X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fgui%2Fcustomexpression%2FVariableTableModel.java;h=f9d6497816eea208d37eb57d68f01f424ddef969;hb=c322e9329373aa7f0b071663874327da7e650082;hp=950828add1c798d9bdee3b834affe34d5cc84853;hpb=7f3ff15f6bbeeb8eae236cc3a111bcc6c60fd441;p=debian%2Fopenrocket

diff --git a/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java b/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
index 950828ad..f9d64978 100644
--- a/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
@@ -7,6 +7,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.Vector;
 
 import javax.swing.JTable;
@@ -28,7 +30,7 @@ public class VariableTableModel extends AbstractTableModel {
 
 	private static final Translator trans = Application.getTranslator();
 
-	private ArrayList<FlightDataType> types = new ArrayList<FlightDataType>();
+	private List<FlightDataType> types; // = new ArrayList<FlightDataType>();
 	private static final String[] columnNames = {trans.get("customExpression.Name"), trans.get("customExpression.Symbol"), trans.get("customExpression.Units")};
 	
 	/*
@@ -36,11 +38,12 @@ public class VariableTableModel extends AbstractTableModel {
 	 */
 	public VariableTableModel(OpenRocketDocument doc){
 		
-		Collections.addAll(types, FlightDataType.ALL_TYPES);
+		types = new ArrayList<FlightDataType>( doc.getFlightDataTypes() );
 		
-		for (CustomExpression expression : doc.getCustomExpressions()){
-			types.add(expression.getType());
-		}
+		//Collections.addAll(types, FlightDataType.ALL_TYPES);
+		//for (CustomExpression expression : doc.getCustomExpressions()){
+		//	types.add(expression.getType());
+		//}
 	}
 	
 	@Override