X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fdialogs%2Fpreset%2FComponentPresetTableColumn.java;h=5d5d12d6a5b67372ec40995d8999c981bc0fda87;hb=2bddccc8c2e80651f15e0b6c22c23f113c17610a;hp=70878f5abbcabbbe6defcbd08825592824383aaf;hpb=5dae291b96c5e0870c82a4907039f5fc19ebc7dc;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java
index 70878f5a..5d5d12d6 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java
@@ -1,6 +1,7 @@
 package net.sf.openrocket.gui.dialogs.preset;
 
-import javax.swing.table.TableCellEditor;
+import java.util.Set;
+
 import javax.swing.table.TableColumn;
 
 import net.sf.openrocket.l10n.Translator;
@@ -21,7 +22,7 @@ public abstract class ComponentPresetTableColumn extends TableColumn {
 	
 	}
 	
-	public abstract Object getValueFromPreset( ComponentPreset preset );
+	public abstract Object getValueFromPreset( Set<String> favorites, ComponentPreset preset );
 	
 	public static class Favorite extends ComponentPresetTableColumn {
 
@@ -30,8 +31,8 @@ public abstract class ComponentPresetTableColumn extends TableColumn {
 		}
 		
 		@Override
-		public Object getValueFromPreset( ComponentPreset preset ) {
-			return Boolean.valueOf(preset.isFavorite());
+		public Object getValueFromPreset( Set<String> favorites, ComponentPreset preset ) {
+			return Boolean.valueOf(favorites.contains(preset.preferenceKey()));
 		}
 
 	}
@@ -46,7 +47,7 @@ public abstract class ComponentPresetTableColumn extends TableColumn {
 		}
 
 		@Override
-		public Object getValueFromPreset(ComponentPreset preset) {
+		public Object getValueFromPreset(Set<String> favorites, ComponentPreset preset) {
 			return preset.has(key) ? preset.get(key) : null;
 		}
 		
@@ -65,10 +66,10 @@ public abstract class ComponentPresetTableColumn extends TableColumn {
 		}
 
 		@Override
-		public Object getValueFromPreset(ComponentPreset preset) {
-			Double value = (Double) super.getValueFromPreset(preset);
+		public Object getValueFromPreset(Set<String> favorites, ComponentPreset preset) {
+			Double value = (Double) super.getValueFromPreset(favorites, preset);
 			if ( value != null ) {
-				return new Value((Double)super.getValueFromPreset(preset),selectedUnit);
+				return new Value((Double)super.getValueFromPreset(favorites, preset),selectedUnit);
 			} else {
 				return null;
 			}