Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

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

diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
index e8b7a345570222718d2b7186249b5f6dcca775cb..be7c52af809133a7fa31239e1b20065b7d1d74f1 100644 (file)
--- a/core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
+++ b/core/src/net/sf/openrocket/file/openrocket/savers/RocketSaver.java
@@ -2,51 +2,49 @@ package net.sf.openrocket.file.openrocket.savers;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import net.sf.openrocket.rocketcomponent.ReferenceType;
 import net.sf.openrocket.rocketcomponent.Rocket;
 
-
 public class RocketSaver extends RocketComponentSaver {
-
+       
        private static final RocketSaver instance = new RocketSaver();
-
+       
        public static ArrayList<String> getElements(net.sf.openrocket.rocketcomponent.RocketComponent c) {
                ArrayList<String> list = new ArrayList<String>();
-
+               
                list.add("<rocket>");
                instance.addParams(c, list);
                list.add("</rocket>");
-
+               
                return list;
        }
-
-
-
+       
        @Override
        protected void addParams(net.sf.openrocket.rocketcomponent.RocketComponent c, List<String> elements) {
                super.addParams(c, elements);
-
+               
                Rocket rocket = (Rocket) c;
                
                if (rocket.getDesigner().length() > 0) {
-                       elements.add("<designer>" 
+                       elements.add("<designer>"
                                        + net.sf.openrocket.file.RocketSaver.escapeXML(rocket.getDesigner())
                                        + "</designer>");
                }
                if (rocket.getRevision().length() > 0) {
-                       elements.add("<revision>" 
-                                       + net.sf.openrocket.file.RocketSaver.escapeXML(rocket.getRevision()) 
+                       elements.add("<revision>"
+                                       + net.sf.openrocket.file.RocketSaver.escapeXML(rocket.getRevision())
                                        + "</revision>");
                }
-
-
+               
+               
                // Motor configurations
                String defId = rocket.getDefaultConfiguration().getMotorConfigurationID();
                for (String id : rocket.getMotorConfigurationIDs()) {
                        if (id == null)
                                continue;
-
+                       
                        String str = "<motorconfiguration configid=\"" + id + "\"";
                        if (id.equals(defId))
                                str += " default=\"true\"";
@@ -55,19 +53,19 @@ public class RocketSaver extends RocketComponentSaver {
                                str += "/>";
                        } else {
                                str += "><name>" + net.sf.openrocket.file.RocketSaver.escapeXML(rocket.getMotorConfigurationName(id))
-                                       + "</name></motorconfiguration>";
+                                               + "</name></motorconfiguration>";
                        }
                        elements.add(str);
                }
                
                // Reference diameter
-               elements.add("<referencetype>" + rocket.getReferenceType().name().toLowerCase()
+               elements.add("<referencetype>" + rocket.getReferenceType().name().toLowerCase(Locale.ENGLISH)
                                + "</referencetype>");
                if (rocket.getReferenceType() == ReferenceType.CUSTOM) {
                        elements.add("<customreference>" + rocket.getCustomReferenceLength()
                                        + "</customreference>");
                }
-
+               
        }
-
+       
 }