X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fstartup%2FPreferences.java;h=ca82aa3f1961d89a379abda2274e4fd57351cd6f;hb=2bddccc8c2e80651f15e0b6c22c23f113c17610a;hp=c8a3a57596985ce673180e62dfcc613ebcf30377;hpb=953ac8ca75bc3bdcb9db8a382c7b3d63c795b27a;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/startup/Preferences.java b/core/src/net/sf/openrocket/startup/Preferences.java
index c8a3a575..ca82aa3f 100644
--- 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);
 		if (material != null) {
 			try {
-				Material m = Material.fromStorableString(material, false);
+				Material m = Material.fromStorableString(material);
 				if (m.getType() == type)
 					return m;
 			} catch (IllegalArgumentException ignore) {
@@ -364,8 +364,8 @@ public abstract class Preferences {
 	public abstract Set<Material> getUserMaterials();
 	public abstract void removeUserMaterial(Material m);
 
-	public abstract void setComponentFavorite( ComponentPreset preset, boolean favorite );
-	public abstract Set<String> getComponentFavorites( );
+	public abstract void setComponentFavorite( ComponentPreset preset, ComponentPreset.Type type, boolean favorite );
+	public abstract Set<String> getComponentFavorites( ComponentPreset.Type type );
 
 	/*
 	 * Map of default line styles
@@ -385,14 +385,13 @@ public abstract class Preferences {
 		
 		//// Elastic cord (round 2mm, 1/16 in)
 		private static final Material DEFAULT_LINE_MATERIAL =
-				Databases.findMaterial(Material.Type.LINE, trans.get("Databases.materials.Elasticcordround2mm"),
-						0.0018, false);
+				Databases.findMaterial(Material.Type.LINE, "Elasticcordround2mm", trans.get("Databases.materials.Elasticcordround2mm"),0.0018);
 		//// Ripstop nylon
 		private static final Material DEFAULT_SURFACE_MATERIAL =
-				Databases.findMaterial(Material.Type.SURFACE, trans.get("Databases.materials.Ripstopnylon"), 0.067, false);
+				Databases.findMaterial(Material.Type.SURFACE, "Ripstopnylon", trans.get("Databases.materials.Ripstopnylon"), 0.067);
 		//// Cardboard
 		private static final Material DEFAULT_BULK_MATERIAL =
-				Databases.findMaterial(Material.Type.BULK, trans.get("Databases.materials.Cardboard"), 680, false);
+				Databases.findMaterial(Material.Type.BULK, "Cardboard", trans.get("Databases.materials.Cardboard"), 680);
 	}
 	
 	private static final HashMap<Class<?>, String> DEFAULT_COLORS =