X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FSimpleRectangularHardcodedGUIComponent.java;fp=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FSimpleRectangularHardcodedGUIComponent.java;h=c384b540d04bb8854f7d01ae3be1ce6463393d4d;hb=bbe38c55aaa999d025f534245f9207a88643f6e5;hp=1ced6d4a86410a76db0cfcba5880aee83f2e5eb8;hpb=a6cd86d5b65d3322c5f9acc8ecec207b3fe6d887;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java index 1ced6d4a..c384b540 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/SimpleRectangularHardcodedGUIComponent.java @@ -1,6 +1,5 @@ package net.mograsim.logic.model.model.components.atomic; -import java.util.HashMap; import java.util.Map; import net.haspamelodica.swt.helper.gcs.GeneralGC; @@ -25,9 +24,6 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen private static final double pinNamesHeight = 3.5; private static final double pinNamesMargin = .5; - // TODO maybe make this more general? - private final Map pinUsages; - private final DefaultOutlineRenderer outlineRenderer; private final CenteredTextSymbolRenderer centerTextRenderer; private final PinNamesSymbolRenderer pinNamesRenderer; @@ -37,7 +33,6 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen public SimpleRectangularHardcodedGUIComponent(ViewModelModifiable model, String name, String centerText) { super(model, name); - pinUsages = new HashMap<>(); this.outlineRenderer = new DefaultOutlineRenderer(this); CenteredTextParams centeredTextParams = new CenteredTextParams(); centeredTextParams.text = centerText; @@ -52,24 +47,17 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen // pins - protected void addPin(Pin pin, Usage usage, Position namePosition) + protected void addPin(Pin pin, Position namePosition) { super.addPin(pin); // do this first to catch errors - pinUsages.put(pin, usage); pinNamesRenderer.setPinPosition(pin, namePosition); } private void pinRemoved(Pin pin) { - pinUsages.remove(pin); pinNamesRenderer.setPinPosition(pin, null); } - public Usage getPinUsage(Pin pin) - { - return pinUsages.get(pin); - } - // logic protected abstract Object recalculate(Object lastState, Map readEnds, Map readWriteEnds); @@ -89,12 +77,7 @@ public abstract class SimpleRectangularHardcodedGUIComponent extends GUIComponen @Override protected void addPin(Pin pin) { - throw new UnsupportedOperationException("Can't add pins without setting usage, call addPin(Pin, Usage [, Position]) instead"); - } - - public static enum Usage - { - INPUT, OUTPUT, TRISTATE; + throw new UnsupportedOperationException("Can't add pins without setting usage, call addPin(Pin [, Position]) instead"); } static