From 6326657a3c18b83ad59a08ffe9d600149fdb4e88 Mon Sep 17 00:00:00 2001
From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sat, 22 Jun 2019 10:43:15 +0200
Subject: [PATCH] Changed interface of GUIComponent.getPins()

---
 .../src/net/mograsim/logic/ui/LogicUIRenderer.java       | 2 +-
 .../mograsim/logic/ui/model/components/GUIComponent.java | 9 ++++-----
 .../logic/ui/model/components/SubmodelComponent.java     | 2 +-
 .../logic/ui/modeladapter/ViewLogicModelAdapter.java     | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIRenderer.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIRenderer.java
index 29bf6136..7858a704 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIRenderer.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/LogicUIRenderer.java
@@ -45,7 +45,7 @@ public class LogicUIRenderer
 			if (DRAW_PINS)
 			{
 				gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_DARK_CYAN));
-				for (Pin p : component.getPins())
+				for (Pin p : component.getPins().values())
 				{
 					Point pos = p.getPos();
 					gc.fillOval(pos.x - 1, pos.y - 1, 2, 2);
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 472798f1..a586616e 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,7 +1,6 @@
 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;
@@ -33,9 +32,9 @@ public abstract class GUIComponent
 	 */
 	private final Map<String, Pin> pinsByName;
 	/**
-	 * An unmodifiable view of {@link #pinsByName}<code>.</code>{@link Map#values() values()}.
+	 * An unmodifiable view of {@link #pinsByName}.
 	 */
-	protected final Collection<Pin> pinsUnmodifiable;
+	protected final Map<String, Pin> pinsUnmodifiable;
 
 	private final List<Consumer<? super GUIComponent>> componentMovedListeners;
 	private final List<Consumer<? super Pin>> pinAddedListeners;
@@ -53,7 +52,7 @@ public abstract class GUIComponent
 		this.model = model;
 		this.bounds = new Rectangle(0, 0, 0, 0);
 		this.pinsByName = new HashMap<>();
-		this.pinsUnmodifiable = Collections.unmodifiableCollection(pinsByName.values());
+		this.pinsUnmodifiable = Collections.unmodifiableMap(pinsByName);
 
 		this.componentMovedListeners = new ArrayList<>();
 		this.pinAddedListeners = new ArrayList<>();
@@ -119,7 +118,7 @@ public abstract class GUIComponent
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public Collection<Pin> getPins()
+	public Map<String, Pin> getPins()
 	{
 		return pinsUnmodifiable;
 	}
diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
index 8febda89..6aad07f2 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
@@ -224,7 +224,7 @@ public abstract class SubmodelComponent extends GUIComponent
 
 		InterfacePinParams[] iPins = new InterfacePinParams[getPins().size()];
 		int i = 0;
-		for (Pin p : getPins())
+		for (Pin p : getPins().values())
 		{
 			InterfacePinParams iPinParams = new InterfacePinParams();
 			iPins[i] = iPinParams;
diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
index 3cbc1502..5503dc4e 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/modeladapter/ViewLogicModelAdapter.java
@@ -85,7 +85,7 @@ public class ViewLogicModelAdapter
 
 	private static Set<Pin> getAllPins(ViewModel viewModel)
 	{
-		return viewModel.getComponents().stream().flatMap(component -> component.getPins().stream()).collect(Collectors.toSet());
+		return viewModel.getComponents().stream().flatMap(component -> component.getPins().values().stream()).collect(Collectors.toSet());
 	}
 
 	private static Map<Pin, Wire> convertWires(Set<Pin> allPins, List<GUIWire> wires, Map<Pin, Wire> externalWires,
-- 
2.17.1