Author: scabanovich Date: 2008-02-28 12:11:00 -0500 (Thu, 28 Feb 2008) New Revision: 6645 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsContentProvider.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsLabelProvider.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java Log: JBIDE-1433 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2008-02-28 17:10:42 UTC (rev 6644) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2008-02-28 17:11:00 UTC (rev 6645) @@ -574,9 +574,16 @@ entities="FileTLD_PRO,FileTLD_1_2,FileTLD_2_0,FileTLD_2_1" name="File TLD" partition="Tag Libraries" - variables="shortname,uri,display-name" - defaultValue="{name} [{shortname}]" - > + defaultValue="{name} [{shortname}]"> + <variable name="shortname" description="attribute of taglib node"/> + <variable name="uri" description="attribute of taglib node"/> + <variable name="display-name" description="attribute of taglib node"/> + <example entity="FileTLD_1_2"> + <put name="name" value="taglib"/> + <put name="shortname" value="c"/> + <put name="uri" value="http://java.sun.com/jstl/core"/> + <put name="display-name" value="JSTL Core"/> + </example> </labelDecorator> </extension> Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsContentProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsContentProvider.java 2008-02-28 17:10:42 UTC (rev 6644) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsContentProvider.java 2008-02-28 17:11:00 UTC (rev 6645) @@ -11,14 +11,18 @@ package org.jboss.tools.jst.web.ui.navigator; import org.eclipse.core.resources.IProject; +import org.eclipse.jface.viewers.StructuredViewer; +import org.eclipse.jface.viewers.Viewer; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.ui.navigator.TreeViewerModelListenerImpl; +import org.jboss.tools.common.model.ui.preferences.DecoratorPreferencesListener; import org.jboss.tools.common.model.ui.views.navigator.NavigatorContentProvider; public class WebProjectsContentProvider extends NavigatorContentProvider { + DecoratorPreferencesListener decoratorListener = null; protected TreeViewerModelListenerImpl createListener() { return new WebProjectsTreeListener(); @@ -40,4 +44,22 @@ } } + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + super.inputChanged(viewer, oldInput, newInput); + if(viewer instanceof StructuredViewer) { + if(decoratorListener == null) { + decoratorListener = new DecoratorPreferencesListener(); + decoratorListener.init(); + } + decoratorListener.setViewer((StructuredViewer)viewer); + } + } + + public void dispose() { + if(decoratorListener != null) { + decoratorListener.dispose(); + decoratorListener = null; + } + super.dispose(); + } } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsLabelProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsLabelProvider.java 2008-02-28 17:10:42 UTC (rev 6644) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/WebProjectsLabelProvider.java 2008-02-28 17:11:00 UTC (rev 6645) @@ -12,7 +12,6 @@ import org.jboss.tools.common.model.ui.navigator.NavigatorLabelProvider; import org.jboss.tools.common.model.ui.navigator.decorator.DecoratorManager; -import org.jboss.tools.common.model.ui.navigator.decorator.DecoratorPart; import org.jboss.tools.common.model.ui.navigator.decorator.XModelObjectDecorator; import org.jboss.tools.common.model.XModelObject; @@ -20,6 +19,9 @@ public class WebProjectsLabelProvider extends NavigatorLabelProvider { + public WebProjectsLabelProvider() { + } + public String getText(Object element) { if(!(element instanceof XModelObject)) return ""; XModelObject o = (XModelObject)element; @@ -43,19 +45,10 @@ } else if("FileSystemFolder".equals(entity)) { String s = o.getAttributeValue("location").replace('\\', '/'); return s.substring(s.lastIndexOf('/') + 1); - } else if(entity.startsWith("FileTLD")) { - String s = super.getText(element); - String shortname = o.getAttributeValue("shortname"); - if(shortname != null) { - s += " " + shortname; - } - String uri = o.getAttributeValue("uri"); - if(uri != null && uri.length() > 0) { - s += " " + uri; - } - return s; } return super.getText(element); } + public void dispose() {} + } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java 2008-02-28 17:10:42 UTC (rev 6644) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java 2008-02-28 17:11:00 UTC (rev 6645) @@ -17,6 +17,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.jboss.tools.common.model.XFilteredTree; @@ -25,6 +26,7 @@ import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.navigator.TreeViewerModelListenerImpl; +import org.jboss.tools.common.model.ui.preferences.DecoratorPreferencesListener; import org.jboss.tools.common.model.ui.views.navigator.FilteredTreesCache; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelTreeListenerSWTASync; @@ -34,7 +36,9 @@ protected Viewer viewer = null; protected TreeViewerModelListenerImpl listener = createListener(); protected XModelTreeListenerSWTASync syncListener = new XModelTreeListenerSWTASync(listener); - + + DecoratorPreferencesListener decoratorListener = null; + protected TreeViewerModelListenerImpl createListener() { return new TreeViewerModelListenerImpl(); } @@ -104,6 +108,10 @@ syncListener = null; listener = null; } + if(decoratorListener != null) { + decoratorListener.dispose(); + decoratorListener = null; + } } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -111,6 +119,13 @@ if(listener != null && viewer instanceof TreeViewer) { listener.setViewer((TreeViewer)viewer); } + if(viewer instanceof StructuredViewer) { + if(decoratorListener == null) { + decoratorListener = new DecoratorPreferencesListener(); + decoratorListener.init(); + } + decoratorListener.setViewer((StructuredViewer)viewer); + } } protected XFilteredTree getFilteredTree(Object object) {