From jackrabbit-commits-return-756-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org Thu Apr 14 11:51:12 2005
Return-Path: <jackrabbit-commits-return-756-apmail-incubator-jackrabbit-commits-archive=www.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org
Received: (qmail 82733 invoked from network); 14 Apr 2005 11:51:12 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 14 Apr 2005 11:51:12 -0000
Received: (qmail 95561 invoked by uid 500); 14 Apr 2005 11:51:10 -0000
Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jackrabbit-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jackrabbit-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jackrabbit-commits@incubator.apache.org>
List-Id: <jackrabbit-commits.incubator.apache.org>
Reply-To: jackrabbit-dev@incubator.apache.org
Delivered-To: mailing list jackrabbit-commits@incubator.apache.org
Received: (qmail 95491 invoked by uid 500); 14 Apr 2005 11:51:09 -0000
Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org
Received: (qmail 95479 invoked by uid 99); 14 Apr 2005 11:51:09 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 14 Apr 2005 04:51:05 -0700
Received: (qmail 82694 invoked by uid 65534); 14 Apr 2005 11:51:04 -0000
Message-ID: <20050414115104.82692.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 14 Apr 2005 11:51:04 -0000
Subject: svn commit: r161260 [3/7] - in incubator/jackrabbit/trunk: ./
 applications/test/ applications/test/repository/nodetypes/
 contrib/orm-persistence/applications/test/
 contrib/orm-persistence/applications/test/repository/nodetypes/
 src/java/org/apache/jackrabbit/core/
 src/java/org/apache/jackrabbit/core/lock/
 src/java/org/apache/jackrabbit/core/nodetype/
 src/java/org/apache/jackrabbit/core/nodetype/virtual/
 src/java/org/apache/jackrabbit/core/nodetype/xml/
 src/java/org/apache/jackrabbit/core/observation/
 src/java/org/apache/jackrabbit/core/search/
 src/java/org/apache/jackrabbit/core/search/lucene/
 src/java/org/apache/jackrabbit/core/security/
 src/java/org/apache/jackrabbit/core/util/
 src/java/org/apache/jackrabbit/core/version/
 src/java/org/apache/jackrabbit/core/virtual/
 src/java/org/apache/jackrabbit/core/xml/
 src/test/org/apache/jackrabbit/core/nodetype/xml/
 src/test/org/apache/jackrabbit/core/observation/
 src/test/org/apache/jackrabbit/core/search/
 src/test/org/apache/jackrabbit/test/api/
 src/test/org/apache/jackrabbit/test/api/lock/
 src/test/org/apache/jackrabbit/test/api/nodetype/
 src/test/org/apache/jackrabbit/test/api/nodetype/spec/
 src/test/org/apache/jackrabbit/test/api/observation/
 src/test/org/apache/jackrabbit/test/api/query/
 src/test/org/apache/jackrabbit/test/api/version/
