From c322e9329373aa7f0b071663874327da7e650082 Mon Sep 17 00:00:00 2001 From: richardgraham Date: Wed, 12 Sep 2012 07:32:58 +0000 Subject: [PATCH] Fixed broken scrolling panel in custom expressions list. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@1020 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../gui/customexpression/CustomExpressionPanel.java | 12 ++++++------ .../gui/customexpression/VariableTableModel.java | 13 ++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java b/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java index 08c83a4b..ba928482 100644 --- a/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java +++ b/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java @@ -46,14 +46,14 @@ public class CustomExpressionPanel extends JPanel { expressionSelectorPanel = new JPanel(new MigLayout("gapy rel")); expressionSelectorPanel.setToolTipText(trans.get("customExpressionPanel.lbl.CalcNote")); - JScrollPane scroll = new JScrollPane(); - Border bdr = BorderFactory.createTitledBorder(trans.get("customExpressionPanel.lbl.CustomExpressions")); - - expressionSelectorPanel.setBorder(bdr); - expressionSelectorPanel.add(scroll); + JScrollPane scroll = new JScrollPane(expressionSelectorPanel); + + //Border bdr = BorderFactory.createTitledBorder(trans.get("customExpressionPanel.lbl.CustomExpressions")); + //scroll.setBorder(bdr); + //expressionSelectorPanel.add(scroll); //this.add(expressionSelectorPanel, "spany 1, height 10px, wmin 600lp, grow 100, gapright para"); - this.add(expressionSelectorPanel, "hmin 200lp, wmin 700lp, grow 100, wrap"); + this.add(scroll, "hmin 200lp, wmin 700lp, grow 100, wrap"); //DescriptionArea desc = new DescriptionArea(trans.get("customExpressionPanel.lbl.UpdateNote")+"\n\n"+trans.get("customExpressionPanel.lbl.CalcNote"), 8, -2f); //desc.setViewportBorder(BorderFactory.createEmptyBorder()); 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 types = new ArrayList(); + private List types; // = new ArrayList(); 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( 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 -- 2.30.2