Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 20934 invoked from network); 14 Aug 2006 14:48:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Aug 2006 14:48:19 -0000 Received: (qmail 88641 invoked by uid 500); 14 Aug 2006 14:48:19 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 88603 invoked by uid 500); 14 Aug 2006 14:48:19 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 88594 invoked by uid 99); 14 Aug 2006 14:48:19 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Aug 2006 07:48:19 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Aug 2006 07:48:18 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id CC2621A981A; Mon, 14 Aug 2006 07:47:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r431359 - in /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state: NodeState.java PropertyState.java Date: Mon, 14 Aug 2006 14:47:57 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060814144757.CC2621A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Mon Aug 14 07:47:56 2006 New Revision: 431359 URL: http://svn.apache.org/viewvc?rev=431359&view=rev Log: work in progress - javadoc - ups... remove leftover from conflict. parent was moved to ItemState Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?rev=431359&r1=431358&r2=431359&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Mon Aug 14 07:47:56 2006 @@ -85,21 +85,12 @@ private String uuid; /** -<<<<<<< .mine -======= - * The name of this node + * The name of this node state */ private QName name; /** - * The parent NodeState or null if this - * instance represents the root node. - */ - private NodeState parent; - - /** ->>>>>>> .r431350 - * this node's definition + * Definition of this node state */ private QNodeDefinition def; Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?rev=431359&r1=431358&r2=431359&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Mon Aug 14 07:47:56 2006 @@ -45,20 +45,23 @@ private QName name; /** - * the internal values + * The internal value(s) */ private QValue[] values; /** - * the type of this property state + * The type of this property state */ private int type; /** - * flag indicating if this is a multivalue property + * Flag indicating if this is a multivalue property */ private boolean multiValued; + /** + * Property definition + */ private QPropertyDefinition def; /** @@ -69,8 +72,8 @@ * @param initialStatus the initial status of the property state object * @param isTransient flag indicating whether this state is transient or not */ - protected PropertyState(PropertyState overlayedState, NodeState parent, int initialStatus, - boolean isTransient, IdFactory idFactory) { + protected PropertyState(PropertyState overlayedState, NodeState parent, + int initialStatus, boolean isTransient, IdFactory idFactory) { super(overlayedState, parent, initialStatus, isTransient, idFactory); pull(); } @@ -117,7 +120,7 @@ public boolean isNode() { return false; } - + /** * {@inheritDoc} */