X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodeladapter%2FLogicCoreAdapter.java;h=70f256ab99035400cdcd76e23d0bc01e4dbb2132;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=397f91384e45a16dcc61d2caa9af86905a22a62d;hpb=552986fd8718d5f2db00802015fdd1ecd58a5a2f;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java
index 397f9138..70f256ab 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/modeladapter/LogicCoreAdapter.java
@@ -13,7 +13,7 @@ import java.util.stream.Collectors;
 import net.mograsim.logic.core.timeline.Timeline;
 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.LogicModel;
 import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.components.submodels.SubmodelInterface;
@@ -31,23 +31,23 @@ public class LogicCoreAdapter
 		componentAdapters.put(componentAdapter.getSupportedClass(), componentAdapter);
 	}
 
-	public static Timeline convert(ViewModel viewModel, CoreModelParameters params)
+	public static Timeline convert(LogicModel logicModel, CoreModelParameters params)
 	{
 		// TODO replace Timeline with CoreModel as soon as it exists
 		Timeline timeline = new Timeline(10);
 
-		convert(viewModel, params, timeline, Map.of());
+		convert(logicModel, params, timeline, Map.of());
 
 		return timeline;
 	}
 
-	private static void convert(ViewModel viewModel, CoreModelParameters params, Timeline timeline, Map<Pin, CoreWire> externalWires)
+	private static void convert(LogicModel logicModel, CoreModelParameters params, Timeline timeline, Map<Pin, CoreWire> externalWires)
 	{
-		Map<Pin, CoreWire> logicWiresPerPin = convertWires(getAllPins(viewModel), viewModel.getWiresByName().values(), externalWires,
+		Map<Pin, CoreWire> logicWiresPerPin = convertWires(getAllPins(logicModel), logicModel.getWiresByName().values(), externalWires,
 				params, timeline);
 		Map<Pin, CoreWire> logicWiresPerPinUnmodifiable = Collections.unmodifiableMap(logicWiresPerPin);
 
-		for (ModelComponent modelComp : viewModel.getComponentsByName().values())
+		for (ModelComponent modelComp : logicModel.getComponentsByName().values())
 		{
 			if (modelComp instanceof SubmodelComponent)
 			{
@@ -65,9 +65,9 @@ public class LogicCoreAdapter
 		}
 	}
 
-	private static Set<Pin> getAllPins(ViewModel viewModel)
+	private static Set<Pin> getAllPins(LogicModel logicModel)
 	{
-		return viewModel.getComponentsByName().values().stream().flatMap(component -> component.getPins().values().stream())
+		return logicModel.getComponentsByName().values().stream().flatMap(component -> component.getPins().values().stream())
 				.collect(Collectors.toSet());
 	}