jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
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 GMT
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 <code>NodeState</code> or <code>null</code> 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}
      */



Mime
View raw message