hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make inside appearance file tags more consistent with the rest

Browse Source 
All other tags use lowercase text, without special characters like '-'
This commit is contained in:
SiboVG 2022-10-19 23:11:14 +02:00
parent 3daa050d5f
commit a60297dbfa
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/file/openrocket/importt/ComponentParameterHandler.java
View File

@ -40,7 +40,8 @@ class ComponentParameterHandler extends AbstractElementHandler {
if ( element.equals("appearance")) { if ( element.equals("appearance")) {
return new AppearanceHandler(component,context); 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); return new InsideAppearanceHandler(component, context);
} }
if (element.equals("motormount")) { if (element.equals("motormount")) {
@ -92,10 +93,11 @@ class ComponentParameterHandler extends AbstractElementHandler {
@Override @Override
public void closeElement(String element, HashMap<String, String> attributes, public void closeElement(String element, HashMap<String, String> attributes,
String content, WarningSet warnings) { 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") || if (element.equals("subcomponents") || element.equals("motormount") ||
element.equals("finpoints") || element.equals("motorconfiguration") || 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")) { element.equals("deploymentconfiguration") || element.equals("separationconfiguration")) {
return; return;
} }

6
core/src/net/sf/openrocket/file/openrocket/importt/InsideAppearanceHandler.java
View File

@ -21,13 +21,15 @@ public class InsideAppearanceHandler extends AppearanceHandler {
@Override @Override
public void closeElement(String element, HashMap<String, String> attributes, String content, WarningSet warnings) throws SAXException { public void closeElement(String element, HashMap<String, String> 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); boolean edgesSameAsInside = Boolean.parseBoolean(content);
if (component instanceof InsideColorComponent) if (component instanceof InsideColorComponent)
((InsideColorComponent)component).getInsideColorComponentHandler().setEdgesSameAsInside(edgesSameAsInside); ((InsideColorComponent)component).getInsideColorComponentHandler().setEdgesSameAsInside(edgesSameAsInside);
return; 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); boolean insideSameAsOutside = Boolean.parseBoolean(content);
if (component instanceof InsideColorComponent) if (component instanceof InsideColorComponent)
((InsideColorComponent)component).getInsideColorComponentHandler().setSeparateInsideOutside(insideSameAsOutside); ((InsideColorComponent)component).getInsideColorComponentHandler().setSeparateInsideOutside(insideSameAsOutside);

8
core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
View File

@ -57,11 +57,11 @@ public class RocketComponentSaver {
InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler(); InsideColorComponentHandler handler = ((InsideColorComponent)c).getInsideColorComponentHandler();
Appearance ap_in = handler.getInsideAppearance(); Appearance ap_in = handler.getInsideAppearance();
if (ap_in != null) { if (ap_in != null) {
elements.add("<inside-appearance>"); elements.add("<insideappearance>");
appendElement(elements, "edgesSameAsInside", handler.isEdgesSameAsInside(), 1); appendElement(elements, "edgessameasinside", handler.isEdgesSameAsInside(), 1);
appendElement(elements, "insideSameAsOutside", handler.isSeparateInsideOutside(), 1); appendElement(elements, "insidesameasoutside", handler.isSeparateInsideOutside(), 1);
buildAppearanceElements(elements, ap_in); buildAppearanceElements(elements, ap_in);
elements.add("</inside-appearance>"); elements.add("</insideappearance>");
} }
} }