projects
/
debian
/
openrocket
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed broken scrolling panel in custom expressions list.
[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 950828add1c798d9bdee3b834affe34d5cc84853..f9d6497816eea208d37eb57d68f01f424ddef969 100644
(file)
--- 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.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;
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 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")};
/*
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){
*/
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
}
@Override