Attachment 120675 Details for Bug 64830 – Work in progress

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

Work in progress

clipboard.txt (text/plain), 11.52 KB, created by Krzysztof Daniel

on 2008-12-17 05:52:27 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2008-12-17 05:52:27 EST

Size: 11.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java,v
>retrieving revision 1.20
>diff -u -r1.20 ElementTreeSelectionDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java	24 Mar 2008 19:21:57 -0000	1.20
>+++ Eclipse UI/org/eclipse/ui/dialogs/ElementTreeSelectionDialog.java	17 Dec 2008 10:50:49 -0000
>@@ -70,8 +70,7 @@
> 
>     private String fEmptyListMessage = WorkbenchMessages.ElementTreeSelectionDialog_nothing_available;
> 
>-    private IStatus fCurrStatus = new Status(IStatus.OK, PlatformUI.PLUGIN_ID,
>-            IStatus.OK, "", null); //$NON-NLS-1$
>+    private IStatus fCurrStatus = Status.OK_STATUS;
> 
>     private List fFilters;
> 
>@@ -200,9 +199,7 @@
>                 fCurrStatus = fValidator.validate(getResult());
>                 updateStatus(fCurrStatus);
>             } else {
>-                fCurrStatus = new Status(IStatus.OK, PlatformUI.PLUGIN_ID,
>-                        IStatus.OK, "", //$NON-NLS-1$
>-                        null);
>+                fCurrStatus = Status.OK_STATUS;
>             }
>         } else {
>             fCurrStatus = new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID,
>Index: Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java,v
>retrieving revision 1.14
>diff -u -r1.14 SelectionStatusDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java	8 May 2006 20:55:32 -0000	1.14
>+++ Eclipse UI/org/eclipse/ui/dialogs/SelectionStatusDialog.java	17 Dec 2008 10:50:49 -0000
>@@ -122,7 +122,11 @@
>         fLastStatus = status;
>         if (fStatusLine != null && !fStatusLine.isDisposed()) {
>             updateButtonsEnableState(status);
>-            fStatusLine.setErrorStatus(status);
>+            if(status.isOK()){
>+            	fStatusLine.setErrorStatus(null);
>+            } else {
>+            	fStatusLine.setErrorStatus(status);
>+            }
>         }
>     }
> 
>Index: Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java,v
>retrieving revision 1.22
>diff -u -r1.22 CheckedTreeSelectionDialog.java
>--- Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java	3 Nov 2008 22:48:04 -0000	1.22
>+++ Eclipse UI/org/eclipse/ui/dialogs/CheckedTreeSelectionDialog.java	17 Dec 2008 10:50:49 -0000
>@@ -64,8 +64,7 @@
> 
>     private String fEmptyListMessage = WorkbenchMessages.CheckedTreeSelectionDialog_nothing_available; 
> 
>-    private IStatus fCurrStatus = new Status(IStatus.OK, PlatformUI.PLUGIN_ID,
>-            0, "", null); //$NON-NLS-1$
>+    private IStatus fCurrStatus = Status.OK_STATUS;
> 
>     private List fFilters;
> 
>@@ -222,9 +221,7 @@
>                 fCurrStatus = fValidator.validate(fViewer.getCheckedElements());
>                 updateStatus(fCurrStatus);
>             } else if (!fCurrStatus.isOK()) {
>-                fCurrStatus = new Status(IStatus.OK, PlatformUI.PLUGIN_ID,
>-                        IStatus.OK, "", //$NON-NLS-1$
>-                        null);
>+                fCurrStatus = Status.OK_STATUS;
>             }
>         } else {
>             fCurrStatus = new Status(IStatus.ERROR, PlatformUI.PLUGIN_ID,
>Index: Eclipse UI/org/eclipse/ui/internal/Workbench.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java,v
>retrieving revision 1.467
>diff -u -r1.467 Workbench.java
>--- Eclipse UI/org/eclipse/ui/internal/Workbench.java	1 Dec 2008 21:15:15 -0000	1.467
>+++ Eclipse UI/org/eclipse/ui/internal/Workbench.java	17 Dec 2008 10:50:50 -0000
>@@ -1864,8 +1864,7 @@
> 					IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);
> 		}
> 
>-		final IStatus result[] = { new Status(IStatus.OK,
>-				WorkbenchPlugin.PI_WORKBENCH, IStatus.OK, "", null) }; //$NON-NLS-1$
>+		final IStatus result[] = { Status.OK_STATUS };
> 		SafeRunner.run(new SafeRunnable(WorkbenchMessages.ErrorReadingState) {
> 			public void run() throws Exception {
> 				FileInputStream input = new FileInputStream(stateFile);
>Index: Eclipse UI/org/eclipse/ui/internal/ViewFactory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ViewFactory.java,v
>retrieving revision 1.65
>diff -u -r1.65 ViewFactory.java
>--- Eclipse UI/org/eclipse/ui/internal/ViewFactory.java	27 Mar 2008 13:26:54 -0000	1.65
>+++ Eclipse UI/org/eclipse/ui/internal/ViewFactory.java	17 Dec 2008 10:50:50 -0000
>@@ -269,7 +269,7 @@
>             //for dynamic UI - add the next line to replace subsequent code that is commented out
>             restoreViewState(mem[i]);
>         }
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> 
>     /**
>Index: Eclipse UI/org/eclipse/ui/internal/PartStack.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartStack.java,v
>retrieving revision 1.105
>diff -u -r1.105 PartStack.java
>--- Eclipse UI/org/eclipse/ui/internal/PartStack.java	24 Mar 2008 19:21:57 -0000	1.105
>+++ Eclipse UI/org/eclipse/ui/internal/PartStack.java	17 Dec 2008 10:50:49 -0000
>@@ -42,7 +42,6 @@
> import org.eclipse.ui.IWorkbenchPartReference;
> import org.eclipse.ui.IWorkbenchPreferenceConstants;
> import org.eclipse.ui.PartInitException;
>-import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.XMLMemento;
> import org.eclipse.ui.internal.StartupThreading.StartupRunnable;
> import org.eclipse.ui.internal.dnd.AbstractDropTarget;
>@@ -1024,7 +1023,7 @@
>         }
>                 
>         
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> 
>     /* (non-Javadoc)
>@@ -1158,7 +1157,7 @@
>         }
>         
> 
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> 
>     protected WorkbenchPage getPage() {
>Index: Eclipse UI/org/eclipse/ui/internal/EditorHistory.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorHistory.java,v
>retrieving revision 1.10
>diff -u -r1.10 EditorHistory.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorHistory.java	8 May 2006 20:55:36 -0000	1.10
>+++ Eclipse UI/org/eclipse/ui/internal/EditorHistory.java	17 Dec 2008 10:50:49 -0000
>@@ -19,7 +19,6 @@
> import org.eclipse.ui.IEditorDescriptor;
> import org.eclipse.ui.IEditorInput;
> import org.eclipse.ui.IMemento;
>-import org.eclipse.ui.PlatformUI;
> 
> /**
>  * This class is used to record "open editor" actions as they
>@@ -134,7 +133,7 @@
>                 add(item, fifoList.size());
>             }
>         }
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> 
>     /**
>@@ -152,6 +151,6 @@
>                 item.saveState(itemMemento);
>             }
>         }
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> }
>Index: Eclipse UI/org/eclipse/ui/internal/EditorHistoryItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorHistoryItem.java,v
>retrieving revision 1.11
>diff -u -r1.11 EditorHistoryItem.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorHistoryItem.java	8 May 2006 20:55:34 -0000	1.11
>+++ Eclipse UI/org/eclipse/ui/internal/EditorHistoryItem.java	17 Dec 2008 10:50:49 -0000
>@@ -153,8 +153,7 @@
>     public IStatus restoreState() {
>         Assert.isTrue(!isRestored());
> 
>-        Status result = new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0,
>-                "", null); //$NON-NLS-1$
>+        IStatus result = Status.OK_STATUS;
>         IMemento memento = this.memento;
>         this.memento = null;
> 
>@@ -235,7 +234,7 @@
>                         .getToolTipText());
>             }
>         }
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> 
> }
>Index: Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java,v
>retrieving revision 1.28
>diff -u -r1.28 EditorSashContainer.java
>--- Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java	2 May 2007 15:31:08 -0000	1.28
>+++ Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java	17 Dec 2008 10:50:49 -0000
>@@ -632,6 +632,6 @@
> 				}});
>            
>         }
>-        return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+        return Status.OK_STATUS;
>     }
> }
>Index: Eclipse UI/org/eclipse/ui/internal/Perspective.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Perspective.java,v
>retrieving revision 1.177
>diff -u -r1.177 Perspective.java
>--- Eclipse UI/org/eclipse/ui/internal/Perspective.java	1 Dec 2008 15:20:36 -0000	1.177
>+++ Eclipse UI/org/eclipse/ui/internal/Perspective.java	17 Dec 2008 10:50:50 -0000
>@@ -1201,7 +1201,7 @@
>      */
>     public IStatus restoreState() {
>         if (this.memento == null) {
>-			return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+			return Status.OK_STATUS;
> 		}
> 
>         MultiStatus result = new MultiStatus(
>Index: Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java,v
>retrieving revision 1.38
>diff -u -r1.38 PerspectiveDescriptor.java
>--- Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java	9 May 2008 14:13:12 -0000	1.38
>+++ Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java	17 Dec 2008 10:50:50 -0000
>@@ -21,7 +21,6 @@
> import org.eclipse.ui.IPerspectiveFactory;
> import org.eclipse.ui.IPluginContribution;
> import org.eclipse.ui.ISharedImages;
>-import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.internal.IWorkbenchConstants;
> import org.eclipse.ui.internal.WorkbenchImages;
> import org.eclipse.ui.internal.WorkbenchPlugin;
>@@ -337,7 +336,7 @@
> 				image = descriptor.getImageDescriptor();
> 			}
> 		}
>-		return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+		return Status.OK_STATUS;
> 	}
> 
> 	/**
>@@ -370,7 +369,7 @@
> 		if (singleton) {
> 			childMem.putInteger(IWorkbenchConstants.TAG_SINGLETON, 1);
> 		}
>-		return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
>+		return Status.OK_STATUS;
> 	}
> 
> 	/**

Actions: View

Attachments on bug 64830: 90051 | 90052 | 120675 | 125381