| author | ning.zhang | 2011-09-22 04:29:38 (EDT) |
|---|---|---|
| committer | xgu | 2011-10-25 02:10:10 (EDT) |
| commit | e26ec2119aa791728eced8c0692a12db549c9fe4 (patch) (side-by-side diff) | |
| tree | fee40735367c7885a69964cd0b61046f7d333d45 | |
| parent | 5645f42512459eeb2eae85f78f3da7d459aab4c6 (diff) | |
| download | org.eclipse.birt-e26ec2119aa791728eced8c0692a12db549c9fe4.zip org.eclipse.birt-e26ec2119aa791728eced8c0692a12db549c9fe4.tar.gz org.eclipse.birt-e26ec2119aa791728eced8c0692a12db549c9fe4.tar.bz2 | |
Avoid adding duplicate expressions.
| -rw-r--r-- | xtab/org.eclipse.birt.report.item.crosstab.ui/src/org/eclipse/birt/report/item/crosstab/ui/views/dialogs/CrosstabFilterConditionBuilder.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.ui/src/org/eclipse/birt/report/item/crosstab/ui/views/dialogs/CrosstabFilterConditionBuilder.java b/xtab/org.eclipse.birt.report.item.crosstab.ui/src/org/eclipse/birt/report/item/crosstab/ui/views/dialogs/CrosstabFilterConditionBuilder.java index e87ae85..3179df8 100644 --- a/xtab/org.eclipse.birt.report.item.crosstab.ui/src/org/eclipse/birt/report/item/crosstab/ui/views/dialogs/CrosstabFilterConditionBuilder.java +++ b/xtab/org.eclipse.birt.report.item.crosstab.ui/src/org/eclipse/birt/report/item/crosstab/ui/views/dialogs/CrosstabFilterConditionBuilder.java @@ -1353,9 +1353,14 @@ public class CrosstabFilterConditionBuilder extends BaseTitleAreaDialog } boolean change = false; + List strValues = new ArrayList( ); + for ( int i = 0; i < valueList.size( ); i++ ) + { + strValues.add( ( (Expression) valueList.get( i ) ).getStringExpression( ) ); + } for ( int i = 0; i < retValue.length; i++ ) { - if ( valueList.indexOf( DEUtil.resolveNull( retValue[i] ) ) < 0 ) + if ( strValues.indexOf( DEUtil.resolveNull( retValue[i] ) ) < 0 ) { valueList.add( new Expression( DEUtil.resolveNull( retValue[i] ), ExpressionButtonUtil.getExpressionButton( CCombo ) |