From 0bd947a27bd7edea1566a09e899394d1aa255220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Fri, 17 May 2024 10:05:40 +0200 Subject: [PATCH] PartJunction*Dto --- .../java/de/ph87/electro/circuit/Circuit.java | 3 +-- .../electro/circuit/{dto => }/CircuitDto.java | 4 ++-- .../ph87/electro/circuit/CircuitService.java | 1 - .../ph87/electro/circuit/part/Junction.java | 1 - .../circuit/{dto => part}/JunctionDto.java | 3 +-- .../de/ph87/electro/circuit/part/Part.java | 4 +++- .../circuit/{dto => part}/PartDto.java | 7 +++--- .../ph87/electro/circuit/part/PartOther.java | 2 -- .../circuit/part/impl/PartBattery.java | 1 - .../{dto => part/impl}/PartBatteryDto.java | 5 ++-- .../circuit/part/impl/PartJunctionCorner.java | 7 +++--- .../part/impl/PartJunctionCornerDto.java | 23 +++++++++++++++++++ .../circuit/part/impl/PartJunctionEdge.java | 7 +++--- .../part/impl/PartJunctionEdgeDto.java | 23 +++++++++++++++++++ .../circuit/part/impl/PartJunctionMiddle.java | 5 ++-- .../part/impl/PartJunctionMiddleDto.java | 20 ++++++++++++++++ .../electro/circuit/part/impl/PartLight.java | 1 - .../{dto => part/impl}/PartLightDto.java | 5 ++-- .../circuit/part/impl/PartSwitch1x1.java | 1 - .../{dto => part/impl}/PartSwitch1x1Dto.java | 5 ++-- .../circuit/part/impl/PartSwitch1x2.java | 1 - .../{dto => part/impl}/PartSwitch1x2Dto.java | 5 ++-- .../circuit/part/impl/PartSwitchCross.java | 1 - .../impl}/PartSwitchCrossDto.java | 5 ++-- 24 files changed, 100 insertions(+), 40 deletions(-) rename src/main/java/de/ph87/electro/circuit/{dto => }/CircuitDto.java (80%) rename src/main/java/de/ph87/electro/circuit/{dto => part}/JunctionDto.java (85%) rename src/main/java/de/ph87/electro/circuit/{dto => part}/PartDto.java (82%) rename src/main/java/de/ph87/electro/circuit/{dto => part/impl}/PartBatteryDto.java (78%) create mode 100644 src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCornerDto.java create mode 100644 src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdgeDto.java create mode 100644 src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddleDto.java rename src/main/java/de/ph87/electro/circuit/{dto => part/impl}/PartLightDto.java (82%) rename src/main/java/de/ph87/electro/circuit/{dto => part/impl}/PartSwitch1x1Dto.java (79%) rename src/main/java/de/ph87/electro/circuit/{dto => part/impl}/PartSwitch1x2Dto.java (81%) rename src/main/java/de/ph87/electro/circuit/{dto => part/impl}/PartSwitchCrossDto.java (84%) diff --git a/src/main/java/de/ph87/electro/circuit/Circuit.java b/src/main/java/de/ph87/electro/circuit/Circuit.java index 4c97b4e..54f6825 100644 --- a/src/main/java/de/ph87/electro/circuit/Circuit.java +++ b/src/main/java/de/ph87/electro/circuit/Circuit.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit; -import de.ph87.electro.circuit.dto.CircuitDto; -import de.ph87.electro.circuit.dto.PartDto; +import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.Part; diff --git a/src/main/java/de/ph87/electro/circuit/dto/CircuitDto.java b/src/main/java/de/ph87/electro/circuit/CircuitDto.java similarity index 80% rename from src/main/java/de/ph87/electro/circuit/dto/CircuitDto.java rename to src/main/java/de/ph87/electro/circuit/CircuitDto.java index 50fbe6f..ad4915f 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/CircuitDto.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitDto.java @@ -1,6 +1,6 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit; -import de.ph87.electro.circuit.Circuit; +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/CircuitService.java b/src/main/java/de/ph87/electro/circuit/CircuitService.java index cfccb57..9a9b9d9 100644 --- a/src/main/java/de/ph87/electro/circuit/CircuitService.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitService.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit; import com.fasterxml.jackson.databind.ObjectMapper; -import de.ph87.electro.circuit.dto.CircuitDto; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/de/ph87/electro/circuit/part/Junction.java b/src/main/java/de/ph87/electro/circuit/part/Junction.java index 482c4ab..40c7a27 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Junction.java +++ b/src/main/java/de/ph87/electro/circuit/part/Junction.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit.part; import de.ph87.electro.circuit.ShortCircuit; -import de.ph87.electro.circuit.dto.JunctionDto; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/dto/JunctionDto.java b/src/main/java/de/ph87/electro/circuit/part/JunctionDto.java similarity index 85% rename from src/main/java/de/ph87/electro/circuit/dto/JunctionDto.java rename to src/main/java/de/ph87/electro/circuit/part/JunctionDto.java index 8a42014..90db95d 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/JunctionDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/JunctionDto.java @@ -1,6 +1,5 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part; -import de.ph87.electro.circuit.part.Junction; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; 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 238c05f..bea25c1 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Part.java +++ b/src/main/java/de/ph87/electro/circuit/part/Part.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit.part; import de.ph87.electro.circuit.ShortCircuit; -import de.ph87.electro.circuit.dto.*; import de.ph87.electro.circuit.part.impl.*; import lombok.Getter; import lombok.Setter; @@ -191,6 +190,9 @@ public abstract class Part { public static Part of(final PartDto abstractDto) { return switch (abstractDto) { case final PartBatteryDto dto -> new PartBattery(dto); + case final PartJunctionCornerDto dto -> new PartJunctionCorner(dto); + case final PartJunctionEdgeDto dto -> new PartJunctionEdge(dto); + case final PartJunctionMiddleDto dto -> new PartJunctionMiddle(dto); case final PartLightDto dto -> new PartLight(dto); case final PartSwitch1x1Dto dto -> new PartSwitch1x1(dto); case final PartSwitch1x2Dto dto -> new PartSwitch1x2(dto); diff --git a/src/main/java/de/ph87/electro/circuit/dto/PartDto.java b/src/main/java/de/ph87/electro/circuit/part/PartDto.java similarity index 82% rename from src/main/java/de/ph87/electro/circuit/dto/PartDto.java rename to src/main/java/de/ph87/electro/circuit/part/PartDto.java index 0edcd54..fa83dc7 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/PartDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/PartDto.java @@ -1,8 +1,6 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import de.ph87.electro.circuit.part.Orientation; -import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.part.impl.*; import lombok.Getter; import lombok.NoArgsConstructor; @@ -38,6 +36,9 @@ public class PartDto { public static PartDto of(final Part abstractPart) { return switch (abstractPart) { case final PartBattery part -> new PartBatteryDto(part); + case final PartJunctionCorner part -> new PartJunctionCornerDto(part); + case final PartJunctionEdge part -> new PartJunctionEdgeDto(part); + case final PartJunctionMiddle part -> new PartJunctionMiddleDto(part); case final PartLight part -> new PartLightDto(part); case final PartSwitch1x1 part -> new PartSwitch1x1Dto(part); case final PartSwitch1x2 part -> new PartSwitch1x2Dto(part); diff --git a/src/main/java/de/ph87/electro/circuit/part/PartOther.java b/src/main/java/de/ph87/electro/circuit/part/PartOther.java index b49745d..e4e2699 100644 --- a/src/main/java/de/ph87/electro/circuit/part/PartOther.java +++ b/src/main/java/de/ph87/electro/circuit/part/PartOther.java @@ -1,7 +1,5 @@ package de.ph87.electro.circuit.part; -import de.ph87.electro.circuit.dto.PartDto; - import java.awt.*; public abstract class PartOther extends Part { diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartBattery.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartBattery.java index 1d76ea4..280d526 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartBattery.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartBattery.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit.part.impl; import de.ph87.electro.circuit.ShortCircuit; -import de.ph87.electro.circuit.dto.PartBatteryDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.Part; diff --git a/src/main/java/de/ph87/electro/circuit/dto/PartBatteryDto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartBatteryDto.java similarity index 78% rename from src/main/java/de/ph87/electro/circuit/dto/PartBatteryDto.java rename to src/main/java/de/ph87/electro/circuit/part/impl/PartBatteryDto.java index b68650f..f91ab09 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/PartBatteryDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartBatteryDto.java @@ -1,6 +1,7 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.part.impl.PartBattery; +import de.ph87.electro.circuit.part.JunctionDto; +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/impl/PartJunctionCorner.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCorner.java index 623a038..0b78329 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCorner.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCorner.java @@ -1,6 +1,5 @@ package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.dto.PartSwitchCrossDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; @@ -29,10 +28,10 @@ public class PartJunctionCorner extends PartOther { j1 = newJunction(this, "", P90, P90); } - public PartJunctionCorner(final PartSwitchCrossDto dto) { + public PartJunctionCorner(final PartJunctionCornerDto dto) { super(dto); - j0 = newJunction(this, dto.getCommon0(), P10, P25); - j1 = newJunction(this, dto.getOutput1(), P90, P75); + j0 = newJunction(this, dto.getJ0(), P10, P10); + j1 = newJunction(this, dto.getJ1(), P90, P90); } } diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCornerDto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCornerDto.java new file mode 100644 index 0000000..12573ca --- /dev/null +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionCornerDto.java @@ -0,0 +1,23 @@ +package de.ph87.electro.circuit.part.impl; + +import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.PartDto; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Getter +@ToString +@NoArgsConstructor +public class PartJunctionCornerDto extends PartDto { + + private JunctionDto j0; + + private JunctionDto j1; + + public PartJunctionCornerDto(final PartJunctionCorner part) { + j0 = new JunctionDto(part.getJ0()); + j1 = new JunctionDto(part.getJ1()); + } + +} diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdge.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdge.java index 28f0c77..f9c1a06 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdge.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdge.java @@ -1,6 +1,5 @@ package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.dto.PartSwitchCrossDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; @@ -30,10 +29,10 @@ public class PartJunctionEdge extends PartOther { j1 = newJunction(this, "", P50, P10); } - public PartJunctionEdge(final PartSwitchCrossDto dto) { + public PartJunctionEdge(final PartJunctionEdgeDto dto) { super(dto); - j0 = newJunction(this, dto.getCommon0(), 0, P50); - j1 = newJunction(this, dto.getOutput1(), P50, 0); + j0 = newJunction(this, dto.getJ0(), P10, P50); + j1 = newJunction(this, dto.getJ1(), P50, P10); } } diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdgeDto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdgeDto.java new file mode 100644 index 0000000..25d9c87 --- /dev/null +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionEdgeDto.java @@ -0,0 +1,23 @@ +package de.ph87.electro.circuit.part.impl; + +import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.PartDto; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Getter +@ToString +@NoArgsConstructor +public class PartJunctionEdgeDto extends PartDto { + + private JunctionDto j0; + + private JunctionDto j1; + + public PartJunctionEdgeDto(final PartJunctionEdge part) { + j0 = new JunctionDto(part.getJ0()); + j1 = new JunctionDto(part.getJ1()); + } + +} diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddle.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddle.java index e61dd2f..74cac50 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddle.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddle.java @@ -1,6 +1,5 @@ package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.dto.PartSwitchCrossDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; @@ -26,9 +25,9 @@ public class PartJunctionMiddle extends PartOther { junction = newJunction(this, "", P50, P50); } - public PartJunctionMiddle(final PartSwitchCrossDto dto) { + public PartJunctionMiddle(final PartJunctionMiddleDto dto) { super(dto); - junction = newJunction(this, dto.getCommon0(), P50, P50); + junction = newJunction(this, dto.getJunction(), P50, P50); } } diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddleDto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddleDto.java new file mode 100644 index 0000000..7ac77f3 --- /dev/null +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartJunctionMiddleDto.java @@ -0,0 +1,20 @@ +package de.ph87.electro.circuit.part.impl; + +import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.PartDto; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Getter +@ToString +@NoArgsConstructor +public class PartJunctionMiddleDto extends PartDto { + + private JunctionDto junction; + + public PartJunctionMiddleDto(final PartJunctionMiddle part) { + junction = new JunctionDto(part.getJunction()); + } + +} diff --git a/src/main/java/de/ph87/electro/circuit/part/impl/PartLight.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartLight.java index a1d7797..11d1c67 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartLight.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartLight.java @@ -1,6 +1,5 @@ package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.dto.PartLightDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; diff --git a/src/main/java/de/ph87/electro/circuit/dto/PartLightDto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartLightDto.java similarity index 82% rename from src/main/java/de/ph87/electro/circuit/dto/PartLightDto.java rename to src/main/java/de/ph87/electro/circuit/part/impl/PartLightDto.java index 428d333..b90cc6e 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/PartLightDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartLightDto.java @@ -1,6 +1,7 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.part.impl.PartLight; +import de.ph87.electro.circuit.part.JunctionDto; +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/impl/PartSwitch1x1.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x1.java index 232d401..ccd2393 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x1.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x1.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit.part.impl; import de.ph87.electro.circuit.ShortCircuit; -import de.ph87.electro.circuit.dto.PartSwitch1x1Dto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; diff --git a/src/main/java/de/ph87/electro/circuit/dto/PartSwitch1x1Dto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x1Dto.java similarity index 79% rename from src/main/java/de/ph87/electro/circuit/dto/PartSwitch1x1Dto.java rename to src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x1Dto.java index 39dbc5a..81a9ef9 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/PartSwitch1x1Dto.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x1Dto.java @@ -1,6 +1,7 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.part.impl.PartSwitch1x1; +import de.ph87.electro.circuit.part.JunctionDto; +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/impl/PartSwitch1x2.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x2.java index a94644c..59b9bba 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x2.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x2.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit.part.impl; import de.ph87.electro.circuit.ShortCircuit; -import de.ph87.electro.circuit.dto.PartSwitch1x2Dto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; diff --git a/src/main/java/de/ph87/electro/circuit/dto/PartSwitch1x2Dto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x2Dto.java similarity index 81% rename from src/main/java/de/ph87/electro/circuit/dto/PartSwitch1x2Dto.java rename to src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x2Dto.java index 6e7400d..31131be 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/PartSwitch1x2Dto.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitch1x2Dto.java @@ -1,6 +1,7 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.part.impl.PartSwitch1x2; +import de.ph87.electro.circuit.part.JunctionDto; +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/impl/PartSwitchCross.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitchCross.java index 81b504a..577e4ae 100644 --- a/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitchCross.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitchCross.java @@ -1,7 +1,6 @@ package de.ph87.electro.circuit.part.impl; import de.ph87.electro.circuit.ShortCircuit; -import de.ph87.electro.circuit.dto.PartSwitchCrossDto; import de.ph87.electro.circuit.part.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.PartOther; diff --git a/src/main/java/de/ph87/electro/circuit/dto/PartSwitchCrossDto.java b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitchCrossDto.java similarity index 84% rename from src/main/java/de/ph87/electro/circuit/dto/PartSwitchCrossDto.java rename to src/main/java/de/ph87/electro/circuit/part/impl/PartSwitchCrossDto.java index 57dc053..b7254b8 100644 --- a/src/main/java/de/ph87/electro/circuit/dto/PartSwitchCrossDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/impl/PartSwitchCrossDto.java @@ -1,6 +1,7 @@ -package de.ph87.electro.circuit.dto; +package de.ph87.electro.circuit.part.impl; -import de.ph87.electro.circuit.part.impl.PartSwitchCross; +import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString;