X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIComponent.java;h=edc3d7b715355fd6196302c96394124da40ccf74;hb=c223a9de7b0ef783bcb4f7612da350583ca29abd;hp=89c532e407635b64f7dedb3460228b81ad4cc88f;hpb=82cc1d386820c179be331790fa3c1fae22bada76;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
index 89c532e4..edc3d7b7 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
@@ -1,23 +1,26 @@
 package net.mograsim.logic.ui.model.components;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.components.params.SubmodelComponentParams;
 import net.mograsim.logic.ui.model.wires.Pin;
 
 public abstract class GUIComponent
 {
 	protected final ViewModelModifiable model;
 	private final Rectangle bounds;
-	private final List<Pin> pins;
-	protected final List<Pin> pinsUnmodifiable;
+	private final Map<String, Pin> pinsByName;
+	protected final Collection<Pin> pinsUnmodifiable;
 
 	private final List<Consumer<? super GUIComponent>> componentMovedListeners;
 	private final List<Consumer<? super Pin>> pinAddedListeners;
@@ -32,8 +35,8 @@ public abstract class GUIComponent
 	{
 		this.model = model;
 		this.bounds = new Rectangle(0, 0, 0, 0);
-		this.pins = new ArrayList<>();
-		this.pinsUnmodifiable = Collections.unmodifiableList(pins);
+		this.pinsByName = new HashMap<>();
+		this.pinsUnmodifiable = Collections.unmodifiableCollection(pinsByName.values());
 
 		this.componentMovedListeners = new ArrayList<>();
 		this.pinAddedListeners = new ArrayList<>();
@@ -47,7 +50,7 @@ public abstract class GUIComponent
 
 	public void destroy()
 	{
-		pins.forEach(p -> pinRemovedListeners.forEach(l -> l.accept(p)));
+		pinsByName.values().forEach(p -> pinRemovedListeners.forEach(l -> l.accept(p)));
 		model.componentDestroyed(this);
 	}
 
@@ -66,6 +69,26 @@ public abstract class GUIComponent
 		return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
 	}
 
+	public double getPosX()
+	{
+		return bounds.x;
+	}
+
+	public double getPosY()
+	{
+		return bounds.y;
+	}
+
+	public double getWidth()
+	{
+		return bounds.width;
+	}
+
+	public double getHeight()
+	{
+		return bounds.height;
+	}
+
 	/**
 	 * Called when this component is clicked. Absolute coordinates of the click are given. Returns true if this component consumed this
 	 * click.
@@ -77,13 +100,21 @@ public abstract class GUIComponent
 	}
 
 	/**
-	 * Returns a list of pins of this component.
+	 * Returns a collection of pins of this component.
 	 */
-	public List<Pin> getPins()
+	public Collection<Pin> getPins()
 	{
 		return pinsUnmodifiable;
 	}
 
+	public Pin getPin(String name)
+	{
+		Pin pin = pinsByName.get(name);
+		if (pin == null)
+			throw new IllegalArgumentException("No pin with the name " + name);
+		return pin;
+	}
+
 	// @formatter:off
 	public void addComponentMovedListener   (Consumer<? super GUIComponent> listener) {componentMovedListeners.add   (listener);}
 	public void addPinAddedListener         (Consumer<? super Pin         > listener) {pinAddedListeners      .add   (listener);}
@@ -120,15 +151,17 @@ public abstract class GUIComponent
 
 	protected void addPin(Pin pin)
 	{
-		pins.add(pin);
+		if (pinsByName.containsKey(pin.name))
+			throw new IllegalArgumentException("Duplicate pin name: " + pin.name);
+		pinsByName.put(pin.name, pin);
 		callPinAddedListeners(pin);
 		pin.addRedrawListener(redrawListenerForSubcomponents);
 		callRedrawListeners();
 	}
 
-	protected void removePin(Pin pin)
+	protected void removePin(String name)
 	{
-		pins.remove(pin);
+		Pin pin = pinsByName.remove(name);
 		callPinRemovedListeners(pin);
 		pin.removeRedrawListener(redrawListenerForSubcomponents);
 		callRedrawListeners();
@@ -141,4 +174,10 @@ public abstract class GUIComponent
 	{
 		return identifierDelegate.get();
 	}
+
+	@SuppressWarnings("static-method")
+	public Map<String, Object> getInstantiationParameters()
+	{
+		return new TreeMap<>();
+	}
 }
\ No newline at end of file