Author: scabanovich Date: 2011-02-02 07:43:24 -0500 (Wed, 02 Feb 2011) New Revision: 28916 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XLabelProvider.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java Log: JBIDE-8306 https://issues.jboss.org/browse/JBIDE-8306 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XLabelProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XLabelProvider.java 2011-02-02 11:33:31 UTC (rev 28915) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XLabelProvider.java 2011-02-02 12:43:24 UTC (rev 28916) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.web.ui.navigator; +import org.eclipse.swt.graphics.Image; import org.jboss.tools.common.model.impl.ExtraRootImpl; import org.jboss.tools.jst.web.messages.xpl.WebUIMessages; import org.jboss.tools.jst.web.model.pv.WebProjectNode; @@ -19,14 +20,28 @@ */ public class XLabelProvider extends WebProjectsLabelProvider { + public static class RootWrapper { + public Object element; + } + public XLabelProvider() {} public String getText(Object element) { + if(element instanceof RootWrapper) { + element = ((RootWrapper)element).element; + } if(element instanceof WebProjectNode && element instanceof ExtraRootImpl) { return WebUIMessages.WEB_RESOURCES; } return super.getText(element); } + public Image getImage(Object element) { + if(element instanceof RootWrapper) { + element = ((RootWrapper)element).element; + } + return super.getImage(element); + } + } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java 2011-02-02 11:33:31 UTC (rev 28915) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java 2011-02-02 12:43:24 UTC (rev 28916) @@ -17,10 +17,14 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.ui.navigator.XLabelProvider.RootWrapper; public class XProjectContentProvider extends XContentProvider { public Object[] getChildren(Object parentElement) { + if(parentElement instanceof RootWrapper) { + parentElement = ((RootWrapper)parentElement).element; + } if(parentElement instanceof XModelObject) { XModelObject o = (XModelObject)parentElement; XFilteredTree filteredTree = getFilteredTree(o); @@ -42,7 +46,9 @@ filteredTree = getFilteredTree(o); } if(filteredTree != null) { - return new Object[]{filteredTree.getRoot()}; + RootWrapper w = new RootWrapper(); + w.element = filteredTree.getRoot(); + return new Object[]{w}; } return new Object[0]; } @@ -50,6 +56,9 @@ } public Object getParent(Object element) { + if(element instanceof RootWrapper) { + element = ((RootWrapper)element).element; + } if(element instanceof XModelObject) { XModelObject o = (XModelObject)element; XFilteredTree filteredTree = getFilteredTree(o);