X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2FLogicUICanvas.java;h=3795f64fd1016d41eb268a47f076253cbb0a602d;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=2974278f3d1ad57f6739289b342faff47300293e;hpb=4ac977cb31feb34f24e05e9d5e7976951dccf557;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java
index 2974278f..3795f64f 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUICanvas.java
@@ -23,8 +23,8 @@ import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.ui.model.ViewModel;
 import net.mograsim.logic.ui.model.components.GUIComponent;
-import net.mograsim.logic.ui.model.components.SubmodelComponent;
-import net.mograsim.logic.ui.model.components.SubmodelInterface;
+import net.mograsim.logic.ui.model.components.submodels.SubmodelComponent;
+import net.mograsim.logic.ui.model.components.submodels.SubmodelInterface;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
 import net.mograsim.preferences.Preferences;
 
@@ -66,7 +66,7 @@ public class LogicUICanvas extends ZoomableCanvas
 		if (e.button == 1)
 		{
 			Point click = displayToWorldCoords(e.x, e.y);
-			for (GUIComponent component : model.getComponents())
+			for (GUIComponent component : model.getComponentsByName().values())
 				if (component.getBounds().contains(click) && component.clicked(click.x, click.y))
 				{
 					redraw();
@@ -163,10 +163,10 @@ public class LogicUICanvas extends ZoomableCanvas
 
 	private void addComponentSelectorItems(List<GUIComponent> componentsByItemIndex, String base, Combo componentSelector, ViewModel model)
 	{
-		for (GUIComponent c : model.getComponents())
+		for (GUIComponent c : model.getComponentsByName().values())
 			if (!(c instanceof WireCrossPoint || c instanceof SubmodelInterface))
 			{
-				String item = base + c.getIdentifier();
+				String item = base + c.name;
 				componentsByItemIndex.add(c);
 				componentSelector.add(item);
 				if (c instanceof SubmodelComponent)