projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/development' into development
[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
..
8109a37
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;
@@
-86,6
+88,12
@@
public class DeserializedSubmodelComponent extends SubmodelComponent
return submodelModifiable;
}
return submodelModifiable;
}
+ @Override
+ public double getSubmodelScale()
+ {
+ return super.getSubmodelScale();
+ }
+
@Override
public void setSubmodelScale(double submodelScale)
{
@Override
public void setSubmodelScale(double submodelScale)
{
@@
-98,11
+106,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