diff --git a/TODO b/TODO index 67f030c71..ec071f934 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 e49814501..55e3e1472 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 d3497cac5..856c23861 100644 --- a/html/download.html +++ b/html/download.html @@ -56,7 +56,7 @@ later. The Sun JRE is recommended.

- Download OpenRocket 0.9.3

+ Download OpenRocket 0.9.4

OpenRocket is still considered beta software. If you encounter any problems, please @@ -65,7 +65,7 @@

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

- 
$ java -jar OpenRocket-0.9.3.jar
+ 
$ java -jar OpenRocket-0.9.4.jar

Older packages and source code are available from the SourceForge repository.

diff --git a/html/index.html b/html/index.html index c2d399446..864a27369 100644 --- a/html/index.html +++ b/html/index.html @@ -90,6 +90,13 @@

News

+

24.11.2009: Version 0.9.4 is + released!

+ +

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.

+

1.9.2009: Version 0.9.3 is released!

diff --git a/releasing.txt b/releasing.txt index 389c310c6..63164c4f8 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 d67ea3354..082f2b9f7 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 5981c2d08..117672f53 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 ce997dfe5..1dc3329a5 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 409d2188e..02feb9b27 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 48a15906b..0596ba1dc 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 c5d5f54c9..3b7b23d95 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 312aa0bb3..6a13069b2 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 97dc5eb59..1a65676b5 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 865c6c809..5caf28963 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 c4e5b6a09..9c0ef2d85 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 9014fb0aa..bb428a3dd 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 8a73471f1..9e9d609d6 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 8874a7aec..31b9dfb0c 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 493232255..921ddde56 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 7ca8b8f98..2f1b2a4ec 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 756115e40..8756d89f7 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 6aa177820..c310e4d99 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 f70691775..7eb0a538e 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 45c0a5635..0a2dbe722 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 06d3da59a..3008bcce9 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 11a5ce654..093303c26 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 f1ee440c3..298cb2636 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 95feafb79..9733254f8 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 64e44ff88..7d906e679 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 02cf01591..c1b902049 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 a57747e23..22dcaa9cc 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 53d8177f0..c1999fba3 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 a9da9b2fd..64e55895d 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 e27fa76c3..e8b7a3455 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 0f8746e2e..8b8ae01f5 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 2c8377283..0fd0f6f31 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 d3e936b50..5b92852e2 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 4d7f60596..5cf5ce70e 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 741c5135a..bab5eccbd 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 d52df559f..d5a3c1b37 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 461087f65..d7bb1ed7b 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 fc244cc14..21ac2aa8f 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 09a79c7fb..0e19fd8d0 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 7e4b956c8..dc9901b09 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 c2d0d3367..bd6e1552b 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 560cc2601..3d70493de 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());