Author: scabanovich Date: 2009-06-03 02:08:04 -0400 (Wed, 03 Jun 2009) New Revision: 15668 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/XProjectContentProvider.java Log: https://jira.jboss.org/jira/browse/JBIDE-4411 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 2009-06-03 05:09:36 UTC (rev 15667) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XContentProvider.java 2009-06-03 06:08:04 UTC (rev 15668) @@ -67,7 +67,7 @@ } return getChildren(o); } - return null; + return new Object[0]; } public Object getParent(Object 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 2009-06-03 05:09:36 UTC (rev 15667) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/navigator/XProjectContentProvider.java 2009-06-03 06:08:04 UTC (rev 15668) @@ -34,7 +34,7 @@ } IProject f = (IProject)parentElement; IModelNature n = EclipseResourceUtil.getModelNature(f); - if(n == null) return null; + if(n == null) return new Object[0]; XModelObject o = EclipseResourceUtil.getObjectByResource(f); if(o == null) o = EclipseResourceUtil.createObjectForResource(f); XFilteredTree filteredTree = getFilteredTree(o); @@ -44,9 +44,9 @@ if(filteredTree != null) { return new Object[]{filteredTree.getRoot()}; } - return null; + return new Object[0]; } - return null; + return new Object[0]; } public Object getParent(Object element) {