projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made get/setHighLevelState ordering uniform: get... comes before set...
[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
2de3345
..
0e9be47
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
@@
-1,5
+1,7
@@
package net.mograsim.logic.model.serializing;
package net.mograsim.logic.model.serializing;
+import java.util.Map;
+
import com.google.gson.JsonElement;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import com.google.gson.JsonElement;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
@@
-41,15
+43,15
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
}
@Override
}
@Override
- public
void setHighLevelState(String stateID, Object newState
)
+ public
Object getHighLevelState(String stateID
)
{
{
-
highLevelStateHandler.setHighLevelState(stateID, newState
);
+
return highLevelStateHandler.getHighLevelState(stateID
);
}
@Override
}
@Override
- public
Object getHighLevelState(String stateID
)
+ public
void setHighLevelState(String stateID, Object newState
)
{
{
-
return highLevelStateHandler.getHighLevelState(stateID
);
+
highLevelStateHandler.setHighLevelState(stateID, newState
);
}
@Override
}
@Override
@@
-71,21
+73,42
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
this.outlineRenderer = outlineRenderer;
}
this.outlineRenderer = outlineRenderer;
}
+ public Renderer getOutlineRenderer()
+ {
+ return outlineRenderer;
+ }
+
public void setSymbolRenderer(Renderer symbolRenderer)
{
this.symbolRenderer = symbolRenderer;
}
public void setSymbolRenderer(Renderer symbolRenderer)
{
this.symbolRenderer = symbolRenderer;
}
+ public Renderer getSymbolRenderer()
+ {
+ return symbolRenderer;
+ }
+
public void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
{
this.highLevelStateHandler = highLevelStateHandler;
}
public void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
{
this.highLevelStateHandler = highLevelStateHandler;
}
+ public HighLevelStateHandler getHighLevelStateHandler()
+ {
+ return highLevelStateHandler;
+ }
+
public ViewModelModifiable getSubmodelModifiable()
{
return submodelModifiable;
}
public ViewModelModifiable getSubmodelModifiable()
{
return submodelModifiable;
}
+ @Override
+ public double getSubmodelScale()
+ {
+ return super.getSubmodelScale();
+ }
+
@Override
public void setSubmodelScale(double submodelScale)
{
@Override
public void setSubmodelScale(double submodelScale)
{
@@
-98,11
+121,23
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
super.setSize(width, height);
}
super.setSize(width, height);
}
+ @Override
+ public Map<String, MovablePin> getSubmodelMovablePins()
+ {
+ return super.getSubmodelMovablePins();
+ }
+
@Override
public Pin addSubmodelInterface(MovablePin supermodelPin)
{
return super.addSubmodelInterface(supermodelPin);
}
@Override
public Pin addSubmodelInterface(MovablePin supermodelPin)
{
return super.addSubmodelInterface(supermodelPin);
}
+ @Override
+ public void removeSubmodelInterface(String name)
+ {
+ super.removeSubmodelInterface(name);
+ }
+
// TODO static initializer
}
\ No newline at end of file
// TODO static initializer
}
\ No newline at end of file