Attachment 60937 Details for Bug 173451 – Second version of the patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Second version of the patch

173451_patch-v1.txt (text/plain), 3.94 KB, created by amehrega

on 2007-03-15 09:58:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: amehrega

Created: 2007-03-15 09:58:30 EDT

Size: 3.94 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.test.auto.gui
>Index: src/org/eclipse/tptp/test/auto/gui/internal/dialogs/AutoGUITestControllerDialog.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.auto.gui/src/org/eclipse/tptp/test/auto/gui/internal/dialogs/AutoGUITestControllerDialog.java,v
>retrieving revision 1.3
>diff -u -r1.3 AutoGUITestControllerDialog.java
>--- src/org/eclipse/tptp/test/auto/gui/internal/dialogs/AutoGUITestControllerDialog.java	23 Aug 2006 20:40:30 -0000	1.3
>+++ src/org/eclipse/tptp/test/auto/gui/internal/dialogs/AutoGUITestControllerDialog.java	15 Mar 2007 13:56:32 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2006 IBM Corporation and others.
>+ * Copyright (c) 2005, 2007 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials 
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -573,14 +573,22 @@
> 	 * @param status The status to be printed
> 	 */
> 	public void setStatus (String status)
>-	{		
>+	{	
>+		
> 		/* The delegator has to handle this (if one exists) */
>-		if (isRoot && delegator != null)
>+		if (isRoot && delegator != null && !delegator.isShellDisposed)
> 		{
> 			delegator.setStatus(status);
> 			return;
> 		}
>-			
>+		//added for defect 173451 to ensure that in case where the widget is disposed
>+		// we switch to the correct reference (for Linux platform)
>+		// Liz Dancy
>+		else if (statuslbl.isDisposed() && delegator.isShellDisposed){
>+			
>+			this.updateDelegator(this.realParent, this.realParent);
>+			statuslbl = this.delegator.statuslbl;
>+		}	
> 		if (status == null)
> 			return;
> 		
>@@ -590,11 +598,10 @@
> 		if (finalStatus.length() > 30)
> 			toolong = true;
> 		
>-		
>+	
> 		statuslbl.setToolTipText(finalStatus);
> 		if (toolong)
> 			finalStatus = finalStatus.substring (0, 30) + "...";
>-		
> 			
> 		statuslbl.setText (finalStatus);
> 	}
>@@ -697,8 +704,9 @@
> 		
> 		AutoGUITestControllerDialog delegator = rootControl.getDelegator();
> 		/* Get rid of the last delegator */					
>-		if (activeControlDialog != null)
>+		if (activeControlDialog != null ){
> 			activeControlDialog.dispose();
>+		}
> 		
> 		delegator = new AutoGUITestControllerDialog(guardian, AutoGUITestControllerDialog.this);																
> 		delegator.setLocation(location);
>@@ -708,7 +716,7 @@
> 		delegator.setStatus(lastStatus);	
> 		delegator.actualParent = guardian;
> 		delegator.realParent = realParent;
>-				
>+		
> 		rootControl.setDelegator(delegator);
> 	}
> 	
>Index: src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUITestCasesForm.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.tptp.test.auto.gui/src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUITestCasesForm.java,v
>retrieving revision 1.18
>diff -u -r1.18 AutoGUITestCasesForm.java
>--- src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUITestCasesForm.java	2 Mar 2007 04:33:15 -0000	1.18
>+++ src/org/eclipse/tptp/test/auto/gui/internal/editor/AutoGUITestCasesForm.java	15 Mar 2007 13:56:32 -0000
>@@ -1690,7 +1690,7 @@
> 				
> 				IActionBars actionBar = AutoGUITestCasesForm.this.getEditorSite().getActionBars();
> 				if (actionBar != null)
>-				{
>+				{					
> 					undoAction.setEnabled(undoAction.isEnabled());
> 					redoAction.setEnabled(redoAction.isEnabled());
> 					actionBar.updateActionBars();
>@@ -1704,7 +1704,14 @@
> 			
> 		public boolean isEnabled()
> 		{
>-			return undo ? linearOperationHistory.canUndo(getUndoContext()) : linearOperationHistory.canRedo(getUndoContext());
>+			try
>+			{
>+				return undo ? linearOperationHistory.canUndo(getUndoContext()) : linearOperationHistory.canRedo(getUndoContext());
>+			}
>+			catch(Exception e)
>+			{
>+				return false;
>+			}
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 173451: 60853 | 60937