Attachment #164412 for bug #215980





public class PackageExplorerProblemsDecorator extends TreeHierarchyLayoutProblemsDecorator {

	/**
	 * Use of this constant is <b>FORBIDDEN</b> for external clients.
	 * <p>
	 * TODO: Make API in 3.7, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=308672
	 * 
	 * @see JavaElementImageDescriptor#PROJECT_ERROR
	 * @since 3.6
	 */
	public final static int PROJECT_ERROR= 0x2000;

	public PackageExplorerProblemsDecorator() {
		super();
	}

		for (int i= 0; i < elements.length; i++) {
			IAdaptable element= elements[i];
			int flags= super.computeAdornmentFlags(element);
			if ((flags & PackageExplorerProblemsDecorator.PROJECT_ERROR) != 0)
				return PackageExplorerProblemsDecorator.PROJECT_ERROR;
			result|= flags;
				result= JavaElementImageDescriptor.WARNING;
		}
		if ((result & JavaElementImageDescriptor.ERROR) != 0)
			return JavaElementImageDescriptor.ERROR;
		else if ((result & JavaElementImageDescriptor.WARNING) != 0)
			return JavaElementImageDescriptor.WARNING;
		return 0;
	}
}





import org.eclipse.jdt.internal.ui.JavaPlugin;
import org.eclipse.jdt.internal.ui.JavaPluginImages;
import org.eclipse.jdt.internal.ui.packageview.PackageExplorerProblemsDecorator;

