diff --git a/chart/org.eclipse.birt.chart.ui.extension/src/org/eclipse/birt/chart/ui/swt/wizard/data/BaseDataDefinitionComponent.java b/chart/org.eclipse.birt.chart.ui.extension/src/org/eclipse/birt/chart/ui/swt/wizard/data/BaseDataDefinitionComponent.java index c917e45ed05..be1854b1a22 100644 --- a/chart/org.eclipse.birt.chart.ui.extension/src/org/eclipse/birt/chart/ui/swt/wizard/data/BaseDataDefinitionComponent.java +++ b/chart/org.eclipse.birt.chart.ui.extension/src/org/eclipse/birt/chart/ui/swt/wizard/data/BaseDataDefinitionComponent.java @@ -876,7 +876,7 @@ private void enableAggEditor(String expression) { ec.decode(expression); expression = ec.convertJSExpression(false); - boolean enabled = this.context.getUIFactory().createUIHelper().useDataSetRow(context.getExtendedItem(), + boolean enabled = !this.context.getUIFactory().createUIHelper().useDataSetRow(context.getExtendedItem(), expression); fAggEditorComposite.setEnabled(enabled); } catch (BirtException e) { diff --git a/chart/org.eclipse.birt.chart.ui/src/org/eclipse/birt/chart/ui/integrate/ChartUIHelperBase.java b/chart/org.eclipse.birt.chart.ui/src/org/eclipse/birt/chart/ui/integrate/ChartUIHelperBase.java index 7d422b1d101..40ac25d1244 100644 --- a/chart/org.eclipse.birt.chart.ui/src/org/eclipse/birt/chart/ui/integrate/ChartUIHelperBase.java +++ b/chart/org.eclipse.birt.chart.ui/src/org/eclipse/birt/chart/ui/integrate/ChartUIHelperBase.java @@ -48,7 +48,12 @@ public boolean canCombine(IChartType type, ChartWizardContext context) { @Override public boolean useDataSetRow(Object reportItem, String expression) throws BirtException { - // Default implementation, do nothing - return false; + /* + * Default implementation is a bit simple, this behavior is copied from + * org.eclipse.birt.chart.ui.swt.wizard.data.BaseDataDefinitionComponent. + * enableAggEditor( String expression ) prior to the refactoring that yielded + * this method. According to the javadoc it should be more comprehensive though. + */ + return expression.startsWith("data"); //$NON-NLS-1$ } }