Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / core / src / net / sf / openrocket / file / openrocket / savers / TransitionSaver.java

diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java
index d7bb1ed7b0cb8d5e75f8982e7c5428f20cbe4058..0a4169f9e143880a826161c77b666306b86a89ff 100644 (file)
--- a/core/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java
+++ b/core/src/net/sf/openrocket/file/openrocket/savers/TransitionSaver.java
@@ -2,26 +2,27 @@ package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import net.sf.openrocket.rocketcomponent.NoseCone;
 import net.sf.openrocket.rocketcomponent.Transition;
 
 
 public class TransitionSaver extends SymmetricComponentSaver {
-
+       
        private static final TransitionSaver instance = new TransitionSaver();
-
+       
        public static ArrayList<String> getElements(net.sf.openrocket.rocketcomponent.RocketComponent c) {
                ArrayList<String> list = new ArrayList<String>();
-
+               
                list.add("<transition>");
                instance.addParams(c, list);
                list.add("</transition>");
-
+               
                return list;
        }
-
-
+       
+       
        /*
         * Note:  This method must be capable of handling nose cones as well.
         */
@@ -30,31 +31,31 @@ public class TransitionSaver extends SymmetricComponentSaver {
                super.addParams(c, elements);
                net.sf.openrocket.rocketcomponent.Transition trans = (net.sf.openrocket.rocketcomponent.Transition) c;
                boolean nosecone = (trans instanceof NoseCone);
-
-
+               
+               
                Transition.Shape shape = trans.getType();
-               elements.add("<shape>" + shape.name().toLowerCase() + "</shape>");
+               elements.add("<shape>" + shape.name().toLowerCase(Locale.ENGLISH) + "</shape>");
                if (shape.isClippable()) {
                        elements.add("<shapeclipped>" + trans.isClipped() + "</shapeclipped>");
                }
                if (shape.usesParameter()) {
                        elements.add("<shapeparameter>" + trans.getShapeParameter() + "</shapeparameter>");
                }
-
-
+               
+               
                if (!nosecone) {
                        if (trans.isForeRadiusAutomatic())
                                elements.add("<foreradius>auto</foreradius>");
                        else
                                elements.add("<foreradius>" + trans.getForeRadius() + "</foreradius>");
                }
-
+               
                if (trans.isAftRadiusAutomatic())
                        elements.add("<aftradius>auto</aftradius>");
                else
                        elements.add("<aftradius>" + trans.getAftRadius() + "</aftradius>");
-
-
+               
+               
                if (!nosecone) {
                        elements.add("<foreshoulderradius>" + trans.getForeShoulderRadius()
                                        + "</foreshoulderradius>");
@@ -65,7 +66,7 @@ public class TransitionSaver extends SymmetricComponentSaver {
                        elements.add("<foreshouldercapped>" + trans.isForeShoulderCapped()
                                        + "</foreshouldercapped>");
                }
-
+               
                elements.add("<aftshoulderradius>" + trans.getAftShoulderRadius()
                                + "</aftshoulderradius>");
                elements.add("<aftshoulderlength>" + trans.getAftShoulderLength()
@@ -75,5 +76,5 @@ public class TransitionSaver extends SymmetricComponentSaver {
                elements.add("<aftshouldercapped>" + trans.isAftShoulderCapped()
                                + "</aftshouldercapped>");
        }
-
+       
 }