/**
 * A {@link JavaElementImageDescriptor} consists of a base image and several adornments. The adornments

	 * Flag to render the project error adornment.
	 * @since 3.6
	 */
	//TODO: make API in 3.7, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=308672
	final static int PROJECT_ERROR= PackageExplorerProblemsDecorator.PROJECT_ERROR;

	private ImageDescriptor fBaseImage;
	private int fFlags;

		if ((fFlags & ERROR) != 0) {
			addBottomLeftImage(JavaPluginImages.DESC_OVR_ERROR, pos);
		}
		if ((fFlags & PackageExplorerProblemsDecorator.PROJECT_ERROR) != 0) {
			addBottomLeftImage(JavaPluginImages.DESC_OVR_PROJECT_ERROR, pos);
		}
		if ((fFlags & WARNING) != 0) {

Lines 49-54 Link Here

(-)ui/org/eclipse/jdt/ui/ProblemsLabelDecorator.java (-1 / +2 lines)
49		49
50	import org.eclipse.jdt.internal.ui.JavaPlugin;	50	import org.eclipse.jdt.internal.ui.JavaPlugin;
51	import org.eclipse.jdt.internal.ui.JavaPluginImages;	51	import org.eclipse.jdt.internal.ui.JavaPluginImages;
		52	import org.eclipse.jdt.internal.ui.packageview.PackageExplorerProblemsDecorator;
52	import org.eclipse.jdt.internal.ui.viewsupport.IProblemChangedListener;	53	import org.eclipse.jdt.internal.ui.viewsupport.IProblemChangedListener;
53	import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;	54	import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;
54	import org.eclipse.jdt.internal.ui.viewsupport.ImageImageDescriptor;	55	import org.eclipse.jdt.internal.ui.viewsupport.ImageImageDescriptor;
Lines 106-112 Link Here
106		107
107	private static final int ERRORTICK_WARNING= JavaElementImageDescriptor.WARNING;	108	private static final int ERRORTICK_WARNING= JavaElementImageDescriptor.WARNING;
108	private static final int ERRORTICK_ERROR= JavaElementImageDescriptor.ERROR;	109	private static final int ERRORTICK_ERROR= JavaElementImageDescriptor.ERROR;
109	private static final int ERRORTICK_PROJECT_ERROR= JavaElementImageDescriptor.PROJECT_ERROR;	110	private static final int ERRORTICK_PROJECT_ERROR= PackageExplorerProblemsDecorator.PROJECT_ERROR;
110		111
111	private ImageDescriptorRegistry fRegistry;	112	private ImageDescriptorRegistry fRegistry;
112	private boolean fUseNewRegistry= false;	113	private boolean fUseNewRegistry= false;

Return to bug 215980

Lines 21-26 Link Here

(-)ui/org/eclipse/jdt/ui/JavaElementImageDescriptor.java (-2 / +4 lines)
21		21
22	import org.eclipse.jdt.internal.ui.JavaPlugin;	22	import org.eclipse.jdt.internal.ui.JavaPlugin;
23	import org.eclipse.jdt.internal.ui.JavaPluginImages;	23	import org.eclipse.jdt.internal.ui.JavaPluginImages;
		24	import org.eclipse.jdt.internal.ui.packageview.PackageExplorerProblemsDecorator;
24		25
25	/**	26	/**
26	* A {@link JavaElementImageDescriptor} consists of a base image and several adornments. The adornments	27	* A {@link JavaElementImageDescriptor} consists of a base image and several adornments. The adornments
Lines 89-95 Link Here
89	* Flag to render the project error adornment.	90	* Flag to render the project error adornment.
90	* @since 3.6	91	* @since 3.6
91	*/	92	*/
92	public final static int PROJECT_ERROR= 0x2000;	93	//TODO: make API in 3.7, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=308672
		94	final static int PROJECT_ERROR= PackageExplorerProblemsDecorator.PROJECT_ERROR;
93		95
94	private ImageDescriptor fBaseImage;	96	private ImageDescriptor fBaseImage;
95	private int fFlags;	97	private int fFlags;
Lines 296-302 Link Here
296	if ((fFlags & ERROR) != 0) {	298	if ((fFlags & ERROR) != 0) {
297	addBottomLeftImage(JavaPluginImages.DESC_OVR_ERROR, pos);	299	addBottomLeftImage(JavaPluginImages.DESC_OVR_ERROR, pos);
298	}	300	}
299	if ((fFlags & PROJECT_ERROR) != 0) {	301	if ((fFlags & PackageExplorerProblemsDecorator.PROJECT_ERROR) != 0) {
300	addBottomLeftImage(JavaPluginImages.DESC_OVR_PROJECT_ERROR, pos);	302	addBottomLeftImage(JavaPluginImages.DESC_OVR_PROJECT_ERROR, pos);
301	}	303	}
302	if ((fFlags & WARNING) != 0) {	304	if ((fFlags & WARNING) != 0) {

Lines 21-26 Link Here

(-)ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerProblemsDecorator.java (-5 / +18 lines)
21		21
22	public class PackageExplorerProblemsDecorator extends TreeHierarchyLayoutProblemsDecorator {	22	public class PackageExplorerProblemsDecorator extends TreeHierarchyLayoutProblemsDecorator {
23		23
		24	/**
		25	* Use of this constant is <b>FORBIDDEN</b> for external clients.
		26	* <p>
		27	* TODO: Make API in 3.7, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=308672
		28	*
		29	* @see JavaElementImageDescriptor#PROJECT_ERROR
		30	* @since 3.6
		31	*/
		32	public final static int PROJECT_ERROR= 0x2000;
		33
24	public PackageExplorerProblemsDecorator() {	34	public PackageExplorerProblemsDecorator() {
25	super();	35	super();
26	}	36	}
Lines 39-49 Link Here
39	for (int i= 0; i < elements.length; i++) {	49	for (int i= 0; i < elements.length; i++) {
40	IAdaptable element= elements[i];	50	IAdaptable element= elements[i];
41	int flags= super.computeAdornmentFlags(element);	51	int flags= super.computeAdornmentFlags(element);
42	if ((flags & JavaElementImageDescriptor.ERROR) != 0 \|\| (flags & JavaElementImageDescriptor.PROJECT_ERROR) != 0)	52	if ((flags & PackageExplorerProblemsDecorator.PROJECT_ERROR) != 0)
43	return JavaElementImageDescriptor.ERROR;	53	return PackageExplorerProblemsDecorator.PROJECT_ERROR;
44	if ((flags & JavaElementImageDescriptor.WARNING) != 0)	54	result\|= flags;
45	result= JavaElementImageDescriptor.WARNING;
46	}	55	}
47	return result;	56	if ((result & JavaElementImageDescriptor.ERROR) != 0)
		57	return JavaElementImageDescriptor.ERROR;
		58	else if ((result & JavaElementImageDescriptor.WARNING) != 0)
		59	return JavaElementImageDescriptor.WARNING;
		60	return 0;
48	}	61	}
49	}	62	}