Fixed table sorting bug in custom expression variable and operator selector windows.

Previously, correct item was not inserted if the table had been sorted by clicking on the column headers.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@974 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java b/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
index 49f4865708bf2fc62cb0600ecddc1b6e8471ec74..be13514f072c292b6b8ecc53bc4581c618ffbdcc 100644 (file)
--- a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java
@@ -150,7 +150,7 @@ public class OperatorSelector extends JDialog {
        
        private void selectOperator(){
                int row = table.getSelectedRow();
-               String str = tableModel.getOperatorAt(row);
+               String str = table.getValueAt(row, 0).toString();
                parentBuilder.pasteIntoExpression(str);
                OperatorSelector.this.dispose();
        }

diff --git a/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java b/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
index 5e0cfe9c16778aef0fa934f72c9731b9ef5e6322..90130e63dca193f59bb4f9369b71c19c19b833d3 100644 (file)
--- a/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
+++ b/core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
@@ -141,7 +141,7 @@ public class VariableSelector extends JDialog {
        
        private void selectVariable(){
                int row = table.getSelectedRow();
-               String str = tableModel.getSymbolAt(row);
+               String str = table.getValueAt(row, 1).toString();
                parentBuilder.pasteIntoExpression(str);
                VariableSelector.this.dispose();
        }