diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar index 455d9cf0..c3af2439 100644 Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractSinglePointComponent.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractSinglePointComponent.java deleted file mode 100644 index 292ff731..00000000 --- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/components/AbstractSinglePointComponent.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.diylc.components; - -import java.awt.Point; - -public abstract class AbstractSinglePointComponent extends AbstractComponent { - - private static final long serialVersionUID = 1L; - - protected Point point = new Point(0, 0); - - @Override - public int getControlPointCount() { - return 1; - } - - @Override - public Point getControlPoint(int index) { - return point; - } - - @Override - public void setControlPoint(Point point, int index) { - this.point.setLocation(point); - } - - @Deprecated - @Override - public Void getValue() { - return null; - } - - @Deprecated - @Override - public void setValue(Void value) { - } -} diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java index 2fcec7de..48ba8738 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CopperTrace.java @@ -72,43 +72,36 @@ public class CopperTrace extends AbstractLeadedComponent { return false; } - @Deprecated public Color getBodyColor() { return super.getBodyColor(); } - @Deprecated @Override public Color getBorderColor() { // TODO Auto-generated method stub return super.getBorderColor(); } - @Deprecated @Override public Byte getAlpha() { return super.getAlpha(); } - @Deprecated @Override public Size getLength() { return super.getLength(); } - @Deprecated @Override public Size getWidth() { return super.getWidth(); } - @Deprecated @Override public Void getValue() { return null; } - @Deprecated @Override public void setValue(Void value) { } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java index f5db6e5e..85b29c90 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/CurvedTrace.java @@ -46,7 +46,6 @@ public class CurvedTrace extends AbstractCurvedComponent { this.size = size; } - @Deprecated @Override public Void getValue() { return null; @@ -56,7 +55,6 @@ public class CurvedTrace extends AbstractCurvedComponent { public void setValue(Void value) { } - @Deprecated @Override public Byte getAlpha() { return super.getAlpha(); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java index 13d9139f..d0268c10 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/Jumper.java @@ -22,6 +22,9 @@ public class Jumper extends AbstractLeadedComponent { @Override public void drawIcon(Graphics2D g2d, int width, int height) { + g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(3)); + g2d.setColor(COLOR.darker()); + g2d.drawLine(1, height - 2, width - 2, 1); g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1)); g2d.setColor(COLOR); g2d.drawLine(1, height - 2, width - 2, 1); @@ -34,42 +37,35 @@ public class Jumper extends AbstractLeadedComponent { || componentState == ComponentState.DRAGGING ? SELECTION_COLOR : COLOR; } - @Deprecated public Color getBodyColor() { return super.getBodyColor(); } - @Deprecated @Override public Color getBorderColor() { return super.getBorderColor(); } - @Deprecated @Override public Byte getAlpha() { return super.getAlpha(); } - @Deprecated @Override public Size getLength() { return super.getLength(); } - @Deprecated @Override public Size getWidth() { return super.getWidth(); } - @Deprecated @Override public Void getValue() { return null; } - @Deprecated @Override public void setValue(Void value) { } diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java index e24f3691..729e34a0 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/SolderPad.java @@ -67,7 +67,6 @@ public class SolderPad extends AbstractComponent { this.size = size; } - @Deprecated @Override public String getName() { return super.getName(); @@ -116,7 +115,6 @@ public class SolderPad extends AbstractComponent { this.type = type; } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java index 57772ae8..3d098a7a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/connectivity/TraceCut.java @@ -86,13 +86,11 @@ public class TraceCut extends AbstractComponent { this.point.setLocation(point); } - @Deprecated @Override public Void getValue() { return null; } - @Deprecated @Override public void setValue(Void value) { } @@ -124,7 +122,6 @@ public class TraceCut extends AbstractComponent { this.borderColor = borderColor; } - @Deprecated @Override public String getName() { return super.getName(); diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java index 883d638b..f9463ff7 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/BOM.java @@ -159,7 +159,6 @@ public class BOM extends AbstractComponent { this.size = size; } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java index 1b470654..ef093ac1 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Image.java @@ -112,7 +112,6 @@ public class Image extends AbstractTransparentComponent { return super.getName(); } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java index b8164540..600120ce 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/Label.java @@ -128,7 +128,6 @@ public class Label extends AbstractComponent { return super.getName(); } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java index 83d69a65..28c09c1a 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/misc/ProjectInformation.java @@ -96,7 +96,6 @@ public class ProjectInformation extends AbstractComponent { this.point.setLocation(point); } - @Deprecated @Override public Void getValue() { return null; diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java index 35ba2d13..6fb233e6 100644 --- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java +++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/passive/RadialElectrolytic.java @@ -118,7 +118,6 @@ public class RadialElectrolytic extends AbstractLeadedComponent { return null; } - @Deprecated @Override public Size getWidth() { return super.getWidth();