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
/
model
/
components
/
submodels
/
SubmodelInterface.java
diff --git
a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java
b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java
index
9ac1749
..
f87df34
100644
(file)
--- a/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java
+++ b/
net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelInterface.java
@@
-2,15
+2,16
@@
package net.mograsim.logic.model.model.components.submodels;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
import net.haspamelodica.swt.helper.gcs.GeneralGC;
import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.model.model.
View
ModelModifiable;
-import net.mograsim.logic.model.model.components.
GUI
Component;
+import net.mograsim.logic.model.model.
Logic
ModelModifiable;
+import net.mograsim.logic.model.model.components.
Model
Component;
import net.mograsim.logic.model.model.wires.Pin;
import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.serializing.IdentifyParams;
-public class SubmodelInterface extends
GUI
Component
+public class SubmodelInterface extends
Model
Component
{
{
- public SubmodelInterface(
View
ModelModifiable model, String name)
+ public SubmodelInterface(
Logic
ModelModifiable model, String name)
{
{
- super(model, name);
+ super(model, name
, true
);
}
@Override
}
@Override
@@
-18,12
+19,18
@@
public class SubmodelInterface extends GUIComponent
{// nothing to do here
}
{// nothing to do here
}
+ @Override
+ public String getIDForSerializing(IdentifyParams idParams)
+ {
+ throw new UnsupportedOperationException("A SubmodelInterface can't be serialized. Use SubmodelComponent.addSubmodelInterface");
+ }
+
/**
* {@inheritDoc}<br>
* This method is only marked public in {@link SubmodelInterface} for {@link SubmodelComponent} to be able to add / remove pins to /
* from a SubmodelInterface.<br>
*
/**
* {@inheritDoc}<br>
* This method is only marked public in {@link SubmodelInterface} for {@link SubmodelComponent} to be able to add / remove pins to /
* from a SubmodelInterface.<br>
*
- * @see
GUI
Component#removePin(Pin)
+ * @see
Model
Component#removePin(Pin)
*
* @author Daniel Kirschten
*/
*
* @author Daniel Kirschten
*/
@@
-38,7
+45,7
@@
public class SubmodelInterface extends GUIComponent
* This method is only marked public in {@link SubmodelInterface} for {@link SubmodelComponent} to be able to add / remove pins to /
* from a SubmodelInterface.<br>
*
* This method is only marked public in {@link SubmodelInterface} for {@link SubmodelComponent} to be able to add / remove pins to /
* from a SubmodelInterface.<br>
*
- * @see
GUI
Component#removePin(Pin)
+ * @see
Model
Component#removePin(Pin)
*
* @author Daniel Kirschten
*/
*
* @author Daniel Kirschten
*/