From e888f07ebf6a0a60e07c8b0d5bd10005277c3996 Mon Sep 17 00:00:00 2001 From: yaoping Date: Fri, 8 Nov 2013 14:26:55 +0800 Subject: [PATCH] revert change of T68653 --- .../reportitem/ui/ReportDataServiceProvider.java | 11 ++--------- .../birt/chart/reportitem/ui/i18n/nls.properties | 2 -- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/ReportDataServiceProvider.java b/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/ReportDataServiceProvider.java index 4a400051b77..dbf5a4f9272 100644 --- a/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/ReportDataServiceProvider.java +++ b/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/ReportDataServiceProvider.java @@ -1731,10 +1731,9 @@ protected IQueryResults executeDataSetQuery( QueryDefinition queryDefn ) * @param queryDefn * @throws AdapterException * @throws DataException - * @throws ChartException */ protected void setQueryDefinitionWithDataSet( Chart cm, ExtendedItemHandle handle, - QueryDefinition queryDefn ) throws AdapterException, DataException, ChartException + QueryDefinition queryDefn ) throws AdapterException, DataException { // Iterate parameter bindings to check if its expression is a // explicit @@ -1744,13 +1743,7 @@ protected void setQueryDefinitionWithDataSet( Chart cm, ExtendedItemHandle handl // Add bindings and filters from report handle. Iterator bindingIt = getUsedDataSetBindings( cm, handle ); - if ( bindingIt == null || !bindingIt.hasNext( ) ) - { - throw new ChartException( ChartReportItemPlugin.ID, - ChartException.DATA_BINDING, - Messages.getString( "exception.no.valid.binding" ) ); //$NON-NLS-1$ - } - while ( bindingIt.hasNext( ) ) + while ( bindingIt != null && bindingIt.hasNext( ) ) { Object computedBinding = bindingIt.next( ); IBinding binding = session.getModelAdaptor( ) diff --git a/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/i18n/nls.properties b/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/i18n/nls.properties index 92fc4ce700d..7975a14145f 100644 --- a/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/i18n/nls.properties +++ b/chart/org.eclipse.birt.chart.reportitem.ui/src/org/eclipse/birt/chart/reportitem/ui/i18n/nls.properties @@ -106,5 +106,3 @@ ChartCubeFilterConditionBuilder.Expression.ValueItemPrefix=Value: ChartCubeFilterConditionBuilder.Expression.YOptionItem.Prefix=Y Option: ChartCubeFilterConditionBuilder.SelectValueDialog.messages.info.selectVauleUnavailable=Value list unavailable with given expression. ChartCubeFilterConditionBuilder.SelectValueDialog.messages.info.illegalVauleExpr=Only the expression with format like data["name"]/[name] can get its value list. - -exception.no.valid.binding=No valid bindings. Please check if the expressions are correct. \ No newline at end of file