[exo-jcr-commits] exo-jcr SVN: r5160 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core.

[do-not-reply at jboss.org]

Author: zavizionov
Date: 2011-11-04 05:50:28 -0400 (Fri, 04 Nov 2011)
New Revision: 5160

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
Log:
EXOJCR-1568 Can't remove mixin from node and add mixin again. Fixed formatter.

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java	2011-11-04 09:48:37 UTC (rev 5159)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NodeImpl.java	2011-11-04 09:50:28 UTC (rev 5160)
@@ -1930,7 +1930,8 @@
       for (PropertyDefinitionData pd : ntmanager.getAllPropertyDefinitions(removedName))
       {
          // to skip remove propertyDefinition with existed another nodeType property definition  
-         if (ntmanager.getPropertyDefinitions(pd.getName(), nodeData().getPrimaryTypeName(), newMixin.toArray(new InternalQName[]{})) == null) 
+         if (ntmanager.getPropertyDefinitions(pd.getName(), nodeData().getPrimaryTypeName(), newMixin
+            .toArray(new InternalQName[]{})) == null)
          {
             ItemData p = dataManager.getItemData(nodeData(), new QPathEntry(pd.getName(), 1), ItemType.PROPERTY, false);
             if (p != null && !p.isNode())
@@ -3065,14 +3066,14 @@
          def =
             session.getWorkspace().getNodeTypesHolder().getChildNodeDefinition(nameToAdd, primaryTypeName,
                parentNode.getPrimaryTypeName(), parentNode.getMixinTypeNames());
-         
+
          if (def == null)
          {
             throw new ConstraintViolationException("Can't find child node definition for " + nameToAdd + " in parent "
                + parentNode.getQPath().getAsString());
          }
       }
-      
+
       boolean allowSns = def.isAllowsSameNameSiblings();
 
       int ind = 1;