svn commit: r1607694 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java

[angela]

Author: angela
Date: Thu Jul  3 16:52:10 2014
New Revision: 1607694

URL: http://svn.apache.org/r1607694
Log:
fix indention

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1607694&r1=1607693&r2=1607694&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
 Thu Jul  3 16:52:10 2014
@@ -115,6 +115,7 @@ public class ImporterImpl implements Imp
 
     /**
      * Creates a new importer instance.
+     *
      * @param absPath  The absolute JCR paths such as passed to the JCR call.
      * @param sessionContext The context of the editing session
      * @param root The write {@code Root}, which in case of a workspace import
@@ -392,12 +393,12 @@ public class ImporterImpl implements Imp
                 //this id exist
                 Tree conflicting = baseStateIdManager.getTree(id);
 
-                if(conflicting == null){
+                if (conflicting == null) {
                     //1.a. Check if id is found in newly created nodes
-                    if(uuids.contains(id)){
+                    if (uuids.contains(id)) {
                         conflicting = currentStateIdManager.getTree(id);
                     }
-                }else{
+                } else {
                     //1.b Re obtain the conflicting tree from Id Manager
                     //associated with current root. Such that any operation
                     //on it gets reflected in later operations
@@ -477,16 +478,16 @@ public class ImporterImpl implements Imp
     }
 
     private void collectUUIDs(Tree tree) {
-        if(tree == null){
+        if (tree == null) {
             return;
         }
 
         String uuid = TreeUtil.getString(tree, JcrConstants.JCR_UUID);
-        if(uuid != null){
+        if (uuid != null) {
             uuids.add(uuid);
         }
 
-        for(Tree child : tree.getChildren()){
+        for (Tree child : tree.getChildren()) {
             collectUUIDs(child);
         }
     }