diff --git a/core/src/de/congrace/exp4j/Example.java b/core/src/de/congrace/exp4j/Example.java index 0d70b0b09..44d64fb2a 100644 --- a/core/src/de/congrace/exp4j/Example.java +++ b/core/src/de/congrace/exp4j/Example.java @@ -22,7 +22,8 @@ public class Example { // A function which calculates the mean of an array and scales it CustomFunction meanFn = new CustomFunction("mean",2) { - public Variable applyFunction(List vars) { + @Override + public Variable applyFunction(List vars) { double[] vals; double scale; diff --git a/core/src/de/congrace/exp4j/PostfixExpression.java b/core/src/de/congrace/exp4j/PostfixExpression.java index 0bbcc1426..ceb0784c0 100644 --- a/core/src/de/congrace/exp4j/PostfixExpression.java +++ b/core/src/de/congrace/exp4j/PostfixExpression.java @@ -100,6 +100,7 @@ public final class PostfixExpression extends AbstractExpression implements Calcu /** * delegate the calculation of a simple expression */ + @Override public Variable calculate() throws IllegalArgumentException { final Stack stack = new Stack(); @@ -110,6 +111,7 @@ public final class PostfixExpression extends AbstractExpression implements Calcu } + @Override public void setVariable(Variable value) { variables.add(value); } diff --git a/core/src/de/congrace/exp4j/Variable.java b/core/src/de/congrace/exp4j/Variable.java index 0030e70b9..378b2bdce 100644 --- a/core/src/de/congrace/exp4j/Variable.java +++ b/core/src/de/congrace/exp4j/Variable.java @@ -91,6 +91,7 @@ public class Variable { return start; } + @Override public String toString(){ if ( arrayValue.length > 1 ){ String out = name + " is Array (length " + new Integer(arrayValue.length).toString() + ") : {"; diff --git a/core/src/de/congrace/exp4j/VariableSet.java b/core/src/de/congrace/exp4j/VariableSet.java index f567006fe..674c51a62 100644 --- a/core/src/de/congrace/exp4j/VariableSet.java +++ b/core/src/de/congrace/exp4j/VariableSet.java @@ -4,11 +4,7 @@ import java.util.HashSet; public class VariableSet extends HashSet { - /** - * - */ - private static final long serialVersionUID = -4212803364398351279L; - + @Override public boolean add(Variable v){ Variable previous = getVariableNamed(v.getName()); if ( previous != null ){ diff --git a/core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java b/core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java index 65ae08506..630cf3639 100644 --- a/core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java +++ b/core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java @@ -9,11 +9,11 @@ import net.sf.openrocket.appearance.DecalImage; import net.sf.openrocket.util.StateChangeListener; -class ResourceDecalImage implements DecalImage { +public class ResourceDecalImage implements DecalImage { final String resource; - ResourceDecalImage(final String resource) { + public ResourceDecalImage(final String resource) { this.resource = resource; } diff --git a/core/src/net/sf/openrocket/document/DecalRegistry.java b/core/src/net/sf/openrocket/document/DecalRegistry.java index 5cc2a9418..b96cafba9 100644 --- a/core/src/net/sf/openrocket/document/DecalRegistry.java +++ b/core/src/net/sf/openrocket/document/DecalRegistry.java @@ -25,11 +25,7 @@ import net.sf.openrocket.util.ChangeSource; import net.sf.openrocket.util.FileUtils; import net.sf.openrocket.util.StateChangeListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class DecalRegistry { - private static Logger log = LoggerFactory.getLogger(DecalRegistry.class); DecalRegistry() { } @@ -116,6 +112,7 @@ public class DecalRegistry { this.delegate = delegate; } + @Override public String getName() { return name != null ? name : delegate.getName(); } @@ -133,6 +130,7 @@ public class DecalRegistry { * @throws FileNotFoundException * @throws IOException */ + @Override public InputStream getBytes() throws FileNotFoundException, IOException { // First check if the decal is located on the file system File exportedFile = getFileSystemLocation(); diff --git a/core/src/net/sf/openrocket/file/GeneralRocketLoader.java b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java index 8f487337b..f4e094328 100644 --- a/core/src/net/sf/openrocket/file/GeneralRocketLoader.java +++ b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java @@ -147,7 +147,6 @@ public class GeneralRocketLoader { // Check for ZIP (for future compatibility) if (buffer[0] == ZIP_SIGNATURE[0] && buffer[1] == ZIP_SIGNATURE[1]) { - OpenRocketDocument doc; isContainer = true; setAttachmentFactory(); // Search for entry with name *.ork @@ -159,11 +158,11 @@ public class GeneralRocketLoader { } if (entry.getName().matches(".*\\.[oO][rR][kK]$")) { loadRocket(in); - return; } else if (entry.getName().matches(".*\\.[rR][kK][tT]$")) { loadRocket(in); - return; } + in.close(); + return; } } diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java index a7eb8ec08..d9e3f27a3 100644 --- a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java @@ -18,20 +18,11 @@ import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.StorageOptions; import net.sf.openrocket.file.RocketSaver; -import net.sf.openrocket.rocketcomponent.AxialStage; -import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent; -import net.sf.openrocket.rocketcomponent.FinSet; -import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent; -import net.sf.openrocket.rocketcomponent.FlightConfiguration; -import net.sf.openrocket.rocketcomponent.FlightConfigurationId; -import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.ParallelStage; import net.sf.openrocket.rocketcomponent.PodSet; import net.sf.openrocket.rocketcomponent.RailButton; -import net.sf.openrocket.rocketcomponent.RecoveryDevice; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.rocketcomponent.TubeCoupler; import net.sf.openrocket.rocketcomponent.TubeFinSet; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightDataBranch; @@ -43,7 +34,6 @@ import net.sf.openrocket.simulation.extension.SimulationExtension; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.Config; -import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Reflection; import net.sf.openrocket.util.TextUtil; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java index ba6399239..890c85af0 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java @@ -10,12 +10,9 @@ import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; -import net.sf.openrocket.optimization.rocketoptimization.OptimizableParameter; import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.FlightConfigurationId; -import net.sf.openrocket.rocketcomponent.FlightConfigurableParameterSet; import net.sf.openrocket.rocketcomponent.Rocket; -import net.sf.openrocket.util.Named; class MotorConfigurationHandler extends AbstractElementHandler { @SuppressWarnings("unused") diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java index a43e1c66a..23cc2f6e4 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java @@ -127,8 +127,7 @@ class NoseConeHandler extends BaseHandler { if (noseCone.isFilled()) { noseCone.setAftShoulderThickness(noseCone.getAftShoulderRadius()); - } - else { + } else { noseCone.setThickness(thickness); noseCone.setAftShoulderThickness(thickness); } @@ -149,6 +148,7 @@ class NoseConeHandler extends BaseHandler { * * @return BULK */ + @Override public Material.Type getMaterialType() { return Material.Type.BULK; } diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java index aea6bff32..4b138fa78 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java @@ -9,7 +9,6 @@ import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RocksimCommonConstants; import net.sf.openrocket.file.rocksim.RocksimLocationMode; -import net.sf.openrocket.rocketcomponent.RadiusRingComponent; import net.sf.openrocket.rocketcomponent.RocketComponent; import org.xml.sax.SAXException; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java index e02353e7f..7d2a7cb4d 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java @@ -153,6 +153,7 @@ class TransitionHandler extends BaseHandler { * * @return BULK */ + @Override public Material.Type getMaterialType() { return Material.Type.BULK; } diff --git a/core/src/net/sf/openrocket/material/Material.java b/core/src/net/sf/openrocket/material/Material.java index 055fc336b..fd311d3fe 100644 --- a/core/src/net/sf/openrocket/material/Material.java +++ b/core/src/net/sf/openrocket/material/Material.java @@ -23,7 +23,8 @@ public abstract class Material implements Comparable { public enum Type { LINE("Databases.materials.types.Line", UnitGroup.UNITS_DENSITY_LINE), SURFACE("Databases.materials.types.Surface", UnitGroup.UNITS_DENSITY_SURFACE), - BULK("Databases.materials.types.Bulk", UnitGroup.UNITS_DENSITY_BULK); + BULK("Databases.materials.types.Bulk", UnitGroup.UNITS_DENSITY_BULK), + CUSTOM("Databases.materials.types.Custom", UnitGroup.UNITS_DENSITY_BULK); private final String name; private final UnitGroup units; @@ -85,6 +86,18 @@ public abstract class Material implements Comparable { } } + + public static class Custom extends Material { + Custom(String name, double density, boolean userDefined) { + super(name, density, userDefined); + } + + @Override + public Type getType() { + return Type.CUSTOM; + } + } + private final String name; @@ -187,6 +200,9 @@ public abstract class Material implements Comparable { case BULK: return new Material.Bulk(name, density, userDefined); + + case CUSTOM: + return new Material.Custom(name, density, userDefined); default: throw new IllegalArgumentException("Unknown material type: " + type); diff --git a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java index 441997ef6..b54949399 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java @@ -7,7 +7,6 @@ import net.sf.openrocket.material.Material; import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.Coordinate; /** * Class of components with well-defined physical appearance and which have an effect on diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurableParameter.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurableParameter.java index 9f6c22e61..a2ca64200 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurableParameter.java +++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurableParameter.java @@ -1,6 +1,5 @@ package net.sf.openrocket.rocketcomponent; -import net.sf.openrocket.util.ChangeSource; /** * Interface for a parameter object that can be configured per diff --git a/core/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java index 8f67e3e09..d077f5616 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RadiusRingComponent.java @@ -33,7 +33,6 @@ public abstract class RadiusRingComponent extends RingComponent implements Coaxi @Override public double getOuterRadius() { if (outerRadiusAutomatic && getParent() instanceof RadialParent) { - RocketComponent parent = getParent(); double pos1 = this.toRelative(Coordinate.NUL, parent)[0].x; double pos2 = this.toRelative(new Coordinate(getLength()), parent)[0].x; pos1 = MathUtil.clamp(pos1, 0, parent.getLength()); diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java index 93e560925..8fa36cbf7 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java @@ -29,7 +29,7 @@ import net.sf.openrocket.util.UniqueID; * * @author Sampo Niskanen */ - +@SuppressWarnings("serial") public class Rocket extends RocketComponent { private static final Logger log = LoggerFactory.getLogger(Rocket.class); private static final Translator trans = Application.getTranslator(); diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java index 6321cfef9..633552048 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java @@ -1101,20 +1101,6 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab return this.position; } - /** - * @deprecated kept around as example code. instead use getLocations - * @return - */ - @Deprecated - private Coordinate getAbsoluteVector() { - if (null == this.parent) { - // == improperly initialized components OR the root Rocket instance - return Coordinate.ZERO; - } else { - return this.getAbsoluteVector().add(this.getOffset()); - } - } - /** * Returns coordinates of this component's instances in relation to this.parent. *

diff --git a/core/src/net/sf/openrocket/rocketcomponent/Sleeve.java b/core/src/net/sf/openrocket/rocketcomponent/Sleeve.java index f6f342c60..aafff5422 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Sleeve.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Sleeve.java @@ -49,7 +49,6 @@ public class Sleeve extends RingComponent { public double getInnerRadius() { // Implement parent inner radius automation if (isInnerRadiusAutomatic() && getParent() instanceof RadialParent) { - RocketComponent parent = getParent(); double pos1 = this.toRelative(Coordinate.NUL, parent)[0].x; double pos2 = this.toRelative(new Coordinate(getLength()), parent)[0].x; pos1 = MathUtil.clamp(pos1, 0, parent.getLength()); diff --git a/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java index 6a29e344e..6c5ff1852 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java +++ b/core/src/net/sf/openrocket/rocketcomponent/StageSeparationConfiguration.java @@ -1,14 +1,9 @@ package net.sf.openrocket.rocketcomponent; -import java.util.EventObject; -import java.util.List; - import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.MathUtil; -import net.sf.openrocket.util.StateChangeListener; public class StageSeparationConfiguration implements FlightConfigurableParameter { diff --git a/core/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java b/core/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java index c2d0a9bd4..84dd93767 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/ThicknessRingComponent.java @@ -38,7 +38,6 @@ public abstract class ThicknessRingComponent extends RingComponent { @Override public double getOuterRadius() { if (isOuterRadiusAutomatic() && getParent() instanceof RadialParent) { - RocketComponent parent = getParent(); double pos1 = this.toRelative(Coordinate.NUL, parent)[0].x; double pos2 = this.toRelative(new Coordinate(getLength()), parent)[0].x; pos1 = MathUtil.clamp(pos1, 0, parent.getLength()); diff --git a/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java b/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java index 033f9bdc8..aa103a080 100644 --- a/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java +++ b/core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java @@ -6,8 +6,6 @@ import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.masscalc.MassCalculator.MassCalcType; import net.sf.openrocket.masscalc.MassData; import net.sf.openrocket.models.atmosphere.AtmosphericConditions; -import net.sf.openrocket.motor.MotorConfiguration; -import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.listeners.SimulationListenerHelper; import net.sf.openrocket.util.BugException; diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index 61d6f16d7..6319b5574 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -21,7 +21,6 @@ import net.sf.openrocket.rocketcomponent.MotorMount; import net.sf.openrocket.rocketcomponent.RecoveryDevice; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration; -import net.sf.openrocket.simulation.FlightEvent.Type; import net.sf.openrocket.simulation.exception.MotorIgnitionException; import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.exception.SimulationLaunchException; diff --git a/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java index c1e240cd4..acde4dcb5 100644 --- a/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java +++ b/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java @@ -6,7 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import de.congrace.exp4j.Calculable; -import de.congrace.exp4j.ExpressionBuilder; import de.congrace.exp4j.Variable; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.logging.Markers; diff --git a/core/test/net/sf/openrocket/file/openrocket/importt/DocumentConfigTest.java b/core/test/net/sf/openrocket/file/openrocket/importt/DocumentConfigTest.java index b42aff9e9..526f5f4db 100644 --- a/core/test/net/sf/openrocket/file/openrocket/importt/DocumentConfigTest.java +++ b/core/test/net/sf/openrocket/file/openrocket/importt/DocumentConfigTest.java @@ -1,11 +1,6 @@ package net.sf.openrocket.file.openrocket.importt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.List; - import net.sf.openrocket.file.openrocket.OpenRocketSaver; import net.sf.openrocket.util.BaseTestCase.BaseTestCase; diff --git a/core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java b/core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java index c90673a68..e16ac3a6f 100644 --- a/core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java +++ b/core/test/net/sf/openrocket/motor/ThrustCurveMotorTest.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import net.sf.openrocket.simulation.MotorState; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Inertia; diff --git a/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java b/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java index 8c30c7476..92003d5b8 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/BooleanModel.java @@ -40,6 +40,7 @@ import net.sf.openrocket.util.StateChangeListener; * @author Sampo Niskanen */ public class BooleanModel extends AbstractAction implements StateChangeListener, Invalidatable { + private static final long serialVersionUID = -7299680391506320196L; private static final Logger log = LoggerFactory.getLogger(BooleanModel.class); private final ChangeSource source; diff --git a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java index f0e937345..5e8f430ab 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java @@ -5,6 +5,7 @@ import java.awt.event.MouseEvent; import javax.swing.JTable; import javax.swing.table.JTableHeader; +@SuppressWarnings("serial") public class ColumnTable extends JTable { public ColumnTable( ColumnTableModel model ) { diff --git a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java index 31827b6f7..38f915bcb 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java @@ -6,6 +6,7 @@ import javax.swing.table.TableColumnModel; import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public abstract class ColumnTableModel extends AbstractTableModel { private final Column[] columns; diff --git a/swing/src/net/sf/openrocket/gui/adaptors/DecalModel.java b/swing/src/net/sf/openrocket/gui/adaptors/DecalModel.java index 28bf50aad..5880d564d 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/DecalModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/DecalModel.java @@ -16,13 +16,15 @@ import net.sf.openrocket.file.FileSystemAttachmentFactory; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; +import net.sf.openrocket.appearance.defaults.ResourceDecalImage; -public class DecalModel extends AbstractListModel implements ComboBoxModel { - +public class DecalModel extends AbstractListModel implements ComboBoxModel { + private static final long serialVersionUID = -3922419344990421156L; private static final Translator trans = Application.getTranslator(); - private static final String NONE_SELECTED = trans.get("lbl.select"); - private static final String SELECT_FILE = trans.get("lbl.choose"); + private static final ResourceDecalImage NONE_SELECTED = new ResourceDecalImage(trans.get("lbl.select")); + + private static final ResourceDecalImage SELECT_FILE = new ResourceDecalImage(trans.get("lbl.choose")); private final OpenRocketDocument document; private final Component parent; @@ -45,7 +47,7 @@ public class DecalModel extends AbstractListModel implements ComboBoxModel { } @Override - public Object getElementAt(int index) { + public DecalImage getElementAt(int index) { if (index <= 0) { return NONE_SELECTED; } diff --git a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java index 1b8551259..e6fd328fa 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java @@ -64,6 +64,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat * This is still the design, but now extends AbstractSpinnerModel to allow other characters * to be entered so that fractional units and expressions can be used. */ + @SuppressWarnings("serial") public class ValueSpinnerModel extends AbstractSpinnerModel implements Invalidatable { private ExpressionParser parser = new ExpressionParser(); @@ -443,6 +444,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat //////////// Action model //////////// + @SuppressWarnings("serial") private class AutomaticActionModel extends AbstractAction implements StateChangeListener, Invalidatable { private boolean oldValue = false; diff --git a/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java b/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java index f4f6ba95f..0ed7fe5cc 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/MaterialModel.java @@ -19,10 +19,12 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Reflection; -public class MaterialModel extends AbstractListModel implements - ComboBoxModel, ComponentChangeListener, DatabaseListener { - - private final String custom; +public class MaterialModel extends AbstractListModel implements + ComboBoxModel, ComponentChangeListener, DatabaseListener { + private static final long serialVersionUID = 4552478532933113655L; + + + private final Material custom; private final Component parentUIComponent; @@ -47,7 +49,7 @@ public class MaterialModel extends AbstractListModel implements this.parentUIComponent = parent; this.rocketComponent = component; this.type = type; - this.custom = trans.get ("Material.CUSTOM"); + this.custom = Material.newMaterial( Material.Type.CUSTOM, trans.get ("Material.CUSTOM"), 1.0, true ); switch (type) { case LINE: @@ -128,7 +130,7 @@ public class MaterialModel extends AbstractListModel implements } @Override - public Object getElementAt(int index) { + public Material getElementAt(int index) { if (index == database.size()) { return custom; } else if (index >= database.size()+1) { diff --git a/swing/src/net/sf/openrocket/gui/components/BasicSlider.java b/swing/src/net/sf/openrocket/gui/components/BasicSlider.java index 0ac92e790..6b182a45d 100644 --- a/swing/src/net/sf/openrocket/gui/components/BasicSlider.java +++ b/swing/src/net/sf/openrocket/gui/components/BasicSlider.java @@ -11,6 +11,7 @@ import javax.swing.plaf.basic.BasicSliderUI; * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class BasicSlider extends JSlider { public BasicSlider(BoundedRangeModel brm) { diff --git a/swing/src/net/sf/openrocket/gui/components/BasicTree.java b/swing/src/net/sf/openrocket/gui/components/BasicTree.java index 6ec8804e7..09d8b3d72 100644 --- a/swing/src/net/sf/openrocket/gui/components/BasicTree.java +++ b/swing/src/net/sf/openrocket/gui/components/BasicTree.java @@ -12,8 +12,8 @@ import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; +@SuppressWarnings("serial") public class BasicTree extends JTree { - public BasicTree() { super(); diff --git a/swing/src/net/sf/openrocket/gui/components/CollectionTable.java b/swing/src/net/sf/openrocket/gui/components/CollectionTable.java index ef14dc619..7e31e6cde 100644 --- a/swing/src/net/sf/openrocket/gui/components/CollectionTable.java +++ b/swing/src/net/sf/openrocket/gui/components/CollectionTable.java @@ -7,6 +7,7 @@ import javax.swing.table.AbstractTableModel; /* * TODO: LOW: This is currently unused. */ +@SuppressWarnings("serial") public abstract class CollectionTable extends JTable { private final String[] columnNames; diff --git a/swing/src/net/sf/openrocket/gui/components/ColorChooser.java b/swing/src/net/sf/openrocket/gui/components/ColorChooser.java index 3165e7996..3cc76dd41 100644 --- a/swing/src/net/sf/openrocket/gui/components/ColorChooser.java +++ b/swing/src/net/sf/openrocket/gui/components/ColorChooser.java @@ -24,6 +24,7 @@ import java.awt.event.ActionListener; * * The chosen color may be retrieved via a call to getCurrentColor. */ +@SuppressWarnings("serial") public class ColorChooser extends JPanel { private static final String COLOR_CHOOSER_BUTTON_LABEL = "Color"; diff --git a/swing/src/net/sf/openrocket/gui/components/ColorChooserButton.java b/swing/src/net/sf/openrocket/gui/components/ColorChooserButton.java index e0472b1ab..573f3b7ec 100644 --- a/swing/src/net/sf/openrocket/gui/components/ColorChooserButton.java +++ b/swing/src/net/sf/openrocket/gui/components/ColorChooserButton.java @@ -22,6 +22,7 @@ import net.sf.openrocket.logging.Markers; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class ColorChooserButton extends JButton { private static final Logger log = LoggerFactory.getLogger(ColorChooserButton.class); diff --git a/swing/src/net/sf/openrocket/gui/components/CsvOptionPanel.java b/swing/src/net/sf/openrocket/gui/components/CsvOptionPanel.java index cd979e16a..5a121d9ad 100644 --- a/swing/src/net/sf/openrocket/gui/components/CsvOptionPanel.java +++ b/swing/src/net/sf/openrocket/gui/components/CsvOptionPanel.java @@ -16,6 +16,7 @@ import net.sf.openrocket.startup.Preferences; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class CsvOptionPanel extends JPanel { private static final Translator trans = Application.getTranslator(); @@ -25,9 +26,9 @@ public class CsvOptionPanel extends JPanel { private final String baseClassName; - private final JComboBox fieldSeparator; + private final JComboBox fieldSeparator; private final JCheckBox[] options; - private final JComboBox commentCharacter; + private final JComboBox commentCharacter; /** * Sole constructor. @@ -57,7 +58,7 @@ public class CsvOptionPanel extends JPanel { label.setToolTipText(tip); panel.add(label, "gapright unrel"); - fieldSeparator = new JComboBox(new String[] { ",", ";", SPACE, TAB }); + fieldSeparator = new JComboBox(new String[] { ",", ";", SPACE, TAB }); fieldSeparator.setEditable(true); fieldSeparator.setSelectedItem(Application.getPreferences().getString(Preferences.EXPORT_FIELD_SEPARATOR, ",")); fieldSeparator.setToolTipText(tip); @@ -90,7 +91,7 @@ public class CsvOptionPanel extends JPanel { label.setToolTipText(tip); panel.add(label, "split 2, gapright unrel"); - commentCharacter = new JComboBox(new String[] { "#", "%", ";" }); + commentCharacter = new JComboBox(new String[] { "#", "%", ";" }); commentCharacter.setEditable(true); commentCharacter.setSelectedItem(Application.getPreferences().getString(Preferences.EXPORT_COMMENT_CHARACTER, "#")); commentCharacter.setToolTipText(tip); diff --git a/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java b/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java index 1e37bb6f2..2c68b129c 100644 --- a/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java +++ b/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java @@ -11,6 +11,7 @@ import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; +@SuppressWarnings("serial") public class DescriptionArea extends JScrollPane { private final JEditorPane editorPane; diff --git a/swing/src/net/sf/openrocket/gui/components/DoubleCellEditor.java b/swing/src/net/sf/openrocket/gui/components/DoubleCellEditor.java index 1602350ac..1ace761df 100644 --- a/swing/src/net/sf/openrocket/gui/components/DoubleCellEditor.java +++ b/swing/src/net/sf/openrocket/gui/components/DoubleCellEditor.java @@ -11,6 +11,7 @@ import javax.swing.table.TableCellEditor; import net.sf.openrocket.gui.SpinnerEditor; import net.sf.openrocket.gui.adaptors.DoubleModel; +@SuppressWarnings("serial") public class DoubleCellEditor extends AbstractCellEditor implements TableCellEditor { private final JSpinner editor; diff --git a/swing/src/net/sf/openrocket/gui/components/SimulationExportPanel.java b/swing/src/net/sf/openrocket/gui/components/SimulationExportPanel.java index 957dc2a5d..b3ed295b0 100644 --- a/swing/src/net/sf/openrocket/gui/components/SimulationExportPanel.java +++ b/swing/src/net/sf/openrocket/gui/components/SimulationExportPanel.java @@ -33,6 +33,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class SimulationExportPanel extends JPanel { private static final String SPACE = "SPACE"; diff --git a/swing/src/net/sf/openrocket/gui/components/UnitCellEditor.java b/swing/src/net/sf/openrocket/gui/components/UnitCellEditor.java index 2ff47abc0..328af39fc 100644 --- a/swing/src/net/sf/openrocket/gui/components/UnitCellEditor.java +++ b/swing/src/net/sf/openrocket/gui/components/UnitCellEditor.java @@ -23,10 +23,11 @@ import net.sf.openrocket.unit.UnitGroup; public abstract class UnitCellEditor extends AbstractCellEditor implements TableCellEditor, ActionListener { - private final JComboBox editor; + private static final long serialVersionUID = 8319509695751912662L; + private final JComboBox editor; public UnitCellEditor() { - editor = new JComboBox(); + editor = new JComboBox(); editor.setEditable(false); editor.addActionListener(this); } diff --git a/swing/src/net/sf/openrocket/gui/components/compass/CompassPointer.java b/swing/src/net/sf/openrocket/gui/components/compass/CompassPointer.java index 37fdad42e..315bc8550 100644 --- a/swing/src/net/sf/openrocket/gui/components/compass/CompassPointer.java +++ b/swing/src/net/sf/openrocket/gui/components/compass/CompassPointer.java @@ -17,6 +17,7 @@ import net.sf.openrocket.gui.adaptors.DoubleModel; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class CompassPointer extends CompassRose implements Resettable { private static final Color PRIMARY_POINTER_COLOR = new Color(1.0f, 0.2f, 0.2f); diff --git a/swing/src/net/sf/openrocket/gui/components/compass/CompassRose.java b/swing/src/net/sf/openrocket/gui/components/compass/CompassRose.java index 49f1d059e..68ed18535 100644 --- a/swing/src/net/sf/openrocket/gui/components/compass/CompassRose.java +++ b/swing/src/net/sf/openrocket/gui/components/compass/CompassRose.java @@ -20,6 +20,7 @@ import net.sf.openrocket.startup.Application; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class CompassRose extends JComponent { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java b/swing/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java index 87d7ab1a1..097af46bd 100644 --- a/swing/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java +++ b/swing/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java @@ -31,6 +31,7 @@ import net.sf.openrocket.util.MathUtil; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class CompassSelectionButton extends FlatButton implements Resettable { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/components/compass/CompassSelector.java b/swing/src/net/sf/openrocket/gui/components/compass/CompassSelector.java index deed9cf7e..fb77f2f4d 100644 --- a/swing/src/net/sf/openrocket/gui/components/compass/CompassSelector.java +++ b/swing/src/net/sf/openrocket/gui/components/compass/CompassSelector.java @@ -11,6 +11,7 @@ import net.sf.openrocket.util.MathUtil; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class CompassSelector extends CompassPointer { private final DoubleModel model; diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java index 2794e08cd..c6d218243 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java @@ -51,6 +51,8 @@ import net.sf.openrocket.util.LineStyle; import net.sf.openrocket.util.StateChangeListener; public class AppearancePanel extends JPanel { + private static final long serialVersionUID = 2709187552673202019L; + private static final Translator trans = Application.getTranslator(); private EditDecalHelper editDecalHelper = Application.getInjector() @@ -159,7 +161,7 @@ public class AppearancePanel extends JPanel { final JButton colorButton = new JButton(new ColorIcon(ab.getPaint())); final DecalModel decalModel = new DecalModel(this, document, ab); - final JComboBox textureDropDown = new JComboBox(decalModel); + final JComboBox textureDropDown = new JComboBox(decalModel); ab.addChangeListener(new StateChangeListener() { @Override @@ -248,7 +250,7 @@ public class AppearancePanel extends JPanel { System.arraycopy(LineStyle.values(), 0, list, 1, LineStyle.values().length); - JComboBox combo = new JComboBox(new EnumModel(c, + final JComboBox combo = new JComboBox(new EnumModel(c, "LineStyle", // // Default style list, trans.get("LineStyle.Defaultstyle"))); @@ -382,7 +384,7 @@ public class AppearancePanel extends JPanel { EdgeMode[] list = new EdgeMode[EdgeMode.values().length]; System.arraycopy(EdgeMode.values(), 0, list, 0, EdgeMode.values().length); - JComboBox combo = new JComboBox(new EnumModel(ab, + JComboBox combo = new JComboBox(new EnumModel(ab, "EdgeMode", list)); mDefault.addEnableComponent(combo, false); add(combo); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java index 51bf75e93..24899c809 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java @@ -20,6 +20,7 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class BodyTubeConfig extends RocketComponentConfig { private DoubleModel maxLength; diff --git a/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java index 135ec94e6..2af7d1d37 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java @@ -10,6 +10,7 @@ import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public class BulkheadConfig extends RingComponentConfig { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java index dfe6a3526..c274edaf6 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java @@ -10,6 +10,7 @@ import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public class CenteringRingConfig extends RingComponentConfig { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java index 7d54fbb09..1a3ea0a95 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java @@ -1,28 +1,10 @@ package net.sf.openrocket.gui.configdialog; -import javax.swing.ComboBoxModel; -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JSpinner; - -import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; -import net.sf.openrocket.gui.SpinnerEditor; -import net.sf.openrocket.gui.adaptors.DoubleModel; -import net.sf.openrocket.gui.adaptors.EnumModel; -import net.sf.openrocket.gui.adaptors.IntegerModel; -import net.sf.openrocket.gui.components.UnitSelector; -import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.rocketcomponent.AxialStage; -import net.sf.openrocket.rocketcomponent.ComponentAssembly; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.startup.Application; -import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class ComponentAssemblyConfig extends RocketComponentConfig { - private static final long serialVersionUID = -944969957186522471L; - private static final Translator trans = Application.getTranslator(); public ComponentAssemblyConfig(OpenRocketDocument document, RocketComponent component) { super(document, component); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java index 509ba867e..c4343676a 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java @@ -23,6 +23,7 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class EllipticalFinSetConfig extends FinSetConfig { private static final Translator trans = Application.getTranslator(); @@ -31,12 +32,10 @@ public class EllipticalFinSetConfig extends FinSetConfig { DoubleModel m; JSpinner spin; - JComboBox combo; JPanel mainPanel = new JPanel(new MigLayout()); - JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", "")); //// Number of fins @@ -111,7 +110,7 @@ public class EllipticalFinSetConfig extends FinSetConfig { //// Position relative to: panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Positionrelativeto"))); - combo = new JComboBox( + JComboBox positionCombo= new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -119,7 +118,7 @@ public class EllipticalFinSetConfig extends FinSetConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx, growx, wrap"); + panel.add(positionCombo, "spanx, growx, wrap"); //// plus panel.add(new JLabel(trans.get("EllipticalFinSetCfg.plus")), "right"); @@ -150,9 +149,9 @@ public class EllipticalFinSetConfig extends FinSetConfig { //// Cross section //// Fin cross section: panel.add(new JLabel(trans.get("EllipticalFinSetCfg.FincrossSection")), "span, split"); - combo = new JComboBox( + JComboBox sectionCombo = new JComboBox( new EnumModel(component, "CrossSection")); - panel.add(combo, "growx, wrap unrel"); + panel.add( sectionCombo, "growx, wrap unrel"); //// Thickness: diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java index 1fd28b2ff..8f23aa5f3 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java @@ -56,7 +56,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class FreeformFinSetConfig extends FinSetConfig { - + private static final long serialVersionUID = 2504130276828826021L; private static final Logger log = LoggerFactory.getLogger(FreeformFinSetConfig.class); private static final Translator trans = Application.getTranslator(); @@ -86,7 +86,6 @@ public class FreeformFinSetConfig extends FinSetConfig { DoubleModel m; JSpinner spin; - JComboBox combo; JPanel mainPanel = new JPanel(new MigLayout("fill")); @@ -139,9 +138,10 @@ public class FreeformFinSetConfig extends FinSetConfig { //// Position relative to: panel.add(new JLabel(trans.get("FreeformFinSetCfg.lbl.Posrelativeto"))); - combo = new JComboBox(new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, RocketComponent.Position.MIDDLE, - RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx 3, growx, wrap"); + JComboBox positionCombo = new JComboBox( + new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { + RocketComponent.Position.TOP, RocketComponent.Position.MIDDLE, RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); + panel.add(positionCombo, "spanx 3, growx, wrap"); //// plus panel.add(new JLabel(trans.get("FreeformFinSetCfg.lbl.plus")), "right"); @@ -169,8 +169,8 @@ public class FreeformFinSetConfig extends FinSetConfig { //// Cross section //// Fin cross section: panel.add(new JLabel(trans.get("FreeformFinSetCfg.lbl.FincrossSection")), "span, split"); - combo = new JComboBox(new EnumModel(component, "CrossSection")); - panel.add(combo, "growx, wrap unrel"); + JComboBox sectionCombo = new JComboBox(new EnumModel(component, "CrossSection")); + panel.add(sectionCombo, "growx, wrap unrel"); //// Thickness: @@ -312,6 +312,8 @@ public class FreeformFinSetConfig extends FinSetConfig { private class FinPointScrollPane extends ScaleScrollPane { + private static final long serialVersionUID = 2232218393756983666L; + private static final int ANY_MASK = (MouseEvent.ALT_DOWN_MASK | MouseEvent.ALT_GRAPH_DOWN_MASK | MouseEvent.META_DOWN_MASK | MouseEvent.CTRL_DOWN_MASK | MouseEvent.SHIFT_DOWN_MASK); private int dragIndex = -1; @@ -480,6 +482,11 @@ public class FreeformFinSetConfig extends FinSetConfig { private class FinPointTableModel extends AbstractTableModel { + /** + * + */ + private static final long serialVersionUID = 4803736958177227852L; + @Override public int getColumnCount() { return Columns.values().length; diff --git a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java index eb600eb89..0f9ec9bc0 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java @@ -19,9 +19,9 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class LaunchLugConfig extends RocketComponentConfig { - private MotorConfig motorConfigPane = null; private static final Translator trans = Application.getTranslator(); public LaunchLugConfig(OpenRocketDocument d, RocketComponent c) { @@ -111,7 +111,7 @@ public class LaunchLugConfig extends RocketComponentConfig { //// Position relative to: panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto"))); - JComboBox combo = new JComboBox( + JComboBox positionCombo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -119,7 +119,7 @@ public class LaunchLugConfig extends RocketComponentConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx, growx, wrap"); + panel.add( positionCombo, "spanx, growx, wrap"); //// plus panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.plus")), "right"); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java index 1db929d97..c1228e4c5 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java @@ -89,10 +89,10 @@ public class ParachuteConfig extends RecoveryDeviceConfig { //// Material: panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Material"))); - JComboBox combo = new JComboBox(new MaterialModel(panel, component, + JComboBox surfaceMaterialCombo = new JComboBox(new MaterialModel(panel, component, Material.Type.SURFACE)); - combo.setToolTipText(trans.get("ParachuteCfg.combo.MaterialModel")); - panel.add(combo, "spanx 3, growx, wrap 30lp"); + surfaceMaterialCombo.setToolTipText(trans.get("ParachuteCfg.combo.MaterialModel")); + panel.add( surfaceMaterialCombo, "spanx 3, growx, wrap 30lp"); @@ -122,9 +122,9 @@ public class ParachuteConfig extends RecoveryDeviceConfig { //// Material: panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Material"))); - combo = new JComboBox(new MaterialModel(panel, component, Material.Type.LINE, + JComboBox shroudMaterialCombo = new JComboBox(new MaterialModel(panel, component, Material.Type.LINE, "LineMaterial")); - panel.add(combo, "spanx 3, growx, wrap"); + panel.add( shroudMaterialCombo, "spanx 3, growx, wrap"); @@ -138,7 +138,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { //// Position relative to: panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Posrelativeto"))); - combo = new JComboBox( + JComboBox positionCombo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -146,7 +146,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx, growx, wrap"); + panel.add( positionCombo, "spanx, growx, wrap"); //// plus panel.add(new JLabel(trans.get("ParachuteCfg.lbl.plus")), "right"); @@ -199,12 +199,12 @@ public class ParachuteConfig extends RecoveryDeviceConfig { DeploymentConfiguration deploymentConfig = parachute.getDeploymentConfigurations().getDefault(); // this issues a warning because EnumModel ipmlements ComboBoxModel without a parameter... ComboBoxModel deployOptionsModel = new EnumModel(deploymentConfig, "DeployEvent"); - combo = new JComboBox( deployOptionsModel ); + JComboBox eventCombo = new JComboBox( deployOptionsModel ); if( (component.getStageNumber() + 1 ) == d.getRocket().getStageCount() ){ // This is the bottom stage: Restrict deployment options. - combo.removeItem( DeployEvent.LOWER_STAGE_SEPARATION ); + eventCombo.removeItem( DeployEvent.LOWER_STAGE_SEPARATION ); } - panel.add(combo, "spanx 3, growx, wrap"); + panel.add(eventCombo, "spanx 3, growx, wrap"); // ... and delay //// plus diff --git a/swing/src/net/sf/openrocket/gui/configdialog/PodSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/PodSetConfig.java index 664912e02..cdb824c37 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/PodSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/PodSetConfig.java @@ -14,14 +14,14 @@ import net.sf.openrocket.gui.adaptors.EnumModel; import net.sf.openrocket.gui.adaptors.IntegerModel; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.ComponentAssembly; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class PodSetConfig extends RocketComponentConfig { - private static final long serialVersionUID = -944969957186522471L; + private static final Translator trans = Application.getTranslator(); public PodSetConfig(OpenRocketDocument document, RocketComponent component) { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index bd4b95dd3..b40a87c20 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -53,7 +53,8 @@ import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.Invalidatable; public class RocketComponentConfig extends JPanel { - + private static final long serialVersionUID = -2925484062132243982L; + private static final Translator trans = Application.getTranslator(); protected final OpenRocketDocument document; @@ -62,7 +63,7 @@ public class RocketComponentConfig extends JPanel { private final List invalidatables = new ArrayList(); - private JComboBox presetComboBox; + private JComboBox presetComboBox; private PresetModel presetModel; protected final JTextField componentNameField; @@ -224,10 +225,10 @@ public class RocketComponentConfig extends JPanel { label.setToolTipText(trans.get("RocketCompCfg.lbl.ttip.componentmaterialaffects")); subPanel.add(label, "spanx 4, wrap rel"); - JComboBox combo = new JComboBox(new MaterialModel(subPanel, component, type, partName)); + JComboBox materialCombo = new JComboBox(new MaterialModel(subPanel, component, type, partName)); //// The component material affects the weight of the component. - combo.setToolTipText(trans.get("RocketCompCfg.combo.ttip.componentmaterialaffects")); - subPanel.add(combo, "spanx 4, growx, wrap paragraph"); + materialCombo.setToolTipText(trans.get("RocketCompCfg.combo.ttip.componentmaterialaffects")); + subPanel.add(materialCombo, "spanx 4, growx, wrap paragraph"); if (component instanceof ExternalComponent) { @@ -239,9 +240,10 @@ public class RocketComponentConfig extends JPanel { label.setToolTipText(tip); subPanel.add(label, "spanx 4, wmin 220lp, wrap rel"); - combo = new JComboBox(new EnumModel(component, "Finish")); - combo.setToolTipText(tip); - subPanel.add(combo, "spanx 4, growx, split"); + JComboBox finishCombo = new JComboBox( + new EnumModel(component, "Finish")); + finishCombo.setToolTipText(tip); + subPanel.add( finishCombo, "spanx 4, growx, split"); //// Set for all JButton button = new JButton(trans.get("RocketCompCfg.but.Setforall")); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java index 0d6bcf4b9..bb9aaf51d 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java @@ -31,6 +31,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; public class StreamerConfig extends RecoveryDeviceConfig { + private static final long serialVersionUID = -4445736703470494588L; private static final Translator trans = Application.getTranslator(); public StreamerConfig(OpenRocketDocument d, final RocketComponent component) { @@ -92,11 +93,11 @@ public class StreamerConfig extends RecoveryDeviceConfig { //// Material: panel.add(new JLabel(trans.get("StreamerCfg.lbl.Material"))); - JComboBox combo = new JComboBox(new MaterialModel(panel, component, + JComboBox streamerMaterialCombo = new JComboBox(new MaterialModel(panel, component, Material.Type.SURFACE)); //// The component material affects the weight of the component. - combo.setToolTipText(trans.get("StreamerCfg.combo.ttip.MaterialModel")); - panel.add(combo, "spanx 3, growx, wrap 20lp"); + streamerMaterialCombo.setToolTipText(trans.get("StreamerCfg.combo.ttip.MaterialModel")); + panel.add(streamerMaterialCombo, "spanx 3, growx, wrap 20lp"); @@ -138,7 +139,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { //// Position relative to: panel.add(new JLabel(trans.get("StreamerCfg.lbl.Posrelativeto"))); - combo = new JComboBox( + JComboBox positionCombo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -146,7 +147,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx, growx, wrap"); + panel.add( positionCombo, "spanx, growx, wrap"); //// plus panel.add(new JLabel(trans.get("StreamerCfg.lbl.plus")), "right"); @@ -196,12 +197,12 @@ public class StreamerConfig extends RecoveryDeviceConfig { panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat") + " " + CommonStrings.dagger), ""); DeploymentConfiguration deploymentConfig = streamer.getDeploymentConfigurations().getDefault(); - combo = new JComboBox(new EnumModel(deploymentConfig, "DeployEvent")); + JComboBox eventCombo = new JComboBox(new EnumModel(deploymentConfig, "DeployEvent")); if( (component.getStageNumber() + 1 ) == d.getRocket().getStageCount() ){ // This is the bottom stage. restrict deployment options. - combo.removeItem( DeployEvent.LOWER_STAGE_SEPARATION ); + eventCombo.removeItem( DeployEvent.LOWER_STAGE_SEPARATION ); } - panel.add(combo, "spanx 3, growx, wrap"); + panel.add( eventCombo, "spanx 3, growx, wrap"); // ... and delay //// plus diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java index 882364722..61e4c32a7 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java @@ -26,9 +26,10 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; public class TransitionConfig extends RocketComponentConfig { + private static final long serialVersionUID = -1851275950604625741L; private static final Translator trans = Application.getTranslator(); - private JComboBox typeBox; + private JComboBox typeBox; //private JLabel description; private JLabel shapeLabel; @@ -59,7 +60,7 @@ public class TransitionConfig extends RocketComponentConfig { Transition.Shape selected = ((Transition) component).getType(); Transition.Shape[] typeList = Transition.Shape.values(); - typeBox = new JComboBox(typeList); + typeBox = new JComboBox(typeList); typeBox.setEditable(false); typeBox.setSelectedItem(selected); typeBox.addActionListener(new ActionListener() { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java index a3611299b..ac7f1d271 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java @@ -26,6 +26,7 @@ import net.sf.openrocket.unit.UnitGroup; public class TrapezoidFinSetConfig extends FinSetConfig { + private static final long serialVersionUID = -4870745241749769842L; private static final Translator trans = Application.getTranslator(); public TrapezoidFinSetConfig(OpenRocketDocument d, final RocketComponent component) { @@ -33,7 +34,6 @@ public class TrapezoidFinSetConfig extends FinSetConfig { DoubleModel m; JSpinner spin; - JComboBox combo; JPanel mainPanel = new JPanel(new MigLayout()); @@ -167,7 +167,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig { //// Position relative to: panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto"))); - combo = new JComboBox( + JComboBox positionCombo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -175,7 +175,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx, growx, wrap"); + panel.add(positionCombo, "spanx, growx, wrap"); //// plus panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right"); @@ -206,9 +206,9 @@ public class TrapezoidFinSetConfig extends FinSetConfig { //// Fin cross section: panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.FincrossSection"))); - combo = new JComboBox( + JComboBox sectionCombo = new JComboBox( new EnumModel(component, "CrossSection")); - panel.add(combo, "span, growx, wrap"); + panel.add( sectionCombo, "span, growx, wrap"); //// Thickness: diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java index bf12fb16f..61e35c1e3 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java @@ -22,8 +22,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; public class TubeFinSetConfig extends RocketComponentConfig { - - private MotorConfig motorConfigPane = null; + private static final long serialVersionUID = 508482875624928676L; private static final Translator trans = Application.getTranslator(); public TubeFinSetConfig(OpenRocketDocument d, RocketComponent c) { @@ -125,7 +124,7 @@ public class TubeFinSetConfig extends RocketComponentConfig { //// Position relative to: panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto"))); - JComboBox combo = new JComboBox( + JComboBox positionCombo = new JComboBox( new EnumModel(component, "RelativePosition", new RocketComponent.Position[] { RocketComponent.Position.TOP, @@ -133,7 +132,7 @@ public class TubeFinSetConfig extends RocketComponentConfig { RocketComponent.Position.BOTTOM, RocketComponent.Position.ABSOLUTE })); - panel.add(combo, "spanx, growx, wrap"); + panel.add(positionCombo, "spanx, growx, wrap"); //// plus panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.plus")), "right"); diff --git a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java index 30970e7e8..967a1afd9 100644 --- a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java +++ b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java @@ -10,12 +10,10 @@ import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +@SuppressWarnings("serial") public class CustomExpressionDialog extends JDialog { private static final Translator trans = Application.getTranslator(); - private static final Logger log = LoggerFactory.getLogger(CustomExpressionDialog.class); @SuppressWarnings("unused") private final Window parentWindow; diff --git a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java index 18cd5e988..4cb2e8d43 100644 --- a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java +++ b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java @@ -32,6 +32,7 @@ import net.sf.openrocket.logging.Markers; import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public class CustomExpressionPanel extends JPanel { private static final Logger log = LoggerFactory.getLogger(CustomExpressionPanel.class); diff --git a/swing/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java b/swing/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java index 8ccdcd4fd..b7ce59bf5 100644 --- a/swing/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java +++ b/swing/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java @@ -29,6 +29,7 @@ import net.sf.openrocket.startup.Application; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("serial") public class OperatorSelector extends JDialog { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/customexpression/VariableSelector.java b/swing/src/net/sf/openrocket/gui/customexpression/VariableSelector.java index 833427eb4..67b051dac 100644 --- a/swing/src/net/sf/openrocket/gui/customexpression/VariableSelector.java +++ b/swing/src/net/sf/openrocket/gui/customexpression/VariableSelector.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; * */ +@SuppressWarnings("serial") public class VariableSelector extends JDialog { private static final Translator trans = Application.getTranslator(); @@ -43,6 +44,7 @@ public class VariableSelector extends JDialog { private final VariableTableModel tableModel; private final ExpressionBuilderDialog parentBuilder; + @SuppressWarnings("serial") public VariableSelector(Window parent, final ExpressionBuilderDialog parentBuilder, final OpenRocketDocument doc){ super(parent, trans.get("CustomVariableSelector.title"), JDialog.ModalityType.DOCUMENT_MODAL); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 12e99f10d..536ac9ad0 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -21,6 +21,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.Chars; +@SuppressWarnings("serial") public class AboutDialog extends JDialog { public static final String OPENROCKET_URL = "http://openrocket.sourceforge.net/"; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java index c895c88de..59601bc09 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java @@ -42,6 +42,7 @@ import net.sf.openrocket.util.JarUtil; import com.jogamp.opengl.JoglVersion; +@SuppressWarnings("serial") public class BugReportDialog extends JDialog { private static final String REPORT_EMAIL = "openrocket-bugs@lists.sourceforge.net"; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java index b1bd69b78..6093eec5a 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java @@ -59,6 +59,7 @@ import net.sf.openrocket.logging.StackTraceWriter; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.NumericComparator; +@SuppressWarnings("serial") public class DebugLogDialog extends JDialog { private static final Logger log = LoggerFactory.getLogger(DebugLogDialog.class); @@ -107,6 +108,7 @@ public class DebugLogDialog extends JDialog { private final SelectableLabel messageLabel; private final JTextArea stackTraceLabel; + @SuppressWarnings("serial") public DebugLogDialog(Window parent) { //// OpenRocket debug log super(parent, trans.get("debuglogdlg.OpenRocketdebuglog")); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java index 52800955e..a377539e9 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java @@ -66,7 +66,7 @@ import net.sf.openrocket.util.Reflection.Method; * @author Sampo Niskanen */ public class ScaleDialog extends JDialog { - + private static final long serialVersionUID = -8558418577377862794L; private static final Logger log = LoggerFactory.getLogger(ScaleDialog.class); private static final Translator trans = Application.getTranslator(); @@ -204,7 +204,7 @@ public class ScaleDialog extends JDialog { private final RocketComponent selection; private final boolean onlySelection; - private JComboBox selectionOption; + private JComboBox selectionOption; private JCheckBox scaleMassValues; private boolean changing = false; @@ -330,7 +330,7 @@ public class ScaleDialog extends JDialog { label.setToolTipText(tip); panel.add(label, "span, split, gapright unrel"); - selectionOption = new JComboBox(options.toArray()); + selectionOption = new JComboBox(options.toArray(new String[0])); selectionOption.setEditable(false); selectionOption.setToolTipText(tip); panel.add(selectionOption, "growx, wrap para*2"); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java index d02e3225a..3dcab908b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java @@ -32,6 +32,7 @@ import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class DeploymentSelectionDialog extends JDialog { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountConfigurationPanel.java index 2dc0501e1..35231e3cc 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountConfigurationPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountConfigurationPanel.java @@ -12,9 +12,9 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.rocketcomponent.Rocket; +@SuppressWarnings("serial") public abstract class MotorMountConfigurationPanel extends JPanel { - private final Rocket rocket; private final Component parent; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java index 482c4c4bd..1409d1fbf 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java @@ -23,16 +23,14 @@ import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.FlightConfigurationId; -import net.sf.openrocket.rocketcomponent.FlightConfigurableParameterSet; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration; import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration.SeparationEvent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public class SeparationSelectionDialog extends JDialog { - - private static final long serialVersionUID = 5121844286782432500L; private static final Translator trans = Application.getTranslator(); @@ -74,8 +72,7 @@ public class SeparationSelectionDialog extends JDialog { overrideButton.setSelected(true); } - @SuppressWarnings("unchecked") - final JComboBox event = new JComboBox(new EnumModel(newConfiguration, "SeparationEvent")); + final JComboBox event = new JComboBox(new EnumModel(newConfiguration, "SeparationEvent")); event.setSelectedItem(newConfiguration.getSeparationEvent()); panel.add(event, "wrap rel"); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java index 187a996bf..698728a5b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorInformationPanel.java @@ -34,6 +34,7 @@ import org.jfree.chart.title.TextTitle; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; +@SuppressWarnings("serial") class MotorInformationPanel extends JPanel { private static final int ZOOM_ICON_POSITION_NEGATIVE_X = 50; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 7651fedee..f22ea0435 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -63,6 +63,8 @@ import net.sf.openrocket.util.BugException; import net.sf.openrocket.utils.MotorCorrelation; public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelector { + private static final long serialVersionUID = -8737784181512143155L; + private static final Logger log = LoggerFactory.getLogger(ThrustCurveMotorSelectionPanel.class); private static final Translator trans = Application.getTranslator(); @@ -87,9 +89,9 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec private final JTextField searchField; private final JLabel curveSelectionLabel; - private final JComboBox curveSelectionBox; - private final DefaultComboBoxModel curveSelectionModel; - private final JComboBox delayBox; + private final JComboBox curveSelectionBox; + private final DefaultComboBoxModel curveSelectionModel; + private final JComboBox delayBox; private final MotorInformationPanel motorInformationPanel; private final MotorFilterPanel motorFilterPanel; @@ -130,6 +132,8 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec } motorFilterPanel = new MotorFilterPanel(allManufacturers, rowFilter) { + private static final long serialVersionUID = 8441555209804602238L; + @Override public void onSelectionChanged() { sorter.sort(); @@ -147,13 +151,15 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec curveSelectionLabel = new JLabel(trans.get("TCMotorSelPan.lbl.Selectthrustcurve")); panel.add(curveSelectionLabel); - curveSelectionModel = new DefaultComboBoxModel(); - curveSelectionBox = new JComboBox(curveSelectionModel); - curveSelectionBox.setRenderer(new CurveSelectionRenderer(curveSelectionBox.getRenderer())); + curveSelectionModel = new DefaultComboBoxModel(); + curveSelectionBox = new JComboBox(curveSelectionModel); + @SuppressWarnings("unchecked") + ListCellRenderer lcr = (ListCellRenderer) curveSelectionBox.getRenderer(); + curveSelectionBox.setRenderer(new CurveSelectionRenderer(lcr)); curveSelectionBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Object value = curveSelectionBox.getSelectedItem(); + MotorHolder value = (MotorHolder)curveSelectionBox.getSelectedItem(); if (value != null) { select(((MotorHolder) value).getMotor()); } @@ -166,13 +172,13 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec { panel.add(new JLabel(trans.get("TCMotorSelPan.lbl.Ejectionchargedelay"))); - delayBox = new JComboBox(); + delayBox = new JComboBox(); delayBox.setEditable(true); delayBox.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - JComboBox cb = (JComboBox) e.getSource(); - String sel = (String) cb.getSelectedItem(); + + String sel = (String) delayBox.getSelectedItem(); //// None if (sel.equalsIgnoreCase(trans.get("TCMotorSelPan.equalsIgnoreCase.None"))) { selectedDelay = Motor.PLUGGED; @@ -554,7 +560,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec if (selectedMotor == null) { //// None - delayBox.setModel(new DefaultComboBoxModel(new String[] { trans.get("TCMotorSelPan.delayBox.None") })); + delayBox.setModel(new DefaultComboBoxModel(new String[] { trans.get("TCMotorSelPan.delayBox.None") })); delayBox.setSelectedIndex(0); } else { @@ -567,7 +573,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec //// None delayStrings[i] = ThrustCurveMotor.getDelayString(delays.get(i), trans.get("TCMotorSelPan.delayBox.None")); } - delayBox.setModel(new DefaultComboBoxModel(delayStrings)); + delayBox.setModel(new DefaultComboBoxModel(delayStrings)); if (reset) { @@ -601,16 +607,16 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec ////////////////////// - private class CurveSelectionRenderer implements ListCellRenderer { + private class CurveSelectionRenderer implements ListCellRenderer { - private final ListCellRenderer renderer; + private final ListCellRenderer renderer; - public CurveSelectionRenderer(ListCellRenderer renderer) { + public CurveSelectionRenderer(ListCellRenderer renderer) { this.renderer = renderer; } @Override - public Component getListCellRendererComponent(JList list, Object value, int index, + public Component getListCellRendererComponent(JList list, MotorHolder value, int index, boolean isSelected, boolean cellHasFocus) { Component c = renderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java index 0ac5f25f6..2bf821a23 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -11,7 +11,6 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.io.Writer; -import java.text.Collator; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -20,6 +19,7 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Vector; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; @@ -88,7 +88,6 @@ import net.sf.openrocket.optimization.rocketoptimization.goals.MaximizationGoal; import net.sf.openrocket.optimization.rocketoptimization.goals.MinimizationGoal; import net.sf.openrocket.optimization.rocketoptimization.goals.ValueSeekGoal; import net.sf.openrocket.optimization.services.OptimizationServiceHelper; -import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.FlightConfigurationId; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; @@ -108,11 +107,10 @@ import net.sf.openrocket.util.TextUtil; * @author Sampo Niskanen */ public class GeneralOptimizationDialog extends JDialog { + private static final long serialVersionUID = -355058777898063291L; private static final Logger log = LoggerFactory.getLogger(GeneralOptimizationDialog.class); private static final Translator trans = Application.getTranslator(); - - private static final Collator collator = Collator.getInstance(); - + private static final String GOAL_MAXIMIZE = trans.get("goal.maximize"); private static final String GOAL_MINIMIZE = trans.get("goal.minimize"); private static final String GOAL_SEEK = trans.get("goal.seek"); @@ -141,7 +139,7 @@ public class GeneralOptimizationDialog extends JDialog { private final SimulationModifierTree availableModifierTree; private final JComboBox simulationSelectionCombo; - private final JComboBox optimizationParameterCombo; + private final JComboBox> optimizationParameterCombo; private final JComboBox optimizationGoalCombo; private final JSpinner optimizationGoalSpinner; @@ -241,6 +239,11 @@ public class GeneralOptimizationDialog extends JDialog { selectedModifierTable.setDefaultEditor(Double.class, new DoubleCellEditor()); selectedModifierTable.setDefaultEditor(Unit.class, new UnitCellEditor() { + /** + * + */ + private static final long serialVersionUID = -2316208862654205128L; + @Override protected UnitGroup getUnitGroup(Unit value, int row, int column) { return selectedModifiers.get(row).getUnitGroup(); @@ -389,7 +392,7 @@ public class GeneralOptimizationDialog extends JDialog { disableComponents.add(label); sub.add(label, ""); - optimizationParameterCombo = new JComboBox(); + optimizationParameterCombo = new JComboBox>(); optimizationParameterCombo.setToolTipText(tip); populateParameters(); optimizationParameterCombo.addActionListener(clearHistoryActionListener); @@ -998,12 +1001,12 @@ public class GeneralOptimizationDialog extends JDialog { current = trans.get("MaximumAltitudeParameter.name"); } - List> parameters = new ArrayList>(); + Vector> parameters = new Vector>(); for (OptimizableParameter p : optimizationParameters) { parameters.add(new Named(p, p.getName())); } - optimizationParameterCombo.setModel(new DefaultComboBoxModel(parameters.toArray())); + optimizationParameterCombo.setModel(new DefaultComboBoxModel>( parameters )); for (int i = 0; i < parameters.size(); i++) { if (parameters.get(i).toString().equals(current)) { @@ -1340,6 +1343,10 @@ public class GeneralOptimizationDialog extends JDialog { */ private class ParameterSelectionTableModel extends AbstractTableModel { + /** + * + */ + private static final long serialVersionUID = -8724716503904686656L; private static final int PARAMETER = 0; private static final int CURRENT = 1; private static final int MIN = 2; @@ -1467,6 +1474,8 @@ public class GeneralOptimizationDialog extends JDialog { } private class DoubleCellRenderer extends DefaultTableCellRenderer { + private static final long serialVersionUID = 448529130732718803L; + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { @@ -1484,51 +1493,51 @@ public class GeneralOptimizationDialog extends JDialog { } - private static class SimulationModifierComparator implements Comparator { - - @Override - public int compare(SimulationModifier mod1, SimulationModifier mod2) { - Object rel1 = mod1.getRelatedObject(); - Object rel2 = mod2.getRelatedObject(); - - /* - * Primarily order by related object: - * - * - RocketComponents first - * - Two RocketComponents are ordered based on their position in the rocket - */ - if (!rel1.equals(rel2)) { - - if (rel1 instanceof RocketComponent) { - if (rel2 instanceof RocketComponent) { - - RocketComponent root = ((RocketComponent) rel1).getRoot(); - for (RocketComponent c : root) { - if (c.equals(rel1)) { - return -1; - } - if (c.equals(rel2)) { - return 1; - } - } - - throw new BugException("Error sorting modifiers, mod1=" + mod1 + " rel1=" + rel1 + - " mod2=" + mod2 + " rel2=" + rel2); - - } else { - return -1; - } - } else { - if (rel2 instanceof RocketComponent) { - return 1; - } - } - - } - - // Secondarily sort by name - return collator.compare(mod1.getName(), mod2.getName()); - } - } +// private static class SimulationModifierComparator implements Comparator { +// +// @Override +// public int compare(SimulationModifier mod1, SimulationModifier mod2) { +// Object rel1 = mod1.getRelatedObject(); +// Object rel2 = mod2.getRelatedObject(); +// +// /* +// * Primarily order by related object: +// * +// * - RocketComponents first +// * - Two RocketComponents are ordered based on their position in the rocket +// */ +// if (!rel1.equals(rel2)) { +// +// if (rel1 instanceof RocketComponent) { +// if (rel2 instanceof RocketComponent) { +// +// RocketComponent root = ((RocketComponent) rel1).getRoot(); +// for (RocketComponent c : root) { +// if (c.equals(rel1)) { +// return -1; +// } +// if (c.equals(rel2)) { +// return 1; +// } +// } +// +// throw new BugException("Error sorting modifiers, mod1=" + mod1 + " rel1=" + rel1 + +// " mod2=" + mod2 + " rel2=" + rel2); +// +// } else { +// return -1; +// } +// } else { +// if (rel2 instanceof RocketComponent) { +// return 1; +// } +// } +// +// } +// +// // Secondarily sort by name +// return collator.compare(mod1.getName(), mod2.getName()); +// } +// } } diff --git a/swing/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java index c18c98060..f2657ca90 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java @@ -31,6 +31,7 @@ import net.sf.openrocket.util.TextUtil; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class SimulationModifierTree extends BasicTree { private final List selectedModifiers; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/DisplayPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/DisplayPreferencesPanel.java index e4883b49c..a49def63a 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/DisplayPreferencesPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/DisplayPreferencesPanel.java @@ -13,6 +13,7 @@ import net.sf.openrocket.startup.Preferences; * @author cpearls * */ +@SuppressWarnings("serial") public class DisplayPreferencesPanel extends PreferencesPanel { public DisplayPreferencesPanel() { super(new MigLayout("fillx")); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java index 43183f537..b198b1885 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java @@ -40,6 +40,7 @@ import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.Named; import net.sf.openrocket.util.Utils; +@SuppressWarnings("serial") public class GeneralPreferencesPanel extends PreferencesPanel { public GeneralPreferencesPanel(JDialog parent) { diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GraphicsPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GraphicsPreferencesPanel.java index c51c7b16a..ad5b3e964 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GraphicsPreferencesPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GraphicsPreferencesPanel.java @@ -31,6 +31,7 @@ import net.sf.openrocket.startup.Preferences; import com.itextpdf.text.Font; +@SuppressWarnings("serial") public class GraphicsPreferencesPanel extends PreferencesPanel { public GraphicsPreferencesPanel(JDialog parent) { diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java index e3b1d1278..7225c04aa 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java @@ -34,6 +34,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.Value; +@SuppressWarnings("serial") public class MaterialEditPanel extends JPanel { private final JTable table; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesPanel.java index 4b92bcd1e..baae04b16 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesPanel.java @@ -19,6 +19,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; +@SuppressWarnings("serial") public abstract class PreferencesPanel extends JPanel { protected static final Logger log = LoggerFactory.getLogger(PreferencesDialog.class); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/SimulationPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/SimulationPreferencesPanel.java index d6005ba7f..5527e4ce5 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/SimulationPreferencesPanel.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/SimulationPreferencesPanel.java @@ -1,6 +1,5 @@ package net.sf.openrocket.gui.dialogs.preferences; -import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -9,30 +8,27 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; -import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JSpinner; -import javax.swing.ListCellRenderer; - import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.SpinnerEditor; import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.adaptors.EnumModel; import net.sf.openrocket.gui.components.BasicSlider; import net.sf.openrocket.gui.components.UnitSelector; -import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.simulation.RK4SimulationStepper; -import net.sf.openrocket.simulation.listeners.SimulationListener; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.GeodeticComputationStrategy; public class SimulationPreferencesPanel extends PreferencesPanel { - + private static final long serialVersionUID = 7983195730016979888L; + /* * private GeodeticComputationStrategy geodeticComputation = * GeodeticComputationStrategy.SPHERICAL; */ + public SimulationPreferencesPanel() { super(new MigLayout("fill")); @@ -62,7 +58,7 @@ public class SimulationPreferencesPanel extends PreferencesPanel { }); this.add(automaticallyRunSimsBox, "wrap, growx, sg combos "); - GeodeticComputationStrategy geodeticComputation = GeodeticComputationStrategy.SPHERICAL; + //GeodeticComputationStrategy geodeticComputation = GeodeticComputationStrategy.SPHERICAL; JPanel sub, subsub; String tip; @@ -112,7 +108,7 @@ public class SimulationPreferencesPanel extends PreferencesPanel { EnumModel gcsModel = new EnumModel( preferences, "GeodeticComputation"); - final JComboBox gcsCombo = new JComboBox(gcsModel); + final JComboBox gcsCombo = new JComboBox(gcsModel); ActionListener gcsTTipListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -233,47 +229,47 @@ public class SimulationPreferencesPanel extends PreferencesPanel { */ } - private class ListenerCellRenderer extends JLabel implements - ListCellRenderer { - - @Override - public Component getListCellRendererComponent(JList list, Object value, - int index, boolean isSelected, boolean cellHasFocus) { - String s = value.toString(); - setText(s); - - // Attempt instantiating, catch any exceptions - Exception ex = null; - try { - Class c = Class.forName(s); - @SuppressWarnings("unused") - SimulationListener l = (SimulationListener) c.newInstance(); - } catch (Exception e) { - ex = e; - } - - if (ex == null) { - setIcon(Icons.SIMULATION_LISTENER_OK); - // // Listener instantiated successfully. - setToolTipText("Listener instantiated successfully."); - } else { - setIcon(Icons.SIMULATION_LISTENER_ERROR); - // // Unable to instantiate listener due to exception:
- setToolTipText("Unable to instantiate listener due to exception:
" - + ex.toString()); - } - - if (isSelected) { - setBackground(list.getSelectionBackground()); - setForeground(list.getSelectionForeground()); - } else { - setBackground(list.getBackground()); - setForeground(list.getForeground()); - } - setOpaque(true); - return this; - } - } +// private class ListenerCellRenderer extends JLabel implements +// ListCellRenderer { +// +// @Override +// public Component getListCellRendererComponent(JList list, Object value, +// int index, boolean isSelected, boolean cellHasFocus) { +// String s = value.toString(); +// setText(s); +// +// // Attempt instantiating, catch any exceptions +// Exception ex = null; +// try { +// Class c = Class.forName(s); +// @SuppressWarnings("unused") +// SimulationListener l = (SimulationListener) c.newInstance(); +// } catch (Exception e) { +// ex = e; +// } +// +// if (ex == null) { +// setIcon(Icons.SIMULATION_LISTENER_OK); +// // // Listener instantiated successfully. +// setToolTipText("Listener instantiated successfully."); +// } else { +// setIcon(Icons.SIMULATION_LISTENER_ERROR); +// // // Unable to instantiate listener due to exception:
+// setToolTipText("Unable to instantiate listener due to exception:
" +// + ex.toString()); +// } +// +// if (isSelected) { +// setBackground(list.getSelectionBackground()); +// setForeground(list.getSelectionForeground()); +// } else { +// setBackground(list.getBackground()); +// setForeground(list.getForeground()); +// } +// setOpaque(true); +// return this; +// } +// } /* * private class ListenerListModel extends AbstractListModel { diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java index 9cf2be02b..c30968130 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java @@ -37,6 +37,7 @@ import net.sf.openrocket.util.Chars; /** * Dialog shown for selecting a preset component. */ +@SuppressWarnings("serial") public class ComponentPresetChooserDialog extends JDialog { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java index 573191750..5a3be9ed5 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java @@ -33,6 +33,7 @@ import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.Value; import net.sf.openrocket.util.AlphanumComparator; +@SuppressWarnings("serial") public class ComponentPresetTable extends JTable { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java index 5d5d12d6a..6bf137b28 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java @@ -12,6 +12,7 @@ import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.Value; +@SuppressWarnings("serial") public abstract class ComponentPresetTableColumn extends TableColumn { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java index 91cff9807..dac63d28c 100644 --- a/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java +++ b/swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoSettingsConfig.java @@ -200,14 +200,15 @@ public class PhotoSettingsConfig extends JTabbedPane { add(new JLabel(trans.get("PhotoSettingsConfig.lbl.skyImage"))); - add(new JComboBox(new DefaultComboBoxModel(new Object[] { null, Mountains.instance, Meadow.instance, + add(new JComboBox(new DefaultComboBoxModel(new Sky[] { null, Mountains.instance, Meadow.instance, Storm.instance, Lake.instance, Orbit.instance, Miramar.instance }) { }) { { addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Object s = ((JComboBox) e.getSource()).getSelectedItem(); + @SuppressWarnings("unchecked") + Object s = ((JComboBox) e.getSource()).getSelectedItem(); if (s instanceof Sky) { p.setSky((Sky) s); skyColorButton.setEnabled(false); diff --git a/swing/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java b/swing/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java index d3a74a3d4..2d97d841b 100644 --- a/swing/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java +++ b/swing/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java @@ -30,7 +30,8 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Named; public class GuidedTourSelectionDialog extends JDialog { - + private static final long serialVersionUID = -3643116444821710259L; + private static final Translator trans = Application.getTranslator(); private static GuidedTourSelectionDialog instance = null; @@ -41,7 +42,7 @@ public class GuidedTourSelectionDialog extends JDialog { private SlideShowDialog slideShowDialog; - private JList tourList; + private JList> tourList; private JEditorPane tourDescription; private JLabel tourLength; @@ -56,7 +57,7 @@ public class GuidedTourSelectionDialog extends JDialog { panel.add(new StyledLabel(trans.get("lbl.selectTour"), Style.BOLD), "spanx, wrap rel"); - tourList = new JList(new TourListModel()); + tourList = new JList>(new TourListModel()); tourList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); tourList.getSelectionModel().addListSelectionListener(new ListSelectionListener() { @Override @@ -157,15 +158,15 @@ public class GuidedTourSelectionDialog extends JDialog { } - @SuppressWarnings("unchecked") private SlideSet getSelectedSlideSet() { - return ((Named) tourList.getSelectedValue()).get(); + return tourList.getSelectedValue().get(); } - private class TourListModel extends AbstractListModel { - + private class TourListModel extends AbstractListModel> { + private static final long serialVersionUID = -4031709944507449410L; + @Override - public Object getElementAt(int index) { + public Named getElementAt(int index) { String name = tourNames.get(index); SlideSet set = slideSetManager.getSlideSet(name); return new Named(set, set.getTitle()); diff --git a/swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java index 89c0dd979..fc76ed038 100644 --- a/swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java +++ b/swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java @@ -25,6 +25,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.Chars; +@SuppressWarnings("serial") public class SlideShowDialog extends JDialog { private static final Logger log = LoggerFactory.getLogger(SlideShowDialog.class); diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 8dba582b9..4d64eb138 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -12,7 +12,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java index d1ea61b5e..6fc0f39a2 100644 --- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java +++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java @@ -10,6 +10,7 @@ import javax.swing.JMenuItem; /** * Implements a menu for the example Open Rocket design files. */ +@SuppressWarnings("serial") public final class ExampleDesignFileAction extends JMenu { /** diff --git a/swing/src/net/sf/openrocket/gui/main/ExportDecalDialog.java b/swing/src/net/sf/openrocket/gui/main/ExportDecalDialog.java index b3505784d..bb7afe25a 100644 --- a/swing/src/net/sf/openrocket/gui/main/ExportDecalDialog.java +++ b/swing/src/net/sf/openrocket/gui/main/ExportDecalDialog.java @@ -25,13 +25,14 @@ import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public class ExportDecalDialog extends JDialog { private final static Translator trans = Application.getTranslator(); private final OpenRocketDocument document; - private final JComboBox decalComboBox; + private final JComboBox decalComboBox; private final JFileChooser chooser; public ExportDecalDialog(Window parent, OpenRocketDocument doc) { @@ -47,7 +48,7 @@ public class ExportDecalDialog extends JDialog { Collection exportableDecals = document.getDecalList(); - decalComboBox = new JComboBox(exportableDecals.toArray(new DecalImage[0])); + decalComboBox = new JComboBox(exportableDecals.toArray(new DecalImage[0])); decalComboBox.setEditable(false); panel.add(decalComboBox, "growx, wrap"); diff --git a/swing/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java index 0055f938f..5582e4fca 100644 --- a/swing/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java +++ b/swing/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java @@ -14,6 +14,7 @@ import java.util.List; /** * Implements a menu for the Most-Recently-Used Open Rocket design files. */ +@SuppressWarnings("serial") public final class MRUDesignFileAction extends JMenu { /** diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java index 82f948725..a756c2651 100644 --- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java @@ -52,15 +52,15 @@ import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.FlightConfigurationId; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeListener; -import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Preferences; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.AlphanumComparator; +@SuppressWarnings("serial") public class SimulationPanel extends JPanel { - private static final long serialVersionUID = 1390060162192576924L; + private static final Logger log = LoggerFactory.getLogger(SimulationPanel.class); private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/main/StorageOptionChooser.java b/swing/src/net/sf/openrocket/gui/main/StorageOptionChooser.java index ad836c882..4e1d690ad 100644 --- a/swing/src/net/sf/openrocket/gui/main/StorageOptionChooser.java +++ b/swing/src/net/sf/openrocket/gui/main/StorageOptionChooser.java @@ -5,7 +5,6 @@ import java.awt.event.ActionListener; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; -import javax.swing.JCheckBox; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -27,6 +26,7 @@ import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.startup.Application; +@SuppressWarnings("serial") public class StorageOptionChooser extends JPanel { public static final double DEFAULT_SAVE_TIME_SKIP = 0.20; diff --git a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java index f78bfd005..a02e626f9 100644 --- a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java +++ b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java @@ -7,6 +7,7 @@ import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.components.BasicTree; +@SuppressWarnings("serial") public class ComponentTree extends BasicTree { public ComponentTree(OpenRocketDocument document) { diff --git a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java index b73f7cec1..8c66f25c7 100644 --- a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java +++ b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java @@ -19,6 +19,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.TextUtil; +@SuppressWarnings("serial") public class ComponentTreeRenderer extends DefaultTreeCellRenderer { private static final Translator trans = Application.getTranslator(); diff --git a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java index 9484ce549..4431725e7 100644 --- a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java +++ b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java @@ -29,6 +29,7 @@ import net.sf.openrocket.util.BugException; * * @author Sampo Niskanen */ +@SuppressWarnings("serial") public class ComponentTreeTransferHandler extends TransferHandler { private static final Logger log = LoggerFactory.getLogger(ComponentTreeTransferHandler.class); diff --git a/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java b/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java index 1079bdce4..00a92addb 100644 --- a/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java +++ b/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java @@ -61,6 +61,7 @@ import org.jfree.ui.TextAnchor; * both datasets and the legend. But for now, the renderers are queried for the line color information * and this is held in the Legend. */ +@SuppressWarnings("serial") public class SimulationPlot { private static final float PLOT_STROKE_WIDTH = 1.5f; diff --git a/swing/src/net/sf/openrocket/gui/preset/ButtonColumn.java b/swing/src/net/sf/openrocket/gui/preset/ButtonColumn.java index 8852c55b0..b610e35d9 100644 --- a/swing/src/net/sf/openrocket/gui/preset/ButtonColumn.java +++ b/swing/src/net/sf/openrocket/gui/preset/ButtonColumn.java @@ -32,6 +32,7 @@ import java.awt.event.MouseListener; * * Credits: A post by Rob Camick http://tips4java.wordpress.com/2009/07/12/table-button-column/ */ +@SuppressWarnings("serial") public class ButtonColumn extends AbstractCellEditor implements TableCellRenderer, TableCellEditor, ActionListener, MouseListener { diff --git a/swing/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java b/swing/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java index bc5dcbe01..c92efd61d 100644 --- a/swing/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java +++ b/swing/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java @@ -9,16 +9,18 @@ import java.util.Set; /** * A combo box that allows for items to be deselected. */ -public class DeselectableComboBox extends JComboBox { +public class DeselectableComboBox extends JComboBox { + private static final long serialVersionUID = 1803702330221425938L; - public DeselectableComboBox() { + @SuppressWarnings("unchecked") + public DeselectableComboBox() { super(); - super.setRenderer(new DeselectedtemsRenderer()); + super.setRenderer(new DeselectedItemsRenderer()); } private Set disabled_items = new HashSet(); - public void addItem(Object anObject, boolean disabled) { + public void addItem(T anObject, boolean disabled) { super.addItem(anObject); if (disabled) { disabled_items.add(getItemCount() - 1); @@ -54,9 +56,12 @@ public class DeselectableComboBox extends JComboBox { } } - private class DeselectedtemsRenderer extends BasicComboBoxRenderer { + private class DeselectedItemsRenderer extends BasicComboBoxRenderer { + private static final long serialVersionUID = 6149806777306976399L; - @Override + // is raw because its super-method-signature is also a raw generic + @SuppressWarnings("rawtypes") + @Override public Component getListCellRendererComponent(JList list, Object value, int index, diff --git a/swing/src/net/sf/openrocket/gui/preset/MaterialModel.java b/swing/src/net/sf/openrocket/gui/preset/MaterialModel.java index eac4440cb..2c0677e58 100644 --- a/swing/src/net/sf/openrocket/gui/preset/MaterialModel.java +++ b/swing/src/net/sf/openrocket/gui/preset/MaterialModel.java @@ -6,6 +6,7 @@ import net.sf.openrocket.database.Databases; import net.sf.openrocket.gui.dialogs.CustomMaterialDialog; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; +import net.sf.openrocket.material.Material.Type; import net.sf.openrocket.startup.Application; import javax.swing.DefaultComboBoxModel; @@ -15,9 +16,10 @@ import java.awt.Component; /** * A material model specifically for presets. */ -public class MaterialModel extends DefaultComboBoxModel implements DatabaseListener { +public class MaterialModel extends DefaultComboBoxModel implements DatabaseListener { + private static final long serialVersionUID = -8850670173491660708L; - private static final String CUSTOM = "Custom"; + private static final Material CUSTOM_MATERIAL = Material.newMaterial(Type.CUSTOM, "Custom", 1.0, true); private final Database database; @@ -65,7 +67,7 @@ public class MaterialModel extends DefaultComboBoxModel implements DatabaseListe return; } - if (item == CUSTOM) { + if (item == CUSTOM_MATERIAL) { // Open custom material dialog in the future, after combo box has closed SwingUtilities.invokeLater(new Runnable() { @@ -100,9 +102,9 @@ public class MaterialModel extends DefaultComboBoxModel implements DatabaseListe } @Override - public Object getElementAt(int index) { + public Material getElementAt(int index) { if (index == database.size()) { - return CUSTOM; + return CUSTOM_MATERIAL; } else if (index >= database.size() + 1) { return null; diff --git a/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java b/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java index dcbbc62fb..1689c08df 100644 --- a/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java +++ b/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java @@ -68,7 +68,9 @@ import net.sf.openrocket.unit.UnitGroup; * Preset editor for creating new preset components. */ public class PresetEditorDialog extends JDialog implements ItemListener { - + + private static final long serialVersionUID = -3298642844886682536L; + private static Translator trans = Application.getTranslator(); private static final Logger log = LoggerFactory.getLogger(PresetEditorDialog.class); @@ -81,7 +83,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { final PresetInputVerifier NON_NEGATIVE_INTEGER = new PresetInputVerifier(Pattern.compile(NON_NEGATIVE_INTEGER_FIELD)); private final JPanel contentPanel = new JPanel(); - private DeselectableComboBox typeCombo; + private DeselectableComboBox typeCombo; private JTextField mfgTextField; private MaterialChooser materialChooser; private MaterialHolder holder = null; @@ -90,7 +92,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { private JTextField ncDescTextField; private DoubleModel ncLength; private JCheckBox ncFilledCB; - private JComboBox ncShapeCB; + private JComboBox ncShapeCB; private DoubleModel ncAftDia; private DoubleModel ncAftShoulderDia; private DoubleModel ncAftShoulderLen; @@ -110,7 +112,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { private DoubleModel trMass; private ImageIcon trImage; private JCheckBox trFilledCB; - private JComboBox trShapeCB; + private JComboBox trShapeCB; private JButton trImageBtn; private JTextField btPartNoTextField; @@ -257,9 +259,9 @@ public class PresetEditorDialog extends JDialog implements ItemListener { contentPanel.add(componentOverlayPanel, "cell 1 3 5 2,grow"); componentOverlayPanel.setLayout(new CardLayout(0, 0)); - typeCombo = new DeselectableComboBox(); + typeCombo = new DeselectableComboBox(); typeCombo.addItemListener(this); - typeCombo.setModel(new DefaultComboBoxModel()); + typeCombo.setModel(new DefaultComboBoxModel()); setItems(typeCombo, toEdit); contentPanel.add(typeCombo, "cell 3 1,growx"); @@ -306,8 +308,8 @@ public class PresetEditorDialog extends JDialog implements ItemListener { JLabel ncShapeLabel = new JLabel(trans.get("NoseConeCfg.lbl.Noseconeshape")); ncPanel.add(ncShapeLabel, "cell 0 2,alignx left"); - ncShapeCB = new JComboBox(); - ncShapeCB.setModel(new DefaultComboBoxModel(new String[] { Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), + ncShapeCB = new JComboBox(); + ncShapeCB.setModel(new DefaultComboBoxModel(new String[] { Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.getName() })); ncPanel.add(ncShapeCB, "cell 1 2,growx"); @@ -405,8 +407,8 @@ public class PresetEditorDialog extends JDialog implements ItemListener { JLabel trShapeLabel = new JLabel("Shape:"); trPanel.add(trShapeLabel, "cell 0 2,alignx left"); - trShapeCB = new JComboBox(); - trShapeCB.setModel(new DefaultComboBoxModel(new String[] { Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), + trShapeCB = new JComboBox(); + trShapeCB.setModel(new DefaultComboBoxModel(new String[] { Transition.Shape.OGIVE.getName(), Transition.Shape.CONICAL.getName(), Transition.Shape.PARABOLIC.getName(), Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.getName() })); trPanel.add(trShapeCB, "cell 1 2,growx"); @@ -1177,7 +1179,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { * @param cb the combo box component * @param preset the preset being edited */ - private void setItems(DeselectableComboBox cb, ComponentPreset preset) { + private void setItems(DeselectableComboBox cb, ComponentPreset preset) { cb.addItem(trans.get(NOSE_CONE_KEY), preset != null && !preset.get(ComponentPreset.TYPE).equals(ComponentPreset.Type.NOSE_CONE)); cb.addItem(trans.get(BODY_TUBE_KEY), preset != null && !preset.get(ComponentPreset.TYPE).equals(ComponentPreset.Type.BODY_TUBE)); cb.addItem(trans.get(BULKHEAD_KEY), preset != null && !preset.get(ComponentPreset.TYPE).equals(ComponentPreset.Type.BULK_HEAD)); @@ -1507,7 +1509,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { } } - private void setMaterial(final JComboBox chooser, final ComponentPreset preset, final MaterialHolder holder, + private void setMaterial(final JComboBox chooser, final ComponentPreset preset, final MaterialHolder holder, final Material.Type theType, final TypedKey key) { if (holder == null) { chooser.setModel(new MaterialModel(PresetEditorDialog.this, theType)); @@ -2190,8 +2192,9 @@ public class PresetEditorDialog extends JDialog implements ItemListener { } } - class MaterialChooser extends JComboBox { - + class MaterialChooser extends JComboBox { + private static final long serialVersionUID = -6066457077483291319L; + public MaterialChooser() { } @@ -2207,7 +2210,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { * @beaninfo bound: true description: Model that the combo box uses to get data to display. */ @Override - public void setModel(final ComboBoxModel aModel) { + public void setModel(final ComboBoxModel aModel) { if (getModel() instanceof MaterialModel) { MaterialModel old = (MaterialModel) getModel(); old.removeListener(); diff --git a/swing/src/net/sf/openrocket/gui/print/AbstractPrintable.java b/swing/src/net/sf/openrocket/gui/print/AbstractPrintable.java index 1e9f0c1f8..f32eeeada 100644 --- a/swing/src/net/sf/openrocket/gui/print/AbstractPrintable.java +++ b/swing/src/net/sf/openrocket/gui/print/AbstractPrintable.java @@ -8,6 +8,7 @@ import java.awt.Image; import java.awt.RenderingHints; import java.awt.image.BufferedImage; +@SuppressWarnings("serial") public abstract class AbstractPrintable extends PrintableComponent { /** * A thin stroke. diff --git a/swing/src/net/sf/openrocket/gui/print/FinMarkingGuide.java b/swing/src/net/sf/openrocket/gui/print/FinMarkingGuide.java index 3aed3c8db..413d52cf4 100644 --- a/swing/src/net/sf/openrocket/gui/print/FinMarkingGuide.java +++ b/swing/src/net/sf/openrocket/gui/print/FinMarkingGuide.java @@ -35,6 +35,7 @@ import net.sf.openrocket.startup.Application; * give orientation. *

*/ +@SuppressWarnings("serial") public class FinMarkingGuide extends JPanel { /** diff --git a/swing/src/net/sf/openrocket/gui/print/PrintableNoseCone.java b/swing/src/net/sf/openrocket/gui/print/PrintableNoseCone.java index 220cf3103..9b2068534 100644 --- a/swing/src/net/sf/openrocket/gui/print/PrintableNoseCone.java +++ b/swing/src/net/sf/openrocket/gui/print/PrintableNoseCone.java @@ -9,8 +9,8 @@ import net.sf.openrocket.util.Transformation; import java.awt.Graphics2D; import java.awt.Rectangle; -import java.awt.Shape; +@SuppressWarnings("serial") public class PrintableNoseCone extends AbstractPrintable { /** diff --git a/swing/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java index e4a933738..dd6fbd3f6 100644 --- a/swing/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java +++ b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java @@ -18,6 +18,7 @@ import java.awt.Component; *

* Based in part on a blog by Santhosh Kumar. http://www.jroller.com/santhosh/date/20050610 */ +@SuppressWarnings("serial") public class CheckTreeCellRenderer extends JPanel implements TreeCellRenderer { /** diff --git a/swing/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java index 71f05bb8c..a00e30a4e 100644 --- a/swing/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java +++ b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java @@ -14,6 +14,7 @@ import java.util.Stack; * This class implements the selection model for the checkbox tree. This specifically is used to keep * track of the TreePaths that have a selected CheckBox. */ +@SuppressWarnings("serial") public class CheckTreeSelectionModel extends DefaultTreeSelectionModel { /** diff --git a/swing/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java b/swing/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java index 346a6bb46..dd8704511 100644 --- a/swing/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java +++ b/swing/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java @@ -23,6 +23,7 @@ import java.util.Vector; /** * A specialized JTree for displaying various rocket items that can be printed. */ +@SuppressWarnings("serial") public class RocketPrintTree extends JTree { /** diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java index 09ff97aee..2955b34d5 100644 --- a/swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java +++ b/swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java @@ -13,6 +13,7 @@ import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.util.StateChangeListener; +@SuppressWarnings("serial") public abstract class AbstractScaleFigure extends JPanel implements ScaleFigure { // Number of pixels to leave at edges when fitting figure diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java index cd5b9490e..b6fdd2bef 100644 --- a/swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java +++ b/swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java @@ -24,6 +24,7 @@ import net.sf.openrocket.util.MathUtil; // TODO: MEDIUM: the figure jumps and bugs when using automatic fitting +@SuppressWarnings("serial") public class FinPointFigure extends AbstractScaleFigure { private static final int BOX_SIZE = 4; diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java index 8f7c30727..bb487d747 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java @@ -21,7 +21,6 @@ import javax.swing.event.DocumentListener; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; -import net.sf.openrocket.gui.adaptors.ParameterSetModel; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.FlightConfiguration; diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java index 3f97c8e7b..bcd127bd8 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java @@ -42,6 +42,7 @@ import net.sf.openrocket.unit.UnitGroup; public class SimulationExportPanel extends JPanel { + private static final long serialVersionUID = 3423905472892675964L; private static final String SPACE = "SPACE"; private static final String TAB = "TAB"; private static final Translator trans = Application.getTranslator(); @@ -109,6 +110,8 @@ public class SimulationExportPanel extends JPanel { table.setColumnSelectionAllowed(false); table.setDefaultEditor(Unit.class, new UnitCellEditor() { + private static final long serialVersionUID = 1088570433902420935L; + @Override protected UnitGroup getUnitGroup(Unit value, int row, int column) { return types[row].getUnitGroup(); @@ -179,7 +182,7 @@ public class SimulationExportPanel extends JPanel { ArrayList stages = new ArrayList(); stages.addAll(Util.generateSeriesLabels(simulation)); - final JComboBox stageSelection = new JComboBox(stages.toArray(new String[0])); + final JComboBox stageSelection = new JComboBox(stages.toArray(new String[0])); stageSelection.addItemListener(new ItemListener() { @Override @@ -337,6 +340,7 @@ public class SimulationExportPanel extends JPanel { * The table model for the variable selection. */ private class SelectionTableModel extends AbstractTableModel { + private static final long serialVersionUID = 493067422917621072L; private static final int SELECTED = 0; private static final int NAME = 1; private static final int UNIT = 2; diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java index 6a925edef..86c61e0c8 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java @@ -50,7 +50,9 @@ import net.sf.openrocket.util.GeodeticComputationStrategy; import com.google.inject.Key; class SimulationOptionsPanel extends JPanel { - + + private static final long serialVersionUID = -5251458539346201239L; + private static final Translator trans = Application.getTranslator(); private OpenRocketDocument document; @@ -114,7 +116,7 @@ class SimulationOptionsPanel extends JPanel { EnumModel gcsModel = new EnumModel( conditions, "GeodeticComputation"); - final JComboBox gcsCombo = new JComboBox(gcsModel); + final JComboBox gcsCombo = new JComboBox(gcsModel); ActionListener gcsTTipListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -317,6 +319,11 @@ class SimulationOptionsPanel extends JPanel { private class SimulationExtensionPanel extends JPanel { + /** + * + */ + private static final long serialVersionUID = -3296795614810745035L; + public SimulationExtensionPanel(final SimulationExtension extension) { super(new MigLayout("fillx, gapx 0")); diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java index 40c3ebba2..5ccf7b3e3 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java @@ -43,6 +43,8 @@ import net.sf.openrocket.util.Utils; * @author Sampo Niskanen */ public class SimulationPlotPanel extends JPanel { + private static final long serialVersionUID = -2227129713185477998L; + private static final Translator trans = Application.getTranslator(); // TODO: LOW: Should these be somewhere else? @@ -86,9 +88,9 @@ public class SimulationPlotPanel extends JPanel { private PlotConfiguration configuration; - private JComboBox configurationSelector; + private JComboBox configurationSelector; - private JComboBox domainTypeSelector; + private JComboBox domainTypeSelector; private UnitSelector domainUnitSelector; private JPanel typeSelectorPanel; @@ -114,7 +116,7 @@ public class SimulationPlotPanel extends JPanel { //// Configuration selector // Setup the combo box - configurationSelector = new JComboBox(PRESET_ARRAY); + configurationSelector = new JComboBox(PRESET_ARRAY); for (PlotConfiguration config : PRESET_ARRAY) { if (config.getName().equals(configuration.getName())) { configurationSelector.setSelectedItem(config); @@ -153,7 +155,7 @@ public class SimulationPlotPanel extends JPanel { //// X axis type: this.add(new JLabel(trans.get("simplotpanel.lbl.Xaxistype")), "spanx, split"); - domainTypeSelector = new JComboBox(types); + domainTypeSelector = new JComboBox(types); domainTypeSelector.setSelectedItem(configuration.getDomainAxisType()); domainTypeSelector.addItemListener(new ItemListener() { @Override @@ -393,12 +395,14 @@ public class SimulationPlotPanel extends JPanel { * A JPanel which configures a single plot of a PlotConfiguration. */ private class PlotTypeSelector extends JPanel { + private static final long serialVersionUID = 9056324972817542570L; + private final String[] POSITIONS = { AUTO_NAME, LEFT_NAME, RIGHT_NAME }; private final int index; - private JComboBox typeSelector; + private JComboBox typeSelector; private UnitSelector unitSelector; - private JComboBox axisSelector; + private JComboBox axisSelector; public PlotTypeSelector(int plotIndex, FlightDataType type, Unit unit, int position) { @@ -406,7 +410,7 @@ public class SimulationPlotPanel extends JPanel { this.index = plotIndex; - typeSelector = new JComboBox(types); + typeSelector = new JComboBox(types); typeSelector.setSelectedItem(type); typeSelector.addItemListener(new ItemListener() { @Override @@ -440,7 +444,7 @@ public class SimulationPlotPanel extends JPanel { //// Axis: this.add(new JLabel(trans.get("simplotpanel.lbl.Axis"))); - axisSelector = new JComboBox(POSITIONS); + axisSelector = new JComboBox(POSITIONS); if (position == LEFT) axisSelector.setSelectedIndex(1); else if (position == RIGHT) @@ -478,6 +482,7 @@ public class SimulationPlotPanel extends JPanel { private class FlightEventTableModel extends AbstractTableModel { + private static final long serialVersionUID = -1108240805614567627L; private final FlightEvent.Type[] eventTypes; public FlightEventTableModel() { diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java index c175f1ce1..1a9983725 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java @@ -453,6 +453,9 @@ public class SimulationRunDialog extends JDialog { log.debug("END, setting progress"); setSimulationProgress(1.0); break; + + default: + break; } return true; } diff --git a/swing/src/net/sf/openrocket/gui/util/CheckList.java b/swing/src/net/sf/openrocket/gui/util/CheckList.java index fa7c17948..ce7f7011c 100644 --- a/swing/src/net/sf/openrocket/gui/util/CheckList.java +++ b/swing/src/net/sf/openrocket/gui/util/CheckList.java @@ -53,23 +53,29 @@ import javax.swing.ListSelectionModel; */ public class CheckList { - private final JList list; + private final JList list; private static final MouseAdapter checkBoxEditor = new CheckListEditor(); public static class Builder { - private JList list; + private JList list; - public Builder(JList list) { - this.list = list == null ? new JList() : list; + @SuppressWarnings("rawtypes") + public Builder(JList list) { + if( null == list ){ + this.list = new JList(); + }else{ + this.list = list; + } } public Builder() { this(null); } + @SuppressWarnings("unchecked") public CheckList build() { - return new CheckList(list); + return new CheckList((JList)list); } } @@ -79,7 +85,7 @@ public class CheckList { * Wraps the standard JList and makes it work like check list * @param list */ - private CheckList(final JList list) { + private CheckList(final JList list) { if (list == null) throw new NullPointerException(); @@ -95,7 +101,7 @@ public class CheckList { } @SuppressWarnings("serial") - private void setupKeyboardActions(final JList list) { + private void setupKeyboardActions(final JList list) { String actionKey = "toggle-check"; list.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), actionKey); list.getActionMap().put(actionKey, new AbstractAction() { @@ -117,7 +123,7 @@ public class CheckList { } - public JList getList() { + public JList getList() { return list; } @@ -137,7 +143,6 @@ public class CheckList { list.setModel(model); } - @SuppressWarnings("unchecked") public DefaultCheckListModel getModel() { return (DefaultCheckListModel) list.getModel(); } diff --git a/swing/src/net/sf/openrocket/gui/util/CheckListEditor.java b/swing/src/net/sf/openrocket/gui/util/CheckListEditor.java index 68680670f..88c8866fe 100644 --- a/swing/src/net/sf/openrocket/gui/util/CheckListEditor.java +++ b/swing/src/net/sf/openrocket/gui/util/CheckListEditor.java @@ -34,7 +34,6 @@ package net.sf.openrocket.gui.util; import java.awt.Rectangle; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.util.Arrays; import javax.swing.JList; import javax.swing.SwingUtilities; diff --git a/swing/src/net/sf/openrocket/gui/util/CheckListRenderer.java b/swing/src/net/sf/openrocket/gui/util/CheckListRenderer.java index e0777c4f9..d6f1600de 100644 --- a/swing/src/net/sf/openrocket/gui/util/CheckListRenderer.java +++ b/swing/src/net/sf/openrocket/gui/util/CheckListRenderer.java @@ -45,10 +45,9 @@ import javax.swing.UIManager; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +@SuppressWarnings("serial") public class CheckListRenderer extends JCheckBox implements ListCellRenderer, Serializable { - - private static final long serialVersionUID = 1L; - + private static final Border NO_FOCUS_BORDER = new EmptyBorder(1, 1, 1, 1); private static final Border SAFE_NO_FOCUS_BORDER = NO_FOCUS_BORDER; // may change in the feature diff --git a/swing/src/net/sf/openrocket/gui/util/DefaultCheckListModel.java b/swing/src/net/sf/openrocket/gui/util/DefaultCheckListModel.java index cbb4e5919..943845811 100644 --- a/swing/src/net/sf/openrocket/gui/util/DefaultCheckListModel.java +++ b/swing/src/net/sf/openrocket/gui/util/DefaultCheckListModel.java @@ -32,7 +32,6 @@ package net.sf.openrocket.gui.util; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -49,7 +48,7 @@ import javax.swing.AbstractListModel; * * @param list element type */ -public class DefaultCheckListModel extends AbstractListModel { +public class DefaultCheckListModel extends AbstractListModel { private static final long serialVersionUID = 1L; @@ -65,10 +64,7 @@ public class DefaultCheckListModel extends AbstractListModel { checks.clear(); } } - - public DefaultCheckListModel(T... data) { - this(Arrays.asList(data)); - } + /* (non-Javadoc) * @see org.oxbow.swingbits.list.ICheckListModel#getSize() @@ -84,7 +80,7 @@ public class DefaultCheckListModel extends AbstractListModel { @Override - public Object getElementAt(int index) { + public T getElementAt(int index) { return data().get(index); } diff --git a/swing/src/net/sf/openrocket/gui/util/EditDecalHelper.java b/swing/src/net/sf/openrocket/gui/util/EditDecalHelper.java index 4cb8818b4..6059848d2 100644 --- a/swing/src/net/sf/openrocket/gui/util/EditDecalHelper.java +++ b/swing/src/net/sf/openrocket/gui/util/EditDecalHelper.java @@ -30,6 +30,7 @@ public class EditDecalHelper { private SwingPreferences prefs; public static class EditDecalHelperException extends Exception { + private static final long serialVersionUID = 6434514222471759358L; private String extraMessage = ""; @@ -138,7 +139,7 @@ public class EditDecalHelper { try { tmpFile = File.createTempFile("OR_graphics", extension); } catch (IOException ioex) { - String message = MessageFormat.format(trans.get("EditDecalHelper.createFileException"), tmpFile.getAbsoluteFile()); + String message = MessageFormat.format(trans.get("EditDecalHelper.createFileException"), "OR_graphics"+extension); throw new EditDecalHelperException(message, ioex); } diff --git a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java index 80a1e0fac..e3525963e 100644 --- a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java +++ b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java @@ -166,6 +166,11 @@ public class GUIUtil { */ public static void installEscapeCloseOperation(final JDialog dialog) { Action dispatchClosing = new AbstractAction() { + /** + * + */ + private static final long serialVersionUID = 9196153713666242274L; + @Override public void actionPerformed(ActionEvent event) { log.info(Markers.USER_MARKER, "Closing dialog " + dialog); @@ -477,13 +482,13 @@ public class GUIUtil { } } else if (c instanceof JComboBox) { - - JComboBox combo = (JComboBox) c; + @SuppressWarnings("unchecked") + JComboBox combo = (JComboBox) c; for (ActionListener l : combo.getActionListeners()) { combo.removeActionListener(l); } - ComboBoxModel model = combo.getModel(); - combo.setModel(new DefaultComboBoxModel()); + ComboBoxModel model = combo.getModel(); + combo.setModel(new DefaultComboBoxModel()); if (model instanceof Invalidatable) { ((Invalidatable) model).invalidate(); } @@ -496,6 +501,8 @@ public class GUIUtil { } Action model = button.getAction(); button.setAction(new AbstractAction() { + private static final long serialVersionUID = 3499667830135101535L; + @Override public void actionPerformed(ActionEvent e) { } diff --git a/swing/src/net/sf/openrocket/gui/widgets/MultiSlider.java b/swing/src/net/sf/openrocket/gui/widgets/MultiSlider.java index 544b91287..e5449da21 100644 --- a/swing/src/net/sf/openrocket/gui/widgets/MultiSlider.java +++ b/swing/src/net/sf/openrocket/gui/widgets/MultiSlider.java @@ -47,12 +47,8 @@ import javax.swing.plaf.SliderUI; * @see JSlider */ +@SuppressWarnings("serial") public class MultiSlider extends JSlider { - /*** - * @see #getUIClassID - * @see #readObject - */ - private static final String uiClassID = "MultiSliderUI"; /*** * An array of data models that handle the numeric maximum values, @@ -212,28 +208,6 @@ public class MultiSlider extends JSlider { updateUI(); } - /*** - * Sets the number of thumbs. - */ - private void setNumberOfThumbs(int num) { - setNumberOfThumbs(num, false); - } - - /*** - * Sets the number of thumbs. - */ - private void setNumberOfThumbs(int num, boolean useEndPoints) { - if (getNumberOfThumbs() != num) { - setNumberOfThumbs(getMinimum(), getMaximum(), num, useEndPoints); - } - } - - /*** - * Sets the number of thumbs by specifying the initial values. - */ - private void setNumberOfThumbs(int[] values) { - setNumberOfThumbs(getMinimum(), getMaximum(), values); - } /*** * creates evenly spaced values for thumbs. diff --git a/swing/src/net/sf/openrocket/utils/ComponentPresetEditor.java b/swing/src/net/sf/openrocket/utils/ComponentPresetEditor.java index 135cf2cd9..a2f01c8b1 100644 --- a/swing/src/net/sf/openrocket/utils/ComponentPresetEditor.java +++ b/swing/src/net/sf/openrocket/utils/ComponentPresetEditor.java @@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory; * A UI for editing component presets. Currently this is a standalone application - run the main within this class. * TODO: Full I18n TODO: Save As .csv */ +@SuppressWarnings("serial") public class ComponentPresetEditor extends JPanel implements PresetResultListener { /** diff --git a/swing/src/net/sf/openrocket/utils/MotorPlot.java b/swing/src/net/sf/openrocket/utils/MotorPlot.java index f3b743105..e9df3df96 100644 --- a/swing/src/net/sf/openrocket/utils/MotorPlot.java +++ b/swing/src/net/sf/openrocket/utils/MotorPlot.java @@ -34,6 +34,7 @@ import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; +@SuppressWarnings("serial") public class MotorPlot extends JDialog { private int selected = -1;