svn commit: r1524697 - in /sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt: UpdateNodePropertiesCommand.java serialization/VltSerializationManager.java

[rombert]

Author: rombert
Date: Thu Sep 19 11:13:27 2013
New Revision: 1524697

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

Prevent update of partial coverage nodes erasing all properties of child
nodes.

Modified:
    
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
    
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java?rev=1524697&r1=1524696&r2=1524697&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/UpdateNodePropertiesCommand.java
 Thu Sep 19 11:13:27 2013
@@ -59,6 +59,13 @@ public class UpdateNodePropertiesCommand
     
     private void update(ResourceProxy resource, Session session) throws 
RepositoryException, IOException {
         String resPath = resource.getPath();
+
+        // TODO - this is a workaround for partial coverage nodes being sent 
here
+        // when a .content.xml file with partial coverage is added here, the 
children are listed with no properties
+        // and get all their properties deleted
+        if (resource.getProperties().isEmpty()) {
+            return;
+        }
                updatePath(resPath, resource.getProperties(), session);
         Iterator<ResourceProxy> it = resource.getChildren().iterator();
         while(it.hasNext()) {

Modified: 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
URL: 
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java?rev=1524697&r1=1524696&r2=1524697&view=diff
==============================================================================
--- 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
 (original)
+++ 
sling/branches/tooling-ide-vlt/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
 Thu Sep 19 11:13:27 2013
@@ -52,6 +52,8 @@ public class VltSerializationManager imp
 
     static final String EXTENSION_XML = ".xml";
 
+    private VltSerializationDataBuilder builder;
+
     public static void main(String[] args) throws RepositoryException, 
URISyntaxException, IOException {
         RepositoryAddress address = new 
RepositoryAddress("http://localhost:8080/server/root";);
         Repository repo = new RepositoryProvider().getRepository(address);
@@ -143,8 +145,6 @@ public class VltSerializationManager imp
        getBuilder().fsLocator = null;
     }
     
-    private VltSerializationDataBuilder builder;
-    
     private VltSerializationDataBuilder getBuilder() {
        if (builder==null) {
                builder = new VltSerializationDataBuilder();