diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index 98f52c12..614920f6 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -4258,6 +4258,10 @@ IMPROVEMENT Escape comma in BOM CSV files to avoid component names being split into separate columns + + IMPROVEMENT + Show jack type in the BOM + IMPROVEMENT Improved find tool usability, make the screen pan to the selected components diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 83ee75c5..0584a8f8 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/electromechanical/CliffJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java index f14d8f3a..5edfa679 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/CliffJack1_4.java @@ -57,7 +57,7 @@ import org.diylc.utils.Constants; description = "Cliff-style closed panel mount 1/4\" phono jack", zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J", autoEdit = false, transformer = CliffJackTransformer.class, enableCache = true) -public class CliffJack1_4 extends AbstractMultiPartComponent { +public class CliffJack1_4 extends AbstractMultiPartComponent { private static final long serialVersionUID = 1L; @@ -76,7 +76,9 @@ public class CliffJack1_4 extends AbstractMultiPartComponent { private JackType type = JackType.MONO; private Orientation orientation = Orientation.DEFAULT; transient private Area[] body; - private String value = ""; + @SuppressWarnings("unused") + @Deprecated + private transient String value = ""; public CliffJack1_4() { super(); @@ -316,23 +318,12 @@ public class CliffJack1_4 extends AbstractMultiPartComponent { return VisibilityPolicy.NEVER; } - @EditableProperty - @Override - public String getValue() { - return value; - } - - @Override - public void setValue(String value) { - this.value = value; - } - - @EditableProperty - public JackType getType() { + @EditableProperty(name = "Type") + public JackType getValue() { return type; } - public void setType(JackType type) { + public void setValue(JackType type) { this.type = type; updateControlPoints(); } diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java index 4fbaad21..e0a57d42 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/ClosedJack1_4.java @@ -57,7 +57,7 @@ import org.diylc.utils.Constants; @ComponentDescriptor(name = "Closed 1/4\" Jack", category = "Electro-Mechanical", author = "Branislav Stojkovic", description = "Enclosed panel mount 1/4\" phono jack", zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J", autoEdit = false, transformer = ClosedJackTransformer.class, enableCache = true) -public class ClosedJack1_4 extends AbstractMultiPartComponent { +public class ClosedJack1_4 extends AbstractMultiPartComponent { private static final long serialVersionUID = 1L; @@ -78,7 +78,9 @@ public class ClosedJack1_4 extends AbstractMultiPartComponent { private JackType type = JackType.MONO; private Orientation orientation = Orientation.DEFAULT; transient private Shape[] body; - private String value = ""; + @SuppressWarnings("unused") + @Deprecated + private transient String value = ""; public ClosedJack1_4() { super(); @@ -327,23 +329,12 @@ public class ClosedJack1_4 extends AbstractMultiPartComponent { return VisibilityPolicy.NEVER; } - @EditableProperty - @Override - public String getValue() { - return value; - } - - @Override - public void setValue(String value) { - this.value = value; - } - - @EditableProperty - public JackType getType() { + @EditableProperty(name = "Type") + public JackType getValue() { return type; } - public void setType(JackType type) { + public void setValue(JackType type) { this.type = type; updateControlPoints(); } diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/NeutrikJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/NeutrikJack1_4.java index 7853409a..80ef700b 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/NeutrikJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/NeutrikJack1_4.java @@ -57,7 +57,7 @@ import org.diylc.utils.Constants; description = "1/4\" mono/stereo phono jack based on Neutrik NMJx series, PCB or Panel-mount", zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J", autoEdit = false, transformer = NeutrikJack1_4Transformer.class, enableCache = true) -public class NeutrikJack1_4 extends AbstractMultiPartComponent { +public class NeutrikJack1_4 extends AbstractMultiPartComponent { private static final long serialVersionUID = 1L; @@ -81,7 +81,10 @@ public class NeutrikJack1_4 extends AbstractMultiPartComponent { private Mount mount = Mount.Panel; private Orientation orientation = Orientation.DEFAULT; transient private Area[] body; - private String value = ""; + @SuppressWarnings("unused") + @Deprecated + private transient String value = ""; + public NeutrikJack1_4() { super(); @@ -330,23 +333,12 @@ public class NeutrikJack1_4 extends AbstractMultiPartComponent { return VisibilityPolicy.NEVER; } - @EditableProperty - @Override - public String getValue() { - return value; - } - - @Override - public void setValue(String value) { - this.value = value; - } - - @EditableProperty - public JackType getType() { + @EditableProperty(name = "Type") + public JackType getValue() { return type; } - public void setType(JackType type) { + public void setValue(JackType type) { this.type = type; updateControlPoints(); } diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java index e3daae3e..15a6a013 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_4.java @@ -51,11 +51,12 @@ import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; +import org.diylc.components.electromechanical.OpenJack1_4.OpenJackType; @ComponentDescriptor(name = "Open 1/4\" Jack", category = "Electro-Mechanical", author = "Branislav Stojkovic", description = "Switchcraft-style open panel mount 1/4\" phono jack, stereo and mono", zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J", enableCache = true) -public class OpenJack1_4 extends AbstractMultiPartComponent { +public class OpenJack1_4 extends AbstractMultiPartComponent { private static final float FONT_SCALE = 0.8f; private static final double RING_THETA = Math.PI * 0.795; @@ -76,7 +77,9 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { private static Size HOLE_DIAMETER = new Size(0.05d, SizeUnit.in); private static Size HOLE_TO_EDGE = new Size(0.063d, SizeUnit.in); - private String value = ""; + @SuppressWarnings("unused") + @Deprecated + private transient String value = ""; private Point2D[] controlPoints = new Point2D[] {new Point2D.Double(0, 0), new Point2D.Double(0, 0), new Point2D.Double(0, 0)}; transient Area[] body; @Deprecated @@ -163,8 +166,8 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { int holeToEdge = (int) HOLE_TO_EDGE.convertToPixels(); double centerY = controlPoints[0].getY() + springLength - holeToEdge; Point2D tipLabel = new Point2D.Double(controlPoints[0].getX(), (int) (controlPoints[0].getY() + holeToEdge * 1.25)); - AffineTransform ringTransform = AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, controlPoints[0].getX(), centerY); - AffineTransform sleeveTransform = AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, controlPoints[0].getX(), centerY); + AffineTransform ringTransform = AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, controlPoints[0].getX(), centerY); + AffineTransform sleeveTransform = AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, controlPoints[0].getX(), centerY); Point2D ringOrSwitchLabel = new Point2D.Double(0, 0); Point2D sleeveLabel = new Point2D.Double(0, 0); ringTransform.transform(tipLabel, ringOrSwitchLabel); @@ -178,9 +181,9 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { } StringUtils.drawCenteredText(g2d, "T", tipLabel.getX(), tipLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); StringUtils.drawCenteredText(g2d, "S", sleeveLabel.getX(), sleeveLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); - if (getType() == OpenJackType.STEREO) + if (getValue() == OpenJackType.STEREO) StringUtils.drawCenteredText(g2d, "R", ringOrSwitchLabel.getX(), ringOrSwitchLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); - if (getType() == OpenJackType.SWITCHED) + if (getValue() == OpenJackType.SWITCHED) StringUtils.drawCenteredText(g2d, "Sw", ringOrSwitchLabel.getX(), ringOrSwitchLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); } @@ -225,7 +228,7 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { springWidth, springWidth)); sleeve.subtract(new Area(new Ellipse2D.Double(x - holeDiameter / 2, y - holeDiameter / 2, holeDiameter, holeDiameter))); - sleeve.transform(AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY)); + sleeve.transform(AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY)); sleeve.add(new Area(new Ellipse2D.Double(x - ringDiameter / 2, centerY - ringDiameter / 2, ringDiameter, ringDiameter))); sleeve.subtract(new Area(new Ellipse2D.Double(x - innerDiameter / 2, centerY - innerDiameter / 2, innerDiameter, @@ -233,13 +236,13 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { body[2] = sleeve; - if (getType() != OpenJackType.MONO) { + if (getValue() != OpenJackType.MONO) { Area ringOrSwitch = new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength, springWidth, springWidth)); ringOrSwitch.subtract(new Area(new Ellipse2D.Double(x - holeDiameter / 2, y - holeDiameter / 2, holeDiameter, holeDiameter))); - ringOrSwitch.transform(AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY)); + ringOrSwitch.transform(AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY)); ringOrSwitch.subtract(new Area(new Ellipse2D.Double(x - outerDiameter / 2, centerY - outerDiameter / 2, outerDiameter, outerDiameter))); @@ -272,8 +275,8 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { double centerY = y + springLength - holeToEdge; - AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY).transform(controlPoints[0], controlPoints[1]); - AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY).transform(controlPoints[0], controlPoints[2]); + AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY).transform(controlPoints[0], controlPoints[1]); + AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY).transform(controlPoints[0], controlPoints[2]); // Rotate if needed if (getTheta() != 0) { @@ -337,7 +340,7 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { @Override public boolean isControlPointSticky(int index) { - return index < 2 || (getType() == OpenJackType.STEREO || getType() == OpenJackType.SWITCHED); + return index < 2 || (getValue() == OpenJackType.STEREO || getValue() == OpenJackType.SWITCHED); } @Override @@ -351,16 +354,6 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { // Invalidate the body body = null; } - - @Override - public String getValue() { - return value; - } - - @Override - public void setValue(String value) { - this.value = value; - } @EditableProperty public Integer getAngle() { @@ -384,12 +377,12 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { return Math.toRadians(getAngle()); } - @EditableProperty - public OpenJackType getType() { + @EditableProperty(name = "Type") + public OpenJackType getValue() { return type; } - public void setType(OpenJackType type) { + public void setValue(OpenJackType type) { this.type = type; updateControlPoints(); // Invalidate the body @@ -411,9 +404,9 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { return "Tip"; if (index == 1) return "Sleeve"; - if (index == 2 && getType() == OpenJackType.STEREO) + if (index == 2 && getValue() == OpenJackType.STEREO) return "Ring"; - if (index == 2 && getType() == OpenJackType.SWITCHED) + if (index == 2 && getValue() == OpenJackType.SWITCHED) return "Shunt"; return null; } @@ -423,7 +416,7 @@ public class OpenJack1_4 extends AbstractMultiPartComponent { return false; } - public enum OpenJackType { + public static enum OpenJackType { MONO, STEREO, SWITCHED; diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java index e7b08966..9d532d4e 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/OpenJack1_8.java @@ -51,11 +51,12 @@ import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; import org.diylc.utils.Constants; +import org.diylc.components.electromechanical.OpenJack1_8.OpenJackType; @ComponentDescriptor(name = "Open 1/8\" Jack", category = "Electro-Mechanical", author = "Branislav Stojkovic", description = "Switchcraft-style open panel mount 1/8\" phono jack, stereo and mono", zOrder = IDIYComponent.COMPONENT, instanceNamePrefix = "J", enableCache = true) -public class OpenJack1_8 extends AbstractMultiPartComponent { +public class OpenJack1_8 extends AbstractMultiPartComponent { private static final float FONT_SCALE = 0.6f; private static final double RING_THETA = Math.PI * 0.795; @@ -76,7 +77,9 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { private static Size HOLE_DIAMETER = new Size(0.025d, SizeUnit.in); private static Size HOLE_TO_EDGE = new Size(0.0315d, SizeUnit.in); - private String value = ""; + @SuppressWarnings("unused") + @Deprecated + private transient String value = ""; private Point2D[] controlPoints = new Point2D[] {new Point2D.Double(0, 0), new Point2D.Double(0, 0), new Point2D.Double(0, 0)}; transient Area[] body; @Deprecated @@ -163,8 +166,8 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { int holeToEdge = (int) HOLE_TO_EDGE.convertToPixels(); double centerY = controlPoints[0].getY() + springLength - holeToEdge; Point2D tipLabel = new Point2D.Double(controlPoints[0].getX(), (int) (controlPoints[0].getY() + holeToEdge * 1.25)); - AffineTransform ringTransform = AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, controlPoints[0].getX(), centerY); - AffineTransform sleeveTransform = AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, controlPoints[0].getX(), centerY); + AffineTransform ringTransform = AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, controlPoints[0].getX(), centerY); + AffineTransform sleeveTransform = AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, controlPoints[0].getX(), centerY); Point2D ringOrSwitchLabel = new Point2D.Double(0, 0); Point2D sleeveLabel = new Point2D.Double(0, 0); ringTransform.transform(tipLabel, ringOrSwitchLabel); @@ -178,9 +181,9 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { } StringUtils.drawCenteredText(g2d, "T", tipLabel.getX(), tipLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); StringUtils.drawCenteredText(g2d, "S", sleeveLabel.getX(), sleeveLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); - if (getType() == OpenJackType.STEREO) + if (getValue() == OpenJackType.STEREO) StringUtils.drawCenteredText(g2d, "R", ringOrSwitchLabel.getX(), ringOrSwitchLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); - if (getType() == OpenJackType.SWITCHED) + if (getValue() == OpenJackType.SWITCHED) StringUtils.drawCenteredText(g2d, "Sw", ringOrSwitchLabel.getX(), ringOrSwitchLabel.getY(), HorizontalAlignment.CENTER, VerticalAlignment.CENTER); } @@ -225,7 +228,7 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { springWidth, springWidth)); sleeve.subtract(new Area(new Ellipse2D.Double(x - holeDiameter / 2, y - holeDiameter / 2, holeDiameter, holeDiameter))); - sleeve.transform(AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY)); + sleeve.transform(AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY)); sleeve.add(new Area(new Ellipse2D.Double(x - ringDiameter / 2, centerY - ringDiameter / 2, ringDiameter, ringDiameter))); sleeve.subtract(new Area(new Ellipse2D.Double(x - innerDiameter / 2, centerY - innerDiameter / 2, innerDiameter, @@ -233,13 +236,13 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { body[2] = sleeve; - if (getType() != OpenJackType.MONO) { + if (getValue() != OpenJackType.MONO) { Area ringOrSwitch = new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength, springWidth, springWidth)); ringOrSwitch.subtract(new Area(new Ellipse2D.Double(x - holeDiameter / 2, y - holeDiameter / 2, holeDiameter, holeDiameter))); - ringOrSwitch.transform(AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY)); + ringOrSwitch.transform(AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY)); ringOrSwitch.subtract(new Area(new Ellipse2D.Double(x - outerDiameter / 2, centerY - outerDiameter / 2, outerDiameter, outerDiameter))); @@ -272,8 +275,8 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { double centerY = y + springLength - holeToEdge; - AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY).transform(controlPoints[0], controlPoints[1]); - AffineTransform.getRotateInstance(getType() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY).transform(controlPoints[0], controlPoints[2]); + AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY).transform(controlPoints[0], controlPoints[1]); + AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY).transform(controlPoints[0], controlPoints[2]); // Rotate if needed if (getTheta() != 0) { @@ -337,7 +340,7 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { @Override public boolean isControlPointSticky(int index) { - return index < 2 || (getType() == OpenJackType.STEREO || getType() == OpenJackType.SWITCHED); + return index < 2 || (getValue() == OpenJackType.STEREO || getValue() == OpenJackType.SWITCHED); } @Override @@ -352,16 +355,6 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { body = null; } - @Override - public String getValue() { - return value; - } - - @Override - public void setValue(String value) { - this.value = value; - } - @EditableProperty public Integer getAngle() { if (angle == null || (orientation != null && orientation != Orientation.DEFAULT)) { @@ -384,12 +377,12 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { return Math.toRadians(getAngle()); } - @EditableProperty - public OpenJackType getType() { + @EditableProperty(name = "Type") + public OpenJackType getValue() { return type; } - public void setType(OpenJackType type) { + public void setValue(OpenJackType type) { this.type = type; updateControlPoints(); // Invalidate the body @@ -411,9 +404,9 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { return "Tip"; if (index == 1) return "Sleeve"; - if (index == 2 && getType() == OpenJackType.STEREO) + if (index == 2 && getValue() == OpenJackType.STEREO) return "Ring"; - if (index == 2 && getType() == OpenJackType.SWITCHED) + if (index == 2 && getValue() == OpenJackType.SWITCHED) return "Shunt"; return null; } @@ -423,7 +416,7 @@ public class OpenJack1_8 extends AbstractMultiPartComponent { return false; } - public enum OpenJackType { + static enum OpenJackType { MONO, STEREO, SWITCHED; diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 83ee75c5..0584a8f8 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 ee133b33..b3dfe89c 100644 Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