X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2FLogicModel.java;h=17d0a44e306e4729cd12330728d1cf788e4c2c23;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=f9eef5db7a26c101c8c1c8421a088c76b88afe89;hpb=0e506ec1b95fb65d5cb85412b59e528f9a996038;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java
index f9eef5db..17d0a44e 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/LogicModel.java
@@ -117,24 +117,24 @@ public class LogicModel
 		return wiresUnmodifiable;
 	}
 
-	public <T extends ModelComponent> T getComponentByName(String name, Class<T> expectedComponentClass)
-	{
-		return getByName(name, expectedComponentClass, components);
-	}
-
-	public ModelWire getWireByName(String name)
+	public ModelComponent getComponentByName(String name)
 	{
-		return getByName(name, ModelWire.class, wires);
+		return components.get(name);
 	}
 
 	@SuppressWarnings("unchecked")
-	private static <T> T getByName(String name, Class<T> expectedClass, Map<String, ? super T> map)
+	public <T extends ModelComponent> T getComponentByName(String name, Class<T> expectedComponentClass)
 	{
-		Object comp = map.get(name);
+		ModelComponent comp = components.get(name);
 		Objects.requireNonNull(comp, "Invaild path, component " + name + " not found");
-		if (expectedClass.isInstance(comp))
+		if (expectedComponentClass.isInstance(comp))
 			return (T) comp;
-		throw new IllegalArgumentException("The component " + name + " is not an instance of " + expectedClass);
+		throw new IllegalArgumentException("The component " + name + " is not an instance of " + expectedComponentClass);
+	}
+
+	public ModelWire getWireByName(String name)
+	{
+		return wires.get(name);
 	}
 
 	public <T extends ModelComponent> T getComponentBySubmodelPath(String path, Class<T> modelClass)