diff --git a/core/src/main/java/de/congrace/exp4j/CustomFunction.java b/core/src/main/java/de/congrace/exp4j/CustomFunction.java index e8ec22cbf..2af79c2ec 100644 --- a/core/src/main/java/de/congrace/exp4j/CustomFunction.java +++ b/core/src/main/java/de/congrace/exp4j/CustomFunction.java @@ -70,7 +70,7 @@ public abstract class CustomFunction extends CalculationToken { @Override void mutateStackForCalculation(Stack stack, VariableSet variables) { - List args = new ArrayList(argc); + List args = new ArrayList<>(argc); for (int i=0; i < argc; i++) { args.add(i, stack.pop() ); } diff --git a/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java b/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java index 52feb0ba2..b05b9468a 100644 --- a/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java +++ b/core/src/main/java/de/congrace/exp4j/ExpressionBuilder.java @@ -13,7 +13,7 @@ import java.util.Set; */ public class ExpressionBuilder { private VariableSet variables = new VariableSet(); - private final Set customFunctions = new HashSet(); + private final Set customFunctions = new HashSet<>(); private String expression; diff --git a/core/src/main/java/de/congrace/exp4j/InfixTranslator.java b/core/src/main/java/de/congrace/exp4j/InfixTranslator.java index 9712bce38..3eb67f420 100644 --- a/core/src/main/java/de/congrace/exp4j/InfixTranslator.java +++ b/core/src/main/java/de/congrace/exp4j/InfixTranslator.java @@ -96,7 +96,7 @@ class InfixTranslator { infixExpression = substituteUnaryOperators(infixExpression); final Token[] tokens = new Tokenizer(variableStrings, customFunctions).tokenize(infixExpression); final StringBuilder output = new StringBuilder(tokens.length); - final Stack operatorStack = new Stack(); + final Stack operatorStack = new Stack<>(); for (final Token token : tokens) { token.mutateStackForInfixTranslation(operatorStack, output); } diff --git a/core/src/main/java/de/congrace/exp4j/PostfixExpression.java b/core/src/main/java/de/congrace/exp4j/PostfixExpression.java index e4ca42f9f..45b806787 100644 --- a/core/src/main/java/de/congrace/exp4j/PostfixExpression.java +++ b/core/src/main/java/de/congrace/exp4j/PostfixExpression.java @@ -103,7 +103,7 @@ public final class PostfixExpression extends AbstractExpression implements Calcu @Override public Variable calculate() throws IllegalArgumentException { - final Stack stack = new Stack(); + final Stack stack = new Stack<>(); for (final Token t : getTokens()) { ((CalculationToken) t).mutateStackForCalculation(stack, variables); } diff --git a/core/src/main/java/de/congrace/exp4j/Tokenizer.java b/core/src/main/java/de/congrace/exp4j/Tokenizer.java index d3784b58a..ea8d8a9a2 100644 --- a/core/src/main/java/de/congrace/exp4j/Tokenizer.java +++ b/core/src/main/java/de/congrace/exp4j/Tokenizer.java @@ -31,7 +31,7 @@ import de.congrace.exp4j.FunctionToken.Function; */ class Tokenizer { private String[] variableNames; - private final Set functionNames = new HashSet(); + private final Set functionNames = new HashSet<>(); private final Set customFunctions; { @@ -160,7 +160,7 @@ class Tokenizer { * when an unknown function name has been used. */ Token[] tokenize(String infix) throws UnparsableExpressionException, UnknownFunctionException { - final List tokens = new ArrayList(); + final List tokens = new ArrayList<>(); final char[] chars = infix.toCharArray(); // iterate over the chars and fork on different types of input Token lastToken; diff --git a/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java b/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java index 33a5e3a30..4e18d2914 100644 --- a/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java +++ b/core/src/main/java/info/openrocket/core/aerodynamics/FlightConditions.java @@ -23,7 +23,7 @@ import info.openrocket.core.util.ModID; */ public class FlightConditions implements Cloneable, ChangeSource, Monitorable { - private List listenerList = new ArrayList(); + private List listenerList = new ArrayList<>(); private EventObject event = new EventObject(this); /** Reference length used in calculations. */ @@ -419,7 +419,7 @@ public class FlightConditions implements Cloneable, ChangeSource, Monitorable { public FlightConditions clone() { try { FlightConditions cond = (FlightConditions) super.clone(); - cond.listenerList = new ArrayList(); + cond.listenerList = new ArrayList<>(); cond.event = new EventObject(cond); cond.atmosphericConditions = atmosphericConditions.clone(); return cond; diff --git a/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java b/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java index 83b3bf2da..2ce1c5ec3 100644 --- a/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java +++ b/core/src/main/java/info/openrocket/core/appearance/defaults/DefaultAppearance.java @@ -89,7 +89,7 @@ public class DefaultAppearance { private static final Appearance KLIMA_MOTOR = simple("/datafiles/textures/motors/klima.jpg"); private static final Appearance REUSABLE_MOTOR = simpleAlpha(new ORColor(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png"); - private static final HashMap plastics = new HashMap(); + private static final HashMap plastics = new HashMap<>(); /** * gets the appearance correspondent to the plastic with the given color diff --git a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java index ed52ecb67..c28177570 100644 --- a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java @@ -35,7 +35,7 @@ public class ComponentPresetDatabase extends Database implement return Collections.emptyList(); } - List result = new ArrayList(list.size() / 6); + List result = new ArrayList<>(list.size() / 6); for (ComponentPreset preset : list) { if (preset.get(ComponentPreset.TYPE).equals(type)) { @@ -61,7 +61,7 @@ public class ComponentPresetDatabase extends Database implement return listForType(type); } - List result = new ArrayList(list.size() / 6); + List result = new ArrayList<>(list.size() / 6); Set favorites = Application.getPreferences().getComponentFavorites(type); @@ -83,7 +83,7 @@ public class ComponentPresetDatabase extends Database implement return listForType(type[0]); } - List result = new ArrayList(list.size() / 6); + List result = new ArrayList<>(list.size() / 6); for (ComponentPreset preset : list) { ComponentPreset.Type presetType = preset.get(ComponentPreset.TYPE); @@ -105,7 +105,7 @@ public class ComponentPresetDatabase extends Database implement @Override public List find(String manufacturer, String partNo) { - List presets = new ArrayList(); + List presets = new ArrayList<>(); for (ComponentPreset preset : list) { if (preset.getManufacturer().matches(manufacturer) && preset.getPartNo().equals(partNo)) { presets.add(preset); diff --git a/core/src/main/java/info/openrocket/core/database/Database.java b/core/src/main/java/info/openrocket/core/database/Database.java index 8aed3e00e..21bd1342a 100644 --- a/core/src/main/java/info/openrocket/core/database/Database.java +++ b/core/src/main/java/info/openrocket/core/database/Database.java @@ -18,8 +18,8 @@ import java.util.List; public class Database> extends AbstractSet { /** the list that contains the data from the database itself */ - protected final List list = new ArrayList(); - private final ArrayList> listeners = new ArrayList>(); + protected final List list = new ArrayList<>(); + private final ArrayList> listeners = new ArrayList<>(); @Override public Iterator iterator() { diff --git a/core/src/main/java/info/openrocket/core/database/Databases.java b/core/src/main/java/info/openrocket/core/database/Databases.java index cf9c8c0b4..f60171f63 100644 --- a/core/src/main/java/info/openrocket/core/database/Databases.java +++ b/core/src/main/java/info/openrocket/core/database/Databases.java @@ -25,15 +25,15 @@ public class Databases { /** * A database of bulk materials (with bulk densities). */ - public static final Database BULK_MATERIAL = new Database(); + public static final Database BULK_MATERIAL = new Database<>(); /** * A database of surface materials (with surface densities). */ - public static final Database SURFACE_MATERIAL = new Database(); + public static final Database SURFACE_MATERIAL = new Database<>(); /** * A database of linear material (with length densities). */ - public static final Database LINE_MATERIAL = new Database(); + public static final Database LINE_MATERIAL = new Database<>(); diff --git a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java index ae3d7e521..7d7997776 100644 --- a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java +++ b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSet.java @@ -28,10 +28,10 @@ public class ThrustCurveMotorSet implements Comparable { private static final DesignationComparator DESIGNATION_COMPARATOR = new DesignationComparator(); private static final ThrustCurveMotorComparator comparator = new ThrustCurveMotorComparator(); - private final ArrayList motors = new ArrayList(); - private final Map digestMap = new IdentityHashMap(); + private final ArrayList motors = new ArrayList<>(); + private final Map digestMap = new IdentityHashMap<>(); - private final List delays = new ArrayList(); + private final List delays = new ArrayList<>(); private Manufacturer manufacturer = null; private String commonName = null; diff --git a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java index 2f756afac..427cd3825 100644 --- a/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/motor/ThrustCurveMotorSetDatabase.java @@ -19,14 +19,14 @@ import info.openrocket.core.motor.ThrustCurveMotor; public class ThrustCurveMotorSetDatabase implements MotorDatabase { private static final Logger log = LoggerFactory.getLogger(ThrustCurveMotorSetDatabase.class); - private final List motorSets = new ArrayList(); + private final List motorSets = new ArrayList<>(); @Override public List findMotors(String digest, Motor.Type type, String manufacturer, String designation, double diameter, double length) { - ArrayList fullMatches = new ArrayList(); - ArrayList digestMatches = new ArrayList(); - ArrayList descriptionMatches = new ArrayList(); + ArrayList fullMatches = new ArrayList<>(); + ArrayList digestMatches = new ArrayList<>(); + ArrayList descriptionMatches = new ArrayList<>(); // Apply filters to see if we can find any motors that match the given criteria. // We'll return diff --git a/core/src/main/java/info/openrocket/core/document/DecalRegistry.java b/core/src/main/java/info/openrocket/core/document/DecalRegistry.java index 928430423..f5eed91bc 100644 --- a/core/src/main/java/info/openrocket/core/document/DecalRegistry.java +++ b/core/src/main/java/info/openrocket/core/document/DecalRegistry.java @@ -41,7 +41,7 @@ public class DecalRegistry { } /** the decal usage map */ - private final Map registeredDecals = new HashMap(); + private final Map registeredDecals = new HashMap<>(); /** * returns a new decal with the same image but with unique names @@ -113,7 +113,7 @@ public class DecalRegistry { public Collection getDecalList() { - Set decals = new TreeSet(); + Set decals = new TreeSet<>(); decals.addAll(registeredDecals.values()); @@ -299,7 +299,7 @@ public class DecalRegistry { String basename = getGroup(BASE_NAME_INDEX, fileNamePattern.matcher(newName)); String extension = getGroup(EXTENSION_INDEX, fileNamePattern.matcher(newName)); - Set counts = new TreeSet(); + Set counts = new TreeSet<>(); boolean needsRewrite = false; diff --git a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java index a952ca535..1e59e1439 100644 --- a/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java +++ b/core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java @@ -72,8 +72,8 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL private final Rocket rocket; - private final ArrayList simulations = new ArrayList(); - private final ArrayList customExpressions = new ArrayList(); + private final ArrayList simulations = new ArrayList<>(); + private final ArrayList customExpressions = new ArrayList<>(); // The Photo Settings will be saved in the core module as a map of key values with corresponding content private Map photoSettings = new HashMap<>(); @@ -86,8 +86,8 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL * The undo history of the rocket. Whenever a new undo position is created while the * rocket is in "dirty" state, the rocket is copied here. */ - private final LinkedList undoHistory = new LinkedList(); - private final LinkedList undoDescription = new LinkedList(); + private final LinkedList undoHistory = new LinkedList<>(); + private final LinkedList undoDescription = new LinkedList<>(); /** * The position in the undoHistory we are currently at. If modifications have been @@ -103,7 +103,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL private String storedDescription = null; - private final ArrayList undoRedoListeners = new ArrayList(2); + private final ArrayList undoRedoListeners = new ArrayList<>(2); private File file = null; private ModID modID = ModID.INVALID; @@ -114,7 +114,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL private final DecalRegistry decalRegistry = new DecalRegistry(); - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); /** * main constructor, enable events in the rocket @@ -169,7 +169,7 @@ public class OpenRocketDocument implements ComponentChangeListener, StateChangeL * @returns a set of all the flight data types defined or available in any way in the rocket document */ public Set getFlightDataTypes() { - Set allTypes = new LinkedHashSet(); + Set allTypes = new LinkedHashSet<>(); // built in Collections.addAll(allTypes, FlightDataType.ALL_TYPES); diff --git a/core/src/main/java/info/openrocket/core/document/Simulation.java b/core/src/main/java/info/openrocket/core/document/Simulation.java index 9ae81a92c..c661ace65 100644 --- a/core/src/main/java/info/openrocket/core/document/Simulation.java +++ b/core/src/main/java/info/openrocket/core/document/Simulation.java @@ -84,7 +84,7 @@ public class Simulation implements ChangeSource, Cloneable { // TODO: HIGH: Change to use actual conditions class?? private SimulationOptions options = new SimulationOptions(); - private ArrayList simulationExtensions = new ArrayList(); + private ArrayList simulationExtensions = new ArrayList<>(); private final Class simulationEngineClass = BasicEventSimulationEngine.class; @@ -94,7 +94,7 @@ public class Simulation implements ChangeSource, Cloneable { private final Class massCalculatorClass = MassCalculator.class; /** Listeners for this object */ - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); /** The conditions actually used in the previous simulation, or null */ @@ -547,11 +547,11 @@ public class Simulation implements ChangeSource, Cloneable { copy.mutex = SafetyMutex.newInstance(); copy.status = Status.NOT_SIMULATED; copy.options = this.options.clone(); - copy.simulationExtensions = new ArrayList(); + copy.simulationExtensions = new ArrayList<>(); for (SimulationExtension c : this.simulationExtensions) { copy.simulationExtensions.add(c.clone()); } - copy.listeners = new ArrayList(); + copy.listeners = new ArrayList<>(); copy.simulatedConditions = null; copy.simulatedConfigurationDescription = null; copy.simulatedData = null; diff --git a/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java b/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java index 2c2282714..88e8a0eed 100644 --- a/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/GeneralRocketSaver.java @@ -180,7 +180,7 @@ public class GeneralRocketSaver { return; } - Set usedDecals = new TreeSet(); + Set usedDecals = new TreeSet<>(); // Look for all decals used in the rocket. for (RocketComponent c : document.getRocket()) { diff --git a/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java index 9aefcf05a..0efb7e4b3 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/AbstractMotorLoader.java @@ -69,8 +69,8 @@ public abstract class AbstractMotorLoader implements MotorLoader { */ protected static List calculateMass(List time, List thrust, double total, double prop) { - List mass = new ArrayList(); - List deltam = new ArrayList(); + List mass = new ArrayList<>(); + List deltam = new ArrayList<>(); double t0, f0; double totalMassChange = 0; diff --git a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java index 6dd529ad7..aac788b1c 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/RASPMotorLoader.java @@ -62,8 +62,8 @@ public class RASPMotorLoader extends AbstractMotorLoader { double diameter = 0; ArrayList delays = null; - List time = new ArrayList(); - List thrust = new ArrayList(); + List time = new ArrayList<>(); + List thrust = new ArrayList<>(); double propW = 0; double totalW = 0; @@ -80,7 +80,7 @@ public class RASPMotorLoader extends AbstractMotorLoader { comment = ""; length = 0; diameter = 0; - delays = new ArrayList(); + delays = new ArrayList<>(); propW = 0; totalW = 0; time.clear(); diff --git a/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java b/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java index e0e99c9d4..3a221378d 100644 --- a/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java +++ b/core/src/main/java/info/openrocket/core/file/motor/RockSimMotorLoader.java @@ -160,7 +160,7 @@ public class RockSimMotorLoader extends AbstractMotorLoader { designation = removeDelay(str); // Delays - ArrayList delayList = new ArrayList(); + ArrayList delayList = new ArrayList<>(); str = attributes.get("delays"); if (str != null) { String[] split = str.split(","); @@ -397,10 +397,10 @@ public class RockSimMotorLoader extends AbstractMotorLoader { */ private static class RSEMotorDataHandler extends AbstractElementHandler { - private final List time = new ArrayList(); - private final List force = new ArrayList(); - private final List mass = new ArrayList(); - private final List cg = new ArrayList(); + private final List time = new ArrayList<>(); + private final List force = new ArrayList<>(); + private final List mass = new ArrayList<>(); + private final List cg = new ArrayList<>(); public List getTime() { return time; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java index c8dbbfbfa..3878fe24d 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/OpenRocketSaver.java @@ -479,7 +479,7 @@ public class OpenRocketSaver extends RocketSaver { return; // Retrieve the data from the branch - List> data = new ArrayList>(types.length); + List> data = new ArrayList<>(types.length); for (int i = 0; i < types.length; i++) { data.add(branch.get(types[i])); } diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java index f8283317c..c72f415c0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java @@ -18,7 +18,7 @@ public class ConfigHandler extends AbstractElementHandler { private ConfigHandler listHandler; private final Config config = new Config(); - private final List list = new ArrayList(); + private final List list = new ArrayList<>(); @Override public ElementHandler openElement(String element, HashMap attributes, WarningSet warnings) diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java index 3b31a2a58..f20ebef17 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/DocumentConfig.java @@ -63,7 +63,7 @@ class DocumentConfig { //////// Component constructors - static final HashMap> constructors = new HashMap>(); + static final HashMap> constructors = new HashMap<>(); static { try { // External components @@ -108,7 +108,7 @@ class DocumentConfig { * the element name. Setters are searched for in descending class order. * A setter of null means setting the parameter is not allowed. */ - static final HashMap setters = new HashMap(); + static final HashMap setters = new HashMap<>(); static { // RocketComponent setters.put("RocketComponent:name", new StringSetter( @@ -117,7 +117,7 @@ class DocumentConfig { Reflection.findMethod(RocketComponent.class, "setID", String.class))); setters.put("RocketComponent:color", new ColorSetter( Reflection.findMethod(RocketComponent.class, "setColor", ORColor.class))); - setters.put("RocketComponent:linestyle", new EnumSetter( + setters.put("RocketComponent:linestyle", new EnumSetter<>( Reflection.findMethod(RocketComponent.class, "setLineStyle", LineStyle.class), LineStyle.class)); setters.put("RocketComponent:position", new AxialPositionSetter()); @@ -149,7 +149,7 @@ class DocumentConfig { // ExternalComponent - setters.put("ExternalComponent:finish", new EnumSetter( + setters.put("ExternalComponent:finish", new EnumSetter<>( Reflection.findMethod(ExternalComponent.class, "setFinish", Finish.class), Finish.class)); setters.put("ExternalComponent:material", new MaterialSetter( @@ -215,7 +215,7 @@ class DocumentConfig { // Transition - setters.put("Transition:shape", new EnumSetter( + setters.put("Transition:shape", new EnumSetter<>( Reflection.findMethod(Transition.class, "setShapeType", Transition.Shape.class), Transition.Shape.class)); setters.put("Transition:shapeclipped", new BooleanSetter( @@ -274,7 +274,7 @@ class DocumentConfig { setters.put("FinSet:radiusoffset", new RadiusPositionSetter()); setters.put("FinSet:thickness", new DoubleSetter( Reflection.findMethod(FinSet.class, "setThickness", double.class))); - setters.put("FinSet:crosssection", new EnumSetter( + setters.put("FinSet:crosssection", new EnumSetter<>( Reflection.findMethod(FinSet.class, "setCrossSection", FinSet.CrossSection.class), FinSet.CrossSection.class)); setters.put("FinSet:cant", new DoubleSetter( @@ -414,7 +414,7 @@ class DocumentConfig { * Reflection.findMethod(MassComponent.class, "setMassComponentType", * double.class))); */ - setters.put("MassComponent:masscomponenttype", new EnumSetter( + setters.put("MassComponent:masscomponenttype", new EnumSetter<>( Reflection.findMethod(MassComponent.class, "setMassComponentType", MassComponent.MassComponentType.class), MassComponent.MassComponentType.class)); @@ -437,7 +437,7 @@ class DocumentConfig { Reflection.findMethod(RecoveryDevice.class, "setCD", double.class), "auto", Reflection.findMethod(RecoveryDevice.class, "setCDAutomatic", boolean.class))); - setters.put("RecoveryDevice:deployevent", new EnumSetter( + setters.put("RecoveryDevice:deployevent", new EnumSetter<>( Reflection.findMethod(RecoveryDevice.class, "getDeploymentConfigurations"), Reflection.findMethod(DeploymentConfiguration.class, "setDeployEvent", DeployEvent.class), DeployEvent.class)); @@ -479,7 +479,7 @@ class DocumentConfig { // Rocket // handled by separate handler - setters.put("Rocket:referencetype", new EnumSetter( + setters.put("Rocket:referencetype", new EnumSetter<>( Reflection.findMethod(Rocket.class, "setReferenceType", ReferenceType.class), ReferenceType.class)); setters.put("Rocket:customreference", new DoubleSetter( @@ -490,7 +490,7 @@ class DocumentConfig { Reflection.findMethod(Rocket.class, "setRevision", String.class))); // Axial Stage - setters.put("AxialStage:separationevent", new EnumSetter( + setters.put("AxialStage:separationevent", new EnumSetter<>( Reflection.findMethod(AxialStage.class, "getSeparationConfigurations"), Reflection.findMethod(StageSeparationConfiguration.class, "setSeparationEvent", StageSeparationConfiguration.SeparationEvent.class), diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java index 5fc582f4e..fa7a107bf 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FinSetPointHandler.java @@ -22,7 +22,7 @@ class FinSetPointHandler extends AbstractElementHandler { @SuppressWarnings("unused") private final DocumentLoadingContext context; private final FreeformFinSet finset; - private final ArrayList coordinates = new ArrayList(); + private final ArrayList coordinates = new ArrayList<>(); public FinSetPointHandler(FreeformFinSet finset, DocumentLoadingContext context) { this.finset = finset; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java index 85f2bee93..6ce1573f1 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/FlightDataHandler.java @@ -19,7 +19,7 @@ class FlightDataHandler extends AbstractElementHandler { private FlightDataBranchHandler dataHandler; private final WarningSet warningSet = new WarningSet(); - private final List branches = new ArrayList(); + private final List branches = new ArrayList<>(); private final SingleSimulationHandler simHandler; private FlightData data; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java b/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java index 829425a06..92ee0035b 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/importt/SingleSimulationHandler.java @@ -36,7 +36,7 @@ class SingleSimulationHandler extends AbstractElementHandler { private ConfigHandler configHandler; private FlightDataHandler dataHandler; - private final List extensions = new ArrayList(); + private final List extensions = new ArrayList<>(); public SingleSimulationHandler(OpenRocketDocument doc, DocumentLoadingContext context) { this.doc = doc; @@ -89,7 +89,7 @@ class SingleSimulationHandler extends AbstractElementHandler { String id = attributes.get("extensionid"); SimulationExtension extension = null; Set extensionProviders = Application.getInjector() - .getInstance(new Key>() { + .getInstance(new Key<>() { }); for (SimulationExtensionProvider p : extensionProviders) { if (p.getIds().contains(id)) { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java index 4cca96ac7..d793a2f28 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/AxialStageSaver.java @@ -15,7 +15,7 @@ public class AxialStageSaver extends ComponentAssemblySaver { private static final AxialStageSaver instance = new AxialStageSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (c.isAfter()) { // yes, this test is redundant. I'm merely paranoid, and attempting to @@ -67,7 +67,7 @@ public class AxialStageSaver extends ComponentAssemblySaver { } private List addSeparationConfigParams(StageSeparationConfiguration config, boolean indent) { - List elements = new ArrayList(2); + List elements = new ArrayList<>(2); elements.add((indent ? " " : "") + "" + config.getSeparationEvent().name().toLowerCase(Locale.ENGLISH).replace("_", "") + ""); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java index 0228f31df..d4d5519bd 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BodyTubeSaver.java @@ -8,7 +8,7 @@ public class BodyTubeSaver extends SymmetricComponentSaver { private static final BodyTubeSaver instance = new BodyTubeSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java index 747824156..0f2505df9 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/BulkheadSaver.java @@ -8,7 +8,7 @@ public class BulkheadSaver extends RadiusRingComponentSaver { private static final BulkheadSaver instance = new BulkheadSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java index 54f50d390..89b206024 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/CenteringRingSaver.java @@ -8,7 +8,7 @@ public class CenteringRingSaver extends RadiusRingComponentSaver { private static final CenteringRingSaver instance = new CenteringRingSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java index 121259c0b..5817d6c69 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ComponentAssemblySaver.java @@ -9,7 +9,7 @@ public class ComponentAssemblySaver extends RocketComponentSaver { private static final ComponentAssemblySaver instance = new ComponentAssemblySaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); if (!c.isAfter()) { if (c instanceof PodSet) { diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java index b7979eafe..1e58a2790 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EllipticalFinSetSaver.java @@ -8,7 +8,7 @@ public class EllipticalFinSetSaver extends FinSetSaver { private static final EllipticalFinSetSaver instance = new EllipticalFinSetSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java index 5e8d0497a..fe755c2e7 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/EngineBlockSaver.java @@ -8,7 +8,7 @@ public class EngineBlockSaver extends ThicknessRingComponentSaver { private static final EngineBlockSaver instance = new EngineBlockSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java index 64e3e61ac..55accf3b1 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/FreeformFinSetSaver.java @@ -11,7 +11,7 @@ public class FreeformFinSetSaver extends FinSetSaver { private static final FreeformFinSetSaver instance = new FreeformFinSetSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java index 2c0f39aa0..b352f5aab 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/InnerTubeSaver.java @@ -10,7 +10,7 @@ public class InnerTubeSaver extends ThicknessRingComponentSaver { private static final InnerTubeSaver instance = new InnerTubeSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java index 4138e62e6..fe52b8d48 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/LaunchLugSaver.java @@ -10,7 +10,7 @@ public class LaunchLugSaver extends ExternalComponentSaver { private static final LaunchLugSaver instance = new LaunchLugSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java index 032b185d4..46bb242c3 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/MassComponentSaver.java @@ -12,7 +12,7 @@ public class MassComponentSaver extends MassObjectSaver { private static final MassComponentSaver instance = new MassComponentSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java index c855ed5e8..78b73c11c 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/NoseConeSaver.java @@ -10,7 +10,7 @@ public class NoseConeSaver extends TransitionSaver { private static final NoseConeSaver instance = new NoseConeSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java index 99d9e04f4..48bda7ece 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ParachuteSaver.java @@ -10,7 +10,7 @@ public class ParachuteSaver extends RecoveryDeviceSaver { private static final ParachuteSaver instance = new ParachuteSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java index c271974e9..5db0357c0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/PhotoStudioSaver.java @@ -17,7 +17,7 @@ import java.util.Map; */ public class PhotoStudioSaver { public static List getElements(Map photoSettings) { - List elements = new ArrayList(); + List elements = new ArrayList<>(); if (photoSettings == null || photoSettings.size() == 0) return elements; diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java index ce8177c4f..8e3fbfd4a 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RailButtonSaver.java @@ -10,7 +10,7 @@ public class RailButtonSaver extends ExternalComponentSaver { private static final RailButtonSaver instance = new RailButtonSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java index 3eea56a09..6ef4183c0 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RecoveryDeviceSaver.java @@ -43,7 +43,7 @@ public class RecoveryDeviceSaver extends MassObjectSaver { } private List addDeploymentConfigurationParams(DeploymentConfiguration config, boolean indent) { - List elements = new ArrayList(3); + List elements = new ArrayList<>(3); elements.add((indent ? " " : "") + "" + config.getDeployEvent().name().toLowerCase(Locale.ENGLISH).replace("_", "") + ""); elements.add((indent ? " " : "") + "" + config.getDeployAltitude() + ""); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java index 37a161676..84ec7f73a 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketComponentSaver.java @@ -226,7 +226,7 @@ public class RocketComponentSaver { //FlightConfigurationID[] motorConfigIDs = ((RocketComponent) mount).getRocket().getFlightConfigurationIDs(); //ParameterSet configs = ((RocketComponent) mount).getRocket().getConfigurationSet(); - List elements = new ArrayList(); + List elements = new ArrayList<>(); MotorConfiguration defaultInstance = mount.getDefaultMotorConfig(); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java index 774a9fd25..e7ede446f 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/RocketSaver.java @@ -16,7 +16,7 @@ public class RocketSaver extends RocketComponentSaver { private static final RocketSaver instance = new RocketSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java index a950658d1..a036c3102 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/ShockCordSaver.java @@ -10,7 +10,7 @@ public class ShockCordSaver extends MassObjectSaver { private static final ShockCordSaver instance = new ShockCordSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java index dc345acfb..d34c9baf3 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/StreamerSaver.java @@ -10,7 +10,7 @@ public class StreamerSaver extends RecoveryDeviceSaver { private static final StreamerSaver instance = new StreamerSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java index 8d2ed1da4..8a2421cfa 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TransitionSaver.java @@ -12,7 +12,7 @@ public class TransitionSaver extends SymmetricComponentSaver { private static final TransitionSaver instance = new TransitionSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java index e0ef34cee..8c08d17a5 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TrapezoidFinSetSaver.java @@ -8,7 +8,7 @@ public class TrapezoidFinSetSaver extends FinSetSaver { private static final TrapezoidFinSetSaver instance = new TrapezoidFinSetSaver(); public static ArrayList getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java index b49d895f9..8848e3368 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeCouplerSaver.java @@ -8,7 +8,7 @@ public class TubeCouplerSaver extends ThicknessRingComponentSaver { private static final TubeCouplerSaver instance = new TubeCouplerSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java index 6d3f5f0f0..721d7cf91 100644 --- a/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java +++ b/core/src/main/java/info/openrocket/core/file/openrocket/savers/TubeFinSetSaver.java @@ -10,7 +10,7 @@ public class TubeFinSetSaver extends ExternalComponentSaver { private static final TubeFinSetSaver instance = new TubeFinSetSaver(); public static List getElements(info.openrocket.core.rocketcomponent.RocketComponent c) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(""); instance.addParams(c, list); diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java b/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java index e186093dc..dbfa90cdc 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/RockSimNoseConeCode.java @@ -34,7 +34,7 @@ public enum RockSimNoseConeCode { /** * Names of the shape that are sometimes found in NCDATA.CSV */ - private final Set shapeNames = new HashSet(); + private final Set shapeNames = new HashSet<>(); /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java index 6f81db496..a4011fe10 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/AbstractTransitionDTO.java @@ -51,7 +51,7 @@ public class AbstractTransitionDTO extends BasePartDTO implements AttachablePart @XmlElementRef(name = RockSimCommonConstants.STREAMER, type = StreamerDTO.class), @XmlElementRef(name = RockSimCommonConstants.PARACHUTE, type = ParachuteDTO.class), @XmlElementRef(name = RockSimCommonConstants.MASS_OBJECT, type = MassObjectDTO.class) }) - List attachedParts = new ArrayList(); + List attachedParts = new ArrayList<>(); /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java index 2cc94c43d..deb3a6b2f 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/BodyTubeDTO.java @@ -62,7 +62,7 @@ public class BodyTubeDTO extends BasePartDTO implements AttachableParts { @XmlElementRef(name = RockSimCommonConstants.PARACHUTE, type = ParachuteDTO.class), @XmlElementRef(name = RockSimCommonConstants.MASS_OBJECT, type = MassObjectDTO.class), @XmlElementRef(name = RockSimCommonConstants.EXTERNAL_POD, type = PodSetDTO.class) }) - List attachedParts = new ArrayList(); + List attachedParts = new ArrayList<>(); /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java index 58588f748..b6dbfecf6 100644 --- a/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java +++ b/core/src/main/java/info/openrocket/core/file/rocksim/export/StageDTO.java @@ -25,7 +25,7 @@ public class StageDTO { @XmlElementRef(name = RockSimCommonConstants.NOSE_CONE, type = NoseConeDTO.class), @XmlElementRef(name = RockSimCommonConstants.TRANSITION, type = TransitionDTO.class) }) - private final List externalPart = new ArrayList(); + private final List externalPart = new ArrayList<>(); /** * Default constructor. diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java b/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java index 4d62e4a47..8876f79a4 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/DelegatorHandler.java @@ -18,9 +18,9 @@ import info.openrocket.core.logging.WarningSet; class DelegatorHandler extends DefaultHandler { private final WarningSet warnings; - private final Deque handlerStack = new ArrayDeque(); - private final Deque elementData = new ArrayDeque(); - private final Deque> elementAttributes = new ArrayDeque>(); + private final Deque handlerStack = new ArrayDeque<>(); + private final Deque elementData = new ArrayDeque<>(); + private final Deque> elementAttributes = new ArrayDeque<>(); // Ignore all elements as long as ignore > 0 private int ignore = 0; @@ -98,7 +98,7 @@ class DelegatorHandler extends DefaultHandler { } private static HashMap copyAttributes(Attributes atts) { - HashMap ret = new HashMap(); + HashMap ret = new HashMap<>(); for (int i = 0; i < atts.getLength(); i++) { ret.put(atts.getLocalName(i), atts.getValue(i)); } diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java b/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java index 3bb68d8b6..25b1043ee 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/NullElementHandler.java @@ -21,7 +21,7 @@ import org.xml.sax.SAXException; public class NullElementHandler extends AbstractElementHandler { public static final NullElementHandler INSTANCE = new NullElementHandler(); - private static final HashMap EMPTY_MAP = new HashMap(); + private static final HashMap EMPTY_MAP = new HashMap<>(); private NullElementHandler() { } diff --git a/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java b/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java index 923bec4ee..32f1f2f33 100644 --- a/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java +++ b/core/src/main/java/info/openrocket/core/file/simplesax/SimpleSAX.java @@ -69,7 +69,7 @@ public class SimpleSAX { private XMLReaderCache(int maxSize) { parserFactory = SAXParserFactory.newInstance(); parserFactory.setNamespaceAware(true); - queue = new LinkedBlockingQueue(maxSize); + queue = new LinkedBlockingQueue<>(maxSize); } private XMLReader createXMLReader() throws SAXException { diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java index 8b2a41c07..544135352 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultMtl.java @@ -212,7 +212,7 @@ public final class DefaultMtl implements Mtl { */ public DefaultMtl(String name) { this.name = name; - this.reflOptions = new ArrayList(); + this.reflOptions = new ArrayList<>(); } @Override diff --git a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java index 87db310f1..718b347fb 100644 --- a/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java +++ b/core/src/main/java/info/openrocket/core/file/wavefrontobj/DefaultObjGroup.java @@ -54,7 +54,7 @@ public final class DefaultObjGroup implements ObjGroup { */ public DefaultObjGroup(String name) { this.name = name; - faces = new ArrayList(); + faces = new ArrayList<>(); } @Override diff --git a/core/src/main/java/info/openrocket/core/l10n/L10N.java b/core/src/main/java/info/openrocket/core/l10n/L10N.java index 919e590d8..d1221fd62 100644 --- a/core/src/main/java/info/openrocket/core/l10n/L10N.java +++ b/core/src/main/java/info/openrocket/core/l10n/L10N.java @@ -103,7 +103,7 @@ public final class L10N { /* * This list is generated using the L10NGenerator utility. */ - Map m = new HashMap(); + Map m = new HashMap<>(); m.put('\u00aa', "a"); m.put('\u00b2', "2"); m.put('\u00b3', "3"); diff --git a/core/src/main/java/info/openrocket/core/logging/MessageSet.java b/core/src/main/java/info/openrocket/core/logging/MessageSet.java index 20aa0fd03..be11b51d7 100644 --- a/core/src/main/java/info/openrocket/core/logging/MessageSet.java +++ b/core/src/main/java/info/openrocket/core/logging/MessageSet.java @@ -94,23 +94,23 @@ public abstract class MessageSet extends AbstractSet imple @Override public Iterator iterator() { final Iterator iterator = messages.iterator(); - return new Iterator() { - @Override - public boolean hasNext() { - return iterator.hasNext(); - } + return new Iterator<>() { + @Override + public boolean hasNext() { + return iterator.hasNext(); + } - @Override - public E next() { - return iterator.next(); - } + @Override + public E next() { + return iterator.next(); + } - @Override - public void remove() { - mutable.check(); - iterator.remove(); - } - }; + @Override + public void remove() { + mutable.check(); + iterator.remove(); + } + }; } @Override diff --git a/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java b/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java index 01eec11f2..ff8cb8a8d 100644 --- a/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java +++ b/core/src/main/java/info/openrocket/core/masscalc/MassCalculation.java @@ -185,7 +185,7 @@ public class MassCalculation { RigidBody inertia = RigidBody.EMPTY; // center-of-mass AND moment-of-inertia data. - final ArrayList bodies = new ArrayList(); + final ArrayList bodies = new ArrayList<>(); String prefix = ""; diff --git a/core/src/main/java/info/openrocket/core/motor/Manufacturer.java b/core/src/main/java/info/openrocket/core/motor/Manufacturer.java index 4a2856f09..d30f774f9 100644 --- a/core/src/main/java/info/openrocket/core/motor/Manufacturer.java +++ b/core/src/main/java/info/openrocket/core/motor/Manufacturer.java @@ -41,7 +41,7 @@ public class Manufacturer implements Serializable { static { // AeroTech has many name combinations... - List names = new ArrayList(); + List names = new ArrayList<>(); for (String s : new String[] { "A", "AT", "AERO", "AEROT", "AEROTECH" }) { names.add(s); names.add(s + "-RMS"); @@ -141,8 +141,8 @@ public class Manufacturer implements Serializable { throw new IllegalArgumentException("motorType cannot be null"); } - Set all = new HashSet(); - Set search = new HashSet(); + Set all = new HashSet<>(); + Set search = new HashSet<>(); all.add(displayName); all.add(simpleName); diff --git a/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java b/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java index 7c89c09a5..21aebee6d 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/OptimizationControllerDelegator.java @@ -14,7 +14,7 @@ import java.util.List; */ public class OptimizationControllerDelegator implements OptimizationController { - private final List controllers = new ArrayList(); + private final List controllers = new ArrayList<>(); /** * Construct the controlled based on an array of controllers. diff --git a/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java b/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java index 94297c895..2345eec09 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/ParallelExecutorCache.java @@ -32,8 +32,8 @@ import info.openrocket.core.util.BugException; */ public class ParallelExecutorCache implements ParallelFunctionCache { - private final Map functionCache = new HashMap(); - private final Map> futureMap = new HashMap>(); + private final Map functionCache = new HashMap<>(); + private final Map> futureMap = new HashMap<>(); private final ExecutorService executor; @@ -57,7 +57,7 @@ public class ParallelExecutorCache implements ParallelFunctionCache { */ public ParallelExecutorCache(int threadCount) { this(new ThreadPoolExecutor(threadCount, threadCount, 60, TimeUnit.SECONDS, - new LinkedBlockingQueue(), + new LinkedBlockingQueue<>(), new ThreadFactory() { @Override public Thread newThread(Runnable r) { @@ -152,7 +152,7 @@ public class ParallelExecutorCache implements ParallelFunctionCache { @Override public List abort(Collection points) { - List computed = new ArrayList(Math.min(points.size(), 10)); + List computed = new ArrayList<>(Math.min(points.size(), 10)); for (Point p : points) { if (abort(p)) { @@ -244,7 +244,7 @@ public class ParallelExecutorCache implements ParallelFunctionCache { @Override public void clearCache() { - List list = new ArrayList(futureMap.keySet()); + List list = new ArrayList<>(futureMap.keySet()); abort(list); functionCache.clear(); } diff --git a/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java b/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java index 65bfd769d..1de7d5844 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/multidim/MultidirectionalSearchOptimizer.java @@ -31,7 +31,7 @@ import info.openrocket.core.util.Statistics; public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Statistics { private static final Logger log = LoggerFactory.getLogger(MultidirectionalSearchOptimizer.class); - private final List simplex = new ArrayList(); + private final List simplex = new ArrayList<>(); private ParallelFunctionCache functionExecutor; @@ -72,9 +72,9 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati } // Normal iterations - List reflection = new ArrayList(simplex.size()); - List expansion = new ArrayList(simplex.size()); - List coordinateSearch = new ArrayList(simplex.size()); + List reflection = new ArrayList<>(simplex.size()); + List expansion = new ArrayList<>(simplex.size()); + List coordinateSearch = new ArrayList<>(simplex.size()); Point current; double currentValue; boolean continueOptimization = true; @@ -177,7 +177,7 @@ public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Stati if (accept(coordinateSearch, currentValue)) { log.debug("Coordinate search successful, resetting simplex"); - List toAbort = new LinkedList(simplex); + List toAbort = new LinkedList<>(simplex); simplex.clear(); simplex.add(current); for (Point p : pattern) { diff --git a/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java b/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java index ce78091c8..01be44b4a 100644 --- a/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java +++ b/core/src/main/java/info/openrocket/core/optimization/general/multidim/SearchPattern.java @@ -19,7 +19,7 @@ public class SearchPattern { * @param dimensionality the dimensionality */ public static List square(int dimensionality) { - List pattern = new ArrayList(dimensionality); + List pattern = new ArrayList<>(dimensionality); for (int i = 0; i < dimensionality; i++) { double[] p = new double[dimensionality]; @@ -39,7 +39,7 @@ public class SearchPattern { throw new IllegalArgumentException("Illegal dimensionality " + dimensionality); } - List pattern = new ArrayList(dimensionality); + List pattern = new ArrayList<>(dimensionality); double[] coordinates = new double[dimensionality]; double dot = -1.0 / dimensionality; diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java index 7fc2aa61d..f2697f22a 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/IdentitySimulationDomain.java @@ -14,7 +14,7 @@ public class IdentitySimulationDomain implements SimulationDomain { @Override public Pair getDistanceToDomain(Simulation simulation) { - return new Pair(-1.0, null); + return new Pair<>(-1.0, null); } } diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java index f3fa5dd0f..bedaa96f9 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/domains/StabilityDomain.java @@ -108,27 +108,27 @@ public class StabilityDomain implements SimulationDomain { if (minAbsolute) { ref = minimum - absolute; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } else { ref = minimum - relative; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } if (maxAbsolute) { ref = absolute - maximum; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } else { ref = relative - maximum; if (ref > 0) { - return new Pair(ref, desc); + return new Pair<>(ref, desc); } } - return new Pair(0.0, desc); + return new Pair<>(0.0, desc); } } diff --git a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java index 0e8562617..bb392e59b 100644 --- a/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java +++ b/core/src/main/java/info/openrocket/core/optimization/rocketoptimization/modifiers/AbstractSimulationModifier.java @@ -30,7 +30,7 @@ public abstract class AbstractSimulationModifier implements SimulationModifier { private double minValue = 0.0; private double maxValue = 1.0; - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); /** * Sole constructor. diff --git a/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java b/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java index 589b213e2..af713a9e4 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/DefaultOptimizableParameterService.java @@ -24,7 +24,7 @@ public class DefaultOptimizableParameterService implements OptimizableParameterS @Override public Collection getParameters(OpenRocketDocument document) { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new MaximumAltitudeParameter()); list.add(new MaximumVelocityParameter()); diff --git a/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java b/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java index d838fec7e..8775059e7 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/DefaultSimulationModifierService.java @@ -46,7 +46,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi private static final double DEFAULT_RANGE_MULTIPLIER = 2.0; - private static final Map, List> definitions = new HashMap, List>(); + private static final Map, List> definitions = new HashMap<>(); static { //addModifier("optimization.modifier.", unitGroup, multiplier, componentClass, methodName); @@ -110,7 +110,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi List list = definitions.get(componentClass); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); definitions.put(componentClass, list); } @@ -124,7 +124,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi @Override public Collection getModifiers(OpenRocketDocument document) { - List modifiers = new ArrayList(); + List modifiers = new ArrayList<>(); Rocket rocket = document.getRocket(); @@ -192,7 +192,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi modifiers.add(mod); // Motor ignition delay - mod = new FlightConfigurationModifier( + mod = new FlightConfigurationModifier<>( trans.get("optimization.modifier.motormount.delay"), trans.get("optimization.modifier.motormount.delay.desc"), c, UnitGroup.UNITS_SHORT_TIME, @@ -250,7 +250,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi // Recovery device deployment altitude and delay if (c instanceof RecoveryDevice) { - SimulationModifier mod = new FlightConfigurationModifier( + SimulationModifier mod = new FlightConfigurationModifier<>( trans.get("optimization.modifier.recoverydevice.deployDelay"), trans.get("optimization.modifier.recoverydevice.deployDelay.desc"), c, @@ -266,7 +266,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi mod.setMaxValue(10); modifiers.add(mod); - mod = new FlightConfigurationModifier( + mod = new FlightConfigurationModifier<>( trans.get("optimization.modifier.recoverydevice.deployAltitude"), trans.get("optimization.modifier.recoverydevice.deployAltitude.desc"), c, @@ -277,13 +277,13 @@ public class DefaultSimulationModifierService implements SimulationModifierServi "DeploymentConfigurations", DeploymentConfiguration.class, "DeployAltitude") { - + @Override public void initialize(Simulation simulation) throws OptimizationException { DeploymentConfiguration config = getModifiedObject(simulation); config.setDeployEvent(DeployEvent.APOGEE); } - + }; setDefaultMinMax(mod, simulation); modifiers.add(mod); diff --git a/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java b/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java index 6421e0df7..652d392d9 100644 --- a/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java +++ b/core/src/main/java/info/openrocket/core/optimization/services/OptimizationServiceHelper.java @@ -25,7 +25,7 @@ public final class OptimizationServiceHelper { * @return a collection of all simulation modifiers applicable to the document. */ public static Collection getSimulationModifiers(OpenRocketDocument document) { - List list = new ArrayList(); + List list = new ArrayList<>(); ServiceLoader loader = ServiceLoader.load(SimulationModifierService.class); for (SimulationModifierService service : loader) { @@ -47,7 +47,7 @@ public final class OptimizationServiceHelper { * document. */ public static Collection getOptimizableParameters(OpenRocketDocument document) { - List list = new ArrayList(); + List list = new ArrayList<>(); ServiceLoader loader = ServiceLoader.load(OptimizableParameterService.class); for (OptimizableParameterService service : loader) { diff --git a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java index 4f7b5a918..0b0ba1524 100644 --- a/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java +++ b/core/src/main/java/info/openrocket/core/preset/ComponentPreset.java @@ -180,75 +180,75 @@ public class ComponentPreset implements Comparable, Serializabl } - public final static TypedKey LEGACY = new TypedKey("Legacy", Boolean.class); - public final static TypedKey MANUFACTURER = new TypedKey("Manufacturer", + public final static TypedKey LEGACY = new TypedKey<>("Legacy", Boolean.class); + public final static TypedKey MANUFACTURER = new TypedKey<>("Manufacturer", Manufacturer.class); - public final static TypedKey PARTNO = new TypedKey("PartNo", String.class); - public final static TypedKey DESCRIPTION = new TypedKey("Description", String.class); - public final static TypedKey TYPE = new TypedKey("Type", Type.class); - public final static TypedKey LENGTH = new TypedKey("Length", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey HEIGHT = new TypedKey("Height", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey WIDTH = new TypedKey("Width", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey INNER_DIAMETER = new TypedKey("InnerDiameter", Double.class, + public final static TypedKey PARTNO = new TypedKey<>("PartNo", String.class); + public final static TypedKey DESCRIPTION = new TypedKey<>("Description", String.class); + public final static TypedKey TYPE = new TypedKey<>("Type", Type.class); + public final static TypedKey LENGTH = new TypedKey<>("Length", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey HEIGHT = new TypedKey<>("Height", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey WIDTH = new TypedKey<>("Width", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey INNER_DIAMETER = new TypedKey<>("InnerDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey OUTER_DIAMETER = new TypedKey("OuterDiameter", Double.class, + public final static TypedKey OUTER_DIAMETER = new TypedKey<>("OuterDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FORE_SHOULDER_LENGTH = new TypedKey("ForeShoulderLength", Double.class, + public final static TypedKey FORE_SHOULDER_LENGTH = new TypedKey<>("ForeShoulderLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FORE_SHOULDER_DIAMETER = new TypedKey("ForeShoulderDiameter", + public final static TypedKey FORE_SHOULDER_DIAMETER = new TypedKey<>("ForeShoulderDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FORE_OUTER_DIAMETER = new TypedKey("ForeOuterDiameter", Double.class, + public final static TypedKey FORE_OUTER_DIAMETER = new TypedKey<>("ForeOuterDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey AFT_SHOULDER_LENGTH = new TypedKey("AftShoulderLength", Double.class, + public final static TypedKey AFT_SHOULDER_LENGTH = new TypedKey<>("AftShoulderLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey AFT_SHOULDER_DIAMETER = new TypedKey("AftShoulderDiameter", + public final static TypedKey AFT_SHOULDER_DIAMETER = new TypedKey<>("AftShoulderDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey AFT_OUTER_DIAMETER = new TypedKey("AftOuterDiameter", Double.class, + public final static TypedKey AFT_OUTER_DIAMETER = new TypedKey<>("AftOuterDiameter", Double.class, UnitGroup.UNITS_LENGTH); - public static final TypedKey CD = new TypedKey("DragCoefficient", Double.class, + public static final TypedKey CD = new TypedKey<>("DragCoefficient", Double.class, UnitGroup.UNITS_COEFFICIENT); - public final static TypedKey SHAPE = new TypedKey("Shape", Shape.class); - public final static TypedKey MATERIAL = new TypedKey("Material", Material.class); - public final static TypedKey FINISH = new TypedKey("Finish", Finish.class); - public final static TypedKey THICKNESS = new TypedKey("Thickness", Double.class, + public final static TypedKey SHAPE = new TypedKey<>("Shape", Shape.class); + public final static TypedKey MATERIAL = new TypedKey<>("Material", Material.class); + public final static TypedKey FINISH = new TypedKey<>("Finish", Finish.class); + public final static TypedKey THICKNESS = new TypedKey<>("Thickness", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FILLED = new TypedKey("Filled", Boolean.class); - public final static TypedKey MASS = new TypedKey("Mass", Double.class, UnitGroup.UNITS_MASS); - public final static TypedKey DIAMETER = new TypedKey("Diameter", Double.class, + public final static TypedKey FILLED = new TypedKey<>("Filled", Boolean.class); + public final static TypedKey MASS = new TypedKey<>("Mass", Double.class, UnitGroup.UNITS_MASS); + public final static TypedKey DIAMETER = new TypedKey<>("Diameter", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey IMAGE = new TypedKey("Image", byte[].class); + public final static TypedKey IMAGE = new TypedKey<>("Image", byte[].class); // RAIL BUTTON SPECIFIC - public final static TypedKey BASE_HEIGHT = new TypedKey("BaseHeight", Double.class, + public final static TypedKey BASE_HEIGHT = new TypedKey<>("BaseHeight", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey FLANGE_HEIGHT = new TypedKey("FlangeHeight", Double.class, + public final static TypedKey FLANGE_HEIGHT = new TypedKey<>("FlangeHeight", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey SCREW_HEIGHT = new TypedKey("ScrewHeight", Double.class, + public final static TypedKey SCREW_HEIGHT = new TypedKey<>("ScrewHeight", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey SCREW_MASS = new TypedKey("ScrewMass", Double.class, + public final static TypedKey SCREW_MASS = new TypedKey<>("ScrewMass", Double.class, UnitGroup.UNITS_MASS); - public final static TypedKey NUT_MASS = new TypedKey("NutMass", Double.class, UnitGroup.UNITS_MASS); + public final static TypedKey NUT_MASS = new TypedKey<>("NutMass", Double.class, UnitGroup.UNITS_MASS); // PARACHUTE SPECIFIC // Parachute Manufacturer declaration see: MANUFACTURER // Parachute Part Number declaration see: PARTNO // Parachute Description declaration see: DESCRIPTION - public final static TypedKey CANOPY_SHAPE = new TypedKey("CanopyShape", Shape.class); + public final static TypedKey CANOPY_SHAPE = new TypedKey<>("CanopyShape", Shape.class); // Parachute diameter declaration see: DIAMETER - public final static TypedKey SPILL_DIA = new TypedKey("SpillDia", Double.class, + public final static TypedKey SPILL_DIA = new TypedKey<>("SpillDia", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey SURFACE_AREA = new TypedKey("SurfaceArea", Double.class, + public final static TypedKey SURFACE_AREA = new TypedKey<>("SurfaceArea", Double.class, UnitGroup.UNITS_LENGTH); // Parachute canopy material declaration see: MATERIAL - public final static TypedKey SIDES = new TypedKey("Sides", Integer.class); - public final static TypedKey LINE_COUNT = new TypedKey("LineCount", Integer.class); - public final static TypedKey LINE_LENGTH = new TypedKey("LineLength", Double.class, + public final static TypedKey SIDES = new TypedKey<>("Sides", Integer.class); + public final static TypedKey LINE_COUNT = new TypedKey<>("LineCount", Integer.class); + public final static TypedKey LINE_LENGTH = new TypedKey<>("LineLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey LINE_MATERIAL = new TypedKey("LineMaterial", Material.class); - public final static TypedKey PACKED_LENGTH = new TypedKey("PackedLength", Double.class, + public final static TypedKey LINE_MATERIAL = new TypedKey<>("LineMaterial", Material.class); + public final static TypedKey PACKED_LENGTH = new TypedKey<>("PackedLength", Double.class, UnitGroup.UNITS_LENGTH); - public final static TypedKey PACKED_DIAMETER = new TypedKey("PackedDiameter", Double.class, + public final static TypedKey PACKED_DIAMETER = new TypedKey<>("PackedDiameter", Double.class, UnitGroup.UNITS_LENGTH); // Parachute Mass declaration see: MASS @@ -410,9 +410,9 @@ public class ComponentPreset implements Comparable, Serializabl ByteArrayOutputStream bos = new ByteArrayOutputStream(); DataOutputStream os = new DataOutputStream(bos); - List> keys = new ArrayList>(properties.keySet()); + List> keys = new ArrayList<>(properties.keySet()); - Collections.sort(keys, new Comparator>() { + Collections.sort(keys, new Comparator<>() { @Override public int compare(TypedKey a, TypedKey b) { return a.getName().compareTo(b.getName()); @@ -481,7 +481,7 @@ public class ComponentPreset implements Comparable, Serializabl } private void writeObject(ObjectOutputStream oos) throws IOException { - Map DTO = new HashMap(); + Map DTO = new HashMap<>(); for (Entry, Object> entry : properties.entrySet()) { diff --git a/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java b/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java index 507b1fa5a..b1f85083d 100644 --- a/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java +++ b/core/src/main/java/info/openrocket/core/preset/InvalidComponentPresetException.java @@ -5,8 +5,8 @@ import java.util.List; public class InvalidComponentPresetException extends Exception { - private final List errors = new ArrayList(); - private final List> invalidParameters = new ArrayList>(); + private final List errors = new ArrayList<>(); + private final List> invalidParameters = new ArrayList<>(); public InvalidComponentPresetException() { super(); diff --git a/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java b/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java index 336ec8ab2..461f499c1 100644 --- a/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java +++ b/core/src/main/java/info/openrocket/core/preset/TypedPropertyMap.java @@ -11,7 +11,7 @@ public class TypedPropertyMap implements Cloneable { private final Map, Object> delegate; public TypedPropertyMap() { - delegate = new LinkedHashMap, Object>(); + delegate = new LinkedHashMap<>(); } public int size() { diff --git a/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java index 36d2a3ebf..a161a7fa0 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/BaseComponentLoader.java @@ -15,7 +15,7 @@ public abstract class BaseComponentLoader extends RockSimComponentFileLoader { public BaseComponentLoader(MaterialHolder materials, File theBasePathToLoadFrom) { super(theBasePathToLoadFrom); - presets = new ArrayList(); + presets = new ArrayList<>(); fileColumns.add(new ManufacturerColumnParser()); fileColumns.add(new StringColumnParser("Part No.", ComponentPreset.PARTNO)); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java b/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java index f27393002..edec1fa34 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/BaseUnitColumnParser.java @@ -16,7 +16,7 @@ public abstract class BaseUnitColumnParser extends BaseColumnParser { protected static Map rocksimUnits; static { - rocksimUnits = new HashMap(); + rocksimUnits = new HashMap<>(); rocksimUnits.put("0", UnitGroup.UNITS_LENGTH.getUnit("in")); rocksimUnits.put("1", UnitGroup.UNITS_LENGTH.getUnit("mm")); } diff --git a/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java b/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java index 624ee980e..7c112be8a 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/MaterialHolder.java @@ -13,11 +13,11 @@ import info.openrocket.core.unit.UnitGroup; public class MaterialHolder { - private final Map bulkMaterials = new HashMap(); + private final Map bulkMaterials = new HashMap<>(); - private final Map surfaceMaterials = new HashMap(); + private final Map surfaceMaterials = new HashMap<>(); - private final Map lineMaterials = new HashMap(); + private final Map lineMaterials = new HashMap<>(); public MaterialHolder() { } @@ -108,7 +108,7 @@ public class MaterialHolder { public Collection values() { - HashSet allMats = new HashSet(); + HashSet allMats = new HashSet<>(); allMats.addAll(bulkMaterials.values()); allMats.addAll(surfaceMaterials.values()); allMats.addAll(lineMaterials.values()); @@ -118,7 +118,7 @@ public class MaterialHolder { } public Database asDatabase(Material.Type theType) { - Database result = new Database(); + Database result = new Database<>(); switch (theType) { case LINE: result.addAll(lineMaterials.values()); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java index e015a0049..d7656ae74 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/MaterialLoader.java @@ -12,9 +12,9 @@ public class MaterialLoader extends RockSimComponentFileLoader { private final MaterialHolder materialMap = new MaterialHolder(); - private final static TypedKey MATERIALNAME = new TypedKey("MaterialName", String.class); - private final static TypedKey UNITS = new TypedKey("Units", String.class); - private final static TypedKey DENSITY = new TypedKey("Density", Double.class); + private final static TypedKey MATERIALNAME = new TypedKey<>("MaterialName", String.class); + private final static TypedKey UNITS = new TypedKey<>("Units", String.class); + private final static TypedKey DENSITY = new TypedKey<>("Density", Double.class); public MaterialLoader(File theBasePathToLoadFrom) { super(theBasePathToLoadFrom); diff --git a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java index 12ef8fa57..d4a3c571e 100644 --- a/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java +++ b/core/src/main/java/info/openrocket/core/preset/loader/RockSimComponentFileLoader.java @@ -33,7 +33,7 @@ public abstract class RockSimComponentFileLoader { private final File dir; - protected List fileColumns = new ArrayList(); + protected List fileColumns = new ArrayList<>(); /** * Constructor. diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java index 2f02cee45..dec18a69b 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentDTO.java @@ -30,7 +30,7 @@ public class OpenRocketComponentDTO { @XmlElementWrapper(name = "Materials") @XmlElement(name = "Material") - List materials = new ArrayList(); + List materials = new ArrayList<>(); @XmlElementWrapper(name = "Components") @XmlElementRefs({ @@ -45,7 +45,7 @@ public class OpenRocketComponentDTO { @XmlElementRef(name = "RailButtons", type = RailButtonDTO.class), @XmlElementRef(name = "Streamers", type = StreamerDTO.class), @XmlElementRef(name = "Parachutes", type = ParachuteDTO.class) }) - private List components = new ArrayList(); + private List components = new ArrayList<>(); public OpenRocketComponentDTO() { } @@ -97,7 +97,7 @@ public class OpenRocketComponentDTO { } public List asComponentPresets() throws InvalidComponentPresetException { - List result = new ArrayList(components.size()); + List result = new ArrayList<>(components.size()); for (int i = 0; i < components.size(); i++) { result.add(components.get(i).asComponentPreset(getLegacy(), materials)); } @@ -105,7 +105,7 @@ public class OpenRocketComponentDTO { } public List asMaterialList() { - List result = new ArrayList(materials.size()); + List result = new ArrayList<>(materials.size()); for (MaterialDTO material : materials) { result.add(material.asMaterial()); } diff --git a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java index b3a422e1a..d45d6a49e 100644 --- a/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java +++ b/core/src/main/java/info/openrocket/core/preset/xml/OpenRocketComponentSaver.java @@ -77,29 +77,29 @@ public class OpenRocketComponentSaver { // We're going to sort the initial data since that makes the output much easier // on the eyes. - Collections.sort(theMaterialList, new Comparator() { + Collections.sort(theMaterialList, new Comparator<>() { - @Override - public int compare(Material o1, Material o2) { - return o1.getName().compareTo(o2.getName()); - } + @Override + public int compare(Material o1, Material o2) { + return o1.getName().compareTo(o2.getName()); + } - }); + }); - Collections.sort(thePresetList, new Comparator() { + Collections.sort(thePresetList, new Comparator<>() { - @Override - public int compare(ComponentPreset o1, ComponentPreset o2) { - int manucmp = o1.getManufacturer().getSimpleName().compareTo(o2.getManufacturer().getSimpleName()); + @Override + public int compare(ComponentPreset o1, ComponentPreset o2) { + int manucmp = o1.getManufacturer().getSimpleName().compareTo(o2.getManufacturer().getSimpleName()); - if (manucmp != 0) { - return manucmp; - } + if (manucmp != 0) { + return manucmp; + } - return o1.getPartNo().compareTo(o2.getPartNo()); - } + return o1.getPartNo().compareTo(o2.getPartNo()); + } - }); + }); marshaller.marshal(toOpenRocketComponentDTO(theMaterialList, thePresetList, isLegacy), sw); return sw.toString(); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java b/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java index 696aa5749..27fcf16af 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/AxialStage.java @@ -18,7 +18,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC * default constructor, builds a rocket with zero stages */ public AxialStage() { - this.separations = new FlightConfigurableParameterSet( + this.separations = new FlightConfigurableParameterSet<>( new StageSeparationConfiguration()); this.axialMethod = AxialMethod.AFTER; this.stageNumber = 0; @@ -93,7 +93,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC @Override protected RocketComponent copyWithOriginalID() { AxialStage copy = (AxialStage) super.copyWithOriginalID(); - copy.separations = new FlightConfigurableParameterSet(separations); + copy.separations = new FlightConfigurableParameterSet<>(separations); return copy; } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java index e0b5b4777..932dbd349 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ClusterConfiguration.java @@ -71,7 +71,7 @@ public class ClusterConfiguration { throw new IllegalArgumentException("Illegal number of points specified: " + points.length); } - List l = new ArrayList(points.length); + List l = new ArrayList<>(points.length); for (double d : points) l.add(d); @@ -108,7 +108,7 @@ public class ClusterConfiguration { public List getPoints(double rotation) { double cos = Math.cos(rotation); double sin = Math.sin(rotation); - List ret = new ArrayList(points.size()); + List ret = new ArrayList<>(points.size()); for (int i = 0; i < points.size() / 2; i++) { double x = points.get(2 * i); double y = points.get(2 * i + 1); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java index 647150288..4ed49b818 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfigurableParameterSet.java @@ -22,7 +22,7 @@ public class FlightConfigurableParameterSet map = new LinkedHashMap(); + protected final LinkedHashMap map = new LinkedHashMap<>(); /** * Construct a FlightConfiguration that has no overrides. @@ -153,7 +153,7 @@ public class FlightConfigurableParameterSet getIds() { - ArrayList toReturn = new ArrayList(); + ArrayList toReturn = new ArrayList<>(); toReturn.addAll(this.map.keySet()); toReturn.remove(FlightConfigurationId.DEFAULT_VALUE_FCID); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java index 1d9192bf8..6da889418 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/FlightConfiguration.java @@ -65,9 +65,9 @@ public class FlightConfiguration implements FlightConfigurableParameter stages = new HashMap<>(); // Map of stage number to StageFlags of the // corresponding stage - final protected Map motors = new HashMap(); + final protected Map motors = new HashMap<>(); private Map preloadStageActiveness = null; - final private Collection activeMotors = new ConcurrentLinkedQueue(); + final private Collection activeMotors = new ConcurrentLinkedQueue<>(); final private InstanceMap activeInstances = new InstanceMap(); final private InstanceMap extraRenderInstances = new InstanceMap(); // Extra instances to be rendered, besides the // active instances @@ -321,7 +321,7 @@ public class FlightConfiguration implements FlightConfigurableParameter getAllComponents() { - List traversalOrder = new ArrayList(); + List traversalOrder = new ArrayList<>(); recurseAllComponentsDepthFirst(this.rocket, traversalOrder); return traversalOrder; } @@ -339,7 +339,7 @@ public class FlightConfiguration implements FlightConfigurableParameter getCoreComponents() { - Queue toProcess = new ArrayDeque(); + Queue toProcess = new ArrayDeque<>(); toProcess.offer(this.rocket); ArrayList toReturn = new ArrayList<>(); @@ -377,7 +377,7 @@ public class FlightConfiguration implements FlightConfigurableParameter getActiveComponents() { - Queue toProcess = new ArrayDeque(this.getActiveStages()); + Queue toProcess = new ArrayDeque<>(this.getActiveStages()); ArrayList toReturn = new ArrayList<>(); while (!toProcess.isEmpty()) { diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java b/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java index 8ae3a2663..1ddc08ff3 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/LaunchLug.java @@ -221,7 +221,7 @@ public class LaunchLug extends Tube implements AnglePositionable, BoxBounded, Li @Override public Collection getComponentBounds() { - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList<>(); addBound(set, 0, radius); addBound(set, length, radius); return set; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java b/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java index 931e815de..1e78b063e 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/MassObject.java @@ -235,7 +235,7 @@ public abstract class MassObject extends InternalComponent { @Override public final Collection getComponentBounds() { - Collection c = new ArrayList(); + Collection c = new ArrayList<>(); addBound(c, 0, getRadius()); addBound(c, getLength(), getRadius()); return c; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java b/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java index 223eddfcd..40737108a 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/ParallelStage.java @@ -49,7 +49,7 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo // not strictly accurate, but this should provide an acceptable estimate for total vehicle size @Override public Collection getComponentBounds() { - Collection bounds = new ArrayList(8); + Collection bounds = new ArrayList<>(8); double x_min = Double.MAX_VALUE; double x_max = Double.MIN_VALUE; double r_max = 0; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java index a2ae2031f..bef61f53f 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RailButton.java @@ -353,7 +353,7 @@ public class RailButton extends ExternalComponent @Override public Collection getComponentBounds() { final double r = outerDiameter_m / 2.0; - ArrayList set = new ArrayList(); + ArrayList set = new ArrayList<>(); set.add(new Coordinate(r, totalHeight_m, r)); set.add(new Coordinate(r, totalHeight_m, -r)); set.add(new Coordinate(r, 0, r)); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java index 342890c44..031da83ec 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RingComponent.java @@ -203,7 +203,7 @@ public abstract class RingComponent extends StructuralComponent implements BoxBo @Override public Collection getComponentBounds() { - List bounds = new ArrayList(); + List bounds = new ArrayList<>(); addBound(bounds, 0, getOuterRadius()); addBound(bounds, length, getOuterRadius()); return bounds; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java index e5c95c614..02161ed32 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/Rocket.java @@ -486,7 +486,7 @@ public class Rocket extends ComponentAssembly { */ public void resetListeners() { // System.out.println("RESETTING LISTENER LIST of Rocket "+this); - listenerList = new HashSet(); + listenerList = new HashSet<>(); } diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java index cc8dd9d98..479b624eb 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java @@ -70,7 +70,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab /** * List of child components of this component. */ - protected ArrayList children = new ArrayList(); + protected ArrayList children = new ArrayList<>(); //////// Parameters common to all components: @@ -438,7 +438,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab // Reset all parent/child information clone.parent = null; - clone.children = new ArrayList(); + clone.children = new ArrayList<>(); // Add copied children to the structure without firing events. for (RocketComponent child : this.children) { @@ -2960,7 +2960,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab */ private static class RocketComponentIterator implements Iterator { // Stack holds iterators which still have some components left. - private final Deque> iteratorStack = new ArrayDeque>(); + private final Deque> iteratorStack = new ArrayDeque<>(); private final Rocket root; private final ModID treeModID; diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java b/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java index 2dc94d29a..f0de49103 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/SymmetricComponent.java @@ -174,7 +174,7 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou */ @Override public Collection getComponentBounds() { - List list = new ArrayList(20); + List list = new ArrayList<>(20); for (int n = 0; n <= 5; n++) { double x = n * getLength() / 5; double r = getRadius(x); diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java b/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java index d64d8b41b..ccee1854e 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/TubeFinSet.java @@ -360,7 +360,7 @@ public class TubeFinSet extends Tube implements AxialPositionable, BoxBounded, R @Override public Collection getComponentBounds() { - List bounds = new ArrayList(); + List bounds = new ArrayList<>(); double r = getBodyRadius(); addBound(bounds, 0, 2 * getBoundingRadius()); diff --git a/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java b/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java index 38201f85f..32cb2a92c 100644 --- a/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java +++ b/core/src/main/java/info/openrocket/core/rocketvisitors/ListComponents.java @@ -8,7 +8,7 @@ import info.openrocket.core.rocketcomponent.RocketComponent; public class ListComponents extends DepthFirstRecursiveVisitor> { private final Class componentClazz; - protected List components = new ArrayList(); + protected List components = new ArrayList<>(); public ListComponents(Class componentClazz) { super(); diff --git a/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java b/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java index aeae329b3..0a1c15a69 100644 --- a/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java +++ b/core/src/main/java/info/openrocket/core/simulation/BasicEventSimulationEngine.java @@ -57,7 +57,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { private FlightConfigurationId fcid; // this is just a list of simulation branches to - Deque toSimulate = new ArrayDeque(); + Deque toSimulate = new ArrayDeque<>(); FlightData flightData; @@ -202,7 +202,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { if (!currentStatus.isLanded()) currentStatus.addEvent(new FlightEvent(FlightEvent.Type.ALTITUDE, currentStatus.getSimulationTime(), currentStatus.getConfiguration().getRocket(), - new Pair(oldAlt, currentStatus.getRocketPosition().z))); + new Pair<>(oldAlt, currentStatus.getRocketPosition().z))); if (currentStatus.getRocketPosition().z > currentStatus.getMaxAlt()) { currentStatus.setMaxAlt(currentStatus.getRocketPosition().z); diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightData.java b/core/src/main/java/info/openrocket/core/simulation/FlightData.java index 3fae1cad8..87924c448 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightData.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightData.java @@ -40,7 +40,7 @@ public class FlightData { private final Mutable mutable = new Mutable(); - private final ArrayList branches = new ArrayList(); + private final ArrayList branches = new ArrayList<>(); private final WarningSet warnings = new WarningSet(); diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java b/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java index b4b28750a..10fdd1147 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightDataBranch.java @@ -48,7 +48,7 @@ public class FlightDataBranch implements Monitorable { */ private double optimumAltitude = Double.NaN; - private final ArrayList events = new ArrayList(); + private final ArrayList events = new ArrayList<>(); private final Mutable mutable = new Mutable(); @@ -73,7 +73,7 @@ public class FlightDataBranch implements Monitorable { "times in constructor."); } - values.put(t, new ArrayList()); + values.put(t, new ArrayList<>()); minValues.put(t, Double.NaN); maxValues.put(t, Double.NaN); } diff --git a/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java b/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java index 15b4174bc..245e6d8d6 100644 --- a/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java +++ b/core/src/main/java/info/openrocket/core/simulation/FlightDataType.java @@ -41,7 +41,7 @@ public class FlightDataType implements Comparable { /** List of existing types. MUST BE DEFINED BEFORE ANY TYPES!! */ /** NOTE: The String key here is now the symbol */ - private static final Map EXISTING_TYPES = new HashMap(); + private static final Map EXISTING_TYPES = new HashMap<>(); //// Time public static final FlightDataType TYPE_TIME = newType(trans.get("FlightDataType.TYPE_TIME"), "t", diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java b/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java index 4dc71864a..96d2559fc 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationConditions.java @@ -59,7 +59,7 @@ public class SimulationConditions implements Monitorable, Cloneable { private double maximumAngleStep = RK4SimulationStepper.RECOMMENDED_ANGLE_STEP; - private List simulationListeners = new ArrayList(); + private List simulationListeners = new ArrayList<>(); private int randomSeed = 0; @@ -251,7 +251,7 @@ public class SimulationConditions implements Monitorable, Cloneable { try { // TODO: HIGH: Deep clone models SimulationConditions clone = (SimulationConditions) super.clone(); - clone.simulationListeners = new ArrayList(this.simulationListeners.size()); + clone.simulationListeners = new ArrayList<>(this.simulationListeners.size()); for (SimulationListener listener : this.simulationListeners) { clone.simulationListeners.add(listener.clone()); } diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java b/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java index 0d3796ea3..7779ebdab 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationOptions.java @@ -79,7 +79,7 @@ public class SimulationOptions implements ChangeSource, Cloneable, SimulationOpt private int randomSeed = new Random().nextInt(); - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); public SimulationOptions() { } @@ -349,7 +349,7 @@ public class SimulationOptions implements ChangeSource, Cloneable, SimulationOpt public SimulationOptions clone() { try { SimulationOptions copy = (SimulationOptions) super.clone(); - copy.listeners = new ArrayList(); + copy.listeners = new ArrayList<>(); return copy; } catch (CloneNotSupportedException e) { throw new BugException(e); diff --git a/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java b/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java index b16f43b72..4768bc3d5 100644 --- a/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java +++ b/core/src/main/java/info/openrocket/core/simulation/SimulationStatus.java @@ -56,7 +56,7 @@ public class SimulationStatus implements Cloneable, Monitorable { private double effectiveLaunchRodLength; // Set of all motors - private final List motorStateList = new ArrayList(); + private final List motorStateList = new ArrayList<>(); /** Nanosecond time when the simulation was started. */ private long simulationStartWallTime = Long.MIN_VALUE; @@ -80,7 +80,7 @@ public class SimulationStatus implements Cloneable, Monitorable { private boolean landed = false; /** Contains a list of deployed recovery devices. */ - private final MonitorableSet deployedRecoveryDevices = new MonitorableSet(); + private final MonitorableSet deployedRecoveryDevices = new MonitorableSet<>(); /** The flight event queue */ private final EventQueue eventQueue = new EventQueue(); @@ -88,7 +88,7 @@ public class SimulationStatus implements Cloneable, Monitorable { private WarningSet warnings; /** Available for special purposes by the listeners. */ - private final Map extraData = new HashMap(); + private final Map extraData = new HashMap<>(); double maxAlt = Double.NEGATIVE_INFINITY; double maxAltTime = 0; @@ -230,7 +230,7 @@ public class SimulationStatus implements Cloneable, Monitorable { } public Collection getActiveMotors() { - List activeList = new ArrayList(); + List activeList = new ArrayList<>(); for (MotorClusterState state : this.motorStateList) { if (this.configuration.isComponentActive(state.getMount())) { activeList.add(state); diff --git a/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java b/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java index 3158cb1f5..f6487b7ce 100644 --- a/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java +++ b/core/src/main/java/info/openrocket/core/simulation/customexpression/CustomExpression.java @@ -38,7 +38,7 @@ public class CustomExpression implements Cloneable { protected String expression; private ExpressionBuilder builder; - private final List subExpressions = new ArrayList(); + private final List subExpressions = new ArrayList<>(); public CustomExpression(OpenRocketDocument doc) { this.doc = doc; @@ -185,7 +185,7 @@ public class CustomExpression implements Cloneable { // get a list of all the names of all the available variables protected ArrayList getAllNames() { - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); /* * for (FlightDataType type : FlightDataType.ALL_TYPES) * names.add(type.getName()); @@ -212,7 +212,7 @@ public class CustomExpression implements Cloneable { // get a list of all the symbols of the available variables ignoring this one protected ArrayList getAllSymbols() { - ArrayList symbols = new ArrayList(); + ArrayList symbols = new ArrayList<>(); /* * for (FlightDataType type : FlightDataType.ALL_TYPES) * symbols.add(type.getSymbol()); diff --git a/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java b/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java index f5d678da7..827045984 100644 --- a/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java +++ b/core/src/main/java/info/openrocket/core/simulation/customexpression/Functions.java @@ -25,7 +25,7 @@ public class Functions { private static final Logger log = LoggerFactory.getLogger(Functions.class); private static final Translator trans = Application.getTranslator(); - private final List allFunctions = new ArrayList(); + private final List allFunctions = new ArrayList<>(); public static Functions getInstance() { if (instance == null) { @@ -44,7 +44,7 @@ public class Functions { // A map of available operator strings (keys) and description of function // (value) - public static final SortedMap AVAILABLE_OPERATORS = new TreeMap() { + public static final SortedMap AVAILABLE_OPERATORS = new TreeMap<>() { { put("+", trans.get("Operator.plus")); put("-", trans.get("Operator.minus")); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java b/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java index a0c004310..b7656ac9a 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/SimulationExtensionConfiguration.java @@ -112,7 +112,7 @@ public final class SimulationExtensionConfiguration extends HashMap original) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (Object value : original) { if (value instanceof SimulationExtensionConfiguration) { list.add(((SimulationExtensionConfiguration) value).clone()); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java b/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java index 2525e21e3..6d092fde1 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/example/DampingMoment.java @@ -31,7 +31,7 @@ public class DampingMoment extends AbstractSimulationExtension { // Save it as a FlightDataType private static final FlightDataType cdm = FlightDataType.getType("Damping moment coefficient", "Cdm", UnitGroup.UNITS_COEFFICIENT); - private static final ArrayList types = new ArrayList(); + private static final ArrayList types = new ArrayList<>(); DampingMoment() { types.add(cdm); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java b/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java index 976a232fb..cdfc2b529 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/example/RollControl.java @@ -28,7 +28,7 @@ import info.openrocket.core.util.MathUtil; public class RollControl extends AbstractSimulationExtension { // save fin cant angle as a FlightDataType - private static final ArrayList types = new ArrayList(); + private static final ArrayList types = new ArrayList<>(); private static final FlightDataType FIN_CANT_TYPE = FlightDataType.getType("Control fin cant", "\u03B1fc", UnitGroup.UNITS_ANGLE); diff --git a/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java b/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java index 146a78084..7f7fff3bd 100644 --- a/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java +++ b/core/src/main/java/info/openrocket/core/simulation/extension/impl/ScriptingSimulationListener.java @@ -39,7 +39,7 @@ public class ScriptingSimulationListener */ private final Invocable invocable; - private Set missing = new HashSet(); + private Set missing = new HashSet<>(); public ScriptingSimulationListener(Invocable invocable) { this.invocable = invocable; @@ -54,7 +54,7 @@ public class ScriptingSimulationListener public SimulationListener clone() { try { ScriptingSimulationListener clone = (ScriptingSimulationListener) super.clone(); - clone.missing = new HashSet(missing); + clone.missing = new HashSet<>(missing); return clone; } catch (CloneNotSupportedException e) { throw new BugException(e); diff --git a/core/src/main/java/info/openrocket/core/startup/Preferences.java b/core/src/main/java/info/openrocket/core/startup/Preferences.java index c165e8c00..22f5e9ad0 100644 --- a/core/src/main/java/info/openrocket/core/startup/Preferences.java +++ b/core/src/main/java/info/openrocket/core/startup/Preferences.java @@ -1031,7 +1031,7 @@ public abstract class Preferences implements ChangeSource { * @return a list of files to load as thrust curves. */ public List getUserThrustCurveFiles() { - List list = new ArrayList(); + List list = new ArrayList<>(); String files = getString(USER_THRUST_CURVES_KEY, null); if (files == null) { @@ -1247,7 +1247,7 @@ public abstract class Preferences implements ChangeSource { * Map of default line styles */ - private static final HashMap, String> DEFAULT_LINE_STYLES = new HashMap, String>(); + private static final HashMap, String> DEFAULT_LINE_STYLES = new HashMap<>(); static { DEFAULT_LINE_STYLES.put(RocketComponent.class, LineStyle.SOLID.name()); @@ -1255,7 +1255,7 @@ public abstract class Preferences implements ChangeSource { } } - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); private final EventObject event = new EventObject(this); @Override diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java index 891c476cf..d42d05204 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadRequest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; class DownloadRequest { - private final ArrayList motorIds = new ArrayList(); + private final ArrayList motorIds = new ArrayList<>(); private String format = null; diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java index f27a49146..1b1c017cb 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/DownloadResponse.java @@ -7,14 +7,14 @@ import java.util.Map; public class DownloadResponse { - private final Map> data = new HashMap>(); + private final Map> data = new HashMap<>(); private String error = null; public void add(MotorBurnFile mbd) { List currentData = data.get(mbd.getMotorId()); if (currentData == null) { - currentData = new ArrayList(); + currentData = new ArrayList<>(); data.put(mbd.getMotorId(), currentData); } currentData.add(mbd); diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java b/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java index a28242376..85a4ab969 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SearchResponse.java @@ -5,7 +5,7 @@ import java.util.List; public class SearchResponse { - private final List results = new ArrayList(); + private final List results = new ArrayList<>(); private int matches; diff --git a/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java b/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java index 60b5f286f..ff498925e 100644 --- a/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java +++ b/core/src/main/java/info/openrocket/core/thrustcurve/SerializeThrustcurveMotors.java @@ -56,7 +56,7 @@ public class SerializeThrustcurveMotors { String inputDir = args[0]; String outputFile = args[1]; - final List allMotors = new ArrayList(); + final List allMotors = new ArrayList<>(); loadFromLocalMotorFiles(allMotors, inputDir); diff --git a/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java b/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java index 05fd2ac85..81d5716ab 100644 --- a/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/FixedPrecisionUnit.java @@ -58,7 +58,7 @@ public class FixedPrecisionUnit extends Unit { throw new IllegalArgumentException("getTicks called with minor=" + minor + " major=" + major); } - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); int mod2, mod3, mod4; // Moduli for minor-notable, major-nonnotable, major-notable double minstep; diff --git a/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java b/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java index 705850266..f0881f2de 100644 --- a/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/FractionalUnit.java @@ -105,7 +105,7 @@ public class FractionalUnit extends Unit { throw new IllegalArgumentException("getTicks called with minor=" + minor + " major=" + major); } - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); int mod2, mod3, mod4; // Moduli for minor-notable, major-nonnotable, major-notable double minstep; diff --git a/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java b/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java index ee75878b3..eba013def 100644 --- a/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java +++ b/core/src/main/java/info/openrocket/core/unit/GeneralUnit.java @@ -67,7 +67,7 @@ public class GeneralUnit extends Unit { // start, end and scale in this units // @Override public ArrayList getTicks(double start, double end, double scale) { - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); @SuppressWarnings("unused") double delta; @SuppressWarnings("unused") @@ -121,7 +121,7 @@ public class GeneralUnit extends Unit { throw new IllegalArgumentException("getTicks called with minor="+minor+" major="+major); } - ArrayList ticks = new ArrayList(); + ArrayList ticks = new ArrayList<>(); int mod2,mod3,mod4; // Moduli for minor-notable, major-nonnotable, major-notable double minstep; diff --git a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java index 8acd23b18..77f38025e 100644 --- a/core/src/main/java/info/openrocket/core/unit/UnitGroup.java +++ b/core/src/main/java/info/openrocket/core/unit/UnitGroup.java @@ -324,7 +324,7 @@ public class UnitGroup { resetDefaultUnits(); - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); map.put("NONE", UNITS_NONE); map.put("LENGTH", UNITS_LENGTH); map.put("ALL_LENGTHS", UNITS_ALL_LENGTHS); @@ -366,7 +366,7 @@ public class UnitGroup { UNITS = Collections.unmodifiableMap(map); - HashMap simap = new HashMap(); + HashMap simap = new HashMap<>(); simap.put("m", UNITS_ALL_LENGTHS); simap.put("m^2", UNITS_AREA); simap.put("m/s", UNITS_VELOCITY); @@ -566,7 +566,7 @@ public class UnitGroup { ////////////////////////////////////////////////////// - protected ArrayList units = new ArrayList(); + protected ArrayList units = new ArrayList<>(); protected int defaultUnit = 0; public int getUnitCount() { diff --git a/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java b/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java index cb59675d5..d5d5a285b 100644 --- a/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java +++ b/core/src/main/java/info/openrocket/core/util/AbstractChangeSource.java @@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory; public class AbstractChangeSource implements ChangeSource { private static final Logger log = LoggerFactory.getLogger(AbstractChangeSource.class); - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); @Override public final void addChangeListener(StateChangeListener listener) { diff --git a/core/src/main/java/info/openrocket/core/util/Base64.java b/core/src/main/java/info/openrocket/core/util/Base64.java index dfa1bf4b1..d85b62546 100644 --- a/core/src/main/java/info/openrocket/core/util/Base64.java +++ b/core/src/main/java/info/openrocket/core/util/Base64.java @@ -28,7 +28,7 @@ public class Base64 { // REVERSE[PAD] = 0; // } - private static final Map REVERSE = new HashMap(); + private static final Map REVERSE = new HashMap<>(); static { for (int i = 0; i < 64; i++) { REVERSE.put(ALPHABET[i], i); diff --git a/core/src/main/java/info/openrocket/core/util/Config.java b/core/src/main/java/info/openrocket/core/util/Config.java index c9a1fe352..9756e0ec0 100644 --- a/core/src/main/java/info/openrocket/core/util/Config.java +++ b/core/src/main/java/info/openrocket/core/util/Config.java @@ -9,7 +9,7 @@ import java.util.Set; public class Config { - private final LinkedHashMap map = new LinkedHashMap(); + private final LinkedHashMap map = new LinkedHashMap<>(); public void put(String key, String value) { validateType(value); @@ -136,7 +136,7 @@ public class Config { return new BigDecimal(value.toString()); } else if (value instanceof List) { List list = (List) value; - ArrayList copy = new ArrayList(list.size()); + ArrayList copy = new ArrayList<>(list.size()); for (Object o : list) { copy.add(clone(o)); } diff --git a/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java b/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java index 17da9ae71..59a6220ba 100644 --- a/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java +++ b/core/src/main/java/info/openrocket/core/util/LinearInterpolator.java @@ -7,7 +7,7 @@ import java.util.TreeMap; public class LinearInterpolator implements Cloneable { - private TreeMap sortMap = new TreeMap(); + private TreeMap sortMap = new TreeMap<>(); /** * Construct a LinearInterpolator with no points. Some points must diff --git a/core/src/main/java/info/openrocket/core/util/ListenerList.java b/core/src/main/java/info/openrocket/core/util/ListenerList.java index 237f0b644..84618a942 100644 --- a/core/src/main/java/info/openrocket/core/util/ListenerList.java +++ b/core/src/main/java/info/openrocket/core/util/ListenerList.java @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; public class ListenerList implements Invalidatable, Iterable { private static final Logger log = LoggerFactory.getLogger(ListenerList.class); - private final ArrayList> listeners = new ArrayList>(); + private final ArrayList> listeners = new ArrayList<>(); private final Throwable instantiationLocation; private Throwable invalidated = null; @@ -45,7 +45,7 @@ public class ListenerList implements Invalidatable, Iterable { public boolean addListener(T listener) { checkState(true); - ListenerData data = new ListenerData(listener); + ListenerData data = new ListenerData<>(listener); if (listeners.contains(data)) { log.warn("Attempting to add duplicate listener " + listener); return false; diff --git a/core/src/main/java/info/openrocket/core/util/MathUtil.java b/core/src/main/java/info/openrocket/core/util/MathUtil.java index a3f1feb36..e12a29c81 100644 --- a/core/src/main/java/info/openrocket/core/util/MathUtil.java +++ b/core/src/main/java/info/openrocket/core/util/MathUtil.java @@ -302,8 +302,8 @@ public class MathUtil { return Double.NaN; } - List sorted = new ArrayList(values); - Collections.sort(sorted, new Comparator() { + List sorted = new ArrayList<>(values); + Collections.sort(sorted, new Comparator<>() { @Override public int compare(Number o1, Number o2) { return Double.compare(o1.doubleValue(), o2.doubleValue()); diff --git a/core/src/main/java/info/openrocket/core/util/MemoryManagement.java b/core/src/main/java/info/openrocket/core/util/MemoryManagement.java index ab7184a23..53774d81d 100644 --- a/core/src/main/java/info/openrocket/core/util/MemoryManagement.java +++ b/core/src/main/java/info/openrocket/core/util/MemoryManagement.java @@ -37,10 +37,10 @@ public final class MemoryManagement { * weak references) * to */ - private static final List objects = new LinkedList(); + private static final List objects = new LinkedList<>(); private static int collectableCallCount = 0; - private static final List>> listenerLists = new LinkedList>>(); + private static final List>> listenerLists = new LinkedList<>(); private static int listenerCallCount = 0; private MemoryManagement() { @@ -88,7 +88,7 @@ public final class MemoryManagement { } } purgeCollectables(); - return new ArrayList(objects); + return new ArrayList<>(objects); } /** @@ -101,7 +101,7 @@ public final class MemoryManagement { * @param list the listener list to register */ public static synchronized void registerListenerList(ListenerList list) { - listenerLists.add(new WeakReference>(list)); + listenerLists.add(new WeakReference<>(list)); listenerCallCount++; if (listenerCallCount % PURGE_CALL_COUNT == 0) { purgeListeners(); @@ -130,7 +130,7 @@ public final class MemoryManagement { } } purgeListeners(); - List> list = new ArrayList>(); + List> list = new ArrayList<>(); for (WeakReference> ref : listenerLists) { ListenerList l = ref.get(); if (l != null) { @@ -178,7 +178,7 @@ public final class MemoryManagement { private final long registrationTime; private MemoryData(Object object) { - this.reference = new WeakReference(object); + this.reference = new WeakReference<>(object); this.registrationTime = System.currentTimeMillis(); } diff --git a/core/src/main/java/info/openrocket/core/util/MonitorableSet.java b/core/src/main/java/info/openrocket/core/util/MonitorableSet.java index 8ec934bcd..5bc8b8da9 100644 --- a/core/src/main/java/info/openrocket/core/util/MonitorableSet.java +++ b/core/src/main/java/info/openrocket/core/util/MonitorableSet.java @@ -33,7 +33,7 @@ public class MonitorableSet extends HashSet implements Monitorable { @Override public Iterator iterator() { - return new MonitorableIterator(super.iterator()); + return new MonitorableIterator<>(super.iterator()); } @Override diff --git a/core/src/main/java/info/openrocket/core/util/PrintProperties.java b/core/src/main/java/info/openrocket/core/util/PrintProperties.java index 3cc6ac5c0..07afb6381 100644 --- a/core/src/main/java/info/openrocket/core/util/PrintProperties.java +++ b/core/src/main/java/info/openrocket/core/util/PrintProperties.java @@ -8,7 +8,7 @@ public class PrintProperties { public static void main(String[] args) { // Sort the keys - SortedSet keys = new TreeSet(); + SortedSet keys = new TreeSet<>(); for (Object key : System.getProperties().keySet()) { keys.add((String) key); } diff --git a/core/src/main/java/info/openrocket/core/util/SafetyMutex.java b/core/src/main/java/info/openrocket/core/util/SafetyMutex.java index f0ac93a80..91c144d93 100644 --- a/core/src/main/java/info/openrocket/core/util/SafetyMutex.java +++ b/core/src/main/java/info/openrocket/core/util/SafetyMutex.java @@ -113,7 +113,7 @@ public abstract class SafetyMutex { // true Throwable lockingLocation = null; // Stack of places that have locked this mutex - final LinkedList locations = new LinkedList(); + final LinkedList locations = new LinkedList<>(); @Override public synchronized void verify() { diff --git a/core/src/main/java/info/openrocket/core/util/Transformation.java b/core/src/main/java/info/openrocket/core/util/Transformation.java index db986e94d..acf7bce87 100644 --- a/core/src/main/java/info/openrocket/core/util/Transformation.java +++ b/core/src/main/java/info/openrocket/core/util/Transformation.java @@ -144,7 +144,7 @@ public class Transformation implements java.io.Serializable { * @param set Collection of coordinates to transform. */ public void transform(Collection set) { - ArrayList temp = new ArrayList(set.size()); + ArrayList temp = new ArrayList<>(set.size()); Iterator iter = set.iterator(); while (iter.hasNext()) temp.add(this.transform(iter.next())); diff --git a/core/src/main/java/info/openrocket/core/util/enums/EnumName.java b/core/src/main/java/info/openrocket/core/util/enums/EnumName.java index f0a3fee79..a2ade2735 100644 --- a/core/src/main/java/info/openrocket/core/util/enums/EnumName.java +++ b/core/src/main/java/info/openrocket/core/util/enums/EnumName.java @@ -25,8 +25,8 @@ public class EnumName> { public EnumName(Class type, EnumConversion conversion) { this.type = type; - map = new EnumMap(type); - reverse = new HashMap(); + map = new EnumMap<>(type); + reverse = new HashMap<>(); E[] keys = type.getEnumConstants(); if (keys == null) { diff --git a/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java b/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java index 89e7cacad..bd20c1f59 100644 --- a/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java +++ b/core/src/main/java/info/openrocket/core/utils/L10nPropertyReport.java @@ -17,7 +17,7 @@ public class L10nPropertyReport { Properties english; - Map langs = new HashMap(); + Map langs = new HashMap<>(); System.out.println("Loading All Resource files"); @@ -51,7 +51,7 @@ public class L10nPropertyReport { for (String key : sortedKeys) { - List missing = new ArrayList(10); + List missing = new ArrayList<>(10); for (Map.Entry en : langs.entrySet()) { if (en.getValue().getProperty(key) != null) { @@ -80,7 +80,7 @@ public class L10nPropertyReport { } private static List getSortedKeys(Properties p) { - List sortedKeys = new ArrayList(p.keySet().size()); + List sortedKeys = new ArrayList<>(p.keySet().size()); for (Object obj : p.keySet()) { sortedKeys.add((String) obj); } diff --git a/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java b/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java index 1f6d13017..d7747c1c1 100644 --- a/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java +++ b/core/src/main/java/info/openrocket/core/utils/TestFunctionOptimizerLoop.java @@ -60,12 +60,12 @@ public class TestFunctionOptimizerLoop { System.err.println("PRECISION = " + PRECISION); ThreadPoolExecutor executor = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, - new ArrayBlockingQueue(100)); + new ArrayBlockingQueue<>(100)); for (int dim = 1; dim <= 10; dim++) { - List stepCount = new ArrayList(); - List functionCount = new ArrayList(); + List stepCount = new ArrayList<>(); + List functionCount = new ArrayList<>(); MultidirectionalSearchOptimizer optimizer = new MultidirectionalSearchOptimizer(); for (int count = 0; count < 200; count++) { diff --git a/core/src/test/java/info/openrocket/core/ServicesForTesting.java b/core/src/test/java/info/openrocket/core/ServicesForTesting.java index 7da7e3fa1..27b3232ab 100644 --- a/core/src/test/java/info/openrocket/core/ServicesForTesting.java +++ b/core/src/test/java/info/openrocket/core/ServicesForTesting.java @@ -30,7 +30,7 @@ public class ServicesForTesting extends AbstractModule { public static class TranslatorProviderForTesting implements Provider { - private final AtomicReference translator = new AtomicReference(); + private final AtomicReference translator = new AtomicReference<>(); @Override public Translator get() { diff --git a/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java b/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java index c6fd23f27..4288dd606 100644 --- a/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java +++ b/core/src/test/java/info/openrocket/core/communication/HttpURLConnectionMock.java @@ -36,7 +36,7 @@ public class HttpURLConnectionMock extends HttpURLConnection { private volatile int responseCode; private volatile String requestMethod = ""; - private final Map requestProperties = new HashMap(); + private final Map requestProperties = new HashMap<>(); private volatile int connectTimeout = -1; private volatile String contentEncoding = ""; diff --git a/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java b/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java index ce4c27957..1a225a4ad 100644 --- a/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java +++ b/core/src/test/java/info/openrocket/core/file/openrocket/OpenRocketSaverTest.java @@ -118,7 +118,7 @@ public class OpenRocketSaverTest { public void testCreateLoadSave() { // Create rockets - ArrayList rocketDocs = new ArrayList(); + ArrayList rocketDocs = new ArrayList<>(); rocketDocs.add(TestRockets.makeTestRocket_v100()); rocketDocs.add(TestRockets.makeTestRocket_v101_withFinTabs()); rocketDocs.add(TestRockets.makeTestRocket_v101_withTubeCouplerChild()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java index 9bfc86c05..701c656f4 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/BodyTubeHandlerTest.java @@ -68,7 +68,7 @@ public class BodyTubeHandlerTest extends RockSimTestBase { AxialStage stage = new AxialStage(); BodyTubeHandler handler = new BodyTubeHandler(null, stage, new WarningSet()); BodyTube component = (BodyTube) getField(handler, "bodyTube"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java index cbcf4826a..8d344531b 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/FinSetHandlerTest.java @@ -78,7 +78,7 @@ public class FinSetHandlerTest { FinSetHandler dto = new FinSetHandler(null, new BodyTube()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); dto.closeElement("Name", attributes, "The name", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java index bab415a4b..e7ac0f85d 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/InnerBodyTubeHandlerTest.java @@ -67,7 +67,7 @@ public class InnerBodyTubeHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); InnerBodyTubeHandler handler = new InnerBodyTubeHandler(null, tube, new WarningSet()); InnerTube component = (InnerTube) getField(handler, "bodyTube"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java index f1ca8a85b..2afe4f9c0 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/LaunchLugHandlerTest.java @@ -66,7 +66,7 @@ public class LaunchLugHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); LaunchLugHandler handler = new LaunchLugHandler(null, tube, new WarningSet()); LaunchLug component = (LaunchLug) getField(handler, "lug"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "-1", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java index 2e36ebff0..d36cbcd2c 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/MassObjectHandlerTest.java @@ -64,7 +64,7 @@ public class MassObjectHandlerTest extends RockSimTestBase { @org.junit.jupiter.api.Test public void testCloseElement() throws Exception { BodyTube tube = new BodyTube(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); MassObjectHandler handler = new MassObjectHandler(null, tube, new WarningSet()); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java index 117c59608..467687ad6 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/NoseConeHandlerTest.java @@ -69,7 +69,7 @@ public class NoseConeHandlerTest extends RockSimTestBase { public void testCloseElement() throws Exception { AxialStage stage = new AxialStage(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); NoseConeHandler handler = new NoseConeHandler(null, stage, warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java index 939f26d41..7d17fabe7 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/ParachuteHandlerTest.java @@ -44,7 +44,7 @@ public class ParachuteHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); ParachuteHandler handler = new ParachuteHandler(null, tube, new WarningSet()); Parachute component = (Parachute) getField(handler, "chute"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Name", attributes, "Test Name", warnings); @@ -152,7 +152,7 @@ public class ParachuteHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); ParachuteHandler handler = new ParachuteHandler(null, tube, new WarningSet()); Parachute component = (Parachute) getField(handler, "chute"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Xb", attributes, "-10", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java index 7b9be82cc..138ab832a 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/RingHandlerTest.java @@ -49,7 +49,7 @@ public class RingHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); CenteringRing component = (CenteringRing) getField(handler, "ring"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "0", warnings); @@ -97,7 +97,7 @@ public class RingHandlerTest extends RockSimTestBase { @SuppressWarnings("unused") CenteringRing component = (CenteringRing) getField(handler, "ring"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); @@ -132,7 +132,7 @@ public class RingHandlerTest extends RockSimTestBase { public void testTubeCoupler() throws Exception { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); @@ -166,7 +166,7 @@ public class RingHandlerTest extends RockSimTestBase { public void testEngineBlock() throws Exception { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); @@ -203,7 +203,7 @@ public class RingHandlerTest extends RockSimTestBase { public void testRing() throws Exception { BodyTube tube = new BodyTube(); RingHandler handler = new RingHandler(null, tube, new WarningSet()); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("OD", attributes, "75", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java index 1fbb45ef8..ae2345079 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/StreamerHandlerTest.java @@ -46,7 +46,7 @@ public class StreamerHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); StreamerHandler handler = new StreamerHandler(null, tube, new WarningSet()); Streamer component = (Streamer) getField(handler, "streamer"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Width", attributes, "0", warnings); @@ -150,7 +150,7 @@ public class StreamerHandlerTest extends RockSimTestBase { BodyTube tube = new BodyTube(); StreamerHandler handler = new StreamerHandler(null, tube, new WarningSet()); Streamer component = (Streamer) getField(handler, "streamer"); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); handler.closeElement("Xb", attributes, "-10", warnings); diff --git a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java index ef6001cae..c9954b44d 100644 --- a/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java +++ b/core/src/test/java/info/openrocket/core/file/rocksim/importt/TransitionHandlerTest.java @@ -63,7 +63,7 @@ public class TransitionHandlerTest extends RockSimTestBase { public void testCloseElement() throws Exception { AxialStage stage = new AxialStage(); - HashMap attributes = new HashMap(); + HashMap attributes = new HashMap<>(); WarningSet warnings = new WarningSet(); TransitionHandler handler = new TransitionHandler(null, stage, new WarningSet()); diff --git a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java index 003ebf043..16eca4261 100644 --- a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java +++ b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/TestRocketOptimizationFunction.java @@ -56,7 +56,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { final Point point = new Point(p1, p2); // Setup stubbing for methods that return values - when(domain.getDistanceToDomain(simulation)).thenReturn(new Pair(ddist, dref)); + when(domain.getDistanceToDomain(simulation)).thenReturn(new Pair<>(ddist, dref)); when(parameter.computeValue(simulation)).thenReturn(pvalue); when(parameter.getUnitGroup()).thenReturn(UnitGroup.UNITS_NONE); when(goal.getMinimizationParameter(pvalue)).thenReturn(gvalue); @@ -88,7 +88,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { verify(modifier1, times(1)).getUnitGroup(); verify(modifier2, times(1)).getCurrentSIValue(simulation); verify(modifier2, times(1)).getUnitGroup(); - verify(listener, times(1)).evaluated(eq(point), argThat(new ArgumentMatcher() { + verify(listener, times(1)).evaluated(eq(point), argThat(new ArgumentMatcher<>() { @Override public boolean matches(Value[] argument) { // Customize this as necessary to match the expected Value[] array @@ -175,7 +175,7 @@ public class TestRocketOptimizationFunction extends BaseTestCase { verify(modifier2).getUnitGroup(); // For verifying the call to listener.evaluated with complex arguments - verify(listener).evaluated(eq(point), argThat(new ArgumentMatcher() { + verify(listener).evaluated(eq(point), argThat(new ArgumentMatcher<>() { @Override public boolean matches(Value[] argument) { // Adjust the logic here based on how specific you need to be about the values diff --git a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java index fc07b6a04..3c8a951d2 100644 --- a/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java +++ b/core/src/test/java/info/openrocket/core/optimization/rocketoptimization/modifiers/TestGenericModifier.java @@ -26,7 +26,7 @@ public class TestGenericModifier extends BaseTestCase { Object related = new Object(); - gm = new GenericModifier("Test modifier", "Description", related, + gm = new GenericModifier<>("Test modifier", "Description", related, UnitGroup.UNITS_NONE, 2.0, TestValue.class, "value") { @Override protected TestValue getModifiedObject(Simulation simulation) { diff --git a/core/src/test/java/info/openrocket/core/plugin/PluginTester.java b/core/src/test/java/info/openrocket/core/plugin/PluginTester.java index 2703964fd..ec3eb6d37 100644 --- a/core/src/test/java/info/openrocket/core/plugin/PluginTester.java +++ b/core/src/test/java/info/openrocket/core/plugin/PluginTester.java @@ -30,7 +30,7 @@ public class PluginTester { private void assertContains(Set set, Class... classes) { assertEquals(classes.length, set.size()); - List> list = new ArrayList>(Arrays.asList(classes)); + List> list = new ArrayList<>(Arrays.asList(classes)); for (Object o : set) { Class c = o.getClass(); assertTrue(list.contains(c)); diff --git a/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java b/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java index 3c53a167a..0b34f4e0f 100644 --- a/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java +++ b/core/src/test/java/info/openrocket/core/rocketcomponent/ParameterSetTest.java @@ -61,7 +61,7 @@ public class ParameterSetTest extends BaseTestCase { public void localSetUp() { gid = 0; TestParameter defaultParam = new TestParameter(); - testSet = new FlightConfigurableParameterSet(defaultParam); + testSet = new FlightConfigurableParameterSet<>(defaultParam); } // ================ Actual Tests ================ @@ -162,7 +162,7 @@ public class ParameterSetTest extends BaseTestCase { assertEquals(testSet.size(), 4, "set should contain two overrides: "); - ArrayList refList = new ArrayList(); + ArrayList refList = new ArrayList<>(); refList.add(fcid1); refList.add(fcid2); refList.add(fcid3); @@ -250,7 +250,7 @@ public class ParameterSetTest extends BaseTestCase { FlightConfigurationId fcid4 = new FlightConfigurationId(); testSet.set(fcid4, tp4); - List refList = new ArrayList(); + List refList = new ArrayList<>(); refList.add(fcid1); refList.add(fcid2); refList.add(fcid3); diff --git a/core/src/test/java/info/openrocket/core/util/MathUtilTest.java b/core/src/test/java/info/openrocket/core/util/MathUtilTest.java index 772b4415f..f96fc0ada 100644 --- a/core/src/test/java/info/openrocket/core/util/MathUtilTest.java +++ b/core/src/test/java/info/openrocket/core/util/MathUtilTest.java @@ -183,8 +183,8 @@ public class MathUtilTest { @Test public void testAverageStddev() { - List ints = new ArrayList(); - List doubles = new ArrayList(); + List ints = new ArrayList<>(); + List doubles = new ArrayList<>(); ints.add(3); ints.add(4); @@ -206,8 +206,8 @@ public class MathUtilTest { @Test public void testMedian() { - List ints = new ArrayList(); - List doubles = new ArrayList(); + List ints = new ArrayList<>(); + List doubles = new ArrayList<>(); ints.add(3); ints.add(4); @@ -237,8 +237,8 @@ public class MathUtilTest { List x; List y; - x = new ArrayList(); - y = new ArrayList(); + x = new ArrayList<>(); + y = new ArrayList<>(); y.add(1.0); v = MathUtil.interpolate(null, y, 0.0); @@ -247,9 +247,9 @@ public class MathUtilTest { v = MathUtil.interpolate(x, y, 0.0); assertEquals(Double.NaN, v, EPS, "Failed to test for empty domain"); - x = new ArrayList(); + x = new ArrayList<>(); x.add(1.0); - y = new ArrayList(); + y = new ArrayList<>(); v = MathUtil.interpolate(x, null, 0.0); assertEquals(Double.NaN, v, EPS, "Failed to test for range null"); @@ -257,10 +257,10 @@ public class MathUtilTest { v = MathUtil.interpolate(x, y, 0.0); assertEquals(Double.NaN, v, EPS, "Failed to test for empty range"); - x = new ArrayList(); + x = new ArrayList<>(); x.add(1.0); x.add(2.0); - y = new ArrayList(); + y = new ArrayList<>(); y.add(15.0); y.add(17.0); @@ -277,12 +277,12 @@ public class MathUtilTest { v = MathUtil.interpolate(x, y, 1.5); assertEquals(16.0, v, EPS, "Failed to calculate center"); - x = new ArrayList(); + x = new ArrayList<>(); x.add(0.25); x.add(0.5); x.add(1.0); x.add(2.0); - y = new ArrayList(); + y = new ArrayList<>(); y.add(0.0); y.add(0.0); y.add(15.0); diff --git a/core/src/test/java/info/openrocket/core/util/TestConfig.java b/core/src/test/java/info/openrocket/core/util/TestConfig.java index b85c6a61d..aa7c149b4 100644 --- a/core/src/test/java/info/openrocket/core/util/TestConfig.java +++ b/core/src/test/java/info/openrocket/core/util/TestConfig.java @@ -58,7 +58,7 @@ public class TestConfig { @Test public void testStoringList() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(123); list.add(Math.PI); @@ -69,7 +69,7 @@ public class TestConfig { @Test public void testModifyingStoredList() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(123); list.add(Math.PI); @@ -96,7 +96,7 @@ public class TestConfig { AtomicInteger ai = new AtomicInteger(100); config.put("atomicinteger", ai); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); config.put("list", list); @@ -139,7 +139,7 @@ public class TestConfig { @Test public void testStoringListWithInvalidTypes() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(new Date()); try { @@ -151,7 +151,7 @@ public class TestConfig { @Test public void testStoringListWithNull() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add("Foo"); list.add(new Date()); try { diff --git a/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java b/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java index 481b2eff2..c567fd2db 100644 --- a/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java +++ b/swing/src/main/java/info/openrocket/swing/file/motor/MotorLoaderHelper.java @@ -92,7 +92,7 @@ public final class MotorLoaderHelper { * @return a list of all motors loaded. */ public static List load(FileIterator iterator) { - List list = new ArrayList(); + List list = new ArrayList<>(); while (iterator.hasNext()) { final Pair input = iterator.next(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java index 7d347c373..41b1ef27d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/BooleanModel.java @@ -59,8 +59,8 @@ public class BooleanModel extends AbstractAction implements StateChangeListener, private boolean value; - private final List components = new ArrayList(); - private final List componentEnableState = new ArrayList(); + private final List components = new ArrayList<>(); + private final List componentEnableState = new ArrayList<>(); private String toString = null; diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java index eb373188c..54495a291 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java @@ -542,7 +542,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat // Implement a wrapper to the ChangeListeners ArrayList propertyChangeListeners = - new ArrayList(); + new ArrayList<>(); @Override public void addPropertyChangeListener(PropertyChangeListener listener) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java index 444866ff3..4a8f9fcee 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/EnumModel.java @@ -24,7 +24,7 @@ public class EnumModel> extends AbstractListModel private final T[] values; private T currentValue = null; - ArrayList displayedValues = new ArrayList(); + ArrayList displayedValues = new ArrayList<>(); private final Reflection.Method getMethod; private final Reflection.Method setMethod; diff --git a/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java b/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java index b34c9ef5e..f25a0790c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/adaptors/ParameterSetModel.java @@ -29,7 +29,7 @@ public class ParameterSetModel> impleme private Object selected; private final FlightConfigurableParameterSet sourceSet; - List idList= new Vector(); + List idList= new Vector<>(); public ParameterSetModel(FlightConfigurableParameterSet set ) { this.sourceSet = set; diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java index 4efad83b0..ab05d3120 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/CsvOptionPanel.java @@ -65,7 +65,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); @@ -115,7 +115,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/main/java/info/openrocket/swing/gui/components/StageSelector.java b/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java index 148f06a1a..89fce75d4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/StageSelector.java @@ -29,7 +29,7 @@ public class StageSelector extends JPanel implements StateChangeListener { private static final Translator trans = Application.getTranslator(); private final Rocket rocket; - private List buttons = new ArrayList(); + private List buttons = new ArrayList<>(); public StageSelector(Rocket _rkt) { super(new MigLayout("gap rel!, insets 0")); diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java b/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java index ade6b0cc4..b3aab0a33 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/URLLabel.java @@ -53,7 +53,7 @@ public class URLLabel extends SelectableLabel { if (Desktop.isDesktopSupported()) { // Blue, underlined font - Map map = new HashMap(); + Map map = new HashMap<>(); map.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON); this.setFont(this.getFont().deriveFont(map)); this.setForeground(URLColor); diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java b/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java index be9cd9051..64ec3c1c3 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/UnitCellEditor.java @@ -27,7 +27,7 @@ public abstract class UnitCellEditor extends AbstractCellEditor private final JComboBox editor; public UnitCellEditor() { - editor = new JComboBox(); + editor = new JComboBox<>(); editor.setEditable(false); editor.addActionListener(this); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java b/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java index 76b60d8d9..b375c6af9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java +++ b/swing/src/main/java/info/openrocket/swing/gui/components/UnitSelector.java @@ -49,7 +49,7 @@ public class UnitSelector extends StyledLabel implements StateChangeListener, Mo private static Border withinBorder; - private final List itemListeners = new ArrayList(); + private final List itemListeners = new ArrayList<>(); static { diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java index 849f22a57..9f6b12736 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/AppearancePanel.java @@ -357,7 +357,7 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati System.arraycopy(LineStyle.values(), 0, list, 1, LineStyle.values().length); - final JComboBox combo = new JComboBox(new EnumModel(c, + final JComboBox combo = new JComboBox<>(new EnumModel<>(c, "LineStyle", // // Default style list, trans.get("LineStyle.Defaultstyle"))); @@ -514,7 +514,7 @@ public class AppearancePanel extends JPanel implements Invalidatable, Invalidati register(mDefault); DecalModel decalModel = new DecalModel(panel, document, builder); - JComboBox textureDropDown = new JComboBox(decalModel); + JComboBox textureDropDown = new JComboBox<>(decalModel); textureDropDown.setMaximumRowCount(20); // We need to add this action listener that triggers a decalModel update when the same item is selected, because diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java index 67a3e15f9..412f9fb16 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/FinSetConfig.java @@ -394,7 +394,7 @@ public abstract class FinSetConfig extends RocketComponentConfig { */ private static double computeFinTabLength(List rings, Double finPositionFromTop, Double finLength, DoubleModel mts, final RocketComponent relativeTo) { - List positionsFromTop = new ArrayList(); + List positionsFromTop = new ArrayList<>(); //Fin tabs will be computed between the last two rings that meet the criteria, represented by top and bottom here. SortableRing top = null; @@ -402,12 +402,12 @@ public abstract class FinSetConfig extends RocketComponentConfig { if (rings != null) { //Sort rings from top of parent to bottom - Collections.sort(rings, new Comparator() { + Collections.sort(rings, new Comparator<>() { @Override public int compare(CenteringRing centeringRing, CenteringRing centeringRing1) { return (int) (1000d * (centeringRing.getAxialOffset(AxialMethod.TOP) - centeringRing1.getAxialOffset(AxialMethod.TOP))); - } + } }); for (int i = 0; i < rings.size(); i++) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java index b5fbff663..4ad5471c5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/MotorConfig.java @@ -79,9 +79,9 @@ public class MotorConfig extends JPanel implements Invalidatable, InvalidatingWi MotorConfiguration motorInstance = mount.getDefaultMotorConfig(); - final EnumModel igEvModel = new EnumModel(motorInstance, "IgnitionEvent", IgnitionEvent.values()); + final EnumModel igEvModel = new EnumModel<>(motorInstance, "IgnitionEvent", IgnitionEvent.values()); register(igEvModel); - final JComboBox eventBox = new JComboBox( igEvModel); + final JComboBox eventBox = new JComboBox<>(igEvModel); panel.add(eventBox , "wrap"); order.add(eventBox); diff --git a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java index bc0ac8343..dd1888c61 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/configdialog/RecoveryDeviceConfig.java @@ -16,7 +16,7 @@ public abstract class RecoveryDeviceConfig extends RocketComponentConfig { private static final long serialVersionUID = 7263235700953855062L; - protected final List altitudeComponents = new ArrayList(); + protected final List altitudeComponents = new ArrayList<>(); public RecoveryDeviceConfig(OpenRocketDocument d, RocketComponent component, JDialog parent) { super(d, component, parent); diff --git a/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java b/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java index 671e4b002..eeafc808a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/customexpression/VariableTableModel.java @@ -28,7 +28,7 @@ public class VariableTableModel extends AbstractTableModel { */ public VariableTableModel(OpenRocketDocument doc){ - types = new ArrayList( doc.getFlightDataTypes() ); + types = new ArrayList<>(doc.getFlightDataTypes()); //Collections.addAll(types, FlightDataType.ALL_TYPES); //for (CustomExpression expression : doc.getCustomExpressions()){ diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java index b2491d92a..3353889a9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/BugReportDialog.java @@ -234,7 +234,7 @@ public class BugReportDialog extends JDialog { sbTemp.append("System properties:\n"); // Sort the keys - SortedSet keys = new TreeSet(); + SortedSet keys = new TreeSet<>(); for (Object key : System.getProperties().keySet()) { keys.add((String) key); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java index 33938617e..7a8bf8195 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ComponentAnalysisDialog.java @@ -100,8 +100,8 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe private final List stabData = new ArrayList<>(); - private final List dragData = new ArrayList(); - private final List rollData = new ArrayList(); + private final List dragData = new ArrayList<>(); + private final List rollData = new ArrayList<>(); public ComponentAnalysisDialog(final RocketPanel rocketPanel) { @@ -617,7 +617,7 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe warningList.setListData(new String[] {trans.get("componentanalysisdlg.noWarnings") }); } else { - warningList.setListData(new Vector(set)); + warningList.setListData(new Vector<>(set)); } longitudeStabilityTableModel.fireTableDataChanged(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java index b3916c0e2..426b2d3d5 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/DebugLogDialog.java @@ -70,7 +70,7 @@ public class DebugLogDialog extends JDialog { private static final String STACK_TRACE_MARK = "\uFF01"; private static final Translator trans = Application.getTranslator(); - private static final EnumMap backgroundColors = new EnumMap(LogLevel.class); + private static final EnumMap backgroundColors = new EnumMap<>(LogLevel.class); static { for (LogLevel l : LogLevel.values()) { // Just to ensure every level has a bg color @@ -87,15 +87,15 @@ public class DebugLogDialog extends JDialog { } /** Buffer containing the log lines displayed */ - private final List buffer = new ArrayList(); + private final List buffer = new ArrayList<>(); /** Queue of log lines to be added to the displayed buffer */ - private final Queue queue = new ConcurrentLinkedQueue(); + private final Queue queue = new ConcurrentLinkedQueue<>(); private final DelegatorLogger delegator; private final LogListener logListener; - private final EnumMap filterButtons = new EnumMap(LogLevel.class); + private final EnumMap filterButtons = new EnumMap<>(LogLevel.class); private final JCheckBox followBox; private final Timer timer; @@ -300,7 +300,7 @@ public class DebugLogDialog extends JDialog { } }); - sorter = new TableRowSorter(model); + sorter = new TableRowSorter<>(model); sorter.setComparator(0, NumericComparator.INSTANCE); sorter.setComparator(1, NumericComparator.INSTANCE); sorter.setComparator(4, new LocationComparator()); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java index 467b4ab9c..67b45cf5c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/PrintSettingsDialog.java @@ -78,13 +78,13 @@ public class PrintSettingsDialog extends JDialog { - final JComboBox sizeCombo = new JComboBox(new EnumModel(settings, "PaperSize")); + final JComboBox sizeCombo = new JComboBox<>(new EnumModel<>(settings, "PaperSize")); ////Paper size: panel.add(new JLabel(trans.get("lbl.Papersize"))); panel.add( sizeCombo, "growx, wrap para"); - final JComboBox orientCombo = new JComboBox(new EnumModel(settings, "PaperOrientation")); + final JComboBox orientCombo = new JComboBox<>(new EnumModel<>(settings, "PaperOrientation")); //// Paper orientation: panel.add(new JLabel(trans.get("lbl.Paperorientation"))); panel.add( orientCombo, "growx, wrap para*2"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java index 16351fb82..f16b302a2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/ScaleDialog.java @@ -207,7 +207,7 @@ public class ScaleDialog extends JDialog { Map, List> scaler) { List list = scaler.get(componentClass); if (list == null) { - list = new ArrayList(); + list = new ArrayList<>(); scaler.put(componentClass, list); } list.add(new GeneralScaler(componentClass, methodName, autoMethodName)); @@ -274,7 +274,7 @@ public class ScaleDialog extends JDialog { private void init() { // Generate options for scaling - List options = new ArrayList(); + List options = new ArrayList<>(); if (!onlySelection) options.add(SCALE_ROCKET); @@ -377,7 +377,7 @@ public class ScaleDialog extends JDialog { label.setToolTipText(tip); panel.add(label, "span, split, gapright unrel"); - selectionOption = new JComboBox(options.toArray(new String[0])); + 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/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java index 007966fbe..272629cbc 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/WarningDialog.java @@ -17,7 +17,7 @@ public abstract class WarningDialog { public static void showWarnings(Component parent, Object message, String title, WarningSet warnings) { Warning[] w = warnings.toArray(new Warning[0]); - final JList list = new JList(w); + final JList list = new JList<>(w); list.setCellRenderer(new BetterListCellRenderer()); JScrollPane pane = new JScrollPane(list); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java index 7dde5a3a6..00119ba69 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java @@ -83,8 +83,8 @@ public class IgnitionSelectionDialog extends JDialog { // Select ignition event panel.add(new JLabel(trans.get("MotorCfg.lbl.Ignitionat")), ""); - final EnumModel igEvModel = new EnumModel(curMotorInstance, "IgnitionEvent", IgnitionEvent.values()); - final JComboBox eventBox = new JComboBox( igEvModel); + final EnumModel igEvModel = new EnumModel<>(curMotorInstance, "IgnitionEvent", IgnitionEvent.values()); + final JComboBox eventBox = new JComboBox<>(igEvModel); panel.add(eventBox, "growx, wrap"); // ... and delay diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java index 2e35848d8..a70b2c726 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/MotorMountTableModel.java @@ -17,7 +17,7 @@ import info.openrocket.core.util.ArrayList; class MotorMountTableModel extends AbstractTableModel implements ComponentChangeListener { private static final long serialVersionUID = 1956400848559941228L; - private final List potentialMounts = new ArrayList(); + private final List potentialMounts = new ArrayList<>(); private final Rocket rocket; diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java index 6d357fad9..b4a371d89 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java @@ -78,7 +78,7 @@ public class SeparationSelectionDialog extends JDialog { overrideButton.setSelected(true); } - 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/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java index e1140d3c2..3dcab5f10 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java @@ -46,7 +46,7 @@ public abstract class MotorFilterPanel extends JPanel { private static final Translator trans = Application.getTranslator(); - private static final Hashtable diameterLabels = new Hashtable(); + private static final Hashtable diameterLabels = new Hashtable<>(); private static final double[] motorDiameters = new double[] { 0.0, 0.013, @@ -80,7 +80,7 @@ public abstract class MotorFilterPanel extends JPanel { diameterLabels.get( motorDiameters.length-1).setText("+"); } - final private static Hashtable impulseLabels = new Hashtable(); + final private static Hashtable impulseLabels = new Hashtable<>(); static { int i =0; for( ImpulseClass impulseClass : ImpulseClass.values() ) { @@ -152,13 +152,13 @@ public abstract class MotorFilterPanel extends JPanel { List manufacturers = new ArrayList<>(allManufacturers); - manufacturers.sort(new Comparator() { - @Override - public int compare(Manufacturer o1, Manufacturer o2) { - return o1.getSimpleName().compareTo(o2.getSimpleName()); - } + manufacturers.sort(new Comparator<>() { + @Override + public int compare(Manufacturer o1, Manufacturer o2) { + return o1.getSimpleName().compareTo(o2.getSimpleName()); + } - }); + }); manufacturerCheckList = new CheckList.Builder().build(); manufacturerCheckList.setData(manufacturers); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java index e1673b503..d73554198 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilter.java @@ -28,7 +28,7 @@ public class MotorRowFilter extends RowFilter implements Ch // configuration data used in the filter process private final ThrustCurveMotorDatabaseModel model; - private List usedMotors = new ArrayList(); + private List usedMotors = new ArrayList<>(); private final AbstractChangeSource changeSourceDelegate = new AbstractChangeSource(); private final Object change = new Object(); @@ -50,7 +50,7 @@ public class MotorRowFilter extends RowFilter implements Ch private boolean hideUsedMotors = false; // List of manufacturers to exclude. - private List excludedManufacturers = new ArrayList(); + private List excludedManufacturers = new ArrayList<>(); // Impulse class filtering private ImpulseClass minimumImpulse; @@ -78,7 +78,7 @@ public class MotorRowFilter extends RowFilter implements Ch } public void setSearchTerms(final List searchTerms) { - this.searchTerms = new ArrayList(); + this.searchTerms = new ArrayList<>(); for (String s : searchTerms) { s = s.trim().toLowerCase(Locale.getDefault()); if (s.length() > 0) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index b9cb668de..438bec7ca 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -137,7 +137,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec //// MotorFilter { // Find all the manufacturers: - Set allManufacturers = new HashSet(); + Set allManufacturers = new HashSet<>(); for (ThrustCurveMotorSet s : database) { allManufacturers.add(s.getManufacturer()); } @@ -162,8 +162,8 @@ 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); + curveSelectionModel = new DefaultComboBoxModel<>(); + curveSelectionBox = new JComboBox<>(curveSelectionModel); @SuppressWarnings("unchecked") ListCellRenderer lcr = (ListCellRenderer) curveSelectionBox.getRenderer(); curveSelectionBox.setRenderer(new CurveSelectionRenderer(lcr)); @@ -184,7 +184,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec ejectionChargeDelayLabel = new JLabel(trans.get("TCMotorSelPan.lbl.Ejectionchargedelay")); panel.add(ejectionChargeDelayLabel); - delayBox = new JComboBox(); + delayBox = new JComboBox<>(); delayBox.setEditable(true); delayBox.addActionListener(new ActionListener() { @Override @@ -295,7 +295,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec // Set comparators and widths table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - sorter = new TableRowSorter(model); + sorter = new TableRowSorter<>(model); for (int i = 0; i < ThrustCurveMotorColumns.values().length; i++) { ThrustCurveMotorColumns column = ThrustCurveMotorColumns.values()[i]; sorter.setComparator(i, column.getComparator()); @@ -439,7 +439,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec ThrustCurveMotorSet motorSetToSelect = null; motorSetToSelect = findMotorSet(motorToSelect); if (motorSetToSelect == null) { - database = new ArrayList(database); + database = new ArrayList<>(database); ThrustCurveMotorSet extra = new ThrustCurveMotorSet(); extra.addMotor(motorToSelect); database.add(extra); @@ -565,7 +565,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec List getFilteredCurves() { List motors = selectedMotorSet.getMotors(); if (hideSimilarBox.isSelected() && selectedMotor != null) { - List filtered = new ArrayList(motors.size()); + List filtered = new ArrayList<>(motors.size()); for (int i = 0; i < motors.size(); i++) { ThrustCurveMotor m = motors.get(i); if (m.equals(selectedMotor)) { @@ -711,7 +711,7 @@ public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelec if (!containsPlugged) { delayStrings[delayStrings.length - 1] = trans.get("TCMotorSelPan.delayBox.Plugged"); } - delayBox.setModel(new DefaultComboBoxModel(delayStrings)); + delayBox.setModel(new DefaultComboBoxModel<>(delayStrings)); if (reset) { // Find and set the closest value diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java index 7dc9d7115..42f68f0aa 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/optimization/OptimizationPlotDialog.java @@ -143,7 +143,7 @@ public class OptimizationPlotDialog extends JDialog { // Create the optimization path (with autosort) XYSeries series = new XYSeries(trans.get("plot1d.series"), true, true); - List tooltips = new ArrayList(); + List tooltips = new ArrayList<>(); for (Map.Entry entry : evaluations.entrySet()) { FunctionEvaluationData data = entry.getValue(); if (data != null) { @@ -242,7 +242,7 @@ public class OptimizationPlotDialog extends JDialog { // Create the optimization path dataset XYSeries pathSeries = new XYSeries(trans.get("plot2d.path"), false, true); - List pathTooltips = new ArrayList(); + List pathTooltips = new ArrayList<>(); for (Point p : path) { FunctionEvaluationData data = evaluations.get(p); if (data != null) { @@ -259,7 +259,7 @@ public class OptimizationPlotDialog extends JDialog { double min = Double.POSITIVE_INFINITY; double max = Double.NEGATIVE_INFINITY; double[][] evals = new double[3][evaluations.size()]; - List evalTooltips = new ArrayList(); + List evalTooltips = new ArrayList<>(); Iterator iterator = evaluations.values().iterator(); for (int i = 0; i < evaluations.size(); i++) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java index 4f4d0eea8..a638d4f9b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java @@ -26,21 +26,21 @@ public class DesignPreferencesPanel extends PreferencesPanel { this.add(new JLabel(trans.get("pref.dlg.lbl.Positiontoinsert")), "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.BODY_COMPONENT_INSERT_POSITION_KEY, // // Always ask // // Insert in middle // // Add to end trans.get("pref.dlg.PrefChoiseSelector1"), trans - .get("pref.dlg.PrefChoiseSelector2"), trans - .get("pref.dlg.PrefChoiseSelector3"))), + .get("pref.dlg.PrefChoiseSelector2"), trans + .get("pref.dlg.PrefChoiseSelector3"))), "wrap para, growx, sg combos"); // // Position to insert new stages: this.add(new JLabel(trans.get("pref.dlg.lbl.PositiontoinsertStages")), "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.STAGE_INSERT_POSITION_KEY, // // Always ask // // Insert in middle @@ -55,14 +55,14 @@ public class DesignPreferencesPanel extends PreferencesPanel { "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.ROCKET_INFO_FONT_SIZE, // // Small // // Medium // // Large trans.get("pref.dlg.PrefFontSmall"), trans - .get("pref.dlg.PrefFontMedium"), trans - .get("pref.dlg.PrefFontLarge"))), + .get("pref.dlg.PrefFontMedium"), trans + .get("pref.dlg.PrefFontLarge"))), "wrap para, growx, sg combos"); // // Default Mach number diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java index ca70f0ba3..4efff050c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java @@ -22,14 +22,14 @@ public class DisplayPreferencesPanel extends PreferencesPanel { "gapright para"); this.add( - new JComboBox(new PrefChoiceSelector( + new JComboBox<>(new PrefChoiceSelector( Preferences.ROCKET_INFO_FONT_SIZE, // // Small // // Medium // // Large trans.get("pref.dlg.PrefFontSmall"), trans - .get("pref.dlg.PrefFontMedium"), trans - .get("pref.dlg.PrefFontLarge"))), + .get("pref.dlg.PrefFontMedium"), trans + .get("pref.dlg.PrefFontLarge"))), "wrap para, growx, sg combos"); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java index 59123d8e9..a0d575085 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/GeneralPreferencesPanel.java @@ -73,14 +73,14 @@ public class GeneralPreferencesPanel extends PreferencesPanel { String locale = preferences.getString("locale", null); userLocale = L10N.toLocale(locale); } - List> locales = new ArrayList>(); + List> locales = new ArrayList<>(); for (Locale l : SwingPreferences.getSupportedLocales()) { - locales.add(new Named(l, l.getDisplayLanguage(l) + "/" + l.getDisplayLanguage())); + locales.add(new Named<>(l, l.getDisplayLanguage(l) + "/" + l.getDisplayLanguage())); } Collections.sort(locales); - locales.add(0, new Named(null, trans.get("generalprefs.languages.default"))); + locales.add(0, new Named<>(null, trans.get("generalprefs.languages.default"))); - final JComboBox languageCombo = new JComboBox(locales.toArray()); + final JComboBox languageCombo = new JComboBox<>(locales.toArray()); for (int i = 0; i < locales.size(); i++) { if (Utils.equals(userLocale, locales.get(i).get())) { languageCombo.setSelectedIndex(i); @@ -180,7 +180,7 @@ public class GeneralPreferencesPanel extends PreferencesPanel { private void changed() { String text = field.getText(); - List list = new ArrayList(); + List list = new ArrayList<>(); for (String s : text.split(";")) { s = s.trim(); if (s.length() > 0) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java index 7f27f171d..63205891d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/PreferencesPanel.java @@ -23,7 +23,7 @@ import info.openrocket.core.unit.UnitGroup; public abstract class PreferencesPanel extends JPanel { protected static final Logger log = LoggerFactory.getLogger(PreferencesDialog.class); - protected final List unitSelectors = new ArrayList(); + protected final List unitSelectors = new ArrayList<>(); protected File defaultDirectory = null; protected static final Translator trans = Application.getTranslator(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java index 01b350df4..817c6a157 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/SimulationPreferencesPanel.java @@ -124,9 +124,9 @@ public class SimulationPreferencesPanel extends PreferencesPanel { label.setToolTipText(trans.get("simedtdlg.lbl.ttip.GeodeticMethodTip")); subsub.add(label, "gapright para"); - EnumModel gcsModel = new EnumModel( + 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) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java index aa2e81a23..19524d3da 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/UnitsPreferencesPanel.java @@ -35,47 +35,47 @@ public class UnitsPreferencesPanel extends PreferencesPanel { //// Rocket dimensions: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Rocketdimensions"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_LENGTH)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_LENGTH)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Motor dimensions: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Motordimensions"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_MOTOR_DIMENSIONS)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_MOTOR_DIMENSIONS)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Distance: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Distance"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DISTANCE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DISTANCE)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Velocity: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Velocity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_VELOCITY)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_VELOCITY)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Acceleration: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Acceleration"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ACCELERATION)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ACCELERATION)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Mass: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Mass"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_MASS)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_MASS)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Force: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Force"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_FORCE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_FORCE)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Total impulse: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Totalimpulse"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_IMPULSE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_IMPULSE)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Moment of inertia: leftPanel.add(new JLabel(trans.get("pref.dlg.lbl.Momentofinertia"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA)); leftPanel.add(combo, "sizegroup boxes, wrap"); //// Stability: @@ -112,52 +112,52 @@ public class UnitsPreferencesPanel extends PreferencesPanel { //// Line density: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Linedensity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_LINE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_LINE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Surface density: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Surfacedensity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_SURFACE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_SURFACE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Bulk density:: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Bulkdensity"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_BULK)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_DENSITY_BULK)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Surface roughness: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Surfaceroughness"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ROUGHNESS)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ROUGHNESS)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Area: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Area"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_AREA)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_AREA)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Angle: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Angle"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ANGLE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ANGLE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Roll rate: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Rollrate"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_ROLL)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_ROLL)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Temperature: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Temperature"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Pressure: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Pressure"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_PRESSURE)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_PRESSURE)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Windspeed: rightPanel.add(new JLabel(trans.get("pref.dlg.lbl.Windspeed"))); - combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED)); + combo = new JComboBox<>(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED)); rightPanel.add(combo, "sizegroup boxes, wrap"); //// Latitude diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java index 21b53e442..71c87773b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetChooserDialog.java @@ -376,7 +376,7 @@ public class ComponentPresetChooserDialog extends JDialog { } private void updateFilters() { - List> filters = new ArrayList>(2); + List> filters = new ArrayList<>(2); String filterTextRegex = filterText.getText(); if (filterTextRegex != null) { try { diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java index 98da92f63..6a6a639f1 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java @@ -105,7 +105,7 @@ public class ComponentPresetTable extends JTable { }; - this.sorter = new TableRowSorter(tableModel); + this.sorter = new TableRowSorter<>(tableModel); this.tableColumnModel = new XTableColumnModel(); /* diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java index 66f7a7b6f..ded91391e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/XTableColumnModel.java @@ -11,7 +11,7 @@ public class XTableColumnModel extends DefaultTableColumnModel { /** Array of TableColumn objects in this model. * Holds all column objects, regardless of their visibility */ - protected Vector allTableColumns = new Vector(); + protected Vector allTableColumns = new Vector<>(); /** * Creates an extended table column model. diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java index 495c1b6a5..4c0c3d8ad 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/FigureRenderer.java @@ -70,7 +70,7 @@ public class FigureRenderer extends RocketRenderer { return false; } - private static final HashMap, ORColor> defaultColorCache = new HashMap, ORColor>(); + private static final HashMap, ORColor> defaultColorCache = new HashMap<>(); @Override public void renderComponent(GL2 gl, Geometry geom, float alpha) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java index 841863cd1..3339919c4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketFigure3d.java @@ -89,8 +89,8 @@ public class RocketFigure3d extends JPanel implements GLEventListener { private volatile boolean redrawExtras = true; private boolean drawCarets = true; - private final ArrayList relativeExtra = new ArrayList(); - private final ArrayList absoluteExtra = new ArrayList(); + private final ArrayList relativeExtra = new ArrayList<>(); + private final ArrayList absoluteExtra = new ArrayList<>(); private double roll = 0; private double yaw = 0; @@ -596,7 +596,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { internalRepaint(); } - private Set selection = new HashSet(); + private Set selection = new HashSet<>(); public void setSelection(final RocketComponent[] selection) { this.selection.clear(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java index da117607e..77b0a71cd 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/RocketRenderer.java @@ -174,7 +174,7 @@ public abstract class RocketRenderer { final InstanceMap imap = config.getActiveInstances(); // output buffer - final Collection treeGeometry = new ArrayList(); + final Collection treeGeometry = new ArrayList<>(); for(Map.Entry> entry: imap.entrySet() ) { final RocketComponent comp = entry.getKey(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java index 20473e41e..6af89f1ff 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/TextureCache.java @@ -27,8 +27,8 @@ public class TextureCache { public void init(GLAutoDrawable drawable) { if (texCache != null) throw new IllegalStateException(this + " already initialized."); - oldTexCache = new HashMap(); - texCache = new HashMap(); + oldTexCache = new HashMap<>(); + texCache = new HashMap<>(); } public void dispose(GLAutoDrawable drawable) { @@ -55,7 +55,7 @@ public class TextureCache { e.getValue().destroy(drawable.getGL().getGL2()); } oldTexCache = texCache; - texCache = new HashMap(); + texCache = new HashMap<>(); } public Texture getTexture(URL uri) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java index 028dcc442..31bee3d55 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/geometry/DisplayListComponentRenderer.java @@ -10,7 +10,7 @@ import info.openrocket.swing.gui.figure3d.geometry.Geometry.Surface; import info.openrocket.core.rocketcomponent.RocketComponent; public class DisplayListComponentRenderer extends ComponentRenderer { - private Map lists = new HashMap(); + private Map lists = new HashMap<>(); @Override public void updateFigure(GLAutoDrawable drawable) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java index 55853e2b6..44e440cac 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoPanel.java @@ -77,7 +77,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { private double ratio; private boolean needUpdate = false; - private List imageCallbacks = new java.util.Vector(); + private List imageCallbacks = new java.util.Vector<>(); private RocketRenderer rr; private PhotoSettings p; @@ -295,7 +295,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { .readPixelsToBufferedImage(drawable.getGL(), 0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight(), true); } - final Vector cbs = new Vector( + final Vector cbs = new Vector<>( imageCallbacks); imageCallbacks.clear(); for (ImageCallback ia : cbs) { @@ -531,7 +531,7 @@ public class PhotoPanel extends JPanel implements GLEventListener { new float[] { 0, 0, 0, 1 }, 0); } - rr.render(drawable, configuration, new HashSet()); + rr.render(drawable, configuration, new HashSet<>()); //Figure out the lowest stage shown diff --git a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java index f49a2a34c..4e55d29b9 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java +++ b/swing/src/main/java/info/openrocket/swing/gui/figure3d/photo/PhotoSettingsConfig.java @@ -293,8 +293,8 @@ public class PhotoSettingsConfig extends JTabbedPane { return trans.get("DecalModel.lbl.select"); } }; - add(new JComboBox(new DefaultComboBoxModel(new Sky[] { noSky, Mountains.instance, Meadow.instance, - Storm.instance, Lake.instance, Orbit.instance, Miramar.instance }) { + add(new JComboBox<>(new DefaultComboBoxModel<>(new Sky[]{noSky, Mountains.instance, Meadow.instance, + Storm.instance, Lake.instance, Orbit.instance, Miramar.instance}) { }) { { addActionListener(new ActionListener() { @@ -320,8 +320,7 @@ public class PhotoSettingsConfig extends JTabbedPane { if (p.getSky() != null) { setSelectedItem(p.getSky()); - } - else { + } else { setSelectedItem(noSky); } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java index 09d419b01..85642ccdd 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/GuidedTourSelectionDialog.java @@ -61,7 +61,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 @@ -175,7 +175,7 @@ public class GuidedTourSelectionDialog extends JDialog { public Named getElementAt(int index) { String name = tourNames.get(index); SlideSet set = slideSetManager.getSlideSet(name); - return new Named(set, set.getTitle()); + return new Named<>(set, set.getTitle()); } @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java index 17e50dba2..fbd4b1181 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/Slide.java @@ -48,7 +48,7 @@ public class Slide { // Otherwise load and cache BufferedImage image = loadImage(); - imageReference = new SoftReference(image); + imageReference = new SoftReference<>(image); return image; } diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java index 7433d4541..1c9966a99 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSet.java @@ -17,7 +17,7 @@ public class SlideSet { private String title = ""; private String description = ""; - private final List slides = new ArrayList(); + private final List slides = new ArrayList<>(); private StyleSheet styleSheet = new StyleSheet(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java index 8373f5f7c..a04acfa7f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetLoader.java @@ -98,7 +98,7 @@ public class SlideSetLoader { } - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(base + "_" + locale.getLanguage() + "_" + locale.getCountry() + "_" + locale.getVariant() + ext); list.add(base + "_" + locale.getLanguage() + "_" + locale.getCountry() + ext); list.add(base + "_" + locale.getLanguage() + ext); diff --git a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java index 4d4897d86..8ba481250 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java +++ b/swing/src/main/java/info/openrocket/swing/gui/help/tours/SlideSetManager.java @@ -33,7 +33,7 @@ public class SlideSetManager { private final String baseDir; - private final Map slideSets = new LinkedHashMap(); + private final Map slideSets = new LinkedHashMap<>(); private static Color textColor; @@ -99,7 +99,7 @@ public class SlideSetManager { * Return a set containing all the slide set names. */ public List getSlideSetNames() { - return new ArrayList(slideSets.keySet()); + return new ArrayList<>(slideSets.keySet()); } /** @@ -126,7 +126,7 @@ public class SlideSetManager { try { - List tours = new ArrayList(); + List tours = new ArrayList<>(); TextLineReader reader = new TextLineReader(in); while (reader.hasNext()) { tours.add(reader.next()); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java b/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java index fa6306cae..0f293ddd2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/BasicFrame.java @@ -142,7 +142,7 @@ public class BasicFrame extends JFrame { * List of currently open frames. When the list goes empty * it is time to exit the application. */ - private static final List frames = new ArrayList(); + private static final List frames = new ArrayList<>(); private static BasicFrame startupFrame = null; // the frame that was created at startup @@ -1043,7 +1043,7 @@ public class BasicFrame extends JFrame { @Override public void actionPerformed(ActionEvent e) { log.info(Markers.USER_MARKER, "Exhaust memory selected"); - LinkedList data = new LinkedList(); + LinkedList data = new LinkedList<>(); int count = 0; final int bytesPerArray = 10240; try { diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java index cffa27488..5d159dfe7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentAddButtons.java @@ -389,7 +389,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { * @return The position to add the new component to, or null if should not add. */ public Pair getAdditionPosition(RocketComponent c) { - return new Pair(c, null); + return new Pair<>(c, null); } /** @@ -537,7 +537,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { if (c == null || c instanceof Rocket) { // Add as last body component of the last stage Rocket rocket = document.getRocket(); - return new Pair(rocket.getChild(rocket.getStageCount() - 1), + return new Pair<>(rocket.getChild(rocket.getStageCount() - 1), null); } @@ -565,10 +565,10 @@ public class ComponentAddButtons extends JPanel implements Scrollable { return null; case 1: // Insert after current position - return new Pair(parent, parent.getChildPosition(c) + 1); + return new Pair<>(parent, parent.getChildPosition(c) + 1); case 2: // Insert at the end of the parent - return new Pair(parent, null); + return new Pair<>(parent, null); default: Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); return null; @@ -660,7 +660,7 @@ public class ComponentAddButtons extends JPanel implements Scrollable { public Pair getAdditionPosition(RocketComponent c) { if (c == null || c instanceof Rocket) { // Add to the end - return new Pair(document.getRocket(), null); + return new Pair<>(document.getRocket(), null); } RocketComponent parentStage = null; @@ -689,10 +689,10 @@ public class ComponentAddButtons extends JPanel implements Scrollable { return null; case 1: // Insert after current stage - return new Pair(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1); + return new Pair<>(document.getRocket(), document.getRocket().getChildPosition(parentStage) + 1); case 2: // Insert at the end - return new Pair(document.getRocket(), null); + return new Pair<>(document.getRocket(), null); default: Application.getExceptionHandler().handleErrorCondition("ERROR: Bad position type: " + pos); return null; diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java index 140c46b64..2fb52cfdd 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ComponentIcons.java @@ -75,10 +75,10 @@ public class ComponentIcons { private static String mass_recovery_hardware; private static String mass_tracker; - private static final HashMap, ImageIcon> SMALL_ICONS = new HashMap, ImageIcon>(); - private static final HashMap, ImageIcon> LARGE_ICONS = new HashMap, ImageIcon>(); - private static final HashMap, ImageIcon> DISABLED_ICONS = new HashMap, ImageIcon>(); - private static final HashMap MASS_COMPONENT_SMALL_ICONS = new HashMap(); + private static final HashMap, ImageIcon> SMALL_ICONS = new HashMap<>(); + private static final HashMap, ImageIcon> LARGE_ICONS = new HashMap<>(); + private static final HashMap, ImageIcon> DISABLED_ICONS = new HashMap<>(); + private static final HashMap MASS_COMPONENT_SMALL_ICONS = new HashMap<>(); static { initColors(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java index 519315f8d..d3a67f414 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/DocumentSelectionModel.java @@ -38,7 +38,7 @@ public class DocumentSelectionModel { private ListSelectionModel simulationListSelectionModel = null; private final List listeners = - new ArrayList(); + new ArrayList<>(); @@ -219,7 +219,7 @@ public class DocumentSelectionModel { return; } - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); for (int i = min; i <= max; i++) { if (simulationListSelectionModel.isSelectedIndex(i) && (i < document.getSimulationCount())) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java b/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java index ca43c410c..55f63af5c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ExampleDesignFile.java @@ -133,7 +133,7 @@ public class ExampleDesignFile implements Comparable { private static ExampleDesignFile[] getJarFileNames() { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); int dirLength = DIRECTORY.length(); // Find and open the jar file this class is contained in diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java b/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java index c0f7c597b..5ff1d4bb0 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/ExportDecalDialog.java @@ -51,7 +51,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/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java b/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java index 7fb7af1b2..f3ce3226f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/MRUDesignFile.java @@ -42,7 +42,7 @@ public class MRUDesignFile { * Constructor. */ protected MRUDesignFile() { - mruFileList = new ArrayList(MAX_SIZE); + mruFileList = new ArrayList<>(MAX_SIZE); listenerList = new EventListenerList(); retrieve(); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java b/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java index 266e357cb..f4ab7d0da 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/OpenRocketClipboard.java @@ -12,7 +12,7 @@ public final class OpenRocketClipboard { private static final List clipboardComponents = new LinkedList<>(); private static Simulation[] clipboardSimulations = null; - private static final List listeners = new ArrayList(); + private static final List listeners = new ArrayList<>(); private OpenRocketClipboard() { // Disallow instantiation diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java index 1dc31d893..14a9a815b 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/componenttree/ComponentTreeModel.java @@ -26,7 +26,7 @@ import info.openrocket.core.util.BugException; */ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { - ArrayList listeners = new ArrayList(); + ArrayList listeners = new ArrayList<>(); private final RocketComponent root; private final JTree tree; @@ -103,7 +103,7 @@ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { // Get currently expanded path IDs Enumeration enumer = tree.getExpandedDescendants(new TreePath(path)); - ArrayList expanded = new ArrayList(); + ArrayList expanded = new ArrayList<>(); if (enumer != null) { while (enumer.hasMoreElements()) { TreePath p = enumer.nextElement(); @@ -210,7 +210,7 @@ public class ComponentTreeModel implements TreeModel, ComponentChangeListener { RocketComponent c = component; - List list = new LinkedList(); + List list = new LinkedList<>(); while (c != null) { list.add(0, c); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java index 8e9f153ee..e73ba6b1d 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/FlightConfigurableTableModel.java @@ -23,7 +23,7 @@ public class FlightConfigurableTableModel protected final Rocket rocket; protected final Class clazz; - private final List components = new ArrayList(); + private final List components = new ArrayList<>(); public FlightConfigurableTableModel(Class clazz, Rocket rocket) { super(); @@ -83,7 +83,7 @@ public class FlightConfigurableTableModel default: { int index = column - 1; T d = components.get(index); - return new Pair(fcid, d); + return new Pair<>(fcid, d); } } } diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java index 8b156b7dd..b124b3d92 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/MotorConfigurationPanel.java @@ -162,7 +162,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel @Override protected JTable initializeTable() { //// Motor selection table. - configurationTableModel = new FlightConfigurableTableModel(MotorMount.class,rocket) { + configurationTableModel = new FlightConfigurableTableModel<>(MotorMount.class, rocket) { @Override protected boolean includeComponent(MotorMount component) { return component.isMotorMount(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java index 5a185a8d8..9e758df31 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/RecoveryConfigurationPanel.java @@ -95,7 +95,7 @@ public class RecoveryConfigurationPanel extends FlightConfigurablePanel(RecoveryDevice.class, rocket); + recoveryTableModel = new FlightConfigurableTableModel<>(RecoveryDevice.class, rocket); JTable recoveryTable = new JTable(recoveryTableModel); recoveryTable.getTableHeader().setReorderingAllowed(false); recoveryTable.setCellSelectionEnabled(true); diff --git a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java index 5aa12de78..d77459b1c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/main/flightconfigpanel/SeparationConfigurationPanel.java @@ -94,7 +94,7 @@ public class SeparationConfigurationPanel extends FlightConfigurablePanel(AxialStage.class, rocket) { + separationTableModel = new FlightConfigurableTableModel<>(AxialStage.class, rocket) { private static final long serialVersionUID = 7979648984099308970L; @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java b/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java index 992a7affa..06911c9f1 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/EventGraphics.java @@ -26,7 +26,7 @@ public class EventGraphics { } private static final Color DEFAULT_EVENT_COLOR = new Color(0, 0, 0); - private static final Map EVENT_COLORS = new HashMap(); + private static final Map EVENT_COLORS = new HashMap<>(); static { EVENT_COLORS.put(FlightEvent.Type.LAUNCH, new Color(255, 0, 0)); EVENT_COLORS.put(FlightEvent.Type.LIFTOFF, new Color(0, 80, 196)); @@ -44,7 +44,7 @@ public class EventGraphics { EVENT_COLORS.put(FlightEvent.Type.SIM_ABORT, new Color(255, 0, 0)); } - private static final Map EVENT_IMAGES = new HashMap(); + private static final Map EVENT_IMAGES = new HashMap<>(); static { loadImage(FlightEvent.Type.LAUNCH, "pix/eventicons/event-launch.png"); loadImage(FlightEvent.Type.LIFTOFF, "pix/eventicons/event-liftoff.png"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java b/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java index bad934107..1c3a08fa4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/PlotConfiguration.java @@ -23,7 +23,7 @@ public class PlotConfiguration implements Cloneable { public static final PlotConfiguration[] DEFAULT_CONFIGURATIONS; static { - ArrayList configs = new ArrayList(); + ArrayList configs = new ArrayList<>(); PlotConfiguration config; //// Vertical motion vs. time @@ -187,12 +187,12 @@ public class PlotConfiguration implements Cloneable { /** The data types to be plotted. */ - private ArrayList plotDataTypes = new ArrayList(); + private ArrayList plotDataTypes = new ArrayList<>(); - private ArrayList plotDataUnits = new ArrayList(); + private ArrayList plotDataUnits = new ArrayList<>(); /** The corresponding Axis on which they will be plotted, or null to auto-select. */ - private ArrayList plotDataAxes = new ArrayList(); + private ArrayList plotDataAxes = new ArrayList<>(); private EnumSet events = EnumSet.noneOf(FlightEvent.Type.class); @@ -203,7 +203,7 @@ public class PlotConfiguration implements Cloneable { /** All available axes. */ private final int axesCount; - private ArrayList allAxes = new ArrayList(); + private ArrayList allAxes = new ArrayList<>(); private String name = null; @@ -355,7 +355,7 @@ public class PlotConfiguration implements Cloneable { public List getAllAxes() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.addAll(allAxes); return list; } @@ -416,7 +416,7 @@ public class PlotConfiguration implements Cloneable { if (autoindex >= plotDataAxes.size()) { // All axes have been assigned, just return since we are already the best - return new Pair(copy, copy.getGoodnessValue(data)); + return new Pair<>(copy, copy.getGoodnessValue(data)); } @@ -432,7 +432,7 @@ public class PlotConfiguration implements Cloneable { } } - return new Pair(best, bestValue); + return new Pair<>(best, bestValue); } @@ -717,7 +717,7 @@ public class PlotConfiguration implements Cloneable { copy.events = this.events.clone(); // Deep-clone all Axis since they are mutable - copy.allAxes = new ArrayList(); + copy.allAxes = new ArrayList<>(); for (Axis a : this.allAxes) { copy.allAxes.add(a.clone()); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java index 2f9edcbd3..47cffcf87 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlot.java @@ -94,7 +94,7 @@ public class SimulationPlot { private final PlotConfiguration filled; private final List eventList; - private final List renderers = new ArrayList(); + private final List renderers = new ArrayList<>(); private final LegendItems legendItems; @@ -579,7 +579,7 @@ public class SimulationPlot { } private List buildEventInfo() { - ArrayList eventList = new ArrayList(); + ArrayList eventList = new ArrayList<>(); for (int branch = 0; branch < branchCount; branch++) { List events = simulation.getSimulatedData().getBranch(branch).getEvents(); @@ -595,7 +595,7 @@ public class SimulationPlot { } } - Collections.sort(eventList, new Comparator() { + Collections.sort(eventList, new Comparator<>() { @Override public int compare(EventDisplayInfo o1, EventDisplayInfo o2) { @@ -614,10 +614,10 @@ public class SimulationPlot { private static class LegendItems implements LegendItemSource { - private final List lineLabels = new ArrayList(); - private final List linePaints = new ArrayList(); - private final List lineStrokes = new ArrayList(); - private final List pointShapes = new ArrayList(); + private final List lineLabels = new ArrayList<>(); + private final List linePaints = new ArrayList<>(); + private final List lineStrokes = new ArrayList<>(); + private final List pointShapes = new ArrayList<>(); @Override public LegendItemCollection getLegendItems() { diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java index 4ab5821d1..bff15019f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/SimulationPlotDialog.java @@ -114,7 +114,7 @@ public class SimulationPlotDialog extends JDialog { checkErrors.setVisible(simulation.hasErrors()); //// Add series selection box - ArrayList stages = new ArrayList(); + ArrayList stages = new ArrayList<>(); stages.add(trans.get("PlotDialog.StageDropDown.allStages")); stages.addAll(Util.generateSeriesLabels(simulation)); diff --git a/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java b/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java index 76bb1bb31..374297417 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java +++ b/swing/src/main/java/info/openrocket/swing/gui/plot/Util.java @@ -23,7 +23,7 @@ public abstract class Util { public static List generateSeriesLabels( Simulation simulation ) { int size = simulation.getSimulatedData().getBranchCount(); - ArrayList stages = new ArrayList(size); + ArrayList stages = new ArrayList<>(size); // we need to generate unique strings for each of the branches. Since the branch names are based // on the stage name there is no guarantee they are unique. In order to address this, we first assume // all the names are unique, then go through them looking for duplicates. diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java index 5ebfb2271..414102e54 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/DeselectableComboBox.java @@ -20,7 +20,7 @@ public class DeselectableComboBox extends JComboBox { super.setRenderer(new DeselectedItemsRenderer()); } - private Set disabled_items = new HashSet(); + private Set disabled_items = new HashSet<>(); public void addItem(T anObject, boolean disabled) { super.addItem(anObject); @@ -32,7 +32,7 @@ public class DeselectableComboBox extends JComboBox { @Override public void removeAllItems() { super.removeAllItems(); - disabled_items = new HashSet(); + disabled_items = new HashSet<>(); } @Override diff --git a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java index ec6dfefec..d59087904 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/preset/PresetEditorDialog.java @@ -214,7 +214,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener { private final PresetResultListener resultListener; - private static final Map componentMap = new HashMap(); + private static final Map componentMap = new HashMap<>(); private static final String NOSE_CONE_KEY = "NoseCone.NoseCone"; private static final String BODY_TUBE_KEY = "BodyTube.BodyTube"; @@ -282,9 +282,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"); @@ -331,9 +331,9 @@ 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(), - Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.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"); JLabel ncLengthLabel = new JLabel(trans.get("NoseConeCfg.lbl.Noseconelength")); @@ -431,9 +431,9 @@ 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(), - Transition.Shape.ELLIPSOID.getName(), Transition.Shape.HAACK.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"); JLabel trLengthLabel = new JLabel("Length:"); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java b/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java index 4b0c02237..45744ab32 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/DesignReport.java @@ -606,8 +606,8 @@ public class DesignReport { return simulations; } - ArrayList simulationsToRun = new ArrayList(); - ArrayList upToDateSimulations = new ArrayList(); + ArrayList simulationsToRun = new ArrayList<>(); + ArrayList upToDateSimulations = new ArrayList<>(); for (Simulation simulation : simulations) { boolean simulate = false; boolean copy = !this.updateExistingSimulations; @@ -679,7 +679,7 @@ public class DesignReport { log.debug("Updating simulations using thread pool"); int cores = Runtime.getRuntime().availableProcessors(); ThreadPoolExecutor executor = new ThreadPoolExecutor(cores, cores, 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue(), + new LinkedBlockingQueue<>(), new SimulationRunnerThreadFactory()); for (Simulation simulation : simulations) { executor.execute(new RunSimulationTask(simulation)); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java index 3d093dc48..9adccf7aa 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/FinMarkingGuide.java @@ -115,7 +115,7 @@ public class FinMarkingGuide extends JPanel { */ private Map> init(Rocket component) { Iterator iter = component.iterator(false); - Map> results = new LinkedHashMap>(); + Map> results = new LinkedHashMap<>(); BodyTube current = null; int totalHeight = 0; int iterationHeight = 0; @@ -131,7 +131,7 @@ public class FinMarkingGuide extends JPanel { else if (next instanceof FinSet || next instanceof TubeFinSet || next instanceof LaunchLug || next instanceof RailButton) { java.util.List list = results.get(current); if (list == null && current != null) { - list = new ArrayList(); + list = new ArrayList<>(); results.put(current, list); double radius = current.getOuterRadius(); @@ -495,7 +495,7 @@ public class FinMarkingGuide extends JPanel { */ private double findRadialOrigin(List components) { - ArrayList positions = new ArrayList(3 * components.size()); + ArrayList positions = new ArrayList<>(3 * components.size()); for (ExternalComponent component : components) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java b/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java index 7edb0a35d..51d275b9c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/OpenRocketPrintable.java @@ -111,7 +111,7 @@ public enum OpenRocketPrintable { * @return a list of OpenRocketPrintable */ public static List getUnstaged() { - List unstaged = new ArrayList(); + List unstaged = new ArrayList<>(); OpenRocketPrintable[] values = values(); for (OpenRocketPrintable value : values) { if (!value.isStageSpecific()) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java index 2a7015d18..c8a067bf7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableCenteringRing.java @@ -35,7 +35,7 @@ public class PrintableCenteringRing extends AbstractPrintable { /** * A set of the inner 'holes'. At least one, but will have many if clustered. */ - private Set innerCenterPoints = new HashSet(); + private Set innerCenterPoints = new HashSet<>(); /** * Construct a simple, non-clustered, printable centering ring, or if the motor mount represents a clustered @@ -55,7 +55,7 @@ public class PrintableCenteringRing extends AbstractPrintable { } else { List coords = theMotorMount.getClusterPoints(); - List points = new ArrayList(); + List points = new ArrayList<>(); for (Coordinate coordinate : coords) { points.add(coordinate.setX(theMotorMount.getOuterRadius())); } @@ -72,7 +72,7 @@ public class PrintableCenteringRing extends AbstractPrintable { */ private PrintableCenteringRing(CenteringRing theRing, List theMotorMounts) { super(theRing); - List points = new ArrayList(); + List points = new ArrayList<>(); //Transform the radial positions of the tubes. for (InnerTube it : theMotorMounts) { if (it.getInstanceCount() > 1) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java index beac95e82..899c12e92 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/PrintableContext.java @@ -28,7 +28,7 @@ public class PrintableContext implements Comparable, Iterable< /** * Sort of a reverse map that tracks each type of printable item and the stages for which that item is to be printed. */ - private final Map> previous = new TreeMap>(); + private final Map> previous = new TreeMap<>(); /** * Constructor. @@ -62,7 +62,7 @@ public class PrintableContext implements Comparable, Iterable< public void add(final Integer theStageNumber, final OpenRocketPrintable thePrintable) { Set stages = previous.get(thePrintable); if (stages == null) { - stages = new TreeSet(); + stages = new TreeSet<>(); previous.put(thePrintable, stages); } if (theStageNumber != null) { @@ -73,21 +73,21 @@ public class PrintableContext implements Comparable, Iterable< /** PrintableContext iterator. */ @Override public Iterator iterator() { - return new Iterator() { - + return new Iterator<>() { + Iterator keyIter = previous.keySet().iterator(); - + @Override public boolean hasNext() { return keyIter.hasNext(); } - + @Override public PrintableContext next() { final OpenRocketPrintable key = keyIter.next(); return new PrintableContext(previous.get(key), key); } - + @Override public void remove() { } diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java index cc055772f..fd3b4b794 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/CheckTreeSelectionModel.java @@ -128,7 +128,7 @@ public class CheckTreeSelectionModel extends DefaultTreeSelectionModel { if (selectionPaths == null) { break; } - ArrayList toBeRemoved = new ArrayList(); + ArrayList toBeRemoved = new ArrayList<>(); for (TreePath selectionPath : selectionPaths) { if (isDescendant(selectionPath, path)) { toBeRemoved.add(selectionPath); @@ -217,7 +217,7 @@ public class CheckTreeSelectionModel extends DefaultTreeSelectionModel { * @param path the tree path node */ private void toggleRemoveSelection (TreePath path) { - Stack stack = new Stack(); + Stack stack = new Stack<>(); TreePath parent = path.getParentPath(); while (parent != null && !isPathSelected(parent)) { stack.push(parent); diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java index 83c829bdd..c95623614 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/components/RocketPrintTree.java @@ -177,7 +177,7 @@ public class RocketPrintTree extends JTree { * @return an array of CheckBoxNode */ private static CheckBoxNode[] createPrintTreeNode(boolean onlyStageSpecific) { - List nodes = new ArrayList(); + List nodes = new ArrayList<>(); OpenRocketPrintable[] printables = OpenRocketPrintable.values(); for (OpenRocketPrintable openRocketPrintable : printables) { if (!onlyStageSpecific || openRocketPrintable.isStageSpecific()) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java index 0faa28c17..87fda6dac 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/CenteringRingStrategy.java @@ -63,7 +63,7 @@ public class CenteringRingStrategy extends AbstractPrintStrategy { RocketComponent parent = rc.getParent(); List siblings = parent.getChildren(); - List mounts = new ArrayList(); + List mounts = new ArrayList<>(); for (RocketComponent rocketComponents : siblings) { if (rocketComponents != rc) { if (rocketComponents instanceof InnerTube) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java index 17000b9b8..4463cb26e 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PageFitPrintStrategy.java @@ -60,7 +60,7 @@ public class PageFitPrintStrategy { public PageFitPrintStrategy(Document doc, PdfWriter theWriter) { document = doc; writer = theWriter; - componentToPrint = new ArrayList(); + componentToPrint = new ArrayList<>(); } /** diff --git a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java index fbc584f95..1f392472a 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java +++ b/swing/src/main/java/info/openrocket/swing/gui/print/visitor/PartsListVisitorStrategy.java @@ -31,7 +31,7 @@ public class PartsListVisitorStrategy { /** * Accumulator for parts data. */ - private Map crap = new HashMap(); + private Map crap = new HashMap<>(); /** * The iText document. diff --git a/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java b/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java index 0e9e7b652..3fcc436d7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java +++ b/swing/src/main/java/info/openrocket/swing/gui/rocketfigure/SymmetricComponentShapes.java @@ -38,7 +38,7 @@ public class SymmetricComponentShapes extends RocketComponentShapes { final double delta = 0.0000001; double x; - ArrayList points = new ArrayList(); + ArrayList points = new ArrayList<>(); x = delta; points.add(new Coordinate(x, c.getRadius(x), 0)); for (i = 1; i < MINPOINTS - 1; i++) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java index 55d3c6ac6..7ca8546c2 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/AbstractScaleFigure.java @@ -54,7 +54,7 @@ public abstract class AbstractScaleFigure extends JPanel { // which frames does this transform between ? protected AffineTransform projection = null; - protected final List listeners = new LinkedList(); + protected final List listeners = new LinkedList<>(); private static Color backgroundColor; diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java index 02bd3a525..ed89dec83 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketFigure.java @@ -99,8 +99,8 @@ public class RocketFigure extends AbstractScaleFigure { Comparator.comparingInt(o -> -o.component.getDisplayOrder_back())); - private final ArrayList relativeExtra = new ArrayList(); - private final ArrayList absoluteExtra = new ArrayList(); + private final ArrayList relativeExtra = new ArrayList<>(); + private final ArrayList absoluteExtra = new ArrayList<>(); private static Color motorFillColor; private static Color motorBorderColor; @@ -395,7 +395,7 @@ public class RocketFigure extends AbstractScaleFigure { return new RocketComponent[0]; } - LinkedHashSet l = new LinkedHashSet(); + LinkedHashSet l = new LinkedHashSet<>(); PriorityQueue figureShapes; if (currentViewType == RocketPanel.VIEW_TYPE.SideView || currentViewType == RocketPanel.VIEW_TYPE.TopView) diff --git a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java index dcaeb2ae2..7f8b42811 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/scalefigure/RocketPanel.java @@ -178,7 +178,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change private SimulationWorker backgroundSimulationWorker = null; - private List listeners = new ArrayList(); + private List listeners = new ArrayList<>(); // Store the basic frame to know which tab is selected (Rocket design, Motors & Configuration, Flight simulations) private final BasicFrame basicFrame; diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java index ad8c156c0..9ea7d2ead 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationExportPanel.java @@ -181,10 +181,10 @@ public class SimulationExportPanel extends JPanel { this.add(csvOptions, "spany, split, growx 1"); //// Add series selection box - ArrayList stages = new ArrayList(); + 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 diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java index afb372731..34388a0a7 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationOptionsPanel.java @@ -126,9 +126,9 @@ class SimulationOptionsPanel extends JPanel { label.setToolTipText(trans.get("simedtdlg.lbl.ttip.GeodeticMethodTip")); subsub.add(label, "gapright para"); - EnumModel gcsModel = new EnumModel( + 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) { @@ -235,7 +235,7 @@ class SimulationOptionsPanel extends JPanel { } private JPopupMenu getExtensionMenu() { - Set extensions = Application.getInjector().getInstance(new Key>() { + Set extensions = Application.getInjector().getInstance(new Key<>() { }); JPopupMenu basemenu = new JPopupMenu(); @@ -445,7 +445,7 @@ class SimulationOptionsPanel extends JPanel { } private SwingSimulationExtensionConfigurator findConfigurator(SimulationExtension extension) { - Set configurators = Application.getInjector().getInstance(new Key>() { + Set configurators = Application.getInjector().getInstance(new Key<>() { }); for (SwingSimulationExtensionConfigurator c : configurators) { if (c.support(extension)) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java index f6cd57463..480bd2090 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java @@ -134,7 +134,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); @@ -531,7 +531,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) diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java index 22b7a211d..704933e98 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationRunDialog.java @@ -76,7 +76,7 @@ public class SimulationRunDialog extends JDialog { static { int n = SwingPreferences.getMaxThreadCount(); - executor = new ThreadPoolExecutor(n, n, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), + executor = new ThreadPoolExecutor(n, n, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new ThreadFactory() { private ThreadFactory factory = Executors.defaultThreadFactory(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java b/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java index 030c3edb5..62a00fd26 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/CheckList.java @@ -75,7 +75,7 @@ public class CheckList { @SuppressWarnings("unchecked") public CheckList build() { - return new CheckList((JList)list); + return new CheckList<>((JList) list); } } @@ -132,7 +132,7 @@ public class CheckList { * @param data */ public void setData(Collection data) { - setModel(new DefaultCheckListModel(data)); + setModel(new DefaultCheckListModel<>(data)); } /** @@ -156,7 +156,7 @@ public class CheckList { } public Collection getUncheckedItems() { - List unchecked = new ArrayList(); + List unchecked = new ArrayList<>(); for (int i = getModel().getSize() - 1; i >= 0; i--) { unchecked.add((T) getModel().getElementAt(i)); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java b/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java index 84d175eb5..007f6c181 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/CustomFinImporter.java @@ -24,7 +24,7 @@ public class CustomFinImporter { public ArrayList getPoints(File file) throws IOException { - ArrayList points = new ArrayList(); + ArrayList points = new ArrayList<>(); BufferedImage pic = ImageIO.read(file); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java b/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java index 7fc01a35e..375467315 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/DefaultCheckListModel.java @@ -52,8 +52,8 @@ public class DefaultCheckListModel extends AbstractListModel { private static final long serialVersionUID = 1L; - private final List data = new ArrayList(); - private final Set checks = new HashSet(); + private final List data = new ArrayList<>(); + private final Set checks = new HashSet<>(); public DefaultCheckListModel(Collection data) { @@ -98,7 +98,7 @@ public class DefaultCheckListModel extends AbstractListModel { } public Collection getCheckedItems() { - List items = new ArrayList(checks); + List items = new ArrayList<>(checks); items.retainAll(data); return Collections.unmodifiableList(items); } @@ -117,7 +117,7 @@ public class DefaultCheckListModel extends AbstractListModel { // if ( CollectionUtils.isEmpty(items)) return; - List correctedItems = new ArrayList(items); + List correctedItems = new ArrayList<>(items); correctedItems.retainAll(data); checks.clear(); @@ -129,7 +129,7 @@ public class DefaultCheckListModel extends AbstractListModel { public void setUncheckedItems( Collection items ) { - List correctedItems = new ArrayList(data); + List correctedItems = new ArrayList<>(data); correctedItems.removeAll(items); checks.clear(); diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java b/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java index 019e739ce..9533113d6 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java @@ -248,9 +248,9 @@ public class GUIUtil { * @param c the component to modify */ public static void setTabToFocusing(Component c) { - Set strokes = new HashSet(Arrays.asList(KeyStroke.getKeyStroke("pressed TAB"))); + Set strokes = new HashSet<>(Arrays.asList(KeyStroke.getKeyStroke("pressed TAB"))); c.setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, strokes); - strokes = new HashSet(Arrays.asList(KeyStroke.getKeyStroke("shift pressed TAB"))); + strokes = new HashSet<>(Arrays.asList(KeyStroke.getKeyStroke("shift pressed TAB"))); c.setFocusTraversalKeys(KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS, strokes); } @@ -555,7 +555,7 @@ public class GUIUtil { combo.removeActionListener(l); } ComboBoxModel model = combo.getModel(); - combo.setModel(new DefaultComboBoxModel()); + combo.setModel(new DefaultComboBoxModel<>()); if (model instanceof Invalidatable) { ((Invalidatable) model).invalidateMe(); } diff --git a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java index 6640ac979..9f17b6d9c 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java +++ b/swing/src/main/java/info/openrocket/swing/gui/util/SwingPreferences.java @@ -68,7 +68,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i private static final List SUPPORTED_LOCALES; static { - List list = new ArrayList(); + List list = new ArrayList<>(); for (String lang : new String[] { "en", "ar", "de", "es", "fr", "it", "nl", "ru", "cs", "pl", "ja", "pt", "tr" }) { list.add(new Locale(lang)); } @@ -767,7 +767,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i public Set getUserMaterials() { Preferences prefs = PREFNODE.node("userMaterials"); - HashSet materials = new HashSet(); + HashSet materials = new HashSet<>(); try { for (String key : prefs.keys()) { @@ -805,7 +805,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i @Override public Set getComponentFavorites(ComponentPreset.Type type) { Preferences prefs = PREFNODE.node("favoritePresets").node(type.name()); - Set collection = new HashSet(); + Set collection = new HashSet<>(); try { collection.addAll(Arrays.asList(prefs.keys())); } catch (BackingStoreException bex) { @@ -848,7 +848,7 @@ public class SwingPreferences extends info.openrocket.core.startup.Preferences i public List getExcludedMotorManufacturers() { Preferences prefs = PREFNODE.node("excludedMotorManufacturers"); - List collection = new ArrayList(); + List collection = new ArrayList<>(); try { String[] manuShortNames = prefs.keys(); for (String s : manuShortNames) { diff --git a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java index bbd383314..6d2aa4ce4 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java +++ b/swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java @@ -418,7 +418,7 @@ public class SearchableAndCategorizableComboBox extends JComboBox { private final SortedSet model; public SortedListModel() { - Comparator alphabeticalComparator = new Comparator() { + Comparator alphabeticalComparator = new Comparator<>() { @Override public int compare(T o1, T o2) { return o1.toString().compareToIgnoreCase(o2.toString()); diff --git a/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java b/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java index 462b762de..f5aed2986 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/BufferLogger.java @@ -14,8 +14,8 @@ import java.util.List; public class BufferLogger extends LogHelper { private final CyclicBuffer buffer; - private final EnumMap storeLevels = - new EnumMap(LogLevel.class); + private final EnumMap storeLevels = + new EnumMap<>(LogLevel.class); /** @@ -28,7 +28,7 @@ public class BufferLogger extends LogHelper { for (LogLevel l: LogLevel.values()) { storeLevels.put(l, true); } - buffer = new CyclicBuffer(length); + buffer = new CyclicBuffer<>(length); } diff --git a/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java b/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java index 2529f150f..82bad6f82 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java +++ b/swing/src/main/java/info/openrocket/swing/logging/CyclicBuffer.java @@ -40,7 +40,7 @@ public class CyclicBuffer extends AbstractQueue { * @param size the size of the cyclic buffer. */ public CyclicBuffer(int size) { - this.buffer = new ArrayList(size); + this.buffer = new ArrayList<>(size); for (int i=0; i extends AbstractQueue { * @return a list of the buffered objects. */ public synchronized List asList() { - ArrayList list = new ArrayList(size); + ArrayList list = new ArrayList<>(size); if (startPosition + size > maxSize) { list.addAll(buffer.subList(startPosition, maxSize)); list.addAll(buffer.subList(0, startPosition + size - maxSize)); diff --git a/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java b/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java index ebc51510c..906ec13f1 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/DelegatorLogger.java @@ -17,7 +17,7 @@ public class DelegatorLogger extends LogHelper { * List of loggers. This list must not be modified, instead it should be * replaced every time the list is changed. */ - private volatile ArrayList loggers = new ArrayList(); + private volatile ArrayList loggers = new ArrayList<>(); @Override public void log(LogLine line) { diff --git a/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java b/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java index c15bfff78..2fa424d18 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/LogLevelBufferLogger.java @@ -18,7 +18,7 @@ import java.util.List; public class LogLevelBufferLogger extends LogHelper { private final EnumMap loggers = - new EnumMap(LogLevel.class); + new EnumMap<>(LogLevel.class); /** @@ -45,7 +45,7 @@ public class LogLevelBufferLogger extends LogHelper { * @return a list of log lines in order. */ public List getLogs() { - List result = new ArrayList(); + List result = new ArrayList<>(); for (LogLevel level : LogLevel.values()) { BufferLogger logger = loggers.get(level); diff --git a/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java b/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java index 28b8eec09..e60cb4316 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java +++ b/swing/src/main/java/info/openrocket/swing/logging/LoggingSystemSetup.java @@ -24,7 +24,7 @@ public class LoggingSystemSetup { public static void addConsoleAppender() { Logger logger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - ConsoleAppender appender = new ConsoleAppender(); + ConsoleAppender appender = new ConsoleAppender<>(); appender.setName("console"); appender.setContext(context); PatternLayoutEncoder layout = new PatternLayoutEncoder(); diff --git a/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java b/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java index 59a68aac9..d0b336b9f 100644 --- a/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java +++ b/swing/src/main/java/info/openrocket/swing/logging/PrintStreamLogger.java @@ -11,7 +11,7 @@ import java.util.EnumMap; */ public class PrintStreamLogger extends LogHelper { - private final EnumMap output = new EnumMap(LogLevel.class); + private final EnumMap output = new EnumMap<>(LogLevel.class); @Override diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java b/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java index 476762217..63fc802ab 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/ConfigurableStreamHandlerFactory.java @@ -15,7 +15,7 @@ public class ConfigurableStreamHandlerFactory implements URLStreamHandlerFactory private final Map protocolHandlers; public ConfigurableStreamHandlerFactory() { - protocolHandlers = new HashMap(); + protocolHandlers = new HashMap<>(); } public void addHandler(String protocol, URLStreamHandler urlHandler) { diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java b/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java index 91a97f918..7b09c6570 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/CurrentClasspathProvider.java @@ -10,7 +10,7 @@ public class CurrentClasspathProvider implements ClasspathProvider { @Override public List getUrls() { - List urls = new ArrayList(); + List urls = new ArrayList<>(); String classpath = System.getProperty("java.class.path"); String[] cps = classpath.split(File.pathSeparator); diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java b/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java index 42c7657e0..29c835101 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/JarInJarStarter.java @@ -16,7 +16,7 @@ public class JarInJarStarter { * @param providers the classpath sources. */ public static void runMain(String mainClass, String[] args, ClasspathProvider... providers) { - List urls = new ArrayList(); + List urls = new ArrayList<>(); for (ClasspathProvider p : providers) { urls.addAll(p.getUrls()); diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java b/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java index 1c979301f..c4b6568d7 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/ManifestClasspathProvider.java @@ -21,7 +21,7 @@ public class ManifestClasspathProvider implements ClasspathProvider { try { List manifest = readManifestLine(MANIFEST_ATTRIBUTE); - List urls = new ArrayList(); + List urls = new ArrayList<>(); for (String s : manifest) { parseManifestLine(urls, s); } @@ -34,7 +34,7 @@ public class ManifestClasspathProvider implements ClasspathProvider { private List readManifestLine(String name) throws IOException { - List lines = new ArrayList(); + List lines = new ArrayList<>(); Enumeration resources = getClass().getClassLoader().getResources("META-INF/MANIFEST.MF"); diff --git a/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java b/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java index f0d6ea7a0..714cfc0cc 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/jij/PluginClasspathProvider.java @@ -15,7 +15,7 @@ public class PluginClasspathProvider implements ClasspathProvider { @Override public List getUrls() { - List urls = new ArrayList(); + List urls = new ArrayList<>(); findPluginDirectoryUrls(urls); findCustomPlugins(urls); diff --git a/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java b/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java index 70ff0f746..7c84f39c0 100644 --- a/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java +++ b/swing/src/main/java/info/openrocket/swing/startup/providers/TranslatorProvider.java @@ -18,7 +18,7 @@ public class TranslatorProvider implements Provider { private final static Logger log = LoggerFactory.getLogger(TranslatorProvider.class); - private AtomicReference translator = new AtomicReference(); + private AtomicReference translator = new AtomicReference<>(); @Override public Translator get() { diff --git a/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java b/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java index f43919f28..07a0e943a 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java +++ b/swing/src/main/java/info/openrocket/swing/utils/ComponentPresetEditor.java @@ -272,7 +272,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene */ class DataTableModel extends DefaultTableModel { - private List associated = new ArrayList(); + private List associated = new ArrayList<>(); /** * Constructs a DefaultTableModel with as many columns as there are elements in @@ -365,7 +365,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene if (file.getName().toLowerCase().endsWith(".csv")) { file = file.getParentFile(); } - presets = new ArrayList(); + presets = new ArrayList<>(); MaterialHolder materialHolder = RockSimComponentFileTranslator.loadAll(presets, file); editContext.setMaterialsLoaded(materialHolder); } @@ -433,7 +433,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene file = FileHelper.forceExtension(file, "orc"); MaterialHolder materials = new MaterialHolder(); - List presets = new ArrayList(); + List presets = new ArrayList<>(); for (int x = 0; x < model.getRowCount(); x++) { ComponentPreset preset = (ComponentPreset) model.getAssociatedObject(x); @@ -454,7 +454,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene presets.add(preset); } - return FileHelper.confirmWrite(file, this) && new OpenRocketComponentSaver().save(file, new ArrayList(materials.values()), presets); + return FileHelper.confirmWrite(file, this) && new OpenRocketComponentSaver().save(file, new ArrayList<>(materials.values()), presets); } class OpenedFileContext { diff --git a/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java b/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java index 8dabc0c73..c537344be 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java +++ b/swing/src/main/java/info/openrocket/swing/utils/RockSimComponentFileTranslator.java @@ -45,13 +45,13 @@ public class RockSimComponentFileTranslator { throw new IllegalArgumentException("Invalid Command Line Params"); } - List allPresets = new ArrayList(); + List allPresets = new ArrayList<>(); LOGGER.println("Loading csv files from directory " + args[0]); MaterialHolder materialMap = loadAll(allPresets, new File(args[0])); LOGGER.println("\tMarshalling to XML"); - String xml = new OpenRocketComponentSaver().marshalToOpenRocketComponent(new ArrayList(materialMap.values()), allPresets, true); + String xml = new OpenRocketComponentSaver().marshalToOpenRocketComponent(new ArrayList<>(materialMap.values()), allPresets, true); // Try parsing the file LOGGER.println("\tValidating XML"); diff --git a/swing/src/main/java/info/openrocket/swing/utils/Scripting.java b/swing/src/main/java/info/openrocket/swing/utils/Scripting.java index 14ff0661a..df354b9d9 100644 --- a/swing/src/main/java/info/openrocket/swing/utils/Scripting.java +++ b/swing/src/main/java/info/openrocket/swing/utils/Scripting.java @@ -29,7 +29,7 @@ public class Scripting { System.out.println("RSyntaxTextArea supported syntax languages:"); TokenMakerFactory f = TokenMakerFactory.getDefaultInstance(); - List list = new ArrayList(f.keySet()); + List list = new ArrayList<>(f.keySet()); Collections.sort(list); for (String type : list) { System.out.println(" " + type); diff --git a/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java b/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java index 63f541b6b..8ac194c21 100644 --- a/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java +++ b/swing/src/test/java/info/openrocket/swing/ServicesForTesting.java @@ -29,7 +29,7 @@ public class ServicesForTesting extends AbstractModule { public static class TranslatorProviderForTesting implements Provider { - private final AtomicReference translator = new AtomicReference(); + private final AtomicReference translator = new AtomicReference<>(); @Override public Translator get() { diff --git a/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java b/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java index 840770650..d98cf7cc9 100644 --- a/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java +++ b/swing/src/test/java/info/openrocket/swing/gui/configdialog/FinSetConfigTest.java @@ -42,7 +42,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeFinTabLength() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(); @@ -58,7 +58,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testCompute2LeadingRings() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(); @@ -85,7 +85,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testCompute1Ring() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setLength(0.004); @@ -106,7 +106,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeOneLeadingOneRingWithinRoot() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -133,7 +133,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeOneLeadingOneTrailingRing() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -158,7 +158,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testComputeOneWithinRootOneTrailingRing() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -183,7 +183,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testBothRingsWithinRootChord() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); RocketComponent parent = new BodyTube(1.0000d, 0.1d); CenteringRing ring1 = new CenteringRing(); @@ -210,7 +210,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void testBothRingsBeyondRootChord() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.TOP); @@ -236,7 +236,7 @@ public class FinSetConfigTest extends BaseTestCase { @Test public void test3RingsWithinRootChord() throws Exception { DoubleModel dm = new DoubleModel(1d); - List rings = new ArrayList(); + List rings = new ArrayList<>(); CenteringRing ring1 = new CenteringRing(); ring1.setAxialMethod(AxialMethod.ABSOLUTE); diff --git a/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java b/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java index 1c6c50988..850bb40d6 100644 --- a/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java +++ b/swing/src/test/java/info/openrocket/swing/gui/dialogs/motor/thrustcurve/MotorRowFilterTest.java @@ -56,7 +56,7 @@ public class MotorRowFilterTest { ThrustCurveMotorSet motorSet = new ThrustCurveMotorSet(); motorSet.addMotor(motor); - List motorList = new ArrayList(); + List motorList = new ArrayList<>(); motorList.add(motorSet); ThrustCurveMotorDatabaseModel model = new ThrustCurveMotorDatabaseModel(motorList); @@ -65,7 +65,7 @@ public class MotorRowFilterTest { /////////////////////////////////// // search terms filter - ArrayList badSearchTerms = new ArrayList(); + ArrayList badSearchTerms = new ArrayList<>(); // Two search terms, one present and one not badSearchTerms.add("xx"); @@ -120,7 +120,7 @@ public class MotorRowFilterTest { ////////////////////////////////// // manufacturer set/get/filter presence/absence - List excludedManufacturers = new ArrayList(); + List excludedManufacturers = new ArrayList<>(); if (motor.getManufacturer() != Manufacturer.getManufacturer("UNKNOWN")) { excludedManufacturers.add(Manufacturer.getManufacturer("Estes")); excludedManufacturers.add(motor.getManufacturer()); diff --git a/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java b/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java index 6ca672501..e1b56faff 100644 --- a/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java +++ b/swing/src/test/java/info/openrocket/swing/logging/CyclicBufferTest.java @@ -15,8 +15,8 @@ public class CyclicBufferTest { @Test public void testBasic() { - CyclicBuffer buffer = new CyclicBuffer(5); - LinkedList correct = new LinkedList(); + CyclicBuffer buffer = new CyclicBuffer<>(5); + LinkedList correct = new LinkedList<>(); Random rnd = new Random(); for (int i=0; i<50; i++) { @@ -31,7 +31,7 @@ public class CyclicBufferTest { @Test public void testComplex() { - CyclicBuffer buffer = new CyclicBuffer(5); + CyclicBuffer buffer = new CyclicBuffer<>(5); testContents(buffer); assertEquals(0, buffer.getOverwriteCount()); @@ -109,8 +109,8 @@ public class CyclicBufferTest { @Test public void testRandom() { - CyclicBuffer buffer = new CyclicBuffer(4); - LinkedList correct = new LinkedList(); + CyclicBuffer buffer = new CyclicBuffer<>(4); + LinkedList correct = new LinkedList<>(); Random rnd = new Random(); for (int i=0; i<500; i++) {