[power-architect commit] r2672 - trunk/src/ca/sqlpower/architect/swingui/olap

[codesite-noreply]

Author: kaiyi4
Date: Fri Aug 29 14:36:05 2008
New Revision: 2672
Modified:
   trunk/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java

Log:
"Use Expression" will be enabled if the target measure is currently using  
expression. This also help turn off that big validation red light every  
time I try to edit a measure that uses expressions.

Modified: trunk/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java	 
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java	Fri  
Aug 29 14:36:05 2008
@@ -120,7 +120,8 @@
         builder.append(new JScrollPane(expression = new JTextArea(4, 30)),  
3);
         expression.setLineWrap(true);

-        SQLTable cubeTable = OLAPUtil.tableForCube((Cube)  
measure.getParent());
+        Cube parentCube = (Cube) measure.getParent();
+        SQLTable cubeTable = OLAPUtil.tableForCube(parentCube);
         boolean enableColumns = false;
         if (cubeTable == null) {
             columnChooser.addItem("Parent Cube has no table");
@@ -132,6 +133,7 @@
             for (SQLColumn col : cubeTable.getColumns()) {
                 if (col.getName().equalsIgnoreCase(measure.getColumn())) {
                     columnChooser.setSelectedItem(col);
+                    break;
                 }
             }
             enableColumns = true;
@@ -148,6 +150,7 @@
                     exp = sql;
                 }
             }
+            expRadioButton.doClick();
         }
         expression.setText(exp == null ? "" : exp.getText());