projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleaned up initializing of ModelComponents (also improved HLSDebugShell)
[Mograsim.git]
/
net.mograsim.logic.model
/
src
/
net
/
mograsim
/
logic
/
model
/
serializing
/
DeserializedSubmodelComponent.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
index
8d0016c
..
33f00e1
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
@@
-2,7
+2,7
@@
package net.mograsim.logic.model.serializing;
import com.google.gson.JsonElement;
import com.google.gson.JsonElement;
-import net.mograsim.logic.model.model.
View
ModelModifiable;
+import net.mograsim.logic.model.model.
Logic
ModelModifiable;
import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
import net.mograsim.logic.model.model.wires.MovablePin;
import net.mograsim.logic.model.model.wires.Pin;
@@
-15,7
+15,7
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
* If a DeserializedSubmodelComponent is part of another SubmodelComponent, when it it serialized, it should not return its internal
* structure, but rather the component ID used to create it.
*
* If a DeserializedSubmodelComponent is part of another SubmodelComponent, when it it serialized, it should not return its internal
* structure, but rather the component ID used to create it.
*
- * @see SubmodelComponentSerializer#deserialize(
View
ModelModifiable, SubmodelComponentParams, String, String, JsonElement)
+ * @see SubmodelComponentSerializer#deserialize(
Logic
ModelModifiable, SubmodelComponentParams, String, String, JsonElement)
* SubmodelComponentSerializer.deserialize(...)
* @see SubmodelComponentSerializer#serialize(SubmodelComponent, java.util.function.Function) SubmodelComponentSerializer.serialize(...)
*/
* SubmodelComponentSerializer.deserialize(...)
* @see SubmodelComponentSerializer#serialize(SubmodelComponent, java.util.function.Function) SubmodelComponentSerializer.serialize(...)
*/
@@
-25,12
+25,13
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
*/
public final JsonElement paramsForSerializingOverride;
*/
public final JsonElement paramsForSerializingOverride;
- public DeserializedSubmodelComponent(
View
ModelModifiable model, String name, String idForSerializingOverride,
+ public DeserializedSubmodelComponent(
Logic
ModelModifiable model, String name, String idForSerializingOverride,
JsonElement paramsForSerializingOverride)
{
JsonElement paramsForSerializingOverride)
{
- super(model, name);
+ super(model, name
, false
);
this.idForSerializingOverride = idForSerializingOverride;
this.paramsForSerializingOverride = paramsForSerializingOverride;
this.idForSerializingOverride = idForSerializingOverride;
this.paramsForSerializingOverride = paramsForSerializingOverride;
+ init();
}
@Override
}
@Override
@@
-43,7
+44,6
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
public void setOutlineRenderer(Renderer outlineRenderer)
{
super.setOutlineRenderer(outlineRenderer);
public void setOutlineRenderer(Renderer outlineRenderer)
{
super.setOutlineRenderer(outlineRenderer);
- requestRedraw();
}
@Override
}
@Override
@@
-52,7
+52,7
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
super.setHighLevelStateHandler(handler);
}
super.setHighLevelStateHandler(handler);
}
- public
View
ModelModifiable getSubmodelModifiable()
+ public
Logic
ModelModifiable getSubmodelModifiable()
{
return submodelModifiable;
}
{
return submodelModifiable;
}
@@
-80,13
+80,4
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
{
super.removeSubmodelInterface(name);
}
{
super.removeSubmodelInterface(name);
}
-
- // TODO only used in EditorCanvas. Replace with setting maxVisibleRegionFillRatioForAlpha0 / min...1.
- @Override
- public Renderer getOutlineRenderer()
- {
- return super.getOutlineRenderer();
- }
-
- // TODO static initializer?
}
\ No newline at end of file
}
\ No newline at end of file