Attachment #131379 for bug #248623

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

Lines 22-30 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java (-39 / +65 lines)
22	import org.eclipse.core.runtime.CoreException;	22	import org.eclipse.core.runtime.CoreException;
23	import org.eclipse.core.runtime.IPath;	23	import org.eclipse.core.runtime.IPath;
24	import org.eclipse.jem.util.logger.proxy.Logger;	24	import org.eclipse.jem.util.logger.proxy.Logger;
		25	import org.eclipse.jface.viewers.ILabelDecorator;
		26	import org.eclipse.jface.viewers.ILabelProvider;
25	import org.eclipse.jface.viewers.ILabelProviderListener;	27	import org.eclipse.jface.viewers.ILabelProviderListener;
26	import org.eclipse.jface.viewers.IStructuredContentProvider;	28	import org.eclipse.jface.viewers.IStructuredContentProvider;
27	import org.eclipse.jface.viewers.ITableLabelProvider;	29	import org.eclipse.jface.viewers.ITableLabelProvider;
		30	import org.eclipse.jface.viewers.LabelProvider;
		31	import org.eclipse.jface.viewers.LabelProviderChangedEvent;
28	import org.eclipse.jface.viewers.Viewer;	32	import org.eclipse.jface.viewers.Viewer;
29	import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;	33	import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
30	import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;	34	import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
Lines 38-50 Link Here
38	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;	42	import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
39	import org.eclipse.jst.javaee.application.Application;	43	import org.eclipse.jst.javaee.application.Application;
40	import org.eclipse.swt.graphics.Image;	44	import org.eclipse.swt.graphics.Image;
		45	import org.eclipse.ui.PlatformUI;
		46	import org.eclipse.ui.model.WorkbenchLabelProvider;
41	import org.eclipse.wst.common.componentcore.ComponentCore;	47	import org.eclipse.wst.common.componentcore.ComponentCore;
42	import org.eclipse.wst.common.componentcore.ModuleCoreNature;	48	import org.eclipse.wst.common.componentcore.ModuleCoreNature;
43	import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;	49	import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
44	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;	50	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
45	import org.eclipse.wst.common.componentcore.resources.IVirtualReference;	51	import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
46		52
47	public class AvailableJ2EEComponentsForEARContentProvider implements IStructuredContentProvider, ITableLabelProvider {	53	public class AvailableJ2EEComponentsForEARContentProvider extends LabelProvider
		54	implements IStructuredContentProvider, ITableLabelProvider {
48		55
49	final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);	56	final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR);
50		57
Lines 52-63 Link Here
52	private IVirtualComponent earComponent;	59	private IVirtualComponent earComponent;
53	private boolean isEE5 = false;	60	private boolean isEE5 = false;
54	private String libDir = null;	61	private String libDir = null;
		62
		63	// private ILabelProvider decoratingWorkbenchLabelProvider = new DecoratingLabelProvider(this,
		64	// PlatformUI.getWorkbench().getDecoratorManager()
		65	// .getLabelDecorator());
		66
		67	private ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
		68
		69	private ILabelProvider workbenchLabelProvider = new WorkbenchLabelProvider();
55		70
		71	private AvailableJ2EEComponentsForEARContentProvider instance;
56		72
57	public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {	73	public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {
58	super();	74	super();
59	this.j2eeVersion = j2eeVersion;	75	this.j2eeVersion = j2eeVersion;
60	earComponent = aEarComponent;	76	earComponent = aEarComponent;
		77
		78	instance = this;
		79	decorator.addListener(new ILabelProviderListener(){
		80	public void labelProviderChanged(LabelProviderChangedEvent event) {
		81	LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance);
		82	fireLabelProviderChanged(newEvent);
		83	}
		84	});
		85	// decoratingWorkbenchLabelProvider.addListener(new ILabelProviderListener(){
		86	//
		87	// public void labelProviderChanged(LabelProviderChangedEvent event) {
		88	// LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance);
		89	// fireLabelProviderChanged(newEvent);
		90	// }
		91	// });
61	}	92	}
62		93
63	/*	94	/*
Lines 217-225 Link Here
217	* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)	248	* @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
218	*/	249	*/
219	public Image getColumnImage(Object element, int columnIndex) {	250	public Image getColumnImage(Object element, int columnIndex) {
		251	if (columnIndex >=2){
		252	return null;
		253	}
		254	if (element instanceof IVirtualComponent) {
		255	IVirtualComponent comp = (IVirtualComponent)element;
		256	return getDecoratedImage(comp);
		257	} else if (element instanceof IProject){
		258	return workbenchLabelProvider.getImage(element);
		259	}
220	return null;	260	return null;
221	}	261	}
222		262
		263	private Image getDecoratedImage(IVirtualComponent comp) {
		264	return getDecoratedImage(comp.getProject());
		265	}
		266
		267	private Image getDecoratedImage(IProject project) {
		268	Image image = workbenchLabelProvider.getImage(project);
		269	if (decorator != null) {
		270	Image decorated = decorator.decorateImage(image, project);
		271	if (decorated != null) {
		272	return decorated;
		273	}
		274	}
		275	return image;
		276	}
		277
