diff --git a/.gitignore b/.gitignore index 99e57a5..3f9684c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.idea/ +/data/ target/ !.mvn/wrapper/maven-wrapper.jar diff --git a/src/main/java/de/ph87/electro/circuit/Circuit.java b/src/main/java/de/ph87/electro/circuit/Circuit.java index 419f4a0..59d40df 100644 --- a/src/main/java/de/ph87/electro/circuit/Circuit.java +++ b/src/main/java/de/ph87/electro/circuit/Circuit.java @@ -1,17 +1,27 @@ package de.ph87.electro.circuit; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.calculation.Calculation; import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.part.PartDto; import de.ph87.electro.circuit.part.Position; +import de.ph87.electro.circuit.part.junction.Junction; +import de.ph87.electro.circuit.wire.Wire; +import de.ph87.electro.circuit.wire.WireDto; import lombok.NoArgsConstructor; import lombok.NonNull; +import lombok.extern.slf4j.Slf4j; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Stream; +import static de.ph87.electro.circuit.CircuitIOService.write; + +@Slf4j @NoArgsConstructor public class Circuit { @@ -40,6 +50,15 @@ public class Circuit { } public void evaluateAndRender() { + try { + final File file = new File("./data/circuit.json"); + if (file.getParentFile().mkdirs()) { + log.info("Directory created: {}", file.getParent()); + } + write(this, new FileOutputStream(file)); + } catch (IOException e) { + log.error(e.toString()); + } Calculation.calculate(this); parts.forEach(Part::render); } diff --git a/src/main/java/de/ph87/electro/circuit/CircuitDto.java b/src/main/java/de/ph87/electro/circuit/CircuitDto.java index a48cf24..e1accd6 100644 --- a/src/main/java/de/ph87/electro/circuit/CircuitDto.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitDto.java @@ -1,6 +1,7 @@ package de.ph87.electro.circuit; import de.ph87.electro.circuit.part.PartDto; +import de.ph87.electro.circuit.wire.WireDto; 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/CircuitIOService.java similarity index 94% rename from src/main/java/de/ph87/electro/circuit/CircuitService.java rename to src/main/java/de/ph87/electro/circuit/CircuitIOService.java index 9a9b9d9..27d0022 100644 --- a/src/main/java/de/ph87/electro/circuit/CircuitService.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitIOService.java @@ -6,7 +6,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -public class CircuitService { +public class CircuitIOService { private static final ObjectMapper objectMapper = new ObjectMapper(); diff --git a/src/main/java/de/ph87/electro/circuit/CircuitPanelMouseAdapter.java b/src/main/java/de/ph87/electro/circuit/CircuitPanelMouseAdapter.java index dd2408f..b1006a7 100644 --- a/src/main/java/de/ph87/electro/circuit/CircuitPanelMouseAdapter.java +++ b/src/main/java/de/ph87/electro/circuit/CircuitPanelMouseAdapter.java @@ -1,8 +1,9 @@ package de.ph87.electro.circuit; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.part.Position; +import de.ph87.electro.circuit.wire.Wire; import java.awt.*; import java.awt.event.MouseAdapter; diff --git a/src/main/java/de/ph87/electro/circuit/ShortCircuit.java b/src/main/java/de/ph87/electro/circuit/ShortCircuit.java deleted file mode 100644 index b620b29..0000000 --- a/src/main/java/de/ph87/electro/circuit/ShortCircuit.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.ph87.electro.circuit; - -public class ShortCircuit extends Exception { - -} diff --git a/src/main/java/de/ph87/electro/circuit/Calculation.java b/src/main/java/de/ph87/electro/circuit/calculation/Calculation.java similarity index 97% rename from src/main/java/de/ph87/electro/circuit/Calculation.java rename to src/main/java/de/ph87/electro/circuit/calculation/Calculation.java index 862c127..7970a41 100644 --- a/src/main/java/de/ph87/electro/circuit/Calculation.java +++ b/src/main/java/de/ph87/electro/circuit/calculation/Calculation.java @@ -1,7 +1,9 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.calculation; +import de.ph87.electro.circuit.Circuit; +import de.ph87.electro.circuit.wire.Wire; import de.ph87.electro.circuit.part.InnerConnection; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.part.parts.PartBattery; import de.ph87.electro.circuit.part.parts.PartLight; diff --git a/src/main/java/de/ph87/electro/circuit/part/InnerConnection.java b/src/main/java/de/ph87/electro/circuit/part/InnerConnection.java index 152fc55..29bebcc 100644 --- a/src/main/java/de/ph87/electro/circuit/part/InnerConnection.java +++ b/src/main/java/de/ph87/electro/circuit/part/InnerConnection.java @@ -1,5 +1,7 @@ package de.ph87.electro.circuit.part; +import de.ph87.electro.circuit.part.junction.Junction; + import java.util.stream.Stream; public class InnerConnection { 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 1d00cfd..763293f 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Part.java +++ b/src/main/java/de/ph87/electro/circuit/part/Part.java @@ -1,5 +1,7 @@ package de.ph87.electro.circuit.part; +import de.ph87.electro.circuit.part.junction.Junction; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.parts.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/de/ph87/electro/circuit/part/PartDto.java b/src/main/java/de/ph87/electro/circuit/part/PartDto.java index 1254ffb..f36a7db 100644 --- a/src/main/java/de/ph87/electro/circuit/part/PartDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/PartDto.java @@ -1,6 +1,7 @@ package de.ph87.electro.circuit.part; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.parts.*; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/Render.java b/src/main/java/de/ph87/electro/circuit/part/Render.java index d392102..07a0e90 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Render.java +++ b/src/main/java/de/ph87/electro/circuit/part/Render.java @@ -1,5 +1,6 @@ package de.ph87.electro.circuit.part; +import de.ph87.electro.circuit.part.junction.Junction; import lombok.Getter; import java.awt.*; diff --git a/src/main/java/de/ph87/electro/circuit/part/Junction.java b/src/main/java/de/ph87/electro/circuit/part/junction/Junction.java similarity index 91% rename from src/main/java/de/ph87/electro/circuit/part/Junction.java rename to src/main/java/de/ph87/electro/circuit/part/junction/Junction.java index 351ce7a..206c1af 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Junction.java +++ b/src/main/java/de/ph87/electro/circuit/part/junction/Junction.java @@ -1,6 +1,9 @@ -package de.ph87.electro.circuit.part; +package de.ph87.electro.circuit.part.junction; -import de.ph87.electro.circuit.Wire; +import de.ph87.electro.circuit.part.Part; +import de.ph87.electro.circuit.part.Position; +import de.ph87.electro.circuit.part.Render; +import de.ph87.electro.circuit.wire.Wire; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/JunctionDto.java b/src/main/java/de/ph87/electro/circuit/part/junction/JunctionDto.java similarity index 87% rename from src/main/java/de/ph87/electro/circuit/part/JunctionDto.java rename to src/main/java/de/ph87/electro/circuit/part/junction/JunctionDto.java index 310996d..07add5c 100644 --- a/src/main/java/de/ph87/electro/circuit/part/JunctionDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/junction/JunctionDto.java @@ -1,4 +1,4 @@ -package de.ph87.electro.circuit.part; +package de.ph87.electro.circuit.part.junction; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartBattery.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartBattery.java index 9267212..f208e3f 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartBattery.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartBattery.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.Orientation; import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.part.Position; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartBatteryDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartBatteryDto.java index 9a99d9a..eabfc1e 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartBatteryDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartBatteryDto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCorner.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCorner.java index 9042d78..8f427a8 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCorner.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCorner.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.PartOther; import de.ph87.electro.circuit.part.Position; import lombok.Getter; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCornerDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCornerDto.java index aa1f3d7..5a6c385 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCornerDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionCornerDto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdge.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdge.java index bed17e6..48e51c5 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdge.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdge.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.PartOther; import de.ph87.electro.circuit.part.Position; import lombok.Getter; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdgeDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdgeDto.java index cba538e..0277523 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdgeDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionEdgeDto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddle.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddle.java index 156ce9b..db417d1 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddle.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddle.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.PartOther; import de.ph87.electro.circuit.part.Position; import lombok.Getter; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddleDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddleDto.java index 1d70a58..65919d5 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddleDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartJunctionMiddleDto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartLight.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartLight.java index 386b923..c3750a2 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartLight.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartLight.java @@ -1,6 +1,7 @@ package de.ph87.electro.circuit.part.parts; import de.ph87.electro.circuit.part.*; +import de.ph87.electro.circuit.part.junction.Junction; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartLightDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartLightDto.java index ef87e48..8682674 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartLightDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartLightDto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1.java index 8c4f7a3..adf337b 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; import de.ph87.electro.circuit.part.InnerConnection; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.PartOther; import de.ph87.electro.circuit.part.Position; import lombok.Getter; @@ -12,7 +12,7 @@ import java.awt.*; import java.util.List; import static de.ph87.electro.CONFIG.*; -import static de.ph87.electro.circuit.Calculation.NO_RESISTANCE; +import static de.ph87.electro.circuit.calculation.Calculation.NO_RESISTANCE; @Getter @ToString(callSuper = true) diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1Dto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1Dto.java index bce4064..9641c05 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1Dto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x1Dto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2.java index 9fb6358..2b05f5a 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; import de.ph87.electro.circuit.part.InnerConnection; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.PartOther; import de.ph87.electro.circuit.part.Position; import lombok.Getter; @@ -11,7 +11,7 @@ import lombok.ToString; import java.util.List; import static de.ph87.electro.CONFIG.*; -import static de.ph87.electro.circuit.Calculation.NO_RESISTANCE; +import static de.ph87.electro.circuit.calculation.Calculation.NO_RESISTANCE; @Getter @ToString(callSuper = true) diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2Dto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2Dto.java index 1b7880b..11125c1 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2Dto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitch1x2Dto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCross.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCross.java index 32ea360..a3947b5 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCross.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCross.java @@ -1,7 +1,7 @@ package de.ph87.electro.circuit.part.parts; import de.ph87.electro.circuit.part.InnerConnection; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.PartOther; import de.ph87.electro.circuit.part.Position; import lombok.Getter; @@ -11,7 +11,7 @@ import lombok.ToString; import java.util.List; import static de.ph87.electro.CONFIG.*; -import static de.ph87.electro.circuit.Calculation.NO_RESISTANCE; +import static de.ph87.electro.circuit.calculation.Calculation.NO_RESISTANCE; @Getter @ToString(callSuper = true) diff --git a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCrossDto.java b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCrossDto.java index 2f3bd71..ba8c6fa 100644 --- a/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCrossDto.java +++ b/src/main/java/de/ph87/electro/circuit/part/parts/PartSwitchCrossDto.java @@ -1,6 +1,6 @@ package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.JunctionDto; +import de.ph87.electro.circuit.part.junction.JunctionDto; import de.ph87.electro.circuit.part.PartDto; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/de/ph87/electro/circuit/Wire.java b/src/main/java/de/ph87/electro/circuit/wire/Wire.java similarity index 96% rename from src/main/java/de/ph87/electro/circuit/Wire.java rename to src/main/java/de/ph87/electro/circuit/wire/Wire.java index 461c592..f063475 100644 --- a/src/main/java/de/ph87/electro/circuit/Wire.java +++ b/src/main/java/de/ph87/electro/circuit/wire/Wire.java @@ -1,6 +1,6 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.wire; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.Position; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/de/ph87/electro/circuit/WireDto.java b/src/main/java/de/ph87/electro/circuit/wire/WireDto.java similarity index 89% rename from src/main/java/de/ph87/electro/circuit/WireDto.java rename to src/main/java/de/ph87/electro/circuit/wire/WireDto.java index 6ad00db..54ee392 100644 --- a/src/main/java/de/ph87/electro/circuit/WireDto.java +++ b/src/main/java/de/ph87/electro/circuit/wire/WireDto.java @@ -1,4 +1,4 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.wire; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/test/java/de/ph87/electro/circuit/net/CalculationServiceTest.java b/src/test/java/de/ph87/electro/circuit/CalculationServiceTest.java similarity index 85% rename from src/test/java/de/ph87/electro/circuit/net/CalculationServiceTest.java rename to src/test/java/de/ph87/electro/circuit/CalculationServiceTest.java index e87c6f7..48e8c58 100644 --- a/src/test/java/de/ph87/electro/circuit/net/CalculationServiceTest.java +++ b/src/test/java/de/ph87/electro/circuit/CalculationServiceTest.java @@ -1,11 +1,10 @@ -package de.ph87.electro.circuit.net; +package de.ph87.electro.circuit; -import de.ph87.electro.circuit.Calculation; -import de.ph87.electro.circuit.Circuit; -import de.ph87.electro.circuit.Wire; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.calculation.Calculation; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.parts.PartBattery; import de.ph87.electro.circuit.part.parts.PartLight; +import de.ph87.electro.circuit.wire.Wire; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/ph87/electro/circuit/net/CalculationTest.java b/src/test/java/de/ph87/electro/circuit/calculation/CalculationTest.java similarity index 81% rename from src/test/java/de/ph87/electro/circuit/net/CalculationTest.java rename to src/test/java/de/ph87/electro/circuit/calculation/CalculationTest.java index 93c40dd..4805b3e 100644 --- a/src/test/java/de/ph87/electro/circuit/net/CalculationTest.java +++ b/src/test/java/de/ph87/electro/circuit/calculation/CalculationTest.java @@ -1,6 +1,5 @@ -package de.ph87.electro.circuit.net; +package de.ph87.electro.circuit.calculation; -import de.ph87.electro.circuit.Calculation; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/ph87/electro/circuit/CircuitCalculationServiceTest.java b/src/test/java/de/ph87/electro/circuit/io/CircuitIOServiceTest.java similarity index 90% rename from src/test/java/de/ph87/electro/circuit/CircuitCalculationServiceTest.java rename to src/test/java/de/ph87/electro/circuit/io/CircuitIOServiceTest.java index cabd0ea..2dd6430 100644 --- a/src/test/java/de/ph87/electro/circuit/CircuitCalculationServiceTest.java +++ b/src/test/java/de/ph87/electro/circuit/io/CircuitIOServiceTest.java @@ -1,6 +1,7 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.io; -import de.ph87.electro.circuit.part.Junction; +import de.ph87.electro.circuit.Circuit; +import de.ph87.electro.circuit.part.junction.Junction; import de.ph87.electro.circuit.part.Part; import de.ph87.electro.circuit.part.parts.PartBattery; import de.ph87.electro.circuit.part.parts.PartLight; @@ -11,9 +12,11 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; +import static de.ph87.electro.circuit.CircuitIOService.read; +import static de.ph87.electro.circuit.CircuitIOService.write; import static org.junit.jupiter.api.Assertions.assertEquals; -class CircuitCalculationServiceTest { +class CircuitIOServiceTest { @Test void serialization() throws IOException { @@ -27,11 +30,11 @@ class CircuitCalculationServiceTest { private void check(final Circuit original) throws IOException { final ByteArrayOutputStream output = new ByteArrayOutputStream(); - CircuitService.write(original, output); + write(original, output); System.out.println(output.toString(StandardCharsets.UTF_8)); final ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray()); - final Circuit reloaded = CircuitService.read(input); + final Circuit reloaded = read(input); original.evaluateAndRender(); reloaded.evaluateAndRender(); diff --git a/src/test/java/de/ph87/electro/circuit/BatteryLightTest.java b/src/test/java/de/ph87/electro/circuit/part/parts/BatteryLightTest.java similarity index 87% rename from src/test/java/de/ph87/electro/circuit/BatteryLightTest.java rename to src/test/java/de/ph87/electro/circuit/part/parts/BatteryLightTest.java index 1fde19a..d4ca4b8 100644 --- a/src/test/java/de/ph87/electro/circuit/BatteryLightTest.java +++ b/src/test/java/de/ph87/electro/circuit/part/parts/BatteryLightTest.java @@ -1,7 +1,6 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.parts.PartBattery; -import de.ph87.electro.circuit.part.parts.PartLight; +import de.ph87.electro.circuit.Circuit; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/ph87/electro/circuit/BatterySwitcher1x1Test.java b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher1x1Test.java similarity index 88% rename from src/test/java/de/ph87/electro/circuit/BatterySwitcher1x1Test.java rename to src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher1x1Test.java index 10d742b..21c1b63 100644 --- a/src/test/java/de/ph87/electro/circuit/BatterySwitcher1x1Test.java +++ b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher1x1Test.java @@ -1,8 +1,6 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.parts.PartBattery; -import de.ph87.electro.circuit.part.parts.PartLight; -import de.ph87.electro.circuit.part.parts.PartSwitch1x1; +import de.ph87.electro.circuit.Circuit; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/ph87/electro/circuit/BatterySwitcher1x2Test.java b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher1x2Test.java similarity index 91% rename from src/test/java/de/ph87/electro/circuit/BatterySwitcher1x2Test.java rename to src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher1x2Test.java index 893fadf..4b2346e 100644 --- a/src/test/java/de/ph87/electro/circuit/BatterySwitcher1x2Test.java +++ b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher1x2Test.java @@ -1,8 +1,6 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.parts.PartBattery; -import de.ph87.electro.circuit.part.parts.PartLight; -import de.ph87.electro.circuit.part.parts.PartSwitch1x2; +import de.ph87.electro.circuit.Circuit; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/ph87/electro/circuit/BatterySwitcher2x2Test.java b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher2x2Test.java similarity index 92% rename from src/test/java/de/ph87/electro/circuit/BatterySwitcher2x2Test.java rename to src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher2x2Test.java index 9f69f9f..3cf08ac 100644 --- a/src/test/java/de/ph87/electro/circuit/BatterySwitcher2x2Test.java +++ b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcher2x2Test.java @@ -1,8 +1,6 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.parts.PartBattery; -import de.ph87.electro.circuit.part.parts.PartLight; -import de.ph87.electro.circuit.part.parts.PartSwitch1x2; +import de.ph87.electro.circuit.Circuit; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/ph87/electro/circuit/BatterySwitcherCrossTest.java b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcherCrossTest.java similarity index 93% rename from src/test/java/de/ph87/electro/circuit/BatterySwitcherCrossTest.java rename to src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcherCrossTest.java index 2d88461..36a36f7 100644 --- a/src/test/java/de/ph87/electro/circuit/BatterySwitcherCrossTest.java +++ b/src/test/java/de/ph87/electro/circuit/part/parts/BatterySwitcherCrossTest.java @@ -1,9 +1,6 @@ -package de.ph87.electro.circuit; +package de.ph87.electro.circuit.part.parts; -import de.ph87.electro.circuit.part.parts.PartBattery; -import de.ph87.electro.circuit.part.parts.PartLight; -import de.ph87.electro.circuit.part.parts.PartSwitch1x2; -import de.ph87.electro.circuit.part.parts.PartSwitchCross; +import de.ph87.electro.circuit.Circuit; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;