From 0616e68f5e61402e94b10149545c7ab429c173d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Thu, 16 May 2024 11:57:45 +0200 Subject: [PATCH] removed obsole Part.duplicate --- .../java/de/ph87/electro/circuit/part/Part.java | 16 +++++++--------- .../electro/circuit/part/impl/PartBattery.java | 5 ----- .../electro/circuit/part/impl/PartLight.java | 5 ----- .../electro/circuit/part/impl/PartSwitch1x1.java | 5 ----- .../electro/circuit/part/impl/PartSwitch1x2.java | 5 ----- .../circuit/part/impl/PartSwitchCross.java | 5 ----- 6 files changed, 7 insertions(+), 34 deletions(-) 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 8eca2b6..4db815a 100644 --- a/src/main/java/de/ph87/electro/circuit/part/Part.java +++ b/src/main/java/de/ph87/electro/circuit/part/Part.java @@ -140,14 +140,19 @@ public abstract class Part { } } + public Point translate(final Point p) { + return new Point( + p.x + position.x * RASTER, + p.y + position.y * RASTER + ); + } + public abstract void click(); public abstract void propagate(final Junction source) throws ShortCircuit; protected abstract void _render(final Graphics2D g); - public abstract Part duplicate(final Point position); - public static Part of(final PartDto abstractDto) { return switch (abstractDto) { case final PartBatteryDto dto -> new PartBattery(dto); @@ -159,11 +164,4 @@ public abstract class Part { }; } - public Point translate(final Point p) { - return new Point( - p.x + position.x * RASTER, - p.y + position.y * RASTER - ); - } - } 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 7656bf3..ad7b9b0 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 @@ -82,11 +82,6 @@ public class PartBattery extends Part { rect(g, HALF + GAP / 2, HALF - PLUS_H / 2, PLUS_W, PLUS_H, null, null, Color.BLACK); } - @Override - public PartBattery duplicate(final Point newPosition) { - return new PartBattery(getName(), newPosition, getOrientation(), voltage); - } - @Override public void click() { // nothing 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 b79315b..060b7b1 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 @@ -90,11 +90,6 @@ public class PartLight extends PartOther { line(g, diag, RASTER - diag, RASTER - diag, diag, Color.BLACK, SYMBOL_STROKE); } - @Override - public PartLight duplicate(final Point newPosition) { - return new PartLight(getName(), newPosition, getOrientation(), maxVoltage); - } - @Override public void click() { defect = false; 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 f824a61..35c4c40 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 @@ -69,9 +69,4 @@ public class PartSwitch1x1 extends PartOther { state = !state; } - @Override - public PartSwitch1x1 duplicate(final Point newPosition) { - return new PartSwitch1x1(getName(), newPosition, getOrientation(), state); - } - } 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 0dcb4de..5cd3bf9 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 @@ -79,9 +79,4 @@ public class PartSwitch1x2 extends PartOther { state = !state; } - @Override - public PartSwitch1x2 duplicate(final Point newPosition) { - return new PartSwitch1x2(getName(), newPosition, getOrientation(), state); - } - } 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 1e069a3..3577063 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 @@ -95,9 +95,4 @@ public class PartSwitchCross extends PartOther { state = !state; } - @Override - public PartSwitchCross duplicate(final Point newPosition) { - return new PartSwitchCross(getName(), newPosition, getOrientation(), state); - } - }