diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java index 89bb2fd6d..dfc6b40d1 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java @@ -40,7 +40,8 @@ class ComponentParameterHandler extends AbstractElementHandler { if ( element.equals("appearance")) { return new AppearanceHandler(component,context); } - if (element.equals("inside-appearance")) { + // TODO: delete 'inside-appearance' when backward compatibility with 22.02.beta.01-22.02.beta.05 is not needed anymore + if (element.equals("insideappearance") || element.equals("inside-appearance")) { return new InsideAppearanceHandler(component, context); } if (element.equals("motormount")) { @@ -92,10 +93,11 @@ class ComponentParameterHandler extends AbstractElementHandler { @Override public void closeElement(String element, HashMap attributes, String content, WarningSet warnings) { - + + // TODO: delete 'inside-appearance' when backward compatibility with 22.02.beta.01-22.02.beta.05 is not needed anymore if (element.equals("subcomponents") || element.equals("motormount") || element.equals("finpoints") || element.equals("motorconfiguration") || - element.equals("appearance") || element.equals("inside-appearance") || + element.equals("appearance") || element.equals("insideappearance") || element.equals("inside-appearance") || element.equals("deploymentconfiguration") || element.equals("separationconfiguration")) { return; } diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java index 3bbaee47e..9940a30cb 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java @@ -21,13 +21,15 @@ public class InsideAppearanceHandler extends AppearanceHandler { @Override public void closeElement(String element, HashMap attributes, String content, WarningSet warnings) throws SAXException { - if ("edgesSameAsInside".equals(element)) { + // TODO: delete 'edgesSameAsInside' when backward compatibility with 22.02.beta.01-22.02.beta.05 is not needed anymore + if ("edgessameasinside".equals(element) || "edgesSameAsInside".equals(element)) { boolean edgesSameAsInside = Boolean.parseBoolean(content); if (component instanceof InsideColorComponent) ((InsideColorComponent)component).getInsideColorComponentHandler().setEdgesSameAsInside(edgesSameAsInside); return; } - if ("insideSameAsOutside".equals(element)) { + // TODO: delete 'insideSameAsOutside' when backward compatibility with 22.02.beta.01-22.02.beta.05 is not needed anymore + if ("insidesameasoutside".equals(element) || "insideSameAsOutside".equals(element)) { boolean insideSameAsOutside = Boolean.parseBoolean(content); if (component instanceof InsideColorComponent) ((InsideColorComponent)component).getInsideColorComponentHandler().setSeparateInsideOutside(insideSameAsOutside); diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java index 30da61d9d..5b273dff7 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java @@ -57,11 +57,11 @@ public class RocketComponentSaver { InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler(); Appearance ap_in = handler.getInsideAppearance(); if (ap_in != null) { - elements.add(""); - appendElement(elements, "edgesSameAsInside", handler.isEdgesSameAsInside(), 1); - appendElement(elements, "insideSameAsOutside", handler.isSeparateInsideOutside(), 1); + elements.add(""); + appendElement(elements, "edgessameasinside", handler.isEdgesSameAsInside(), 1); + appendElement(elements, "insidesameasoutside", handler.isSeparateInsideOutside(), 1); buildAppearanceElements(elements, ap_in); - elements.add(""); + elements.add(""); } }