Attachment #172417 for bug #308672

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





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#BUILDPATH_ERROR
	 * @since 3.6
	 */
	public final static int BUILDPATH_ERROR= 0x2000;

	public PackageExplorerProblemsDecorator() {
		super();
	}

		for (int i= 0; i < elements.length; i++) {
			IAdaptable element= elements[i];
			int flags= super.computeAdornmentFlags(element);
			if ((flags & JavaElementImageDescriptor.BUILDPATH_ERROR) != 0)
				return JavaElementImageDescriptor.BUILDPATH_ERROR;
			result|= flags;
		}
		if ((result & JavaElementImageDescriptor.ERROR) != 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 build path error adornment.
	 * @since 3.7
	 */
	public final static int BUILDPATH_ERROR= 0x2000;
	final static int BUILDPATH_ERROR= PackageExplorerProblemsDecorator.BUILDPATH_ERROR;

	private ImageDescriptor fBaseImage;
	private int fFlags;

		if ((fFlags & ERROR) != 0) {
			addBottomLeftImage(JavaPluginImages.DESC_OVR_ERROR, pos);
		}
		if ((fFlags & BUILDPATH_ERROR) != 0) {
			addBottomLeftImage(JavaPluginImages.DESC_OVR_BUILDPATH_ERROR, pos);
		}
		if ((fFlags & WARNING) != 0) {

Lines 50-56 Link Here

(-)ui/org/eclipse/jdt/ui/ProblemsLabelDecorator.java (-2 / +1 lines)
50		50
51	import org.eclipse.jdt.internal.ui.JavaPlugin;	51	import org.eclipse.jdt.internal.ui.JavaPlugin;
52	import org.eclipse.jdt.internal.ui.JavaPluginImages;	52	import org.eclipse.jdt.internal.ui.JavaPluginImages;
53	import org.eclipse.jdt.internal.ui.packageview.PackageExplorerProblemsDecorator;
54	import org.eclipse.jdt.internal.ui.viewsupport.IProblemChangedListener;	53	import org.eclipse.jdt.internal.ui.viewsupport.IProblemChangedListener;
55	import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;	54	import org.eclipse.jdt.internal.ui.viewsupport.ImageDescriptorRegistry;
56	import org.eclipse.jdt.internal.ui.viewsupport.ImageImageDescriptor;	55	import org.eclipse.jdt.internal.ui.viewsupport.ImageImageDescriptor;
Lines 108-114 Link Here
108		107
109	private static final int ERRORTICK_WARNING= JavaElementImageDescriptor.WARNING;	108	private static final int ERRORTICK_WARNING= JavaElementImageDescriptor.WARNING;
110	private static final int ERRORTICK_ERROR= JavaElementImageDescriptor.ERROR;	109	private static final int ERRORTICK_ERROR= JavaElementImageDescriptor.ERROR;
111	private static final int ERRORTICK_BUILDPATH_ERROR= PackageExplorerProblemsDecorator.BUILDPATH_ERROR;	110	private static final int ERRORTICK_BUILDPATH_ERROR= JavaElementImageDescriptor.BUILDPATH_ERROR;
112		111
113	/**	112	/**
114	* JRE container problem marker type (value	113	* JRE container problem marker type (value

Return to bug 308672

Lines 21-27 Link Here

(-)ui/org/eclipse/jdt/ui/JavaElementImageDescriptor.java (-5 / +3 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;
25		24
26	/**	25	/**
27	* A {@link JavaElementImageDescriptor} consists of a base image and several adornments. The adornments	26	* A {@link JavaElementImageDescriptor} consists of a base image and several adornments. The adornments
Lines 88-97 Link Here
88		87
89	/**	88	/**
90	* Flag to render the build path error adornment.	89	* Flag to render the build path error adornment.
91	* @since 3.6	90	* @since 3.7
92	*/	91	*/
93	//TODO: make API in 3.7, see https://bugs.eclipse.org/bugs/show_bug.cgi?id=308672	92	public final static int BUILDPATH_ERROR= 0x2000;
94	final static int BUILDPATH_ERROR= PackageExplorerProblemsDecorator.BUILDPATH_ERROR;
95		93
96	private ImageDescriptor fBaseImage;	94	private ImageDescriptor fBaseImage;
97	private int fFlags;	95	private int fFlags;
Lines 298-304 Link Here
298	if ((fFlags & ERROR) != 0) {	296	if ((fFlags & ERROR) != 0) {
299	addBottomLeftImage(JavaPluginImages.DESC_OVR_ERROR, pos);	297	addBottomLeftImage(JavaPluginImages.DESC_OVR_ERROR, pos);
300	}	298	}
301	if ((fFlags & PackageExplorerProblemsDecorator.BUILDPATH_ERROR) != 0) {	299	if ((fFlags & BUILDPATH_ERROR) != 0) {
302	addBottomLeftImage(JavaPluginImages.DESC_OVR_BUILDPATH_ERROR, pos);	300	addBottomLeftImage(JavaPluginImages.DESC_OVR_BUILDPATH_ERROR, pos);
303	}	301	}
304	if ((fFlags & WARNING) != 0) {	302	if ((fFlags & WARNING) != 0) {

Lines 21-36 Link Here

(-)ui/org/eclipse/jdt/internal/ui/packageview/PackageExplorerProblemsDecorator.java (-12 / +2 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#BUILDPATH_ERROR
30	* @since 3.6
31	*/
32	public final static int BUILDPATH_ERROR= 0x2000;
33
34	public PackageExplorerProblemsDecorator() {	24	public PackageExplorerProblemsDecorator() {
35	super();	25	super();
36	}	26	}
Lines 49-56 Link Here
49	for (int i= 0; i < elements.length; i++) {	39	for (int i= 0; i < elements.length; i++) {
50	IAdaptable element= elements[i];	40	IAdaptable element= elements[i];
51	int flags= super.computeAdornmentFlags(element);	41	int flags= super.computeAdornmentFlags(element);
52	if ((flags & PackageExplorerProblemsDecorator.BUILDPATH_ERROR) != 0)	42	if ((flags & JavaElementImageDescriptor.BUILDPATH_ERROR) != 0)
53	return PackageExplorerProblemsDecorator.BUILDPATH_ERROR;	43	return JavaElementImageDescriptor.BUILDPATH_ERROR;
54	result\|= flags;	44	result\|= flags;
55	}	45	}
56	if ((result & JavaElementImageDescriptor.ERROR) != 0)	46	if ((result & JavaElementImageDescriptor.ERROR) != 0)