From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Mon, 15 Jul 2019 14:22:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/development' into development
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=a393b0a2a9899707af54c9ee77a01f28ac967bd1;p=Mograsim.git

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

a393b0a2a9899707af54c9ee77a01f28ac967bd1
diff --cc net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java
index 2de33454,adf24338..8109a37f
--- 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,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;
  	}
  
+ 	@Override
 -	public void setSubmodelScale(double submodelScale)
++	public double getSubmodelScale()
+ 	{
 -		super.setSubmodelScale(submodelScale);
++		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);
  	}
  
+ 	@Override
 -	public double getSubmodelScale()
++	public Map<String, MovablePin> getSubmodelMovablePins()
+ 	{
 -		return super.getSubmodelScale();
++		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 a8f192e5,1c6a4846..23f8bcb8
--- a/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;