Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / file / rocksim / RocksimCommonConstants.java

diff --git a/core/src/net/sf/openrocket/file/rocksim/RocksimCommonConstants.java b/core/src/net/sf/openrocket/file/rocksim/RocksimCommonConstants.java
index 9686b9794a481f5f08dadcc331274509f93a5dad..431db2650dd2cde09d0ad207e33250769252d28e 100644 (file)
--- a/core/src/net/sf/openrocket/file/rocksim/RocksimCommonConstants.java
+++ b/core/src/net/sf/openrocket/file/rocksim/RocksimCommonConstants.java
@@ -79,6 +79,10 @@ public class RocksimCommonConstants {
     public static final String ROCK_SIM_DOCUMENT = "RockSimDocument";
     public static final String FILE_VERSION = "FileVersion";
     public static final String DESIGN_INFORMATION = "DesignInformation";
+    public static final String TUBE_FIN_SET = "TubeFinSet";
+    public static final String RING_TAIL = "RingTail";
+    public static final String EXTERNAL_POD = "ExternalPod";
+
     /**
      * Length conversion.  Rocksim is in millimeters, OpenRocket in meters.
      */
@@ -103,7 +107,4 @@ public class RocksimCommonConstants {
      * Radius conversion.  Rocksim is always in diameters, OpenRocket mostly in radius.
      */
     public static final int ROCKSIM_TO_OPENROCKET_RADIUS = 2 * ROCKSIM_TO_OPENROCKET_LENGTH;
-    public static final String TUBE_FIN_SET = "TubeFinSet";
-    public static final String RING_TAIL = "RingTail";
-    public static final String EXTERNAL_POD = "ExternalPod";
 }