From 45f8520ad1c116a06f9cf208080f5db7c5bb0d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Thu, 5 Dec 2024 15:21:15 +0100 Subject: [PATCH] code clean --- src/main/java/de/ph87/electro/CONFIG.java | 12 ++--- src/main/java/de/ph87/electro/Window.java | 10 ++-- .../ph87/electro/circuit/CircuitPainter.java | 2 +- .../circuit/calculation/Calculation.java | 32 ++++++------- .../de/ph87/electro/circuit/node/Node.java | 18 ++++---- .../de/ph87/electro/circuit/part/Part.java | 46 +++++++++---------- .../electro/circuit/part/parts/Battery.java | 2 +- .../circuit/part/parts/BatteryDto.java | 2 +- .../part/parts/ConnectorCornerDto.java | 2 +- .../circuit/part/parts/ConnectorEdge.java | 2 +- .../circuit/part/parts/ConnectorEdgeDto.java | 2 +- .../circuit/part/parts/ConnectorMiddle.java | 2 +- .../part/parts/ConnectorMiddleDto.java | 2 +- .../electro/circuit/part/parts/Light.java | 2 +- .../electro/circuit/part/parts/LightDto.java | 2 +- .../electro/circuit/part/parts/PotiDto.java | 2 +- .../electro/circuit/part/parts/Switch1x1.java | 2 +- .../circuit/part/parts/Switch1x1Dto.java | 2 +- .../electro/circuit/part/parts/Switch1x2.java | 2 +- .../circuit/part/parts/Switch1x2Dto.java | 2 +- .../circuit/part/parts/SwitchCross.java | 2 +- .../circuit/part/parts/SwitchCrossDto.java | 2 +- .../electro/circuit/part/parts/Voltmeter.java | 10 ++-- .../circuit/part/parts/VoltmeterDto.java | 2 +- 24 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/main/java/de/ph87/electro/CONFIG.java b/src/main/java/de/ph87/electro/CONFIG.java index ef8054b..7bf68ef 100644 --- a/src/main/java/de/ph87/electro/CONFIG.java +++ b/src/main/java/de/ph87/electro/CONFIG.java @@ -11,12 +11,6 @@ public class CONFIG { public static final double MAX_RESISTANCE = 1 / NO_RESISTANCE; - public static boolean SHOW_WIRE_DETAILS = true; - - public static boolean SHOW_NODE_VOLTAGES = false; - - public static boolean SHOW_NODE_NAMES = false; - public static final double VOLTAGE_HIGH_MIN = 0.1; public static final int RASTER = 200; @@ -81,6 +75,12 @@ public class CONFIG { public static final BasicStroke SWITCH_STROKE = new BasicStroke(15); + public static boolean SHOW_WIRE_DETAILS = true; + + public static boolean SHOW_NODE_VOLTAGES = false; + + public static boolean SHOW_NODE_NAMES = false; + public static Point ALIGN(final Point position) { return new Point(position.x / RASTER * RASTER, position.y / RASTER * RASTER); } diff --git a/src/main/java/de/ph87/electro/Window.java b/src/main/java/de/ph87/electro/Window.java index c45045f..756d4f5 100644 --- a/src/main/java/de/ph87/electro/Window.java +++ b/src/main/java/de/ph87/electro/Window.java @@ -36,6 +36,11 @@ public class Window extends JFrame { setVisible(true); } + public static void main(String[] args) { + final Window window = new Window(); + window.setCircuit(Demos.potiAndVoltmeter()); + } + public void setCircuit(final Circuit circuit) { circuitPanel.setCircuit(circuit); } @@ -51,9 +56,4 @@ public class Window extends JFrame { setLocation(screenBounds.x, screenBounds.y); } - public static void main(String[] args) { - final Window window = new Window(); - window.setCircuit(Demos.potiAndVoltmeter()); - } - } diff --git a/src/main/java/de/ph87/electro/circuit/CircuitPainter.java b/src/main/java/de/ph87/electro/circuit/CircuitPainter.java index 251e364..c094f9e 100644 --- a/src/main/java/de/ph87/electro/circuit/CircuitPainter.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitPainter.java @@ -1,8 +1,8 @@ package de.ph87.electro.circuit; +import de.ph87.electro.circuit.node.Node; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.Part; -import de.ph87.electro.circuit.node.Node; import java.awt.*; import java.awt.geom.AffineTransform; diff --git a/src/main/java/de/ph87/electro/circuit/calculation/Calculation.java b/src/main/java/de/ph87/electro/circuit/calculation/Calculation.java index f540346..e422713 100644 --- a/src/main/java/de/ph87/electro/circuit/calculation/Calculation.java +++ b/src/main/java/de/ph87/electro/circuit/calculation/Calculation.java @@ -36,20 +36,6 @@ public class Calculation { private RealVector potentials = null; - public static List calculate(final Circuit circuit) { - final List calculations = new ArrayList<>(); - final List batteries = new ArrayList<>(circuit.streamParts().flatMap(Battery::filterCast).toList()); - while (!batteries.isEmpty()) { - final Battery pivot = batteries.removeFirst(); - final Set connectedNodes = new HashSet<>(); - pivot.getPlus().collectConnectedNodes(connectedNodes); - pivot.getMinus().collectConnectedNodes(connectedNodes); - connectedNodes.stream().filter(n -> n instanceof PartNode).map(n -> (PartNode) n).map(PartNode::getPart).flatMap(Battery::filterCast).forEach(batteries::remove); - calculations.add(new Calculation(connectedNodes, pivot)); - } - return calculations; - } - public Calculation(final int numNodes) { matrix = new Array2DRowRealMatrix(numNodes, numNodes); currents = new ArrayRealVector(numNodes); @@ -74,6 +60,20 @@ public class Calculation { toSchematic(); } + public static List calculate(final Circuit circuit) { + final List calculations = new ArrayList<>(); + final List batteries = new ArrayList<>(circuit.streamParts().flatMap(Battery::filterCast).toList()); + while (!batteries.isEmpty()) { + final Battery pivot = batteries.removeFirst(); + final Set connectedNodes = new HashSet<>(); + pivot.getPlus().collectConnectedNodes(connectedNodes); + pivot.getMinus().collectConnectedNodes(connectedNodes); + connectedNodes.stream().filter(n -> n instanceof PartNode).map(n -> (PartNode) n).map(PartNode::getPart).flatMap(Battery::filterCast).forEach(batteries::remove); + calculations.add(new Calculation(connectedNodes, pivot)); + } + return calculations; + } + private void fromSchematic() { wires.forEach( wire -> addResistor(wire.getA(), wire.getB(), CONFIG.NO_RESISTANCE) @@ -194,12 +194,12 @@ public class Calculation { @Getter private static final class Format { + private final String format; + private int integer; private int decimal; - private final String format; - public Format(final RealMatrix matrix) { for (int r = 0; r < matrix.getRowDimension(); r++) { for (int c = 0; c < matrix.getColumnDimension(); c++) { diff --git a/src/main/java/de/ph87/electro/circuit/node/Node.java b/src/main/java/de/ph87/electro/circuit/node/Node.java index 9b3ff4f..bedce04 100644 --- a/src/main/java/de/ph87/electro/circuit/node/Node.java +++ b/src/main/java/de/ph87/electro/circuit/node/Node.java @@ -26,10 +26,10 @@ public class Node { private final String name; @NonNull - protected Point position; + private final Set wires = new HashSet<>(); @NonNull - private final Set wires = new HashSet<>(); + protected Point position; @NonNull @ToString.Include @@ -38,13 +38,6 @@ public class Node { @NonNull private Color color = VOLTAGE_UNKNOWN_COLOR; - @NonNull - @ToString.Include - @SuppressWarnings("unused") // lombok toString - public List destinations() { - return wires.stream().map(wire -> wire.getOpposite(this)).map(Node::getUuid).toList(); - } - public Node(@NonNull final String name, @NonNull final Point position) { this.uuid = UUID.randomUUID().toString(); this.name = name; @@ -57,6 +50,13 @@ public class Node { this.position = position; } + @NonNull + @ToString.Include + @SuppressWarnings("unused") // lombok toString + public List destinations() { + return wires.stream().map(wire -> wire.getOpposite(this)).map(Node::getUuid).toList(); + } + public void setVoltage(final double voltage) { this.voltage = voltage; this.color = Double.isNaN(voltage) ? VOLTAGE_UNKNOWN_COLOR : ((voltage >= VOLTAGE_HIGH_MIN) ? VOLTAGE_HIGH_COLOR : VOLTAGE_LOW_COLOR); diff --git a/src/main/java/de/ph87/electro/circuit/part/Part.java b/src/main/java/de/ph87/electro/circuit/part/Part.java index cd52a3e..84052db 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Part.java +++ b/src/main/java/de/ph87/electro/circuit/part/Part.java @@ -25,6 +25,12 @@ public abstract class Part { @ToString.Include private final String uuid; + @NonNull + private final List nodes = new ArrayList<>(); + + @NonNull + protected Orientation orientation = Orientation.R0; + @NonNull @Setter @ToString.Include @@ -33,12 +39,6 @@ public abstract class Part { @NonNull private Point position; - @NonNull - protected Orientation orientation = Orientation.R0; - - @NonNull - private final List nodes = new ArrayList<>(); - @NonNull private AffineTransform transform = new AffineTransform(); @@ -57,6 +57,23 @@ public abstract class Part { updateTransform(); } + @NonNull + public static Part fromDto(@NonNull final PartDto abstractDto) { + return switch (abstractDto) { + case final BatteryDto dto -> new Battery(dto); + case final ConnectorCornerDto dto -> new ConnectorCorner(dto); + case final ConnectorEdgeDto dto -> new ConnectorEdge(dto); + case final ConnectorMiddleDto dto -> new ConnectorMiddle(dto); + case final LightDto dto -> new Light(dto); + case final Switch1x1Dto dto -> new Switch1x1(dto); + case final Switch1x2Dto dto -> new Switch1x2(dto); + case final SwitchCrossDto dto -> new SwitchCross(dto); + case final PotiDto dto -> new Poti(dto); + case final VoltmeterDto dto -> new Voltmeter(dto); + case null, default -> throw new RuntimeException(); + }; + } + public void setPosition(@NonNull final Point position) { this.position = position; updateTransform(); @@ -136,21 +153,4 @@ public abstract class Part { return nodes.stream().filter(node -> node.intersects(position)).findFirst(); } - @NonNull - public static Part fromDto(@NonNull final PartDto abstractDto) { - return switch (abstractDto) { - case final BatteryDto dto -> new Battery(dto); - case final ConnectorCornerDto dto -> new ConnectorCorner(dto); - case final ConnectorEdgeDto dto -> new ConnectorEdge(dto); - case final ConnectorMiddleDto dto -> new ConnectorMiddle(dto); - case final LightDto dto -> new Light(dto); - case final Switch1x1Dto dto -> new Switch1x1(dto); - case final Switch1x2Dto dto -> new Switch1x2(dto); - case final SwitchCrossDto dto -> new SwitchCross(dto); - case final PotiDto dto -> new Poti(dto); - case final VoltmeterDto dto -> new Voltmeter(dto); - case null, default -> throw new RuntimeException(); - }; - } - } diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Battery.java b/src/main/java/de/ph87/electro/circuit/part/parts/Battery.java index 2663b29..c0e4de9 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Battery.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Battery.java @@ -1,8 +1,8 @@ package de.ph87.electro.circuit.part.parts; +import de.ph87.electro.circuit.node.Node; import de.ph87.electro.circuit.part.InnerConnection; import de.ph87.electro.circuit.part.Part; -import de.ph87.electro.circuit.node.Node; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/BatteryDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/BatteryDto.java index a499e5d..d3cc0a1 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/BatteryDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/BatteryDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorCornerDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorCornerDto.java index 071aba0..b201bd0 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorCornerDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorCornerDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdge.java b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdge.java index a7a4517..c3d5e44 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdge.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdge.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.node.Node; +import de.ph87.electro.circuit.part.Part; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdgeDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdgeDto.java index 05ced35..e2f78e2 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdgeDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorEdgeDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddle.java b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddle.java index cb2b236..e62cc7c 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddle.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddle.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.node.Node; +import de.ph87.electro.circuit.part.Part; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddleDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddleDto.java index 5c7fbb5..a0bcfc4 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddleDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/ConnectorMiddleDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Light.java b/src/main/java/de/ph87/electro/circuit/part/parts/Light.java index bc0355e..23436f2 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Light.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Light.java @@ -1,9 +1,9 @@ package de.ph87.electro.circuit.part.parts; +import de.ph87.electro.circuit.node.Node; import de.ph87.electro.circuit.part.InnerConnection; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.Part; -import de.ph87.electro.circuit.node.Node; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/LightDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/LightDto.java index 309c1fa..fcc113b 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/LightDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/LightDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PotiDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PotiDto.java index 15b02d3..00bb533 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PotiDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PotiDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1.java b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1.java index d9f8b8b..bc57b14 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1.java @@ -1,8 +1,8 @@ package de.ph87.electro.circuit.part.parts; +import de.ph87.electro.circuit.node.Node; import de.ph87.electro.circuit.part.InnerConnection; import de.ph87.electro.circuit.part.Part; -import de.ph87.electro.circuit.node.Node; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1Dto.java b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1Dto.java index 0c5bcaa..8752b5a 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1Dto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x1Dto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2.java b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2.java index 0221090..47fb9b8 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2.java @@ -1,8 +1,8 @@ package de.ph87.electro.circuit.part.parts; +import de.ph87.electro.circuit.node.Node; import de.ph87.electro.circuit.part.InnerConnection; import de.ph87.electro.circuit.part.Part; -import de.ph87.electro.circuit.node.Node; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2Dto.java b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2Dto.java index a178c42..ffdcb27 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2Dto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Switch1x2Dto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCross.java b/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCross.java index ae67033..616f018 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCross.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCross.java @@ -1,8 +1,8 @@ package de.ph87.electro.circuit.part.parts; +import de.ph87.electro.circuit.node.Node; import de.ph87.electro.circuit.part.InnerConnection; import de.ph87.electro.circuit.part.Part; -import de.ph87.electro.circuit.node.Node; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCrossDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCrossDto.java index a25052c..68418fd 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCrossDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/SwitchCrossDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/Voltmeter.java b/src/main/java/de/ph87/electro/circuit/part/parts/Voltmeter.java index d500cea..4ba48b2 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/Voltmeter.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/Voltmeter.java @@ -34,6 +34,8 @@ public class Voltmeter extends Part { private final Node b; + double x = 0; + @Setter private double min = -3; @@ -56,7 +58,9 @@ public class Voltmeter extends Part { postCalculate(); // TODO remove } - double x = 0; + public static Point P(final RealVector anchor) { + return new Point((int) round(anchor.getEntry(0)), (int) round(anchor.getEntry(1))); + } @Override public void _render(final Graphics2D g) { @@ -75,10 +79,6 @@ public class Voltmeter extends Part { drawCircle(g, P(ANCHOR), P03, 0, 360, null, null, Color.black); } - public static Point P(final RealVector anchor) { - return new Point((int) round(anchor.getEntry(0)), (int) round(anchor.getEntry(1))); - } - private double getVoltage() { return !Double.isNaN(b.getVoltage()) && !Double.isNaN(a.getVoltage()) ? b.getVoltage() - a.getVoltage() : 0.0; } diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/VoltmeterDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/VoltmeterDto.java index 70ed932..942c72d 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/VoltmeterDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/VoltmeterDto.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.node.NodeDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter;