From d23932f311312abb73801262a80ef2f6bc66818d Mon Sep 17 00:00:00 2001
From: plaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 26 Nov 2009 15:56:35 +0000
Subject: [PATCH] refactored file package

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@33 180e2498-e6e9-4542-8430-84ac67f01cd8
---
 TODO                                           |  1 +
 html/actions/updates.php                       |  2 +-
 html/download.html                             |  4 ++--
 html/index.html                                |  7 +++++++
 releasing.txt                                  | 18 +++++++++++++-----
 .../communication/UpdateInfoRetriever.java     |  3 +++
 .../sf/openrocket/file/GeneralMotorLoader.java |  2 ++
 .../openrocket/file/GeneralRocketLoader.java   |  1 +
 .../file/{ => motor}/RASPMotorLoader.java      |  3 ++-
 .../file/{ => motor}/RockSimMotorLoader.java   |  3 ++-
 .../{ => openrocket}/OpenRocketLoader.java     |  4 +++-
 .../file/{ => openrocket}/OpenRocketSaver.java |  5 +++--
 .../{ => savers}/BodyComponentSaver.java       |  2 +-
 .../openrocket/{ => savers}/BodyTubeSaver.java |  2 +-
 .../openrocket/{ => savers}/BulkheadSaver.java |  2 +-
 .../{ => savers}/CenteringRingSaver.java       |  2 +-
 .../{ => savers}/ComponentAssemblySaver.java   |  2 +-
 .../{ => savers}/EllipticalFinSetSaver.java    |  2 +-
 .../{ => savers}/EngineBlockSaver.java         |  2 +-
 .../{ => savers}/ExternalComponentSaver.java   |  2 +-
 .../openrocket/{ => savers}/FinSetSaver.java   |  2 +-
 .../{ => savers}/FreeformFinSetSaver.java      |  2 +-
 .../{ => savers}/InnerTubeSaver.java           |  2 +-
 .../{ => savers}/InternalComponentSaver.java   |  2 +-
 .../{ => savers}/LaunchLugSaver.java           |  2 +-
 .../{ => savers}/MassComponentSaver.java       |  2 +-
 .../{ => savers}/MassObjectSaver.java          |  2 +-
 .../openrocket/{ => savers}/NoseConeSaver.java |  2 +-
 .../{ => savers}/ParachuteSaver.java           |  2 +-
 .../{ => savers}/RadiusRingComponentSaver.java |  2 +-
 .../{ => savers}/RecoveryDeviceSaver.java      |  2 +-
 .../{ => savers}/RingComponentSaver.java       |  2 +-
 .../{ => savers}/RocketComponentSaver.java     |  2 +-
 .../openrocket/{ => savers}/RocketSaver.java   |  2 +-
 .../{ => savers}/ShockCordSaver.java           |  2 +-
 .../openrocket/{ => savers}/StageSaver.java    |  2 +-
 .../openrocket/{ => savers}/StreamerSaver.java |  2 +-
 .../{ => savers}/StructuralComponentSaver.java |  2 +-
 .../{ => savers}/SymmetricComponentSaver.java  |  2 +-
 .../ThicknessRingComponentSaver.java           |  2 +-
 .../{ => savers}/TransitionSaver.java          |  2 +-
 .../{ => savers}/TrapezoidFinSetSaver.java     |  2 +-
 .../{ => savers}/TubeCouplerSaver.java         |  2 +-
 .../openrocket/gui/StorageOptionChooser.java   |  2 +-
 src/net/sf/openrocket/gui/main/BasicFrame.java |  2 +-
 .../rocketcomponent/CenteringRing.java         |  1 +
 46 files changed, 74 insertions(+), 46 deletions(-)
 rename src/net/sf/openrocket/file/{ => motor}/RASPMotorLoader.java (98%)
 rename src/net/sf/openrocket/file/{ => motor}/RockSimMotorLoader.java (99%)
 rename src/net/sf/openrocket/file/{ => openrocket}/OpenRocketLoader.java (99%)
 rename src/net/sf/openrocket/file/{ => openrocket}/OpenRocketSaver.java (99%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/BodyComponentSaver.java (89%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/BodyTubeSaver.java (94%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/BulkheadSaver.java (89%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/CenteringRingSaver.java (90%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/ComponentAssemblySaver.java (62%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/EllipticalFinSetSaver.java (94%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/EngineBlockSaver.java (90%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/ExternalComponentSaver.java (91%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/FinSetSaver.java (96%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/FreeformFinSetSaver.java (94%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/InnerTubeSaver.java (95%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/InternalComponentSaver.java (84%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/LaunchLugSaver.java (95%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/MassComponentSaver.java (93%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/MassObjectSaver.java (93%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/NoseConeSaver.java (92%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/ParachuteSaver.java (95%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/RadiusRingComponentSaver.java (94%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/RecoveryDeviceSaver.java (93%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/RingComponentSaver.java (92%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/RocketComponentSaver.java (98%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/RocketSaver.java (97%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/ShockCordSaver.java (94%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/StageSaver.java (89%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/StreamerSaver.java (94%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/StructuralComponentSaver.java (89%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/SymmetricComponentSaver.java (91%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/ThicknessRingComponentSaver.java (92%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/TransitionSaver.java (98%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/TrapezoidFinSetSaver.java (95%)
 rename src/net/sf/openrocket/file/openrocket/{ => savers}/TubeCouplerSaver.java (90%)

diff --git a/TODO b/TODO
index 67f030c7..ec071f93 100644
--- a/TODO
+++ b/TODO
@@ -26,6 +26,7 @@ Postponed:
 - Reading thrust curves from external directory
 - Plot motor thrust curve
 
+- Screw weights for nose cones / transitions
 
 - Windows executable wrapper (launch4j)
 - Allow only one instance of OpenRocket running (RMI communication)
diff --git a/html/actions/updates.php b/html/actions/updates.php
index e4981450..55e3e147 100644
--- a/html/actions/updates.php
+++ b/html/actions/updates.php
@@ -60,6 +60,6 @@ header("Content-type: text/plain; charset=utf-8");
 $version = $_GET["version"];
 
 // No updates available
-header("HTTP/1.0 202 No Content");
+header("HTTP/1.0 204 No Content");
 
 ?>
\ No newline at end of file
diff --git a/html/download.html b/html/download.html
index d3497cac..856c2386 100644
--- a/html/download.html
+++ b/html/download.html
@@ -56,7 +56,7 @@
     later.  The Sun JRE is recommended.</em></p>
 
     <p class="download">
-    <a href="https://sourceforge.net/projects/openrocket/files/openrocket/OpenRocket-0.9.3.jar/download">Download OpenRocket 0.9.3</a></p>
+    <a href="https://sourceforge.net/projects/openrocket/files/openrocket/OpenRocket-0.9.4.jar/download">Download OpenRocket 0.9.4</a></p>
 
     <p>OpenRocket is still considered <strong>beta software</strong>.
     If you encounter any problems, please 
@@ -65,7 +65,7 @@
     <p>OpenRocket can be started in graphical environments (such as
     Windows) by double-clicking the package icon.  No installation is
     required.  From the command line it can be started by</p>
-    <pre class="quote">$ java -jar OpenRocket-0.9.3.jar</pre>
+    <pre class="quote">$ java -jar OpenRocket-0.9.4.jar</pre>
 
     <p>Older packages and source code are available from the
     <a href="https://sourceforge.net/project/showfiles.php?group_id=260357&amp;package_id=319743">SourceForge repository</a>.</p>
diff --git a/html/index.html b/html/index.html
index c2d39944..864a2736 100644
--- a/html/index.html
+++ b/html/index.html
@@ -90,6 +90,13 @@
 
     <h2>News</h2>
 
+    <p><strong>24.11.2009:</strong> Version 0.9.4 is
+      <a href="download.html">released</a>!</p>
+
+    <p>This version adds support for through-the-wall fin tabs,
+    attaching components to coupler tubes, material editing, automatic
+    update checking, in addition to fixing numerous bugs.</p>
+
     <p><strong>1.9.2009:</strong> Version 0.9.3 is
       <a href="download.html">released</a>!</p>
 
diff --git a/releasing.txt b/releasing.txt
index 389c310c..63164c4f 100644
--- a/releasing.txt
+++ b/releasing.txt
@@ -6,13 +6,21 @@ Steps for making a release:
 3. Update ChangeLog
 4. ant dist
 5. Test new features (not in project directory)
-6. Copy distribution files into dist/
+6. Copy distribution files into dists/
 7. Update Eclipse project and commit files to SVN
-8. Tag the version in SVN
+8. Tag the version in SVN, URL:
+   https://openrocket.svn.sourceforge.net/svnroot/openrocket/tags/Release_0.9.x
 9. Upload JAR and source distribution and ReleaseNotes to Sourceforge 
-   (Project Admin -> File Manager, create new version directory + upload)
+    - Project Admin -> File Manager
+    - create new version directory under /openrocket
+    - upload JAR, ZIP and ReleaseNotes
+    - select ReleaseNotes properties, set as release notes
+    - select JAR properties, set release note file and default downloads
+    - select ZIP properties, set release note file
 10. Update HTML: index.html (release notes) download.html (version number)
-11. Update HTML to web server
-12. Send email about new release
+11. Update HTML to web server:
+    scp * plaa,openrocket@web.sourceforge.net:htdocs/
+12. Test downloading from Sourceforge and web site
 13. Update build.properties to "pre" version + commit
+14. Send email about new release to openrocket-announce@lists.sourceforge.net
 
diff --git a/src/net/sf/openrocket/communication/UpdateInfoRetriever.java b/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
index d67ea335..082f2b9f 100644
--- a/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
+++ b/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
@@ -124,6 +124,7 @@ public class UpdateInfoRetriever {
 			try {
 				doConnection();
 			} catch (IOException e) {
+				System.out.println("fetching update failed: " + e);
 				return;
 			}
 		}
@@ -158,6 +159,8 @@ public class UpdateInfoRetriever {
 			try {
 				connection.connect();
 				
+				System.out.println("response code: " + connection.getResponseCode());
+				
 				if (connection.getResponseCode() == Communicator.UPDATE_INFO_NO_UPDATE_CODE) {
 					// No updates are available
 					info = new UpdateInfo();
diff --git a/src/net/sf/openrocket/file/GeneralMotorLoader.java b/src/net/sf/openrocket/file/GeneralMotorLoader.java
index 5981c2d0..117672f5 100644
--- a/src/net/sf/openrocket/file/GeneralMotorLoader.java
+++ b/src/net/sf/openrocket/file/GeneralMotorLoader.java
@@ -6,6 +6,8 @@ import java.io.Reader;
 import java.nio.charset.Charset;
 import java.util.List;
 
+import net.sf.openrocket.file.motor.RASPMotorLoader;
+import net.sf.openrocket.file.motor.RockSimMotorLoader;
 import net.sf.openrocket.motor.Motor;
 
 /**
diff --git a/src/net/sf/openrocket/file/GeneralRocketLoader.java b/src/net/sf/openrocket/file/GeneralRocketLoader.java
index ce997dfe..1dc3329a 100644
--- a/src/net/sf/openrocket/file/GeneralRocketLoader.java
+++ b/src/net/sf/openrocket/file/GeneralRocketLoader.java
@@ -7,6 +7,7 @@ import java.nio.charset.Charset;
 import java.util.zip.GZIPInputStream;
 
 import net.sf.openrocket.document.OpenRocketDocument;
+import net.sf.openrocket.file.openrocket.OpenRocketLoader;
 
 
 /**
diff --git a/src/net/sf/openrocket/file/RASPMotorLoader.java b/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
similarity index 98%
rename from src/net/sf/openrocket/file/RASPMotorLoader.java
rename to src/net/sf/openrocket/file/motor/RASPMotorLoader.java
index 409d2188..02feb9b2 100644
--- a/src/net/sf/openrocket/file/RASPMotorLoader.java
+++ b/src/net/sf/openrocket/file/motor/RASPMotorLoader.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file;
+package net.sf.openrocket.file.motor;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import net.sf.openrocket.file.MotorLoader;
 import net.sf.openrocket.motor.Manufacturer;
 import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.motor.MotorDigest;
diff --git a/src/net/sf/openrocket/file/RockSimMotorLoader.java b/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
similarity index 99%
rename from src/net/sf/openrocket/file/RockSimMotorLoader.java
rename to src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
index 48a15906..0596ba1d 100644
--- a/src/net/sf/openrocket/file/RockSimMotorLoader.java
+++ b/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file;
+package net.sf.openrocket.file.motor;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import net.sf.openrocket.aerodynamics.WarningSet;
+import net.sf.openrocket.file.MotorLoader;
 import net.sf.openrocket.file.simplesax.ElementHandler;
 import net.sf.openrocket.file.simplesax.NullElementHandler;
 import net.sf.openrocket.file.simplesax.PlainTextHandler;
diff --git a/src/net/sf/openrocket/file/OpenRocketLoader.java b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
similarity index 99%
rename from src/net/sf/openrocket/file/OpenRocketLoader.java
rename to src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
index c5d5f54c..3b7b23d9 100644
--- a/src/net/sf/openrocket/file/OpenRocketLoader.java
+++ b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file;
+package net.sf.openrocket.file.openrocket;
 
 import java.awt.Color;
 import java.io.IOException;
@@ -16,6 +16,8 @@ import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.document.StorageOptions;
 import net.sf.openrocket.document.Simulation.Status;
+import net.sf.openrocket.file.RocketLoadException;
+import net.sf.openrocket.file.RocketLoader;
 import net.sf.openrocket.file.simplesax.ElementHandler;
 import net.sf.openrocket.file.simplesax.PlainTextHandler;
 import net.sf.openrocket.file.simplesax.SimpleSAX;
diff --git a/src/net/sf/openrocket/file/OpenRocketSaver.java b/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
similarity index 99%
rename from src/net/sf/openrocket/file/OpenRocketSaver.java
rename to src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
index 312aa0bb..6a13069b 100644
--- a/src/net/sf/openrocket/file/OpenRocketSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file;
+package net.sf.openrocket.file.openrocket;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -14,6 +14,7 @@ import net.sf.openrocket.aerodynamics.Warning;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.document.StorageOptions;
+import net.sf.openrocket.file.RocketSaver;
 import net.sf.openrocket.rocketcomponent.FinSet;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
@@ -40,7 +41,7 @@ public class OpenRocketSaver extends RocketSaver {
 	
 	private static final String OPENROCKET_CHARSET = "UTF-8";
 	
-	private static final String METHOD_PACKAGE = "net.sf.openrocket.file.openrocket";
+	private static final String METHOD_PACKAGE = "net.sf.openrocket.file.openrocket.savers";
 	private static final String METHOD_SUFFIX = "Saver";
 	
 	
diff --git a/src/net/sf/openrocket/file/openrocket/BodyComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java
similarity index 89%
rename from src/net/sf/openrocket/file/openrocket/BodyComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java
index 97dc5eb5..1a65676b 100644
--- a/src/net/sf/openrocket/file/openrocket/BodyComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/BodyComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/BodyTubeSaver.java b/src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java
similarity index 94%
rename from src/net/sf/openrocket/file/openrocket/BodyTubeSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java
index 865c6c80..5caf2896 100644
--- a/src/net/sf/openrocket/file/openrocket/BodyTubeSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/BodyTubeSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/BulkheadSaver.java b/src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java
similarity index 89%
rename from src/net/sf/openrocket/file/openrocket/BulkheadSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java
index c4e5b6a0..9c0ef2d8 100644
--- a/src/net/sf/openrocket/file/openrocket/BulkheadSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/BulkheadSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/CenteringRingSaver.java b/src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java
similarity index 90%
rename from src/net/sf/openrocket/file/openrocket/CenteringRingSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java
index 9014fb0a..bb428a3d 100644
--- a/src/net/sf/openrocket/file/openrocket/CenteringRingSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/CenteringRingSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/ComponentAssemblySaver.java b/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java
similarity index 62%
rename from src/net/sf/openrocket/file/openrocket/ComponentAssemblySaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java
index 8a73471f..9e9d609d 100644
--- a/src/net/sf/openrocket/file/openrocket/ComponentAssemblySaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/ComponentAssemblySaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 public class ComponentAssemblySaver extends RocketComponentSaver {
 
diff --git a/src/net/sf/openrocket/file/openrocket/EllipticalFinSetSaver.java b/src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java
similarity index 94%
rename from src/net/sf/openrocket/file/openrocket/EllipticalFinSetSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java
index 8874a7ae..31b9dfb0 100644
--- a/src/net/sf/openrocket/file/openrocket/EllipticalFinSetSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/EllipticalFinSetSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/EngineBlockSaver.java b/src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java
similarity index 90%
rename from src/net/sf/openrocket/file/openrocket/EngineBlockSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java
index 49323225..921ddde5 100644
--- a/src/net/sf/openrocket/file/openrocket/EngineBlockSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/EngineBlockSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/ExternalComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java
similarity index 91%
rename from src/net/sf/openrocket/file/openrocket/ExternalComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java
index 7ca8b8f9..2f1b2a4e 100644
--- a/src/net/sf/openrocket/file/openrocket/ExternalComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/ExternalComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/FinSetSaver.java b/src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java
similarity index 96%
rename from src/net/sf/openrocket/file/openrocket/FinSetSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java
index 756115e4..8756d89f 100644
--- a/src/net/sf/openrocket/file/openrocket/FinSetSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/FinSetSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/FreeformFinSetSaver.java b/src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java
similarity index 94%
rename from src/net/sf/openrocket/file/openrocket/FreeformFinSetSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java
index 6aa17782..c310e4d9 100644
--- a/src/net/sf/openrocket/file/openrocket/FreeformFinSetSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/FreeformFinSetSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/InnerTubeSaver.java b/src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java
similarity index 95%
rename from src/net/sf/openrocket/file/openrocket/InnerTubeSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java
index f7069177..7eb0a538 100644
--- a/src/net/sf/openrocket/file/openrocket/InnerTubeSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/InnerTubeSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/InternalComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java
similarity index 84%
rename from src/net/sf/openrocket/file/openrocket/InternalComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java
index 45c0a563..0a2dbe72 100644
--- a/src/net/sf/openrocket/file/openrocket/InternalComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/InternalComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/LaunchLugSaver.java b/src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java
similarity index 95%
rename from src/net/sf/openrocket/file/openrocket/LaunchLugSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java
index 06d3da59..3008bcce 100644
--- a/src/net/sf/openrocket/file/openrocket/LaunchLugSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/LaunchLugSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/MassComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java
similarity index 93%
rename from src/net/sf/openrocket/file/openrocket/MassComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java
index 11a5ce65..093303c2 100644
--- a/src/net/sf/openrocket/file/openrocket/MassComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/MassObjectSaver.java b/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java
similarity index 93%
rename from src/net/sf/openrocket/file/openrocket/MassObjectSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java
index f1ee440c..298cb263 100644
--- a/src/net/sf/openrocket/file/openrocket/MassObjectSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/NoseConeSaver.java b/src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java
similarity index 92%
rename from src/net/sf/openrocket/file/openrocket/NoseConeSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java
index 95feafb7..9733254f 100644
--- a/src/net/sf/openrocket/file/openrocket/NoseConeSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/NoseConeSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/ParachuteSaver.java b/src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java
similarity index 95%
rename from src/net/sf/openrocket/file/openrocket/ParachuteSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java
index 64e44ff8..7d906e67 100644
--- a/src/net/sf/openrocket/file/openrocket/ParachuteSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/ParachuteSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/RadiusRingComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java
similarity index 94%
rename from src/net/sf/openrocket/file/openrocket/RadiusRingComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java
index 02cf0159..c1b90204 100644
--- a/src/net/sf/openrocket/file/openrocket/RadiusRingComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/RadiusRingComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/RecoveryDeviceSaver.java b/src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java
similarity index 93%
rename from src/net/sf/openrocket/file/openrocket/RecoveryDeviceSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java
index a57747e2..22dcaa9c 100644
--- a/src/net/sf/openrocket/file/openrocket/RecoveryDeviceSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/RingComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java
similarity index 92%
rename from src/net/sf/openrocket/file/openrocket/RingComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java
index 53d8177f..c1999fba 100644
--- a/src/net/sf/openrocket/file/openrocket/RingComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/RingComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/RocketComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
similarity index 98%
rename from src/net/sf/openrocket/file/openrocket/RocketComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
index a9da9b2f..64e55895 100644
--- a/src/net/sf/openrocket/file/openrocket/RocketComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.awt.Color;
 import java.util.ArrayList;
diff --git a/src/net/sf/openrocket/file/openrocket/RocketSaver.java b/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
similarity index 97%
rename from src/net/sf/openrocket/file/openrocket/RocketSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
index e27fa76c..e8b7a345 100644
--- a/src/net/sf/openrocket/file/openrocket/RocketSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/ShockCordSaver.java b/src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java
similarity index 94%
rename from src/net/sf/openrocket/file/openrocket/ShockCordSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java
index 0f8746e2..8b8ae01f 100644
--- a/src/net/sf/openrocket/file/openrocket/ShockCordSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/ShockCordSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/StageSaver.java b/src/net/sf/openrocket/file/openrocket/savers/StageSaver.java
similarity index 89%
rename from src/net/sf/openrocket/file/openrocket/StageSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/StageSaver.java
index 2c837728..0fd0f6f3 100644
--- a/src/net/sf/openrocket/file/openrocket/StageSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/StageSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 
diff --git a/src/net/sf/openrocket/file/openrocket/StreamerSaver.java b/src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java
similarity index 94%
rename from src/net/sf/openrocket/file/openrocket/StreamerSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java
index d3e936b5..5b92852e 100644
--- a/src/net/sf/openrocket/file/openrocket/StreamerSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/StreamerSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/StructuralComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java
similarity index 89%
rename from src/net/sf/openrocket/file/openrocket/StructuralComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java
index 4d7f6059..5cf5ce70 100644
--- a/src/net/sf/openrocket/file/openrocket/StructuralComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/StructuralComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/SymmetricComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java
similarity index 91%
rename from src/net/sf/openrocket/file/openrocket/SymmetricComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java
index 741c5135..bab5eccb 100644
--- a/src/net/sf/openrocket/file/openrocket/SymmetricComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/SymmetricComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/ThicknessRingComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java
similarity index 92%
rename from src/net/sf/openrocket/file/openrocket/ThicknessRingComponentSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java
index d52df559..d5a3c1b3 100644
--- a/src/net/sf/openrocket/file/openrocket/ThicknessRingComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/ThicknessRingComponentSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.List;
 
diff --git a/src/net/sf/openrocket/file/openrocket/TransitionSaver.java b/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java
similarity index 98%
rename from src/net/sf/openrocket/file/openrocket/TransitionSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java
index 461087f6..d7bb1ed7 100644
--- a/src/net/sf/openrocket/file/openrocket/TransitionSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/TrapezoidFinSetSaver.java b/src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java
similarity index 95%
rename from src/net/sf/openrocket/file/openrocket/TrapezoidFinSetSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java
index fc244cc1..21ac2aa8 100644
--- a/src/net/sf/openrocket/file/openrocket/TrapezoidFinSetSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/TrapezoidFinSetSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/file/openrocket/TubeCouplerSaver.java b/src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java
similarity index 90%
rename from src/net/sf/openrocket/file/openrocket/TubeCouplerSaver.java
rename to src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java
index 09a79c7f..0e19fd8d 100644
--- a/src/net/sf/openrocket/file/openrocket/TubeCouplerSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/TubeCouplerSaver.java
@@ -1,4 +1,4 @@
-package net.sf.openrocket.file.openrocket;
+package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/net/sf/openrocket/gui/StorageOptionChooser.java b/src/net/sf/openrocket/gui/StorageOptionChooser.java
index 7e4b956c..dc9901b0 100644
--- a/src/net/sf/openrocket/gui/StorageOptionChooser.java
+++ b/src/net/sf/openrocket/gui/StorageOptionChooser.java
@@ -20,8 +20,8 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.Simulation;
 import net.sf.openrocket.document.StorageOptions;
-import net.sf.openrocket.file.OpenRocketSaver;
 import net.sf.openrocket.file.RocketSaver;
+import net.sf.openrocket.file.openrocket.OpenRocketSaver;
 import net.sf.openrocket.simulation.FlightData;
 import net.sf.openrocket.simulation.FlightDataBranch;
 
diff --git a/src/net/sf/openrocket/gui/main/BasicFrame.java b/src/net/sf/openrocket/gui/main/BasicFrame.java
index c2d0d336..bd6e1552 100644
--- a/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -66,10 +66,10 @@ import net.sf.openrocket.communication.UpdateInfoRetriever;
 import net.sf.openrocket.database.Databases;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.file.GeneralRocketLoader;
-import net.sf.openrocket.file.OpenRocketSaver;
 import net.sf.openrocket.file.RocketLoadException;
 import net.sf.openrocket.file.RocketLoader;
 import net.sf.openrocket.file.RocketSaver;
+import net.sf.openrocket.file.openrocket.OpenRocketSaver;
 import net.sf.openrocket.gui.StorageOptionChooser;
 import net.sf.openrocket.gui.configdialog.ComponentConfigDialog;
 import net.sf.openrocket.gui.dialogs.AboutDialog;
diff --git a/src/net/sf/openrocket/rocketcomponent/CenteringRing.java b/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
index 560cc260..3d70493d 100644
--- a/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
+++ b/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
@@ -28,6 +28,7 @@ public class CenteringRing extends RadiusRingComponent {
 					if (pos2 < 0 || pos1 > sibling.getLength())
 						continue;
 					
+					// TODO: CRITICAL: ClassCastException below:
 					innerRadius = Math.max(innerRadius, ((InnerTube)sibling).getOuterRadius());
 				}
 				innerRadius = Math.min(innerRadius, getOuterRadius());
-- 
2.30.2