svn commit: r1522640 - /sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java

[ro...@apache.org]

Author: rombert
Date: Thu Sep 12 15:56:27 2013
New Revision: 1522640

URL: http://svn.apache.org/r1522640
Log:
SLING-2989 - [Tooling] integrate with vlt once available

Do not recurse into child nodes if the node's serialization type is
METADATA_FULL.

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

Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java?rev=1522640&r1=1522639&r2=1522640&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportWizard.java Thu Sep 12 15:56:27 2013
@@ -25,6 +25,7 @@ import java.lang.reflect.InvocationTarge
 import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
 import org.apache.sling.ide.eclipse.core.ProjectUtil;
 import org.apache.sling.ide.eclipse.core.ServerUtil;
+import org.apache.sling.ide.eclipse.ui.internal.SerializationKindManager.SerializationKind;
 import org.apache.sling.ide.filter.Filter;
 import org.apache.sling.ide.filter.FilterLocator;
 import org.apache.sling.ide.filter.FilterResult;
@@ -247,12 +248,13 @@ public class ImportWizard extends Wizard
         ResourceProxy resource = executeCommand(repository.newListChildrenNodeCommand(path));
         String primaryType = (String) resource.getProperties().get(Repository.JCR_PRIMARY_TYPE);
  
-        System.out.println(primaryType + " -> " + skm.getSerializationKind(primaryType));
+        SerializationKind serializationKind = skm.getSerializationKind(primaryType);
+        System.out.println(primaryType + " -> " + serializationKind);
         
         // TODO we should know all node types for which to create files and folders
 
         String serializationPath = serializationManager.getSerializationFilePath(path);
-        switch (skm.getSerializationKind(primaryType)) {
+        switch (serializationKind) {
             case FILE: {
                 importFile(repository, path, project, projectRelativePath);
 
@@ -318,8 +320,13 @@ public class ImportWizard extends Wizard
 
         System.out.println("Children: " + resource.getChildren());
 
+        if (serializationKind == SerializationKind.METADATA_FULL) {
+            return;
+        }
+        
         for (ResourceProxy child : resource.getChildren()) {
 
+            // TODO - still needed?
             if (Repository.NT_RESOURCE.equals(child.getProperties().get(Repository.JCR_PRIMARY_TYPE))) {
                 continue;
             }