create changelog entry

[debian/openrocket] / core / src / net / sf / openrocket / gui / customexpression / VariableTableModel.java

diff --git a/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java b/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
index b81a6b05e388e188a5cb680cbb90fdc2dd967b14..f9d6497816eea208d37eb57d68f01f424ddef969 100644 (file)
--- a/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
@@ -3,15 +3,22 @@
  */
 package net.sf.openrocket.gui.customexpression;
 
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
 
+import javax.swing.JTable;
 import javax.swing.table.AbstractTableModel;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
 
-import net.sf.openrocket.document.Simulation;
+import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.l10n.Translator;
-import net.sf.openrocket.simulation.CustomExpression;
+import net.sf.openrocket.simulation.customexpression.CustomExpression;
 import net.sf.openrocket.simulation.FlightDataType;
 import net.sf.openrocket.startup.Application;
 
@@ -23,20 +30,20 @@ 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")};
        
        /*
         * Table model will be constructed with all the built in variables and any custom variables defined
         */
-       public VariableTableModel(Simulation sim){
+       public VariableTableModel(OpenRocketDocument doc){
                
-               Collections.addAll(types, FlightDataType.ALL_TYPES);
-               
-               for (CustomExpression expression : sim.getCustomExpressions()){
-                       types.add(expression.getType());
-               }
+               types = new ArrayList<FlightDataType>( doc.getFlightDataTypes() );
                
+               //Collections.addAll(types, FlightDataType.ALL_TYPES);
+               //for (CustomExpression expression : doc.getCustomExpressions()){
+               //      types.add(expression.getType());
+               //}
        }
        
        @Override
@@ -56,7 +63,7 @@ public class VariableTableModel extends AbstractTableModel {
                else if (col == 1)
                        return types.get(row).getSymbol();
                else if (col == 2)
-                       return types.get(row).getUnitGroup().getDefaultUnit().toString();
+                       return types.get(row).getUnitGroup().getSIUnit().toString();
                
                return null;
        }