X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodeladapter%2FViewLogicModelAdapter.java;h=8c337cd25d57dd5596d26641e20b7b06da6bf62a;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=16b52ee1bd6767d88de37f118acd4dac373797ba;hpb=b5d8c2d71e27350ea7c9314e40df5bb0584271cd;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
index 16b52ee1..8c337cd2 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/ViewLogicModelAdapter.java
@@ -1,9 +1,9 @@
 package net.mograsim.logic.model.modeladapter;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -11,8 +11,8 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.wires.Wire;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.CoreWire;
+import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModel;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
@@ -41,10 +41,11 @@ public class ViewLogicModelAdapter
 		return timeline;
 	}
 
-	private static void convert(ViewModel viewModel, LogicModelParameters params, Timeline timeline, Map<Pin, Wire> externalWires)
+	private static void convert(ViewModel viewModel, LogicModelParameters params, Timeline timeline, Map<Pin, CoreWire> externalWires)
 	{
-		Map<Pin, Wire> logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWires(), externalWires, params, timeline);
-		Map<Pin, Wire> logicWiresPerPinUnmodifiable = Collections.unmodifiableMap(logicWiresPerPin);
+		Map<Pin, CoreWire> logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWiresByName().values(), externalWires, params,
+				timeline);
+		Map<Pin, CoreWire> logicWiresPerPinUnmodifiable = Collections.unmodifiableMap(logicWiresPerPin);
 
 		for (GUIComponent guiComp : viewModel.getComponentsByName().values())
 		{
@@ -52,7 +53,7 @@ public class ViewLogicModelAdapter
 			{
 				SubmodelComponent guiCompCasted = (SubmodelComponent) guiComp;
 				Map<String, Pin> supermodelPins = guiCompCasted.getSupermodelPins();
-				Map<Pin, Wire> externalWiresForSubmodel = supermodelPins.entrySet().stream()
+				Map<Pin, CoreWire> externalWiresForSubmodel = supermodelPins.entrySet().stream()
 						.collect(Collectors.toMap(e -> guiCompCasted.getSubmodelPin(e.getKey()), e -> logicWiresPerPin.get(e.getValue())));
 				convert(guiCompCasted.submodel, params, timeline, externalWiresForSubmodel);
 			} else if (guiComp instanceof WireCrossPoint)
@@ -60,7 +61,7 @@ public class ViewLogicModelAdapter
 				WireCrossPoint guiCompCasted = (WireCrossPoint) guiComp;
 				guiCompCasted.setLogicModelBinding(logicWiresPerPin.get(guiCompCasted.getPin()).createReadOnlyEnd());
 			} else if (!(guiComp instanceof SubmodelInterface))// nothing to do for SubmodelInterfaces
-				createAndLinkComponent(timeline, params, guiComp, logicWiresPerPinUnmodifiable, componentAdapters.get(guiComp.getClass()));
+				createAndLinkComponent(timeline, params, guiComp, logicWiresPerPinUnmodifiable);
 		}
 	}
 
@@ -70,50 +71,50 @@ public class ViewLogicModelAdapter
 				.collect(Collectors.toSet());
 	}
 