To: jackrabbit-cvs@incubator.apache.org
From: stefan@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Copied: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/node=
type/ItemDef.java (from r161036, incubator/jackrabbit/trunk/src/java/org/ap=
ache/jackrabbit/core/nodetype/ChildItemDef.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/ItemDef.java?view=3Ddiff&rev=3D161260&p1=3D=
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/Chi=
ldItemDef.java&r1=3D161036&p2=3Dincubator/jackrabbit/trunk/src/java/org/apa=
che/jackrabbit/core/nodetype/ItemDef.java&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ChildItemDef.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ItemDef.java Thu Apr 14 04:50:38 2005
@@ -16,15 +16,15 @@
  */
 package org.apache.jackrabbit.core.nodetype;
=20
-import org.apache.jackrabbit.core.QName;
 import org.apache.jackrabbit.core.Constants;
+import org.apache.jackrabbit.core.QName;
=20
 import javax.jcr.version.OnParentVersionAction;
=20
 /**
  * An <code>ItemDef</code> ...
  */
-public abstract class ChildItemDef implements Cloneable {
+public abstract class ItemDef implements Cloneable {
=20
     // '*' denoting residual child item definition
     public static final QName ANY_NAME =3D
@@ -32,7 +32,7 @@
=20
     protected QName declaringNodeType =3D null;
     private QName name =3D ANY_NAME;
-    private boolean autoCreate =3D false;
+    private boolean autoCreated =3D false;
     private int onParentVersion =3D OnParentVersionAction.COPY;
     private boolean writeProtected =3D false;
     private boolean mandatory =3D false;
@@ -48,11 +48,11 @@
         if (this =3D=3D obj) {
             return true;
         }
-        if (obj instanceof ChildItemDef) {
-            ChildItemDef other =3D (ChildItemDef) obj;
+        if (obj instanceof ItemDef) {
+            ItemDef other =3D (ItemDef) obj;
             return (declaringNodeType =3D=3D null ? other.declaringNodeTyp=
e =3D=3D null : declaringNodeType.equals(other.declaringNodeType))
                     && (name =3D=3D null ? other.name =3D=3D null : name.e=
quals(other.name))
-                    && autoCreate =3D=3D other.autoCreate
+                    && autoCreated =3D=3D other.autoCreated
                     && onParentVersion =3D=3D other.onParentVersion
                     && writeProtected =3D=3D other.writeProtected
                     && mandatory =3D=3D other.mandatory;
@@ -74,8 +74,8 @@
         this.name =3D name;
     }
=20
-    public void setAutoCreate(boolean autoCreate) {
-        this.autoCreate =3D autoCreate;
+    public void setAutoCreated(boolean autoCreated) {
+        this.autoCreated =3D autoCreated;
     }
=20
     public void setOnParentVersion(int onParentVersion) {
@@ -98,8 +98,8 @@
         return name;
     }
=20
-    public boolean isAutoCreate() {
-        return autoCreate;
+    public boolean isAutoCreated() {
+        return autoCreated;
     }
=20
     public int getOnParentVersion() {

Copied: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/node=
type/ItemDefinitionImpl.java (from r161036, incubator/jackrabbit/trunk/src/=
java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java?view=3Ddiff&rev=3D1=
61260&p1=3Dincubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/n=
odetype/ItemDefImpl.java&r1=3D161036&p2=3Dincubator/jackrabbit/trunk/src/ja=
va/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ItemDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ItemDefinitionImpl.java Thu Apr 14 04:50:38 2005
@@ -21,16 +21,16 @@
 import org.apache.jackrabbit.core.QName;
 import org.apache.log4j.Logger;
=20
-import javax.jcr.nodetype.ItemDef;
+import javax.jcr.nodetype.ItemDefinition;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 import javax.jcr.nodetype.NodeType;
=20
 /**
- * An <code>ItemDefImpl</code> ...
+ * An <code>ItemDefinitionImpl</code> ...
  */
-abstract class ItemDefImpl implements ItemDef {
+abstract class ItemDefinitionImpl implements ItemDefinition {
=20
-    private static Logger log =3D Logger.getLogger(ItemDefImpl.class);
+    private static Logger log =3D Logger.getLogger(ItemDefinitionImpl.clas=
s);
=20
     protected static final String ANY_NAME =3D "*";
=20
@@ -38,7 +38,7 @@
     // namespace resolver used to translate qualified names to JCR names
     protected final NamespaceResolver nsResolver;
=20
-    private final ChildItemDef itemDef;
+    private final ItemDef itemDef;
=20
     /**
      * Package private constructor
@@ -47,7 +47,8 @@
      * @param ntMgr      node type manager
      * @param nsResolver namespace resolver
      */
-    ItemDefImpl(ChildItemDef itemDef, NodeTypeManagerImpl ntMgr, Namespace=
Resolver nsResolver) {
+    ItemDefinitionImpl(ItemDef itemDef, NodeTypeManagerImpl ntMgr,
+                       NamespaceResolver nsResolver) {
         this.itemDef =3D itemDef;
         this.ntMgr =3D ntMgr;
         this.nsResolver =3D nsResolver;
@@ -99,8 +100,8 @@
     /**
      * {@inheritDoc}
      */
-    public boolean isAutoCreate() {
-        return itemDef.isAutoCreate();
+    public boolean isAutoCreated() {
+        return itemDef.isAutoCreated();
     }
=20
     /**

Copied: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/node=
type/NodeDef.java (from r161036, incubator/jackrabbit/trunk/src/java/org/ap=
ache/jackrabbit/core/nodetype/ChildNodeDef.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeDef.java?view=3Ddiff&rev=3D161260&p1=3D=
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype/Chi=
ldNodeDef.java&r1=3D161036&p2=3Dincubator/jackrabbit/trunk/src/java/org/apa=
che/jackrabbit/core/nodetype/NodeDef.java&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/ChildNodeDef.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeDef.java Thu Apr 14 04:50:38 2005
@@ -22,30 +22,30 @@
 import java.util.Arrays;
=20
 /**
- * A <code>ChildNodeDef</code> ...
+ * A <code>NodeDef</code> ...
  */
-public class ChildNodeDef extends ChildItemDef {
+public class NodeDef extends ItemDef {
=20
     private QName defaultPrimaryType =3D null;
     private QName[] requiredPrimaryTypes =3D new QName[]{Constants.NT_BASE=
};
-    private boolean allowSameNameSibs =3D false;
+    private boolean allowsSameNameSiblings =3D false;
=20
     /**
      * Default constructor.
      */
-    public ChildNodeDef() {
+    public NodeDef() {
     }
=20
     public boolean equals(Object obj) {
         if (this =3D=3D obj) {
             return true;
         }
-        if (obj instanceof ChildNodeDef) {
-            ChildNodeDef other =3D (ChildNodeDef) obj;
+        if (obj instanceof NodeDef) {
+            NodeDef other =3D (NodeDef) obj;
             return super.equals(obj)
                     && Arrays.equals(requiredPrimaryTypes, other.requiredP=
rimaryTypes)
                     && (defaultPrimaryType =3D=3D null ? other.defaultPrim=
aryType =3D=3D null : defaultPrimaryType.equals(other.defaultPrimaryType))
-                    && allowSameNameSibs =3D=3D other.allowSameNameSibs;
+                    && allowsSameNameSiblings =3D=3D other.allowsSameNameS=
iblings;
         }
         return false;
     }
@@ -68,10 +68,10 @@
     }
=20
     /**
-     * @param allowSameNameSibs
+     * @param allowsSameNameSiblings
      */
-    public void setAllowSameNameSibs(boolean allowSameNameSibs) {
-        this.allowSameNameSibs =3D allowSameNameSibs;
+    public void setAllowsSameNameSiblings(boolean allowsSameNameSiblings) {
+        this.allowsSameNameSiblings =3D allowsSameNameSiblings;
     }
=20
     /**
@@ -91,8 +91,8 @@
     /**
      * @return
      */
-    public boolean allowSameNameSibs() {
-        return allowSameNameSibs;
+    public boolean allowsSameNameSiblings() {
+        return allowsSameNameSiblings;
     }
=20
     /**

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeDefId.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeDefId.java?view=3Ddiff&r1=3D161259&r2=
=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeDefId.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeDefId.java Thu Apr 14 04:50:38 2005
@@ -22,7 +22,7 @@
 import java.util.TreeSet;
=20
 /**
- * <code>NodeDefId</code> uniquely identifies a <code>ChildNodeDef</code> =
in the
+ * <code>NodeDefId</code> uniquely identifies a <code>NodeDef</code> in the
  * node type registry.
  */
 public class NodeDefId implements Serializable {
@@ -31,9 +31,9 @@
=20
     private final int id;
=20
-    public NodeDefId(ChildNodeDef def) {
+    public NodeDefId(NodeDef def) {
         if (def =3D=3D null) {
-            throw new IllegalArgumentException("ChildNodeDef argument can =
not be null");
+            throw new IllegalArgumentException("NodeDef argument can not b=
e null");
         }
         // build key (format: <declaringNodeType>/<name>/<requiredPrimaryT=
ypes>)
         StringBuffer sb =3D new StringBuffer();

Copied: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/node=
type/NodeDefinitionImpl.java (from r161036, incubator/jackrabbit/trunk/src/=
java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java?view=3Ddiff&rev=3D1=
61260&p1=3Dincubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/n=
odetype/NodeDefImpl.java&r1=3D161036&p2=3Dincubator/jackrabbit/trunk/src/ja=
va/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeDefinitionImpl.java Thu Apr 14 04:50:38 2005
@@ -22,17 +22,18 @@
 import org.apache.log4j.Logger;
=20
 import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.nodetype.NodeType;
=20
 /**
- * A <code>NodeDefImpl</code> ...
+ * A <code>NodeDefinitionImpl</code> ...
  */
-public class NodeDefImpl extends ItemDefImpl implements NodeDef {
+public class NodeDefinitionImpl extends ItemDefinitionImpl
+        implements NodeDefinition {
=20
-    private static Logger log =3D Logger.getLogger(NodeDefImpl.class);
+    private static Logger log =3D Logger.getLogger(NodeDefinitionImpl.clas=
s);
=20
-    private final ChildNodeDef nodeDef;
+    private final NodeDef nodeDef;
=20
=20
     /**
@@ -42,12 +43,13 @@
      * @param ntMgr      node type manager
      * @param nsResolver namespace resolver
      */
-    NodeDefImpl(ChildNodeDef nodeDef, NodeTypeManagerImpl ntMgr, Namespace=
Resolver nsResolver) {
+    NodeDefinitionImpl(NodeDef nodeDef, NodeTypeManagerImpl ntMgr,
+                       NamespaceResolver nsResolver) {
         super(nodeDef, ntMgr, nsResolver);
         this.nodeDef =3D nodeDef;
     }
=20
-    public ChildNodeDef unwrap() {
+    public NodeDef unwrap() {
         return nodeDef;
     }
=20
@@ -95,8 +97,8 @@
     /**
      * {@inheritDoc}
      */
-    public boolean allowSameNameSibs() {
-        return nodeDef.allowSameNameSibs();
+    public boolean allowsSameNameSiblings() {
+        return nodeDef.allowsSameNameSiblings();
     }
 }
=20

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeTypeDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeTypeDef.java?view=3Ddiff&r1=3D161259&r2=
=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeDef.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeDef.java Thu Apr 14 04:50:38 2005
@@ -35,7 +35,7 @@
     private boolean orderableChildNodes;
     private QName primaryItemName;
     private PropDef[] propDefs;
-    private ChildNodeDef[] nodeDefs;
+    private NodeDef[] nodeDefs;
     private Set dependencies;
=20
     /**
@@ -44,7 +44,7 @@
     public NodeTypeDef() {
         dependencies =3D null;
         name =3D null;
-        nodeDefs =3D new ChildNodeDef[0];
+        nodeDefs =3D new NodeDef[0];
         propDefs =3D new PropDef[0];
         supertypes =3D new QName[0];
         mixin =3D false;
@@ -192,9 +192,9 @@
     /**
      * Sets the child node definitions.
      *
-     * @param defs An array of <code>ChildNodeDef</code> objects
+     * @param defs An array of <code>NodeDef</code> objects
      */
-    public void setChildNodeDefs(ChildNodeDef[] defs) {
+    public void setChildNodeDefs(NodeDef[] defs) {
         resetDependencies();
         nodeDefs =3D defs;
     }
@@ -266,7 +266,7 @@
      * @return an array containing the child node definitions or
      *         <code>null</code> if not set.
      */
-    public ChildNodeDef[] getChildNodeDefs() {
+    public NodeDef[] getChildNodeDefs() {
         return nodeDefs;
     }
 }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeTypeDefDiff.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeTypeDefDiff.java?view=3Ddiff&r1=3D16125=
9&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeDefDiff.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeDefDiff.java Thu Apr 14 04:50:38 2005
@@ -42,9 +42,9 @@
  * <li>changing property/child node <code>protected</code> flag
  * <li>changing property/child node <code>onParentVersion</code> value
  * <li>changing property/child node <code>mandatory</code> flag to <code>f=
alse</code>
- * <li>changing property/child node <code>autoCreate</code> flag
+ * <li>changing property/child node <code>autoCreated</code> flag
  * <li>changing child node <code>defaultPrimaryType</code>
- * <li>changing child node <code>sameNameSibs</code> flag to <code>true</c=
ode>
+ * <li>changing child node <code>sameNameSiblings</code> flag to <code>tru=
e</code>
  * <li>weaken property <code>valueConstraints</code> (e.g. by removing com=
pletely
  * or by adding to existing or by making a single constraint less restrict=
ive)
  * <li>changing property <code>defaultValues</code>
@@ -293,13 +293,13 @@
          */
=20
         int maxType =3D NONE;
-        ChildNodeDef[] cnda1 =3D oldDef.getChildNodeDefs();
+        NodeDef[] cnda1 =3D oldDef.getChildNodeDefs();
         HashMap defs1 =3D new HashMap();
         for (int i =3D 0; i < cnda1.length; i++) {
             defs1.put(new NodeDefId(cnda1[i]), cnda1[i]);
         }
=20
-        ChildNodeDef[] cnda2 =3D newDef.getChildNodeDefs();
+        NodeDef[] cnda2 =3D newDef.getChildNodeDefs();
         HashMap defs2 =3D new HashMap();
         for (int i =3D 0; i < cnda1.length; i++) {
             defs2.put(new NodeDefId(cnda2[i]), cnda2[i]);
@@ -312,8 +312,8 @@
         Iterator iter =3D defs1.keySet().iterator();
         while (iter.hasNext()) {
             NodeDefId id =3D (NodeDefId) iter.next();
-            ChildNodeDef def1 =3D (ChildNodeDef) defs1.get(id);
-            ChildNodeDef def2 =3D (ChildNodeDef) defs2.get(id);
+            NodeDef def1 =3D (NodeDef) defs1.get(id);
+            NodeDef def2 =3D (NodeDef) defs2.get(id);
             ChildNodeDefDiff diff =3D new ChildNodeDefDiff(def1, def2);
             if (diff.getType() > maxType) {
                 maxType =3D diff.getType();
@@ -329,7 +329,7 @@
         iter =3D defs2.keySet().iterator();
         while (iter.hasNext()) {
             NodeDefId id =3D (NodeDefId) iter.next();
-            ChildNodeDef def =3D (ChildNodeDef) defs2.get(id);
+            NodeDef def =3D (NodeDef) defs2.get(id);
             ChildNodeDefDiff diff =3D new ChildNodeDefDiff(null, def);
             if (diff.getType() > maxType) {
                 maxType =3D diff.getType();
@@ -342,11 +342,11 @@
=20
     //--------------------------------------------------------< inner clas=
ses >
     abstract class ChildItemDefDiff {
-        protected final ChildItemDef oldDef;
-        protected final ChildItemDef newDef;
+        protected final ItemDef oldDef;
+        protected final ItemDef newDef;
         protected int type;
=20
-        ChildItemDefDiff(ChildItemDef oldDef, ChildItemDef newDef) {
+        ChildItemDefDiff(ItemDef oldDef, ItemDef newDef) {
             this.oldDef =3D oldDef;
             this.newDef =3D newDef;
             init();
@@ -494,16 +494,16 @@
=20
     public class ChildNodeDefDiff extends ChildItemDefDiff {
=20
-        ChildNodeDefDiff(ChildNodeDef oldDef, ChildNodeDef newDef) {
+        ChildNodeDefDiff(NodeDef oldDef, NodeDef newDef) {
             super(oldDef, newDef);
         }
=20
-        public ChildNodeDef getOldDef() {
-            return (ChildNodeDef) oldDef;
+        public NodeDef getOldDef() {
+            return (NodeDef) oldDef;
         }
=20
-        public ChildNodeDef getNewDef() {
-            return (ChildNodeDef) newDef;
+        public NodeDef getNewDef() {
+            return (NodeDef) newDef;
         }
=20
         protected void init() {
@@ -516,10 +516,10 @@
              */
             if (isModified() && type !=3D NONE && type !=3D MAJOR) {
=20
-                boolean b1 =3D getOldDef().allowSameNameSibs();
-                boolean b2 =3D getNewDef().allowSameNameSibs();
+                boolean b1 =3D getOldDef().allowsSameNameSiblings();
+                boolean b2 =3D getNewDef().allowsSameNameSiblings();
                 if (b1 !=3D b1 && !b2) {
-                    // changed sameNameSibs flag to false (MAJOR change)
+                    // changed sameNameSiblings flag to false (MAJOR chang=
e)
                     type =3D MAJOR;
                 }
=20

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeTypeImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeTypeImpl.java?view=3Ddiff&r1=3D161259&r=
2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeImpl.java Thu Apr 14 04:50:38 2005
@@ -30,9 +30,9 @@
 import javax.jcr.Value;
 import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeDef;
+import javax.jcr.nodetype.NodeDefinition;
 import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.PropertyDefinition;
 import java.util.ArrayList;
 import java.util.HashSet;
=20
@@ -85,9 +85,9 @@
      * @throws RepositoryException if no applicable child node definition
      *                             could be found
      */
-    public NodeDefImpl getApplicableChildNodeDef(QName nodeName)
+    public NodeDefinitionImpl getApplicableChildNodeDefinition(QName nodeN=
ame)
             throws RepositoryException {
-        return getApplicableChildNodeDef(nodeName, null);
+        return getApplicableChildNodeDefinition(nodeName, null);
     }
=20
     /**
@@ -100,9 +100,10 @@
      * @throws RepositoryException if no applicable child node definition
      *                             could be found
      */
-    public NodeDefImpl getApplicableChildNodeDef(QName nodeName, QName nod=
eTypeName)
+    public NodeDefinitionImpl getApplicableChildNodeDefinition(QName nodeN=
ame,
+                                                               QName nodeT=
ypeName)
             throws RepositoryException {
-        return new NodeDefImpl(ent.getApplicableChildNodeDef(nodeName, nod=
eTypeName),
+        return new NodeDefinitionImpl(ent.getApplicableChildNodeDef(nodeNa=
me, nodeTypeName),
                 ntMgr, nsResolver);
     }
=20
@@ -117,10 +118,12 @@
      * @throws RepositoryException if no applicable property definition
      *                             could be found
      */
-    public PropertyDefImpl getApplicablePropertyDef(QName propertyName, in=
t type,
-                                                    boolean multiValued)
+    public PropertyDefinitionImpl getApplicablePropertyDefinition(QName pr=
opertyName,
+                                                                  int type,
+                                                                  boolean =
multiValued)
             throws RepositoryException {
-        return new PropertyDefImpl(ent.getApplicablePropertyDef(propertyNa=
me, type, multiValued),
+        return new PropertyDefinitionImpl(
+                ent.getApplicablePropertyDef(propertyName, type, multiValu=
ed),
                 ntMgr, nsResolver);
     }
=20
@@ -155,17 +158,17 @@
     /**
      * Returns an array containing only those child node definitions of th=
is
      * node type (including the child node definitions inherited from supe=
rtypes
-     * of this node type) where <code>{@link NodeDef#isAutoCreate()}</code>
+     * of this node type) where <code>{@link NodeDefinition#isAutoCreated(=
)}</code>
      * returns <code>true</code>.
      *
      * @return an array of child node definitions.
-     * @see NodeDef#isAutoCreate
+     * @see NodeDefinition#isAutoCreated
      */
-    public NodeDef[] getAutoCreateNodeDefs() {
-        ChildNodeDef[] cnda =3D ent.getAutoCreateNodeDefs();
-        NodeDef[] nodeDefs =3D new NodeDef[cnda.length];
+    public NodeDefinition[] getAutoCreatedNodeDefinitions() {
+        NodeDef[] cnda =3D ent.getAutoCreateNodeDefs();
+        NodeDefinition[] nodeDefs =3D new NodeDefinition[cnda.length];
         for (int i =3D 0; i < cnda.length; i++) {
-            nodeDefs[i] =3D new NodeDefImpl(cnda[i], ntMgr, nsResolver);
+            nodeDefs[i] =3D new NodeDefinitionImpl(cnda[i], ntMgr, nsResol=
ver);
         }
         return nodeDefs;
     }
@@ -173,17 +176,17 @@
     /**
      * Returns an array containing only those property definitions of this
      * node type (including the property definitions inherited from supert=
ypes
-     * of this node type) where <code>{@link PropertyDef#isAutoCreate()}</=
code>
+     * of this node type) where <code>{@link PropertyDefinition#isAutoCrea=
ted()}</code>
      * returns <code>true</code>.
      *
      * @return an array of property definitions.
-     * @see PropertyDef#isAutoCreate
+     * @see PropertyDefinition#isAutoCreated
      */
-    public PropertyDef[] getAutoCreatePropertyDefs() {
+    public PropertyDefinition[] getAutoCreatedPropertyDefinitions() {
         PropDef[] pda =3D ent.getAutoCreatePropDefs();
-        PropertyDef[] propDefs =3D new PropertyDef[pda.length];
+        PropertyDefinition[] propDefs =3D new PropertyDefinition[pda.lengt=
h];
         for (int i =3D 0; i < pda.length; i++) {
-            propDefs[i] =3D new PropertyDefImpl(pda[i], ntMgr, nsResolver);
+            propDefs[i] =3D new PropertyDefinitionImpl(pda[i], ntMgr, nsRe=
solver);
         }
         return propDefs;
     }
@@ -191,17 +194,17 @@
     /**
      * Returns an array containing only those property definitions of this
      * node type (including the property definitions inherited from supert=
ypes
-     * of this node type) where <code>{@link PropertyDef#isMandatory()}</c=
ode>
+     * of this node type) where <code>{@link PropertyDefinition#isMandator=
y()}</code>
      * returns <code>true</code>.
      *
      * @return an array of property definitions.
-     * @see PropertyDef#isMandatory
+     * @see PropertyDefinition#isMandatory
      */
-    public PropertyDef[] getMandatoryPropertyDefs() {
+    public PropertyDefinition[] getMandatoryPropertyDefinitions() {
         PropDef[] pda =3D ent.getMandatoryPropDefs();
-        PropertyDef[] propDefs =3D new PropertyDef[pda.length];
+        PropertyDefinition[] propDefs =3D new PropertyDefinition[pda.lengt=
h];
         for (int i =3D 0; i < pda.length; i++) {
-            propDefs[i] =3D new PropertyDefImpl(pda[i], ntMgr, nsResolver);
+            propDefs[i] =3D new PropertyDefinitionImpl(pda[i], ntMgr, nsRe=
solver);
         }
         return propDefs;
     }
@@ -209,17 +212,17 @@
     /**
      * Returns an array containing only those child node definitions of th=
is
      * node type (including the child node definitions inherited from supe=
rtypes
-     * of this node type) where <code>{@link NodeDef#isMandatory()}</code>
+     * of this node type) where <code>{@link NodeDefinition#isMandatory()}=
</code>
      * returns <code>true</code>.
      *
      * @return an array of child node definitions.
-     * @see NodeDef#isMandatory
+     * @see NodeDefinition#isMandatory
      */
-    public NodeDef[] getMandatoryNodeDefs() {
-        ChildNodeDef[] cnda =3D ent.getMandatoryNodeDefs();
-        NodeDef[] nodeDefs =3D new NodeDef[cnda.length];
+    public NodeDefinition[] getMandatoryNodeDefinitions() {
+        NodeDef[] cnda =3D ent.getMandatoryNodeDefs();
+        NodeDefinition[] nodeDefs =3D new NodeDefinition[cnda.length];
         for (int i =3D 0; i < cnda.length; i++) {
-            nodeDefs[i] =3D new NodeDefImpl(cnda[i], ntMgr, nsResolver);
+            nodeDefs[i] =3D new NodeDefinitionImpl(cnda[i], ntMgr, nsResol=
ver);
         }
         return nodeDefs;
     }
@@ -237,7 +240,7 @@
      * @throws ConstraintViolationException
      * @throws RepositoryException
      */
-    public static void checkSetPropertyValueConstraints(PropertyDefImpl de=
f,
+    public static void checkSetPropertyValueConstraints(PropertyDefinition=
Impl def,
                                                         InternalValue[] va=
lues)
             throws ConstraintViolationException, RepositoryException {
         EffectiveNodeType.checkSetPropertyValueConstraints(def.unwrap(), v=
alues);
@@ -370,11 +373,11 @@
     /**
      * {@inheritDoc}
      */
-    public NodeDef[] getChildNodeDefs() {
-        ChildNodeDef[] cnda =3D ent.getAllNodeDefs();
-        NodeDef[] nodeDefs =3D new NodeDef[cnda.length];
+    public NodeDefinition[] getChildNodeDefinitions() {
+        NodeDef[] cnda =3D ent.getAllNodeDefs();
+        NodeDefinition[] nodeDefs =3D new NodeDefinition[cnda.length];
         for (int i =3D 0; i < cnda.length; i++) {
-            nodeDefs[i] =3D new NodeDefImpl(cnda[i], ntMgr, nsResolver);
+            nodeDefs[i] =3D new NodeDefinitionImpl(cnda[i], ntMgr, nsResol=
ver);
         }
         return nodeDefs;
     }
@@ -382,11 +385,11 @@
     /**
      * {@inheritDoc}
      */
-    public PropertyDef[] getPropertyDefs() {
+    public PropertyDefinition[] getPropertyDefinitions() {
         PropDef[] pda =3D ent.getAllPropDefs();
-        PropertyDef[] propDefs =3D new PropertyDef[pda.length];
+        PropertyDefinition[] propDefs =3D new PropertyDefinition[pda.lengt=
h];
         for (int i =3D 0; i < pda.length; i++) {
-            propDefs[i] =3D new PropertyDefImpl(pda[i], ntMgr, nsResolver);
+            propDefs[i] =3D new PropertyDefinitionImpl(pda[i], ntMgr, nsRe=
solver);
         }
         return propDefs;
     }
@@ -412,11 +415,11 @@
     /**
      * {@inheritDoc}
      */
-    public NodeDef[] getDeclaredChildNodeDefs() {
-        ChildNodeDef[] cnda =3D ntd.getChildNodeDefs();
-        NodeDef[] nodeDefs =3D new NodeDef[cnda.length];
+    public NodeDefinition[] getDeclaredChildNodeDefinitions() {
+        NodeDef[] cnda =3D ntd.getChildNodeDefs();
+        NodeDefinition[] nodeDefs =3D new NodeDefinition[cnda.length];
         for (int i =3D 0; i < cnda.length; i++) {
-            nodeDefs[i] =3D new NodeDefImpl(cnda[i], ntMgr, nsResolver);
+            nodeDefs[i] =3D new NodeDefinitionImpl(cnda[i], ntMgr, nsResol=
ver);
         }
         return nodeDefs;
     }
@@ -431,13 +434,13 @@
         }
         try {
             QName name =3D QName.fromJCRName(propertyName, nsResolver);
-            PropertyDefImpl def;
+            PropertyDefinitionImpl def;
             try {
                 // try to get definition that matches the given value type
-                def =3D getApplicablePropertyDef(name, value.getType(), fa=
lse);
+                def =3D getApplicablePropertyDefinition(name, value.getTyp=
e(), false);
             } catch (ConstraintViolationException cve) {
                 // fallback: ignore type
-                def =3D getApplicablePropertyDef(name, PropertyType.UNDEFI=
NED, false);
+                def =3D getApplicablePropertyDefinition(name, PropertyType=
.UNDEFINED, false);
             }
             if (def.isProtected()) {
                 return false;
@@ -492,13 +495,13 @@
                     return false;
                 }
             }
-            PropertyDefImpl def;
+            PropertyDefinitionImpl def;
             try {
                 // try to get definition that matches the given value type
-                def =3D getApplicablePropertyDef(name, type, true);
+                def =3D getApplicablePropertyDefinition(name, type, true);
             } catch (ConstraintViolationException cve) {
                 // fallback: ignore type
-                def =3D getApplicablePropertyDef(name, PropertyType.UNDEFI=
NED, true);
+                def =3D getApplicablePropertyDefinition(name, PropertyType=
.UNDEFINED, true);
             }
=20
             if (def.isProtected()) {
@@ -590,11 +593,11 @@
     /**
      * {@inheritDoc}
      */
-    public PropertyDef[] getDeclaredPropertyDefs() {
+    public PropertyDefinition[] getDeclaredPropertyDefinitions() {
         PropDef[] pda =3D ntd.getPropertyDefs();
-        PropertyDef[] propDefs =3D new PropertyDef[pda.length];
+        PropertyDefinition[] propDefs =3D new PropertyDefinition[pda.lengt=
h];
         for (int i =3D 0; i < pda.length; i++) {
-            propDefs[i] =3D new PropertyDefImpl(pda[i], ntMgr, nsResolver);
+            propDefs[i] =3D new PropertyDefinitionImpl(pda[i], ntMgr, nsRe=
solver);
         }
         return propDefs;
     }

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?view=3Ddiff&r1=3D1=
61259&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeManagerImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeManagerImpl.java Thu Apr 14 04:50:38 2005
@@ -37,13 +37,14 @@
 /**
  * A <code>NodeTypeManagerImpl</code> ...
  */
-public class NodeTypeManagerImpl implements NodeTypeManager, NodeTypeRegis=
tryListener {
+public class NodeTypeManagerImpl implements NodeTypeManager,
+        NodeTypeRegistryListener {
=20
     private static Logger log =3D Logger.getLogger(NodeTypeManagerImpl.cla=
ss);
=20
     private final NodeTypeRegistry ntReg;
=20
-    private final NodeDefImpl rootNodeDef;
+    private final NodeDefinitionImpl rootNodeDef;
=20
     // namespace resolver used to translate qualified names to JCR names
     private final NamespaceResolver nsResolver;
@@ -64,13 +65,14 @@
         // setup item cache with soft references to node type instances
         ntCache =3D new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT);
=20
-        rootNodeDef =3D new RootNodeDefinition(ntReg.getRootNodeDef(), thi=
s, nsResolver);
+        rootNodeDef =3D new RootNodeDefinition(ntReg.getRootNodeDef(), thi=
s,
+                nsResolver);
     }
=20
     /**
      * @return
      */
-    public NodeDefImpl getRootNodeDefinition() {
+    public NodeDefinitionImpl getRootNodeDefinition() {
         return rootNodeDef;
     }
=20
@@ -78,24 +80,24 @@
      * @param id
      * @return
      */
-    public NodeDefImpl getNodeDef(NodeDefId id) {
-        ChildNodeDef cnd =3D ntReg.getNodeDef(id);
+    public NodeDefinitionImpl getNodeDefinition(NodeDefId id) {
+        NodeDef cnd =3D ntReg.getNodeDef(id);
         if (cnd =3D=3D null) {
             return null;
         }
-        return new NodeDefImpl(cnd, this, nsResolver);
+        return new NodeDefinitionImpl(cnd, this, nsResolver);
     }
=20
     /**
      * @param id
      * @return
      */
-    public PropertyDefImpl getPropDef(PropDefId id) {
+    public PropertyDefinitionImpl getPropertyDefinition(PropDefId id) {
         PropDef pd =3D ntReg.getPropDef(id);
         if (pd =3D=3D null) {
             return null;
         }
-        return new PropertyDefImpl(pd, this, nsResolver);
+        return new PropertyDefinitionImpl(pd, this, nsResolver);
     }
=20
     /**
@@ -103,7 +105,8 @@
      * @return
      * @throws NoSuchNodeTypeException
      */
-    public synchronized NodeTypeImpl getNodeType(QName name) throws NoSuch=
NodeTypeException {
+    public synchronized NodeTypeImpl getNodeType(QName name)
+            throws NoSuchNodeTypeException {
         NodeTypeImpl nt =3D (NodeTypeImpl) ntCache.get(name);
         if (nt !=3D null) {
             return nt;
@@ -222,12 +225,13 @@
      * The <code>RootNodeDefinition</code> defines the characteristics of
      * the root node.
      */
-    private static class RootNodeDefinition extends NodeDefImpl {
+    private static class RootNodeDefinition extends NodeDefinitionImpl {
=20
         /**
          * Creates a new <code>RootNodeDefinition</code>.
          */
-        RootNodeDefinition(ChildNodeDef def, NodeTypeManagerImpl ntMgr, Na=
mespaceResolver nsResolver) {
+        RootNodeDefinition(NodeDef def, NodeTypeManagerImpl ntMgr,
+                           NamespaceResolver nsResolver) {
             super(def, ntMgr, nsResolver);
         }
=20

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/NodeTypeRegistry.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?view=3Ddiff&r1=3D1612=
59&r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeRegistry.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/NodeTypeRegistry.java Thu Apr 14 04:50:38 2005
@@ -77,7 +77,7 @@
     private final HashMap registeredNTDefs;
=20
     // definition of the root node
-    private final ChildNodeDef rootNodeDef;
+    private final NodeDef rootNodeDef;
=20
     // map of id's and property definitions
     private final HashMap propDefs;
@@ -132,14 +132,16 @@
             throws RepositoryException {
         this.nsReg =3D nsReg;
         this.ntStore =3D ntStore;
-        customNodeTypesResource =3D new FileSystemResource(this.ntStore, C=
USTOM_NODETYPES_RESOURCE_NAME);
+        customNodeTypesResource =3D
+                new FileSystemResource(this.ntStore, CUSTOM_NODETYPES_RESO=
URCE_NAME);
         try {
             // make sure path to resource exists
             if (!customNodeTypesResource.exists()) {
                 customNodeTypesResource.makeParentDirs();
             }
         } catch (FileSystemException fse) {
-            String error =3D "internal error: invalid resource: " + custom=
NodeTypesResource.getPath();
+            String error =3D "internal error: invalid resource: "
+                    + customNodeTypesResource.getPath();
             log.debug(error);
             throw new RepositoryException(error, fse);
         }
@@ -162,15 +164,20 @@
         builtInNTDefs =3D new NodeTypeDefStore();
         InputStream in =3D null;
         try {
-            in =3D getClass().getClassLoader().getResourceAsStream(BUILTIN=
_NODETYPES_RESOURCE_PATH);
+            in =3D getClass().getClassLoader().getResourceAsStream(
+                    BUILTIN_NODETYPES_RESOURCE_PATH);
             builtInNTDefs.load(in);
             internalRegister(builtInNTDefs.all());
         } catch (IOException ioe) {
-            String error =3D "internal error: failed to read built-in node=
 type definitions stored in " + BUILTIN_NODETYPES_RESOURCE_PATH;
+            String error =3D
+                    "internal error: failed to read built-in node type def=
initions stored in "
+                    + BUILTIN_NODETYPES_RESOURCE_PATH;
             log.debug(error);
             throw new RepositoryException(error, ioe);
         } catch (InvalidNodeTypeDefException intde) {
-            String error =3D "internal error: invalid built-in node type d=
efinition stored in " + BUILTIN_NODETYPES_RESOURCE_PATH;
+            String error =3D
+                    "internal error: invalid built-in node type definition=
 stored in "
+                    + BUILTIN_NODETYPES_RESOURCE_PATH;
             log.debug(error);
             throw new RepositoryException(error, intde);
         } finally {
@@ -195,7 +202,9 @@
                 in =3D customNodeTypesResource.getInputStream();
             }
         } catch (FileSystemException fse) {
-            String error =3D "internal error: failed to access custom node=
 type definitions stored in " + customNodeTypesResource.getPath();
+            String error =3D
+                    "internal error: failed to access custom node type def=
initions stored in "
+                    + customNodeTypesResource.getPath();
             log.debug(error);
             throw new RepositoryException(error, fse);
         }
@@ -206,11 +215,15 @@
                 customNTDefs.load(in);
                 internalRegister(customNTDefs.all());
             } catch (IOException ioe) {
-                String error =3D "internal error: failed to read custom no=
de type definitions stored in " + customNodeTypesResource.getPath();
+                String error =3D
+                        "internal error: failed to read custom node type d=
efinitions stored in "
+                        + customNodeTypesResource.getPath();
                 log.debug(error);
                 throw new RepositoryException(error, ioe);
             } catch (InvalidNodeTypeDefException intde) {
-                String error =3D "internal error: invalid custom node type=
 definition stored in " + customNodeTypesResource.getPath();
+                String error =3D
+                        "internal error: invalid custom node type definiti=
on stored in "
+                        + customNodeTypesResource.getPath();
                 log.debug(error);
                 throw new RepositoryException(error, intde);
             } finally {
@@ -223,8 +236,8 @@
         }
     }
=20
-    private static ChildNodeDef createRootNodeDef() {
-        ChildNodeDef def =3D new ChildNodeDef();
+    private static NodeDef createRootNodeDef() {
+        NodeDef def =3D new NodeDef();
=20
         // FIXME need a fake declaring node type
         def.setDeclaringNodeType(new QName(NS_DEFAULT_URI, ""));
@@ -233,8 +246,8 @@
         def.setMandatory(true);
         def.setProtected(false);
         def.setOnParentVersion(OnParentVersionAction.VERSION);
-        def.setAllowSameNameSibs(false);
-        def.setAutoCreate(true);
+        def.setAllowsSameNameSiblings(false);
+        def.setAutoCreated(true);
         return def;
     }
=20
@@ -319,9 +332,9 @@
             PropDefId id =3D new PropDefId(def);
             propDefs.put(id, def);
         }
-        ChildNodeDef[] nda =3D ntd.getChildNodeDefs();
+        NodeDef[] nda =3D ntd.getChildNodeDefs();
         for (int i =3D 0; i < nda.length; i++) {
-            ChildNodeDef def =3D nda[i];
+            NodeDef def =3D nda[i];
             NodeDefId id =3D new NodeDefId(def);
             nodeDefs.put(id, def);
         }
@@ -335,7 +348,8 @@
             throw new NoSuchNodeTypeException(name.toString());
         }
         if (builtInNTDefs.contains(name)) {
-            throw new RepositoryException(name.toString() + ": can't unreg=
ister built-in node type.");
+            throw new RepositoryException(name.toString()
+                    + ": can't unregister built-in node type.");
         }
=20
         NodeTypeDef ntd =3D (NodeTypeDef) registeredNTDefs.get(name);
@@ -364,7 +378,7 @@
             PropDefId id =3D new PropDefId(pda[i]);
             propDefs.remove(id);
         }
-        ChildNodeDef[] nda =3D ntd.getChildNodeDefs();
+        NodeDef[] nda =3D ntd.getChildNodeDefs();
         for (int i =3D 0; i < nda.length; i++) {
             NodeDefId id =3D new NodeDefId(nda[i]);
             nodeDefs.remove(id);
@@ -377,11 +391,15 @@
             out =3D customNodeTypesResource.getOutputStream();
             customNTDefs.store(out, nsReg);
         } catch (IOException ioe) {
-            String error =3D "internal error: failed to persist custom nod=
e type definitions to " + customNodeTypesResource.getPath();
+            String error =3D
+                    "internal error: failed to persist custom node type de=
finitions to "
+                    + customNodeTypesResource.getPath();
             log.debug(error);
             throw new RepositoryException(error, ioe);
         } catch (FileSystemException fse) {
-            String error =3D "internal error: failed to persist custom nod=
e type definitions to " + customNodeTypesResource.getPath();
+            String error =3D
+                    "internal error: failed to persist custom node type de=
finitions to "
+                    + customNodeTypesResource.getPath();
             log.debug(error);
             throw new RepositoryException(error, fse);
         } finally {
@@ -421,7 +439,8 @@
      */
     private void notifyRegistered(QName ntName) {
         // copy listeners to array to avoid ConcurrentModificationException
-        NodeTypeRegistryListener[] la =3D new NodeTypeRegistryListener[lis=
teners.size()];
+        NodeTypeRegistryListener[] la =3D
+                new NodeTypeRegistryListener[listeners.size()];
         Iterator iter =3D listeners.values().iterator();
         int cnt =3D 0;
         while (iter.hasNext()) {
@@ -439,7 +458,8 @@
      */
     private void notifyReRegistered(QName ntName) {
         // copy listeners to array to avoid ConcurrentModificationException
-        NodeTypeRegistryListener[] la =3D new NodeTypeRegistryListener[lis=
teners.size()];
+        NodeTypeRegistryListener[] la =3D
+                new NodeTypeRegistryListener[listeners.size()];
         Iterator iter =3D listeners.values().iterator();
         int cnt =3D 0;
         while (iter.hasNext()) {
@@ -457,7 +477,8 @@
      */
     private void notifyUnregistered(QName ntName) {
         // copy listeners to array to avoid ConcurrentModificationException
-        NodeTypeRegistryListener[] la =3D new NodeTypeRegistryListener[lis=
teners.size()];
+        NodeTypeRegistryListener[] la =3D
+                new NodeTypeRegistryListener[listeners.size()];
         Iterator iter =3D listeners.values().iterator();
         int cnt =3D 0;
         while (iter.hasNext()) {
@@ -505,7 +526,8 @@
                     throw new InvalidNodeTypeDefException(msg);
                 }
                 if (!registeredNTDefs.containsKey(supertypes[i])) {
-                    String msg =3D "[" + name + "] invalid supertype: " + =
supertypes[i];
+                    String msg =3D "[" + name + "] invalid supertype: "
+                            + supertypes[i];
                     log.debug(msg);
                     throw new InvalidNodeTypeDefException(msg);
                 }
@@ -576,7 +598,7 @@
                 throw new InvalidNodeTypeDefException(msg);
             }
             // check that auto-created properties specify a name
-            if (pd.definesResidual() && pd.isAutoCreate()) {
+            if (pd.definesResidual() && pd.isAutoCreated()) {
                 String msg =3D "[" + name + "#" + pd.getName()
                         + "] auto-created properties must specify a name";
                 log.debug(msg);
@@ -584,7 +606,7 @@
             }
             // check that auto-created properties specify a type
             if (pd.getRequiredType() =3D=3D PropertyType.UNDEFINED
-                    && pd.isAutoCreate()) {
+                    && pd.isAutoCreated()) {
                 String msg =3D "[" + name + "#" + pd.getName()
                         + "] auto-created properties must specify a type";
                 log.debug(msg);
@@ -613,7 +635,7 @@
                 // no default values specified
                 if (checkAutoCreatePropHasDefault) {
                     // auto-created properties must have a default value
-                    if (pd.isAutoCreate()) {
+                    if (pd.isAutoCreated()) {
                         String msg =3D "[" + name + "#" + pd.getName()
                                 + "] auto-created property must have a def=
ault value";
                         log.debug(msg);
@@ -674,9 +696,9 @@
         }
=20
         // validate child-node definitions
-        ChildNodeDef[] cnda =3D ntd.getChildNodeDefs();
+        NodeDef[] cnda =3D ntd.getChildNodeDefs();
         for (int i =3D 0; i < cnda.length; i++) {
-            ChildNodeDef cnd =3D cnda[i];
+            NodeDef cnd =3D cnda[i];
             /**
              * sanity check:
              * make sure declaring node type matches name of node type def=
inition
@@ -688,7 +710,7 @@
                 throw new InvalidNodeTypeDefException(msg);
             }
             // check that auto-created child-nodes specify a name
-            if (cnd.definesResidual() && cnd.isAutoCreate()) {
+            if (cnd.definesResidual() && cnd.isAutoCreated()) {
                 String msg =3D "[" + name + "#" + cnd.getName()
                         + "] auto-created child-nodes must specify a name";
                 log.debug(msg);
@@ -696,7 +718,7 @@
             }
             // check that auto-created child-nodes specify a default prima=
ry type
             if (cnd.getDefaultPrimaryType() =3D=3D null
-                    && cnd.isAutoCreate()) {
+                    && cnd.isAutoCreated()) {
                 String msg =3D "[" + name + "#" + cnd.getName()
                         + "] auto-created child-nodes must specify a defau=
lt primary type";
                 log.debug(msg);
@@ -737,7 +759,7 @@
                         ent =3D EffectiveNodeType.create(this, ntd);
                         defaultENT =3D ent;
                     }
-                    if (cnd.isAutoCreate()) {
+                    if (cnd.isAutoCreated()) {
                         /**
                          * check for circularity through default primary t=
ypes
                          * of auto-created child nodes (node type 'a' defi=
nes
@@ -860,7 +882,7 @@
     /**
      * @return
      */
-    public ChildNodeDef getRootNodeDef() {
+    public NodeDef getRootNodeDef() {
         return rootNodeDef;
     }
=20
@@ -1025,7 +1047,8 @@
         }
     }
=20
-    void checkForCircularNodeAutoCreation(EffectiveNodeType childNodeENT, =
Stack definingParentNTs)
+    void checkForCircularNodeAutoCreation(EffectiveNodeType childNodeENT,
+                                          Stack definingParentNTs)
             throws InvalidNodeTypeDefException {
         // check for circularity through default node types of auto-create=
d child nodes
         // (node type 'a' defines auto-created child node with default nod=
e type 'a')
@@ -1046,11 +1069,12 @@
                 buf.append("--> ");
                 buf.append("node type ");
                 buf.append(nt);
-                throw new InvalidNodeTypeDefException("circular node auto-=
creation detected: " + buf.toString());
+                throw new InvalidNodeTypeDefException("circular node auto-=
creation detected: "
+                        + buf.toString());
             }
         }
=20
-        ChildNodeDef[] nodeDefs =3D childNodeENT.getAutoCreateNodeDefs();
+        NodeDef[] nodeDefs =3D childNodeENT.getAutoCreateNodeDefs();
         for (int i =3D 0; i < nodeDefs.length; i++) {
             QName dnt =3D nodeDefs[i].getDefaultPrimaryType();
             QName definingNT =3D nodeDefs[i].getDeclaringNodeType();
@@ -1058,11 +1082,13 @@
                 if (dnt !=3D null) {
                     // check recursively
                     definingParentNTs.push(definingNT);
-                    checkForCircularNodeAutoCreation(getEffectiveNodeType(=
dnt), definingParentNTs);
+                    checkForCircularNodeAutoCreation(getEffectiveNodeType(=
dnt),
+                            definingParentNTs);
                     definingParentNTs.pop();
                 }
             } catch (NoSuchNodeTypeException nsnte) {
-                String msg =3D definingNT + " defines invalid default node=
 type for child node " + nodeDefs[i].getName();
+                String msg =3D definingNT
+                        + " defines invalid default node type for child no=
de " + nodeDefs[i].getName();
                 log.debug(msg);
                 throw new InvalidNodeTypeDefException(msg, nsnte);
             }
@@ -1197,7 +1223,8 @@
             throw new NoSuchNodeTypeException(name.toString());
         }
         if (builtInNTDefs.contains(name)) {
-            throw new RepositoryException(name.toString() + ": can't unreg=
ister built-in node type.");
+            throw new RepositoryException(name.toString()
+                    + ": can't unregister built-in node type.");
         }
=20
         /**
@@ -1207,7 +1234,8 @@
         Set dependentNTs =3D getDependentNodeTypes(name);
         if (dependentNTs.size() > 0) {
             StringBuffer msg =3D new StringBuffer();
-            msg.append(name + " could not be removed because the following=
 node types are referencing it: ");
+            msg.append(name
+                    + " could not be removed because the following node ty=
pes are referencing it: ");
             Iterator iterator =3D dependentNTs.iterator();
             while (iterator.hasNext()) {
                 msg.append(iterator.next());
@@ -1260,7 +1288,8 @@
             throw new NoSuchNodeTypeException(name.toString());
         }
         if (builtInNTDefs.contains(name)) {
-            throw new RepositoryException(name.toString() + ": can't rereg=
ister built-in node type.");
+            throw new RepositoryException(name.toString()
+                    + ": can't reregister built-in node type.");
         }
=20
         /**
@@ -1379,7 +1408,8 @@
      * @return
      * @throws NoSuchNodeTypeException
      */
-    public synchronized NodeTypeDef getNodeTypeDef(QName nodeTypeName) thr=
ows NoSuchNodeTypeException {
+    public synchronized NodeTypeDef getNodeTypeDef(QName nodeTypeName)
+            throws NoSuchNodeTypeException {
         if (!registeredNTDefs.containsKey(nodeTypeName)) {
             throw new NoSuchNodeTypeException(nodeTypeName.toString());
         }
@@ -1406,14 +1436,14 @@
      * @param id
      * @return
      */
-    public ChildNodeDef getNodeDef(NodeDefId id) {
-        ChildNodeDef def =3D (ChildNodeDef) nodeDefs.get(id);
+    public NodeDef getNodeDef(NodeDefId id) {
+        NodeDef def =3D (NodeDef) nodeDefs.get(id);
         if (def =3D=3D null) {
             return null;
         }
         // return clone to make sure nobody messes around with the 'real' =
definition
         try {
-            return (ChildNodeDef) def.clone();
+            return (NodeDef) def.clone();
         } catch (CloneNotSupportedException e) {
             // should never get here
             log.fatal("internal error", e);
@@ -1442,13 +1472,13 @@
=20
     //----------------------------------------------------------< diagnost=
ics >
     /**
-     * Dumps the state of this <code>NodeTypeManager</code> instance.
+     * Dumps the state of this <code>NodeTypeRegistry</code> instance.
      *
      * @param ps
      * @throws RepositoryException
      */
     void dump(PrintStream ps) throws RepositoryException {
-        ps.println("NodeTypeManager (" + this + ")");
+        ps.println("NodeTypeRegistry (" + this + ")");
         ps.println();
         ps.println("Registered NodeTypes:");
         ps.println();
@@ -1466,7 +1496,7 @@
             ps.println("\tPrimaryItemName\t" + (ntd.getPrimaryItemName() =
=3D=3D null ? "<null>" : ntd.getPrimaryItemName().toString()));
             PropDef[] pd =3D ntd.getPropertyDefs();
             for (int i =3D 0; i < pd.length; i++) {
-                ps.print("\tPropertyDef");
+                ps.print("\tPropertyDefinition");
                 ps.println(" (declared in " + pd[i].getDeclaringNodeType()=
 + ") id=3D" + new PropDefId(pd[i]));
                 ps.println("\t\tName\t\t" + (pd[i].definesResidual() ? "*"=
 : pd[i].getName().toString()));
                 String type =3D pd[i].getRequiredType() =3D=3D 0 ? "null" =
: PropertyType.nameFromValue(pd[i].getRequiredType());
@@ -1497,15 +1527,15 @@
                     }
                 }
                 ps.println("\t\tDefaultValue\t" + defaultValues.toString()=
);
-                ps.println("\t\tAutoCreate\t" + pd[i].isAutoCreate());
+                ps.println("\t\tAutoCreated\t" + pd[i].isAutoCreated());
                 ps.println("\t\tMandatory\t" + pd[i].isMandatory());
                 ps.println("\t\tOnVersion\t" + OnParentVersionAction.nameF=
romValue(pd[i].getOnParentVersion()));
                 ps.println("\t\tProtected\t" + pd[i].isProtected());
                 ps.println("\t\tMultiple\t" + pd[i].isMultiple());
             }
-            ChildNodeDef[] nd =3D ntd.getChildNodeDefs();
+            NodeDef[] nd =3D ntd.getChildNodeDefs();
             for (int i =3D 0; i < nd.length; i++) {
-                ps.print("\tNodeDef");
+                ps.print("\tNodeDefinition");
                 ps.println(" (declared in " + nd[i].getDeclaringNodeType()=
 + ") id=3D" + new NodeDefId(nd[i]));
                 ps.println("\t\tName\t\t" + (nd[i].definesResidual() ? "*"=
 : nd[i].getName().toString()));
                 QName[] reqPrimaryTypes =3D nd[i].getRequiredPrimaryTypes(=
);
@@ -1518,11 +1548,11 @@
                 if (defPrimaryType !=3D null) {
                     ps.print("\n\t\tDefaultPrimaryType\t" + defPrimaryType=
);
                 }
-                ps.println("\n\t\tAutoCreate\t" + nd[i].isAutoCreate());
+                ps.println("\n\t\tAutoCreated\t" + nd[i].isAutoCreated());
                 ps.println("\t\tMandatory\t" + nd[i].isMandatory());
                 ps.println("\t\tOnVersion\t" + OnParentVersionAction.nameF=
romValue(nd[i].getOnParentVersion()));
                 ps.println("\t\tProtected\t" + nd[i].isProtected());
-                ps.println("\t\tAllowSameNameSibs\t" + nd[i].allowSameName=
Sibs());
+                ps.println("\t\tAllowsSameNameSiblings\t" + nd[i].allowsSa=
meNameSiblings());
             }
         }
         ps.println();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no=
detype/PropDef.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/PropDef.java?view=3Ddiff&r1=3D161259&r2=3D1=
61260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropDef.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropDef.java Thu Apr 14 04:50:38 2005
@@ -24,7 +24,7 @@
 /**
  * A <code>PropDef</code> ...
  */
-public class PropDef extends ChildItemDef {
+public class PropDef extends ItemDef {
=20
     private int requiredType =3D PropertyType.UNDEFINED;
     private ValueConstraint[] valueConstraints =3D new ValueConstraint[0];

Copied: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/node=
type/PropertyDefinitionImpl.java (from r161036, incubator/jackrabbit/trunk/=
src/java/org/apache/jackrabbit/core/nodetype/PropertyDefImpl.java)
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/=
apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java?view=3Ddiff&rev=
=3D161260&p1=3Dincubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/co=
re/nodetype/PropertyDefImpl.java&r1=3D161036&p2=3Dincubator/jackrabbit/trun=
k/src/java/org/apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java&=
r2=3D161260
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropertyDefImpl.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype=
/PropertyDefinitionImpl.java Thu Apr 14 04:50:38 2005
@@ -22,14 +22,15 @@
=20
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
-import javax.jcr.nodetype.PropertyDef;
+import javax.jcr.nodetype.PropertyDefinition;
=20
 /**
- * A <code>PropertyDefImpl</code> ...
+ * A <code>PropertyDefinitionImpl</code> ...
  */
-public class PropertyDefImpl extends ItemDefImpl implements PropertyDef {
+public class PropertyDefinitionImpl extends ItemDefinitionImpl
+        implements PropertyDefinition {
=20
-    private static Logger log =3D Logger.getLogger(PropertyDefImpl.class);
+    private static Logger log =3D Logger.getLogger(PropertyDefinitionImpl.=
class);
=20
     private final PropDef propDef;
=20
@@ -41,7 +42,8 @@
      * @param ntMgr      node type manager
      * @param nsResolver namespace resolver
      */
-    PropertyDefImpl(PropDef propDef, NodeTypeManagerImpl ntMgr, NamespaceR=
esolver nsResolver) {
+    PropertyDefinitionImpl(PropDef propDef, NodeTypeManagerImpl ntMgr,
+                           NamespaceResolver nsResolver) {
         super(propDef, ntMgr, nsResolver);
         this.propDef =3D propDef;
     }
@@ -66,7 +68,9 @@
             } catch (RepositoryException re) {
                 // should never get here
                 String propName =3D (getName() =3D=3D null) ? "[null]" : g=
etName();
-                log.error("illegal default value specified for property " =
+ propName + " in node type " + getDeclaringNodeType(), re);
+                log.error("illegal default value specified for property "
+                        + propName + " in node type " + getDeclaringNodeTy=
pe(),
+                        re);
                 return null;
             }
         }