From 1eb91a2b3679a6c192d44656ccc841ef945c5d6d Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Thu, 1 Dec 2011 19:16:22 +0000 Subject: [PATCH] Refactored some gui specific utility classes from net.sf.openrocket.util to net.sf.openrocket.gui.util. The following classes were moved: ConcurrentProgressMonitor, ConcurrentProgressMonitorInputStream, FileHelper, GUIUtil, Icons, OpenFileWorker, SaveCSVWorker, SaveFileWorker, SimpleFileFilter. --- src/net/sf/openrocket/document/OpenRocketDocument.java | 2 +- .../sf/openrocket/file/motor/MotorLoaderHelper.java | 2 +- .../gui/components/SimulationExportPanel.java | 6 +++--- .../sf/openrocket/gui/components/compass/Tester.java | 2 +- .../gui/configdialog/ComponentConfigDialog.java | 2 +- .../gui/configdialog/RocketComponentConfig.java | 2 +- .../sf/openrocket/gui/configdialog/RocketConfig.java | 2 +- src/net/sf/openrocket/gui/dialogs/AboutDialog.java | 4 ++-- src/net/sf/openrocket/gui/dialogs/BugReportDialog.java | 2 +- .../gui/dialogs/ComponentAnalysisDialog.java | 2 +- .../openrocket/gui/dialogs/CustomMaterialDialog.java | 2 +- src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java | 2 +- src/net/sf/openrocket/gui/dialogs/DetailDialog.java | 2 +- .../gui/dialogs/EditMotorConfigurationDialog.java | 2 +- .../sf/openrocket/gui/dialogs/ExampleDesignDialog.java | 2 +- src/net/sf/openrocket/gui/dialogs/LicenseDialog.java | 2 +- .../gui/dialogs/MotorDatabaseLoadingDialog.java | 2 +- src/net/sf/openrocket/gui/dialogs/PrintDialog.java | 4 ++-- .../sf/openrocket/gui/dialogs/PrintSettingsDialog.java | 2 +- src/net/sf/openrocket/gui/dialogs/ScaleDialog.java | 2 +- .../sf/openrocket/gui/dialogs/UpdateInfoDialog.java | 4 ++-- .../gui/dialogs/motor/MotorChooserDialog.java | 2 +- .../motor/thrustcurve/ThrustCurveMotorPlotDialog.java | 2 +- .../thrustcurve/ThrustCurveMotorSelectionPanel.java | 4 ++-- .../optimization/GeneralOptimizationDialog.java | 4 ++-- .../dialogs/optimization/OptimizationPlotDialog.java | 2 +- .../gui/dialogs/preferences/PreferencesDialog.java | 4 ++-- src/net/sf/openrocket/gui/main/BasicFrame.java | 10 +++++----- src/net/sf/openrocket/gui/main/RocketActions.java | 2 +- .../sf/openrocket/gui/main/SimulationEditDialog.java | 4 ++-- src/net/sf/openrocket/gui/main/SimulationPanel.java | 2 +- .../sf/openrocket/gui/main/SimulationRunDialog.java | 2 +- .../sf/openrocket/gui/plot/SimulationPlotDialog.java | 2 +- .../sf/openrocket/gui/plot/SimulationPlotPanel.java | 4 ++-- .../sf/openrocket/gui/print/ConceptPrintDialog.java | 2 +- .../sf/openrocket/gui/scalefigure/ScaleSelector.java | 2 +- .../{ => gui}/util/ConcurrentProgressMonitor.java | 2 +- .../util/ConcurrentProgressMonitorInputStream.java | 3 ++- src/net/sf/openrocket/{ => gui}/util/FileHelper.java | 2 +- src/net/sf/openrocket/{ => gui}/util/GUIUtil.java | 6 +++++- src/net/sf/openrocket/{ => gui}/util/Icons.java | 2 +- .../sf/openrocket/{ => gui}/util/OpenFileWorker.java | 3 ++- .../sf/openrocket/{ => gui}/util/SaveCSVWorker.java | 4 +++- .../sf/openrocket/{ => gui}/util/SaveFileWorker.java | 3 ++- .../sf/openrocket/{ => gui}/util/SimpleFileFilter.java | 2 +- src/net/sf/openrocket/startup/Startup2.java | 4 ++-- src/net/sf/openrocket/utils/MotorPlot.java | 2 +- 47 files changed, 71 insertions(+), 62 deletions(-) rename src/net/sf/openrocket/{ => gui}/util/ConcurrentProgressMonitor.java (97%) rename src/net/sf/openrocket/{ => gui}/util/ConcurrentProgressMonitorInputStream.java (98%) rename src/net/sf/openrocket/{ => gui}/util/FileHelper.java (99%) rename src/net/sf/openrocket/{ => gui}/util/GUIUtil.java (98%) rename src/net/sf/openrocket/{ => gui}/util/Icons.java (99%) rename src/net/sf/openrocket/{ => gui}/util/OpenFileWorker.java (98%) rename src/net/sf/openrocket/{ => gui}/util/SaveCSVWorker.java (96%) rename src/net/sf/openrocket/{ => gui}/util/SaveFileWorker.java (93%) rename src/net/sf/openrocket/{ => gui}/util/SimpleFileFilter.java (98%) diff --git a/src/net/sf/openrocket/document/OpenRocketDocument.java b/src/net/sf/openrocket/document/OpenRocketDocument.java index c935bd294..3853f4ab8 100644 --- a/src/net/sf/openrocket/document/OpenRocketDocument.java +++ b/src/net/sf/openrocket/document/OpenRocketDocument.java @@ -12,6 +12,7 @@ import net.sf.openrocket.document.events.DocumentChangeEvent; import net.sf.openrocket.document.events.DocumentChangeListener; import net.sf.openrocket.document.events.SimulationChangeEvent; import net.sf.openrocket.gui.main.ExceptionHandler; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.TraceException; @@ -22,7 +23,6 @@ import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.ArrayList; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.Icons; /** * Class describing an entire OpenRocket document, including a rocket and diff --git a/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java b/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java index d3bbc3dc6..049738a49 100644 --- a/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java +++ b/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java @@ -11,12 +11,12 @@ import java.util.List; import net.sf.openrocket.file.iterator.DirectoryIterator; import net.sf.openrocket.file.iterator.FileIterator; +import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Pair; -import net.sf.openrocket.util.SimpleFileFilter; public final class MotorLoaderHelper { diff --git a/src/net/sf/openrocket/gui/components/SimulationExportPanel.java b/src/net/sf/openrocket/gui/components/SimulationExportPanel.java index cd73c5f9e..30ef196b1 100644 --- a/src/net/sf/openrocket/gui/components/SimulationExportPanel.java +++ b/src/net/sf/openrocket/gui/components/SimulationExportPanel.java @@ -21,6 +21,9 @@ import javax.swing.table.TableColumnModel; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.Simulation; +import net.sf.openrocket.gui.util.FileHelper; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.SaveCSVWorker; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightDataBranch; @@ -28,10 +31,7 @@ import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.FileHelper; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Prefs; -import net.sf.openrocket.util.SaveCSVWorker; public class SimulationExportPanel extends JPanel { diff --git a/src/net/sf/openrocket/gui/components/compass/Tester.java b/src/net/sf/openrocket/gui/components/compass/Tester.java index eda95f567..86a82a495 100644 --- a/src/net/sf/openrocket/gui/components/compass/Tester.java +++ b/src/net/sf/openrocket/gui/components/compass/Tester.java @@ -10,10 +10,10 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.adaptors.DoubleModel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.ResourceBundleTranslator; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.GUIUtil; public class Tester { diff --git a/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java b/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java index 5bb3448bc..a669b2dc5 100644 --- a/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java +++ b/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java @@ -8,13 +8,13 @@ import java.lang.reflect.InvocationTargetException; import javax.swing.JDialog; import net.sf.openrocket.document.OpenRocketDocument; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeListener; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Reflection; /** diff --git a/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 802434d76..1ed1ccecb 100644 --- a/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -35,6 +35,7 @@ import net.sf.openrocket.gui.components.ColorIcon; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.components.UnitSelector; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; import net.sf.openrocket.rocketcomponent.ComponentAssembly; @@ -44,7 +45,6 @@ import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Invalidatable; import net.sf.openrocket.util.LineStyle; import net.sf.openrocket.util.Prefs; diff --git a/src/net/sf/openrocket/gui/configdialog/RocketConfig.java b/src/net/sf/openrocket/gui/configdialog/RocketConfig.java index 701295c24..c692f4983 100644 --- a/src/net/sf/openrocket/gui/configdialog/RocketConfig.java +++ b/src/net/sf/openrocket/gui/configdialog/RocketConfig.java @@ -12,11 +12,11 @@ import javax.swing.JTextArea; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; public class RocketConfig extends RocketComponentConfig { private static final Translator trans = Application.getTranslator(); diff --git a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 5f42865ba..e02a3c26f 100644 --- a/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -14,11 +14,11 @@ import net.sf.openrocket.gui.components.DescriptionArea; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.components.URLLabel; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Chars; -import net.sf.openrocket.util.GUIUtil; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.Prefs; public class AboutDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java index f9001bf24..27ae214ca 100644 --- a/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java @@ -30,12 +30,12 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.communication.BugReporter; import net.sf.openrocket.gui.components.SelectableLabel; import net.sf.openrocket.gui.components.StyledLabel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogLevelBufferLogger; import net.sf.openrocket.logging.LogLine; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.JarUtil; import net.sf.openrocket.util.Prefs; diff --git a/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java index 7318d5c74..8fba84e16 100644 --- a/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java @@ -50,6 +50,7 @@ import net.sf.openrocket.gui.components.StageSelector; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.scalefigure.RocketPanel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.masscalc.BasicMassCalculator; import net.sf.openrocket.masscalc.MassCalculator; @@ -62,7 +63,6 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.Coordinate; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Prefs; diff --git a/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java index aad2f47e9..5e5aece88 100644 --- a/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java @@ -18,10 +18,10 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.UnitSelector; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.material.Material; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; public class CustomMaterialDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java b/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java index 53742c161..5c36f5d87 100644 --- a/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java @@ -42,6 +42,7 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.adaptors.Column; import net.sf.openrocket.gui.adaptors.ColumnTableModel; import net.sf.openrocket.gui.components.SelectableLabel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.DelegatorLogger; import net.sf.openrocket.logging.LogHelper; @@ -51,7 +52,6 @@ import net.sf.openrocket.logging.LogLine; import net.sf.openrocket.logging.StackTraceWriter; import net.sf.openrocket.logging.TraceException; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.NumericComparator; public class DebugLogDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/DetailDialog.java b/src/net/sf/openrocket/gui/dialogs/DetailDialog.java index 87e36e678..d1f0f547c 100644 --- a/src/net/sf/openrocket/gui/dialogs/DetailDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/DetailDialog.java @@ -6,7 +6,7 @@ import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import net.sf.openrocket.util.GUIUtil; +import net.sf.openrocket.gui.util.GUIUtil; public class DetailDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java b/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java index b1ef4a9c6..0a41ce665 100644 --- a/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/EditMotorConfigurationDialog.java @@ -28,6 +28,7 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.dialogs.motor.MotorChooserDialog; import net.sf.openrocket.gui.main.BasicFrame; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.rocketcomponent.MotorMount; @@ -35,7 +36,6 @@ import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Chars; -import net.sf.openrocket.util.GUIUtil; public class EditMotorConfigurationDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java b/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java index 069791ab5..95ad56dfe 100644 --- a/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/ExampleDesignDialog.java @@ -27,10 +27,10 @@ import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; import net.miginfocom.swing.MigLayout; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.JarUtil; public class ExampleDesignDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java index 920e0b47f..c3e6141e5 100644 --- a/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java @@ -16,9 +16,9 @@ import javax.swing.JTextArea; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.components.StyledLabel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; public class LicenseDialog extends JDialog { private static final String LICENSE_FILENAME = "LICENSE.TXT"; diff --git a/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java b/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java index 006b30f43..203a903b0 100644 --- a/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java @@ -13,10 +13,10 @@ import javax.swing.Timer; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; /** * A progress dialog displayed while loading motors. diff --git a/src/net/sf/openrocket/gui/dialogs/PrintDialog.java b/src/net/sf/openrocket/gui/dialogs/PrintDialog.java index 924baace3..8d8721ef0 100644 --- a/src/net/sf/openrocket/gui/dialogs/PrintDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/PrintDialog.java @@ -34,12 +34,12 @@ import net.sf.openrocket.gui.print.PrintableContext; import net.sf.openrocket.gui.print.TemplateProperties; import net.sf.openrocket.gui.print.components.CheckTreeManager; import net.sf.openrocket.gui.print.components.RocketPrintTree; +import net.sf.openrocket.gui.util.FileHelper; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.FileHelper; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Prefs; /** diff --git a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java index 183ee7a1f..53411709e 100644 --- a/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java @@ -19,10 +19,10 @@ import net.sf.openrocket.gui.components.ColorChooserButton; import net.sf.openrocket.gui.print.PaperOrientation; import net.sf.openrocket.gui.print.PaperSize; import net.sf.openrocket.gui.print.PrintSettings; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; /** * This class is a dialog for displaying advanced settings for printing rocket related info. diff --git a/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java index c6ccc2398..fb8b32fdc 100644 --- a/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java @@ -26,6 +26,7 @@ import net.sf.openrocket.gui.adaptors.DoubleModel; import net.sf.openrocket.gui.components.BasicSlider; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.main.ExceptionHandler; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.rocketcomponent.BodyComponent; @@ -53,7 +54,6 @@ import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.Coordinate; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Reflection; import net.sf.openrocket.util.Reflection.Method; diff --git a/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java b/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java index 08f720892..3ec6d6a15 100644 --- a/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java @@ -15,12 +15,12 @@ import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.communication.UpdateInfo; import net.sf.openrocket.gui.components.URLLabel; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Chars; import net.sf.openrocket.util.ComparablePair; -import net.sf.openrocket.util.GUIUtil; -import net.sf.openrocket.util.Icons; public class UpdateInfoDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java b/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java index 8c6849e98..eeb939c7a 100644 --- a/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java @@ -14,11 +14,11 @@ import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.dialogs.MotorDatabaseLoadingDialog; import net.sf.openrocket.gui.dialogs.motor.thrustcurve.ThrustCurveMotorSelectionPanel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; public class MotorChooserDialog extends JDialog implements CloseableDialog { diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java index 22238caa8..c1ecb7cfb 100644 --- a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java @@ -13,11 +13,11 @@ import javax.swing.JDialog; import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.GUIUtil; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; diff --git a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index ca0fb811d..287491564 100644 --- a/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -47,6 +47,8 @@ import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.dialogs.motor.CloseableDialog; import net.sf.openrocket.gui.dialogs.motor.MotorSelector; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.motor.Motor; @@ -55,8 +57,6 @@ import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.GUIUtil; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.Prefs; import net.sf.openrocket.utils.MotorCorrelation; diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java index 1478a2b12..66688bf5d 100644 --- a/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -65,6 +65,8 @@ import net.sf.openrocket.gui.components.UnitCellEditor; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.scalefigure.RocketFigure; import net.sf.openrocket.gui.scalefigure.ScaleScrollPane; +import net.sf.openrocket.gui.util.FileHelper; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.optimization.general.OptimizationException; @@ -88,8 +90,6 @@ import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.Value; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.Chars; -import net.sf.openrocket.util.FileHelper; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Named; import net.sf.openrocket.util.Prefs; import net.sf.openrocket.util.TextUtil; diff --git a/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java b/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java index c90c31ab1..1df3214e2 100644 --- a/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java @@ -18,6 +18,7 @@ import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.components.StyledLabel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.optimization.general.Point; @@ -27,7 +28,6 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.Value; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.LinearInterpolator; import net.sf.openrocket.util.MathUtil; diff --git a/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java index a13be044b..4c3f0fd6f 100644 --- a/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java +++ b/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java @@ -36,15 +36,15 @@ import net.sf.openrocket.gui.components.DescriptionArea; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.dialogs.UpdateInfoDialog; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Named; import net.sf.openrocket.util.Prefs; -import net.sf.openrocket.util.SimpleFileFilter; import net.sf.openrocket.util.Utils; diff --git a/src/net/sf/openrocket/gui/main/BasicFrame.java b/src/net/sf/openrocket/gui/main/BasicFrame.java index 5f2d92e01..fb86fbb11 100644 --- a/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -83,6 +83,11 @@ import net.sf.openrocket.gui.dialogs.optimization.GeneralOptimizationDialog; import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog; import net.sf.openrocket.gui.main.componenttree.ComponentTree; import net.sf.openrocket.gui.scalefigure.RocketPanel; +import net.sf.openrocket.gui.util.FileHelper; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; +import net.sf.openrocket.gui.util.OpenFileWorker; +import net.sf.openrocket.gui.util.SaveFileWorker; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; @@ -92,15 +97,10 @@ import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.Stage; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.FileHelper; -import net.sf.openrocket.util.GUIUtil; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.MemoryManagement; import net.sf.openrocket.util.MemoryManagement.MemoryData; -import net.sf.openrocket.util.OpenFileWorker; import net.sf.openrocket.util.Prefs; import net.sf.openrocket.util.Reflection; -import net.sf.openrocket.util.SaveFileWorker; import net.sf.openrocket.util.TestRockets; public class BasicFrame extends JFrame { diff --git a/src/net/sf/openrocket/gui/main/RocketActions.java b/src/net/sf/openrocket/gui/main/RocketActions.java index 625afdab3..4bd754a93 100644 --- a/src/net/sf/openrocket/gui/main/RocketActions.java +++ b/src/net/sf/openrocket/gui/main/RocketActions.java @@ -17,6 +17,7 @@ import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.configdialog.ComponentConfigDialog; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeListener; @@ -24,7 +25,6 @@ import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.Stage; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.Pair; import net.sf.openrocket.util.Prefs; diff --git a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/src/net/sf/openrocket/gui/main/SimulationEditDialog.java index 92c2dac81..39b5fbea2 100644 --- a/src/net/sf/openrocket/gui/main/SimulationEditDialog.java +++ b/src/net/sf/openrocket/gui/main/SimulationEditDialog.java @@ -43,6 +43,8 @@ import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.plot.Axis; import net.sf.openrocket.gui.plot.PlotConfiguration; import net.sf.openrocket.gui.plot.SimulationPlotPanel; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.models.atmosphere.ExtendedISAModel; import net.sf.openrocket.rocketcomponent.Configuration; @@ -57,9 +59,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.Chars; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.GeodeticComputationStrategy; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.Prefs; import org.jfree.chart.ChartFactory; diff --git a/src/net/sf/openrocket/gui/main/SimulationPanel.java b/src/net/sf/openrocket/gui/main/SimulationPanel.java index 6a4bef03c..36b5a608d 100644 --- a/src/net/sf/openrocket/gui/main/SimulationPanel.java +++ b/src/net/sf/openrocket/gui/main/SimulationPanel.java @@ -34,6 +34,7 @@ import net.sf.openrocket.document.events.SimulationChangeEvent; import net.sf.openrocket.gui.adaptors.Column; import net.sf.openrocket.gui.adaptors.ColumnTableModel; import net.sf.openrocket.gui.components.StyledLabel; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; @@ -41,7 +42,6 @@ import net.sf.openrocket.rocketcomponent.ComponentChangeListener; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.Prefs; public class SimulationPanel extends JPanel { diff --git a/src/net/sf/openrocket/gui/main/SimulationRunDialog.java b/src/net/sf/openrocket/gui/main/SimulationRunDialog.java index 9ac4a3690..cc1be6966 100644 --- a/src/net/sf/openrocket/gui/main/SimulationRunDialog.java +++ b/src/net/sf/openrocket/gui/main/SimulationRunDialog.java @@ -23,6 +23,7 @@ import javax.swing.JProgressBar; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.gui.dialogs.DetailDialog; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.rocketcomponent.Configuration; @@ -38,7 +39,6 @@ import net.sf.openrocket.simulation.listeners.SimulationListener; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Prefs; diff --git a/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java b/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java index e1e1b2d7a..0cd08ff1c 100644 --- a/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java +++ b/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java @@ -33,6 +33,7 @@ import javax.swing.JPanel; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.gui.components.StyledLabel; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataType; @@ -41,7 +42,6 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.BugException; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.Prefs; diff --git a/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java b/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java index f2afcae60..06544f526 100644 --- a/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java +++ b/src/net/sf/openrocket/gui/plot/SimulationPlotPanel.java @@ -24,14 +24,14 @@ import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.gui.components.DescriptionArea; import net.sf.openrocket.gui.components.UnitSelector; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; -import net.sf.openrocket.util.GUIUtil; -import net.sf.openrocket.util.Icons; import net.sf.openrocket.util.Utils; /** diff --git a/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java b/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java index 9347ecbff..9a07efa08 100644 --- a/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java +++ b/src/net/sf/openrocket/gui/print/ConceptPrintDialog.java @@ -13,7 +13,7 @@ import javax.swing.JScrollPane; import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.util.GUIUtil; +import net.sf.openrocket.gui.util.GUIUtil; public class ConceptPrintDialog extends JDialog { diff --git a/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java b/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java index d4452d6c9..a93847d36 100644 --- a/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java +++ b/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java @@ -12,7 +12,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import net.sf.openrocket.util.Icons; +import net.sf.openrocket.gui.util.Icons; public class ScaleSelector extends JPanel { diff --git a/src/net/sf/openrocket/util/ConcurrentProgressMonitor.java b/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java similarity index 97% rename from src/net/sf/openrocket/util/ConcurrentProgressMonitor.java rename to src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java index 7253c8904..b6aa6ea34 100644 --- a/src/net/sf/openrocket/util/ConcurrentProgressMonitor.java +++ b/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.awt.Component; diff --git a/src/net/sf/openrocket/util/ConcurrentProgressMonitorInputStream.java b/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java similarity index 98% rename from src/net/sf/openrocket/util/ConcurrentProgressMonitorInputStream.java rename to src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java index 6c45a6ccf..ccc0d7998 100644 --- a/src/net/sf/openrocket/util/ConcurrentProgressMonitorInputStream.java +++ b/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.awt.Component; import java.io.FilterInputStream; @@ -7,6 +7,7 @@ import java.io.InputStream; import java.io.InterruptedIOException; + /** * A functional equivalent of ProgressMonitorInputStream which * uses {@link ConcurrentProgressMonitor} and leaves the progress dialog open diff --git a/src/net/sf/openrocket/util/FileHelper.java b/src/net/sf/openrocket/gui/util/FileHelper.java similarity index 99% rename from src/net/sf/openrocket/util/FileHelper.java rename to src/net/sf/openrocket/gui/util/FileHelper.java index 0929c3280..8c496393e 100644 --- a/src/net/sf/openrocket/util/FileHelper.java +++ b/src/net/sf/openrocket/gui/util/FileHelper.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.awt.Component; import java.io.File; diff --git a/src/net/sf/openrocket/util/GUIUtil.java b/src/net/sf/openrocket/gui/util/GUIUtil.java similarity index 98% rename from src/net/sf/openrocket/util/GUIUtil.java rename to src/net/sf/openrocket/gui/util/GUIUtil.java index e74dbc196..34258d587 100644 --- a/src/net/sf/openrocket/util/GUIUtil.java +++ b/src/net/sf/openrocket/gui/util/GUIUtil.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.awt.Component; import java.awt.Container; @@ -73,6 +73,10 @@ import javax.swing.tree.TreeSelectionModel; import net.sf.openrocket.gui.Resettable; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; +import net.sf.openrocket.util.BugException; +import net.sf.openrocket.util.Invalidatable; +import net.sf.openrocket.util.MemoryManagement; +import net.sf.openrocket.util.Prefs; public class GUIUtil { private static final LogHelper log = Application.getLogger(); diff --git a/src/net/sf/openrocket/util/Icons.java b/src/net/sf/openrocket/gui/util/Icons.java similarity index 99% rename from src/net/sf/openrocket/util/Icons.java rename to src/net/sf/openrocket/gui/util/Icons.java index e5f41317a..8adf191d5 100644 --- a/src/net/sf/openrocket/util/Icons.java +++ b/src/net/sf/openrocket/gui/util/Icons.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.net.URL; import java.util.Collections; diff --git a/src/net/sf/openrocket/util/OpenFileWorker.java b/src/net/sf/openrocket/gui/util/OpenFileWorker.java similarity index 98% rename from src/net/sf/openrocket/util/OpenFileWorker.java rename to src/net/sf/openrocket/gui/util/OpenFileWorker.java index a1d3106d3..a52692e57 100644 --- a/src/net/sf/openrocket/util/OpenFileWorker.java +++ b/src/net/sf/openrocket/gui/util/OpenFileWorker.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.io.BufferedInputStream; import java.io.File; @@ -15,6 +15,7 @@ import net.sf.openrocket.file.RocketLoader; import net.sf.openrocket.gui.main.ExceptionHandler; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; +import net.sf.openrocket.util.MathUtil; /** diff --git a/src/net/sf/openrocket/util/SaveCSVWorker.java b/src/net/sf/openrocket/gui/util/SaveCSVWorker.java similarity index 96% rename from src/net/sf/openrocket/util/SaveCSVWorker.java rename to src/net/sf/openrocket/gui/util/SaveCSVWorker.java index c94881833..585a63ac6 100644 --- a/src/net/sf/openrocket/util/SaveCSVWorker.java +++ b/src/net/sf/openrocket/gui/util/SaveCSVWorker.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.awt.Window; import java.io.BufferedOutputStream; @@ -17,6 +17,8 @@ import net.sf.openrocket.gui.main.ExceptionHandler; import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.unit.Unit; +import net.sf.openrocket.util.BugException; +import net.sf.openrocket.util.ProgressOutputStream; public class SaveCSVWorker extends SwingWorker { diff --git a/src/net/sf/openrocket/util/SaveFileWorker.java b/src/net/sf/openrocket/gui/util/SaveFileWorker.java similarity index 93% rename from src/net/sf/openrocket/util/SaveFileWorker.java rename to src/net/sf/openrocket/gui/util/SaveFileWorker.java index fe5f70cfb..b9191c4a7 100644 --- a/src/net/sf/openrocket/util/SaveFileWorker.java +++ b/src/net/sf/openrocket/gui/util/SaveFileWorker.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.io.BufferedOutputStream; import java.io.File; @@ -9,6 +9,7 @@ import javax.swing.SwingWorker; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.RocketSaver; import net.sf.openrocket.gui.main.ExceptionHandler; +import net.sf.openrocket.util.ProgressOutputStream; public class SaveFileWorker extends SwingWorker { diff --git a/src/net/sf/openrocket/util/SimpleFileFilter.java b/src/net/sf/openrocket/gui/util/SimpleFileFilter.java similarity index 98% rename from src/net/sf/openrocket/util/SimpleFileFilter.java rename to src/net/sf/openrocket/gui/util/SimpleFileFilter.java index 008592a71..39ded9179 100644 --- a/src/net/sf/openrocket/util/SimpleFileFilter.java +++ b/src/net/sf/openrocket/gui/util/SimpleFileFilter.java @@ -1,4 +1,4 @@ -package net.sf.openrocket.util; +package net.sf.openrocket.gui.util; import java.io.File; diff --git a/src/net/sf/openrocket/startup/Startup2.java b/src/net/sf/openrocket/startup/Startup2.java index 4371fc3e7..6a7aa6eda 100644 --- a/src/net/sf/openrocket/startup/Startup2.java +++ b/src/net/sf/openrocket/startup/Startup2.java @@ -23,12 +23,12 @@ import net.sf.openrocket.gui.dialogs.UpdateInfoDialog; import net.sf.openrocket.gui.main.BasicFrame; import net.sf.openrocket.gui.main.ExceptionHandler; import net.sf.openrocket.gui.main.Splash; +import net.sf.openrocket.gui.util.GUIUtil; +import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; -import net.sf.openrocket.util.GUIUtil; import net.sf.openrocket.util.Prefs; -import net.sf.openrocket.util.SimpleFileFilter; /** * The second class in the OpenRocket startup sequence. This class can assume the diff --git a/src/net/sf/openrocket/utils/MotorPlot.java b/src/net/sf/openrocket/utils/MotorPlot.java index 968146953..f3b743105 100644 --- a/src/net/sf/openrocket/utils/MotorPlot.java +++ b/src/net/sf/openrocket/utils/MotorPlot.java @@ -20,11 +20,11 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import net.sf.openrocket.file.motor.GeneralMotorLoader; +import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.util.GUIUtil; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel;