From f8b42d95cfdd7895741c179365f29885f8ed1bb7 Mon Sep 17 00:00:00 2001 From: hneemann Date: Wed, 1 Jun 2016 14:01:25 +0200 Subject: [PATCH] refactoring concerning equalsDescription --- src/main/java/de/neemann/digital/draw/elements/Circuit.java | 2 +- src/main/java/de/neemann/digital/draw/model/NetList.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java index 2bec22ee0..833aadd13 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java +++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java @@ -470,7 +470,7 @@ public class Circuit { public ObservableValues getOutputNames() throws PinException { ArrayList pinList = new ArrayList<>(); for (VisualElement ve : visualElements) { - if (ve.getElementName().equals(Out.DESCRIPTION.getName())) { + if (ve.equalsDescription(Out.DESCRIPTION)) { String name = ve.getElementAttributes().getLabel(); if (name == null || name.length() == 0) throw new PinException(Lang.get("err_pinWithoutName")); diff --git a/src/main/java/de/neemann/digital/draw/model/NetList.java b/src/main/java/de/neemann/digital/draw/model/NetList.java index ae91f5206..f7e709613 100644 --- a/src/main/java/de/neemann/digital/draw/model/NetList.java +++ b/src/main/java/de/neemann/digital/draw/model/NetList.java @@ -29,7 +29,7 @@ public class NetList implements Iterable { add(w); for (VisualElement ve : circuit.getElements()) - if (ve.getElementName().equals(Tunnel.DESCRIPTION.getName())) { + if (ve.equalsDescription(Tunnel.DESCRIPTION)) { Vector pos = ve.getPos(); Net found = null; for (Net n : netList)