223	/*	278	/*
224	* (non-Javadoc)	279	* (non-Javadoc)
225	*	280	*
Lines 256-302 Link Here
256	}	311	}
257	return null;	312	return null;
258	}	313	}
259	/*	314
260	* (non-Javadoc)
261	*
262	* @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
263	* java.lang.Object, java.lang.Object)
264	*/
265	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
266	//do nothing
267	}
268
269	/*
270	* (non-Javadoc)
271	*
272	* @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
273	*/
274	public void addListener(ILabelProviderListener listener) {
275	//do nothing
276	}
277
278	/*
279	* (non-Javadoc)
280	*
281	* @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
282	* java.lang.String)
283	*/
284	public boolean isLabelProperty(Object element, String property) {
285	return false;
286	}
287
288	/*
289	* (non-Javadoc)
290	*
291	* @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
292	*/
293	public void removeListener(ILabelProviderListener listener) {
294	//do nothing
295	}
296
297	/* (non-Javadoc)	315	/* (non-Javadoc)
298	* @see org.eclipse.jface.viewers.IContentProvider#dispose()	316	* @see org.eclipse.jface.viewers.IContentProvider#dispose()
299	*/	317	*/
300	public void dispose() {	318	public void dispose() {
		319	// if (decoratingWorkbenchLabelProvider != null) {
		320	// decoratingWorkbenchLabelProvider.dispose();
		321	// }
		322	}
		323
		324	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
		325	// TODO Auto-generated method stub
		326
301	}	327	}
302	}	328	}

Lines 43-48 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java (-1 / +5 lines)
43	import org.eclipse.jface.viewers.ColumnWeightData;	43	import org.eclipse.jface.viewers.ColumnWeightData;
44	import org.eclipse.jface.viewers.ICheckStateListener;	44	import org.eclipse.jface.viewers.ICheckStateListener;
45	import org.eclipse.jface.viewers.IContentProvider;	45	import org.eclipse.jface.viewers.IContentProvider;
		46	import org.eclipse.jface.viewers.ILabelDecorator;
46	import org.eclipse.jface.viewers.TableLayout;	47	import org.eclipse.jface.viewers.TableLayout;
47	import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;	48	import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
48	import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;	49	import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
Lines 805-811 Link Here
805	int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(earComponent);	806	int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(earComponent);
806	AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(earComponent, j2eeVersion);	807	AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(earComponent, j2eeVersion);
807	availableComponentsViewer.setContentProvider(provider);	808	availableComponentsViewer.setContentProvider(provider);
808	availableComponentsViewer.setLabelProvider(provider);	809
		810	ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator();
		811	availableComponentsViewer.setLabelProvider(new TableDecoratingLabelProvider(provider, decorator));
		812	// availableComponentsViewer.setLabelProvider(provider);
809	setLibDirInContentProvider();	813	setLibDirInContentProvider();
810	addTableListeners();	814	addTableListeners();
811	}	815	}




 */
package org.eclipse.jst.j2ee.internal.wizard;

import org.eclipse.core.resources.IProject;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;




 * TODO To change the template for this generated type comment go to
 * Window - Preferences - Java - Code Style - Code Templates
 */
public class J2EEComponentLabelProvider extends LabelProvider implements ILabelProvider {

	ITableLabelProvider tableLableProvider;
	
	private J2EEComponentLabelProvider instance;
	
