refactored file package

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)

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");
 
 ?>

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>

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>
 

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
 

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();

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;
 
 /**

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;
 
 
 /**

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;

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;

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;

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";
 	
 	

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;
 

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;

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;

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;

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 {
 

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;

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;

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;
 

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;

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());