projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
De-localize Material and FlightDataType objects when persisting in ork files. Added...
[debian/openrocket]
/
core
/
src
/
net
/
sf
/
openrocket
/
preset
/
xml
/
MaterialDTO.java
diff --git
a/core/src/net/sf/openrocket/preset/xml/MaterialDTO.java
b/core/src/net/sf/openrocket/preset/xml/MaterialDTO.java
index 6bfbe4c659fdc1a0f124d0bb4d0dc9a9e2d43b3d..405596a446fe5ee0034391dd7ce96efda7cd83ff 100644
(file)
--- a/
core/src/net/sf/openrocket/preset/xml/MaterialDTO.java
+++ b/
core/src/net/sf/openrocket/preset/xml/MaterialDTO.java
@@
-9,7
+9,6
@@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
-import net.sf.openrocket.database.Databases;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.util.Chars;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.util.Chars;
@@
-80,7
+79,7
@@
public class MaterialDTO {
}
Material asMaterial() {
}
Material asMaterial() {
- return Material.new
Material(type.getORMaterialType(), name, density, true
);
+ return Material.new
UserMaterial(type.getORMaterialType(), name, density
);
}
}