Fix the issue - Remove Model listener from the related data set property

pages when the pages are closed.[60467]
eclipse-birt · May 16, 2013 · d8ac06d · d8ac06d
1 parent e80c10a
commit d8ac06d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/.../src/org/eclipse/birt/report/designer/data/ui/dataset/DataSetDataSourceSelectionPage.java b/.../src/org/eclipse/birt/report/designer/data/ui/dataset/DataSetDataSourceSelectionPage.java
@@ -180,21 +180,23 @@ public boolean performOk( )
 			{
 				if ( lastSelectedDataSourceIndex != combo.getSelectionIndex( ) )
 				{
-					DataSetHandle datasetHandle =  (DataSetHandle) getContainer( ).getModel( ) ;
+					DataSetHandle datasetHandle = (DataSetHandle) getContainer( ).getModel( );
 					datasetHandle.setDataSource( combo.getItem( combo.getSelectionIndex( ) ) );
 					( (DataSetEditor) ( getContainer( ) ) ).updateDataSetDesign( this );
-
-					if( datasetHandle instanceof OdaDataSetHandle && datasetHandle.getProperty( DataSetHandle.RESULT_SET_PROP ) != null )
+
+					if ( datasetHandle instanceof OdaDataSetHandle
+							&& datasetHandle.getProperty( DataSetHandle.RESULT_SET_PROP ) != null )
 						datasetHandle.clearProperty( DataSetHandle.RESULT_SET_PROP );
 				}
-				( (DataSetHandle) ( getContainer( ).getModel( ) ) ).removeListener( this );
 			}
 		}
 		catch ( SemanticException e )
 		{
 			ExceptionHandler.handle( e );
 			return false;
 		}
+
+		( (DataSetHandle) ( getContainer( ).getModel( ) ) ).removeListener( this );
 		return super.performOk( );
 	}
 

diff --git a/...gner.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/DataSetFiltersPage.java b/...gner.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/DataSetFiltersPage.java
@@ -18,7 +18,6 @@
 import org.eclipse.birt.core.exception.BirtException;
 import org.eclipse.birt.report.designer.data.ui.property.AbstractDescriptionPropertyPage;
 import org.eclipse.birt.report.designer.data.ui.util.ChoiceSetFactory;
-import org.eclipse.birt.report.designer.data.ui.util.DataSetExceptionHandler;
 import org.eclipse.birt.report.designer.data.ui.util.DataSetExpressionProvider;
 import org.eclipse.birt.report.designer.internal.ui.util.ExceptionHandler;
 import org.eclipse.birt.report.designer.nls.Messages;
@@ -370,13 +369,20 @@ public boolean canLeave( )
 		return true;
 	}
 
+	public boolean performCancel( )
+	{
+		( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
+		return super.performCancel( );
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * 
 	 * @see org.eclipse.birt.report.designer.ui.IPropertyPage#performOk()
 	 */
 	public boolean performOk( )
 	{
+		( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
 		return canLeave( );
 	}
 

diff --git a/...r.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/DataSetParametersPage.java b/...r.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/DataSetParametersPage.java
@@ -1145,9 +1145,11 @@ public boolean performOk( )
 					&& this.getContainer( ) instanceof DataSetEditor )
 			{
 				this.modelChanged = false;
-				( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
 				( (DataSetEditor) getContainer( ) ).updateDataSetDesign( this );
 			}
+
+			( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
+
 			return super.performOk( );
 		}
 		else
@@ -1161,6 +1163,9 @@ public boolean performOk( )
 							} ) );
 			if ( confirm )
 				( (DataSetEditor) getContainer( ) ).updateDataSetDesign( this );
+
+			( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
+
 			return confirm;
 		}
 	}
@@ -2097,7 +2102,8 @@ public void widgetSelected( SelectionEvent event )
 								Messages.getString( "ParameterNodeProvider.dial.title.editScalar" ), false ); //$NON-NLS-1$
 						isCreateMode = false;
 					}
-					handle.addListener( new ScalarParameterListener( ) );
+					ScalarParameterListener scalarParameterListener = new ScalarParameterListener( );
+					handle.addListener( scalarParameterListener );
 					dialog.setInput( handle );
 					if ( dialog.open( ) == OK )
 					{
@@ -2132,6 +2138,8 @@ public void widgetSelected( SelectionEvent event )
 					{
 						dataSetParameterHandle.setParamName( originalParamName );
 					}
+
+					handle.removeListener( scalarParameterListener );
 				}
 			};
 

diff --git a/...er.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/OutputColumnDefnPage.java b/...er.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/OutputColumnDefnPage.java
@@ -647,7 +647,10 @@ public boolean performOk( )
 			return super.performOk( );
 		}
 		else
+		{
+			disposeAll( );
 			return false;
+		}
 	}
 
 	/**
@@ -715,7 +718,6 @@ private void disposeAll( )
 	{
 		rsColumnMap = null;
 		columnHintMap = null;
-	//	selectorImage.dispose( );
 		( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
 	}
 

diff --git a/...igner.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/OutputColumnsPage.java b/...igner.ui.data/src/org/eclipse/birt/report/designer/data/ui/dataset/OutputColumnsPage.java
@@ -308,10 +308,16 @@ public boolean performOk( )
 			}
 			if( !pageActivated )
 				this.setAnalysisTypeForColumn( );
+
+			( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
+
 			return super.performOk( );
 		}
 		else
+		{
+			( (DataSetHandle) getContainer( ).getModel( ) ).removeListener( this );
 			return false;
+		}
 	}
 
 	/*

diff --git a/...i.data/src/org/eclipse/birt/report/designer/data/ui/dataset/ParameterComboCellEditor.java b/...i.data/src/org/eclipse/birt/report/designer/data/ui/dataset/ParameterComboCellEditor.java
@@ -355,6 +355,7 @@ protected Object openDialogBox( Control cellEditorWindow )
 			}
 		}
 		setFocus( );
+		handle.removeListener( this.listener );
 		return null;
 	}