diff --git a/diylc/diylc-core/src/main/java/org/diylc/core/IDIYComponent.java b/diylc/diylc-core/src/main/java/org/diylc/core/IDIYComponent.java index 0ab5721d..c71970ca 100644 --- a/diylc/diylc-core/src/main/java/org/diylc/core/IDIYComponent.java +++ b/diylc/diylc-core/src/main/java/org/diylc/core/IDIYComponent.java @@ -204,13 +204,4 @@ public interface IDIYComponent extends Serializable, Cloneable { * @param project */ void createdIn(Project project); - - /** - * Returns whether this component is polarized (direction matters for electronic function). - * Default implementation returns true, components that are not polarized should override this. - * @return true if the component is polarized, false otherwise - */ - default boolean isPolarized() { - return true; - } } diff --git a/diylc/diylc-core/src/test/java/org/diylc/plugins/compare/service/CompareServiceTest.java b/diylc/diylc-core/src/test/java/org/diylc/plugins/compare/service/CompareServiceTest.java index 159aa65e..4783d45c 100644 --- a/diylc/diylc-core/src/test/java/org/diylc/plugins/compare/service/CompareServiceTest.java +++ b/diylc/diylc-core/src/test/java/org/diylc/plugins/compare/service/CompareServiceTest.java @@ -222,10 +222,6 @@ public class CompareServiceTest { netlist2.add(createGroup(componentMap, "Resistor1", "Node2", "Component2", "Node2")); netlist2.add(createGroup(componentMap, "Resistor1", "Node1", "Component3", "Node3")); - // Make Resistor1 non-polarized - IDIYComponent resistor = componentMap.get("Resistor1"); - when(resistor.isPolarized()).thenReturn(false); - CompareResults results = compareService.compare(netlist1, netlist2); assertTrue(results.matches()); @@ -243,7 +239,6 @@ public class CompareServiceTest { when(diode1.getControlPoint(1)).thenReturn(new Point2D.Double(0, 0)); when(diode1.isControlPointSticky(0)).thenReturn(true); when(diode1.isControlPointSticky(1)).thenReturn(true); - when(diode1.isPolarized()).thenReturn(true); when(diode1.toString()).thenReturn("Diode1"); when(diode1.getControlPointNodeName(0)).thenReturn("Anode"); when(diode1.getControlPointNodeName(1)).thenReturn("Cathode"); @@ -256,7 +251,6 @@ public class CompareServiceTest { when(component2_1.getControlPoint(0)).thenReturn(new Point2D.Double(0, 0)); when(component2_1.isControlPointSticky(0)).thenReturn(true); when(component2_1.toString()).thenReturn("Component2"); - when(component2_1.isPolarized()).thenReturn(false); // Create Component3 for netlist1 IDIYComponent component3_1 = mock(IDIYComponent.class); @@ -266,7 +260,6 @@ public class CompareServiceTest { when(component3_1.getControlPoint(0)).thenReturn(new Point2D.Double(0, 0)); when(component3_1.isControlPointSticky(0)).thenReturn(true); when(component3_1.toString()).thenReturn("Component3"); - when(component3_1.isPolarized()).thenReturn(false); // Create first netlist with polarized component in two groups Netlist netlist1 = new Netlist(List.of(diode1, component2_1, component3_1)); @@ -294,7 +287,6 @@ public class CompareServiceTest { when(diode2.getControlPoint(1)).thenReturn(new Point2D.Double(0, 0)); when(diode2.isControlPointSticky(0)).thenReturn(true); when(diode2.isControlPointSticky(1)).thenReturn(true); - when(diode2.isPolarized()).thenReturn(true); when(diode2.toString()).thenReturn("Diode1"); when(diode2.getControlPointNodeName(0)).thenReturn("Anode"); when(diode2.getControlPointNodeName(1)).thenReturn("Cathode"); @@ -307,7 +299,6 @@ public class CompareServiceTest { when(component2_2.getControlPoint(0)).thenReturn(new Point2D.Double(0, 0)); when(component2_2.isControlPointSticky(0)).thenReturn(true); when(component2_2.toString()).thenReturn("Component2"); - when(component2_2.isPolarized()).thenReturn(false); // Create Component3 for netlist2 IDIYComponent component3_2 = mock(IDIYComponent.class); @@ -317,7 +308,6 @@ public class CompareServiceTest { when(component3_2.getControlPoint(0)).thenReturn(new Point2D.Double(0, 0)); when(component3_2.isControlPointSticky(0)).thenReturn(true); when(component3_2.toString()).thenReturn("Component3"); - when(component3_2.isPolarized()).thenReturn(false); // Create second netlist with same connections but different node order Netlist netlist2 = new Netlist(List.of(diode2, component2_2, component3_2)); @@ -343,8 +333,7 @@ public class CompareServiceTest { System.out.println("Group: " + g); for (Node n : g.getNodes()) { System.out.println(" Node: " + n.getComponent().getName() + - " " + n.getComponent().getControlPointNodeName(n.getPointIndex()) + - " (polarized: " + n.getComponent().isPolarized() + ")"); + " " + n.getComponent().getControlPointNodeName(n.getPointIndex())); } } System.out.println("\nNetlist2 groups:"); @@ -352,8 +341,7 @@ public class CompareServiceTest { System.out.println("Group: " + g); for (Node n : g.getNodes()) { System.out.println(" Node: " + n.getComponent().getName() + - " " + n.getComponent().getControlPointNodeName(n.getPointIndex()) + - " (polarized: " + n.getComponent().isPolarized() + ")"); + " " + n.getComponent().getControlPointNodeName(n.getPointIndex())); } } @@ -485,11 +473,6 @@ public class CompareServiceTest { netlist2.add(createGroup(componentMap, "Diode1", "Cathode", "Component4", "Node4")); // Make Resistor1 non-polarized and Diode1 polarized - IDIYComponent resistor = componentMap.get("Resistor1"); - IDIYComponent diode = componentMap.get("Diode1"); - when(resistor.isPolarized()).thenReturn(false); - when(diode.isPolarized()).thenReturn(true); - CompareResults results = compareService.compare(netlist1, netlist2); assertTrue(results.matches()); @@ -519,8 +502,6 @@ public class CompareServiceTest { when(c.getControlPoint(0)).thenReturn(new Point2D.Double(0, 0)); when(c.isControlPointSticky(0)).thenReturn(true); when(c.toString()).thenReturn(name); - // Default to non-polarized - when(c.isPolarized()).thenReturn(false); return c; }); // For the same component name, update the node name for this instance diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/FuseHolderPanel.java b/diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/FuseHolderPanel.java index df8b0a83..6c401dc1 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/FuseHolderPanel.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/FuseHolderPanel.java @@ -347,9 +347,4 @@ public class FuseHolderPanel extends AbstractMultiPartComponent { Rectangle2D bounds = getBody()[0].getBounds2D(); return new Rectangle2D.Double(bounds.getX() - margin, bounds.getY() - margin, bounds.getWidth() + 2 * margin, bounds.getHeight() + 2 * margin); } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/AirCoreInductor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/AirCoreInductor.java index 40fadbdc..0c109a5e 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/AirCoreInductor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/AirCoreInductor.java @@ -155,9 +155,4 @@ public class AirCoreInductor extends AbstractLeadedComponent { public void setResistance(Resistance resistance) { this.resistance = resistance; } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/AxialElectrolyticCapacitor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/AxialElectrolyticCapacitor.java index 1702edff..2c62d5c1 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/AxialElectrolyticCapacitor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/AxialElectrolyticCapacitor.java @@ -280,9 +280,4 @@ public class AxialElectrolyticCapacitor extends AbstractLeadedComponent this.polarized = polarized; } - @Override - public boolean isPolarized() { - return polarized; - } - public void drawIcon(Graphics2D g2d, int width, int height) { g2d.rotate(-Math.PI / 4, width / 2, height / 2); g2d.setColor(LEAD_COLOR); diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/CrystalOscillator.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/CrystalOscillator.java index 0ab497dd..c0808c08 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/CrystalOscillator.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/CrystalOscillator.java @@ -133,9 +133,4 @@ public class CrystalOscillator extends AbstractLeadedComponent implem protected Size getDefaultWidth() { return DEFAULT_WIDTH; } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/FuseSymbol.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/FuseSymbol.java index 73dfa616..74207486 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/FuseSymbol.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/FuseSymbol.java @@ -147,9 +147,4 @@ public class FuseSymbol extends AbstractSchematicLeadedSymbol { public enum DrawStyle { ANSI, IEC, IEEE } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/HeatSinkResistor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/HeatSinkResistor.java index 6e41d6f4..7fbc7a01 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/HeatSinkResistor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/HeatSinkResistor.java @@ -508,11 +508,6 @@ public class HeatSinkResistor extends AbstractLeadedComponent implem g2d.draw(a); } - @Override - public boolean isPolarized() { - return false; - } - public enum MountingHoleCount { TWO_DIAGONAL("2 diagonal"), FOUR("4 holes"), diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/InductorSymbol.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/InductorSymbol.java index a7a72bee..897647ac 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/InductorSymbol.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/InductorSymbol.java @@ -151,9 +151,4 @@ public class InductorSymbol extends AbstractSchematicLeadedSymbol { public void setCore(boolean core) { this.core = core; } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialCeramicDiskCapacitor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialCeramicDiskCapacitor.java index 0ee73256..cce1c1f6 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialCeramicDiskCapacitor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialCeramicDiskCapacitor.java @@ -116,9 +116,4 @@ public class RadialCeramicDiskCapacitor extends AbstractRadialComponent imp } return new Ellipse2D.Double(0f, 0f, getClosestOdd(diameter), getClosestOdd(diameter)); } - - @Override - public boolean isPolarized() { - return polarized; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialFilmCapacitor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialFilmCapacitor.java index e3fbd5c6..5fb36976 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialFilmCapacitor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialFilmCapacitor.java @@ -151,9 +151,4 @@ public class RadialFilmCapacitor extends AbstractFilmCapacitor implements IDatas return name().substring(0, 1) + name().substring(1).toLowerCase(); } } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialInductor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialInductor.java index 964c0dfc..952eb4d0 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialInductor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialInductor.java @@ -299,9 +299,4 @@ public class RadialInductor extends AbstractRadialComponent { public void setLip(Size lip) { this.lip = lip; } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialMicaCapacitor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialMicaCapacitor.java index c9a6bc7b..31229b86 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialMicaCapacitor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/RadialMicaCapacitor.java @@ -147,9 +147,4 @@ public class RadialMicaCapacitor extends AbstractRadialComponent im a.add(new Area(new Ellipse2D.Double(length - width, 0, width, width))); return a; } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/Resistor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/Resistor.java index b21057b9..c6c9d2aa 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/Resistor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/Resistor.java @@ -221,11 +221,6 @@ public class Resistor extends AbstractLeadedComponent implements IGe return super.getFlipStanding(); } - @Override - public boolean isPolarized() { - return false; - } - public enum ResistorShape { Tubular, Tubular_Beveled, Standard; diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/ResistorSymbol.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/ResistorSymbol.java index 3a9baec7..6905770b 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/ResistorSymbol.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/ResistorSymbol.java @@ -160,11 +160,6 @@ public class ResistorSymbol extends AbstractSchematicLeadedSymbol { public enum DrawStyle { ANSI, IEC } - - @Override - public boolean isPolarized() { - return false; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/TantalumCapacitor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/TantalumCapacitor.java index 85b90937..1e188c19 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/TantalumCapacitor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/TantalumCapacitor.java @@ -244,9 +244,4 @@ public class TantalumCapacitor extends AbstractRadialComponent { } return new Ellipse2D.Double(0f, 0f, getClosestOdd(diameter), getClosestOdd(diameter)); } - - @Override - public boolean isPolarized() { - return true; - } } diff --git a/diylc/diylc-library/src/main/java/org/diylc/components/passive/ToroidalInductor.java b/diylc/diylc-library/src/main/java/org/diylc/components/passive/ToroidalInductor.java index cfb33c23..5573401f 100644 --- a/diylc/diylc-library/src/main/java/org/diylc/components/passive/ToroidalInductor.java +++ b/diylc/diylc-library/src/main/java/org/diylc/components/passive/ToroidalInductor.java @@ -165,9 +165,4 @@ public class ToroidalInductor extends AbstractLeadedComponent implem public void setResistance(Resistance resistance) { this.resistance = resistance; } - - @Override - public boolean isPolarized() { - return false; - } }