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 248623 | Differences between
and this patch

Collapse All | Expand All

(-)j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java (+16 lines)
Lines 22-27 Link Here
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.ILabelProvider;
25
import org.eclipse.jface.viewers.ILabelProviderListener;
26
import org.eclipse.jface.viewers.ILabelProviderListener;
26
import org.eclipse.jface.viewers.IStructuredContentProvider;
27
import org.eclipse.jface.viewers.IStructuredContentProvider;
27
import org.eclipse.jface.viewers.ITableLabelProvider;
28
import org.eclipse.jface.viewers.ITableLabelProvider;
Lines 37-42 Link Here
37
import org.eclipse.jst.j2ee.model.ModelProviderManager;
38
import org.eclipse.jst.j2ee.model.ModelProviderManager;
38
import org.eclipse.jst.javaee.application.Application;
39
import org.eclipse.jst.javaee.application.Application;
39
import org.eclipse.swt.graphics.Image;
40
import org.eclipse.swt.graphics.Image;
41
import org.eclipse.ui.model.WorkbenchLabelProvider;
40
import org.eclipse.wst.common.componentcore.ComponentCore;
42
import org.eclipse.wst.common.componentcore.ComponentCore;
41
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
43
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
42
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
44
import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
Lines 51-56 Link Here
51
	private IVirtualComponent earComponent;
53
	private IVirtualComponent earComponent;
52
	private boolean isEE5 = false;
54
	private boolean isEE5 = false;
53
	private String libDir = null;
55
	private String libDir = null;
56
57
	private ILabelProvider decoratingWorkbenchLabelProvider = WorkbenchLabelProvider.getDecoratingWorkbenchLabelProvider();
54
	
58
	
55
	
59
	
56
	public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {
60
	public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) {
Lines 212-217 Link Here
212
	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
216
	 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
213
	 */
217
	 */
214
	public Image getColumnImage(Object element, int columnIndex) {
218
	public Image getColumnImage(Object element, int columnIndex) {
219
		if (columnIndex >=2){
220
			return null;
221
		}
222
		if (element instanceof IVirtualComponent) {
223
			IVirtualComponent comp = (IVirtualComponent)element;
224
			return decoratingWorkbenchLabelProvider.getImage(comp.getProject());
225
		} else if (element instanceof IProject){
226
			return decoratingWorkbenchLabelProvider.getImage(element);
227
		}
215
		return null;
228
		return null;
216
	}
229
	}
217
230
Lines 293-297 Link Here
293
	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
306
	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
294
	 */
307
	 */
295
	public void dispose() {
308
	public void dispose() {
309
		if (decoratingWorkbenchLabelProvider != null) {
310
			decoratingWorkbenchLabelProvider.dispose();
311
		}
296
	}
312
	}
297
}
313
}

Return to bug 248623