Author: aniedbala
Date: Mon Nov 24 11:19:38 2008
New Revision: 2843
Modified:
trunk/src/ca/sqlpower/architect/swingui/olap/MeasureEditPanel.java
Log:
A fix for bug 1704.
This modification was made because this is the only place
RolapAggregator.enumeration was being used, and this String array will not
need to change unless Mondrian changes.
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 Mon
Nov 24 11:19:38 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());
}
