[exo-jcr-commits] exo-jcr SVN: r1240 - jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2009-12-29 10:15:27 -0500 (Tue, 29 Dec 2009)
New Revision: 1240

Modified:
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
Log:
EXOJCR-344: formatting

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-29 14:50:43 UTC (rev 1239)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-29 15:15:27 UTC (rev 1240)
@@ -1569,7 +1569,7 @@
     * Merges incoming node with changes stored in this log i.e: 1. incoming data still not modified
     * if there are no corresponding changes 2. incoming data is refreshed with corresponding changes
     * if any 3. new datas is added from changes 4. if chaged data is marked as "deleted" it removes
-    * from outgoing list WARN. THIS METHOD HAS SIBLING - mergeList, see below
+    * from outgoing list WARN. THIS METHOD HAS SIBLING - mergeList, see below.
     * 
     * @param rootData
     * @return
@@ -1590,9 +1590,13 @@
          {
             ItemData data = state.getData();
             if (!state.isDeleted())
+            {
                descendants.put(data.getIdentifier(), data);
+            }
             else
+            {
                descendants.remove(data.getIdentifier());
+            }
          }
          Collection<ItemData> desc = descendants.values();
          return new ArrayList<ItemData>(desc);
@@ -1607,7 +1611,7 @@
     * Merges incoming property data with changes stored in this log i.e: 1. incoming data still not modified
     * if there are no corresponding changes 2. incoming data is refreshed with corresponding changes
     * if any 3. new datas is added from changes 4. if chaged data is marked as "deleted" it removes
-    * from outgoing list WARN. THIS METHOD HAS SIBLING - mergeList, see below
+    * from outgoing list WARN. THIS METHOD HAS SIBLING - mergeList, see below.
     * 
     * @param rootData
     * @return
@@ -1628,9 +1632,13 @@
          {
             ItemData data = state.getData();
             if (!state.isDeleted())
+            {
                descendants.put(data.getIdentifier(), data);
+            }
             else
+            {
                descendants.remove(data.getIdentifier());
+            }
          }
          Collection<ItemData> desc = descendants.values();
          return new ArrayList<ItemData>(desc);
@@ -1643,7 +1651,7 @@
 
    /**
     * Merge a list of nodes and properties of root data. NOTE. Properties in the list will have empty
-    * value data. I.e. for operations not changes properties content. USED FOR DELETE
+    * value data. I.e. for operations not changes properties content. USED FOR DELETE.
     * 
     * @param rootData
     * @param dataManager
@@ -1671,9 +1679,13 @@
          {
             ItemData data = state.getData();
             if (!state.isDeleted())
+            {
                descendants.put(data.getIdentifier(), data);
+            }
             else
+            {
                descendants.remove(data.getIdentifier());
+            }
          }
          Collection<ItemData> desc = descendants.values();
          List<ItemData> retval;
@@ -1686,7 +1698,9 @@
             {
                retval.add(itemData);
                if (deep)
+               {
                   retval.addAll(mergeList(itemData, dataManager, true, action));
+               }
             }
          }
          else
@@ -1724,9 +1738,6 @@
             for (NodeData childNode : childNodes)
             {
                ret.put(childNode.getIdentifier(), childNode);
-
-               if (log.isDebugEnabled())
-                  log.debug("Traverse stored (N) " + childNode.getQPath().getAsString());
             }
          }
          if (action != MERGE_NODES)
@@ -1746,9 +1757,6 @@
                   }
                }
                ret.put(childProp.getIdentifier(), childProp);
-
-               if (log.isDebugEnabled())
-                  log.debug("Traverse stored (P) " + childProp.getQPath().getAsString());
             }
          }
       }