Attachment 21257 Details for Bug 85308 – Patch for 85308

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

[patch] Patch for 85308

85308.txt (text/plain), 7.87 KB, created by Tod Creasey

on 2005-05-17 09:34:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tod Creasey

Created: 2005-05-17 09:34:43 EDT

Size: 7.87 KB

patch

obsolete

>Index: BlockedJobsDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/BlockedJobsDialog.java,v
>retrieving revision 1.37
>diff -u -r1.37 BlockedJobsDialog.java
>--- BlockedJobsDialog.java	4 Apr 2005 19:43:06 -0000	1.37
>+++ BlockedJobsDialog.java	17 May 2005 13:34:07 -0000
>@@ -331,7 +331,7 @@
>      * @return ProgressTreeContentProvider
>      */
>     private ProgressTreeContentProvider getContentProvider() {
>-        return new ProgressTreeContentProvider(viewer, !Policy.DEBUG_SHOW_SYSTEM_JOBS) {
>+        return new ProgressTreeContentProvider(viewer, Policy.DEBUG_SHOW_SYSTEM_JOBS) {
>             /*
>              * (non-Javadoc)
>              * 
>Index: NewProgressViewer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/NewProgressViewer.java,v
>retrieving revision 1.63
>diff -u -r1.63 NewProgressViewer.java
>--- NewProgressViewer.java	11 Mar 2005 21:10:17 -0000	1.63
>+++ NewProgressViewer.java	17 May 2005 13:34:07 -0000
>@@ -1617,7 +1617,7 @@
>         
>         if(job.isSystem()){
>         	if(getContentProvider() instanceof ProgressContentProvider)
>-        		return ((ProgressContentProvider) getContentProvider()).filterDebug;
>+        		return !((ProgressContentProvider) getContentProvider()).debug();
>         	return false;
>         }
>         return false;
>Index: ProgressContentProvider.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressContentProvider.java,v
>retrieving revision 1.42
>diff -u -r1.42 ProgressContentProvider.java
>--- ProgressContentProvider.java	25 Feb 2005 20:52:21 -0000	1.42
>+++ ProgressContentProvider.java	17 May 2005 13:34:07 -0000
>@@ -20,28 +20,30 @@
> public abstract class ProgressContentProvider implements
>         IProgressUpdateCollector, IStructuredContentProvider {
> 
>+	private boolean overrideValue;
> 	/**
>-	 * Return whether or not we are filtering debug items.
>+	 * Return whether or not we check the preferences or overide.
> 	 */
>-    protected boolean filterDebug;
>+    private boolean override = false;
> 
>     /**
>      * Create a new instance of the receiver with all of the
>      * default values.  
>      */
>     public ProgressContentProvider() {
>-        this(!ProgressViewUpdater.getSingleton().debug);
>+    	ProgressViewUpdater.getSingleton().addCollector(this);
>     }
> 
>     /**
>      * Create a new instance of the receiver with a flag to 
>      * indicate if there will be debug info shown or not.
>-     * @param noDebug If true debug information will be shown
>+     * @param debug If true debug information will be shown
>      * if the debug flag in the ProgressManager is true.
>      */
>-    public ProgressContentProvider(boolean noDebug) {
>-        ProgressViewUpdater.getSingleton().addCollector(this);
>-        filterDebug = noDebug;
>+    public ProgressContentProvider(boolean debug) {
>+    	this();
>+    	override = true;
>+        overrideValue = debug;
>     }
> 
>     /*
>@@ -51,7 +53,7 @@
>      */
>     public Object[] getElements(Object inputElement) {
> 
>-        return ProgressManager.getInstance().getRootElements(!filterDebug);
>+        return ProgressManager.getInstance().getRootElements(debug());
>     }
> 
>     /*
>@@ -72,5 +74,18 @@
>     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
>         //No change when input changes
>     }
>+    
>+    /**
>+     * Return whether or not we are debugging. Check the
>+     * system settings unless we are overiding them.
>+     * @return boolean <code>true</code> if debug
>+     * (system) jobs are being shown.
>+     */
>+    public boolean debug(){
>+    	if(override)
>+    		return overrideValue;
>+    	return ProgressViewUpdater.getSingleton().debug;
>+    	
>+    }
> 
> }
>Index: ProgressMonitorJobsDialog.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressMonitorJobsDialog.java,v
>retrieving revision 1.33
>diff -u -r1.33 ProgressMonitorJobsDialog.java
>--- ProgressMonitorJobsDialog.java	20 Apr 2005 12:57:38 -0000	1.33
>+++ ProgressMonitorJobsDialog.java	17 May 2005 13:34:07 -0000
>@@ -128,7 +128,7 @@
>             });
> 
>             ProgressTreeContentProvider provider = new ProgressTreeContentProvider(
>-                    viewer, !Policy.DEBUG_SHOW_SYSTEM_JOBS);
>+                    viewer, Policy.DEBUG_SHOW_SYSTEM_JOBS);
>             viewer.setContentProvider(provider);
>             viewer.setInput(provider);
>             viewer.setLabelProvider(new ProgressLabelProvider());
>Index: ProgressRegion.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressRegion.java,v
>retrieving revision 1.18
>diff -u -r1.18 ProgressRegion.java
>--- ProgressRegion.java	25 Feb 2005 20:52:21 -0000	1.18
>+++ ProgressRegion.java	17 May 2005 13:34:07 -0000
>@@ -113,7 +113,7 @@
> 
>         //Never show debug info
>         IContentProvider provider = new ProgressViewerContentProvider(viewer,
>-                true);
>+                false);
>         viewer.setContentProvider(provider);
>         viewer.setInput(provider);
>         viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl));
>Index: ProgressTreeContentProvider.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressTreeContentProvider.java,v
>retrieving revision 1.7
>diff -u -r1.7 ProgressTreeContentProvider.java
>--- ProgressTreeContentProvider.java	25 Feb 2005 20:52:21 -0000	1.7
>+++ ProgressTreeContentProvider.java	17 May 2005 13:34:07 -0000
>@@ -30,15 +30,17 @@
>         viewer = mainViewer;
>     }
> 
>+    
>     /**
>      * Create a new instance of the receiver with the supplied
>      * viewer and debug flag.
>      * @param mainViewer
>-     * @param noDebug If true do not show debug information
>+     * @param debug If true do show debug information
>+     * @see ProgressContentProvider
>      */
>     public ProgressTreeContentProvider(NewProgressViewer mainViewer,
>-            boolean noDebug) {
>-        super(noDebug);
>+            boolean debug) {
>+        super(debug);
>         viewer = mainViewer;
>     }
> 
>Index: ProgressViewerContentProvider.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressViewerContentProvider.java,v
>retrieving revision 1.10
>diff -u -r1.10 ProgressViewerContentProvider.java
>--- ProgressViewerContentProvider.java	4 Apr 2005 15:13:24 -0000	1.10
>+++ ProgressViewerContentProvider.java	17 May 2005 13:34:07 -0000
>@@ -25,15 +25,6 @@
>     /**
>      * Create a new instance of the receiver.
>      * @param structured The Viewer we are providing content for
>-     */
>-    public ProgressViewerContentProvider(ProgressViewer structured) {
>-        super();
>-        progressViewer = structured;
>-    }
>-
>-    /**
>-     * Create a new instance of the receiver.
>-     * @param structured The Viewer we are providing content for
>      * @param noDebug A flag to indicate if the debug flag is false.
>      */
>     public ProgressViewerContentProvider(ProgressViewer structured,
>@@ -111,7 +102,7 @@
>      */
>     public Object[] getElements(Object inputElement) {
>         JobTreeElement[] elements = ProgressManager.getInstance()
>-                .getRootElements(!filterDebug);
>+                .getRootElements(debug());
>         return getDisplayedValues(elements);
>     }
>

Actions: View | Diff

Attachments on bug 85308: 21257