Attachment #21257 for bug #85308

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

View | Details | Raw Unified | Return to bug 85308
Collapse All | Expand All

Lines 331-337 Link Here

(-)BlockedJobsDialog.java (-1 / +1 lines)
331	* @return ProgressTreeContentProvider	331	* @return ProgressTreeContentProvider
332	*/	332	*/
333	private ProgressTreeContentProvider getContentProvider() {	333	private ProgressTreeContentProvider getContentProvider() {
334	return new ProgressTreeContentProvider(viewer, !Policy.DEBUG_SHOW_SYSTEM_JOBS) {	334	return new ProgressTreeContentProvider(viewer, Policy.DEBUG_SHOW_SYSTEM_JOBS) {
335	/*	335	/*
336	* (non-Javadoc)	336	* (non-Javadoc)
337	*	337	*

Lines 1617-1623 Link Here

(-)NewProgressViewer.java (-1 / +1 lines)
1617		1617
1618	if(job.isSystem()){	1618	if(job.isSystem()){
1619	if(getContentProvider() instanceof ProgressContentProvider)	1619	if(getContentProvider() instanceof ProgressContentProvider)
1620	return ((ProgressContentProvider) getContentProvider()).filterDebug;	1620	return !((ProgressContentProvider) getContentProvider()).debug();
1621	return false;	1621	return false;
1622	}	1622	}
1623	return false;	1623	return false;




public abstract class ProgressContentProvider implements
        IProgressUpdateCollector, IStructuredContentProvider {

	private boolean overrideValue;
	/**
	 * Return whether or not we check the preferences or overide.
	 */
    private boolean override = false;

    /**
     * Create a new instance of the receiver with all of the
     * default values.  
     */
    public ProgressContentProvider() {
    	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 debug If true debug information will be shown
     * if the debug flag in the ProgressManager is true.
     */
    public ProgressContentProvider(boolean debug) {
    	this();
    	override = true;
        overrideValue = debug;
    }

    /*

     */
    public Object[] getElements(Object inputElement) {

        return ProgressManager.getInstance().getRootElements(debug());
    }

    /*

    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;
    	
    }

}

Lines 128-134 Link Here

(-)ProgressMonitorJobsDialog.java (-1 / +1 lines)
128	});	128	});
129		129
130	ProgressTreeContentProvider provider = new ProgressTreeContentProvider(	130	ProgressTreeContentProvider provider = new ProgressTreeContentProvider(
131	viewer, !Policy.DEBUG_SHOW_SYSTEM_JOBS);	131	viewer, Policy.DEBUG_SHOW_SYSTEM_JOBS);
132	viewer.setContentProvider(provider);	132	viewer.setContentProvider(provider);
133	viewer.setInput(provider);	133	viewer.setInput(provider);
134	viewer.setLabelProvider(new ProgressLabelProvider());	134	viewer.setLabelProvider(new ProgressLabelProvider());

Lines 113-119 Link Here

(-)ProgressRegion.java (-1 / +1 lines)
113		113
114	//Never show debug info	114	//Never show debug info
115	IContentProvider provider = new ProgressViewerContentProvider(viewer,	115	IContentProvider provider = new ProgressViewerContentProvider(viewer,
116	true);	116	false);
117	viewer.setContentProvider(provider);	117	viewer.setContentProvider(provider);
118	viewer.setInput(provider);	118	viewer.setInput(provider);
119	viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl));	119	viewer.setLabelProvider(new ProgressViewerLabelProvider(viewerControl));




        viewer = mainViewer;
    }

    
    /**
     * Create a new instance of the receiver with the supplied
     * viewer and debug flag.
     * @param mainViewer
     * @param debug If true do show debug information
     * @see ProgressContentProvider
     */
    public ProgressTreeContentProvider(NewProgressViewer mainViewer,
            boolean debug) {
        super(debug);
        viewer = mainViewer;
    }





    /**
     * 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,

     */
    public Object[] getElements(Object inputElement) {
        JobTreeElement[] elements = ProgressManager.getInstance()
                .getRootElements(debug());
        return getDisplayedValues(elements);
    }


Return to bug 85308

Lines 20-47 Link Here

(-)ProgressContentProvider.java (-8 / +23 lines)
20	public abstract class ProgressContentProvider implements	20	public abstract class ProgressContentProvider implements
21	IProgressUpdateCollector, IStructuredContentProvider {	21	IProgressUpdateCollector, IStructuredContentProvider {
22		22
		23	private boolean overrideValue;
23	/**	24	/**
24	* Return whether or not we are filtering debug items.	25	* Return whether or not we check the preferences or overide.
25	*/	26	*/
26	protected boolean filterDebug;	27	private boolean override = false;
27		28
28	/**	29	/**
29	* Create a new instance of the receiver with all of the	30	* Create a new instance of the receiver with all of the
30	* default values.	31	* default values.
31	*/	32	*/
32	public ProgressContentProvider() {	33	public ProgressContentProvider() {
33	this(!ProgressViewUpdater.getSingleton().debug);	34	ProgressViewUpdater.getSingleton().addCollector(this);
34	}	35	}
35		36
36	/**	37	/**
37	* Create a new instance of the receiver with a flag to	38	* Create a new instance of the receiver with a flag to
38	* indicate if there will be debug info shown or not.	39	* indicate if there will be debug info shown or not.
39	* @param noDebug If true debug information will be shown	40	* @param debug If true debug information will be shown
40	* if the debug flag in the ProgressManager is true.	41	* if the debug flag in the ProgressManager is true.
41	*/	42	*/
42	public ProgressContentProvider(boolean noDebug) {	43	public ProgressContentProvider(boolean debug) {
43	ProgressViewUpdater.getSingleton().addCollector(this);	44	this();
44	filterDebug = noDebug;	45	override = true;
		46	overrideValue = debug;
45	}	47	}
46		48
47	/*	49	/*
Lines 51-57 Link Here
51	*/	53	*/
52	public Object[] getElements(Object inputElement) {	54	public Object[] getElements(Object inputElement) {
53		55
54	return ProgressManager.getInstance().getRootElements(!filterDebug);	56	return ProgressManager.getInstance().getRootElements(debug());
55	}	57	}
56		58
57	/*	59	/*
Lines 72-76 Link Here
72	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {	74	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
73	//No change when input changes	75	//No change when input changes
74	}	76	}
		77
		78	/**
		79	* Return whether or not we are debugging. Check the
		80	* system settings unless we are overiding them.
		81	* @return boolean <code>true</code> if debug
		82	* (system) jobs are being shown.
		83	*/
		84	public boolean debug(){
		85	if(override)
		86	return overrideValue;
		87	return ProgressViewUpdater.getSingleton().debug;
		88
		89	}
75		90
76	}	91	}

Lines 30-44 Link Here

(-)ProgressTreeContentProvider.java (-3 / +5 lines)
30	viewer = mainViewer;	30	viewer = mainViewer;
31	}	31	}
32		32
		33
33	/**	34	/**
34	* Create a new instance of the receiver with the supplied	35	* Create a new instance of the receiver with the supplied
35	* viewer and debug flag.	36	* viewer and debug flag.
36	* @param mainViewer	37	* @param mainViewer
37	* @param noDebug If true do not show debug information	38	* @param debug If true do show debug information
		39	* @see ProgressContentProvider
38	*/	40	*/
39	public ProgressTreeContentProvider(NewProgressViewer mainViewer,	41	public ProgressTreeContentProvider(NewProgressViewer mainViewer,
40	boolean noDebug) {	42	boolean debug) {
41	super(noDebug);	43	super(debug);
42	viewer = mainViewer;	44	viewer = mainViewer;
43	}	45	}
44		46

Lines 25-39 Link Here

(-)ProgressViewerContentProvider.java (-10 / +1 lines)
25	/**	25	/**
26	* Create a new instance of the receiver.	26	* Create a new instance of the receiver.
27	* @param structured The Viewer we are providing content for	27	* @param structured The Viewer we are providing content for
28	*/
29	public ProgressViewerContentProvider(ProgressViewer structured) {
30	super();
31	progressViewer = structured;
32	}
33
34	/**
35	* Create a new instance of the receiver.
36	* @param structured The Viewer we are providing content for
37	* @param noDebug A flag to indicate if the debug flag is false.	28	* @param noDebug A flag to indicate if the debug flag is false.
38	*/	29	*/
39	public ProgressViewerContentProvider(ProgressViewer structured,	30	public ProgressViewerContentProvider(ProgressViewer structured,
Lines 111-117 Link Here
111	*/	102	*/
112	public Object[] getElements(Object inputElement) {	103	public Object[] getElements(Object inputElement) {
113	JobTreeElement[] elements = ProgressManager.getInstance()	104	JobTreeElement[] elements = ProgressManager.getInstance()
114	.getRootElements(!filterDebug);	105	.getRootElements(debug());
115	return getDisplayedValues(elements);	106	return getDisplayedValues(elements);
116	}	107	}
117		108