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

Mass types now save.

Browse Source
This commit is contained in:
Craig Earls 2014-12-13 15:21:09 -07:00
parent 66eb5753e5
commit 07b831c34f
3 changed files with 22 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/DocumentConfig.java
View File

@ -314,6 +314,14 @@ class DocumentConfig {
// MassComponent // MassComponent
setters.put("MassComponent:mass", new DoubleSetter( setters.put("MassComponent:mass", new DoubleSetter(
Reflection.findMethod(MassComponent.class, "setComponentMass", double.class))); Reflection.findMethod(MassComponent.class, "setComponentMass", double.class)));
/*setters.put("MassComponent:masscomponenttype", new DoubleSetter(
Reflection.findMethod(MassComponent.class, "setMassComponentType", double.class)));*/
setters.put("MassComponent:masscomponenttype", new EnumSetter<MassComponent.MassComponentType>(
Reflection.findMethod(MassComponent.class, "setMassComponentType", MassComponent.MassComponentType.class),
MassComponent.MassComponentType.class));
/* setters.put("Transition:shape", new EnumSetter<Transition.Shape>(
Reflection.findMethod(Transition.class, "setType", Transition.Shape.class),
Transition.Shape.class));*/
// ShockCord // ShockCord
setters.put("ShockCord:cordlength", new DoubleSetter( setters.put("ShockCord:cordlength", new DoubleSetter(

21
core/src/net/sf/openrocket/file/openrocket/savers/MassComponentSaver.java
View File

@ -2,31 +2,36 @@ package net.sf.openrocket.file.openrocket.savers;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import net.sf.openrocket.rocketcomponent.MassComponent; import net.sf.openrocket.rocketcomponent.MassComponent;
import net.sf.openrocket.rocketcomponent.MassComponent.MassComponentType;
public class MassComponentSaver extends MassObjectSaver { public class MassComponentSaver extends MassObjectSaver {
private static final MassComponentSaver instance = new MassComponentSaver(); private static final MassComponentSaver instance = new MassComponentSaver();
public static List<String> getElements(net.sf.openrocket.rocketcomponent.RocketComponent c) { public static List<String> getElements(net.sf.openrocket.rocketcomponent.RocketComponent c) {
List<String> list = new ArrayList<String>(); List<String> list = new ArrayList<String>();
list.add("<masscomponent>"); list.add("<masscomponent>");
instance.addParams(c, list); instance.addParams(c, list);
list.add("</masscomponent>"); list.add("</masscomponent>");
return list; return list;
} }
@Override @Override
protected void addParams(net.sf.openrocket.rocketcomponent.RocketComponent c, List<String> elements) { protected void addParams(net.sf.openrocket.rocketcomponent.RocketComponent c, List<String> elements) {
super.addParams(c, elements); super.addParams(c, elements);
MassComponent mass = (MassComponent) c; MassComponent mass = (MassComponent) c;
elements.add("<mass>" + mass.getMass() + "</mass>"); elements.add("<mass>" + mass.getMass() + "</mass>");
MassComponentType type = mass.getMassComponentType();
elements.add("<masscomponenttype>" + type.name().toLowerCase(Locale.ENGLISH) + "</masscomponenttype>");
} }
} }

2
core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
View File

@ -15,7 +15,7 @@ public class MassComponent extends MassObject {
private double mass = 0; private double mass = 0;
public enum MassComponentType { public static enum MassComponentType {
MASSCOMPONENT(Application.getTranslator().get("MassComponent.MassComponent")), MASSCOMPONENT(Application.getTranslator().get("MassComponent.MassComponent")),
ALTIMETER(Application.getTranslator().get("MassComponent.Altimeter")), ALTIMETER(Application.getTranslator().get("MassComponent.Altimeter")),
FLIGHTCOMPUTER(Application.getTranslator().get("MassComponent.FlightComputer")), FLIGHTCOMPUTER(Application.getTranslator().get("MassComponent.FlightComputer")),