From 26fb295554afd42b5a7f7f9cc6fe395b5dec682a Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Fri, 27 Sep 2013 10:10:38 -0500 Subject: [PATCH] Rework source structure to separate swing gui code from core code. Separate swing application code from core code. Moved a bunch of sources and libraries around. Created new eclipse project. Further refinements to make it build. Update gitignore. --- .gitignore | 6 - core/.classpath | 9 - core/build.xml | 135 +------ .../file/rocksim/export/InnerBodyTubeDTO.java | 202 +++++------ .../loader/RocksimComponentFileLoader.java | 92 +++-- .../openrocket/rocketcomponent/InnerTube.java | 21 +- .../net/sf/openrocket/ServicesForTesting.java | 155 ++++++++ .../file/openrocket/OpenRocketSaverTest.java | 7 +- .../net/sf/openrocket/plugin/PluginTest.java | 4 +- .../rocketcomponent/ComponentCompareTest.java | 5 +- .../rocketcomponent/FinSetTest.java | 137 ++++---- .../util/BaseTestCase/BaseTestCase.java | 4 +- swing/.classpath | 23 ++ swing/.gitignore | 2 + swing/.project | 17 + swing/.settings/org.eclipse.jdt.core.prefs | 89 +++++ swing/build.xml | 331 ++++++++++++++++++ {core => swing}/lib/OrangeExtensions-1.2.jar | Bin {core => swing}/lib/iText-5.0.2.jar | Bin {core => swing}/lib/jcommon-1.0.18.jar | Bin {core => swing}/lib/jfreechart-1.0.15.jar | Bin .../jogl/gluegen-rt-natives-linux-amd64.jar | Bin .../jogl/gluegen-rt-natives-linux-i586.jar | Bin .../gluegen-rt-natives-macosx-universal.jar | Bin .../jogl/gluegen-rt-natives-windows-amd64.jar | Bin .../jogl/gluegen-rt-natives-windows-i586.jar | Bin {core => swing}/lib/jogl/gluegen-rt.jar | Bin .../lib/jogl/jogl-all-natives-linux-amd64.jar | Bin .../lib/jogl/jogl-all-natives-linux-i586.jar | Bin .../jogl-all-natives-macosx-universal.jar | Bin .../jogl/jogl-all-natives-windows-amd64.jar | Bin .../jogl/jogl-all-natives-windows-i586.jar | Bin {core => swing}/lib/jogl/jogl-all.jar | Bin .../lib/logback-classic-1.0.12.jar | Bin {core => swing}/lib/logback-core-1.0.12.jar | Bin {core => swing}/lib/miglayout15-swing.jar | Bin .../reference/jfreechart-1.0.15-sources.jar | Bin .../reference/jogl-all-2.0.2-sources.jar | Bin .../resources-src/datafiles/presets/Estes.orc | 0 .../datafiles/presets/LocPrecision.orc | 0 .../resources-src/datafiles/presets/Quest.orc | 0 .../datafiles/presets/bluetube.orc | 0 .../resources-src/datafiles/presets/bms.orc | 0 .../datafiles/presets/fliskits.orc | 0 .../datafiles/presets/giantleaprocketry.orc | 0 .../datafiles/presets/publicmissiles.orc | 0 .../datafiles/presets/semroc.orc | 0 .../rocksim_components/bluetube/BTDATA.CSV | 0 .../rocksim_components/bluetube/MATERIAL.CSV | 0 .../rocksim_components/bluetube/TCDATA.CSV | 0 .../rocksim_components/bluetube/readme.txt | 0 .../rocksim_components/bms/BHdata.csv | 0 .../rocksim_components/bms/BTdata.csv | 0 .../rocksim_components/bms/CRdata.csv | 0 .../rocksim_components/bms/LLdata.csv | 0 .../rocksim_components/bms/MATERIAL.CSV | 0 .../rocksim_components/bms/NCdata.csv | 0 .../rocksim_components/bms/TCdata.csv | 0 .../rocksim_components/bms/TRdata.csv | 0 .../rocksim_components/bms/ebdata.csv | 0 .../rocksim_components/estes/BTDATA.CSV | 0 .../rocksim_components/estes/EBDATA.CSV | 0 .../rocksim_components/estes/LLDATA.CSV | 0 .../rocksim_components/estes/MATERIAL.CSV | 0 .../rocksim_components/estes/MODATA.CSV | 0 .../rocksim_components/estes/NCDATA.CSV | 0 .../rocksim_components/estes/PCDATA.CSV | 0 .../rocksim_components/estes/TCDATA.CSV | 0 .../rocksim_components/estes/TRDATA.CSV | 0 .../giantleaprocketry/BHDATA.CSV | 0 .../giantleaprocketry/BTDATA.CSV | 0 .../giantleaprocketry/CRDATA.CSV | 0 .../giantleaprocketry/LLDATA.CSV | 0 .../giantleaprocketry/MATERIAL.CSV | 0 .../giantleaprocketry/MODATA.CSV | 0 .../giantleaprocketry/NCDATA.CSV | 0 .../giantleaprocketry/PCDATA.CSV | 0 .../giantleaprocketry/TCDATA.CSV | 0 .../publicmissiles/BHDATA.CSV | 0 .../publicmissiles/BTDATA.CSV | 0 .../publicmissiles/CFDATA.CSV | 0 .../publicmissiles/CRDATA.CSV | 0 .../publicmissiles/EBDATA.CSV | 0 .../publicmissiles/FSDATA.CSV | 0 .../publicmissiles/GRAPHS.CSV | 0 .../publicmissiles/LLDATA.CSV | 0 .../publicmissiles/MATERIAL.CSV | 0 .../publicmissiles/MODATA.CSV | 0 .../publicmissiles/NCDATA.CSV | 0 .../publicmissiles/PCDATA.CSV | 0 .../publicmissiles/SLDATA.CSV | 0 .../publicmissiles/STDATA.CSV | 0 .../publicmissiles/TCDATA.CSV | 0 .../publicmissiles/TRDATA.CSV | 0 .../rocksim_components/quest/BTDATA.CSV | 0 .../rocksim_components/quest/CRDATA.CSV | 0 .../rocksim_components/quest/EBDATA.CSV | 0 .../rocksim_components/quest/MATERIAL.CSV | 0 .../rocksim_components/quest/NCDATA.CSV | 0 .../rocksim_components/quest/PCDATA.CSV | 0 .../rocksim_components/quest/STDATA.CSV | 0 .../rocksim_components/quest/TCDATA.CSV | 0 .../rocksim_components/quest/TRDATA.CSV | 0 .../rocksim_components/semroc/BHDATA.CSV | 0 .../rocksim_components/semroc/BTDATA.CSV | 0 .../rocksim_components/semroc/CRDATA.CSV | 0 .../rocksim_components/semroc/EBDATA.CSV | 0 .../rocksim_components/semroc/LLDATA.CSV | 0 .../rocksim_components/semroc/MATERIAL.CSV | 0 .../rocksim_components/semroc/NCDATA.CSV | 0 .../rocksim_components/semroc/PCDATA.CSV | 0 .../rocksim_components/semroc/STDATA.CSV | 0 .../rocksim_components/semroc/TCDATA.CSV | 0 .../rocksim_components/semroc/TRDATA.CSV | 0 .../datafiles/tours/convert-images.sh | 0 .../creating_design/dialog-1-nosecone.xcf.gz | Bin .../creating_design/dialog-2-bodytube.xcf.gz | Bin .../creating_design/dialog-3-finset.xcf.gz | Bin .../creating_design/dialog-4-innertube.xcf.gz | Bin .../dialog-5-centeringring.xcf.gz | Bin .../creating_design/dialog-6-parachute.xcf.gz | Bin .../tours/creating_design/main-0-initial.png | Bin .../creating_design/main-1-nosecone.xcf.gz | Bin .../creating_design/main-2-bodytube.xcf.gz | Bin .../creating_design/main-3-finset.xcf.gz | Bin .../creating_design/main-4-innertube.xcf.gz | Bin .../main-5-centeringring.xcf.gz | Bin .../creating_design/main-6-parachute.xcf.gz | Bin .../tours/creating_design/main-7-rest.xcf.gz | Bin .../tours/creating_design/main-8-final.png | Bin .../introduction/advanced_features.xcf.gz | Bin .../introduction/flight_simulations.xcf.gz | Bin .../tours/introduction/logo-MANUAL.xcf.gz | Bin .../tours/introduction/main_window.png | Bin .../introduction/main_window_bottom.xcf.gz | Bin .../tours/introduction/main_window_top.xcf.gz | Bin .../examples/A simple model rocket.ork | Bin .../examples/Apocalypse with decals.ork | Bin .../datafiles/examples/Boosted Dart.ork | Bin .../examples/Clustered rocket design.ork | Bin .../examples/High Power Airstart.ork | Bin ... rocket with dual parachute deployment.ork | Bin .../datafiles/examples/Preset Usage.ork | Bin .../examples/Roll-stabilized rocket.ork | Bin .../examples/Simulation listeners.ork | Bin .../datafiles/examples/TARC Payloader.ork | Bin .../datafiles/examples/Three-stage rocket.ork | Bin .../resources/datafiles/presets/system.ser | Bin 386639 -> 386639 bytes .../resources/datafiles/textures/balsa.jpg | Bin .../datafiles/textures/cardboard.jpg | Bin .../resources/datafiles/textures/chute.jpg | Bin .../datafiles/textures/hardboard.jpg | Bin .../datafiles/textures/motors/aerotech.png | Bin .../datafiles/textures/motors/estes.jpg | Bin .../datafiles/textures/motors/reusable.png | Bin .../datafiles/textures/spiral-wound-alpha.png | Bin .../resources/datafiles/textures/wadding.png | Bin .../resources/datafiles/textures/wood.jpg | Bin .../ComponentPresetDatabaseLoader.java | 0 .../database/MotorDatabaseLoader.java | 0 .../file/motor/MotorLoaderHelper.java | 0 .../sf/openrocket/gui/ExportDecalDialog.java | 0 .../src/net/sf/openrocket/gui/Resettable.java | 0 .../net/sf/openrocket/gui/SpinnerEditor.java | 0 .../openrocket/gui/StorageOptionChooser.java | 0 .../sf/openrocket/gui/TextFieldListener.java | 0 .../openrocket/gui/adaptors/BooleanModel.java | 0 .../sf/openrocket/gui/adaptors/Column.java | 0 .../gui/adaptors/ColumnTableModel.java | 0 .../openrocket/gui/adaptors/DecalModel.java | 0 .../openrocket/gui/adaptors/DoubleModel.java | 0 .../sf/openrocket/gui/adaptors/EnumModel.java | 0 .../adaptors/FlightConfigurationModel.java | 0 .../openrocket/gui/adaptors/IntegerModel.java | 0 .../gui/adaptors/MaterialModel.java | 0 .../openrocket/gui/adaptors/PresetModel.java | 0 .../gui/components/BasicSlider.java | 0 .../openrocket/gui/components/BasicTree.java | 0 .../gui/components/CollectionTable.java | 0 .../gui/components/ColorChooser.java | 0 .../gui/components/ColorChooserButton.java | 0 .../openrocket/gui/components/ColorIcon.java | 0 .../gui/components/CsvOptionPanel.java | 0 .../gui/components/DescriptionArea.java | 0 .../gui/components/DoubleCellEditor.java | 0 .../openrocket/gui/components/FlatButton.java | 0 .../openrocket/gui/components/HtmlLabel.java | 0 .../gui/components/ImageDisplayComponent.java | 0 .../gui/components/SelectableLabel.java | 0 .../gui/components/SimulationExportPanel.java | 0 .../gui/components/StageSelector.java | 0 .../gui/components/StarCheckBox.java | 0 .../gui/components/StyledLabel.java | 0 .../openrocket/gui/components/URLLabel.java | 0 .../gui/components/UnitCellEditor.java | 0 .../gui/components/UnitSelector.java | 0 .../components/compass/CompassPointer.java | 0 .../gui/components/compass/CompassRose.java | 0 .../compass/CompassSelectionButton.java | 0 .../components/compass/CompassSelector.java | 0 .../gui/components/compass/Tester.java | 0 .../gui/configdialog/AppearancePanel.java | 0 .../gui/configdialog/BodyTubeConfig.java | 0 .../gui/configdialog/BulkheadConfig.java | 0 .../gui/configdialog/CenteringRingConfig.java | 0 .../gui/configdialog/CommonStrings.java | 0 .../configdialog/ComponentConfigDialog.java | 0 .../configdialog/EllipticalFinSetConfig.java | 0 .../gui/configdialog/FinSetConfig.java | 0 .../configdialog/FreeformFinSetConfig.java | 0 .../gui/configdialog/InnerTubeConfig.java | 23 +- .../gui/configdialog/LaunchLugConfig.java | 0 .../gui/configdialog/MassComponentConfig.java | 0 .../gui/configdialog/MotorConfig.java | 0 .../gui/configdialog/NoseConeConfig.java | 0 .../gui/configdialog/ParachuteConfig.java | 0 .../configdialog/RecoveryDeviceConfig.java | 0 .../gui/configdialog/RingComponentConfig.java | 0 .../configdialog/RocketComponentConfig.java | 0 .../gui/configdialog/RocketConfig.java | 0 .../gui/configdialog/ShockCordConfig.java | 0 .../gui/configdialog/SleeveConfig.java | 0 .../gui/configdialog/StageConfig.java | 0 .../gui/configdialog/StreamerConfig.java | 0 .../ThicknessRingComponentConfig.java | 0 .../gui/configdialog/TransitionConfig.java | 0 .../configdialog/TrapezoidFinSetConfig.java | 0 .../CustomExpressionDialog.java | 0 .../CustomExpressionPanel.java | 0 .../ExpressionBuilderDialog.java | 0 .../customexpression/OperatorSelector.java | 0 .../customexpression/OperatorTableModel.java | 0 .../customexpression/VariableSelector.java | 0 .../customexpression/VariableTableModel.java | 0 .../openrocket/gui/dialogs/AboutDialog.java | 0 .../gui/dialogs/BugReportDialog.java | 0 .../gui/dialogs/ComponentAnalysisDialog.java | 0 .../gui/dialogs/CustomMaterialDialog.java | 0 .../gui/dialogs/DebugLogDialog.java | 0 .../openrocket/gui/dialogs/DetailDialog.java | 0 .../gui/dialogs/EditDecalDialog.java | 0 .../openrocket/gui/dialogs/LicenseDialog.java | 0 .../openrocket/gui/dialogs/PrintDialog.java | 0 .../gui/dialogs/PrintSettingsDialog.java | 0 .../openrocket/gui/dialogs/ScaleDialog.java | 0 .../gui/dialogs/SwingWorkerDialog.java | 0 .../gui/dialogs/UpdateInfoDialog.java | 0 .../openrocket/gui/dialogs/WarningDialog.java | 0 .../DeploymentSelectionDialog.java | 0 .../FlightConfigurationDialog.java | 0 .../IgnitionSelectionDialog.java | 0 .../MotorConfigurationPanel.java | 0 .../MotorConfigurationTableModel.java | 0 .../MotorMountTableModel.java | 0 .../RecoveryConfigurationPanel.java | 0 .../RenameConfigDialog.java | 0 .../SeparationConfigurationPanel.java | 0 .../SeparationSelectionDialog.java | 0 .../gui/dialogs/motor/CloseableDialog.java | 0 .../gui/dialogs/motor/MotorChooserDialog.java | 0 .../gui/dialogs/motor/MotorSelector.java | 0 .../dialogs/motor/thrustcurve/MotorClass.java | 0 .../motor/thrustcurve/MotorHolder.java | 0 .../thrustcurve/ThrustCurveMotorColumns.java | 0 .../ThrustCurveMotorComparator.java | 0 .../ThrustCurveMotorDatabaseModel.java | 0 .../ThrustCurveMotorPlotDialog.java | 0 .../ThrustCurveMotorSelectionPanel.java | 0 .../optimization/FunctionEvaluationData.java | 0 .../GeneralOptimizationDialog.java | 0 .../optimization/OptimizationPlotDialog.java | 0 .../optimization/OptimizationStepData.java | 0 .../optimization/OptimizationWorker.java | 0 .../optimization/SimulationModifierTree.java | 0 .../preferences/MaterialEditPanel.java | 0 .../preferences/PreferencesDialog.java | 0 .../preset/ComponentPresetChooserDialog.java | 0 .../preset/ComponentPresetRowFilter.java | 0 .../dialogs/preset/ComponentPresetTable.java | 0 .../preset/ComponentPresetTableColumn.java | 0 .../gui/dialogs/preset/XTableColumnModel.java | 0 .../gui/figure3d/FigureRenderer.java | 0 .../gui/figure3d/RealisticRenderer.java | 0 .../gui/figure3d/RocketFigure3d.java | 0 .../gui/figure3d/RocketRenderer.java | 0 .../gui/figure3d/UnfinishedRenderer.java | 0 .../figure3d/geometry/ComponentRenderer.java | 0 .../DisplayListComponentRenderer.java | 0 .../gui/figure3d/geometry/FinRenderer.java | 0 .../gui/figure3d/geometry/Geometry.java | 0 .../figure3d/geometry/MassObjectRenderer.java | 0 .../figure3d/geometry/TransitionRenderer.java | 0 .../gui/figureelements/CGCaret.java | 0 .../gui/figureelements/CPCaret.java | 0 .../openrocket/gui/figureelements/Caret.java | 0 .../gui/figureelements/FigureElement.java | 0 .../gui/figureelements/RocketInfo.java | 0 .../help/tours/GuidedTourSelectionDialog.java | 0 .../sf/openrocket/gui/help/tours/Slide.java | 0 .../openrocket/gui/help/tours/SlideSet.java | 0 .../gui/help/tours/SlideSetLoader.java | 0 .../gui/help/tours/SlideSetManager.java | 0 .../gui/help/tours/SlideShowComponent.java | 0 .../gui/help/tours/SlideShowDialog.java | 0 .../gui/help/tours/SlideShowLinkListener.java | 0 .../gui/help/tours/TextLineReader.java | 0 .../sf/openrocket/gui/main/BasicFrame.java | 0 .../gui/main/ClipboardListener.java | 0 .../gui/main/ComponentAddButtons.java | 0 .../openrocket/gui/main/ComponentIcons.java | 0 .../gui/main/DocumentSelectionListener.java | 0 .../gui/main/DocumentSelectionModel.java | 0 .../gui/main/ExampleDesignFile.java | 0 .../gui/main/ExampleDesignFileAction.java | 0 .../sf/openrocket/gui/main/MRUDesignFile.java | 0 .../gui/main/MRUDesignFileAction.java | 0 .../gui/main/OpenRocketClipboard.java | 0 .../sf/openrocket/gui/main/RocketActions.java | 0 .../openrocket/gui/main/SimulationPanel.java | 0 .../net/sf/openrocket/gui/main/Splash.java | 0 .../gui/main/SwingExceptionHandler.java | 0 .../openrocket/gui/main/UndoRedoAction.java | 0 .../gui/main/componenttree/ComponentTree.java | 0 .../componenttree/ComponentTreeModel.java | 0 .../componenttree/ComponentTreeRenderer.java | 0 .../ComponentTreeTransferHandler.java | 0 .../RocketComponentTransferable.java | 0 .../src/net/sf/openrocket/gui/plot/Axis.java | 0 .../sf/openrocket/gui/plot/EventGraphics.java | 0 .../gui/plot/PlotConfiguration.java | 0 .../openrocket/gui/plot/SimulationChart.java | 0 .../openrocket/gui/plot/SimulationPlot.java | 0 .../gui/plot/SimulationPlotDialog.java | 0 .../src/net/sf/openrocket/gui/plot/Util.java | 0 .../openrocket/gui/preset/ButtonColumn.java | 0 .../gui/preset/DeselectableComboBox.java | 0 .../gui/preset/ImagePreviewPanel.java | 0 .../openrocket/gui/preset/MaterialModel.java | 0 .../gui/preset/PresetEditorDialog.java | 0 .../gui/preset/PresetResultListener.java | 0 .../gui/print/AbstractPrintable.java | 0 .../sf/openrocket/gui/print/DesignReport.java | 0 .../openrocket/gui/print/FinMarkingGuide.java | 0 .../sf/openrocket/gui/print/ITextHelper.java | 0 .../gui/print/OpenRocketPrintable.java | 0 .../gui/print/PDFPrintStreamDoc.java | 0 .../gui/print/PaperOrientation.java | 0 .../sf/openrocket/gui/print/PaperSize.java | 0 .../openrocket/gui/print/PrintController.java | 0 .../sf/openrocket/gui/print/PrintFigure.java | 0 .../openrocket/gui/print/PrintSettings.java | 0 .../gui/print/PrintSimulationWorker.java | 0 .../sf/openrocket/gui/print/PrintUnit.java | 0 .../openrocket/gui/print/PrintUtilities.java | 0 .../gui/print/PrintableCenteringRing.java | 0 .../gui/print/PrintableComponent.java | 0 .../gui/print/PrintableContext.java | 0 .../openrocket/gui/print/PrintableFinSet.java | 0 .../gui/print/PrintableNoseCone.java | 0 .../gui/print/PrintableTransition.java | 0 .../gui/print/TemplateProperties.java | 0 .../gui/print/components/CheckBoxNode.java | 0 .../components/CheckTreeCellRenderer.java | 0 .../print/components/CheckTreeManager.java | 0 .../components/CheckTreeSelectionModel.java | 0 .../gui/print/components/RocketPrintTree.java | 0 .../openrocket/gui/print/components/Rule.java | 0 .../print/visitor/AbstractPrintStrategy.java | 0 .../print/visitor/CenteringRingStrategy.java | 0 .../gui/print/visitor/Dimension.java | 0 .../visitor/FinMarkingGuideStrategy.java | 0 .../print/visitor/FinSetPrintStrategy.java | 0 .../print/visitor/PageFitPrintStrategy.java | 0 .../visitor/PartsDetailVisitorStrategy.java | 0 .../visitor/PartsListVisitorStrategy.java | 0 .../gui/print/visitor/TransitionStrategy.java | 0 .../gui/rocketfigure/BodyTubeShapes.java | 0 .../gui/rocketfigure/FinSetShapes.java | 0 .../gui/rocketfigure/LaunchLugShapes.java | 0 .../gui/rocketfigure/MassObjectShapes.java | 0 .../gui/rocketfigure/RingComponentShapes.java | 0 .../rocketfigure/RocketComponentShapes.java | 0 .../SymmetricComponentShapes.java | 0 .../gui/rocketfigure/TransitionShapes.java | 0 .../gui/scalefigure/AbstractScaleFigure.java | 0 .../gui/scalefigure/FinPointFigure.java | 0 .../gui/scalefigure/RocketFigure.java | 0 .../gui/scalefigure/RocketPanel.java | 0 .../gui/scalefigure/ScaleFigure.java | 0 .../gui/scalefigure/ScaleScrollPane.java | 0 .../gui/scalefigure/ScaleSelector.java | 0 .../simulation/SimulationConditionsPanel.java | 0 .../gui/simulation/SimulationEditDialog.java | 0 .../gui/simulation/SimulationExportPanel.java | 0 .../simulation/SimulationOptionsPanel.java | 0 .../gui/simulation/SimulationPlotPanel.java | 0 .../gui/simulation/SimulationRunDialog.java | 0 .../simulation/SimulationWarningDialog.java | 0 .../gui/simulation/SimulationWorker.java | 0 .../openrocket/gui/util/ColorConversion.java | 0 .../gui/util/ConcurrentProgressMonitor.java | 0 .../ConcurrentProgressMonitorInputStream.java | 0 .../gui/util/CustomFinImporter.java | 0 .../openrocket/gui/util/EditDecalHelper.java | 0 .../sf/openrocket/gui/util/FileHelper.java | 0 .../net/sf/openrocket/gui/util/GUIUtil.java | 0 .../src/net/sf/openrocket/gui/util/Icons.java | 0 .../openrocket/gui/util/OpenFileWorker.java | 0 .../gui/util/ProgressOutputStream.java | 0 .../sf/openrocket/gui/util/SaveCSVWorker.java | 0 .../openrocket/gui/util/SaveFileWorker.java | 0 .../openrocket/gui/util/SwingPreferences.java | 0 .../openrocket/gui/watcher/FileWatcher.java | 0 .../sf/openrocket/gui/watcher/WatchEvent.java | 0 .../sf/openrocket/gui/watcher/WatchKey.java | 0 .../openrocket/gui/watcher/WatchService.java | 0 .../gui/watcher/WatchServiceImpl.java | 0 .../sf/openrocket/gui/watcher/Watchable.java | 0 .../sf/openrocket/logging/BufferLogger.java | 0 .../sf/openrocket/logging/CyclicBuffer.java | 0 .../openrocket/logging/DelegatorLogger.java | 0 .../net/sf/openrocket/logging/LogHelper.java | 0 .../net/sf/openrocket/logging/LogLevel.java | 0 .../logging/LogLevelBufferLogger.java | 0 .../net/sf/openrocket/logging/LogLine.java | 0 .../logging/LogbackBufferLoggerAdaptor.java | 0 .../logging/LoggingSystemSetup.java | 0 .../openrocket/logging/PrintStreamLogger.java | 0 .../logging/PrintStreamToSLF4J.java | 0 .../openrocket/logging/StackTraceWriter.java | 0 .../sf/openrocket/logging/TraceException.java | 0 .../net/sf/openrocket/startup/GuiModule.java | 0 .../net/sf/openrocket/startup/OSXSetup.java | 0 .../net/sf/openrocket/startup/Startup.java | 0 .../sf/openrocket/startup/SwingStartup.java | 0 .../startup/jij/ClasspathProvider.java | 0 .../jij/ClasspathUrlStreamHandler.java | 0 .../jij/ConfigurableStreamHandlerFactory.java | 0 .../startup/jij/CurrentClasspathProvider.java | 0 .../startup/jij/JarInJarStarter.java | 0 .../jij/ManifestClasspathProvider.java | 0 .../startup/jij/PluginClasspathProvider.java | 0 ...ockingComponentPresetDatabaseProvider.java | 0 .../BlockingMotorDatabaseProvider.java | 0 .../startup/providers/TranslatorProvider.java | 0 .../sf/openrocket/utils/BasicApplication.java | 0 .../utils/ComponentPresetEditor.java | 0 .../openrocket/utils/CoreServicesModule.java | 0 .../utils/GraphicalMotorSelector.java | 0 .../net/sf/openrocket/utils/MotorPlot.java | 0 .../utils/RocksimComponentFileTranslator.java | 0 .../sf/openrocket/utils/RocksimConverter.java | 0 .../sf/openrocket/utils/SerializePresets.java | 0 .../net/sf/openrocket/IntegrationTest.java | 0 .../test/net/sf/openrocket/gui/TestGUI.java | 0 .../gui/configdialog/FinSetConfigTest.java | 0 .../openrocket/gui/print/PrintUnitTest.java | 0 .../openrocket/gui/print/TestPaperSize.java | 0 .../openrocket/logging/CyclicBufferTest.java | 0 .../logging/LogLevelBufferLoggerTest.java | 0 .../sf/openrocket/logging/LogLevelTest.java | 0 461 files changed, 862 insertions(+), 400 deletions(-) create mode 100644 core/test/net/sf/openrocket/ServicesForTesting.java create mode 100644 swing/.classpath create mode 100644 swing/.gitignore create mode 100644 swing/.project create mode 100644 swing/.settings/org.eclipse.jdt.core.prefs create mode 100644 swing/build.xml rename {core => swing}/lib/OrangeExtensions-1.2.jar (100%) rename {core => swing}/lib/iText-5.0.2.jar (100%) rename {core => swing}/lib/jcommon-1.0.18.jar (100%) rename {core => swing}/lib/jfreechart-1.0.15.jar (100%) rename {core => swing}/lib/jogl/gluegen-rt-natives-linux-amd64.jar (100%) rename {core => swing}/lib/jogl/gluegen-rt-natives-linux-i586.jar (100%) rename {core => swing}/lib/jogl/gluegen-rt-natives-macosx-universal.jar (100%) rename {core => swing}/lib/jogl/gluegen-rt-natives-windows-amd64.jar (100%) rename {core => swing}/lib/jogl/gluegen-rt-natives-windows-i586.jar (100%) rename {core => swing}/lib/jogl/gluegen-rt.jar (100%) rename {core => swing}/lib/jogl/jogl-all-natives-linux-amd64.jar (100%) rename {core => swing}/lib/jogl/jogl-all-natives-linux-i586.jar (100%) rename {core => swing}/lib/jogl/jogl-all-natives-macosx-universal.jar (100%) rename {core => swing}/lib/jogl/jogl-all-natives-windows-amd64.jar (100%) rename {core => swing}/lib/jogl/jogl-all-natives-windows-i586.jar (100%) rename {core => swing}/lib/jogl/jogl-all.jar (100%) rename {core => swing}/lib/logback-classic-1.0.12.jar (100%) rename {core => swing}/lib/logback-core-1.0.12.jar (100%) rename {core => swing}/lib/miglayout15-swing.jar (100%) rename {core => swing}/reference/jfreechart-1.0.15-sources.jar (100%) rename {core => swing}/reference/jogl-all-2.0.2-sources.jar (100%) rename {core => swing}/resources-src/datafiles/presets/Estes.orc (100%) rename {core => swing}/resources-src/datafiles/presets/LocPrecision.orc (100%) rename {core => swing}/resources-src/datafiles/presets/Quest.orc (100%) rename {core => swing}/resources-src/datafiles/presets/bluetube.orc (100%) rename {core => swing}/resources-src/datafiles/presets/bms.orc (100%) rename {core => swing}/resources-src/datafiles/presets/fliskits.orc (100%) rename {core => swing}/resources-src/datafiles/presets/giantleaprocketry.orc (100%) rename {core => swing}/resources-src/datafiles/presets/publicmissiles.orc (100%) rename {core => swing}/resources-src/datafiles/presets/semroc.orc (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bluetube/readme.txt (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/BHdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/BTdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/CRdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/LLdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/NCdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/TCdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/TRdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/bms/ebdata.csv (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/MODATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/STDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV (100%) rename {core => swing}/resources-src/datafiles/tours/convert-images.sh (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-0-initial.png (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/creating_design/main-8-final.png (100%) rename {core => swing}/resources-src/datafiles/tours/introduction/advanced_features.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/introduction/flight_simulations.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/introduction/logo-MANUAL.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/introduction/main_window.png (100%) rename {core => swing}/resources-src/datafiles/tours/introduction/main_window_bottom.xcf.gz (100%) rename {core => swing}/resources-src/datafiles/tours/introduction/main_window_top.xcf.gz (100%) rename {core => swing}/resources/datafiles/examples/A simple model rocket.ork (100%) rename {core => swing}/resources/datafiles/examples/Apocalypse with decals.ork (100%) rename {core => swing}/resources/datafiles/examples/Boosted Dart.ork (100%) rename {core => swing}/resources/datafiles/examples/Clustered rocket design.ork (100%) rename {core => swing}/resources/datafiles/examples/High Power Airstart.ork (100%) rename {core => swing}/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork (100%) rename {core => swing}/resources/datafiles/examples/Preset Usage.ork (100%) rename {core => swing}/resources/datafiles/examples/Roll-stabilized rocket.ork (100%) rename {core => swing}/resources/datafiles/examples/Simulation listeners.ork (100%) rename {core => swing}/resources/datafiles/examples/TARC Payloader.ork (100%) rename {core => swing}/resources/datafiles/examples/Three-stage rocket.ork (100%) rename {core => swing}/resources/datafiles/presets/system.ser (97%) rename {core => swing}/resources/datafiles/textures/balsa.jpg (100%) rename {core => swing}/resources/datafiles/textures/cardboard.jpg (100%) rename {core => swing}/resources/datafiles/textures/chute.jpg (100%) rename {core => swing}/resources/datafiles/textures/hardboard.jpg (100%) rename {core => swing}/resources/datafiles/textures/motors/aerotech.png (100%) rename {core => swing}/resources/datafiles/textures/motors/estes.jpg (100%) rename {core => swing}/resources/datafiles/textures/motors/reusable.png (100%) rename {core => swing}/resources/datafiles/textures/spiral-wound-alpha.png (100%) rename {core => swing}/resources/datafiles/textures/wadding.png (100%) rename {core => swing}/resources/datafiles/textures/wood.jpg (100%) rename {core => swing}/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java (100%) rename {core => swing}/src/net/sf/openrocket/database/MotorDatabaseLoader.java (100%) rename {core => swing}/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/ExportDecalDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/Resettable.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/SpinnerEditor.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/StorageOptionChooser.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/TextFieldListener.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/BooleanModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/Column.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/ColumnTableModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/DecalModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/DoubleModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/EnumModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/FlightConfigurationModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/IntegerModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/MaterialModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/adaptors/PresetModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/BasicSlider.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/BasicTree.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/CollectionTable.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/ColorChooser.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/ColorChooserButton.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/ColorIcon.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/CsvOptionPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/DescriptionArea.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/DoubleCellEditor.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/FlatButton.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/HtmlLabel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/ImageDisplayComponent.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/SelectableLabel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/SimulationExportPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/StageSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/StarCheckBox.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/StyledLabel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/URLLabel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/UnitCellEditor.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/UnitSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/compass/CompassPointer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/compass/CompassRose.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/compass/CompassSelectionButton.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/compass/CompassSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/components/compass/Tester.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/CommonStrings.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java (89%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/MotorConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/RocketConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/StageConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/OperatorTableModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/VariableSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/AboutDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/DetailDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/PrintDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/WarningDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/FlightConfigurationDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationTableModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountTableModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RecoveryConfigurationPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorClass.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetRowFilter.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/dialogs/preset/XTableColumnModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/UnfinishedRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figureelements/CGCaret.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figureelements/CPCaret.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figureelements/Caret.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figureelements/FigureElement.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/figureelements/RocketInfo.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/Slide.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/SlideSet.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/help/tours/TextLineReader.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/BasicFrame.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/ClipboardListener.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/ComponentAddButtons.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/ComponentIcons.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/ExampleDesignFile.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/MRUDesignFile.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/RocketActions.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/SimulationPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/Splash.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/UndoRedoAction.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/Axis.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/EventGraphics.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/PlotConfiguration.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/SimulationChart.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/SimulationPlot.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/plot/Util.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/preset/ButtonColumn.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/preset/ImagePreviewPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/preset/MaterialModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/preset/PresetResultListener.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/AbstractPrintable.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/DesignReport.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/FinMarkingGuide.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/ITextHelper.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PaperOrientation.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PaperSize.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintController.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintFigure.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintSettings.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintUnit.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintUtilities.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintableCenteringRing.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintableComponent.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintableContext.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintableFinSet.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintableNoseCone.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/PrintableTransition.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/TemplateProperties.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/components/Rule.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/AbstractPrintStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/Dimension.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/simulation/SimulationWorker.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/ColorConversion.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/CustomFinImporter.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/EditDecalHelper.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/FileHelper.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/GUIUtil.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/Icons.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/OpenFileWorker.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/ProgressOutputStream.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/SaveCSVWorker.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/SaveFileWorker.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/util/SwingPreferences.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/watcher/FileWatcher.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/watcher/WatchEvent.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/watcher/WatchKey.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/watcher/WatchService.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/watcher/WatchServiceImpl.java (100%) rename {core => swing}/src/net/sf/openrocket/gui/watcher/Watchable.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/BufferLogger.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/CyclicBuffer.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/DelegatorLogger.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/LogHelper.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/LogLevel.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/LogLevelBufferLogger.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/LogLine.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/LogbackBufferLoggerAdaptor.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/LoggingSystemSetup.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/PrintStreamLogger.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/PrintStreamToSLF4J.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/StackTraceWriter.java (100%) rename {core => swing}/src/net/sf/openrocket/logging/TraceException.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/GuiModule.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/OSXSetup.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/Startup.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/SwingStartup.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/ClasspathProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/ClasspathUrlStreamHandler.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/ConfigurableStreamHandlerFactory.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/CurrentClasspathProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/JarInJarStarter.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/ManifestClasspathProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/jij/PluginClasspathProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/providers/BlockingComponentPresetDatabaseProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/providers/BlockingMotorDatabaseProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/startup/providers/TranslatorProvider.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/BasicApplication.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/ComponentPresetEditor.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/CoreServicesModule.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/GraphicalMotorSelector.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/MotorPlot.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/RocksimComponentFileTranslator.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/RocksimConverter.java (100%) rename {core => swing}/src/net/sf/openrocket/utils/SerializePresets.java (100%) rename {core => swing}/test/net/sf/openrocket/IntegrationTest.java (100%) rename {core => swing}/test/net/sf/openrocket/gui/TestGUI.java (100%) rename {core => swing}/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java (100%) rename {core => swing}/test/net/sf/openrocket/gui/print/PrintUnitTest.java (100%) rename {core => swing}/test/net/sf/openrocket/gui/print/TestPaperSize.java (100%) rename {core => swing}/test/net/sf/openrocket/logging/CyclicBufferTest.java (100%) rename {core => swing}/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java (100%) rename {core => swing}/test/net/sf/openrocket/logging/LogLevelTest.java (100%) diff --git a/.gitignore b/.gitignore index 896cbbf5f..91aeba86b 100644 --- a/.gitignore +++ b/.gitignore @@ -37,9 +37,3 @@ /core/resources-src/pix/sormus.xcf.gz /core/resources-src/pix/splashscreen-sormus.png /core/resources-src/pix/splashscreen-sormus.xcf.gz -<<<<<<< HEAD - -/*/bin/ -/android-libraries/*/bin/ -======= ->>>>>>> Convert svn:ignore properties to .gitignore. diff --git a/core/.classpath b/core/.classpath index 40137a329..3345ea11a 100644 --- a/core/.classpath +++ b/core/.classpath @@ -10,8 +10,6 @@ - - @@ -20,19 +18,12 @@ - - - - - - - diff --git a/core/build.xml b/core/build.xml index 48f7aed46..9f41533e9 100644 --- a/core/build.xml +++ b/core/build.xml @@ -1,4 +1,4 @@ - + @@ -23,14 +23,6 @@ - - - - - - - - @@ -51,13 +43,6 @@ - - - - - - - @@ -74,56 +59,20 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Generating ORC file for vendor @{vendor} - - - - - - - - - - - - - - - - - - - - - - Building source distribution - - - - - - - - - - - - - - - - - - Testing source distribution - - - - - - - - - Source distribution test successful - - - - - - - - - - - - - Distribution ${build.version} (${build.source}) built into directory ${jar.dir} - - diff --git a/core/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java index 8b040395e..cf995a54d 100644 --- a/core/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java +++ b/core/src/net/sf/openrocket/file/rocksim/export/InnerBodyTubeDTO.java @@ -1,7 +1,12 @@ package net.sf.openrocket.file.rocksim.export; +import java.util.List; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; + import net.sf.openrocket.file.rocksim.RocksimCommonConstants; -import net.sf.openrocket.gui.configdialog.InnerTubeConfig; import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.Bulkhead; import net.sf.openrocket.rocketcomponent.CenteringRing; @@ -15,110 +20,105 @@ import net.sf.openrocket.rocketcomponent.Transition; import net.sf.openrocket.rocketcomponent.TubeCoupler; import net.sf.openrocket.util.Coordinate; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import java.util.List; - /** * This class models the XML element for a Rocksim inside tube. */ @XmlRootElement(name = RocksimCommonConstants.BODY_TUBE) @XmlAccessorType(XmlAccessType.FIELD) public class InnerBodyTubeDTO extends BodyTubeDTO implements AttachableParts { - - /** - * Constructor. - */ - public InnerBodyTubeDTO() { - super.setInsideTube(true); - } - - /** - * Full copy constructor. - * - * @param bt the corresponding OR inner body tube - * @param parent the attached parts (subcomponents in Rocksim speak) of the InnerTube's parent. This instance - * is a member of those attached parts, as well as all sibling components. This is passed in the - * event that the inner tube is a cluster. In that situation this instance will be removed and - * individual instances for each cluster member will be added. - */ - public InnerBodyTubeDTO(InnerTube bt, AttachableParts parent) { - super(bt); - setEngineOverhang(bt.getMotorOverhang() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); - setID(bt.getInnerRadius() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS); - setOD(bt.getOuterRadius() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS); - setMotorDia((bt.getMotorMountDiameter() / 2) * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS); - setMotorMount(bt.isMotorMount()); - setInsideTube(true); - setRadialAngle(bt.getRadialDirection()); - setRadialLoc(bt.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); - - List children = bt.getChildren(); - for (int i = 0; i < children.size(); i++) { - RocketComponent rocketComponents = children.get(i); - if (rocketComponents instanceof InnerTube) { - final InnerTube innerTube = (InnerTube) rocketComponents; - //Only if the inner tube is NOT a cluster, then create the corresponding Rocksim DTO and add it - //to the list of attached parts. If it is a cluster, then it is handled specially outside of this - //loop. - if (innerTube.getClusterCount() == 1) { - attachedParts.add(new InnerBodyTubeDTO(innerTube, this)); - } - } else if (rocketComponents instanceof BodyTube) { - attachedParts.add(new BodyTubeDTO((BodyTube) rocketComponents)); - } else if (rocketComponents instanceof Transition) { - attachedParts.add(new TransitionDTO((Transition) rocketComponents)); - } else if (rocketComponents instanceof EngineBlock) { - attachedParts.add(new EngineBlockDTO((EngineBlock) rocketComponents)); - } else if (rocketComponents instanceof TubeCoupler) { - attachedParts.add(new TubeCouplerDTO((TubeCoupler) rocketComponents)); - } else if (rocketComponents instanceof CenteringRing) { - attachedParts.add(new CenteringRingDTO((CenteringRing) rocketComponents)); - } else if (rocketComponents instanceof Bulkhead) { - attachedParts.add(new BulkheadDTO((Bulkhead) rocketComponents)); - } else if (rocketComponents instanceof Streamer) { - attachedParts.add(new StreamerDTO((Streamer) rocketComponents)); - } else if (rocketComponents instanceof Parachute) { - attachedParts.add(new ParachuteDTO((Parachute) rocketComponents)); - } else if (rocketComponents instanceof MassObject) { - attachedParts.add(new MassObjectDTO((MassObject) rocketComponents)); - } - } - //Do the cluster. For now this splits the cluster into separate tubes, which is how Rocksim represents it. - //The import (from Rocksim to OR) could be augmented to be more intelligent and try to determine if the - //co-located tubes are a cluster. - if (bt.getClusterConfiguration().getClusterCount() > 1) { - handleCluster(bt, parent); - parent.removeAttachedPart(this); - } - } - - - /** - * Handle the inner tube as a cluster. This amounts to splitting it up so that each motor mount in the cluster - * is created individually to support Rocksim's view of clusters. - * - * @param it the clustered tube - * @param p the collection (parent's attached parts really) to which all cluster tubes will be added - */ - private void handleCluster(InnerTube it, AttachableParts p) { - - Coordinate[] coords = {Coordinate.NUL}; - coords = it.shiftCoordinates(coords); - for (int x = 0; x < coords.length; x++) { - InnerTube partialClone = InnerTubeConfig.makeIndividualClusterComponent(coords[x], it.getName() + " #" + (x + 1), it); - p.addAttachedPart(new InnerBodyTubeDTO(partialClone, p)); - } - } - - @Override - public void addAttachedPart(BasePartDTO part) { - attachedParts.add(part); - } - - @Override - public void removeAttachedPart(BasePartDTO part) { - attachedParts.remove(part); - } + + /** + * Constructor. + */ + public InnerBodyTubeDTO() { + super.setInsideTube(true); + } + + /** + * Full copy constructor. + * + * @param bt the corresponding OR inner body tube + * @param parent the attached parts (subcomponents in Rocksim speak) of the InnerTube's parent. This instance + * is a member of those attached parts, as well as all sibling components. This is passed in the + * event that the inner tube is a cluster. In that situation this instance will be removed and + * individual instances for each cluster member will be added. + */ + public InnerBodyTubeDTO(InnerTube bt, AttachableParts parent) { + super(bt); + setEngineOverhang(bt.getMotorOverhang() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); + setID(bt.getInnerRadius() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS); + setOD(bt.getOuterRadius() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS); + setMotorDia((bt.getMotorMountDiameter() / 2) * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS); + setMotorMount(bt.isMotorMount()); + setInsideTube(true); + setRadialAngle(bt.getRadialDirection()); + setRadialLoc(bt.getRadialPosition() * RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LENGTH); + + List children = bt.getChildren(); + for (int i = 0; i < children.size(); i++) { + RocketComponent rocketComponents = children.get(i); + if (rocketComponents instanceof InnerTube) { + final InnerTube innerTube = (InnerTube) rocketComponents; + //Only if the inner tube is NOT a cluster, then create the corresponding Rocksim DTO and add it + //to the list of attached parts. If it is a cluster, then it is handled specially outside of this + //loop. + if (innerTube.getClusterCount() == 1) { + attachedParts.add(new InnerBodyTubeDTO(innerTube, this)); + } + } else if (rocketComponents instanceof BodyTube) { + attachedParts.add(new BodyTubeDTO((BodyTube) rocketComponents)); + } else if (rocketComponents instanceof Transition) { + attachedParts.add(new TransitionDTO((Transition) rocketComponents)); + } else if (rocketComponents instanceof EngineBlock) { + attachedParts.add(new EngineBlockDTO((EngineBlock) rocketComponents)); + } else if (rocketComponents instanceof TubeCoupler) { + attachedParts.add(new TubeCouplerDTO((TubeCoupler) rocketComponents)); + } else if (rocketComponents instanceof CenteringRing) { + attachedParts.add(new CenteringRingDTO((CenteringRing) rocketComponents)); + } else if (rocketComponents instanceof Bulkhead) { + attachedParts.add(new BulkheadDTO((Bulkhead) rocketComponents)); + } else if (rocketComponents instanceof Streamer) { + attachedParts.add(new StreamerDTO((Streamer) rocketComponents)); + } else if (rocketComponents instanceof Parachute) { + attachedParts.add(new ParachuteDTO((Parachute) rocketComponents)); + } else if (rocketComponents instanceof MassObject) { + attachedParts.add(new MassObjectDTO((MassObject) rocketComponents)); + } + } + //Do the cluster. For now this splits the cluster into separate tubes, which is how Rocksim represents it. + //The import (from Rocksim to OR) could be augmented to be more intelligent and try to determine if the + //co-located tubes are a cluster. + if (bt.getClusterConfiguration().getClusterCount() > 1) { + handleCluster(bt, parent); + parent.removeAttachedPart(this); + } + } + + + /** + * Handle the inner tube as a cluster. This amounts to splitting it up so that each motor mount in the cluster + * is created individually to support Rocksim's view of clusters. + * + * @param it the clustered tube + * @param p the collection (parent's attached parts really) to which all cluster tubes will be added + */ + private void handleCluster(InnerTube it, AttachableParts p) { + + Coordinate[] coords = { Coordinate.NUL }; + coords = it.shiftCoordinates(coords); + for (int x = 0; x < coords.length; x++) { + InnerTube partialClone = InnerTube.makeIndividualClusterComponent(coords[x], it.getName() + " #" + (x + 1), it); + p.addAttachedPart(new InnerBodyTubeDTO(partialClone, p)); + } + } + + @Override + public void addAttachedPart(BasePartDTO part) { + attachedParts.add(part); + } + + @Override + public void removeAttachedPart(BasePartDTO part) { + attachedParts.remove(part); + } } diff --git a/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java b/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java index cb285a216..eef411558 100644 --- a/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java +++ b/core/src/net/sf/openrocket/preset/loader/RocksimComponentFileLoader.java @@ -1,13 +1,5 @@ package net.sf.openrocket.preset.loader; -import au.com.bytecode.opencsv.CSVReader; -import net.sf.openrocket.gui.print.PrintUnit; -import net.sf.openrocket.preset.TypedPropertyMap; -import net.sf.openrocket.unit.Unit; -import net.sf.openrocket.unit.UnitGroup; -import net.sf.openrocket.util.ArrayList; -import net.sf.openrocket.util.StringUtil; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -17,19 +9,26 @@ import java.io.InputStreamReader; import java.io.PrintStream; import java.util.List; +import net.sf.openrocket.preset.TypedPropertyMap; +import net.sf.openrocket.unit.Unit; +import net.sf.openrocket.unit.UnitGroup; +import net.sf.openrocket.util.ArrayList; +import net.sf.openrocket.util.StringUtil; +import au.com.bytecode.opencsv.CSVReader; + /** * Primary entry point for parsing component CSV files that are in Rocksim format. */ public abstract class RocksimComponentFileLoader { - - private static final PrintStream LOGGER = System.err; - + + private static final PrintStream LOGGER = System.err; + private String basePath = ""; - + private File dir; - + protected List fileColumns = new ArrayList(); - + /** * Constructor. * @@ -39,7 +38,7 @@ public abstract class RocksimComponentFileLoader { dir = theBasePathToLoadFrom; basePath = dir.getAbsolutePath(); } - + /** * Constructor. * @@ -49,17 +48,17 @@ public abstract class RocksimComponentFileLoader { dir = new File(basePath); basePath = theBasePathToLoadFrom; } - + protected abstract RocksimComponentFileType getFileType(); - + public void load() { try { - load(getFileType()); - } catch (FileNotFoundException fex ) { - LOGGER.println( fex.getLocalizedMessage() ); + load(getFileType()); + } catch (FileNotFoundException fex) { + LOGGER.println(fex.getLocalizedMessage()); } } - + /** * Read a comma separated component file and return the parsed contents as a list of string arrays. Not for * production use - just here for smoke testing. @@ -83,7 +82,7 @@ public abstract class RocksimComponentFileLoader { FileInputStream fis = new FileInputStream(new File(dir, type.getDefaultFileName())); load(fis); } - + /** * Read a comma separated component file and return the parsed contents as a list of string arrays. * @@ -97,7 +96,7 @@ public abstract class RocksimComponentFileLoader { private void load(File file) throws FileNotFoundException { load(new FileInputStream(file)); } - + /** * Read a comma separated component file and return the parsed contents as a list of string arrays. * @@ -114,13 +113,13 @@ public abstract class RocksimComponentFileLoader { InputStreamReader r = null; try { r = new InputStreamReader(is); - + // Create the CSV reader. Use comma separator. CSVReader reader = new CSVReader(r, ',', '\'', '\\'); - + //Read and throw away the header row. parseHeaders(reader.readNext()); - + String[] data = null; while ((data = reader.readNext()) != null) { // detect empty lines and skip: @@ -134,41 +133,38 @@ public abstract class RocksimComponentFileLoader { } //Read the rest of the file as data rows. return; - } - catch (IOException e) { - } - finally { + } catch (IOException e) { + } finally { if (r != null) { try { r.close(); - } - catch (IOException e) { + } catch (IOException e) { } } } - + } - + protected void parseHeaders(String[] headers) { for (RocksimComponentFileColumnParser column : fileColumns) { column.configure(headers); } } - + protected void parseData(String[] data) { if (data == null || data.length == 0) { return; } TypedPropertyMap props = new TypedPropertyMap(); - + preProcess(data); - + for (RocksimComponentFileColumnParser column : fileColumns) { column.parse(data, props); } postProcess(props); } - + protected void preProcess(String[] data) { for (int i = 0; i < data.length; i++) { String d = data[i]; @@ -177,13 +173,13 @@ public abstract class RocksimComponentFileLoader { } d = d.trim(); d = stripAll(d, '"'); - + data[i] = d; } } - + protected abstract void postProcess(TypedPropertyMap props); - + /** * Rocksim CSV units are either inches or mm. A value of 0 or "in." indicate inches. A value of 1 or "mm" indicate * millimeters. @@ -196,7 +192,7 @@ public abstract class RocksimComponentFileLoader { String tmp = units.trim().toLowerCase(); return "0".equals(tmp) || tmp.startsWith("in"); } - + /** * Convert inches or millimeters to meters. * @@ -207,13 +203,13 @@ public abstract class RocksimComponentFileLoader { */ protected static double convertLength(String units, double value) { if (isInches(units)) { - return PrintUnit.INCHES.toMeters(value); + return UnitGroup.UNITS_LENGTH.getUnit("in").fromUnit(value); } else { - return PrintUnit.MILLIMETERS.toMeters(value); + return UnitGroup.UNITS_LENGTH.getUnit("mm").fromUnit(value); } } - + protected static double convertMass(String units, double value) { if ("oz".equals(units)) { Unit u = UnitGroup.UNITS_MASS.getUnit(2); @@ -221,7 +217,7 @@ public abstract class RocksimComponentFileLoader { } return value; } - + /** * Remove all occurrences of the given character. Note: this is done because some manufacturers embed double quotes * in their descriptions or material names. Those are stripped away because they cause all sorts of matching/lookup @@ -242,7 +238,7 @@ public abstract class RocksimComponentFileLoader { } return sb.toString(); } - + /** * Convert all words in a given string to Camel Case (first letter capitalized). Words are assumed to be separated * by a space. Note: this is done because some manufacturers define their material name in Camel Case but the @@ -268,7 +264,7 @@ public abstract class RocksimComponentFileLoader { return target; } } - + } //Errata: diff --git a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java index 2f9ab99d2..4b9737028 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java +++ b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java @@ -309,6 +309,25 @@ public class InnerTube extends ThicknessRingComponent implements Clusterable, Ra return copy; } - + /** + * For a given coordinate that represents one tube in a cluster, create an instance of that tube. Must be called + * once for each tube in the cluster. + * + * @param coord the coordinate of the clustered tube to create + * @param splitName the name of the individual tube + * @param theInnerTube the 'parent' from which this tube will be created. + * + * @return an instance of an inner tube that represents ONE of the clustered tubes in the cluster represented + * by theInnerTube + */ + public static InnerTube makeIndividualClusterComponent(Coordinate coord, String splitName, RocketComponent theInnerTube) { + InnerTube copy = (InnerTube) theInnerTube.copy(); + copy.setClusterConfiguration(ClusterConfiguration.SINGLE); + copy.setClusterRotation(0.0); + copy.setClusterScale(1.0); + copy.setRadialShift(coord.y, coord.z); + copy.setName(splitName); + return copy; + } } \ No newline at end of file diff --git a/core/test/net/sf/openrocket/ServicesForTesting.java b/core/test/net/sf/openrocket/ServicesForTesting.java new file mode 100644 index 000000000..2d6ec6743 --- /dev/null +++ b/core/test/net/sf/openrocket/ServicesForTesting.java @@ -0,0 +1,155 @@ +package net.sf.openrocket; + +import java.util.Collections; +import java.util.Locale; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; + +import net.sf.openrocket.formatting.RocketDescriptor; +import net.sf.openrocket.formatting.RocketDescriptorImpl; +import net.sf.openrocket.l10n.DebugTranslator; +import net.sf.openrocket.l10n.ResourceBundleTranslator; +import net.sf.openrocket.l10n.Translator; +import net.sf.openrocket.material.Material; +import net.sf.openrocket.preset.ComponentPreset; +import net.sf.openrocket.preset.ComponentPreset.Type; +import net.sf.openrocket.startup.Preferences; + +import com.google.inject.AbstractModule; +import com.google.inject.Provider; + +public class ServicesForTesting extends AbstractModule { + + @Override + protected void configure() { + bind(Preferences.class).to(PreferencesForTesting.class); + bind(Translator.class).toProvider(TranslatorProviderForTesting.class); + bind(RocketDescriptor.class).to(RocketDescriptorImpl.class); + } + + public static class TranslatorProviderForTesting implements Provider { + + private AtomicReference translator = new AtomicReference(); + + @Override + public Translator get() { + + Translator oldTranslator = translator.get(); + + if (oldTranslator != null) { + return oldTranslator; + } + + + Locale.setDefault(Locale.US); + + // Setup the translator + Translator newTranslator; + newTranslator = new ResourceBundleTranslator("l10n.messages"); + if (Locale.getDefault().getLanguage().equals("xx")) { + newTranslator = new DebugTranslator(newTranslator); + } + + if (translator.compareAndSet(null, newTranslator)) { + return newTranslator; + } else { + return translator.get(); + } + + } + + } + + public static class PreferencesForTesting extends Preferences { + + @Override + public boolean getBoolean(String key, boolean defaultValue) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void putBoolean(String key, boolean value) { + // TODO Auto-generated method stub + + } + + @Override + public int getInt(String key, int defaultValue) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void putInt(String key, int value) { + // TODO Auto-generated method stub + + } + + @Override + public double getDouble(String key, double defaultValue) { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void putDouble(String key, double value) { + // TODO Auto-generated method stub + + } + + @Override + public String getString(String key, String defaultValue) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void putString(String key, String value) { + // TODO Auto-generated method stub + + } + + @Override + public String getString(String directory, String key, String defaultValue) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void putString(String directory, String key, String value) { + // TODO Auto-generated method stub + + } + + @Override + public void addUserMaterial(Material m) { + // TODO Auto-generated method stub + + } + + @Override + public Set getUserMaterials() { + return Collections. emptySet(); + } + + @Override + public void removeUserMaterial(Material m) { + // TODO Auto-generated method stub + + } + + @Override + public void setComponentFavorite(ComponentPreset preset, Type type, boolean favorite) { + // TODO Auto-generated method stub + + } + + @Override + public Set getComponentFavorites(Type type) { + // TODO Auto-generated method stub + return null; + } + + } +} diff --git a/core/test/net/sf/openrocket/file/openrocket/OpenRocketSaverTest.java b/core/test/net/sf/openrocket/file/openrocket/OpenRocketSaverTest.java index 7d80a0cfd..96f826c08 100644 --- a/core/test/net/sf/openrocket/file/openrocket/OpenRocketSaverTest.java +++ b/core/test/net/sf/openrocket/file/openrocket/OpenRocketSaverTest.java @@ -13,7 +13,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import net.sf.openrocket.IntegrationTest; +import net.sf.openrocket.ServicesForTesting; import net.sf.openrocket.database.ComponentPresetDao; import net.sf.openrocket.database.ComponentPresetDatabase; import net.sf.openrocket.database.motor.MotorDatabase; @@ -30,7 +30,6 @@ import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.plugin.PluginModule; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.TestRockets; -import net.sf.openrocket.utils.CoreServicesModule; import org.junit.After; import org.junit.BeforeClass; @@ -50,7 +49,7 @@ public class OpenRocketSaverTest { @BeforeClass public static void setup() { - Module applicationModule = new CoreServicesModule(); + Module applicationModule = new ServicesForTesting(); Module pluginModule = new PluginModule(); Module dbOverrides = new AbstractModule() { @@ -307,7 +306,7 @@ public class OpenRocketSaverTest { private static ThrustCurveMotor readMotor() { GeneralMotorLoader loader = new GeneralMotorLoader(); - InputStream is = IntegrationTest.class.getResourceAsStream("Estes_A8.rse"); + InputStream is = OpenRocketSaverTest.class.getResourceAsStream("/net/sf/openrocket/Estes_A8.rse"); assertNotNull("Problem in unit test, cannot find Estes_A8.rse", is); try { for (Motor m : loader.load(is, "Estes_A8.rse")) { diff --git a/core/test/net/sf/openrocket/plugin/PluginTest.java b/core/test/net/sf/openrocket/plugin/PluginTest.java index bff5bf9c1..6dacbeae4 100644 --- a/core/test/net/sf/openrocket/plugin/PluginTest.java +++ b/core/test/net/sf/openrocket/plugin/PluginTest.java @@ -1,6 +1,6 @@ package net.sf.openrocket.plugin; -import net.sf.openrocket.utils.CoreServicesModule; +import net.sf.openrocket.ServicesForTesting; import org.junit.Test; @@ -20,7 +20,7 @@ public class PluginTest { @Test public void testPluginModule() { - Module applicationModule = new CoreServicesModule(); + Module applicationModule = new ServicesForTesting(); Injector injector = Guice.createInjector(applicationModule, new PluginModule()); PluginTester tester = injector.getInstance(PluginTester.class); diff --git a/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java index d1797c2c7..c954edbd6 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java @@ -4,10 +4,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.awt.Color; import java.util.Iterator; -import net.sf.openrocket.gui.util.ColorConversion; +import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.BaseTestCase.BaseTestCase; @@ -41,7 +40,7 @@ public class ComponentCompareTest extends BaseTestCase { ComponentCompare.assertDeepSimilarity(r1, r2, false); - r1.setColor(ColorConversion.fromAwtColor(Color.YELLOW)); + r1.setColor(Color.BLACK); try { ComponentCompare.assertEquality(r1, r2); fail(); diff --git a/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java index 14299440c..9febe3256 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java @@ -3,16 +3,13 @@ package net.sf.openrocket.rocketcomponent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - -import java.awt.Color; - -import net.sf.openrocket.gui.util.ColorConversion; import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material.Type; import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish; import net.sf.openrocket.rocketcomponent.FinSet.CrossSection; import net.sf.openrocket.rocketcomponent.FinSet.TabRelativePosition; import net.sf.openrocket.rocketcomponent.RocketComponent.Position; +import net.sf.openrocket.util.Color; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.LineStyle; import net.sf.openrocket.util.BaseTestCase.BaseTestCase; @@ -20,22 +17,22 @@ import net.sf.openrocket.util.BaseTestCase.BaseTestCase; import org.junit.Test; public class FinSetTest extends BaseTestCase { - + @Test public void testTrapezoidCGComputation() { - + { // This is a simple square fin with sides of 1.0. TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(1); fins.setFinShape(1.0, 1.0, 0.0, 1.0, .005); - + Coordinate coords = fins.getCG(); assertEquals(1.0, fins.getFinArea(), 0.001); assertEquals(0.5, coords.x, 0.001); assertEquals(0.5, coords.y, 0.001); } - + { // This is a trapezoid. Height 1, root 1, tip 1/2 no sweep. // It can be decomposed into a rectangle followed by a triangle @@ -46,18 +43,18 @@ public class FinSetTest extends BaseTestCase { TrapezoidFinSet fins = new TrapezoidFinSet(); fins.setFinCount(1); fins.setFinShape(1.0, 0.5, 0.0, 1.0, .005); - + Coordinate coords = fins.getCG(); assertEquals(0.75, fins.getFinArea(), 0.001); assertEquals(0.3889, coords.x, 0.001); assertEquals(0.4444, coords.y, 0.001); } - + } - + @Test public void testFreeformCGComputation() throws Exception { - + { // This is a trapezoid. Height 1, root 1, tip 1/2 no sweep. // It can be decomposed into a rectangle followed by a triangle @@ -68,10 +65,10 @@ public class FinSetTest extends BaseTestCase { FreeformFinSet fins = new FreeformFinSet(); fins.setFinCount(1); Coordinate[] points = new Coordinate[] { - new Coordinate(0,0), - new Coordinate(0,1), - new Coordinate(.5,1), - new Coordinate(1,0) + new Coordinate(0, 0), + new Coordinate(0, 1), + new Coordinate(.5, 1), + new Coordinate(1, 0) }; fins.setPoints(points); Coordinate coords = fins.getCG(); @@ -79,20 +76,20 @@ public class FinSetTest extends BaseTestCase { assertEquals(0.3889, coords.x, 0.001); assertEquals(0.4444, coords.y, 0.001); } - + { // This is the same trapezoid as previous free form, but it has // some extra points along the lines. FreeformFinSet fins = new FreeformFinSet(); fins.setFinCount(1); Coordinate[] points = new Coordinate[] { - new Coordinate(0,0), - new Coordinate(0,.5), - new Coordinate(0,1), - new Coordinate(.25,1), - new Coordinate(.5,1), - new Coordinate(.75,.5), - new Coordinate(1,0) + new Coordinate(0, 0), + new Coordinate(0, .5), + new Coordinate(0, 1), + new Coordinate(.25, 1), + new Coordinate(.5, 1), + new Coordinate(.75, .5), + new Coordinate(1, 0) }; fins.setPoints(points); Coordinate coords = fins.getCG(); @@ -100,7 +97,7 @@ public class FinSetTest extends BaseTestCase { assertEquals(0.3889, coords.x, 0.001); assertEquals(0.4444, coords.y, 0.001); } - + { // This is the same trapezoid as previous free form, but it has // some extra points which are very close to previous points. @@ -109,14 +106,14 @@ public class FinSetTest extends BaseTestCase { FreeformFinSet fins = new FreeformFinSet(); fins.setFinCount(1); Coordinate[] points = new Coordinate[] { - new Coordinate(0,0), - new Coordinate(0,1E-15), - new Coordinate(0,1), - new Coordinate(1E-15,1), - new Coordinate(.5,1), - new Coordinate(.5,1-1E-15), - new Coordinate(1,1E-15), - new Coordinate(1,0) + new Coordinate(0, 0), + new Coordinate(0, 1E-15), + new Coordinate(0, 1), + new Coordinate(1E-15, 1), + new Coordinate(.5, 1), + new Coordinate(.5, 1 - 1E-15), + new Coordinate(1, 1E-15), + new Coordinate(1, 0) }; fins.setPoints(points); Coordinate coords = fins.getCG(); @@ -124,9 +121,9 @@ public class FinSetTest extends BaseTestCase { assertEquals(0.3889, coords.x, 0.001); assertEquals(0.4444, coords.y, 0.001); } - + } - + @Test public void testFreeFormCGWithNegativeY() throws Exception { // This particular fin shape is currently not allowed in OR since the y values are negative @@ -151,38 +148,38 @@ public class FinSetTest extends BaseTestCase { FreeformFinSet fins = new FreeformFinSet(); fins.setFinCount(1); Coordinate[] points = new Coordinate[] { - new Coordinate(0,0), - new Coordinate(0,1), - new Coordinate(2,1), - new Coordinate(2,-1), - new Coordinate(1,-1), - new Coordinate(1,0) + new Coordinate(0, 0), + new Coordinate(0, 1), + new Coordinate(2, 1), + new Coordinate(2, -1), + new Coordinate(1, -1), + new Coordinate(1, 0) }; fins.setPoints(points); Coordinate coords = fins.getCG(); assertEquals(3.0, fins.getFinArea(), 0.001); - assertEquals(3.5/3.0, coords.x, 0.001); - assertEquals(0.5/3.0, coords.y, 0.001); - + assertEquals(3.5 / 3.0, coords.x, 0.001); + assertEquals(0.5 / 3.0, coords.y, 0.001); + } - - + + @Test public void testFreeformConvert() { testFreeformConvert(new TrapezoidFinSet()); testFreeformConvert(new EllipticalFinSet()); testFreeformConvert(new FreeformFinSet()); } - - + + private void testFreeformConvert(FinSet fin) { FreeformFinSet converted; Material mat = Material.newMaterial(Type.BULK, "foo", 0.1, true); - + fin.setBaseRotation(1.1); fin.setCantAngle(0.001); fin.setCGOverridden(true); - fin.setColor(ColorConversion.fromAwtColor(Color.YELLOW)); + fin.setColor(Color.BLACK); fin.setComment("cmt"); fin.setCrossSection(CrossSection.ROUNDED); fin.setFinCount(5); @@ -200,57 +197,57 @@ public class FinSetTest extends BaseTestCase { fin.setTabRelativePosition(TabRelativePosition.END); fin.setTabShift(0.015); fin.setThickness(0.005); - - + + converted = FreeformFinSet.convertFinSet((FinSet) fin.copy()); - + ComponentCompare.assertSimilarity(fin, converted, true); - + assertEquals(converted.getComponentName(), converted.getName()); - - + + // Create test rocket Rocket rocket = new Rocket(); Stage stage = new Stage(); BodyTube body = new BodyTube(); - + rocket.addChild(stage); stage.addChild(body); body.addChild(fin); - + Listener l1 = new Listener("l1"); rocket.addComponentChangeListener(l1); - + fin.setName("Custom name"); assertTrue(l1.changed); assertEquals(ComponentChangeEvent.NONFUNCTIONAL_CHANGE, l1.changetype); - - + + // Create copy RocketComponent rocketcopy = rocket.copy(); - + Listener l2 = new Listener("l2"); rocketcopy.addComponentChangeListener(l2); - + FinSet fincopy = (FinSet) rocketcopy.getChild(0).getChild(0).getChild(0); FreeformFinSet.convertFinSet(fincopy); - + assertTrue(l2.changed); assertEquals(ComponentChangeEvent.TREE_CHANGE, l2.changetype & ComponentChangeEvent.TREE_CHANGE); - + } - - + + private static class Listener implements ComponentChangeListener { private boolean changed = false; private int changetype = 0; private final String name; - + public Listener(String name) { this.name = name; } - + @Override public void componentChanged(ComponentChangeEvent e) { assertFalse("Ensuring listener " + name + " has not been called.", changed); @@ -258,5 +255,5 @@ public class FinSetTest extends BaseTestCase { changetype = e.getType(); } } - + } diff --git a/core/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java b/core/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java index db762dfab..454e133cb 100644 --- a/core/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java +++ b/core/test/net/sf/openrocket/util/BaseTestCase/BaseTestCase.java @@ -1,10 +1,10 @@ package net.sf.openrocket.util.BaseTestCase; +import net.sf.openrocket.ServicesForTesting; import net.sf.openrocket.l10n.DebugTranslator; import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.plugin.PluginModule; import net.sf.openrocket.startup.Application; -import net.sf.openrocket.utils.CoreServicesModule; import org.junit.BeforeClass; @@ -18,7 +18,7 @@ public class BaseTestCase { @BeforeClass public static void setUp() throws Exception { - Module applicationModule = new CoreServicesModule(); + Module applicationModule = new ServicesForTesting(); Module debugTranslator = new AbstractModule() { @Override diff --git a/swing/.classpath b/swing/.classpath new file mode 100644 index 000000000..d8d181fc9 --- /dev/null +++ b/swing/.classpath @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/swing/.gitignore b/swing/.gitignore new file mode 100644 index 000000000..348c102af --- /dev/null +++ b/swing/.gitignore @@ -0,0 +1,2 @@ +/build +/bin diff --git a/swing/.project b/swing/.project new file mode 100644 index 000000000..f8a30912c --- /dev/null +++ b/swing/.project @@ -0,0 +1,17 @@ + + + OpenRocket Swing + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/swing/.settings/org.eclipse.jdt.core.prefs b/swing/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..779e3273d --- /dev/null +++ b/swing/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,89 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled +org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore +org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull +org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault +org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable +org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=error +org.eclipse.jdt.core.compiler.problem.deadCode=warning +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore +org.eclipse.jdt.core.compiler.problem.fallthroughCase=error +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled +org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning +org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning +org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error +org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning diff --git a/swing/build.xml b/swing/build.xml new file mode 100644 index 000000000..380ece52e --- /dev/null +++ b/swing/build.xml @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compiling main classes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generating ORC file for vendor @{vendor} + + + + + + + + + + + + + + + + + + + + + + Building source distribution + + + + + + + + + + + + + + + + + + Testing source distribution + + + + + + + + + Source distribution test successful + + + + + + + + + + + + + Distribution ${build.version} (${build.source}) built into directory ${jar.dir} + + + + + + + + + + + Checking project for FIXMEs. + + + + + + + + + + + + + + + + CRITICAL TODOs exist in project: +${criticaltodos} + No critical TODOs in project. + + + + + + + + Checking project for non-ASCII characters. + + + + + + + + + + + + + + + + Non-ASCII characters exist in project: +${nonascii} + No non-ASCII characters in project. + + + + + + Building unit tests + + + + Running unit tests + + + + + + + + + + + + + + + + + + + + + + + Unit tests passed successfully. + + + + + + Building unit tests + + + + Running unit tests + + + + + + + + + + + + + + + + + + + + + Unit tests passed successfully. + + + + + diff --git a/core/lib/OrangeExtensions-1.2.jar b/swing/lib/OrangeExtensions-1.2.jar similarity index 100% rename from core/lib/OrangeExtensions-1.2.jar rename to swing/lib/OrangeExtensions-1.2.jar diff --git a/core/lib/iText-5.0.2.jar b/swing/lib/iText-5.0.2.jar similarity index 100% rename from core/lib/iText-5.0.2.jar rename to swing/lib/iText-5.0.2.jar diff --git a/core/lib/jcommon-1.0.18.jar b/swing/lib/jcommon-1.0.18.jar similarity index 100% rename from core/lib/jcommon-1.0.18.jar rename to swing/lib/jcommon-1.0.18.jar diff --git a/core/lib/jfreechart-1.0.15.jar b/swing/lib/jfreechart-1.0.15.jar similarity index 100% rename from core/lib/jfreechart-1.0.15.jar rename to swing/lib/jfreechart-1.0.15.jar diff --git a/core/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar similarity index 100% rename from core/lib/jogl/gluegen-rt-natives-linux-amd64.jar rename to swing/lib/jogl/gluegen-rt-natives-linux-amd64.jar diff --git a/core/lib/jogl/gluegen-rt-natives-linux-i586.jar b/swing/lib/jogl/gluegen-rt-natives-linux-i586.jar similarity index 100% rename from core/lib/jogl/gluegen-rt-natives-linux-i586.jar rename to swing/lib/jogl/gluegen-rt-natives-linux-i586.jar diff --git a/core/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar similarity index 100% rename from core/lib/jogl/gluegen-rt-natives-macosx-universal.jar rename to swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar diff --git a/core/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar similarity index 100% rename from core/lib/jogl/gluegen-rt-natives-windows-amd64.jar rename to swing/lib/jogl/gluegen-rt-natives-windows-amd64.jar diff --git a/core/lib/jogl/gluegen-rt-natives-windows-i586.jar b/swing/lib/jogl/gluegen-rt-natives-windows-i586.jar similarity index 100% rename from core/lib/jogl/gluegen-rt-natives-windows-i586.jar rename to swing/lib/jogl/gluegen-rt-natives-windows-i586.jar diff --git a/core/lib/jogl/gluegen-rt.jar b/swing/lib/jogl/gluegen-rt.jar similarity index 100% rename from core/lib/jogl/gluegen-rt.jar rename to swing/lib/jogl/gluegen-rt.jar diff --git a/core/lib/jogl/jogl-all-natives-linux-amd64.jar b/swing/lib/jogl/jogl-all-natives-linux-amd64.jar similarity index 100% rename from core/lib/jogl/jogl-all-natives-linux-amd64.jar rename to swing/lib/jogl/jogl-all-natives-linux-amd64.jar diff --git a/core/lib/jogl/jogl-all-natives-linux-i586.jar b/swing/lib/jogl/jogl-all-natives-linux-i586.jar similarity index 100% rename from core/lib/jogl/jogl-all-natives-linux-i586.jar rename to swing/lib/jogl/jogl-all-natives-linux-i586.jar diff --git a/core/lib/jogl/jogl-all-natives-macosx-universal.jar b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar similarity index 100% rename from core/lib/jogl/jogl-all-natives-macosx-universal.jar rename to swing/lib/jogl/jogl-all-natives-macosx-universal.jar diff --git a/core/lib/jogl/jogl-all-natives-windows-amd64.jar b/swing/lib/jogl/jogl-all-natives-windows-amd64.jar similarity index 100% rename from core/lib/jogl/jogl-all-natives-windows-amd64.jar rename to swing/lib/jogl/jogl-all-natives-windows-amd64.jar diff --git a/core/lib/jogl/jogl-all-natives-windows-i586.jar b/swing/lib/jogl/jogl-all-natives-windows-i586.jar similarity index 100% rename from core/lib/jogl/jogl-all-natives-windows-i586.jar rename to swing/lib/jogl/jogl-all-natives-windows-i586.jar diff --git a/core/lib/jogl/jogl-all.jar b/swing/lib/jogl/jogl-all.jar similarity index 100% rename from core/lib/jogl/jogl-all.jar rename to swing/lib/jogl/jogl-all.jar diff --git a/core/lib/logback-classic-1.0.12.jar b/swing/lib/logback-classic-1.0.12.jar similarity index 100% rename from core/lib/logback-classic-1.0.12.jar rename to swing/lib/logback-classic-1.0.12.jar diff --git a/core/lib/logback-core-1.0.12.jar b/swing/lib/logback-core-1.0.12.jar similarity index 100% rename from core/lib/logback-core-1.0.12.jar rename to swing/lib/logback-core-1.0.12.jar diff --git a/core/lib/miglayout15-swing.jar b/swing/lib/miglayout15-swing.jar similarity index 100% rename from core/lib/miglayout15-swing.jar rename to swing/lib/miglayout15-swing.jar diff --git a/core/reference/jfreechart-1.0.15-sources.jar b/swing/reference/jfreechart-1.0.15-sources.jar similarity index 100% rename from core/reference/jfreechart-1.0.15-sources.jar rename to swing/reference/jfreechart-1.0.15-sources.jar diff --git a/core/reference/jogl-all-2.0.2-sources.jar b/swing/reference/jogl-all-2.0.2-sources.jar similarity index 100% rename from core/reference/jogl-all-2.0.2-sources.jar rename to swing/reference/jogl-all-2.0.2-sources.jar diff --git a/core/resources-src/datafiles/presets/Estes.orc b/swing/resources-src/datafiles/presets/Estes.orc similarity index 100% rename from core/resources-src/datafiles/presets/Estes.orc rename to swing/resources-src/datafiles/presets/Estes.orc diff --git a/core/resources-src/datafiles/presets/LocPrecision.orc b/swing/resources-src/datafiles/presets/LocPrecision.orc similarity index 100% rename from core/resources-src/datafiles/presets/LocPrecision.orc rename to swing/resources-src/datafiles/presets/LocPrecision.orc diff --git a/core/resources-src/datafiles/presets/Quest.orc b/swing/resources-src/datafiles/presets/Quest.orc similarity index 100% rename from core/resources-src/datafiles/presets/Quest.orc rename to swing/resources-src/datafiles/presets/Quest.orc diff --git a/core/resources-src/datafiles/presets/bluetube.orc b/swing/resources-src/datafiles/presets/bluetube.orc similarity index 100% rename from core/resources-src/datafiles/presets/bluetube.orc rename to swing/resources-src/datafiles/presets/bluetube.orc diff --git a/core/resources-src/datafiles/presets/bms.orc b/swing/resources-src/datafiles/presets/bms.orc similarity index 100% rename from core/resources-src/datafiles/presets/bms.orc rename to swing/resources-src/datafiles/presets/bms.orc diff --git a/core/resources-src/datafiles/presets/fliskits.orc b/swing/resources-src/datafiles/presets/fliskits.orc similarity index 100% rename from core/resources-src/datafiles/presets/fliskits.orc rename to swing/resources-src/datafiles/presets/fliskits.orc diff --git a/core/resources-src/datafiles/presets/giantleaprocketry.orc b/swing/resources-src/datafiles/presets/giantleaprocketry.orc similarity index 100% rename from core/resources-src/datafiles/presets/giantleaprocketry.orc rename to swing/resources-src/datafiles/presets/giantleaprocketry.orc diff --git a/core/resources-src/datafiles/presets/publicmissiles.orc b/swing/resources-src/datafiles/presets/publicmissiles.orc similarity index 100% rename from core/resources-src/datafiles/presets/publicmissiles.orc rename to swing/resources-src/datafiles/presets/publicmissiles.orc diff --git a/core/resources-src/datafiles/presets/semroc.orc b/swing/resources-src/datafiles/presets/semroc.orc similarity index 100% rename from core/resources-src/datafiles/presets/semroc.orc rename to swing/resources-src/datafiles/presets/semroc.orc diff --git a/core/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/bluetube/BTDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/bluetube/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/bluetube/TCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/bluetube/readme.txt b/swing/resources-src/datafiles/rocksim_components/bluetube/readme.txt similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bluetube/readme.txt rename to swing/resources-src/datafiles/rocksim_components/bluetube/readme.txt diff --git a/core/resources-src/datafiles/rocksim_components/bms/BHdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/BHdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/BHdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/BHdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/BTdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/BTdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/BTdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/BTdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/CRdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/CRdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/CRdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/CRdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/LLdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/LLdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/LLdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/LLdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/bms/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/bms/NCdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/NCdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/NCdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/NCdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/TCdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/TCdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/TCdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/TCdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/TRdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/TRdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/TRdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/TRdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/bms/ebdata.csv b/swing/resources-src/datafiles/rocksim_components/bms/ebdata.csv similarity index 100% rename from core/resources-src/datafiles/rocksim_components/bms/ebdata.csv rename to swing/resources-src/datafiles/rocksim_components/bms/ebdata.csv diff --git a/core/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/BTDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/EBDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/LLDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/MODATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/MODATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/MODATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/MODATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/NCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/PCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/TCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/estes/TRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BHDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/BTDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/CRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/LLDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/MODATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/NCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/PCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/giantleaprocketry/TCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/BHDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/BTDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/CFDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/CRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/EBDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/FSDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/GRAPHS.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/LLDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/MODATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/NCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/PCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/SLDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/STDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/TCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/publicmissiles/TRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/BTDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/CRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/EBDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/NCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/PCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/STDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/STDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/STDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/STDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/TCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/quest/TRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/BHDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/BTDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/CRDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/EBDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/LLDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/MATERIAL.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/NCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/PCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/STDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/TCDATA.CSV diff --git a/core/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV b/swing/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV similarity index 100% rename from core/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV rename to swing/resources-src/datafiles/rocksim_components/semroc/TRDATA.CSV diff --git a/core/resources-src/datafiles/tours/convert-images.sh b/swing/resources-src/datafiles/tours/convert-images.sh similarity index 100% rename from core/resources-src/datafiles/tours/convert-images.sh rename to swing/resources-src/datafiles/tours/convert-images.sh diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/dialog-1-nosecone.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/dialog-2-bodytube.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/dialog-3-finset.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/dialog-4-innertube.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/dialog-5-centeringring.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/dialog-6-parachute.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-0-initial.png b/swing/resources-src/datafiles/tours/creating_design/main-0-initial.png similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-0-initial.png rename to swing/resources-src/datafiles/tours/creating_design/main-0-initial.png diff --git a/core/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-1-nosecone.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-2-bodytube.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-3-finset.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-4-innertube.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-5-centeringring.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-6-parachute.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz b/swing/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz rename to swing/resources-src/datafiles/tours/creating_design/main-7-rest.xcf.gz diff --git a/core/resources-src/datafiles/tours/creating_design/main-8-final.png b/swing/resources-src/datafiles/tours/creating_design/main-8-final.png similarity index 100% rename from core/resources-src/datafiles/tours/creating_design/main-8-final.png rename to swing/resources-src/datafiles/tours/creating_design/main-8-final.png diff --git a/core/resources-src/datafiles/tours/introduction/advanced_features.xcf.gz b/swing/resources-src/datafiles/tours/introduction/advanced_features.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/introduction/advanced_features.xcf.gz rename to swing/resources-src/datafiles/tours/introduction/advanced_features.xcf.gz diff --git a/core/resources-src/datafiles/tours/introduction/flight_simulations.xcf.gz b/swing/resources-src/datafiles/tours/introduction/flight_simulations.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/introduction/flight_simulations.xcf.gz rename to swing/resources-src/datafiles/tours/introduction/flight_simulations.xcf.gz diff --git a/core/resources-src/datafiles/tours/introduction/logo-MANUAL.xcf.gz b/swing/resources-src/datafiles/tours/introduction/logo-MANUAL.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/introduction/logo-MANUAL.xcf.gz rename to swing/resources-src/datafiles/tours/introduction/logo-MANUAL.xcf.gz diff --git a/core/resources-src/datafiles/tours/introduction/main_window.png b/swing/resources-src/datafiles/tours/introduction/main_window.png similarity index 100% rename from core/resources-src/datafiles/tours/introduction/main_window.png rename to swing/resources-src/datafiles/tours/introduction/main_window.png diff --git a/core/resources-src/datafiles/tours/introduction/main_window_bottom.xcf.gz b/swing/resources-src/datafiles/tours/introduction/main_window_bottom.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/introduction/main_window_bottom.xcf.gz rename to swing/resources-src/datafiles/tours/introduction/main_window_bottom.xcf.gz diff --git a/core/resources-src/datafiles/tours/introduction/main_window_top.xcf.gz b/swing/resources-src/datafiles/tours/introduction/main_window_top.xcf.gz similarity index 100% rename from core/resources-src/datafiles/tours/introduction/main_window_top.xcf.gz rename to swing/resources-src/datafiles/tours/introduction/main_window_top.xcf.gz diff --git a/core/resources/datafiles/examples/A simple model rocket.ork b/swing/resources/datafiles/examples/A simple model rocket.ork similarity index 100% rename from core/resources/datafiles/examples/A simple model rocket.ork rename to swing/resources/datafiles/examples/A simple model rocket.ork diff --git a/core/resources/datafiles/examples/Apocalypse with decals.ork b/swing/resources/datafiles/examples/Apocalypse with decals.ork similarity index 100% rename from core/resources/datafiles/examples/Apocalypse with decals.ork rename to swing/resources/datafiles/examples/Apocalypse with decals.ork diff --git a/core/resources/datafiles/examples/Boosted Dart.ork b/swing/resources/datafiles/examples/Boosted Dart.ork similarity index 100% rename from core/resources/datafiles/examples/Boosted Dart.ork rename to swing/resources/datafiles/examples/Boosted Dart.ork diff --git a/core/resources/datafiles/examples/Clustered rocket design.ork b/swing/resources/datafiles/examples/Clustered rocket design.ork similarity index 100% rename from core/resources/datafiles/examples/Clustered rocket design.ork rename to swing/resources/datafiles/examples/Clustered rocket design.ork diff --git a/core/resources/datafiles/examples/High Power Airstart.ork b/swing/resources/datafiles/examples/High Power Airstart.ork similarity index 100% rename from core/resources/datafiles/examples/High Power Airstart.ork rename to swing/resources/datafiles/examples/High Power Airstart.ork diff --git a/core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork b/swing/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork similarity index 100% rename from core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork rename to swing/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork diff --git a/core/resources/datafiles/examples/Preset Usage.ork b/swing/resources/datafiles/examples/Preset Usage.ork similarity index 100% rename from core/resources/datafiles/examples/Preset Usage.ork rename to swing/resources/datafiles/examples/Preset Usage.ork diff --git a/core/resources/datafiles/examples/Roll-stabilized rocket.ork b/swing/resources/datafiles/examples/Roll-stabilized rocket.ork similarity index 100% rename from core/resources/datafiles/examples/Roll-stabilized rocket.ork rename to swing/resources/datafiles/examples/Roll-stabilized rocket.ork diff --git a/core/resources/datafiles/examples/Simulation listeners.ork b/swing/resources/datafiles/examples/Simulation listeners.ork similarity index 100% rename from core/resources/datafiles/examples/Simulation listeners.ork rename to swing/resources/datafiles/examples/Simulation listeners.ork diff --git a/core/resources/datafiles/examples/TARC Payloader.ork b/swing/resources/datafiles/examples/TARC Payloader.ork similarity index 100% rename from core/resources/datafiles/examples/TARC Payloader.ork rename to swing/resources/datafiles/examples/TARC Payloader.ork diff --git a/core/resources/datafiles/examples/Three-stage rocket.ork b/swing/resources/datafiles/examples/Three-stage rocket.ork similarity index 100% rename from core/resources/datafiles/examples/Three-stage rocket.ork rename to swing/resources/datafiles/examples/Three-stage rocket.ork diff --git a/core/resources/datafiles/presets/system.ser b/swing/resources/datafiles/presets/system.ser similarity index 97% rename from core/resources/datafiles/presets/system.ser rename to swing/resources/datafiles/presets/system.ser index d1da35045b1d7cae123d0d3c68f3e98862a39a3d..bd1b8da4eb962a74a223a157d34c51e832e33aa0 100644 GIT binary patch delta 2274 zcmZ`)YfM~46wcn63uOzexIB`jbfIi1RHaKJu5F?r)flv^EwolbO|3svV$?1gHHsK* zf7DlN%}qK#Oa)B{p+b4uvyv@aY=M^7Qr@pht*J>xY#WV*LdA1md*_n)=Vre1ojK<_ zXU@zG^(KXSlNyfHN>TAPskE*|O7*Uij@0%wuRmo=w8Tld=R=k_X4^@flB=Ty4HF&1 z_&wDre-CvHA=y@jZ`v~rINmSbS!-dX-_{I*@tiAGBPCd{*au#;4m7h2b$5a_Yx+MvIj@;D-NLsHggNf zg&{v0nubx1lt1N^sz&79Dbr5YIYaHNd=IrtUymL|+s3g=_+65}EGUXjX>Pm`4HXju zmbgQ{N$^ctR&|oAA4#mBPDp@bmBMO4hhF&oJ7LIT!00Mrf`boM3nLsXsxdjg|GhA* zuz-=BT+m>>$?um&6C^FBpc_t`;C8<-%BA$RYB^-}UXTL9G{?5Jnc(%aCg<3|XrZma8O_$pi$0WCQ2?$$7Np{zNhjKS0|~6)LB7vy;4RK!(r*RTs%7%_a+9 z?jhS%h$6jgZy#~9duB-v%bOy0hzXHK^^A~x)9{0XLnMQPw@36k3J=s=Cs~?J?#SI)QlREQ zDQ}sb?Qr9!-Y;am@abPhq%-zIrHQ-)#cmGG?T@o5-Y1)CJxrH zfSMl-pyr?FvDf<-Nv)w&86nQuxg;MfIJQi7aWei$!tsk0=wqC%*nuqx zCx=Q(Q#iIF&BR7WQf)}EyIJgLmzWNpMbUNY4y-7Xz3!kc7PL|~t85i)EHF>ju@_P> z?}2El)uGg@_+`h?2=K*H2bWU5BWjcrHjJXwrUZC8P7fg88^s0k?KD;0i-I&8B=98w z7QM#^4_NQB24u)S49jci8qS7AdzgEzEX_%i3<8jNPK8RTbA@l9xx zLID<2VnDgJhv3~Fk$bY_PTFChPt@*bSTj5`AZi0@*!l-`n^H7tiH98{`d;0Jzm_p^ fH>YaLq^?SK0epotk;)GFQIb;Ht+0DWT#Wb+z;utp delta 2270 zcmZ`)YfM~46wcn6%eGr!)h&=Lr3+@6N-C)Cl~Vnyq!U$b4I9te6D?LL=R(9{W%fPPCAr%h(J{ zDi!tCpyQDjk@oeWk$vzMF0B!n4@TtddB@RE(cgfE1D7#@lr=DdUvUsMu<4sfE(`|I zP(Ornq@9y4seD-8oigQO9n;joO7>HS^ySD&v~3=}jNc{s%fh1Ql4i&1&`>(wZ?PT= zOh915vZ{m3g_~JkwU7X(%7it74*l@^x5A*sfU)JmI0ql75QaHeP-$|0?>k{gVF4q% zxS-)0li$yECP*4hK{uTS6f(G(rw1fm!l0hBN`#ssI+FJY3B{xW(Fd#$dhOs8Hk+XfaK-?@oL}DPn znXFd{%P+*kWCFrrvWav4=mOeuek2~l574$ph01B&=pZi{kRkLz`6aSNv&q7jyU8vU zqDVhG&`Z4Rt{IZeawmxc;v%F@JtJh_F#O=?Aj#n1tzo?mIWPP7H{xKQH)1jOk77Lg zBzX*`$Fxw&AaO2b<5=&t2|ZpOs*-#a39R(C#SVp6NS3Bn9>20_a!`SQZ8@S6xbm~3 zzha)bFzP-W!rVQZamvqRkTtOP8j+$$o&c!qIU}B|!UvVtNv39#J91}+&}roq|$JPQ_Ey8C*zMK9KU#hKFZk&o!F9SawwxT zg=0(8Ol+)`YD0qE&15G##dP>&HQk`@z=}NVH79kmu#I|IS(9LAp?R`_J)eSk564oi z4y9hjFDs75Kp>tvxs>u9QKNii$0$l|N`R;C)&t1*Msb0i4w|a&MM0Vk68I7Ti{5X9 z2dwuQ12SYEg5`B|9cRO$eayRFmgb^K1_4Mst3svJ*?c^*NFq&Uwsg9MtM^I+&RR)2 zO@j$H{ggWotgV2HH|x=%@)88@rH`wuQXoP%h*?y739xH^c-N~zK=?Z6T=D{H35wJS z2XnNRz=uAnO_*`}qJF2h(U{{qwo}-#U3?{=ztwoX(&$>&T|`#1u+%2rXY>VfJH(fbP=Li0 z8Bnh6L3pQItheInnerTube - */ - public static InnerTube makeIndividualClusterComponent(Coordinate coord, String splitName, RocketComponent theInnerTube) { - InnerTube copy = (InnerTube) theInnerTube.copy(); - copy.setClusterConfiguration(ClusterConfiguration.SINGLE); - copy.setClusterRotation(0.0); - copy.setClusterScale(1.0); - copy.setRadialShift(coord.y, coord.z); - copy.setName(splitName); - return copy; - } + } diff --git a/core/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/MotorConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/RecoveryDeviceConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/RocketConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/RocketConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/RocketConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/StageConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StageConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/StageConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/StageConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java diff --git a/core/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java similarity index 100% rename from core/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java rename to swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java rename to swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java rename to swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java b/swing/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java rename to swing/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java b/swing/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java rename to swing/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/OperatorTableModel.java b/swing/src/net/sf/openrocket/gui/customexpression/OperatorTableModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/OperatorTableModel.java rename to swing/src/net/sf/openrocket/gui/customexpression/OperatorTableModel.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java b/swing/src/net/sf/openrocket/gui/customexpression/VariableSelector.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java rename to swing/src/net/sf/openrocket/gui/customexpression/VariableSelector.java diff --git a/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java b/swing/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java rename to swing/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/DetailDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/DetailDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/DetailDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/DetailDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/PrintDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/PrintDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/PrintDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/PrintDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/WarningDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/WarningDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/DeploymentSelectionDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/FlightConfigurationDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/FlightConfigurationDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/FlightConfigurationDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/FlightConfigurationDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/IgnitionSelectionDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationPanel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationTableModel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationTableModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationTableModel.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorConfigurationTableModel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountTableModel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountTableModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountTableModel.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/MotorMountTableModel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RecoveryConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RecoveryConfigurationPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RecoveryConfigurationPanel.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RecoveryConfigurationPanel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/RenameConfigDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationConfigurationPanel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/flightconfiguration/SeparationSelectionDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/CloseableDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/MotorChooserDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/MotorSelector.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorClass.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorClass.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorClass.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorClass.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorHolder.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorColumns.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorComparator.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorDatabaseModel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorPlotDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java rename to swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java rename to swing/src/net/sf/openrocket/gui/dialogs/optimization/FunctionEvaluationData.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java rename to swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationStepData.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java rename to swing/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java b/swing/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java rename to swing/src/net/sf/openrocket/gui/dialogs/optimization/SimulationModifierTree.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java rename to swing/src/net/sf/openrocket/gui/dialogs/preferences/MaterialEditPanel.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java rename to swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetRowFilter.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetRowFilter.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetRowFilter.java rename to swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetRowFilter.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java rename to swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java rename to swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/XTableColumnModel.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/XTableColumnModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/dialogs/preset/XTableColumnModel.java rename to swing/src/net/sf/openrocket/gui/dialogs/preset/XTableColumnModel.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/FigureRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java rename to swing/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/UnfinishedRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/UnfinishedRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/UnfinishedRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/UnfinishedRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/geometry/ComponentRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/geometry/DisplayListComponentRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/geometry/FinRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java rename to swing/src/net/sf/openrocket/gui/figure3d/geometry/Geometry.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/geometry/MassObjectRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java b/swing/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java rename to swing/src/net/sf/openrocket/gui/figure3d/geometry/TransitionRenderer.java diff --git a/core/src/net/sf/openrocket/gui/figureelements/CGCaret.java b/swing/src/net/sf/openrocket/gui/figureelements/CGCaret.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figureelements/CGCaret.java rename to swing/src/net/sf/openrocket/gui/figureelements/CGCaret.java diff --git a/core/src/net/sf/openrocket/gui/figureelements/CPCaret.java b/swing/src/net/sf/openrocket/gui/figureelements/CPCaret.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figureelements/CPCaret.java rename to swing/src/net/sf/openrocket/gui/figureelements/CPCaret.java diff --git a/core/src/net/sf/openrocket/gui/figureelements/Caret.java b/swing/src/net/sf/openrocket/gui/figureelements/Caret.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figureelements/Caret.java rename to swing/src/net/sf/openrocket/gui/figureelements/Caret.java diff --git a/core/src/net/sf/openrocket/gui/figureelements/FigureElement.java b/swing/src/net/sf/openrocket/gui/figureelements/FigureElement.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figureelements/FigureElement.java rename to swing/src/net/sf/openrocket/gui/figureelements/FigureElement.java diff --git a/core/src/net/sf/openrocket/gui/figureelements/RocketInfo.java b/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java similarity index 100% rename from core/src/net/sf/openrocket/gui/figureelements/RocketInfo.java rename to swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java b/swing/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java rename to swing/src/net/sf/openrocket/gui/help/tours/GuidedTourSelectionDialog.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/Slide.java b/swing/src/net/sf/openrocket/gui/help/tours/Slide.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/Slide.java rename to swing/src/net/sf/openrocket/gui/help/tours/Slide.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideSet.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideSet.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/SlideSet.java rename to swing/src/net/sf/openrocket/gui/help/tours/SlideSet.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java rename to swing/src/net/sf/openrocket/gui/help/tours/SlideSetLoader.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java rename to swing/src/net/sf/openrocket/gui/help/tours/SlideSetManager.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java rename to swing/src/net/sf/openrocket/gui/help/tours/SlideShowComponent.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java rename to swing/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java b/swing/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java rename to swing/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java diff --git a/core/src/net/sf/openrocket/gui/help/tours/TextLineReader.java b/swing/src/net/sf/openrocket/gui/help/tours/TextLineReader.java similarity index 100% rename from core/src/net/sf/openrocket/gui/help/tours/TextLineReader.java rename to swing/src/net/sf/openrocket/gui/help/tours/TextLineReader.java diff --git a/core/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/BasicFrame.java rename to swing/src/net/sf/openrocket/gui/main/BasicFrame.java diff --git a/core/src/net/sf/openrocket/gui/main/ClipboardListener.java b/swing/src/net/sf/openrocket/gui/main/ClipboardListener.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/ClipboardListener.java rename to swing/src/net/sf/openrocket/gui/main/ClipboardListener.java diff --git a/core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java b/swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java rename to swing/src/net/sf/openrocket/gui/main/ComponentAddButtons.java diff --git a/core/src/net/sf/openrocket/gui/main/ComponentIcons.java b/swing/src/net/sf/openrocket/gui/main/ComponentIcons.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/ComponentIcons.java rename to swing/src/net/sf/openrocket/gui/main/ComponentIcons.java diff --git a/core/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java b/swing/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java rename to swing/src/net/sf/openrocket/gui/main/DocumentSelectionListener.java diff --git a/core/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java b/swing/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java rename to swing/src/net/sf/openrocket/gui/main/DocumentSelectionModel.java diff --git a/core/src/net/sf/openrocket/gui/main/ExampleDesignFile.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/ExampleDesignFile.java rename to swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java diff --git a/core/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java rename to swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java diff --git a/core/src/net/sf/openrocket/gui/main/MRUDesignFile.java b/swing/src/net/sf/openrocket/gui/main/MRUDesignFile.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/MRUDesignFile.java rename to swing/src/net/sf/openrocket/gui/main/MRUDesignFile.java diff --git a/core/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java rename to swing/src/net/sf/openrocket/gui/main/MRUDesignFileAction.java diff --git a/core/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java b/swing/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java rename to swing/src/net/sf/openrocket/gui/main/OpenRocketClipboard.java diff --git a/core/src/net/sf/openrocket/gui/main/RocketActions.java b/swing/src/net/sf/openrocket/gui/main/RocketActions.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/RocketActions.java rename to swing/src/net/sf/openrocket/gui/main/RocketActions.java diff --git a/core/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/SimulationPanel.java rename to swing/src/net/sf/openrocket/gui/main/SimulationPanel.java diff --git a/core/src/net/sf/openrocket/gui/main/Splash.java b/swing/src/net/sf/openrocket/gui/main/Splash.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/Splash.java rename to swing/src/net/sf/openrocket/gui/main/Splash.java diff --git a/core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java b/swing/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java rename to swing/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java diff --git a/core/src/net/sf/openrocket/gui/main/UndoRedoAction.java b/swing/src/net/sf/openrocket/gui/main/UndoRedoAction.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/UndoRedoAction.java rename to swing/src/net/sf/openrocket/gui/main/UndoRedoAction.java diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java rename to swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTree.java diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java rename to swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeModel.java diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java rename to swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java rename to swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java b/swing/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java similarity index 100% rename from core/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java rename to swing/src/net/sf/openrocket/gui/main/componenttree/RocketComponentTransferable.java diff --git a/core/src/net/sf/openrocket/gui/plot/Axis.java b/swing/src/net/sf/openrocket/gui/plot/Axis.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/Axis.java rename to swing/src/net/sf/openrocket/gui/plot/Axis.java diff --git a/core/src/net/sf/openrocket/gui/plot/EventGraphics.java b/swing/src/net/sf/openrocket/gui/plot/EventGraphics.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/EventGraphics.java rename to swing/src/net/sf/openrocket/gui/plot/EventGraphics.java diff --git a/core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java b/swing/src/net/sf/openrocket/gui/plot/PlotConfiguration.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/PlotConfiguration.java rename to swing/src/net/sf/openrocket/gui/plot/PlotConfiguration.java diff --git a/core/src/net/sf/openrocket/gui/plot/SimulationChart.java b/swing/src/net/sf/openrocket/gui/plot/SimulationChart.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/SimulationChart.java rename to swing/src/net/sf/openrocket/gui/plot/SimulationChart.java diff --git a/core/src/net/sf/openrocket/gui/plot/SimulationPlot.java b/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/SimulationPlot.java rename to swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java diff --git a/core/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java b/swing/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java rename to swing/src/net/sf/openrocket/gui/plot/SimulationPlotDialog.java diff --git a/core/src/net/sf/openrocket/gui/plot/Util.java b/swing/src/net/sf/openrocket/gui/plot/Util.java similarity index 100% rename from core/src/net/sf/openrocket/gui/plot/Util.java rename to swing/src/net/sf/openrocket/gui/plot/Util.java diff --git a/core/src/net/sf/openrocket/gui/preset/ButtonColumn.java b/swing/src/net/sf/openrocket/gui/preset/ButtonColumn.java similarity index 100% rename from core/src/net/sf/openrocket/gui/preset/ButtonColumn.java rename to swing/src/net/sf/openrocket/gui/preset/ButtonColumn.java diff --git a/core/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java b/swing/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java similarity index 100% rename from core/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java rename to swing/src/net/sf/openrocket/gui/preset/DeselectableComboBox.java diff --git a/core/src/net/sf/openrocket/gui/preset/ImagePreviewPanel.java b/swing/src/net/sf/openrocket/gui/preset/ImagePreviewPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/preset/ImagePreviewPanel.java rename to swing/src/net/sf/openrocket/gui/preset/ImagePreviewPanel.java diff --git a/core/src/net/sf/openrocket/gui/preset/MaterialModel.java b/swing/src/net/sf/openrocket/gui/preset/MaterialModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/preset/MaterialModel.java rename to swing/src/net/sf/openrocket/gui/preset/MaterialModel.java diff --git a/core/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java b/swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java rename to swing/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java diff --git a/core/src/net/sf/openrocket/gui/preset/PresetResultListener.java b/swing/src/net/sf/openrocket/gui/preset/PresetResultListener.java similarity index 100% rename from core/src/net/sf/openrocket/gui/preset/PresetResultListener.java rename to swing/src/net/sf/openrocket/gui/preset/PresetResultListener.java diff --git a/core/src/net/sf/openrocket/gui/print/AbstractPrintable.java b/swing/src/net/sf/openrocket/gui/print/AbstractPrintable.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/AbstractPrintable.java rename to swing/src/net/sf/openrocket/gui/print/AbstractPrintable.java diff --git a/core/src/net/sf/openrocket/gui/print/DesignReport.java b/swing/src/net/sf/openrocket/gui/print/DesignReport.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/DesignReport.java rename to swing/src/net/sf/openrocket/gui/print/DesignReport.java diff --git a/core/src/net/sf/openrocket/gui/print/FinMarkingGuide.java b/swing/src/net/sf/openrocket/gui/print/FinMarkingGuide.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/FinMarkingGuide.java rename to swing/src/net/sf/openrocket/gui/print/FinMarkingGuide.java diff --git a/core/src/net/sf/openrocket/gui/print/ITextHelper.java b/swing/src/net/sf/openrocket/gui/print/ITextHelper.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/ITextHelper.java rename to swing/src/net/sf/openrocket/gui/print/ITextHelper.java diff --git a/core/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java b/swing/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java rename to swing/src/net/sf/openrocket/gui/print/OpenRocketPrintable.java diff --git a/core/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java b/swing/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java rename to swing/src/net/sf/openrocket/gui/print/PDFPrintStreamDoc.java diff --git a/core/src/net/sf/openrocket/gui/print/PaperOrientation.java b/swing/src/net/sf/openrocket/gui/print/PaperOrientation.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PaperOrientation.java rename to swing/src/net/sf/openrocket/gui/print/PaperOrientation.java diff --git a/core/src/net/sf/openrocket/gui/print/PaperSize.java b/swing/src/net/sf/openrocket/gui/print/PaperSize.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PaperSize.java rename to swing/src/net/sf/openrocket/gui/print/PaperSize.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintController.java b/swing/src/net/sf/openrocket/gui/print/PrintController.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintController.java rename to swing/src/net/sf/openrocket/gui/print/PrintController.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintFigure.java b/swing/src/net/sf/openrocket/gui/print/PrintFigure.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintFigure.java rename to swing/src/net/sf/openrocket/gui/print/PrintFigure.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintSettings.java b/swing/src/net/sf/openrocket/gui/print/PrintSettings.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintSettings.java rename to swing/src/net/sf/openrocket/gui/print/PrintSettings.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java b/swing/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java rename to swing/src/net/sf/openrocket/gui/print/PrintSimulationWorker.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintUnit.java b/swing/src/net/sf/openrocket/gui/print/PrintUnit.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintUnit.java rename to swing/src/net/sf/openrocket/gui/print/PrintUnit.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintUtilities.java b/swing/src/net/sf/openrocket/gui/print/PrintUtilities.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintUtilities.java rename to swing/src/net/sf/openrocket/gui/print/PrintUtilities.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintableCenteringRing.java b/swing/src/net/sf/openrocket/gui/print/PrintableCenteringRing.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintableCenteringRing.java rename to swing/src/net/sf/openrocket/gui/print/PrintableCenteringRing.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintableComponent.java b/swing/src/net/sf/openrocket/gui/print/PrintableComponent.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintableComponent.java rename to swing/src/net/sf/openrocket/gui/print/PrintableComponent.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintableContext.java b/swing/src/net/sf/openrocket/gui/print/PrintableContext.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintableContext.java rename to swing/src/net/sf/openrocket/gui/print/PrintableContext.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintableFinSet.java b/swing/src/net/sf/openrocket/gui/print/PrintableFinSet.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintableFinSet.java rename to swing/src/net/sf/openrocket/gui/print/PrintableFinSet.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintableNoseCone.java b/swing/src/net/sf/openrocket/gui/print/PrintableNoseCone.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintableNoseCone.java rename to swing/src/net/sf/openrocket/gui/print/PrintableNoseCone.java diff --git a/core/src/net/sf/openrocket/gui/print/PrintableTransition.java b/swing/src/net/sf/openrocket/gui/print/PrintableTransition.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/PrintableTransition.java rename to swing/src/net/sf/openrocket/gui/print/PrintableTransition.java diff --git a/core/src/net/sf/openrocket/gui/print/TemplateProperties.java b/swing/src/net/sf/openrocket/gui/print/TemplateProperties.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/TemplateProperties.java rename to swing/src/net/sf/openrocket/gui/print/TemplateProperties.java diff --git a/core/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java b/swing/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java rename to swing/src/net/sf/openrocket/gui/print/components/CheckBoxNode.java diff --git a/core/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java rename to swing/src/net/sf/openrocket/gui/print/components/CheckTreeCellRenderer.java diff --git a/core/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java rename to swing/src/net/sf/openrocket/gui/print/components/CheckTreeManager.java diff --git a/core/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java b/swing/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java rename to swing/src/net/sf/openrocket/gui/print/components/CheckTreeSelectionModel.java diff --git a/core/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java b/swing/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java rename to swing/src/net/sf/openrocket/gui/print/components/RocketPrintTree.java diff --git a/core/src/net/sf/openrocket/gui/print/components/Rule.java b/swing/src/net/sf/openrocket/gui/print/components/Rule.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/components/Rule.java rename to swing/src/net/sf/openrocket/gui/print/components/Rule.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/AbstractPrintStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/AbstractPrintStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/AbstractPrintStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/AbstractPrintStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/Dimension.java b/swing/src/net/sf/openrocket/gui/print/visitor/Dimension.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/Dimension.java rename to swing/src/net/sf/openrocket/gui/print/visitor/Dimension.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/PartsListVisitorStrategy.java diff --git a/core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java b/swing/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java similarity index 100% rename from core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java rename to swing/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/BodyTubeShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/FinSetShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/LaunchLugShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/MassObjectShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/RingComponentShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/RocketComponentShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/SymmetricComponentShapes.java diff --git a/core/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java b/swing/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java similarity index 100% rename from core/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java rename to swing/src/net/sf/openrocket/gui/rocketfigure/TransitionShapes.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java rename to swing/src/net/sf/openrocket/gui/scalefigure/AbstractScaleFigure.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java rename to swing/src/net/sf/openrocket/gui/scalefigure/FinPointFigure.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java rename to swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java rename to swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java rename to swing/src/net/sf/openrocket/gui/scalefigure/ScaleFigure.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java b/swing/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java rename to swing/src/net/sf/openrocket/gui/scalefigure/ScaleScrollPane.java diff --git a/core/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java b/swing/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java similarity index 100% rename from core/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java rename to swing/src/net/sf/openrocket/gui/scalefigure/ScaleSelector.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationEditDialog.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationExportPanel.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationRunDialog.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationWarningDialog.java diff --git a/core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationWorker.java similarity index 100% rename from core/src/net/sf/openrocket/gui/simulation/SimulationWorker.java rename to swing/src/net/sf/openrocket/gui/simulation/SimulationWorker.java diff --git a/core/src/net/sf/openrocket/gui/util/ColorConversion.java b/swing/src/net/sf/openrocket/gui/util/ColorConversion.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/ColorConversion.java rename to swing/src/net/sf/openrocket/gui/util/ColorConversion.java diff --git a/core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java b/swing/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java rename to swing/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitor.java diff --git a/core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java b/swing/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java rename to swing/src/net/sf/openrocket/gui/util/ConcurrentProgressMonitorInputStream.java diff --git a/core/src/net/sf/openrocket/gui/util/CustomFinImporter.java b/swing/src/net/sf/openrocket/gui/util/CustomFinImporter.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/CustomFinImporter.java rename to swing/src/net/sf/openrocket/gui/util/CustomFinImporter.java diff --git a/core/src/net/sf/openrocket/gui/util/EditDecalHelper.java b/swing/src/net/sf/openrocket/gui/util/EditDecalHelper.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/EditDecalHelper.java rename to swing/src/net/sf/openrocket/gui/util/EditDecalHelper.java diff --git a/core/src/net/sf/openrocket/gui/util/FileHelper.java b/swing/src/net/sf/openrocket/gui/util/FileHelper.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/FileHelper.java rename to swing/src/net/sf/openrocket/gui/util/FileHelper.java diff --git a/core/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/GUIUtil.java rename to swing/src/net/sf/openrocket/gui/util/GUIUtil.java diff --git a/core/src/net/sf/openrocket/gui/util/Icons.java b/swing/src/net/sf/openrocket/gui/util/Icons.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/Icons.java rename to swing/src/net/sf/openrocket/gui/util/Icons.java diff --git a/core/src/net/sf/openrocket/gui/util/OpenFileWorker.java b/swing/src/net/sf/openrocket/gui/util/OpenFileWorker.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/OpenFileWorker.java rename to swing/src/net/sf/openrocket/gui/util/OpenFileWorker.java diff --git a/core/src/net/sf/openrocket/gui/util/ProgressOutputStream.java b/swing/src/net/sf/openrocket/gui/util/ProgressOutputStream.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/ProgressOutputStream.java rename to swing/src/net/sf/openrocket/gui/util/ProgressOutputStream.java diff --git a/core/src/net/sf/openrocket/gui/util/SaveCSVWorker.java b/swing/src/net/sf/openrocket/gui/util/SaveCSVWorker.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/SaveCSVWorker.java rename to swing/src/net/sf/openrocket/gui/util/SaveCSVWorker.java diff --git a/core/src/net/sf/openrocket/gui/util/SaveFileWorker.java b/swing/src/net/sf/openrocket/gui/util/SaveFileWorker.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/SaveFileWorker.java rename to swing/src/net/sf/openrocket/gui/util/SaveFileWorker.java diff --git a/core/src/net/sf/openrocket/gui/util/SwingPreferences.java b/swing/src/net/sf/openrocket/gui/util/SwingPreferences.java similarity index 100% rename from core/src/net/sf/openrocket/gui/util/SwingPreferences.java rename to swing/src/net/sf/openrocket/gui/util/SwingPreferences.java diff --git a/core/src/net/sf/openrocket/gui/watcher/FileWatcher.java b/swing/src/net/sf/openrocket/gui/watcher/FileWatcher.java similarity index 100% rename from core/src/net/sf/openrocket/gui/watcher/FileWatcher.java rename to swing/src/net/sf/openrocket/gui/watcher/FileWatcher.java diff --git a/core/src/net/sf/openrocket/gui/watcher/WatchEvent.java b/swing/src/net/sf/openrocket/gui/watcher/WatchEvent.java similarity index 100% rename from core/src/net/sf/openrocket/gui/watcher/WatchEvent.java rename to swing/src/net/sf/openrocket/gui/watcher/WatchEvent.java diff --git a/core/src/net/sf/openrocket/gui/watcher/WatchKey.java b/swing/src/net/sf/openrocket/gui/watcher/WatchKey.java similarity index 100% rename from core/src/net/sf/openrocket/gui/watcher/WatchKey.java rename to swing/src/net/sf/openrocket/gui/watcher/WatchKey.java diff --git a/core/src/net/sf/openrocket/gui/watcher/WatchService.java b/swing/src/net/sf/openrocket/gui/watcher/WatchService.java similarity index 100% rename from core/src/net/sf/openrocket/gui/watcher/WatchService.java rename to swing/src/net/sf/openrocket/gui/watcher/WatchService.java diff --git a/core/src/net/sf/openrocket/gui/watcher/WatchServiceImpl.java b/swing/src/net/sf/openrocket/gui/watcher/WatchServiceImpl.java similarity index 100% rename from core/src/net/sf/openrocket/gui/watcher/WatchServiceImpl.java rename to swing/src/net/sf/openrocket/gui/watcher/WatchServiceImpl.java diff --git a/core/src/net/sf/openrocket/gui/watcher/Watchable.java b/swing/src/net/sf/openrocket/gui/watcher/Watchable.java similarity index 100% rename from core/src/net/sf/openrocket/gui/watcher/Watchable.java rename to swing/src/net/sf/openrocket/gui/watcher/Watchable.java diff --git a/core/src/net/sf/openrocket/logging/BufferLogger.java b/swing/src/net/sf/openrocket/logging/BufferLogger.java similarity index 100% rename from core/src/net/sf/openrocket/logging/BufferLogger.java rename to swing/src/net/sf/openrocket/logging/BufferLogger.java diff --git a/core/src/net/sf/openrocket/logging/CyclicBuffer.java b/swing/src/net/sf/openrocket/logging/CyclicBuffer.java similarity index 100% rename from core/src/net/sf/openrocket/logging/CyclicBuffer.java rename to swing/src/net/sf/openrocket/logging/CyclicBuffer.java diff --git a/core/src/net/sf/openrocket/logging/DelegatorLogger.java b/swing/src/net/sf/openrocket/logging/DelegatorLogger.java similarity index 100% rename from core/src/net/sf/openrocket/logging/DelegatorLogger.java rename to swing/src/net/sf/openrocket/logging/DelegatorLogger.java diff --git a/core/src/net/sf/openrocket/logging/LogHelper.java b/swing/src/net/sf/openrocket/logging/LogHelper.java similarity index 100% rename from core/src/net/sf/openrocket/logging/LogHelper.java rename to swing/src/net/sf/openrocket/logging/LogHelper.java diff --git a/core/src/net/sf/openrocket/logging/LogLevel.java b/swing/src/net/sf/openrocket/logging/LogLevel.java similarity index 100% rename from core/src/net/sf/openrocket/logging/LogLevel.java rename to swing/src/net/sf/openrocket/logging/LogLevel.java diff --git a/core/src/net/sf/openrocket/logging/LogLevelBufferLogger.java b/swing/src/net/sf/openrocket/logging/LogLevelBufferLogger.java similarity index 100% rename from core/src/net/sf/openrocket/logging/LogLevelBufferLogger.java rename to swing/src/net/sf/openrocket/logging/LogLevelBufferLogger.java diff --git a/core/src/net/sf/openrocket/logging/LogLine.java b/swing/src/net/sf/openrocket/logging/LogLine.java similarity index 100% rename from core/src/net/sf/openrocket/logging/LogLine.java rename to swing/src/net/sf/openrocket/logging/LogLine.java diff --git a/core/src/net/sf/openrocket/logging/LogbackBufferLoggerAdaptor.java b/swing/src/net/sf/openrocket/logging/LogbackBufferLoggerAdaptor.java similarity index 100% rename from core/src/net/sf/openrocket/logging/LogbackBufferLoggerAdaptor.java rename to swing/src/net/sf/openrocket/logging/LogbackBufferLoggerAdaptor.java diff --git a/core/src/net/sf/openrocket/logging/LoggingSystemSetup.java b/swing/src/net/sf/openrocket/logging/LoggingSystemSetup.java similarity index 100% rename from core/src/net/sf/openrocket/logging/LoggingSystemSetup.java rename to swing/src/net/sf/openrocket/logging/LoggingSystemSetup.java diff --git a/core/src/net/sf/openrocket/logging/PrintStreamLogger.java b/swing/src/net/sf/openrocket/logging/PrintStreamLogger.java similarity index 100% rename from core/src/net/sf/openrocket/logging/PrintStreamLogger.java rename to swing/src/net/sf/openrocket/logging/PrintStreamLogger.java diff --git a/core/src/net/sf/openrocket/logging/PrintStreamToSLF4J.java b/swing/src/net/sf/openrocket/logging/PrintStreamToSLF4J.java similarity index 100% rename from core/src/net/sf/openrocket/logging/PrintStreamToSLF4J.java rename to swing/src/net/sf/openrocket/logging/PrintStreamToSLF4J.java diff --git a/core/src/net/sf/openrocket/logging/StackTraceWriter.java b/swing/src/net/sf/openrocket/logging/StackTraceWriter.java similarity index 100% rename from core/src/net/sf/openrocket/logging/StackTraceWriter.java rename to swing/src/net/sf/openrocket/logging/StackTraceWriter.java diff --git a/core/src/net/sf/openrocket/logging/TraceException.java b/swing/src/net/sf/openrocket/logging/TraceException.java similarity index 100% rename from core/src/net/sf/openrocket/logging/TraceException.java rename to swing/src/net/sf/openrocket/logging/TraceException.java diff --git a/core/src/net/sf/openrocket/startup/GuiModule.java b/swing/src/net/sf/openrocket/startup/GuiModule.java similarity index 100% rename from core/src/net/sf/openrocket/startup/GuiModule.java rename to swing/src/net/sf/openrocket/startup/GuiModule.java diff --git a/core/src/net/sf/openrocket/startup/OSXSetup.java b/swing/src/net/sf/openrocket/startup/OSXSetup.java similarity index 100% rename from core/src/net/sf/openrocket/startup/OSXSetup.java rename to swing/src/net/sf/openrocket/startup/OSXSetup.java diff --git a/core/src/net/sf/openrocket/startup/Startup.java b/swing/src/net/sf/openrocket/startup/Startup.java similarity index 100% rename from core/src/net/sf/openrocket/startup/Startup.java rename to swing/src/net/sf/openrocket/startup/Startup.java diff --git a/core/src/net/sf/openrocket/startup/SwingStartup.java b/swing/src/net/sf/openrocket/startup/SwingStartup.java similarity index 100% rename from core/src/net/sf/openrocket/startup/SwingStartup.java rename to swing/src/net/sf/openrocket/startup/SwingStartup.java diff --git a/core/src/net/sf/openrocket/startup/jij/ClasspathProvider.java b/swing/src/net/sf/openrocket/startup/jij/ClasspathProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/ClasspathProvider.java rename to swing/src/net/sf/openrocket/startup/jij/ClasspathProvider.java diff --git a/core/src/net/sf/openrocket/startup/jij/ClasspathUrlStreamHandler.java b/swing/src/net/sf/openrocket/startup/jij/ClasspathUrlStreamHandler.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/ClasspathUrlStreamHandler.java rename to swing/src/net/sf/openrocket/startup/jij/ClasspathUrlStreamHandler.java diff --git a/core/src/net/sf/openrocket/startup/jij/ConfigurableStreamHandlerFactory.java b/swing/src/net/sf/openrocket/startup/jij/ConfigurableStreamHandlerFactory.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/ConfigurableStreamHandlerFactory.java rename to swing/src/net/sf/openrocket/startup/jij/ConfigurableStreamHandlerFactory.java diff --git a/core/src/net/sf/openrocket/startup/jij/CurrentClasspathProvider.java b/swing/src/net/sf/openrocket/startup/jij/CurrentClasspathProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/CurrentClasspathProvider.java rename to swing/src/net/sf/openrocket/startup/jij/CurrentClasspathProvider.java diff --git a/core/src/net/sf/openrocket/startup/jij/JarInJarStarter.java b/swing/src/net/sf/openrocket/startup/jij/JarInJarStarter.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/JarInJarStarter.java rename to swing/src/net/sf/openrocket/startup/jij/JarInJarStarter.java diff --git a/core/src/net/sf/openrocket/startup/jij/ManifestClasspathProvider.java b/swing/src/net/sf/openrocket/startup/jij/ManifestClasspathProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/ManifestClasspathProvider.java rename to swing/src/net/sf/openrocket/startup/jij/ManifestClasspathProvider.java diff --git a/core/src/net/sf/openrocket/startup/jij/PluginClasspathProvider.java b/swing/src/net/sf/openrocket/startup/jij/PluginClasspathProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/jij/PluginClasspathProvider.java rename to swing/src/net/sf/openrocket/startup/jij/PluginClasspathProvider.java diff --git a/core/src/net/sf/openrocket/startup/providers/BlockingComponentPresetDatabaseProvider.java b/swing/src/net/sf/openrocket/startup/providers/BlockingComponentPresetDatabaseProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/providers/BlockingComponentPresetDatabaseProvider.java rename to swing/src/net/sf/openrocket/startup/providers/BlockingComponentPresetDatabaseProvider.java diff --git a/core/src/net/sf/openrocket/startup/providers/BlockingMotorDatabaseProvider.java b/swing/src/net/sf/openrocket/startup/providers/BlockingMotorDatabaseProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/providers/BlockingMotorDatabaseProvider.java rename to swing/src/net/sf/openrocket/startup/providers/BlockingMotorDatabaseProvider.java diff --git a/core/src/net/sf/openrocket/startup/providers/TranslatorProvider.java b/swing/src/net/sf/openrocket/startup/providers/TranslatorProvider.java similarity index 100% rename from core/src/net/sf/openrocket/startup/providers/TranslatorProvider.java rename to swing/src/net/sf/openrocket/startup/providers/TranslatorProvider.java diff --git a/core/src/net/sf/openrocket/utils/BasicApplication.java b/swing/src/net/sf/openrocket/utils/BasicApplication.java similarity index 100% rename from core/src/net/sf/openrocket/utils/BasicApplication.java rename to swing/src/net/sf/openrocket/utils/BasicApplication.java diff --git a/core/src/net/sf/openrocket/utils/ComponentPresetEditor.java b/swing/src/net/sf/openrocket/utils/ComponentPresetEditor.java similarity index 100% rename from core/src/net/sf/openrocket/utils/ComponentPresetEditor.java rename to swing/src/net/sf/openrocket/utils/ComponentPresetEditor.java diff --git a/core/src/net/sf/openrocket/utils/CoreServicesModule.java b/swing/src/net/sf/openrocket/utils/CoreServicesModule.java similarity index 100% rename from core/src/net/sf/openrocket/utils/CoreServicesModule.java rename to swing/src/net/sf/openrocket/utils/CoreServicesModule.java diff --git a/core/src/net/sf/openrocket/utils/GraphicalMotorSelector.java b/swing/src/net/sf/openrocket/utils/GraphicalMotorSelector.java similarity index 100% rename from core/src/net/sf/openrocket/utils/GraphicalMotorSelector.java rename to swing/src/net/sf/openrocket/utils/GraphicalMotorSelector.java diff --git a/core/src/net/sf/openrocket/utils/MotorPlot.java b/swing/src/net/sf/openrocket/utils/MotorPlot.java similarity index 100% rename from core/src/net/sf/openrocket/utils/MotorPlot.java rename to swing/src/net/sf/openrocket/utils/MotorPlot.java diff --git a/core/src/net/sf/openrocket/utils/RocksimComponentFileTranslator.java b/swing/src/net/sf/openrocket/utils/RocksimComponentFileTranslator.java similarity index 100% rename from core/src/net/sf/openrocket/utils/RocksimComponentFileTranslator.java rename to swing/src/net/sf/openrocket/utils/RocksimComponentFileTranslator.java diff --git a/core/src/net/sf/openrocket/utils/RocksimConverter.java b/swing/src/net/sf/openrocket/utils/RocksimConverter.java similarity index 100% rename from core/src/net/sf/openrocket/utils/RocksimConverter.java rename to swing/src/net/sf/openrocket/utils/RocksimConverter.java diff --git a/core/src/net/sf/openrocket/utils/SerializePresets.java b/swing/src/net/sf/openrocket/utils/SerializePresets.java similarity index 100% rename from core/src/net/sf/openrocket/utils/SerializePresets.java rename to swing/src/net/sf/openrocket/utils/SerializePresets.java diff --git a/core/test/net/sf/openrocket/IntegrationTest.java b/swing/test/net/sf/openrocket/IntegrationTest.java similarity index 100% rename from core/test/net/sf/openrocket/IntegrationTest.java rename to swing/test/net/sf/openrocket/IntegrationTest.java diff --git a/core/test/net/sf/openrocket/gui/TestGUI.java b/swing/test/net/sf/openrocket/gui/TestGUI.java similarity index 100% rename from core/test/net/sf/openrocket/gui/TestGUI.java rename to swing/test/net/sf/openrocket/gui/TestGUI.java diff --git a/core/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java b/swing/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java similarity index 100% rename from core/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java rename to swing/test/net/sf/openrocket/gui/configdialog/FinSetConfigTest.java diff --git a/core/test/net/sf/openrocket/gui/print/PrintUnitTest.java b/swing/test/net/sf/openrocket/gui/print/PrintUnitTest.java similarity index 100% rename from core/test/net/sf/openrocket/gui/print/PrintUnitTest.java rename to swing/test/net/sf/openrocket/gui/print/PrintUnitTest.java diff --git a/core/test/net/sf/openrocket/gui/print/TestPaperSize.java b/swing/test/net/sf/openrocket/gui/print/TestPaperSize.java similarity index 100% rename from core/test/net/sf/openrocket/gui/print/TestPaperSize.java rename to swing/test/net/sf/openrocket/gui/print/TestPaperSize.java diff --git a/core/test/net/sf/openrocket/logging/CyclicBufferTest.java b/swing/test/net/sf/openrocket/logging/CyclicBufferTest.java similarity index 100% rename from core/test/net/sf/openrocket/logging/CyclicBufferTest.java rename to swing/test/net/sf/openrocket/logging/CyclicBufferTest.java diff --git a/core/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java b/swing/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java similarity index 100% rename from core/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java rename to swing/test/net/sf/openrocket/logging/LogLevelBufferLoggerTest.java diff --git a/core/test/net/sf/openrocket/logging/LogLevelTest.java b/swing/test/net/sf/openrocket/logging/LogLevelTest.java similarity index 100% rename from core/test/net/sf/openrocket/logging/LogLevelTest.java rename to swing/test/net/sf/openrocket/logging/LogLevelTest.java