You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2013/09/24 23:44:35 UTC

svn commit: r1526021 - /sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java

Author: rombert
Date: Tue Sep 24 21:44:35 2013
New Revision: 1526021

URL: http://svn.apache.org/r1526021
Log:
SLING-3106 - Do not try to sync version control files

Honour the team private flag on resources.

Modified:
    sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1526021&r1=1526020&r2=1526021&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java Tue Sep 24 21:44:35 2013
@@ -491,6 +491,10 @@ public class SlingLaunchpadBehaviour ext
             return null;
         }
 
+        if (res.isTeamPrivateMember(IResource.CHECK_ANCESTORS)) {
+            return null;
+        }
+
         System.out.println("For " + resource + " build fileInfo " + info);
         if (info == null) {
             return null;
@@ -665,6 +669,15 @@ public class SlingLaunchpadBehaviour ext
             return null;
         }
 
+        IResource res = getResource(resource);
+        if (res == null) {
+            return null;
+        }
+
+        if (res.isTeamPrivateMember(IResource.CHECK_ANCESTORS)) {
+            return null;
+        }
+
         return repository.newDeleteNodeCommand(info);
     }