From a1fe1adf06636665eecd9a540bf3fd0b5177363c Mon Sep 17 00:00:00 2001 From: bkuker Date: Thu, 25 Oct 2012 14:48:46 -0400 Subject: [PATCH] Remove unused Application imports --- core/src/net/sf/openrocket/database/Database.java | 1 - .../net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java | 1 - core/src/net/sf/openrocket/document/Simulation.java | 1 - core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java | 1 - core/src/net/sf/openrocket/file/iterator/FileIterator.java | 1 - .../net/sf/openrocket/file/iterator/ZipDirectoryIterator.java | 1 - core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java | 1 - core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java | 1 - core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java | 1 - core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java | 1 - .../src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java | 2 -- core/src/net/sf/openrocket/gui/components/URLLabel.java | 1 - .../openrocket/gui/dialogs/optimization/OptimizationWorker.java | 1 - core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java | 1 - core/src/net/sf/openrocket/gui/print/DesignReport.java | 1 - core/src/net/sf/openrocket/gui/print/PaperSize.java | 2 -- core/src/net/sf/openrocket/gui/print/PrintUtilities.java | 2 -- .../sf/openrocket/gui/print/visitor/CenteringRingStrategy.java | 1 - .../openrocket/gui/print/visitor/FinMarkingGuideStrategy.java | 2 -- .../sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java | 2 -- .../sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java | 2 -- .../gui/print/visitor/PartsDetailVisitorStrategy.java | 1 - .../net/sf/openrocket/gui/print/visitor/TransitionStrategy.java | 2 -- core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java | 1 - core/src/net/sf/openrocket/motor/ThrustCurveMotor.java | 1 - .../general/multidim/MultidirectionalSearchOptimizer.java | 1 - .../general/onedim/GoldenSectionSearchOptimizer.java | 1 - .../rocketoptimization/parameters/SimulationBasedParameter.java | 1 - .../net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java | 1 - .../net/sf/openrocket/preset/xml/OpenRocketComponentSaver.java | 2 -- core/src/net/sf/openrocket/simulation/FlightData.java | 1 - core/src/net/sf/openrocket/simulation/SimulationOptions.java | 1 - .../customexpression/CustomExpressionSimulationListener.java | 1 - .../simulation/listeners/SimulationListenerHelper.java | 1 - core/src/net/sf/openrocket/util/Coordinate.java | 2 -- core/src/net/sf/openrocket/util/ExpressionParser.java | 1 - core/src/net/sf/openrocket/util/MemoryManagement.java | 2 -- core/src/net/sf/openrocket/util/Quaternion.java | 2 -- 38 files changed, 49 deletions(-) diff --git a/core/src/net/sf/openrocket/database/Database.java b/core/src/net/sf/openrocket/database/Database.java index ba5872387..38f79e715 100644 --- a/core/src/net/sf/openrocket/database/Database.java +++ b/core/src/net/sf/openrocket/database/Database.java @@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.file.Loader; import net.sf.openrocket.file.iterator.DirectoryIterator; import net.sf.openrocket.file.iterator.FileIterator; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.JarUtil; import net.sf.openrocket.util.Pair; diff --git a/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java b/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java index 70ff2197e..b79c00cd6 100644 --- a/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java +++ b/core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java @@ -9,7 +9,6 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.startup.Application; /** * A database containing ThrustCurveMotorSet objects and allowing adding a motor diff --git a/core/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java index 0ac87d6ee..c23d02f17 100644 --- a/core/src/net/sf/openrocket/document/Simulation.java +++ b/core/src/net/sf/openrocket/document/Simulation.java @@ -24,7 +24,6 @@ import net.sf.openrocket.simulation.SimulationStepper; import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.exception.SimulationListenerException; import net.sf.openrocket.simulation.listeners.SimulationListener; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.ChangeSource; diff --git a/core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java b/core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java index 202c3cd50..f1a28a866 100644 --- a/core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java +++ b/core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java @@ -11,7 +11,6 @@ import java.net.URL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.JarUtil; import net.sf.openrocket.util.Pair; diff --git a/core/src/net/sf/openrocket/file/iterator/FileIterator.java b/core/src/net/sf/openrocket/file/iterator/FileIterator.java index 1d5ce10a8..d0a943959 100644 --- a/core/src/net/sf/openrocket/file/iterator/FileIterator.java +++ b/core/src/net/sf/openrocket/file/iterator/FileIterator.java @@ -8,7 +8,6 @@ import java.util.NoSuchElementException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Pair; /** diff --git a/core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java b/core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java index 3f7acd537..ae50fa8a8 100644 --- a/core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java +++ b/core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java @@ -11,7 +11,6 @@ import java.util.zip.ZipFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Pair; /** diff --git a/core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java b/core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java index 8631ffa9b..a8ebf9780 100644 --- a/core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java +++ b/core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java @@ -17,7 +17,6 @@ import net.sf.openrocket.file.iterator.FileIterator; import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Pair; public final class MotorLoaderHelper { diff --git a/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java b/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java index f1e8ce400..ec1bd3156 100644 --- a/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java +++ b/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java @@ -18,7 +18,6 @@ import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.MotorDigest; import net.sf.openrocket.motor.MotorDigest.DataType; import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Coordinate; import org.slf4j.Logger; diff --git a/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java b/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java index b8c974763..193014588 100644 --- a/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java +++ b/core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java @@ -12,7 +12,6 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.file.UnknownFileTypeException; import net.sf.openrocket.motor.Motor; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.UncloseableInputStream; /** diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java index 7d287af0e..f321593ed 100644 --- a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java @@ -32,7 +32,6 @@ import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.simulation.SimulationOptions; import net.sf.openrocket.simulation.customexpression.CustomExpression; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BuildProperties; import net.sf.openrocket.util.MathUtil; diff --git a/core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java b/core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java index 480b68bd9..46d41894d 100644 --- a/core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java +++ b/core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java @@ -9,8 +9,6 @@ import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Stage; -import net.sf.openrocket.startup.Application; - import javax.xml.bind.JAXBContext; import javax.xml.bind.Marshaller; diff --git a/core/src/net/sf/openrocket/gui/components/URLLabel.java b/core/src/net/sf/openrocket/gui/components/URLLabel.java index 793183cda..182f3b127 100644 --- a/core/src/net/sf/openrocket/gui/components/URLLabel.java +++ b/core/src/net/sf/openrocket/gui/components/URLLabel.java @@ -15,7 +15,6 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; /** diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java index e447b4a1a..fce171a95 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java +++ b/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java @@ -24,7 +24,6 @@ import net.sf.openrocket.optimization.rocketoptimization.RocketOptimizationFunct import net.sf.openrocket.optimization.rocketoptimization.RocketOptimizationListener; import net.sf.openrocket.optimization.rocketoptimization.SimulationDomain; import net.sf.openrocket.optimization.rocketoptimization.SimulationModifier; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Value; import net.sf.openrocket.util.BugException; diff --git a/core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java b/core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java index 9383c6ae6..23a5c6eaa 100644 --- a/core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java +++ b/core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java @@ -25,7 +25,6 @@ import net.sf.openrocket.rocketcomponent.MassObject; import net.sf.openrocket.rocketcomponent.RingComponent; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.Transition; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Coordinate; /* diff --git a/core/src/net/sf/openrocket/gui/print/DesignReport.java b/core/src/net/sf/openrocket/gui/print/DesignReport.java index 6e7ca77d5..da601a8df 100644 --- a/core/src/net/sf/openrocket/gui/print/DesignReport.java +++ b/core/src/net/sf/openrocket/gui/print/DesignReport.java @@ -26,7 +26,6 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.Stage; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.exception.SimulationException; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.Chars; diff --git a/core/src/net/sf/openrocket/gui/print/PaperSize.java b/core/src/net/sf/openrocket/gui/print/PaperSize.java index f33ef2706..6a9f6b0d3 100644 --- a/core/src/net/sf/openrocket/gui/print/PaperSize.java +++ b/core/src/net/sf/openrocket/gui/print/PaperSize.java @@ -8,8 +8,6 @@ import java.util.Locale; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; - import com.itextpdf.text.PageSize; import com.itextpdf.text.Rectangle; diff --git a/core/src/net/sf/openrocket/gui/print/PrintUtilities.java b/core/src/net/sf/openrocket/gui/print/PrintUtilities.java index eb749447a..2c8fdc275 100644 --- a/core/src/net/sf/openrocket/gui/print/PrintUtilities.java +++ b/core/src/net/sf/openrocket/gui/print/PrintUtilities.java @@ -15,8 +15,6 @@ import javax.swing.RepaintManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; - import com.itextpdf.text.Chunk; import com.itextpdf.text.Document; import com.itextpdf.text.DocumentException; diff --git a/core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java index 0bf9c3531..603de9bf4 100644 --- a/core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java +++ b/core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java @@ -11,7 +11,6 @@ import net.sf.openrocket.gui.print.PrintableCenteringRing; import net.sf.openrocket.rocketcomponent.CenteringRing; import net.sf.openrocket.rocketcomponent.InnerTube; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.ArrayList; import java.awt.image.BufferedImage; diff --git a/core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java index 60d849e8c..1312fd60b 100644 --- a/core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java +++ b/core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java @@ -8,8 +8,6 @@ import com.itextpdf.text.pdf.PdfWriter; import net.sf.openrocket.gui.print.FinMarkingGuide; import net.sf.openrocket.gui.print.ITextHelper; import net.sf.openrocket.rocketcomponent.Rocket; -import net.sf.openrocket.startup.Application; - import java.awt.*; import java.awt.image.BufferedImage; diff --git a/core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java index e3395acea..aefff89fc 100644 --- a/core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java +++ b/core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java @@ -12,8 +12,6 @@ import net.sf.openrocket.gui.print.PrintUnit; import net.sf.openrocket.gui.print.PrintableFinSet; import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.startup.Application; - import java.awt.image.BufferedImage; import java.util.List; import java.util.Set; diff --git a/core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java index 8da5e39b6..090f95e6e 100644 --- a/core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java +++ b/core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java @@ -9,8 +9,6 @@ import com.itextpdf.text.pdf.PdfWriter; import net.sf.openrocket.gui.print.PrintUnit; import net.sf.openrocket.gui.print.PrintableComponent; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.startup.Application; - import java.awt.Graphics2D; import java.util.ArrayList; import java.util.Collections; diff --git a/core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java index 69ebe1e7c..10115046b 100644 --- a/core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java +++ b/core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java @@ -36,7 +36,6 @@ import net.sf.openrocket.rocketcomponent.ShockCord; import net.sf.openrocket.rocketcomponent.Stage; import net.sf.openrocket.rocketcomponent.Streamer; import net.sf.openrocket.rocketcomponent.Transition; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; diff --git a/core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java b/core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java index 18467f7e3..9d11d55a6 100644 --- a/core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java +++ b/core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java @@ -12,8 +12,6 @@ import net.sf.openrocket.gui.print.PrintableTransition; import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.Transition; -import net.sf.openrocket.startup.Application; - import java.awt.image.BufferedImage; import java.util.List; import java.util.Set; diff --git a/core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java b/core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java index a856de69c..b7eef06d9 100644 --- a/core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java +++ b/core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java @@ -4,7 +4,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.sf.openrocket.rocketcomponent.Configuration; -import net.sf.openrocket.startup.Application; /** * Abstract base for mass calculators. Provides functionality for cacheing mass data. diff --git a/core/src/net/sf/openrocket/motor/ThrustCurveMotor.java b/core/src/net/sf/openrocket/motor/ThrustCurveMotor.java index fd62441bf..8f1c042a0 100644 --- a/core/src/net/sf/openrocket/motor/ThrustCurveMotor.java +++ b/core/src/net/sf/openrocket/motor/ThrustCurveMotor.java @@ -8,7 +8,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.sf.openrocket.models.atmosphere.AtmosphericConditions; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.ArrayUtils; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.Coordinate; diff --git a/core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java b/core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java index a7e476933..cc97f692c 100644 --- a/core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java +++ b/core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java @@ -14,7 +14,6 @@ import net.sf.openrocket.optimization.general.OptimizationController; import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.ParallelFunctionCache; import net.sf.openrocket.optimization.general.Point; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Statistics; /** diff --git a/core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java b/core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java index e6951a033..771964493 100644 --- a/core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java +++ b/core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java @@ -9,7 +9,6 @@ import net.sf.openrocket.optimization.general.OptimizationController; import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.ParallelFunctionCache; import net.sf.openrocket.optimization.general.Point; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Statistics; diff --git a/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java index 769432323..5d0b455bb 100644 --- a/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java +++ b/core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java @@ -16,7 +16,6 @@ import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.exception.SimulationLaunchException; import net.sf.openrocket.simulation.listeners.SimulationListener; import net.sf.openrocket.simulation.listeners.system.InterruptListener; -import net.sf.openrocket.startup.Application; /** * An abstract optimization parameter that simulates a rocket flight and obtains diff --git a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java index decb6fc57..9cbeced10 100644 --- a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java +++ b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java @@ -14,7 +14,6 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.file.Loader; import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.preset.InvalidComponentPresetException; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; public class OpenRocketComponentLoader implements Loader { diff --git a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentSaver.java b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentSaver.java index 172e9203f..282e0b902 100644 --- a/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentSaver.java +++ b/core/src/net/sf/openrocket/preset/xml/OpenRocketComponentSaver.java @@ -3,8 +3,6 @@ package net.sf.openrocket.preset.xml; import net.sf.openrocket.material.Material; import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.preset.InvalidComponentPresetException; -import net.sf.openrocket.startup.Application; - import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; diff --git a/core/src/net/sf/openrocket/simulation/FlightData.java b/core/src/net/sf/openrocket/simulation/FlightData.java index ae0152b04..3c5afffc3 100644 --- a/core/src/net/sf/openrocket/simulation/FlightData.java +++ b/core/src/net/sf/openrocket/simulation/FlightData.java @@ -7,7 +7,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.WarningSet; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Mutable; diff --git a/core/src/net/sf/openrocket/simulation/SimulationOptions.java b/core/src/net/sf/openrocket/simulation/SimulationOptions.java index 368af10e8..a61409bfe 100644 --- a/core/src/net/sf/openrocket/simulation/SimulationOptions.java +++ b/core/src/net/sf/openrocket/simulation/SimulationOptions.java @@ -18,7 +18,6 @@ import net.sf.openrocket.models.gravity.GravityModel; import net.sf.openrocket.models.gravity.WGSGravityModel; import net.sf.openrocket.models.wind.PinkNoiseWindModel; import net.sf.openrocket.rocketcomponent.Rocket; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.ChangeSource; import net.sf.openrocket.util.GeodeticComputationStrategy; diff --git a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java index 73b374ec8..a10f94847 100644 --- a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java +++ b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java @@ -10,7 +10,6 @@ import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.SimulationStatus; import net.sf.openrocket.simulation.exception.SimulationException; import net.sf.openrocket.simulation.listeners.AbstractSimulationListener; -import net.sf.openrocket.startup.Application; public class CustomExpressionSimulationListener extends AbstractSimulationListener { diff --git a/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java b/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java index b3a36db6f..d0a64fe50 100644 --- a/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java +++ b/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java @@ -17,7 +17,6 @@ import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.simulation.MassData; import net.sf.openrocket.simulation.SimulationStatus; import net.sf.openrocket.simulation.exception.SimulationException; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.MathUtil; diff --git a/core/src/net/sf/openrocket/util/Coordinate.java b/core/src/net/sf/openrocket/util/Coordinate.java index efb76334e..65ebe9325 100644 --- a/core/src/net/sf/openrocket/util/Coordinate.java +++ b/core/src/net/sf/openrocket/util/Coordinate.java @@ -5,8 +5,6 @@ import java.io.Serializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; - /** * An immutable class of weighted coordinates. The weights are non-negative. * diff --git a/core/src/net/sf/openrocket/util/ExpressionParser.java b/core/src/net/sf/openrocket/util/ExpressionParser.java index 7197539a7..360bde809 100644 --- a/core/src/net/sf/openrocket/util/ExpressionParser.java +++ b/core/src/net/sf/openrocket/util/ExpressionParser.java @@ -5,7 +5,6 @@ import java.text.DecimalFormatSymbols; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; import de.congrace.exp4j.Calculable; import de.congrace.exp4j.ExpressionBuilder; diff --git a/core/src/net/sf/openrocket/util/MemoryManagement.java b/core/src/net/sf/openrocket/util/MemoryManagement.java index 13253de06..066ebb98b 100644 --- a/core/src/net/sf/openrocket/util/MemoryManagement.java +++ b/core/src/net/sf/openrocket/util/MemoryManagement.java @@ -9,8 +9,6 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; - /** * A class that performs certain memory-management operations for debugging purposes. * For example, complex objects that are being discarded and that should be garbage-collectable diff --git a/core/src/net/sf/openrocket/util/Quaternion.java b/core/src/net/sf/openrocket/util/Quaternion.java index a6790c6ec..82b6d55af 100644 --- a/core/src/net/sf/openrocket/util/Quaternion.java +++ b/core/src/net/sf/openrocket/util/Quaternion.java @@ -3,8 +3,6 @@ package net.sf.openrocket.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.startup.Application; - /** * An immutable quaternion class. *