diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/Dot.java b/diylc/diylc-library/src/org/diylc/components/connectivity/Dot.java index 9b783086..20899355 100644 --- a/diylc/diylc-library/src/org/diylc/components/connectivity/Dot.java +++ b/diylc/diylc-library/src/org/diylc/components/connectivity/Dot.java @@ -15,7 +15,6 @@ import org.diylc.core.annotations.ComponentDescriptor; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; import org.diylc.core.measures.SizeUnit; -import org.diylc.utils.Constants; @ComponentDescriptor(name = "Dot", category = "Connectivity", author = "Branislav Stojkovic", description = "Connector dot", instanceNamePrefix = "Dot", stretchable = false, zOrder = IDIYComponent.COMPONENT, diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/BatterySnap9V.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/BatterySnap9V.java index 6a150ef2..8fefea5a 100644 --- a/diylc/diylc-library/src/org/diylc/components/electromechanical/BatterySnap9V.java +++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/BatterySnap9V.java @@ -89,6 +89,7 @@ public class BatterySnap9V extends AbstractTransparentComponent { g2d.draw(body[2]); } + @SuppressWarnings("incomplete-switch") public Shape[] getBody() { if (body == null) { body = new Shape[3]; diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java b/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java index 49dd0681..10d7c12d 100644 --- a/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java +++ b/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java @@ -117,6 +117,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent { VerticalAlignment.CENTER); } + @SuppressWarnings("incomplete-switch") public Shape[] getBody() { if (body == null) { body = new Shape[4]; diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitch.java b/diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitch.java index de67c614..3e93c8a6 100644 --- a/diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitch.java +++ b/diylc/diylc-library/src/org/diylc/components/guitar/LeverSwitch.java @@ -115,6 +115,7 @@ public class LeverSwitch extends AbstractTransparentComponent { g2d.draw(body[2]); } + @SuppressWarnings("incomplete-switch") public Shape[] getBody() { if (body == null) { body = new Shape[3]; @@ -199,6 +200,7 @@ public class LeverSwitch extends AbstractTransparentComponent { return body; } + @SuppressWarnings("incomplete-switch") private void updateControlPoints() { int x = controlPoints[0].x; int y = controlPoints[0].y; diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java b/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java index 120d0e91..6d5a76da 100644 --- a/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java +++ b/diylc/diylc-library/src/org/diylc/components/guitar/SingleCoilPickup.java @@ -113,6 +113,7 @@ public class SingleCoilPickup extends AbstractTransparentComponent { VerticalAlignment.CENTER); } + @SuppressWarnings("incomplete-switch") public Shape[] getBody() { if (body == null) { body = new Shape[3]; diff --git a/diylc/diylc-library/src/org/diylc/components/misc/Label.java b/diylc/diylc-library/src/org/diylc/components/misc/Label.java index 7b23a6a5..5b3e35b4 100644 --- a/diylc/diylc-library/src/org/diylc/components/misc/Label.java +++ b/diylc/diylc-library/src/org/diylc/components/misc/Label.java @@ -33,12 +33,14 @@ public class Label extends AbstractComponent { private String text = DEFAULT_TEXT; private Font font = LABEL_FONT; private Color color = LABEL_COLOR; + @SuppressWarnings("unused") @Deprecated private boolean center; private HorizontalAlignment horizontalAlignment = HorizontalAlignment.CENTER; private VerticalAlignment verticalAlignment = VerticalAlignment.CENTER; private Orientation orientation = Orientation.DEFAULT; + @SuppressWarnings("incomplete-switch") @Override public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project, IDrawingObserver drawingObserver) { diff --git a/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java b/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java index d2bf3e68..6f623f04 100644 --- a/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java +++ b/diylc/diylc-library/src/org/diylc/components/misc/PCBText.java @@ -40,6 +40,7 @@ public class PCBText extends AbstractComponent { private VerticalAlignment verticalAlignment = VerticalAlignment.CENTER; private Orientation orientation = Orientation.DEFAULT; + @SuppressWarnings("incomplete-switch") @Override public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project, IDrawingObserver drawingObserver) { diff --git a/diylc/diylc-library/src/org/diylc/components/passive/TrimmerPotentiometer.java b/diylc/diylc-library/src/org/diylc/components/passive/TrimmerPotentiometer.java index 9578840c..2a87f4b3 100644 --- a/diylc/diylc-library/src/org/diylc/components/passive/TrimmerPotentiometer.java +++ b/diylc/diylc-library/src/org/diylc/components/passive/TrimmerPotentiometer.java @@ -53,7 +53,7 @@ public class TrimmerPotentiometer extends AbstractPotentiometer { protected Color bodyColor = BODY_COLOR; protected Color borderColor = BORDER_COLOR; - protected static Display display = DISPLAY; + protected Display display = DISPLAY; // Array of 7 elements: 3 lug connectors, 1 pot body and 3 lugs transient protected Shape[] body = null; @@ -327,7 +327,7 @@ public class TrimmerPotentiometer extends AbstractPotentiometer { int y = (panelHeight - textHeight) / 2 + fontMetrics.getAscent(); String label = ""; - label = (getDisplay() == Display.NAME) ? getName() : getValue().toString(); + label = (getDisplay() == Display.NAME) ? getName() : (getValue() == null ? "" : getValue().toString()); if (getDisplay() == Display.NONE) { label = ""; } @@ -387,7 +387,7 @@ public class TrimmerPotentiometer extends AbstractPotentiometer { @EditableProperty public Display getDisplay() { if (display == null) { - display = Display.VALUE; + display = DISPLAY; } return display; } diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java index 70fafce2..9951d21d 100644 --- a/diylc/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java +++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/AbstractTransistorSymbol.java @@ -52,7 +52,7 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent if (checkPointsClipped(g2d.getClip())) { return; } - int pinSpacing = (int) PIN_SPACING.convertToPixels(); + Color finalColor; if (componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING) { finalColor = SELECTION_COLOR; @@ -67,9 +67,6 @@ public abstract class AbstractTransistorSymbol extends AbstractComponent // Draw transistor - int x = controlPoints[0].x; - int y = controlPoints[0].y; - Shape[] body = getBody(); int rotation = 0; diff --git a/diylc/diylc-library/src/org/diylc/components/shapes/AbstractShape.java b/diylc/diylc-library/src/org/diylc/components/shapes/AbstractShape.java index c67d1ac6..7295c973 100644 --- a/diylc/diylc-library/src/org/diylc/components/shapes/AbstractShape.java +++ b/diylc/diylc-library/src/org/diylc/components/shapes/AbstractShape.java @@ -1,16 +1,9 @@ package org.diylc.components.shapes; -import java.awt.AlphaComposite; import java.awt.Color; -import java.awt.Composite; -import java.awt.Graphics2D; import java.awt.Point; -import org.diylc.common.ObjectCache; import org.diylc.components.AbstractTransparentComponent; -import org.diylc.core.ComponentState; -import org.diylc.core.IDrawingObserver; -import org.diylc.core.Project; import org.diylc.core.VisibilityPolicy; import org.diylc.core.annotations.EditableProperty; import org.diylc.core.measures.Size; diff --git a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java index e7aef6aa..d36c67af 100644 --- a/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java +++ b/diylc/diylc-swing/src/org/diylc/DIYLCStarter.java @@ -3,7 +3,6 @@ package org.diylc; import java.io.File; import java.io.FileInputStream; import java.net.URL; -import java.util.Arrays; import java.util.Properties; import javax.swing.JOptionPane; @@ -13,7 +12,6 @@ import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; import org.diylc.appframework.miscutils.ConfigurationManager; import org.diylc.appframework.miscutils.PropertyInjector; -import org.diylc.appframework.miscutils.Utils; import org.diylc.presenter.Presenter; import org.diylc.swing.gui.MainFrame; import org.diylc.swing.gui.TemplateDialog; diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml index a8d1a129..065daab3 100644 --- a/diylc/diylc-swing/update.xml +++ b/diylc/diylc-swing/update.xml @@ -1353,7 +1353,11 @@ IMPROVEMENT Auto save and recovery made a bit smarter - + + + BUG_FIX + Changing Display to one trimmer affects all trimmers and does not get saved to the file + https://github.com/bancika/diy-layout-creator/releases