-	private static Map<Pin, Wire> convertWires(Set<Pin> allPins, List<GUIWire> wires, Map<Pin, Wire> externalWires,
+	private static Map<Pin, CoreWire> convertWires(Set<Pin> allPins, Collection<GUIWire> wires, Map<Pin, CoreWire> externalWires,
 			LogicModelParameters params, Timeline timeline)
 	{
 		Map<Pin, Set<Pin>> connectedPinGroups = getConnectedPinGroups(allPins, wires);
-		Map<Pin, Wire> logicWiresPerPin = createLogicWires(params, timeline, connectedPinGroups, externalWires);
+		Map<Pin, CoreWire> logicWiresPerPin = createLogicWires(params, timeline, connectedPinGroups, externalWires);
 		setGUIWiresLogicModelBinding(wires, logicWiresPerPin);
 		return logicWiresPerPin;
 	}
 
-	private static Map<Pin, Wire> createLogicWires(LogicModelParameters params, Timeline timeline, Map<Pin, Set<Pin>> connectedPinGroups,
-			Map<Pin, Wire> externalWires)
+	private static Map<Pin, CoreWire> createLogicWires(LogicModelParameters params, Timeline timeline, Map<Pin, Set<Pin>> connectedPinGroups,
+			Map<Pin, CoreWire> externalWires)
 	{
-		Map<Pin, Wire> logicWiresPerPin = new HashMap<>();
-		Map<Set<Pin>, Wire> logicWiresPerPinGroup = new HashMap<>();
+		Map<Pin, CoreWire> logicWiresPerPin = new HashMap<>();
+		Map<Set<Pin>, CoreWire> logicWiresPerPinGroup = new HashMap<>();
 		for (Entry<Pin, Set<Pin>> e : connectedPinGroups.entrySet())
 			logicWiresPerPin.put(e.getKey(), logicWiresPerPinGroup.computeIfAbsent(e.getValue(), set ->
 			{
-				Wire externalWire = null;
+				CoreWire externalWire = null;
 				for (Pin p : set)
 				{
-					Wire externalWireCandidate = externalWires.get(p);
+					CoreWire externalWireCandidate = externalWires.get(p);
 					if (externalWireCandidate != null)
 						if (externalWire == null)
 							externalWire = externalWireCandidate;
-						else if (externalWire.length == externalWireCandidate.length)
-							Wire.fuse(externalWire, externalWireCandidate);
+						else if (externalWire.width == externalWireCandidate.width)
+							CoreWire.fuse(externalWire, externalWireCandidate);
 						else
 							throw new IllegalArgumentException(
 									"Two pins to external wires with different logicWidths can't be connected directly");
 				}
-				return externalWire == null ? new Wire(timeline, e.getKey().logicWidth, params.wireTravelTime) : externalWire;
+				return externalWire == null ? new CoreWire(timeline, e.getKey().logicWidth, params.wireTravelTime) : externalWire;
 			}));
 		return logicWiresPerPin;
 	}
 
-	private static void setGUIWiresLogicModelBinding(List<GUIWire> wires, Map<Pin, Wire> logicWiresPerPin)
+	private static void setGUIWiresLogicModelBinding(Collection<GUIWire> wires, Map<Pin, CoreWire> logicWiresPerPin)
 	{
-		Map<Wire, ReadEnd> guiWireSharedReadEnd = logicWiresPerPin.values().stream().distinct()
-				.collect(Collectors.toMap(Function.identity(), Wire::createReadOnlyEnd));
+		Map<CoreWire, ReadEnd> guiWireSharedReadEnd = logicWiresPerPin.values().stream().distinct()
+				.collect(Collectors.toMap(Function.identity(), CoreWire::createReadOnlyEnd));
 		for (GUIWire guiWire : wires)
 			guiWire.setLogicModelBinding(guiWireSharedReadEnd.get(logicWiresPerPin.get(guiWire.getPin1())));
 	}
 
-	private static Map<Pin, Set<Pin>> getConnectedPinGroups(Set<Pin> allPins, List<GUIWire> wires)
+	private static Map<Pin, Set<Pin>> getConnectedPinGroups(Set<Pin> allPins, Collection<GUIWire> wires)
 	{
 		Map<Pin, Set<Pin>> connectedPinsPerPin = new HashMap<>();
 
@@ -143,8 +144,15 @@ public class ViewLogicModelAdapter
 
 	@SuppressWarnings("unchecked")
 	private static <G extends GUIComponent> void createAndLinkComponent(Timeline timeline, LogicModelParameters params,
-			GUIComponent guiComponent, Map<Pin, Wire> logicWiresPerPin, ComponentAdapter<G> adapter)
+			GUIComponent guiComponent, Map<Pin, CoreWire> logicWiresPerPin)
 	{
+		Class<?> cls = guiComponent.getClass();
+		ComponentAdapter<? super G> adapter = null;
+		while (cls != GUIComponent.class && adapter == null)
+		{
+			adapter = (ComponentAdapter<? super G>) componentAdapters.get(cls);
+			cls = cls.getSuperclass();
+		}
 		if (adapter == null)
 			throw new IllegalArgumentException("Unknown component class: " + guiComponent.getClass());
 		adapter.createAndLinkComponent(timeline, params, (G) guiComponent, logicWiresPerPin);