diff --git a/core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java b/core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java index 978fd0900..6e7c2db97 100644 --- a/core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java +++ b/core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java @@ -2,6 +2,7 @@ package net.sf.openrocket.aerodynamics; import java.util.Map; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.MathUtil; diff --git a/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java b/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java index 76429c276..8564edf74 100644 --- a/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java +++ b/core/src/net/sf/openrocket/aerodynamics/AerodynamicCalculator.java @@ -2,8 +2,8 @@ package net.sf.openrocket.aerodynamics; import java.util.Map; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.FlightConfiguration; -import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.Monitorable; diff --git a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java index 97d7dd303..22e21cf39 100644 --- a/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java +++ b/core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java @@ -1,10 +1,11 @@ package net.sf.openrocket.aerodynamics; -import static net.sf.openrocket.util.MathUtil.EPSILON; import static net.sf.openrocket.util.MathUtil.pow2; import java.util.*; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.AxialStage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/ComponentAssemblyCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/ComponentAssemblyCalc.java index 2017bb168..c6f113094 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/ComponentAssemblyCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/ComponentAssemblyCalc.java @@ -2,7 +2,7 @@ package net.sf.openrocket.aerodynamics.barrowman; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Transformation; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java index 326c73a0d..59072fd9b 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java @@ -1,15 +1,14 @@ package net.sf.openrocket.aerodynamics.barrowman; import static java.lang.Math.pow; -import static net.sf.openrocket.util.MathUtil.EPSILON; import static net.sf.openrocket.util.MathUtil.pow2; import java.util.Arrays; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.BugException; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java index 04c3425ec..6a178cf44 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/LaunchLugCalc.java @@ -2,10 +2,8 @@ package net.sf.openrocket.aerodynamics.barrowman; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; -import net.sf.openrocket.rocketcomponent.LaunchLug; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Transformation; public class LaunchLugCalc extends TubeCalc { diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java index 26a279fbf..9f6c7bbd3 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/RailButtonCalc.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RailButton; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Coordinate; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java index 68b5daede..1af683bfa 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/RocketComponentCalc.java @@ -2,7 +2,7 @@ package net.sf.openrocket.aerodynamics.barrowman; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Transformation; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java index 2820ce5cb..41a3a81e2 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/SymmetricComponentCalc.java @@ -5,8 +5,8 @@ import static net.sf.openrocket.util.MathUtil.pow2; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.BarrowmanCalculator; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.SymmetricComponent; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java index cce711b4d..d1875c9e4 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeCalc.java @@ -1,7 +1,7 @@ package net.sf.openrocket.aerodynamics.barrowman; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.Tube; import net.sf.openrocket.util.MathUtil; diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java index 88e402f1d..642664ce5 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java @@ -1,23 +1,16 @@ package net.sf.openrocket.aerodynamics.barrowman; -import static java.lang.Math.pow; import static net.sf.openrocket.util.MathUtil.pow2; -import java.util.Arrays; - import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.Warning.Other; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.BodyTube; -import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.TubeFinSet; import net.sf.openrocket.util.Coordinate; -import net.sf.openrocket.util.LinearInterpolator; import net.sf.openrocket.util.MathUtil; -import net.sf.openrocket.util.PolyInterpolator; import net.sf.openrocket.util.Transformation; import org.slf4j.Logger; diff --git a/core/src/net/sf/openrocket/communication/ReleaseNotesHandler.java b/core/src/net/sf/openrocket/communication/ReleaseNotesHandler.java index ca24fd731..409d82a7a 100644 --- a/core/src/net/sf/openrocket/communication/ReleaseNotesHandler.java +++ b/core/src/net/sf/openrocket/communication/ReleaseNotesHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.communication; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; diff --git a/core/src/net/sf/openrocket/communication/WelcomeInfoRetriever.java b/core/src/net/sf/openrocket/communication/WelcomeInfoRetriever.java index 38736eff7..0642695e1 100644 --- a/core/src/net/sf/openrocket/communication/WelcomeInfoRetriever.java +++ b/core/src/net/sf/openrocket/communication/WelcomeInfoRetriever.java @@ -1,6 +1,6 @@ package net.sf.openrocket.communication; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.SimpleSAX; import net.sf.openrocket.util.BuildProperties; import org.xml.sax.InputSource; diff --git a/core/src/net/sf/openrocket/document/Simulation.java b/core/src/net/sf/openrocket/document/Simulation.java index 068fc91c8..b560cd1a8 100644 --- a/core/src/net/sf/openrocket/document/Simulation.java +++ b/core/src/net/sf/openrocket/document/Simulation.java @@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.AerodynamicCalculator; import net.sf.openrocket.aerodynamics.BarrowmanCalculator; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.formatting.RocketDescriptor; import net.sf.openrocket.masscalc.MassCalculator; import net.sf.openrocket.rocketcomponent.FlightConfiguration; diff --git a/core/src/net/sf/openrocket/file/AbstractRocketLoader.java b/core/src/net/sf/openrocket/file/AbstractRocketLoader.java index c5d206ccd..38e55ffa4 100644 --- a/core/src/net/sf/openrocket/file/AbstractRocketLoader.java +++ b/core/src/net/sf/openrocket/file/AbstractRocketLoader.java @@ -3,7 +3,7 @@ package net.sf.openrocket.file; import java.io.IOException; import java.io.InputStream; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; public abstract class AbstractRocketLoader implements RocketLoader { diff --git a/core/src/net/sf/openrocket/file/CSVExport.java b/core/src/net/sf/openrocket/file/CSVExport.java index 2536450eb..b8e1cc4a1 100644 --- a/core/src/net/sf/openrocket/file/CSVExport.java +++ b/core/src/net/sf/openrocket/file/CSVExport.java @@ -8,8 +8,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightDataBranch; diff --git a/core/src/net/sf/openrocket/file/DatabaseMotorFinder.java b/core/src/net/sf/openrocket/file/DatabaseMotorFinder.java index 36e83698d..0112e398b 100644 --- a/core/src/net/sf/openrocket/file/DatabaseMotorFinder.java +++ b/core/src/net/sf/openrocket/file/DatabaseMotorFinder.java @@ -1,13 +1,12 @@ package net.sf.openrocket.file; -import java.util.Collections; import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor.Type; import net.sf.openrocket.startup.Application; diff --git a/core/src/net/sf/openrocket/file/GeneralRocketLoader.java b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java index d4bd10f96..7de369c58 100644 --- a/core/src/net/sf/openrocket/file/GeneralRocketLoader.java +++ b/core/src/net/sf/openrocket/file/GeneralRocketLoader.java @@ -12,7 +12,7 @@ import java.util.zip.GZIPInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocumentFactory; import net.sf.openrocket.file.openrocket.importt.OpenRocketLoader; diff --git a/core/src/net/sf/openrocket/file/MotorFinder.java b/core/src/net/sf/openrocket/file/MotorFinder.java index b17e66433..5c1ec08e5 100644 --- a/core/src/net/sf/openrocket/file/MotorFinder.java +++ b/core/src/net/sf/openrocket/file/MotorFinder.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.motor.Motor; /** diff --git a/core/src/net/sf/openrocket/file/RocketLoader.java b/core/src/net/sf/openrocket/file/RocketLoader.java index 1bd5c2460..81453a7d6 100644 --- a/core/src/net/sf/openrocket/file/RocketLoader.java +++ b/core/src/net/sf/openrocket/file/RocketLoader.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file; import java.io.InputStream; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; public interface RocketLoader { diff --git a/core/src/net/sf/openrocket/file/RocketSaver.java b/core/src/net/sf/openrocket/file/RocketSaver.java index 1ccb0e41b..fa1d4b56b 100644 --- a/core/src/net/sf/openrocket/file/RocketSaver.java +++ b/core/src/net/sf/openrocket/file/RocketSaver.java @@ -3,7 +3,7 @@ package net.sf.openrocket.file; import java.io.IOException; import java.io.OutputStream; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.StorageOptions; diff --git a/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java b/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java index b1fee2686..561d0f2e9 100644 --- a/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java +++ b/core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java @@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.NullElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java index 3e9c82389..7cb022c44 100644 --- a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java @@ -11,7 +11,7 @@ import net.sf.openrocket.file.openrocket.savers.PhotoStudioSaver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.aerodynamics.Warning; +import net.sf.openrocket.logging.Warning; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.StorageOptions; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/AnglePositionSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/AnglePositionSetter.java index 4843f6872..d49e35359 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/AnglePositionSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/AnglePositionSetter.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.position.AngleMethod; import net.sf.openrocket.rocketcomponent.position.AnglePositionable; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java index 4d7445d14..5db14f599 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/AppearanceHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.appearance.AppearanceBuilder; import net.sf.openrocket.appearance.Decal.EdgeMode; import net.sf.openrocket.document.Attachment; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/AtmosphereHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/AtmosphereHandler.java index b109c1c24..dd86befc6 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/AtmosphereHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/AtmosphereHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/AxialPositionSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/AxialPositionSetter.java index 2fe5084a9..c031b0215 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/AxialPositionSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/AxialPositionSetter.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.position.AxialMethod; import net.sf.openrocket.rocketcomponent.position.AxialPositionable; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/BooleanSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/BooleanSetter.java index 8de389fa8..ecadcd7ea 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/BooleanSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/BooleanSetter.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ClusterConfigurationSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/ClusterConfigurationSetter.java index 4fce5c064..ba2a4cb26 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ClusterConfigurationSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ClusterConfigurationSetter.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.ClusterConfiguration; import net.sf.openrocket.rocketcomponent.Clusterable; import net.sf.openrocket.rocketcomponent.RocketComponent; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ColorSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/ColorSetter.java index f290162e0..041386cbd 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ColorSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ColorSetter.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentHandler.java index 85d782bb0..729a56880 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentHandler.java @@ -4,8 +4,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java index dfc6b40d1..34bbee014 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentPresetSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentPresetSetter.java index b90940629..097338116 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentPresetSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentPresetSetter.java @@ -3,8 +3,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; import java.util.List; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ConfigHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/ConfigHandler.java index f9df591e7..6c58bf129 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ConfigHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ConfigHandler.java @@ -5,7 +5,7 @@ import java.math.BigInteger; import java.util.HashMap; import java.util.List; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/CustomExpressionHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/CustomExpressionHandler.java index 187f2ffff..61d849b7d 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/CustomExpressionHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/CustomExpressionHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/DatatypeHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/DatatypeHandler.java index c3fef5140..652f5d2e5 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/DatatypeHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/DatatypeHandler.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/DeploymentConfigurationHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/DeploymentConfigurationHandler.java index 77b157369..8e9e54f7e 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/DeploymentConfigurationHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/DeploymentConfigurationHandler.java @@ -4,8 +4,8 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/DoubleSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/DoubleSetter.java index b12263666..688b6b78d 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/DoubleSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/DoubleSetter.java @@ -3,8 +3,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.Arrays; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.FlightConfigurableParameterSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/EnumSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/EnumSetter.java index 3156c1dd2..5966c1fe7 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/EnumSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/EnumSetter.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.FlightConfigurableParameterSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/FinSetPointHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/FinSetPointHandler.java index 05f3386e2..bc2d51c45 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/FinSetPointHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/FinSetPointHandler.java @@ -5,8 +5,8 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/FinTabPositionSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/FinTabPositionSetter.java index c756d2683..1de1182ee 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/FinTabPositionSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/FinTabPositionSetter.java @@ -5,7 +5,7 @@ import java.util.HashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.position.*; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java index 44cb2feaa..d44303c9b 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataBranchHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java index 99d819327..c5d766458 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/IgnitionConfigurationHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/IgnitionConfigurationHandler.java index 10d5c6b1a..ca0237a01 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/IgnitionConfigurationHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/IgnitionConfigurationHandler.java @@ -4,8 +4,8 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java index 9940a30cb..ac9fae327 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java @@ -1,13 +1,7 @@ package net.sf.openrocket.file.openrocket.importt; -import net.sf.openrocket.aerodynamics.WarningSet; -import net.sf.openrocket.appearance.AppearanceBuilder; -import net.sf.openrocket.appearance.Decal; -import net.sf.openrocket.document.Attachment; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; -import net.sf.openrocket.file.simplesax.AbstractElementHandler; -import net.sf.openrocket.file.simplesax.ElementHandler; -import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.rocketcomponent.InsideColorComponent; import net.sf.openrocket.rocketcomponent.RocketComponent; import org.xml.sax.SAXException; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/IntSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/IntSetter.java index c3987342e..893dfc308 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/IntSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/IntSetter.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/MaterialSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/MaterialSetter.java index 3aae93c04..0c6792d91 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/MaterialSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/MaterialSetter.java @@ -3,8 +3,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; import java.util.Locale; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.database.Databases; import net.sf.openrocket.material.Material; import net.sf.openrocket.rocketcomponent.RocketComponent; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java index 1b0a4a2dd..96f212b14 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/MotorConfigurationHandler.java @@ -4,13 +4,12 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; -import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.FlightConfigurationId; import net.sf.openrocket.rocketcomponent.Rocket; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java index 5e4258cb3..5b2e2d4a2 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/MotorHandler.java @@ -5,8 +5,8 @@ import java.lang.Double; import java.util.HashMap; import java.util.Locale; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/MotorMountHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/MotorMountHandler.java index 93b51fd08..f95a6645d 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/MotorMountHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/MotorMountHandler.java @@ -4,8 +4,8 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketContentHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketContentHandler.java index f4745bf16..b14bc6bb4 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketContentHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketContentHandler.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketHandler.java index f9c2a56be..d3742aeb6 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketHandler.java @@ -8,8 +8,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/OverrideSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/OverrideSetter.java index 1cdf8585b..5b74a58ef 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/OverrideSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/OverrideSetter.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/PhotoStudioHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/PhotoStudioHandler.java index 52f729be1..ca6add7d3 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/PhotoStudioHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/PhotoStudioHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.openrocket.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/RadiusPositionSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/RadiusPositionSetter.java index bd4f36404..25dc4c813 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/RadiusPositionSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/RadiusPositionSetter.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.position.RadiusMethod; import net.sf.openrocket.rocketcomponent.position.RadiusPositionable; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/Setter.java b/core/src/net/sf/openrocket/file/openrocket/importt/Setter.java index 79dc82aa0..fea7cbd48 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/Setter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/Setter.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; //// Interface diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/SimulationConditionsHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/SimulationConditionsHandler.java index 941abd51f..8a82302b6 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/SimulationConditionsHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/SimulationConditionsHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/SimulationsHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/SimulationsHandler.java index c5b0f705b..eaf8911f7 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/SimulationsHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/SimulationsHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/SingleSimulationHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/SingleSimulationHandler.java index f24edfbc7..7c1cee0ee 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/SingleSimulationHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/SingleSimulationHandler.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Set; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation.Status; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/StageSeparationConfigurationHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/StageSeparationConfigurationHandler.java index f17753b39..57c913549 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/StageSeparationConfigurationHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/StageSeparationConfigurationHandler.java @@ -4,8 +4,8 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/StringSetter.java b/core/src/net/sf/openrocket/file/openrocket/importt/StringSetter.java index b1c6fc1c4..4e1fa021d 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/StringSetter.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/StringSetter.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.openrocket.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.util.Reflection; diff --git a/core/src/net/sf/openrocket/file/rasaero/RASAeroCommonConstants.java b/core/src/net/sf/openrocket/file/rasaero/RASAeroCommonConstants.java index d42161a64..da5481ca8 100644 --- a/core/src/net/sf/openrocket/file/rasaero/RASAeroCommonConstants.java +++ b/core/src/net/sf/openrocket/file/rasaero/RASAeroCommonConstants.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.rocketcomponent.DeploymentConfiguration; import net.sf.openrocket.rocketcomponent.ExternalComponent; import net.sf.openrocket.rocketcomponent.FinSet; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/BaseHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/BaseHandler.java index c09f69003..56f67569b 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/BaseHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/BaseHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.AbstractElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/BoattailHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/BoattailHandler.java index 60c688dde..db3dad2e3 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/BoattailHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/BoattailHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/BodyTubeHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/BodyTubeHandler.java index b5f080418..0f9635eea 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/BodyTubeHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/BodyTubeHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/BoosterHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/BoosterHandler.java index b8cb625d2..30121dc98 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/BoosterHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/BoosterHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/FinCanHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/FinCanHandler.java index f1d9699d9..f79860300 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/FinCanHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/FinCanHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.rocketcomponent.BodyTube; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/FinHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/FinHandler.java index b650846aa..22ba7a807 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/FinHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/FinHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/LaunchSiteHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/LaunchSiteHandler.java index 81c856c3b..79e157880 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/LaunchSiteHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/LaunchSiteHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/NoseConeHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/NoseConeHandler.java index f8ffb19c4..d112a0e97 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/NoseConeHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/NoseConeHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroHandler.java index bc4a9a8cc..751e37cfe 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroMotorsLoader.java b/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroMotorsLoader.java index cb608674b..b24df532f 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroMotorsLoader.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/RASAeroMotorsLoader.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.database.motor.ThrustCurveMotorSet; import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.startup.Application; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java index ed346a3bd..6af7ccd45 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/SimulationListHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/SimulationListHandler.java index 1bd623d80..a33efc456 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/SimulationListHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/SimulationListHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/SurfaceFinishHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/SurfaceFinishHandler.java index dfd1d328b..4306b75c0 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/SurfaceFinishHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/SurfaceFinishHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.rocketcomponent.ExternalComponent; import net.sf.openrocket.rocketcomponent.Rocket; diff --git a/core/src/net/sf/openrocket/file/rasaero/importt/TransitionHandler.java b/core/src/net/sf/openrocket/file/rasaero/importt/TransitionHandler.java index 7afeebee8..91bfe1c73 100644 --- a/core/src/net/sf/openrocket/file/rasaero/importt/TransitionHandler.java +++ b/core/src/net/sf/openrocket/file/rasaero/importt/TransitionHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rasaero.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java index d90b8b7c5..27ecb0e81 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/AttachedPartsHandler.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.AbstractElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java index c8394e076..8e3b9ff43 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java @@ -7,7 +7,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.database.Databases; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java index 093858955..ea90c5227 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/BodyTubeHandler.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimFinishCode; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java index f3305713d..d503112bb 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/FinSetHandler.java @@ -11,7 +11,7 @@ import java.util.List; import net.sf.openrocket.rocketcomponent.Transition; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimFinishCode; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java index 924596012..21120fe3d 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandler.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java index 1004edfca..29c154540 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/LaunchLugHandler.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimFinishCode; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java index 8ad7b1ff8..e2b1895cc 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/MassObjectHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimDensityType; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java index c9b5b040d..59a6a4469 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/NoseConeHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimFinishCode; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java index 5d4a7af7a..8a8006a35 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/PodHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/PodHandler.java index ffec3d0b5..267be2ec6 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/PodHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/PodHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java index 2bdd3a674..ba56d4f82 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/PositionDependentHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimLocationMode; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java index 871f88b65..3f3ca4968 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/RecoveryDeviceHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimDensityType; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java index 9ffa798f0..2afb02c5a 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/RingHandler.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java index 57dacf7f1..00b337f7e 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimAppearanceBuilder.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.net.MalformedURLException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.appearance.AppearanceBuilder; import net.sf.openrocket.appearance.Decal.EdgeMode; import net.sf.openrocket.document.Attachment; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimHandler.java index 18f785b2c..c175cc1c9 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/RockSimHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/RockSimHandler.java @@ -6,8 +6,8 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java index 3730bf36c..e3418941f 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/StreamerHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/SubAssemblyHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/SubAssemblyHandler.java index a80f3034d..c57a9ae2c 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/SubAssemblyHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/SubAssemblyHandler.java @@ -1,7 +1,7 @@ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.ElementHandler; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java index 7fe0d81d3..1dfb182db 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/TransitionHandler.java @@ -5,7 +5,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimFinishCode; diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandler.java index 7d78212fe..29f2a1ba9 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandler.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.DocumentLoadingContext; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimFinishCode; diff --git a/core/src/net/sf/openrocket/file/simplesax/AbstractElementHandler.java b/core/src/net/sf/openrocket/file/simplesax/AbstractElementHandler.java index 3085d2ffe..9e926dcd9 100644 --- a/core/src/net/sf/openrocket/file/simplesax/AbstractElementHandler.java +++ b/core/src/net/sf/openrocket/file/simplesax/AbstractElementHandler.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.simplesax; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import org.xml.sax.SAXException; diff --git a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java index 6023f43ee..b55d215c3 100644 --- a/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java +++ b/core/src/net/sf/openrocket/file/simplesax/DelegatorHandler.java @@ -8,7 +8,7 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; /** * The actual SAX handler class. Contains the necessary methods for parsing the SAX source. diff --git a/core/src/net/sf/openrocket/file/simplesax/ElementHandler.java b/core/src/net/sf/openrocket/file/simplesax/ElementHandler.java index de963949f..bd05f2eac 100644 --- a/core/src/net/sf/openrocket/file/simplesax/ElementHandler.java +++ b/core/src/net/sf/openrocket/file/simplesax/ElementHandler.java @@ -2,7 +2,7 @@ package net.sf.openrocket.file.simplesax; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import org.xml.sax.SAXException; diff --git a/core/src/net/sf/openrocket/file/simplesax/NullElementHandler.java b/core/src/net/sf/openrocket/file/simplesax/NullElementHandler.java index 302ee91c9..623b9aeac 100644 --- a/core/src/net/sf/openrocket/file/simplesax/NullElementHandler.java +++ b/core/src/net/sf/openrocket/file/simplesax/NullElementHandler.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.simplesax; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import org.xml.sax.SAXException; diff --git a/core/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java b/core/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java index 406a522c9..76846a117 100644 --- a/core/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java +++ b/core/src/net/sf/openrocket/file/simplesax/PlainTextHandler.java @@ -2,8 +2,8 @@ package net.sf.openrocket.file.simplesax; import java.util.HashMap; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; /** * An element handler that does not allow any sub-elements. If any are encountered diff --git a/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java b/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java index cc1fc55f6..f2d0ebb76 100644 --- a/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java +++ b/core/src/net/sf/openrocket/file/simplesax/SimpleSAX.java @@ -4,7 +4,7 @@ import java.io.IOException; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/core/src/net/sf/openrocket/aerodynamics/Warning.java b/core/src/net/sf/openrocket/logging/Warning.java similarity index 99% rename from core/src/net/sf/openrocket/aerodynamics/Warning.java rename to core/src/net/sf/openrocket/logging/Warning.java index 71946ca5b..8d053758c 100644 --- a/core/src/net/sf/openrocket/aerodynamics/Warning.java +++ b/core/src/net/sf/openrocket/logging/Warning.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.aerodynamics; +package net.sf.openrocket.logging; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.motor.Motor; diff --git a/core/src/net/sf/openrocket/aerodynamics/WarningSet.java b/core/src/net/sf/openrocket/logging/WarningSet.java similarity index 98% rename from core/src/net/sf/openrocket/aerodynamics/WarningSet.java rename to core/src/net/sf/openrocket/logging/WarningSet.java index 6fcd7b837..2c248786b 100644 --- a/core/src/net/sf/openrocket/aerodynamics/WarningSet.java +++ b/core/src/net/sf/openrocket/logging/WarningSet.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.aerodynamics; +package net.sf.openrocket.logging; import java.util.AbstractSet; import java.util.Iterator; diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index 6838c4a2b..827771438 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -1,17 +1,15 @@ package net.sf.openrocket.simulation; import java.util.ArrayDeque; -import java.util.Collection; import java.util.Deque; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.motor.IgnitionEvent; import net.sf.openrocket.motor.MotorConfiguration; import net.sf.openrocket.motor.MotorConfigurationId; import net.sf.openrocket.rocketcomponent.AxialStage; diff --git a/core/src/net/sf/openrocket/simulation/FlightData.java b/core/src/net/sf/openrocket/simulation/FlightData.java index 27f6c1318..9f6c2386a 100644 --- a/core/src/net/sf/openrocket/simulation/FlightData.java +++ b/core/src/net/sf/openrocket/simulation/FlightData.java @@ -6,7 +6,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Mutable; diff --git a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java index 80275a52b..2bfa14b66 100644 --- a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java +++ b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.masscalc.RigidBody; import net.sf.openrocket.models.atmosphere.AtmosphericConditions; diff --git a/core/src/net/sf/openrocket/simulation/SimulationStatus.java b/core/src/net/sf/openrocket/simulation/SimulationStatus.java index 4cb132312..772978c23 100644 --- a/core/src/net/sf/openrocket/simulation/SimulationStatus.java +++ b/core/src/net/sf/openrocket/simulation/SimulationStatus.java @@ -7,12 +7,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.sf.openrocket.aerodynamics.AerodynamicCalculator; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.motor.MotorConfiguration; import net.sf.openrocket.motor.MotorConfigurationId; import net.sf.openrocket.rocketcomponent.FlightConfiguration; diff --git a/core/src/net/sf/openrocket/simulation/extension/AbstractSimulationExtension.java b/core/src/net/sf/openrocket/simulation/extension/AbstractSimulationExtension.java index fbed23a43..655b21527 100644 --- a/core/src/net/sf/openrocket/simulation/extension/AbstractSimulationExtension.java +++ b/core/src/net/sf/openrocket/simulation/extension/AbstractSimulationExtension.java @@ -3,7 +3,7 @@ package net.sf.openrocket.simulation.extension; import java.util.Collections; import java.util.List; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.l10n.Translator; diff --git a/core/src/net/sf/openrocket/simulation/extension/SimulationExtension.java b/core/src/net/sf/openrocket/simulation/extension/SimulationExtension.java index f0b6c93c2..e960432cb 100644 --- a/core/src/net/sf/openrocket/simulation/extension/SimulationExtension.java +++ b/core/src/net/sf/openrocket/simulation/extension/SimulationExtension.java @@ -2,7 +2,7 @@ package net.sf.openrocket.simulation.extension; import java.util.List; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.simulation.FlightDataType; diff --git a/core/src/net/sf/openrocket/simulation/extension/example/DampingMoment.java b/core/src/net/sf/openrocket/simulation/extension/example/DampingMoment.java index a6e0429fb..403195797 100644 --- a/core/src/net/sf/openrocket/simulation/extension/example/DampingMoment.java +++ b/core/src/net/sf/openrocket/simulation/extension/example/DampingMoment.java @@ -10,7 +10,6 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.AerodynamicCalculator; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.motor.MotorConfiguration; import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.rocketcomponent.RocketComponent; diff --git a/core/src/net/sf/openrocket/simulation/extension/impl/ScriptingExtension.java b/core/src/net/sf/openrocket/simulation/extension/impl/ScriptingExtension.java index 953543442..4addd22a5 100644 --- a/core/src/net/sf/openrocket/simulation/extension/impl/ScriptingExtension.java +++ b/core/src/net/sf/openrocket/simulation/extension/impl/ScriptingExtension.java @@ -4,8 +4,8 @@ import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptException; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.l10n.L10N; diff --git a/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java b/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java index 903971481..ea46bb79f 100644 --- a/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java +++ b/core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; +import net.sf.openrocket.logging.Warning; import net.sf.openrocket.masscalc.RigidBody; import net.sf.openrocket.models.atmosphere.AtmosphericConditions; import net.sf.openrocket.motor.MotorConfigurationId; diff --git a/core/src/net/sf/openrocket/thrustcurve/DownloadResponseParser.java b/core/src/net/sf/openrocket/thrustcurve/DownloadResponseParser.java index 6a851b6a3..660b47380 100644 --- a/core/src/net/sf/openrocket/thrustcurve/DownloadResponseParser.java +++ b/core/src/net/sf/openrocket/thrustcurve/DownloadResponseParser.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.SimpleSAX; diff --git a/core/src/net/sf/openrocket/thrustcurve/SearchResponseParser.java b/core/src/net/sf/openrocket/thrustcurve/SearchResponseParser.java index 03dd75643..a7015c2f1 100644 --- a/core/src/net/sf/openrocket/thrustcurve/SearchResponseParser.java +++ b/core/src/net/sf/openrocket/thrustcurve/SearchResponseParser.java @@ -9,7 +9,7 @@ import java.util.HashMap; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.SimpleSAX; diff --git a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java index ea423886c..eba208790 100644 --- a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java +++ b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java @@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import net.sf.openrocket.logging.WarningSet; import org.junit.BeforeClass; import org.junit.Test; diff --git a/core/test/net/sf/openrocket/aerodynamics/FinSetCalcTest.java b/core/test/net/sf/openrocket/aerodynamics/FinSetCalcTest.java index bfdefe084..4cd2aa885 100644 --- a/core/test/net/sf/openrocket/aerodynamics/FinSetCalcTest.java +++ b/core/test/net/sf/openrocket/aerodynamics/FinSetCalcTest.java @@ -1,6 +1,8 @@ package net.sf.openrocket.aerodynamics; import static org.junit.Assert.assertEquals; + +import net.sf.openrocket.logging.WarningSet; import org.junit.BeforeClass; import org.junit.Test; diff --git a/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java b/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java index 513b0c922..588741449 100644 --- a/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java +++ b/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java @@ -1,6 +1,8 @@ package net.sf.openrocket.aerodynamics; import static org.junit.Assert.assertEquals; + +import net.sf.openrocket.logging.WarningSet; import org.junit.BeforeClass; import org.junit.Test; @@ -9,7 +11,6 @@ import com.google.inject.Injector; import com.google.inject.Module; import net.sf.openrocket.ServicesForTesting; -import net.sf.openrocket.aerodynamics.BarrowmanCalculator; import net.sf.openrocket.aerodynamics.barrowman.RailButtonCalc; import net.sf.openrocket.plugin.PluginModule; import net.sf.openrocket.rocketcomponent.FlightConfiguration; @@ -21,7 +22,6 @@ import net.sf.openrocket.rocketcomponent.position.AxialMethod; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.TestRockets; -import net.sf.openrocket.util.Transformation; public class RailButtonCalcTest { protected final double EPSILON = 0.0001; diff --git a/core/test/net/sf/openrocket/aerodynamics/SymmetricComponentCalcTest.java b/core/test/net/sf/openrocket/aerodynamics/SymmetricComponentCalcTest.java index b32b5e786..d980cfd25 100644 --- a/core/test/net/sf/openrocket/aerodynamics/SymmetricComponentCalcTest.java +++ b/core/test/net/sf/openrocket/aerodynamics/SymmetricComponentCalcTest.java @@ -1,6 +1,8 @@ package net.sf.openrocket.aerodynamics; import static org.junit.Assert.assertEquals; + +import net.sf.openrocket.logging.WarningSet; import org.junit.BeforeClass; import org.junit.Test; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java index b8830bb1b..c3861b6df 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/BodyTubeHandlerTest.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.material.Material; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java index 297528289..19eb0b16b 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/FinSetHandlerTest.java @@ -21,7 +21,7 @@ import com.google.inject.Module; import com.google.inject.util.Modules; import net.sf.openrocket.ServicesForTesting; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.l10n.DebugTranslator; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.plugin.PluginModule; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java index 0a2bf9e03..1d1203f16 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/InnerBodyTubeHandlerTest.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.material.Material; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java index de79aea33..98079e1a5 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/LaunchLugHandlerTest.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.material.Material; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java index 217026db6..f9d82a4aa 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/MassObjectHandlerTest.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.material.Material; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java index 0e4a449bd..1a9b5997e 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/NoseConeHandlerTest.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimNoseConeCode; import net.sf.openrocket.file.simplesax.PlainTextHandler; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java index c01655955..1ab81e638 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/ParachuteHandlerTest.java @@ -7,7 +7,7 @@ import java.util.HashMap; import org.junit.Assert; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.material.Material; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java index 11e87e61d..ac0642c47 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/RingHandlerTest.java @@ -8,7 +8,7 @@ import java.util.HashMap; import org.junit.Assert; import org.junit.Test; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.material.Material; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java index cb48db84b..1482d98d4 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/StreamerHandlerTest.java @@ -8,7 +8,7 @@ import java.util.HashMap; import org.junit.Assert; import org.junit.Test; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimDensityType; import net.sf.openrocket.file.simplesax.PlainTextHandler; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java index 4e5c069a7..59f81e699 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/TransitionHandlerTest.java @@ -3,7 +3,7 @@ */ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.file.rocksim.RockSimNoseConeCode; import net.sf.openrocket.file.simplesax.PlainTextHandler; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandlerTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandlerTest.java index 63cffbf17..45e4c6fa2 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandlerTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/TubeFinSetHandlerTest.java @@ -1,6 +1,6 @@ package net.sf.openrocket.file.rocksim.importt; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.file.rocksim.RockSimCommonConstants; import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.ExternalComponent; diff --git a/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java index b695423c7..59638c8e4 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/FreeformFinSetTest.java @@ -15,7 +15,7 @@ import org.junit.Test; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.aerodynamics.barrowman.FinSetCalc; import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material.Type; diff --git a/core/test/net/sf/openrocket/rocketcomponent/OverrideTest.java b/core/test/net/sf/openrocket/rocketcomponent/OverrideTest.java index 71bfa9ab5..503994a6d 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/OverrideTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/OverrideTest.java @@ -3,7 +3,7 @@ package net.sf.openrocket.rocketcomponent; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.BarrowmanCalculator; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.util.BaseTestCase.BaseTestCase; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.TestRockets; diff --git a/core/test/net/sf/openrocket/simulation/TestFlightData.java b/core/test/net/sf/openrocket/simulation/TestFlightData.java index d9620d529..66889dc76 100644 --- a/core/test/net/sf/openrocket/simulation/TestFlightData.java +++ b/core/test/net/sf/openrocket/simulation/TestFlightData.java @@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; /** * Tests the FlightData object. diff --git a/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java b/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java index 7aeef0a25..7eb1efb6b 100644 --- a/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java +++ b/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java @@ -12,8 +12,8 @@ import javax.swing.JTable; import net.sf.openrocket.util.StringUtils; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.adaptors.Column; import net.sf.openrocket.gui.adaptors.ColumnTableModel; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java index d05c0b039..ddb80fffb 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java @@ -11,7 +11,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; import java.util.ArrayList; import java.util.EventObject; import java.util.List; @@ -40,8 +39,8 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.aerodynamics.AerodynamicCalculator; import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.gui.adaptors.Column; import net.sf.openrocket.gui.adaptors.ColumnTable; import net.sf.openrocket.gui.adaptors.ColumnTableModel; diff --git a/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java index bb6a89a1b..14d122919 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java @@ -7,8 +7,8 @@ import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JScrollPane; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; @SuppressWarnings("serial") public class WarningDialog extends JDialog { diff --git a/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java b/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java index 0e185251d..64c120c19 100644 --- a/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java +++ b/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java @@ -11,8 +11,8 @@ import java.awt.Rectangle; import java.awt.font.GlyphVector; import java.awt.geom.Rectangle2D; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.FlightConfiguration; import net.sf.openrocket.simulation.FlightData; diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 2cec966ea..f31f597f1 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -49,7 +49,7 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.appearance.DecalImage; import net.sf.openrocket.arch.SystemInfo; import net.sf.openrocket.document.OpenRocketDocument; diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java index 17336d761..88efc984f 100644 --- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java @@ -48,8 +48,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.aerodynamics.Warning; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.Warning; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation.Status; diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java index bc9ebf44e..1b4ac81a0 100644 --- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java +++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java @@ -35,7 +35,7 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.aerodynamics.AerodynamicCalculator; import net.sf.openrocket.aerodynamics.BarrowmanCalculator; import net.sf.openrocket.aerodynamics.FlightConditions; -import net.sf.openrocket.aerodynamics.WarningSet; +import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.events.SimulationChangeEvent; diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java index d9625cb17..cdb3706a4 100644 --- a/swing/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java +++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import javax.swing.JOptionPane; -import net.sf.openrocket.aerodynamics.Warning; +import net.sf.openrocket.logging.Warning; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.gui.dialogs.DetailDialog; import net.sf.openrocket.l10n.Translator;