You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/09/02 23:21:44 UTC

svn commit: r1164714 - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype: EffectiveNodeType.java EffectiveNodeTypeImpl.java

Author: mduerig
Date: Fri Sep  2 21:21:44 2011
New Revision: 1164714

URL: http://svn.apache.org/viewvc?rev=1164714&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
clean up: remove deprecated api

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java?rev=1164714&r1=1164713&r2=1164714&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java Fri Sep  2 21:21:44 2011
@@ -101,14 +101,6 @@ public interface EffectiveNodeType {
             throws ConstraintViolationException, NoSuchNodeTypeException;
 
     /**
-     * @param name
-     * @throws ConstraintViolationException
-     * @deprecated Use {@link #hasRemoveNodeConstraint(Name)} and
-     * {@link #hasRemovePropertyConstraint(Name)} respectively.
-     */
-    void checkRemoveItemConstraints(Name name) throws ConstraintViolationException;
-
-    /**
      * Returns <code>true</code> if a single node definition matching the
      * specified <code>nodeName</code> is either mandatory or protected.
      *

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=1164714&r1=1164713&r2=1164714&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Fri Sep  2 21:21:44 2011
@@ -350,16 +350,6 @@ public class EffectiveNodeTypeImpl imple
     }
 
     @Override
-    public void checkRemoveItemConstraints(Name name) throws ConstraintViolationException {
-        // as there might be multiple definitions with the same name and we
-        // don't know which one is applicable, we check all of them
-        QItemDefinition[] defs = getNamedItemDefs(name);
-        if (hasRemoveConstraint(defs)) {
-            throw new ConstraintViolationException("can't remove mandatory or protected item");
-        }
-    }
-
-    @Override
     public boolean hasRemoveNodeConstraint(Name nodeName) {
         QNodeDefinition[] defs = getNamedQNodeDefinitions(nodeName);
         return hasRemoveConstraint(defs);