	public J2EEComponentLabelProvider(ITableLabelProvider tableLableProvider){
		this.tableLableProvider = tableLableProvider;
		instance = this;
		tableLableProvider.addListener(new ILabelProviderListener(){
			public void labelProviderChanged(LabelProviderChangedEvent event) {
				LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance);
				fireLabelProviderChanged(newEvent);
			}
		});
	}
	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
	 */
	public Image getImage(Object element) {
		return tableLableProvider.getColumnImage(element, 1);
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
	 */
	public String getText(Object element) {
		return tableLableProvider.getColumnText(element, 1);
//		if(element instanceof IVirtualComponent){
//			IVirtualComponent comp = (IVirtualComponent)element;
//			return comp.getProject().getName();
//		}
//		
//		if (element instanceof IProject) {
//			IProject handle = (IProject)element;
//			return handle.getName();
//		}
//		return null;

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
	 */
	public void addListener(ILabelProviderListener listener) {
		// TODO Auto-generated method stub
		
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
	 */
	public void dispose() {
		// TODO Auto-generated method stub
		
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
	 */
	public boolean isLabelProperty(Object element, String property) {
		// TODO Auto-generated method stub
		return false;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
	 */
	public void removeListener(ILabelProviderListener listener) {
		// TODO Auto-generated method stub
		
	}

}

Lines 128-134 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java (-1 / +1 lines)
128	int j2eeVersion = getJ2EEVersion();	128	int j2eeVersion = getJ2EEVersion();
129	AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(null, j2eeVersion);	129	AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(null, j2eeVersion);
130	moduleProjectsViewer.setContentProvider(provider);	130	moduleProjectsViewer.setContentProvider(provider);
131	moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider());	131	moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider(provider));
132	setCheckedItemsFromModel();	132	setCheckedItemsFromModel();
133		133
134	moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() {	134	moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() {




/**
 *  Class that supports Decoration of TableViewer and TreeViewer with TreeColumns
 */
package org.eclipse.jst.j2ee.internal;

import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.swt.graphics.Image;

/**
 * @author Annamalai Chockalingam
 * 
 */
public class TableDecoratingLabelProvider extends DecoratingLabelProvider
		implements ITableLabelProvider {

	ITableLabelProvider provider;
	ILabelDecorator decorator;

	/**
	 * @param provider
	 * @param decorator
	 */
	public TableDecoratingLabelProvider(ILabelProvider provider,
			ILabelDecorator decorator) {
		super(provider, decorator);
		this.provider = (ITableLabelProvider) provider;
		this.decorator = decorator;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang
	 * .Object, int)
	 */
	public Image getColumnImage(Object element, int columnIndex) {
		Image image = provider.getColumnImage(element, columnIndex);
		if (decorator != null) {
			Image decorated = decorator.decorateImage(image, element);
			if (decorated != null) {
				return decorated;
			}
		}
		return image;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang
	 * .Object, int)
	 */
	public String getColumnText(Object element, int columnIndex) {
		String text = provider.getColumnText(element, columnIndex);
		if (decorator != null) {
			String decorated = decorator.decorateText(text, element);
			if (decorated != null) {
				return decorated;
			}
		}
		return text;
	}
}

Return to bug 248623

Lines 16-26 Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java (-47 / +30 lines)
16	*/	16	*/
17	package org.eclipse.jst.j2ee.internal.wizard;	17	package org.eclipse.jst.j2ee.internal.wizard;
18		18
19	import org.eclipse.core.resources.IProject;
20	import org.eclipse.jface.viewers.ILabelProvider;	19	import org.eclipse.jface.viewers.ILabelProvider;
21	import org.eclipse.jface.viewers.ILabelProviderListener;	20	import org.eclipse.jface.viewers.ILabelProviderListener;
		21	import org.eclipse.jface.viewers.ITableLabelProvider;
		22	import org.eclipse.jface.viewers.LabelProvider;
		23	import org.eclipse.jface.viewers.LabelProviderChangedEvent;
22	import org.eclipse.swt.graphics.Image;	24	import org.eclipse.swt.graphics.Image;
23	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
24		25
25		26
26		27
Lines 30-91 Link Here
30	* TODO To change the template for this generated type comment go to	31	* TODO To change the template for this generated type comment go to
31	* Window - Preferences - Java - Code Style - Code Templates	32	* Window - Preferences - Java - Code Style - Code Templates
32	*/	33	*/
33	public class J2EEComponentLabelProvider implements ILabelProvider {	34	public class J2EEComponentLabelProvider extends LabelProvider implements ILabelProvider {
34		35
		36	ITableLabelProvider tableLableProvider;
		37
		38	private J2EEComponentLabelProvider instance;
		39
		40	public J2EEComponentLabelProvider(ITableLabelProvider tableLableProvider){
		41	this.tableLableProvider = tableLableProvider;
		42	instance = this;
		43	tableLableProvider.addListener(new ILabelProviderListener(){
		44	public void labelProviderChanged(LabelProviderChangedEvent event) {
		45	LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance);
		46	fireLabelProviderChanged(newEvent);
		47	}
		48	});
		49	}
35	/* (non-Javadoc)	50	/* (non-Javadoc)
36	* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)	51	* @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
37	*/	52	*/
38	public Image getImage(Object element) {	53	public Image getImage(Object element) {
39	// TODO Auto-generated method stub	54	return tableLableProvider.getColumnImage(element, 1);
40	return null;
41	}	55	}
42		56
43	/* (non-Javadoc)	57	/* (non-Javadoc)
44	* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)	58	* @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
45	*/	59	*/
46	public String getText(Object element) {	60	public String getText(Object element) {
47	if(element instanceof IVirtualComponent){	61	return tableLableProvider.getColumnText(element, 1);
48	IVirtualComponent comp = (IVirtualComponent)element;	62	// if(element instanceof IVirtualComponent){
49	return comp.getProject().getName();	63	// IVirtualComponent comp = (IVirtualComponent)element;
50	}	64	// return comp.getProject().getName();
51		65	// }
52	if (element instanceof IProject) {	66	//
53	IProject handle = (IProject)element;	67	// if (element instanceof IProject) {
54	return handle.getName();	68	// IProject handle = (IProject)element;
55	}	69	// return handle.getName();
56	return null;	70	// }
57	}	71	// return null;
58
59	/* (non-Javadoc)
60	* @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
61	*/
62	public void addListener(ILabelProviderListener listener) {
63	// TODO Auto-generated method stub
64
65	}
66
67	/* (non-Javadoc)
68	* @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
69	*/
70	public void dispose() {
71	// TODO Auto-generated method stub
72
73	}
74
75	/* (non-Javadoc)
76	* @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
77	*/
78	public boolean isLabelProperty(Object element, String property) {
79	// TODO Auto-generated method stub
80	return false;
81	}
82
83	/* (non-Javadoc)
84	* @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
85	*/
86	public void removeListener(ILabelProviderListener listener) {
87	// TODO Auto-generated method stub
88
89	}	72	}
90		73
91	}	74	}

Added Link Here

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/TableDecoratingLabelProvider.java (+68 lines)
1	/**
2	* Class that supports Decoration of TableViewer and TreeViewer with TreeColumns
3	*/
4	package org.eclipse.jst.j2ee.internal;
5
6	import org.eclipse.jface.viewers.DecoratingLabelProvider;
7	import org.eclipse.jface.viewers.ILabelDecorator;
8	import org.eclipse.jface.viewers.ILabelProvider;
9	import org.eclipse.jface.viewers.ITableLabelProvider;
10	import org.eclipse.swt.graphics.Image;
11
12	/**
13	* @author Annamalai Chockalingam
14	*
15	*/
16	public class TableDecoratingLabelProvider extends DecoratingLabelProvider
17	implements ITableLabelProvider {
18
19	ITableLabelProvider provider;
20	ILabelDecorator decorator;
21
22	/**
23	* @param provider
24	* @param decorator
25	*/
26	public TableDecoratingLabelProvider(ILabelProvider provider,
27	ILabelDecorator decorator) {
28	super(provider, decorator);
29	this.provider = (ITableLabelProvider) provider;
30	this.decorator = decorator;
31	}
32
33	/*
34	* (non-Javadoc)
35	*
36	* @see
37	* org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang
38	* .Object, int)
39	*/
40	public Image getColumnImage(Object element, int columnIndex) {
41	Image image = provider.getColumnImage(element, columnIndex);
42	if (decorator != null) {
43	Image decorated = decorator.decorateImage(image, element);
44	if (decorated != null) {
45	return decorated;
46	}
47	}
48	return image;
49	}
50
51	/*
52	* (non-Javadoc)
53	*
54	* @see
55	* org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang
56	* .Object, int)
57	*/
58	public String getColumnText(Object element, int columnIndex) {
59	String text = provider.getColumnText(element, columnIndex);
60	if (decorator != null) {
61	String decorated = decorator.decorateText(text, element);
62	if (decorated != null) {
63	return decorated;
64	}
65	}
66	return text;
67	}
68	}