Merge remote-tracking branch 'origin/development' into development

diff --cc net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
index 2de3345,adf2433..8109a37
--- 1/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
--- 2/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,7 -1,7 +1,9 @@@
  package net.mograsim.logic.model.serializing;
  
+ import java.util.Map;
+ 
 +import com.google.gson.JsonElement;
 +
  import net.haspamelodica.swt.helper.gcs.GeneralGC;
  import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
  import net.mograsim.logic.model.model.ViewModelModifiable;
@@@ -86,23 -49,39 +88,41 @@@ public class DeserializedSubmodelCompon
                return submodelModifiable;
        }
  
 -      public void setSubmodelScale(double submodelScale)
+       @Override
 -              super.setSubmodelScale(submodelScale);
++      public double getSubmodelScale()
+       {
++              return super.getSubmodelScale();
+       }
+ 
        @Override
 -      public void setSize(double width, double height)
 +      public void setSubmodelScale(double submodelScale)
        {
 -              super.setSize(width, height);
 +              super.setSubmodelScale(submodelScale);
        }
  
        @Override
 -      public Pin addSubmodelInterface(MovablePin supermodelPin)
 +      public void setSize(double width, double height)
        {
 -              return super.addSubmodelInterface(supermodelPin);
 +              super.setSize(width, height);
        }
  
 -      public double getSubmodelScale()
+       @Override
 -              return super.getSubmodelScale();
++      public Map<String, MovablePin> getSubmodelMovablePins()
+       {
++              return super.getSubmodelMovablePins();
+       }
+ 
        @Override
 -      public Map<String, MovablePin> getSubmodelMovablePins()
 +      public Pin addSubmodelInterface(MovablePin supermodelPin)
        {
 -              return super.getSubmodelMovablePins();
 +              return super.addSubmodelInterface(supermodelPin);
        }
  
+       @Override
+       public void removeSubmodelInterface(String name)
+       {
+               super.removeSubmodelInterface(name);
+       }
++
 +      // TODO static initializer
  }

diff --cc net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
index a8f192e,1c6a484..23f8bcb
--- 1/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
--- 2/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java
@@@ -2,7 -2,7 +2,8 @@@ package net.mograsim.logic.model.serial
  
  import java.io.IOException;
  import java.io.InputStream;
 +import java.io.UncheckedIOException;
+ import java.util.Collection;
  import java.util.HashMap;
  import java.util.Map;