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
/
startup
/
Preferences.java
diff --git
a/core/src/net/sf/openrocket/startup/Preferences.java
b/core/src/net/sf/openrocket/startup/Preferences.java
index c8a3a57596985ce673180e62dfcc613ebcf30377..b8270a14e193cb68ebeba93dac3273b136fd1e72 100644
(file)
--- a/
core/src/net/sf/openrocket/startup/Preferences.java
+++ b/
core/src/net/sf/openrocket/startup/Preferences.java
@@
-234,7
+234,7
@@
public abstract class Preferences {
String material = get("componentMaterials", componentClass, null);
\r
if (material != null) {
\r
try {
\r
String material = get("componentMaterials", componentClass, null);
\r
if (material != null) {
\r
try {
\r
- Material m = Material.fromStorableString(material
, false
);
\r
+ Material m = Material.fromStorableString(material);
\r
if (m.getType() == type)
\r
return m;
\r
} catch (IllegalArgumentException ignore) {
\r
if (m.getType() == type)
\r
return m;
\r
} catch (IllegalArgumentException ignore) {
\r
@@
-385,14
+385,13
@@
public abstract class Preferences {
\r
//// Elastic cord (round 2mm, 1/16 in)
\r
private static final Material DEFAULT_LINE_MATERIAL =
\r
\r
//// Elastic cord (round 2mm, 1/16 in)
\r
private static final Material DEFAULT_LINE_MATERIAL =
\r
- Databases.findMaterial(Material.Type.LINE, trans.get("Databases.materials.Elasticcordround2mm"),
\r
- 0.0018, false);
\r
+ Databases.findMaterial(Material.Type.LINE, "Elasticcordround2mm", trans.get("Databases.materials.Elasticcordround2mm"),0.0018);
\r
//// Ripstop nylon
\r
private static final Material DEFAULT_SURFACE_MATERIAL =
\r
//// Ripstop nylon
\r
private static final Material DEFAULT_SURFACE_MATERIAL =
\r
- Databases.findMaterial(Material.Type.SURFACE,
trans.get("Databases.materials.Ripstopnylon"), 0.067, false
);
\r
+ Databases.findMaterial(Material.Type.SURFACE,
"Ripstopnylon", trans.get("Databases.materials.Ripstopnylon"), 0.067
);
\r
//// Cardboard
\r
private static final Material DEFAULT_BULK_MATERIAL =
\r
//// Cardboard
\r
private static final Material DEFAULT_BULK_MATERIAL =
\r
- Databases.findMaterial(Material.Type.BULK,
trans.get("Databases.materials.Cardboard"), 680, false
);
\r
+ Databases.findMaterial(Material.Type.BULK,
"Cardboard", trans.get("Databases.materials.Cardboard"), 680
);
\r
}
\r
\r
private static final HashMap<Class<?>, String> DEFAULT_COLORS =
\r
}
\r
\r
private static final HashMap<Class<?>, String> DEFAULT_COLORS =
\r