[power-architect commit] r2853 - branches/release-0.9.12/src/ca/sqlpower/architect/swingui/olap

[codesite-noreply]

Author: [EMAIL PROTECTED]
Date: Thu Nov 27 13:15:11 2008
New Revision: 2853
Modified:
    
branches/release-0.9.12/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java

Log:
Backport of r2843 to the 0.9.12 branch. This fixes the missing XOM library  
dependency causing exceptions when creating new measures.

Modified:  
branches/release-0.9.12/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java
==============================================================================
---  
branches/release-0.9.12/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java	 
(original)
+++  
branches/release-0.9.12/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java	 
Thu Nov 27 13:15:11 2008
@@ -32,7 +32,6 @@
 import javax.swing.JTextArea;
 import javax.swing.JTextField;

-import mondrian.rolap.RolapAggregator;
 import ca.sqlpower.architect.ArchitectException;
 import ca.sqlpower.architect.SQLColumn;
 import ca.sqlpower.architect.SQLTable;
@@ -88,7 +87,9 @@
         builder.append(status, 3);
         builder.append("Name", name = new JTextField(measure.getName()));
         builder.append("Caption", captionField = new  
JTextField(measure.getCaption()));
-        builder.append("Aggregator", aggregator = new  
JComboBox(RolapAggregator.enumeration.getNames()));
+
+        String[] rolapAggregates = new String[]  
{"sum", "count", "min", "max", "avg", "distinct-count"} ;
+        builder.append("Aggregator", aggregator = new  
JComboBox(rolapAggregates));
         if (measure.getAggregator() != null) {
             aggregator.setSelectedItem(measure.getAggregator());
         }