De-localize Material and FlightDataType objects when persisting in ork files. Added...
authorkruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Tue, 31 Jul 2012 21:20:55 +0000 (21:20 +0000)
committerkruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Tue, 31 Jul 2012 21:20:55 +0000 (21:20 +0000)
commit4da92a4e994992a78d62a7ca21c88d6c41292d6f
tree4b13b40b7897b1bd33b57f24bf2c37be91b33718
parentfb75481e190d4f789e7ac6d062560b823b267adc
De-localize Material and FlightDataType objects when persisting in ork files.  Added a String key to each of these objects which holds on to a unique identifier which is stored in the ork file.  User defined Materials are given a key which is defined as "UserDefined." + name.

The construction pattern for Material has changed so explicitly passing in the userDefined boolean is no longer required.  Instead there are two different factory methods to be used.  Direct construction of Material derived classes is no longer allowed.

The persistence mechanism for Materials in perferences has changed.  It will now persist the key and name but still supports reading old format.

The example files have been regenerated, but will need to be regenerated again prior to an official build in order to get the version string correct.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@946 180e2498-e6e9-4542-8430-84ac67f01cd8
46 files changed:
core/resources/datafiles/examples/3FNC Using Presets.ork
core/resources/datafiles/examples/A simple model rocket.ork
core/resources/datafiles/examples/Clustered rocket design.ork
core/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork
core/resources/datafiles/examples/Roll-stabilized rocket.ork
core/resources/datafiles/examples/Simulation listeners.ork
core/resources/datafiles/examples/Three-stage rocket.ork
core/src/net/sf/openrocket/database/Databases.java
core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
core/src/net/sf/openrocket/file/rocksim/importt/BaseHandler.java
core/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
core/src/net/sf/openrocket/gui/util/SwingPreferences.java
core/src/net/sf/openrocket/material/Material.java
core/src/net/sf/openrocket/preset/ComponentPresetFactory.java
core/src/net/sf/openrocket/preset/loader/LineMaterialColumnParser.java
core/src/net/sf/openrocket/preset/loader/MaterialColumnParser.java
core/src/net/sf/openrocket/preset/loader/MaterialHolder.java
core/src/net/sf/openrocket/preset/loader/MaterialLoader.java
core/src/net/sf/openrocket/preset/loader/SurfaceMaterialColumnParser.java
core/src/net/sf/openrocket/preset/xml/BaseComponentDTO.java
core/src/net/sf/openrocket/preset/xml/MaterialDTO.java
core/src/net/sf/openrocket/simulation/FlightDataType.java
core/src/net/sf/openrocket/startup/Preferences.java
core/src/net/sf/openrocket/util/TestRockets.java
core/test/net/sf/openrocket/preset/BodyTubeComponentTests.java
core/test/net/sf/openrocket/preset/BodyTubePresetTests.java
core/test/net/sf/openrocket/preset/BulkHeadComponentTests.java
core/test/net/sf/openrocket/preset/BulkHeadPresetTests.java
core/test/net/sf/openrocket/preset/CenteringRingComponentTests.java
core/test/net/sf/openrocket/preset/CenteringRingPresetTests.java
core/test/net/sf/openrocket/preset/EngineBlockComponentTests.java
core/test/net/sf/openrocket/preset/EngineBlockPresetTests.java
core/test/net/sf/openrocket/preset/LaunchLugComponentTests.java
core/test/net/sf/openrocket/preset/LaunchLugPresetTests.java
core/test/net/sf/openrocket/preset/NoseConeComponentTests.java
core/test/net/sf/openrocket/preset/NoseConePresetTests.java
core/test/net/sf/openrocket/preset/ParachuterComponentTests.java
core/test/net/sf/openrocket/preset/StreamerComponentTests.java
core/test/net/sf/openrocket/preset/TransitionComponentTests.java
core/test/net/sf/openrocket/preset/TransitionPresetTests.java
core/test/net/sf/openrocket/preset/TubeCouplerComponentTests.java
core/test/net/sf/openrocket/preset/TubeCouplerPresetTests.java
core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java