From: richardgraham <richardgraham@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Sat, 18 Aug 2012 07:18:13 +0000 (+0000)
Subject: Fixed table sorting bug in custom expression variable and operator selector windows.
X-Git-Tag: upstream/12.09^2~50
X-Git-Url: https://git.gag.com/?p=debian%2Fopenrocket;a=commitdiff_plain;h=aa898a75c54f5184570e6f2471786fe174e9984e

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 49f48657..be13514f 100644
--- 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 5e0cfe9c..90130e63 100644
--- 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();
 	}