commit 7ca70c4aafb6342549d75ceba0f3874263845035
author Fred Bricon <fbricon@gmail.com> Tue Aug 13 16:20:50 2013 +0200
committer Fred Bricon <fbricon@gmail.com> Tue Aug 13 16:20:50 2013 +0200
tree 0ade2717f2da1916980d1fd5c572eb909b754503
parent cf51d6983a91111f3f04f1715c82f26f32e3d5c6

412819 : disable the 'Deployed Resources' node for non-maven projects

Signed-off-by: Fred Bricon <fbricon@gmail.com>

org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java

diff --git a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java
index cafeadd..e97f78d 100644
--- a/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java
+++ b/org.eclipse.m2e.wtp/src/org/eclipse/m2e/wtp/internal/WTPResourcesContentProvider.java
@@ -14,6 +14,7 @@
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
+import org.eclipse.m2e.core.internal.IMavenConstants;
 import org.eclipse.m2e.wtp.WTPProjectsUtil;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.model.BaseWorkbenchContentProvider;
@@ -37,19 +38,19 @@
   private static final Logger LOG = LoggerFactory.getLogger(WTPResourcesContentProvider.class); 
   
   @Override
-public void init(ICommonContentExtensionSite config) {
+  public void init(ICommonContentExtensionSite config) {
   }
 
   @Override
-public void restoreState(IMemento memento) {
+  public void restoreState(IMemento memento) {
   }
 
   @Override
-public void saveState(IMemento memento) {
+  public void saveState(IMemento memento) {
   }
 
   @Override
-public Object[] getChildren(Object element) {
+  public Object[] getChildren(Object element) {
     if(element instanceof WTPResourcesNode) {
       return ((WTPResourcesNode) element).getResources();
     }
@@ -59,22 +60,25 @@
   // IPipelinedTreeContentProvider
 
   @Override
-@SuppressWarnings("rawtypes")
+  @SuppressWarnings("rawtypes")
   public void getPipelinedElements(Object element, Set currentElements) {
   }
   
   @Override
-@SuppressWarnings({"unchecked", "rawtypes"})
+  @SuppressWarnings({"unchecked", "rawtypes"})
   public void getPipelinedChildren(Object parent, Set currentChildren) {
     if (parent instanceof IProject) {
       IProject project = (IProject) parent;
       if(project.isAccessible()) {
         try {
+          if (!project.hasNature(IMavenConstants.NATURE_ID)) {
+        	  return;
+          }
           IFacetedProject facetedProject = ProjectFacetsManager.create(project);//MNGECLIPSE-1992 there's no reason to actually create a ProjectFacet at this point
           if(facetedProject != null && 
               (facetedProject.hasProjectFacet(WTPProjectsUtil.DYNAMIC_WEB_FACET) || 
                facetedProject.hasProjectFacet(WTPProjectsUtil.EAR_FACET))) {
-            List newChildren = new ArrayList<Object>();
+            List newChildren = new ArrayList<Object>(currentChildren.size()+1);
             newChildren.add(new WTPResourcesNode(project));
             newChildren.addAll(currentChildren);
             currentChildren.clear();
@@ -88,27 +92,27 @@
   }
 
   @Override
-public Object getPipelinedParent(Object element, Object suggestedParent) {
+  public Object getPipelinedParent(Object element, Object suggestedParent) {
     return suggestedParent;
   }
 
   @Override
-public boolean interceptRefresh(PipelinedViewerUpdate refreshSynchronization) {
+  public boolean interceptRefresh(PipelinedViewerUpdate refreshSynchronization) {
     return false;
   }
   
   @Override
-public boolean interceptUpdate(PipelinedViewerUpdate updateSynchronization) {
+  public boolean interceptUpdate(PipelinedViewerUpdate updateSynchronization) {
     return false;
   }
   
   @Override
-public PipelinedShapeModification interceptAdd(PipelinedShapeModification addModification) {
+  public PipelinedShapeModification interceptAdd(PipelinedShapeModification addModification) {
     return addModification;
   }
 
   @Override
-public PipelinedShapeModification interceptRemove(PipelinedShapeModification removeModification) {
+  public PipelinedShapeModification interceptRemove(PipelinedShapeModification removeModification) {
     return removeModification;
   }