Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 131379 Details for
Bug 248623
Add icons for module dependencies in EAR wizard
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
patch
patch.txt (text/plain), 15.22 KB, created by
Milen Manov
on 2009-04-09 04:32:17 EDT
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Milen Manov
Created:
2009-04-09 04:32:17 EDT
Size:
15.22 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.jst.j2ee.ui >Index: j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java,v >retrieving revision 1.20 >diff -u -r1.20 AvailableJ2EEComponentsForEARContentProvider.java >--- j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java 27 Feb 2009 20:52:07 -0000 1.20 >+++ j2ee_ui/org/eclipse/jst/j2ee/internal/AvailableJ2EEComponentsForEARContentProvider.java 9 Apr 2009 08:26:27 -0000 >@@ -22,9 +22,13 @@ > import org.eclipse.core.runtime.CoreException; > import org.eclipse.core.runtime.IPath; > import org.eclipse.jem.util.logger.proxy.Logger; >+import org.eclipse.jface.viewers.ILabelDecorator; >+import org.eclipse.jface.viewers.ILabelProvider; > import org.eclipse.jface.viewers.ILabelProviderListener; > import org.eclipse.jface.viewers.IStructuredContentProvider; > import org.eclipse.jface.viewers.ITableLabelProvider; >+import org.eclipse.jface.viewers.LabelProvider; >+import org.eclipse.jface.viewers.LabelProviderChangedEvent; > import org.eclipse.jface.viewers.Viewer; > import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; > import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; >@@ -38,13 +42,16 @@ > import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities; > import org.eclipse.jst.javaee.application.Application; > import org.eclipse.swt.graphics.Image; >+import org.eclipse.ui.PlatformUI; >+import org.eclipse.ui.model.WorkbenchLabelProvider; > import org.eclipse.wst.common.componentcore.ComponentCore; > import org.eclipse.wst.common.componentcore.ModuleCoreNature; > import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; > import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; > import org.eclipse.wst.common.componentcore.resources.IVirtualReference; > >-public class AvailableJ2EEComponentsForEARContentProvider implements IStructuredContentProvider, ITableLabelProvider { >+public class AvailableJ2EEComponentsForEARContentProvider extends LabelProvider >+ implements IStructuredContentProvider, ITableLabelProvider { > > final static String PATH_SEPARATOR = String.valueOf(IPath.SEPARATOR); > >@@ -52,12 +59,36 @@ > private IVirtualComponent earComponent; > private boolean isEE5 = false; > private String libDir = null; >+ >+// private ILabelProvider decoratingWorkbenchLabelProvider = new DecoratingLabelProvider(this, >+// PlatformUI.getWorkbench().getDecoratorManager() >+// .getLabelDecorator()); >+ >+ private ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(); >+ >+ private ILabelProvider workbenchLabelProvider = new WorkbenchLabelProvider(); > >+ private AvailableJ2EEComponentsForEARContentProvider instance; > > public AvailableJ2EEComponentsForEARContentProvider(IVirtualComponent aEarComponent, int j2eeVersion) { > super(); > this.j2eeVersion = j2eeVersion; > earComponent = aEarComponent; >+ >+ instance = this; >+ decorator.addListener(new ILabelProviderListener(){ >+ public void labelProviderChanged(LabelProviderChangedEvent event) { >+ LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance); >+ fireLabelProviderChanged(newEvent); >+ } >+ }); >+// decoratingWorkbenchLabelProvider.addListener(new ILabelProviderListener(){ >+// >+// public void labelProviderChanged(LabelProviderChangedEvent event) { >+// LabelProviderChangedEvent newEvent = new LabelProviderChangedEvent(instance); >+// fireLabelProviderChanged(newEvent); >+// } >+// }); > } > > /* >@@ -217,9 +248,33 @@ > * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int) > */ > public Image getColumnImage(Object element, int columnIndex) { >+ if (columnIndex >=2){ >+ return null; >+ } >+ if (element instanceof IVirtualComponent) { >+ IVirtualComponent comp = (IVirtualComponent)element; >+ return getDecoratedImage(comp); >+ } else if (element instanceof IProject){ >+ return workbenchLabelProvider.getImage(element); >+ } > return null; > } > >+ private Image getDecoratedImage(IVirtualComponent comp) { >+ return getDecoratedImage(comp.getProject()); >+ } >+ >+ private Image getDecoratedImage(IProject project) { >+ Image image = workbenchLabelProvider.getImage(project); >+ if (decorator != null) { >+ Image decorated = decorator.decorateImage(image, project); >+ if (decorated != null) { >+ return decorated; >+ } >+ } >+ return image; >+ } >+ > /* > * (non-Javadoc) > * >@@ -256,47 +311,18 @@ > } > return null; > } >- /* >- * (non-Javadoc) >- * >- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, >- * java.lang.Object, java.lang.Object) >- */ >- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { >- //do nothing >- } >- >- /* >- * (non-Javadoc) >- * >- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener) >- */ >- public void addListener(ILabelProviderListener listener) { >- //do nothing >- } >- >- /* >- * (non-Javadoc) >- * >- * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, >- * java.lang.String) >- */ >- public boolean isLabelProperty(Object element, String property) { >- return false; >- } >- >- /* >- * (non-Javadoc) >- * >- * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener) >- */ >- public void removeListener(ILabelProviderListener listener) { >- //do nothing >- } >- >+ > /* (non-Javadoc) > * @see org.eclipse.jface.viewers.IContentProvider#dispose() > */ > public void dispose() { >+// if (decoratingWorkbenchLabelProvider != null) { >+// decoratingWorkbenchLabelProvider.dispose(); >+// } >+ } >+ >+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { >+ // TODO Auto-generated method stub >+ > } > } >Index: j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java,v >retrieving revision 1.46 >diff -u -r1.46 AddModulestoEARPropertiesPage.java >--- j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java 4 Nov 2008 18:18:42 -0000 1.46 >+++ j2ee_ui/org/eclipse/jst/j2ee/internal/AddModulestoEARPropertiesPage.java 9 Apr 2009 08:26:27 -0000 >@@ -43,6 +43,7 @@ > import org.eclipse.jface.viewers.ColumnWeightData; > import org.eclipse.jface.viewers.ICheckStateListener; > import org.eclipse.jface.viewers.IContentProvider; >+import org.eclipse.jface.viewers.ILabelDecorator; > import org.eclipse.jface.viewers.TableLayout; > import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider; > import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider; >@@ -805,7 +806,10 @@ > int j2eeVersion = J2EEVersionUtil.convertVersionStringToInt(earComponent); > AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(earComponent, j2eeVersion); > availableComponentsViewer.setContentProvider(provider); >- availableComponentsViewer.setLabelProvider(provider); >+ >+ ILabelDecorator decorator = PlatformUI.getWorkbench().getDecoratorManager().getLabelDecorator(); >+ availableComponentsViewer.setLabelProvider(new TableDecoratingLabelProvider(provider, decorator)); >+// availableComponentsViewer.setLabelProvider(provider); > setLibDirInContentProvider(); > addTableListeners(); > } >Index: j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java,v >retrieving revision 1.9 >diff -u -r1.9 J2EEComponentLabelProvider.java >--- j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java 7 Jun 2007 20:02:08 -0000 1.9 >+++ j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentLabelProvider.java 9 Apr 2009 08:26:27 -0000 >@@ -16,11 +16,12 @@ > */ > 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; > > > >@@ -30,62 +31,44 @@ > * TODO To change the template for this generated type comment go to > * Window - Preferences - Java - Code Style - Code Templates > */ >-public class J2EEComponentLabelProvider implements ILabelProvider { >+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) { >- // TODO Auto-generated method stub >- return null; >+ return tableLableProvider.getColumnImage(element, 1); > } > > /* (non-Javadoc) > * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) > */ > public String getText(Object element) { >- 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 >- >+ 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; > } > > } >Index: j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java >=================================================================== >RCS file: /cvsroot/webtools/jeetools/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java,v >retrieving revision 1.17 >diff -u -r1.17 EarFacetInstallPage.java >--- j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java 16 Feb 2009 13:56:19 -0000 1.17 >+++ j2ee_ui/org/eclipse/jst/j2ee/ui/project/facet/EarFacetInstallPage.java 9 Apr 2009 08:26:27 -0000 >@@ -128,7 +128,7 @@ > int j2eeVersion = getJ2EEVersion(); > AvailableJ2EEComponentsForEARContentProvider provider = new AvailableJ2EEComponentsForEARContentProvider(null, j2eeVersion); > moduleProjectsViewer.setContentProvider(provider); >- moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider()); >+ moduleProjectsViewer.setLabelProvider(new J2EEComponentLabelProvider(provider)); > setCheckedItemsFromModel(); > > moduleProjectsViewer.addCheckStateListener(new ICheckStateListener() { >Index: j2ee_ui/org/eclipse/jst/j2ee/internal/TableDecoratingLabelProvider.java >=================================================================== >RCS file: j2ee_ui/org/eclipse/jst/j2ee/internal/TableDecoratingLabelProvider.java >diff -N j2ee_ui/org/eclipse/jst/j2ee/internal/TableDecoratingLabelProvider.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ j2ee_ui/org/eclipse/jst/j2ee/internal/TableDecoratingLabelProvider.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,68 @@ >+/** >+ * 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; >+ } >+} >\ No newline at end of file
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
kaloyan
:
iplog+
Actions:
View
|
Diff
Attachments on
bug 248623
:
120169
|
131379
|
131633