Renamed logic to core where appropiate

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / ViewModelModifiable.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java
index d9dbdc4..7ebde10 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModelModifiable.java
@@ -2,16 +2,16 @@ package net.mograsim.logic.model.model;
 
 import java.util.Set;
 
-import net.mograsim.logic.model.model.components.GUIComponent;
-import net.mograsim.logic.model.model.wires.GUIWire;
+import net.mograsim.logic.model.model.components.ModelComponent;
+import net.mograsim.logic.model.model.wires.ModelWire;
 
 public class ViewModelModifiable extends ViewModel
 {
-       public String getDefaultComponentName(GUIComponent component)
+       public String getDefaultComponentName(ModelComponent component)
        {
                Set<String> componentNames = getComponentsByName().keySet();
-               // TODO get the ID of component^^
-               // The following does not work because this code is called in the constructor of DeserializedSubmodelComponent at a time where
+               // TODO get the ID of component
+               // The following does not work because this method is called in the constructor of DeserializedSubmodelComponent at a time where
                // idForSerializingOverride is not yet set
 //             String componentID = null;
 //             if (component instanceof DeserializedSubmodelComponent)
@@ -40,26 +40,26 @@ public class ViewModelModifiable extends ViewModel
        }
 
        @Override
-       public void componentCreated(GUIComponent component)
+       public void componentCreated(ModelComponent component, Runnable destroyed)
        {
-               super.componentCreated(component);
+               super.componentCreated(component, destroyed);
        }
 
        @Override
-       public void componentDestroyed(GUIComponent component)
+       public void destroyComponent(ModelComponent component)
        {
-               super.componentDestroyed(component);
+               super.destroyComponent(component);
        }
 
        @Override
-       public void wireCreated(GUIWire wire)
+       public void wireCreated(ModelWire wire, Runnable destroyed)
        {
-               super.wireCreated(wire);
+               super.wireCreated(wire, destroyed);
        }
 
        @Override
-       public void wireDestroyed(GUIWire wire)
+       public void destroyWire(ModelWire wire)
        {
-               super.wireDestroyed(wire);
+               super.destroyWire(wire);
        }
 }
\ No newline at end of file