diff --git a/diylc/diylc-core/src/org/diylc/common/PropertyWrapper.java b/diylc/diylc-core/src/org/diylc/common/PropertyWrapper.java index 07603625..d6240951 100644 --- a/diylc/diylc-core/src/org/diylc/common/PropertyWrapper.java +++ b/diylc/diylc-core/src/org/diylc/common/PropertyWrapper.java @@ -136,7 +136,6 @@ public class PropertyWrapper implements Cloneable { final int prime = 31; int result = 1; result = prime * result + (defaultable ? 1231 : 1237); - result = prime * result + ((getter == null) ? 0 : getter.hashCode()); result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((setter == null) ? 0 : setter.hashCode()); return result; diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractCurvedComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractCurvedComponent.java index 1e5c47c8..95e04ec3 100644 --- a/diylc/diylc-core/src/org/diylc/components/AbstractCurvedComponent.java +++ b/diylc/diylc-core/src/org/diylc/components/AbstractCurvedComponent.java @@ -221,12 +221,12 @@ public abstract class AbstractCurvedComponent extends AbstractTransparentComp } } - @EditableProperty - public Color getColor() { + @EditableProperty(name="Color") + public Color getLeadColor() { return color; } - public void setColor(Color color) { + public void setLeadColor(Color color) { this.color = color; } diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 0e296fdd..eaa62c70 100644 Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/SolderPad.java b/diylc/diylc-library/src/org/diylc/components/connectivity/SolderPad.java index ae81af47..94021f30 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/SolderPad.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/SolderPad.java @@ -135,11 +135,11 @@ public class SolderPad extends AbstractComponent { } @EditableProperty(name = "Color") - public Color getColor() { + public Color getLeadColor() { return color; } - public void setColor(Color color) { + public void setLeadColor(Color color) { this.color = color; } diff --git a/diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java b/diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java index 7843be1c..02f52175 100644 --- a/diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java +++ b/diylc/diylc-library/src/org/diylc/parsing/V1FileParser.java @@ -155,7 +155,7 @@ public class V1FileParser implements IOldFileParser { SolderPad pad = new SolderPad(); pad.setName(nameAttr); if (color != null) { - pad.setColor(color); + pad.setLeadColor(color); } pad.setControlPoint(convertV1CoordinatesToV3Point(referencePoint, x1Attr, y1Attr), 0); component = pad; @@ -197,7 +197,7 @@ public class V1FileParser implements IOldFileParser { wire.setName(nameAttr); String colorAttr = node.getAttributes().getNamedItem("Color").getNodeValue(); - wire.setColor(parseV1Color(colorAttr)); + wire.setLeadColor(parseV1Color(colorAttr)); wire.setControlPoint(point1, 0); wire.setControlPoint(new Point(x2, y2), 1); wire.setControlPoint(new Point(x3, y3), 2); diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml index 6639cac5..7da1a399 100644 --- a/diylc/diylc-swing/build.xml +++ b/diylc/diylc-swing/build.xml @@ -109,7 +109,6 @@ - diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 0e296fdd..eaa62c70 100644 Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar index 875a8594..2d8ef194 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index 2b179c0f..5f71da83 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -1648,23 +1648,23 @@ NEW_FEATURE - Hold Control key to zoom with mouse wheel. Zooming tracks mouse cursor position. + Hold Control key to zoom with mouse wheel. Zooming tracks mouse cursor position NEW_FEATURE - Ability to set project-wide default font through 'Edit Project Settings' dialog. + Ability to set project-wide default font through 'Edit Project Settings' dialog NEW_FEATURE - Added wizard installer for Windows that associates .DIY files automatically. + Added wizard installer for Windows that associates .DIY files automatically IMPROVEMENT - Moved config and auto-save file locations to standard user directory instead of using the app directory. + Moved config and auto-save file locations to standard user directory instead of using the app directory IMPROVEMENT - Do not allow creating zero-length components (i.e. traces, lines, etc) + Do not allow creating zero-length components (e.g. traces, lines, etc) IMPROVEMENT @@ -1674,6 +1674,10 @@ IMPROVEMENT Solder pads can be sent behind copper traces to allow creating white border around traces on top of a ground plane + + IMPROVEMENT + Ability to edit color of copper trace, curved trace and solder pad at the same time + BUG_FIX Component library empty if the app is installed in a folder that contains special characters in the name