jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1165743 [2/5] - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ./ config/ hierarchy/ lock/ nodetype/ observation/ operation/ query/ security/ state/ util/ version/ xml/
Date Tue, 06 Sep 2011 16:13:55 GMT
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java Tue Sep  6 16:13:51 2011
@@ -38,8 +38,8 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 
 /**
- * <code>ChildNodeEntriesImpl</code> implements a memory sensitive implementation
- * of the <code>ChildNodeEntries</code> interface.
+ * {@code ChildNodeEntriesImpl} implements a memory sensitive implementation
+ * of the {@code ChildNodeEntries} interface.
  */
 final class ChildNodeEntriesImpl implements ChildNodeEntries {
     private static final Logger log = LoggerFactory.getLogger(ChildNodeEntriesImpl.class);
@@ -60,17 +60,17 @@ final class ChildNodeEntriesImpl impleme
     private final EntryFactory factory;
 
      /**
-      * Create a new <code>ChildNodeEntries</code> collection from the given
-      * <code>childNodeInfos</code> instead of retrieving them from the
+      * Create a new {@code ChildNodeEntries} collection from the given
+      * {@code childNodeInfos} instead of retrieving them from the
       * persistent layer.
       *
       * @param parent
       * @param factory
       * @param childNodeInfos The complete list of child infos or
-      * <code>null</code> if an 'empty' ChildNodeEntriesImpl should be created.
+      * {@code null} if an 'empty' ChildNodeEntriesImpl should be created.
       * In the latter case, individual child entries will be added on demand
       * and the complete list will be retrieved only to answer {@link #iterator()}
-      * if the passed boolean is <code>true</code>.
+      * if the passed boolean is {@code true}.
       */
      ChildNodeEntriesImpl(NodeEntry parent, EntryFactory factory, Iterator<ChildInfo> childNodeInfos) {
          this.parent = parent;
@@ -90,9 +90,9 @@ final class ChildNodeEntriesImpl impleme
 
     /**
      * @param childEntry
-     * @return The node entry that directly follows the given <code>childEntry</code>
-     * or <code>null</code> if the given <code>childEntry</code> has no successor
-     * or was not found in this <code>ChildNodeEntries</code>.
+     * @return The node entry that directly follows the given {@code childEntry}
+     * or <code>null</code> if the given {@code childEntry} has no successor
+     * or was not found in this {@code ChildNodeEntries}.
      */
     NodeEntry getNext(NodeEntry childEntry) {
         LinkedEntries.LinkNode ln = entries.getLinkNode(childEntry);
@@ -102,9 +102,9 @@ final class ChildNodeEntriesImpl impleme
 
     /**
      * @param childEntry
-     * @return The node entry that directly precedes the given <code>childEntry</code>
-     * or <code>null</code> if the given <code>childEntry</code> is the first
-     * or was not found in this <code>ChildNodeEntries</code>.
+     * @return The node entry that directly precedes the given {@code childEntry}
+     * or <code>null</code> if the given {@code childEntry} is the first
+     * or was not found in this {@code ChildNodeEntries}.
      */
     NodeEntry getPrevious(NodeEntry childEntry) {
         LinkedEntries.LinkNode ln = entries.getLinkNode(childEntry);
@@ -211,10 +211,10 @@ final class ChildNodeEntriesImpl impleme
     }
 
     /**
-     * Adds a <code>NodeEntry</code> to the end of the list. Same as
+     * Adds a {@code NodeEntry} to the end of the list. Same as
      * {@link #add(NodeEntry, int)}, where the index is {@link Path#INDEX_UNDEFINED}.
      *
-     * @param cne the <code>NodeEntry</code> to add.
+     * @param cne the {@code NodeEntry} to add.
      */
      @Override
      public synchronized void add(NodeEntry cne) {
@@ -249,7 +249,7 @@ final class ChildNodeEntriesImpl impleme
      *
      * @param entry
      * @param index
-     * @return the <code>LinkNode</code> belonging to the added entry.
+     * @return the {@code LinkNode} belonging to the added entry.
      */
     private LinkedEntries.LinkNode internalAdd(NodeEntry entry, int index) {
         Name nodeName = entry.getName();
@@ -284,12 +284,12 @@ final class ChildNodeEntriesImpl impleme
     }
 
     /**
-     * Add the specified new entry after the specified <code>insertAfter</code>.
+     * Add the specified new entry after the specified {@code insertAfter}.
      *
      * @param newEntry
      * @param index
      * @param insertAfter
-     * @return the <code>LinkNode</code> associated with the <code>newEntry</code>.
+     * @return the <code>LinkNode</code> associated with the {@code newEntry}.
      */
     private LinkedEntries.LinkNode internalAddAfter(NodeEntry newEntry, int index, LinkedEntries.LinkNode insertAfter) {
         LinkedEntries.LinkNode ln = entries.addAfter(newEntry, index, insertAfter);
@@ -301,7 +301,7 @@ final class ChildNodeEntriesImpl impleme
      * Removes the child node entry referring to the node state.
      *
      * @param childEntry the entry to be removed.
-     * @return the removed entry or <code>null</code> if there is no such entry.
+     * @return the removed entry or {@code null} if there is no such entry.
      */
     @Override
     public synchronized NodeEntry remove(NodeEntry childEntry) {
@@ -315,18 +315,18 @@ final class ChildNodeEntriesImpl impleme
     }
 
     /**
-     * Reorders an existing <code>NodeState</code> before another
-     * <code>NodeState</code>. If <code>beforeNode</code> is
-     * <code>null</code> <code>insertNode</code> is moved to the end of the
+     * Reorders an existing {@code NodeState} before another
+     * <code>NodeState</code>. If {@code beforeNode} is
+     * <code>null</code> {@code insertNode} is moved to the end of the
      * child node entries.
      *
      * @param insertEntry the NodeEntry to move.
-     * @param beforeEntry the NodeEntry where <code>insertNode</code> is
+     * @param beforeEntry the NodeEntry where {@code insertNode} is
      * reordered to.
      * @return the NodeEntry that followed the 'insertNode' before the reordering.
-     * @throws NoSuchElementException if <code>insertNode</code> or
-     * <code>beforeNode</code> does not have a <code>NodeEntry</code>
-     * in this <code>ChildNodeEntries</code>.
+     * @throws NoSuchElementException if {@code insertNode} or
+     * <code>beforeNode</code> does not have a {@code NodeEntry}
+     * in this {@code ChildNodeEntries}.
      */
     @Override
     public synchronized NodeEntry reorder(NodeEntry insertEntry, NodeEntry beforeEntry) {
@@ -463,14 +463,14 @@ final class ChildNodeEntriesImpl impleme
         }
 
         /**
-         * Returns the matching <code>LinkNode</code> from a list or a single
-         * <code>LinkNode</code>. This method will return <code>null</code>
+         * Returns the matching {@code LinkNode} from a list or a single
+         * <code>LinkNode</code>. This method will return {@code null}
          * if none of the entries matches either due to missing entry for given
-         * state name or due to missing availability of the <code>NodeEntry</code>.
+         * state name or due to missing availability of the {@code NodeEntry}.
          *
-         * @param nodeEntry the <code>NodeEntry</code> that is compared to the
-         * resolution of any <code>NodeEntry</code> that matches by name.
-         * @return the matching <code>LinkNode</code> or <code>null</code>
+         * @param nodeEntry the {@code NodeEntry} that is compared to the
+         * resolution of any {@code NodeEntry} that matches by name.
+         * @return the matching <code>LinkNode</code> or {@code null}
          */
         private LinkedEntries.LinkNode getLinkNode(NodeEntry nodeEntry) {
             for (Iterator<LinkedEntries.LinkNode> it = linkNodeIterator(); it.hasNext();) {
@@ -492,7 +492,7 @@ final class ChildNodeEntriesImpl impleme
          *
          * @param cne the child node entry to add.
          * @param index
-         * @return the LinkNode which refers to the added <code>NodeEntry</code>.
+         * @return the LinkNode which refers to the added {@code NodeEntry}.
          */
         LinkedEntries.LinkNode add(NodeEntry cne, int index) {
             LinkedEntries.LinkNode ln = new LinkedEntries.LinkNode(cne, index);
@@ -502,13 +502,13 @@ final class ChildNodeEntriesImpl impleme
 
         /**
          * Adds the given child node entry to this list after the specified
-         * <code>entry</code> or at the beginning if <code>entry</code> is
-         * <code>null</code>.
+         * <code>entry</code> or at the beginning if {@code entry} is
+         * {@code null}.
          *
          * @param cne the child node entry to add.
          * @param index
          * @param insertAfter after which to insert the new entry
-         * @return the LinkNode which refers to the added <code>NodeEntry</code>.
+         * @return the LinkNode which refers to the added {@code NodeEntry}.
          */
         LinkedEntries.LinkNode addAfter(NodeEntry cne, int index, LinkedEntries.LinkNode insertAfter) {
             LinkedEntries.LinkNode newNode;
@@ -540,12 +540,12 @@ final class ChildNodeEntriesImpl impleme
         }
 
         /**
-         * Reorders an existing <code>LinkNode</code> before another existing
-         * <code>LinkNode</code>. If <code>before</code> is <code>null</code>
-         * the <code>insert</code> node is moved to the end of the list.
+         * Reorders an existing {@code LinkNode} before another existing
+         * <code>LinkNode</code>. If <code>before</code> is {@code null}
+         * the {@code insert} node is moved to the end of the list.
          *
          * @param insert the node to reorder.
-         * @param before the node where to reorder node <code>insert</code>.
+         * @param before the node where to reorder node {@code insert}.
          */
         void reorderNode(LinkedEntries.LinkNode insert, LinkedEntries.LinkNode before) {
             removeNode(insert);
@@ -557,8 +557,8 @@ final class ChildNodeEntriesImpl impleme
         }
 
         /**
-         * Create a new <code>LinkNode</code> for a given {@link NodeEntry}
-         * <code>value</code>.
+         * Create a new {@code LinkNode} for a given {@link NodeEntry}
+         * {@code value}.
          *
          * @param value a child node entry.
          * @return a wrapping {@link LinkedEntries.LinkNode}.
@@ -582,7 +582,7 @@ final class ChildNodeEntriesImpl impleme
 
         //----------------------------------------------------------------------
         /**
-         * Extends the <code>AbstractLinkedList.Node</code>.
+         * Extends the {@code AbstractLinkedList.Node}.
          */
         private final class LinkNode extends Node {
 
@@ -625,14 +625,14 @@ final class ChildNodeEntriesImpl impleme
             }
 
             /**
-             * @return the wrapped <code>NodeEntry</code>.
+             * @return the wrapped {@code NodeEntry}.
              */
             public NodeEntry getNodeEntry() {
                 return (NodeEntry) getValue();
             }
 
             /**
-             * Removes this <code>LinkNode</code> from the linked list.
+             * Removes this {@code LinkNode} from the linked list.
              */
             public void remove() {
                 removeNode(this);
@@ -712,11 +712,11 @@ final class ChildNodeEntriesImpl impleme
         }
 
         /**
-         * Returns a single <code>NodeEntry</code> or an unmodifiable
-         * <code>List</code> of NodeEntry objects.
+         * Returns a single {@code NodeEntry} or an unmodifiable
+         * {@code List} of NodeEntry objects.
          *
          * @param qName
-         * @return a single <code>NodeEntry</code> or a <code>List</code> of
+         * @return a single <code>NodeEntry</code> or a {@code List} of
          * NodeEntry objects.
          */
         private Object get(Name qName) {
@@ -739,7 +739,7 @@ final class ChildNodeEntriesImpl impleme
         /**
          * Returns a unmodifiable List of NodeEntry objects even if the name map
          * only contains a single entry for the given name. If no matching entry
-         * exists for the given <code>Name</code> an empty list is returned.
+         * exists for the given {@code Name} an empty list is returned.
          *
          * @param name
          * @return list of entries or an empty list.
@@ -877,7 +877,7 @@ final class ChildNodeEntriesImpl impleme
          *
          * @param siblings
          * @param index
-         * @return matching entry or <code>null</code>.
+         * @return matching entry or {@code null}.
          */
         private static NodeEntry findMatchingEntry(List<NodeEntry> siblings, int index) {
             // shortcut if index can never match

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java Tue Sep  6 16:13:51 2011
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.spi.Name;
 import java.util.Collection;
 
 /**
- * <code>ChildPropertyEntries</code>...
+ * {@code ChildPropertyEntries}...
  */
 public interface ChildPropertyEntries {
 
@@ -34,8 +34,8 @@ public interface ChildPropertyEntries {
     boolean contains(Name propertyName);
 
     /**
-     * Return the PropertyEntry with the given <code>Name</code> or
-     * <code>null</code>.
+     * Return the PropertyEntry with the given {@code Name} or
+     * {@code null}.
      *
      * @param propertyName
      * @return
@@ -43,40 +43,40 @@ public interface ChildPropertyEntries {
     PropertyEntry get(Name propertyName);
 
     /**
-     * Returns an unmodifiable collection containing all <code>PropertyEntry</code>
+     * Returns an unmodifiable collection containing all {@code PropertyEntry}
      * objects present.
      *
-     * @return Collection of all <code>PropertyEntry</code> objects present.
+     * @return Collection of all {@code PropertyEntry} objects present.
      */
     Collection<PropertyEntry> getPropertyEntries();
 
     /**
      * Returns an unmodifiable collection containing all existing property names.
      *
-     * @return Collection of <code>Name</code>
+     * @return Collection of {@code Name}
      */
     Collection<Name> getPropertyNames();
 
     /**
-     * Adds the new <code>PropertyEntry</code> to this <code>ChildPropertyEntries</code>.
+     * Adds the new <code>PropertyEntry</code> to this {@code ChildPropertyEntries}.
      *
      * @param propertyEntry
      */
     void add(PropertyEntry propertyEntry);
 
     /**
-     * Adds all <code>PropertyEntry</code>s from the given collection to this
-     * <code>ChildPropertyEntries</code>.
+     * Adds all {@code PropertyEntry}s from the given collection to this
+     * {@code ChildPropertyEntries}.
      *
      * @param propertyEntries
      */
     void addAll(Collection<PropertyEntry> propertyEntries);
 
     /**
-     * Remove the collection entry with the given <code>Name</code>.
+     * Remove the collection entry with the given {@code Name}.
      *
      * @param propertyEntry
-     * @return true If this <code>ChildPropertyEntries</code> contained the
+     * @return true If this {@code ChildPropertyEntries} contained the
      * given entry. False otherwise.
      */
     boolean remove(PropertyEntry propertyEntry);

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntriesImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntriesImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntriesImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntriesImpl.java Tue Sep  6 16:13:51 2011
@@ -30,7 +30,7 @@ import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 
 /**
- * <code>ChildPropertyEntriesImpl</code>...
+ * {@code ChildPropertyEntriesImpl}...
  */
 public class ChildPropertyEntriesImpl implements ChildPropertyEntries {
     private final Map<Name, Reference<PropertyEntry>> properties;

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryFactory.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryFactory.java Tue Sep  6 16:13:51 2011
@@ -25,7 +25,7 @@ import org.apache.jackrabbit.spi.PathFac
 import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
 
 /**
- * <code>EntryFactory</code>...
+ * {@code EntryFactory}...
  */
 public class EntryFactory {
 
@@ -59,7 +59,7 @@ public class EntryFactory {
     private final InvalidationStrategy invalidationStrategy;
 
     /**
-     * Create a new instance of the <code>EntryFactory</code>.
+     * Create a new instance of the {@code EntryFactory}.
      *
      * @param isf
      * @param idFactory
@@ -165,22 +165,22 @@ public class EntryFactory {
 
         /**
          * Invalidate underlying {@link org.apache.jackrabbit.jcr2spi.state.ItemState} of this
-         * <code>entry</code>. Implementors may choose to delay the actual call to
+         * {@code entry}. Implementors may choose to delay the actual call to
          * {@link org.apache.jackrabbit.jcr2spi.state.ItemState#invalidate()} for this
-         * <code>entry</code> and for any of its child entries. They need to ensure however that
+         * {@code entry} and for any of its child entries. They need to ensure however that
          * {@link #applyPending(HierarchyEntry)} properly invalidates the respective state when called.
          *
-         * @param entry The <code>HierarchyEntry</code> to invalidate.
-         * @param recursive Invalidate state of child entries if <code>true</code>.
+         * @param entry The {@code HierarchyEntry} to invalidate.
+         * @param recursive Invalidate state of child entries if {@code true}.
          */
         void invalidate(HierarchyEntry entry, boolean recursive);
 
         /**
          * Apply any pending {@link org.apache.jackrabbit.jcr2spi.state.ItemState#invalidate()
          * invalidation} of the underlying {@link org.apache.jackrabbit.jcr2spi.state.ItemState} of
-         * this <code>entry</code>.
+         * this {@code entry}.
          *
-         * @param entry The affected <code>NodeEntry</code>.
+         * @param entry The affected {@code NodeEntry}.
          */
         void applyPending(HierarchyEntry entry);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryValidation.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryValidation.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryValidation.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryValidation.java Tue Sep  6 16:13:51 2011
@@ -25,18 +25,18 @@ import javax.jcr.ItemNotFoundException;
 import java.util.Iterator;
 
 /**
- * <code>EntryValidation</code>...
+ * {@code EntryValidation}...
  */
 final class EntryValidation {
     private EntryValidation() { }
 
     /**
-     * Returns <code>true</code> if the collection of child node
-     * <code>entries</code> contains at least one valid <code>NodeEntry</code>.
+     * Returns {@code true} if the collection of child node
+     * <code>entries</code> contains at least one valid {@code NodeEntry}.
      *
      * @param nodeEntries Iterator of NodeEntries to check.
-     * @return <code>true</code> if one of the entries is valid; otherwise
-     *         <code>false</code>.
+     * @return {@code true} if one of the entries is valid; otherwise
+     *         {@code false}.
      */
     static boolean containsValidNodeEntry(Iterator<NodeEntry> nodeEntries) {
         boolean hasValid = false;
@@ -48,13 +48,13 @@ final class EntryValidation {
     }
 
     /**
-     * Returns <code>true</code> if the given childnode entry is not
-     * <code>null</code> and resolves to a NodeState, that is valid or if the
+     * Returns {@code true} if the given childnode entry is not
+     * {@code null} and resolves to a NodeState, that is valid or if the
      * childnode entry has not been resolved up to now (assuming the corresponding
      * node state is still valid).
      *
      * @param cne NodeEntry to check.
-     * @return <code>true</code> if the given entry is valid.
+     * @return {@code true} if the given entry is valid.
      */
     static boolean isValidNodeEntry(NodeEntry cne) {
         // shortcut.
@@ -81,12 +81,12 @@ final class EntryValidation {
     }
 
     /**
-     * Returns <code>true</code> if the given childnode entry is not
-     * <code>null</code> and resolves to a NodeState, that is neither NEW
+     * Returns {@code true} if the given childnode entry is not
+     * {@code null} and resolves to a NodeState, that is neither NEW
      * nor REMOVED.
      *
      * @param cne NodeEntry to check.
-     * @return <code>true</code> if the given entry is valid.
+     * @return {@code true} if the given entry is valid.
      */
     static boolean isValidWorkspaceNodeEntry(NodeEntry cne) {
         // shortcut.
@@ -98,13 +98,13 @@ final class EntryValidation {
     }
 
     /**
-     * Returns <code>true</code> if the given child property entry is not
-     * <code>null</code> and resolves to a PropertyState, that is valid or if the
+     * Returns {@code true} if the given child property entry is not
+     * {@code null} and resolves to a PropertyState, that is valid or if the
      * child property entry has not been resolved up to now (assuming the corresponding
      * PropertyState is still valid).
      *
      * @param cpe PropertyEntry to check.
-     * @return <code>true</code> if the given entry is valid.
+     * @return {@code true} if the given entry is valid.
      */
     static boolean isValidPropertyEntry(PropertyEntry cpe) {
         if (cpe == null) {

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java Tue Sep  6 16:13:51 2011
@@ -28,12 +28,12 @@ import javax.jcr.ItemNotFoundException;
 import javax.jcr.RepositoryException;
 
 /**
- * <code>HierarchyEntry</code>...
+ * {@code HierarchyEntry}...
  */
 public interface HierarchyEntry {
 
     /**
-     * True if this <code>HierarchyEntry</code> would resolve to a <code>NodeState</code>.
+     * True if this <code>HierarchyEntry</code> would resolve to a {@code NodeState}.
      *
      * @return
      */
@@ -57,16 +57,16 @@ public interface HierarchyEntry {
     Path getWorkspacePath() throws RepositoryException;
 
     /**
-     * Returns the <code>NodeEntry</code> being parent to this
-     * <code>HierarchyEntry</code>.
+     * Returns the {@code NodeEntry} being parent to this
+     * {@code HierarchyEntry}.
      *
-     * @return the parent <code>HierarchyEntry</code>
+     * @return the parent {@code HierarchyEntry}
      */
     NodeEntry getParent();
 
     /**
-     * If this <code>HierarchyEntry</code> provides an underlying
-     * <code>ItemState</code> this method returns the status of that state,
+     * If this {@code HierarchyEntry} provides an underlying
+     * {@code ItemState} this method returns the status of that state,
      * otherwise it returns {@link Status#_UNDEFINED_}.
      *
      * @return Status of the ItemState or {@link Status#_UNDEFINED_} if this
@@ -76,30 +76,30 @@ public interface HierarchyEntry {
     int getStatus();
 
     /**
-     * Returns <code>true</code> if the referenced <code>ItemState</code> is
-     * available. That is, the referenced <code>ItemState</code> has already
+     * Returns <code>true</code> if the referenced {@code ItemState} is
+     * available. That is, the referenced {@code ItemState} has already
      * been resolved.<br>
      * Note, that the validity of the ItemState is not checked.
      *
-     * @return <code>true</code> if the <code>ItemState</code> is available;
-     * otherwise <code>false</code>.
+     * @return <code>true</code> if the {@code ItemState} is available;
+     * otherwise {@code false}.
      * @see #getItemState()
      */
     boolean isAvailable();
 
     /**
-     * If this <code>HierarchyEntry</code> has already been resolved before
-     * (see {@link #isAvailable()}), that <code>ItemState</code> is returned.
+     * If this {@code HierarchyEntry} has already been resolved before
+     * (see {@link #isAvailable()}), that {@code ItemState} is returned.
      * Note however, that the validity of the State is not asserted.<br>
      * If the entry has not been resolved yet an attempt is made to resolve this
-     * entry, which may fail if there exists no accessible <code>ItemState</code>
+     * entry, which may fail if there exists no accessible {@code ItemState}
      * or if the corresponding state has been removed in the mean time.
      *
-     * @return the referenced <code>ItemState</code>.
-     * @throws ItemNotFoundException if the <code>ItemState</code> does not
+     * @return the referenced {@code ItemState}.
+     * @throws ItemNotFoundException if the {@code ItemState} does not
      * exist anymore.
      * @throws RepositoryException If an error occurs while retrieving the
-     * <code>ItemState</code>.
+     * {@code ItemState}.
      */
     ItemState getItemState() throws ItemNotFoundException, RepositoryException;
 
@@ -111,8 +111,8 @@ public interface HierarchyEntry {
     void setItemState(ItemState state);
 
     /**
-     * Invalidates the underlying <code>ItemState</code> if available and if it
-     * is not transiently modified. If the <code>recursive</code> flag is true,
+     * Invalidates the underlying {@code ItemState} if available and if it
+     * is not transiently modified. If the {@code recursive} flag is true,
      * also invalidates the child entries recursively.<br>
      * Note, that in contrast to {@link HierarchyEntry#reload(boolean)}
      * this method only sets the status of this item state to {@link
@@ -122,8 +122,8 @@ public interface HierarchyEntry {
     void invalidate(boolean recursive);
 
     /**
-     * Calculates the status of the underlying <code>ItemState</code>: any pending
-     * changes to the underlying <code>ItemState</code> are applied.
+     * Calculates the status of the underlying {@code ItemState}: any pending
+     * changes to the underlying {@code ItemState} are applied.
      */
     void calculateStatus();
 
@@ -138,7 +138,7 @@ public interface HierarchyEntry {
 
     /**
      * Reloads this hierarchy entry and the corresponding ItemState, if this
-     * entry has already been resolved. If '<code>recursive</code>' the complete
+     * entry has already been resolved. If '{@code recursive}' the complete
      * hierarchy below this entry is reloaded as well.
      *
      * @param recursive
@@ -160,7 +160,7 @@ public interface HierarchyEntry {
     void transientRemove() throws InvalidItemStateException, RepositoryException;
 
     /**
-     * Removes this <code>HierarchyEntry</code> from its parent and sets the
+     * Removes this {@code HierarchyEntry} from its parent and sets the
      * status of the underlying ItemState to {@link Status#REMOVED} or to
      * {@link Status#STALE_DESTROYED}, respectively. If this entry is a
      * NodeEntry all descending ItemStates must get their status changed as well.
@@ -175,7 +175,7 @@ public interface HierarchyEntry {
     void complete(Operation transientOperation) throws RepositoryException;
 
     /**
-     * The required generation of this <code>HierarchyEntry</code> . This is used by the
+     * The required generation of this {@code HierarchyEntry} . This is used by the
      * {@link ItemInfoCache} to determine whether an item info in the cache is up to date or not.
      * That is whether the generation of the item info in the cache is the same or more recent
      * as the required generation of this entry.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java Tue Sep  6 16:13:51 2011
@@ -37,7 +37,7 @@ import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 
 /**
- * <code>HierarchyEntryImpl</code> implements base functionality for child node
+ * {@code HierarchyEntryImpl} implements base functionality for child node
  * and property references.
  */
 abstract class HierarchyEntryImpl implements HierarchyEntry {
@@ -62,7 +62,7 @@ abstract class HierarchyEntryImpl implem
     protected Name name;
 
     /**
-     * Hard reference to the parent <code>NodeEntry</code>.
+     * Hard reference to the parent {@code NodeEntry}.
      */
     protected NodeEntryImpl parent;
 
@@ -72,10 +72,10 @@ abstract class HierarchyEntryImpl implem
     protected final EntryFactory factory;
 
     /**
-     * Creates a new <code>HierarchyEntryImpl</code> with the given parent
-     * <code>NodeState</code>.
+     * Creates a new {@code HierarchyEntryImpl} with the given parent
+     * {@code NodeState}.
      *
-     * @param parent the <code>NodeEntry</code> that owns this child node
+     * @param parent the {@code NodeEntry} that owns this child node
      *               reference.
      * @param name   the name of the child item.
      * @param factory
@@ -111,16 +111,16 @@ abstract class HierarchyEntryImpl implem
     }
 
     /**
-     * Resolves this <code>HierarchyEntryImpl</code> and returns the target
-     * <code>ItemState</code> of this reference. This method may return a
-     * cached <code>ItemState</code> if this method was called before already
+     * Resolves this {@code HierarchyEntryImpl} and returns the target
+     * {@code ItemState} of this reference. This method may return a
+     * cached {@code ItemState} if this method was called before already
      * otherwise this method will forward the call to {@link #doResolve()}
      * and cache its return value. If an existing state has been invalidated
      * before, an attempt is made to reload it in order to make sure, that
      * a call to {@link ItemState#isValid()} does not equivocally return false.
      *
-     * @return the <code>ItemState</code> where this reference points to.
-     * @throws ItemNotFoundException if the referenced <code>ItemState</code>
+     * @return the {@code ItemState} where this reference points to.
+     * @throws ItemNotFoundException if the referenced {@code ItemState}
      * does not exist.
      * @throws RepositoryException if an error occurs.
      */
@@ -148,11 +148,11 @@ abstract class HierarchyEntryImpl implem
     }
 
     /**
-     * Resolves this <code>HierarchyEntryImpl</code> and returns the target
-     * <code>ItemState</code> of this reference.
+     * Resolves this {@code HierarchyEntryImpl} and returns the target
+     * {@code ItemState} of this reference.
      *
-     * @return the <code>ItemState</code> where this reference points to.
-     * @throws ItemNotFoundException if the referenced <code>ItemState</code>
+     * @return the {@code ItemState} where this reference points to.
+     * @throws ItemNotFoundException if the referenced {@code ItemState}
      * does not exist.
      * @throws RepositoryException if another error occurs.
      */
@@ -168,7 +168,7 @@ abstract class HierarchyEntryImpl implem
     abstract Path buildPath(boolean workspacePath) throws RepositoryException;
 
     /**
-     * @return the item state or <code>null</code> if the entry isn't resolved.
+     * @return the item state or {@code null} if the entry isn't resolved.
      */
     ItemState internalGetItemState() {
         ItemState state = null;
@@ -183,7 +183,7 @@ abstract class HierarchyEntryImpl implem
     }
 
     /**
-     * Invalidates the underlying {@link ItemState}. If <code>recursive</code> is
+     * Invalidates the underlying {@link ItemState}. If {@code recursive} is
      * true also invalidates the underlying item states of all child entries.
      * @param recursive
      */
@@ -435,7 +435,7 @@ abstract class HierarchyEntryImpl implem
     // ----------------------------------------------< InvalidationStrategy >---
     
     /**
-     * An implementation of <code>InvalidationStrategy</code> which lazily invalidates
+     * An implementation of {@code InvalidationStrategy} which lazily invalidates
      * the underlying {@link ItemState}s.
      */
     static class LazyInvalidation implements EntryFactory.InvalidationStrategy {
@@ -456,14 +456,14 @@ abstract class HierarchyEntryImpl implem
         private int nextGeneration;
 
         /**
-         * A recursive invalidation is being processed if <code>true</code>.
+         * A recursive invalidation is being processed if {@code true}.
          * This flag is for preventing re-entrance.
          */
         private boolean invalidating;
 
         /**
          * Records a pending recursive {@link ItemState#invalidate() invalidation} for
-         * <code>entry</code> if <code>recursive</code> is <code>true</code>. Otherwise
+         * <code>entry</code> if <code>recursive</code> is {@code true}. Otherwise
          * invalidates the entry right away.
          * {@inheritDoc}
          */
@@ -484,8 +484,8 @@ abstract class HierarchyEntryImpl implem
         }
 
         /**
-         * Checks whether <code>entry</code> itself has a invalidation pending.
-         * If so, the <code>entry</code> is invalidated. Otherwise check
+         * Checks whether {@code entry} itself has a invalidation pending.
+         * If so, the {@code entry} is invalidated. Otherwise check
          * whether an invalidation occurred after the entry has last been
          * invalidated. If so, search the path to the root for an originator of
          * the pending invalidation.
@@ -515,7 +515,7 @@ abstract class HierarchyEntryImpl implem
 
         /**
          * Search the path to the root for an originator of a pending invalidation of
-         * this <code>entry</code>. If such an originator is found, invalidate each
+         * this {@code entry}. If such an originator is found, invalidate each
          * entry on the path. Otherwise do nothing.
          *
          * @param entry

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEventListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEventListener.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEventListener.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEventListener.java Tue Sep  6 16:13:51 2011
@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * <code>HierarchyEventListener</code>...
+ * {@code HierarchyEventListener}...
  */
 public class HierarchyEventListener implements InternalEventListener {
     private static final Logger log = LoggerFactory.getLogger(HierarchyEventListener.class);
@@ -79,7 +79,7 @@ public class HierarchyEventListener impl
     }
 
     /**
-     * Processes <code>events</code> and invalidates cached <code>ItemState</code>s
+     * Processes <code>events</code> and invalidates cached {@code ItemState}s
      * accordingly. Note that this is performed for local changes only,
      * since workspace operations are reported as local and have been applied already.
      *

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java Tue Sep  6 16:13:51 2011
@@ -28,12 +28,12 @@ import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 
 /**
- * <code>HierarchyManager</code>...
+ * {@code HierarchyManager}...
  */
 public interface HierarchyManager {
 
     /**
-     * Dispose this <code>HierarchyManager</code>
+     * Dispose this {@code HierarchyManager}
      */
     void dispose();
 
@@ -43,36 +43,36 @@ public interface HierarchyManager {
     NodeEntry getRootEntry();
 
     /**
-     * Lookup of <code>HierarchyEntry</code> by its workspace Id that may be different
+     * Lookup of {@code HierarchyEntry} by its workspace Id that may be different
      * if a entry (or any of its ancestors) has been transiently moved or
      * reordered.<p/>
      * If the Hierarchy already lists the entry with the given workspaceItemId it is
-     * returned otherwise <code>null</code>. See {@link #getNodeEntry(NodeId)}
+     * returned otherwise {@code null}. See {@link #getNodeEntry(NodeId)}
      * or {@link #getPropertyEntry(PropertyId)} for methods that resolves the
      * ItemId including lookup in the persistence layer if the entry has not been
      * loaded yet.
      *
      * @param workspaceItemId
-     * @return the HierarchyEntry with the given <code>workspaceItemId</code>.
+     * @return the HierarchyEntry with the given {@code workspaceItemId}.
      */
     HierarchyEntry lookup(ItemId workspaceItemId);
 
     /**
-     * Lookup of <code>HierarchyEntry</code> by its workspace path that may be different
+     * Lookup of {@code HierarchyEntry} by its workspace path that may be different
      * if a entry (or any of its ancestors) has been transiently moved or
      * reordered.<p/>
      * If the Hierarchy already lists the entry with the given path it is
-     * returned otherwise <code>null</code>. See {@link #getNodeEntry(Path)}
+     * returned otherwise {@code null}. See {@link #getNodeEntry(Path)}
      * or {@link #getPropertyEntry(Path)} for methods that resolves the path
      * including lookup in the persistence layer if the entry has not been loaded yet.
      *
      * @param workspacePath
-     * @return the HierarchyEntry with the given <code>workspacePath</code>.
+     * @return the HierarchyEntry with the given {@code workspacePath}.
      */
     HierarchyEntry lookup(Path workspacePath);
 
     /**
-     * Resolves a itemId into a <code>HierarchyEntry</code>.
+     * Resolves a itemId into a {@code HierarchyEntry}.
      *
      * @param nodeId
      * @return
@@ -82,7 +82,7 @@ public interface HierarchyManager {
     NodeEntry getNodeEntry(NodeId nodeId) throws ItemNotFoundException, RepositoryException;
 
     /**
-     * Resolves a path into a <code>NodeEntry</code>.
+     * Resolves a path into a {@code NodeEntry}.
      *
      * @param qPath
      * @return
@@ -92,7 +92,7 @@ public interface HierarchyManager {
     NodeEntry getNodeEntry(Path qPath) throws PathNotFoundException, RepositoryException;
 
     /**
-     * Resolves a propertyId into a <code>PropertyEntry</code>.
+     * Resolves a propertyId into a {@code PropertyEntry}.
      *
      * @param propertyId
      * @return
@@ -102,7 +102,7 @@ public interface HierarchyManager {
     PropertyEntry getPropertyEntry(PropertyId propertyId) throws ItemNotFoundException, RepositoryException;
 
     /**
-     * Resolves a path into a <code>PropertyEntry</code>.
+     * Resolves a path into a {@code PropertyEntry}.
      *
      * @param qPath
      * @return
@@ -112,25 +112,25 @@ public interface HierarchyManager {
     PropertyEntry getPropertyEntry(Path qPath) throws PathNotFoundException, RepositoryException;
 
      /**
-     * Retrieves the <code>NodeEntry</code> corresponding to the given
-     * path and resolves it to the underlying <code>NodeState</code>.
-     *
-     * @param qPath
-     * @return
-     * @throws PathNotFoundException
-     * @throws RepositoryException
-     */
+      * Retrieves the {@code NodeEntry} corresponding to the given
+      * path and resolves it to the underlying {@code NodeState}.
+      *
+      * @param qPath
+      * @return
+      * @throws PathNotFoundException
+      * @throws RepositoryException
+      */
      NodeState getNodeState(Path qPath) throws PathNotFoundException, RepositoryException;
 
      /**
-     * Retrieves the <code>PropertyEntry</code> corresponding to the given
-     * path and resolves it to the underlying <code>PropertyState</code>.
-     *
-     * @param qPath
-     * @return
-     * @throws PathNotFoundException
-     * @throws RepositoryException
-     */
+      * Retrieves the {@code PropertyEntry} corresponding to the given
+      * path and resolves it to the underlying {@code PropertyState}.
+      *
+      * @param qPath
+      * @return
+      * @throws PathNotFoundException
+      * @throws RepositoryException
+      */
      PropertyState getPropertyState(Path qPath) throws PathNotFoundException, RepositoryException;
 
     /**
@@ -145,14 +145,14 @@ public interface HierarchyManager {
 
     /**
      * Returns the depth of the specified descendant relative to the given
-     * ancestor. If <code>ancestor</code> and <code>descendant</code>
-     * denote the same item 0 is returned. If <code>ancestor</code> does not
+     * ancestor. If <code>ancestor</code> and {@code descendant}
+     * denote the same item 0 is returned. If {@code ancestor} does not
      * denote an ancestor -1 is returned.
      *
      * @param ancestor NodeEntry that must be an ancestor of the descendant
      * @param descendant HierarchyEntry
-     * @return the relative depth; -1 if <code>ancestor</code> does not
-     * denote an ancestor of the item denoted by <code>descendant</code>
+     * @return the relative depth; -1 if {@code ancestor} does not
+     * denote an ancestor of the item denoted by {@code descendant}
      * (or itself).
      * @throws ItemNotFoundException If either of the specified id's does not
      * denote an existing item.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java Tue Sep  6 16:13:51 2011
@@ -35,7 +35,7 @@ import javax.jcr.PathNotFoundException;
 import javax.jcr.RepositoryException;
 
 /**
- * <code>HierarchyManagerImpl</code> implements the <code>HierarchyManager</code>
+ * <code>HierarchyManagerImpl</code> implements the {@code HierarchyManager}
  * interface.
  */
 public class HierarchyManagerImpl implements HierarchyManager {

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java Tue Sep  6 16:13:51 2011
@@ -36,19 +36,19 @@ import java.util.List;
 import java.util.Collection;
 
 /**
- * <code>NodeEntry</code>...
+ * {@code NodeEntry}...
  */
 public interface NodeEntry extends HierarchyEntry {
 
     /**
-     * @return the <code>NodeId</code> of this child node entry.
+     * @return the {@code NodeId} of this child node entry.
      */
     NodeId getId() throws InvalidItemStateException, RepositoryException;
 
     /**
      * Returns the ID that must be used for resolving this entry OR loading its
      * children entries from the persistent layer. This is the same as
-     * <code>getId()</code> unless this entry or any of its ancestors has been
+     * {@code getId()} unless this entry or any of its ancestors has been
      * transiently moved.
      *
      * @return
@@ -58,7 +58,7 @@ public interface NodeEntry extends Hiera
 
     /**
      * @return the unique ID of the node state which is referenced by this
-     * child node entry or <code>null</code> if the node state cannot be
+     * child node entry or {@code null} if the node state cannot be
      * identified with a unique ID.
      */
     String getUniqueID();
@@ -79,11 +79,11 @@ public interface NodeEntry extends Hiera
     int getIndex() throws InvalidItemStateException, RepositoryException;
 
     /**
-     * @return the referenced <code>NodeState</code>.
-     * @throws ItemNotFoundException if the <code>NodeState</code> does not
+     * @return the referenced {@code NodeState}.
+     * @throws ItemNotFoundException if the {@code NodeState} does not
      * exist.
      * @throws RepositoryException If an error occurs while retrieving the
-     * <code>NodeState</code>.
+     * {@code NodeState}.
      */
     NodeState getNodeState() throws ItemNotFoundException, RepositoryException;
 
@@ -118,83 +118,83 @@ public interface NodeEntry extends Hiera
      * Traverse the tree below this entry and return the child entry matching
      * the given 'workspacePath', i.e. transient modifications and new entries
      * are ignored.<p/>
-     * If no matching entry can be found, <code>null</code> is return.
+     * If no matching entry can be found, {@code null} is return.
      *
      * @param workspacePath
-     * @return matching entry or <code>null</code>.
+     * @return matching entry or {@code null}.
      */
     HierarchyEntry lookupDeepEntry(Path workspacePath);
 
     /**
-     * Determines if there is a valid <code>NodeEntry</code> with the
-     * specified <code>nodeName</code>.
+     * Determines if there is a valid {@code NodeEntry} with the
+     * specified {@code nodeName}.
      *
-     * @param nodeName <code>Name</code> object specifying a node name
-     * @return <code>true</code> if there is a <code>NodeEntry</code> with
-     * the specified <code>nodeName</code>.
+     * @param nodeName {@code Name} object specifying a node name
+     * @return <code>true</code> if there is a {@code NodeEntry} with
+     * the specified {@code nodeName}.
      */
     boolean hasNodeEntry(Name nodeName);
 
     /**
-     * Determines if there is a valid <code>NodeEntry</code> with the
-     * specified <code>name</code> and <code>index</code>.
+     * Determines if there is a valid {@code NodeEntry} with the
+     * specified <code>name</code> and {@code index}.
      *
-     * @param nodeName  <code>Name</code> object specifying a node name.
+     * @param nodeName  {@code Name} object specifying a node name.
      * @param index 1-based index if there are same-name child node entries.
-     * @return <code>true</code> if there is a <code>NodeEntry</code> with
-     * the specified <code>name</code> and <code>index</code>.
+     * @return <code>true</code> if there is a {@code NodeEntry} with
+     * the specified <code>name</code> and {@code index}.
      */
     boolean hasNodeEntry(Name nodeName, int index);
 
     /**
-     * Returns the valid <code>NodeEntry</code> with the specified name
-     * and index or <code>null</code> if there's no matching entry.
+     * Returns the valid {@code NodeEntry} with the specified name
+     * and index or {@code null} if there's no matching entry.
      *
-     * @param nodeName <code>Name</code> object specifying a node name.
+     * @param nodeName {@code Name} object specifying a node name.
      * @param index 1-based index if there are same-name child node entries.
-     * @return The <code>NodeEntry</code> with the specified name and index
-     * or <code>null</code> if there's no matching entry.
+     * @return The {@code NodeEntry} with the specified name and index
+     * or {@code null} if there's no matching entry.
      * @throws RepositoryException If an unexpected error occurs.
      */
     NodeEntry getNodeEntry(Name nodeName, int index) throws RepositoryException;
 
     /**
-     * Returns the valid <code>NodeEntry</code> with the specified name
-     * and index or <code>null</code> if there's no matching entry. If
-     * <code>loadIfNotFound</code> is true, the implementation must make
+     * Returns the valid {@code NodeEntry} with the specified name
+     * and index or {@code null} if there's no matching entry. If
+     * {@code loadIfNotFound} is true, the implementation must make
      * sure, that it's list of child entries is up to date and eventually
      * try to load the node entry.
      *
-     * @param nodeName <code>Name</code> object specifying a node name.
+     * @param nodeName {@code Name} object specifying a node name.
      * @param index 1-based index if there are same-name child node entries.
      * @param loadIfNotFound
-     * @return The <code>NodeEntry</code> with the specified name and index
-     * or <code>null</code> if there's no matching entry.
+     * @return The {@code NodeEntry} with the specified name and index
+     * or {@code null} if there's no matching entry.
      * @throws RepositoryException If an unexpected error occurs.
      */
     NodeEntry getNodeEntry(Name nodeName, int index, boolean loadIfNotFound) throws RepositoryException;
 
     /**
-     * Returns a unmodifiable iterator of <code>NodeEntry</code> objects
-     * denoting the the valid child NodeEntries present on this <code>NodeEntry</code>.
+     * Returns a unmodifiable iterator of {@code NodeEntry} objects
+     * denoting the the valid child NodeEntries present on this {@code NodeEntry}.
      *
-     * @return iterator of <code>NodeEntry</code> objects
+     * @return iterator of {@code NodeEntry} objects
      * @throws RepositoryException If an unexpected error occurs.
      */
     Iterator<NodeEntry> getNodeEntries() throws RepositoryException;
 
     /**
-     * Returns a unmodifiable List of <code>NodeEntry</code>s with the
+     * Returns a unmodifiable List of {@code NodeEntry}s with the
      * specified name.
      *
      * @param nodeName name of the child node entries that should be returned
-     * @return list of <code>NodeEntry</code> objects
+     * @return list of {@code NodeEntry} objects
      * @throws RepositoryException If an unexpected error occurs.
      */
     List<NodeEntry> getNodeEntries(Name nodeName) throws RepositoryException;
 
     /**
-     * Creates or updates the <code>ChildNodeEntries</code> of this node.
+     * Creates or updates the {@code ChildNodeEntries} of this node.
      *
      * @param childInfos
      * @throws RepositoryException
@@ -208,13 +208,13 @@ public interface NodeEntry extends Hiera
      * @param nodeName
      * @param index
      * @param uniqueID
-     * @return the <code>NodeEntry</code>.
+     * @return the {@code NodeEntry}.
      * @throws RepositoryException If an unexpected error occurs.
      */
     NodeEntry getOrAddNodeEntry(Name nodeName, int index, String uniqueID) throws RepositoryException;
 
     /**
-     * Adds a new, transient child <code>NodeEntry</code>
+     * Adds a new, transient child {@code NodeEntry}
      *
      * @param nodeName
      * @param uniqueID
@@ -226,36 +226,36 @@ public interface NodeEntry extends Hiera
     NodeEntry addNewNodeEntry(Name nodeName, String uniqueID, Name primaryNodeType, QNodeDefinition definition) throws RepositoryException;
 
     /**
-     * Determines if there is a property entry with the specified <code>Name</code>.
+     * Determines if there is a property entry with the specified {@code Name}.
      *
-     * @param propName <code>Name</code> object specifying a property name
-     * @return <code>true</code> if there is a property entry with the specified
-     * <code>Name</code>.
+     * @param propName {@code Name} object specifying a property name
+     * @return {@code true} if there is a property entry with the specified
+     * {@code Name}.
      */
     boolean hasPropertyEntry(Name propName);
 
     /**
-     * Returns the valid <code>PropertyEntry</code> with the specified name
-     * or <code>null</code> if no matching entry exists.
+     * Returns the valid {@code PropertyEntry} with the specified name
+     * or {@code null} if no matching entry exists.
      *
-     * @param propName <code>Name</code> object specifying a property name.
-     * @return The <code>PropertyEntry</code> with the specified name or
-     * <code>null</code> if no matching entry exists.
+     * @param propName {@code Name} object specifying a property name.
+     * @return The {@code PropertyEntry} with the specified name or
+     * {@code null} if no matching entry exists.
      * @throws RepositoryException If an unexpected error occurs.
      */
     PropertyEntry getPropertyEntry(Name propName) throws RepositoryException;
 
     /**
-     * Returns the valid <code>PropertyEntry</code> with the specified name
-     * or <code>null</code> if no matching entry exists.  If
-     * <code>loadIfNotFound</code> is true, the implementation must make
+     * Returns the valid {@code PropertyEntry} with the specified name
+     * or {@code null} if no matching entry exists.  If
+     * {@code loadIfNotFound} is true, the implementation must make
      * sure, that it's list of property entries is up to date and eventually
      * try to load the property entry with the given name.
      *
-     * @param propName <code>Name</code> object specifying a property name.
+     * @param propName {@code Name} object specifying a property name.
      * @param loadIfNotFound
-     * @return The <code>PropertyEntry</code> with the specified name or
-     * <code>null</code> if no matching entry exists.
+     * @return The {@code PropertyEntry} with the specified name or
+     * {@code null} if no matching entry exists.
      * @throws RepositoryException If an unexpected error occurs.
      */
     PropertyEntry getPropertyEntry(Name propName, boolean loadIfNotFound) throws RepositoryException;
@@ -270,21 +270,21 @@ public interface NodeEntry extends Hiera
     Iterator<PropertyEntry> getPropertyEntries();
 
     /**
-     * Add an existing <code>PropertyEntry</code> with the given name if it is
-     * not yet contained in this <code>NodeEntry</code>.
+     * Add an existing {@code PropertyEntry} with the given name if it is
+     * not yet contained in this {@code NodeEntry}.
      * Please note the difference to {@link #addNewPropertyEntry(Name, QPropertyDefinition, QValue[], int)}
      * which adds a new, transient entry.
      *
      * @param propName
-     * @return the <code>PropertyEntry</code>
+     * @return the {@code PropertyEntry}
      * @throws ItemExistsException if a child item exists with the given name
      * @throws RepositoryException if an unexpected error occurs.
      */
     PropertyEntry getOrAddPropertyEntry(Name propName) throws ItemExistsException, RepositoryException;
 
     /**
-     * Adds property entries for the given <code>Name</code>s. It depends on
-     * the status of this <code>NodeEntry</code>, how conflicts are resolved
+     * Adds property entries for the given {@code Name}s. It depends on
+     * the status of this {@code NodeEntry}, how conflicts are resolved
      * and whether or not existing entries that are missing in the iterator
      * get removed.
      *
@@ -295,8 +295,8 @@ public interface NodeEntry extends Hiera
     void setPropertyEntries(Collection<Name> propNames) throws ItemExistsException, RepositoryException;
 
     /**
-     * Add a new, transient <code>PropertyEntry</code> to this <code>NodeEntry</code>
-     * and return the <code>PropertyState</code> associated with the new entry.
+     * Add a new, transient <code>PropertyEntry</code> to this {@code NodeEntry}
+     * and return the {@code PropertyState} associated with the new entry.
      *
      * @param propName
      * @param definition
@@ -311,18 +311,18 @@ public interface NodeEntry extends Hiera
 
     /**
      * Reorders this NodeEntry before the sibling entry specified by the given
-     * <code>beforeEntry</code>.
+     * {@code beforeEntry}.
      *
      * @param beforeEntry the child node where to insert the node before. If
-     * <code>null</code> this entry is moved to the end of its parents child node entries.
+     * {@code null} this entry is moved to the end of its parents child node entries.
      * @throws RepositoryException If an unexpected error occurs.
      */
     void orderBefore(NodeEntry beforeEntry) throws RepositoryException;
 
     /**
-     * Moves this <code>NodeEntry</code> as new child entry of the
-     * <code>NodeEntry</code> identified by <code>newParent</code> and/or renames
-     * it to <code>newName</code>. If <code>transientMove</code> is true, an
+     * Moves this {@code NodeEntry} as new child entry of the
+     * <code>NodeEntry</code> identified by {@code newParent} and/or renames
+     * it to <code>newName</code>. If {@code transientMove} is true, an
      * implementation must make sure, that reverting this modification by calling
      * {@link HierarchyEntry#revert()} on the common ancestor of both parents
      * moves this NodeEntry back and resets the name to its original value.
@@ -336,14 +336,14 @@ public interface NodeEntry extends Hiera
     NodeEntry move(Name newName, NodeEntry newParent, boolean transientMove) throws RepositoryException;
 
     /**
-     * @return true if this <code>NodeEntry</code> is transiently moved.
+     * @return true if this {@code NodeEntry} is transiently moved.
      */
     boolean isTransientlyMoved();
 
     /**
      * The parent entry of a external event gets informed about the modification.
      * Note, that {@link Event#getParentId()} of the given childEvent must point
-     * to this <code>NodeEntry</code>.
+     * to this {@code NodeEntry}.
      *
      * @param childEvent
      */

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Tue Sep  6 16:13:51 2011
@@ -65,14 +65,14 @@ import java.util.Set;
 import static org.apache.jackrabbit.jcr2spi.util.Unchecked.cast;
 
 /**
- * <code>NodeEntryImpl</code> implements common functionality for child
+ * {@code NodeEntryImpl} implements common functionality for child
  * node entry implementations.
  */
 public class NodeEntryImpl extends HierarchyEntryImpl implements NodeEntry {
     private static final Logger log = LoggerFactory.getLogger(NodeEntryImpl.class);
 
     /**
-     * UniqueID identifying this NodeEntry or <code>null</code> if either
+     * UniqueID identifying this NodeEntry or {@code null} if either
      * the underlying state has not been loaded yet or if it cannot be
      * identified with a unique ID.
      */
@@ -104,10 +104,10 @@ public class NodeEntryImpl extends Hiera
 
     /**
      * Upon transient 'move' ('rename') or 'reorder' of SNSs this
-     * <code>NodeEntry</code> remembers the original parent, name and index
+     * {@code NodeEntry} remembers the original parent, name and index
      * for later revert as well as for the creation of the
      * {@link #getWorkspaceId() workspace id}. Finally the revertInfo is
-     * used to find the target of an <code>Event</code> indicating external
+     * used to find the target of an {@code Event} indicating external
      * modification.
      *
      * @see #refresh(Event)
@@ -115,9 +115,9 @@ public class NodeEntryImpl extends Hiera
     private RevertInfo revertInfo;
 
     /**
-     * Creates a new <code>NodeEntryImpl</code>
+     * Creates a new {@code NodeEntryImpl}
      *
-     * @param parent    the <code>NodeEntry</code> that owns this child item
+     * @param parent    the {@code NodeEntry} that owns this child item
      *                  reference.
      * @param name      the name of the child node.
      * @param factory   the entry factory.
@@ -667,7 +667,7 @@ public class NodeEntryImpl extends Hiera
     }
 
     /**
-     * Ignores the <code>loadIfNotFound</code> flag due to the fact, that
+     * Ignores the {@code loadIfNotFound} flag due to the fact, that
      * {@link org.apache.jackrabbit.spi.NodeInfo#getPropertyIds()} returns the
      * complete list of property names currently available.
      */
@@ -941,7 +941,7 @@ public class NodeEntryImpl extends Hiera
 
     /**
      * Adds the path element of an item id to the path currently being built.
-     * On exit, <code>builder</code> contains the path of this entry.
+     * On exit, {@code builder} contains the path of this entry.
      *
      * @param builder
      * @param nEntry NodeEntryImpl of the state the path should be built for.
@@ -1038,7 +1038,7 @@ public class NodeEntryImpl extends Hiera
     /**
      * @param oldName
      * @param oldIndex
-     * @return <code>true</code> if the given oldName and oldIndex match
+     * @return {@code true} if the given oldName and oldIndex match
      * {@link #getName(boolean)} and {@link #getIndex(boolean)}, respectively.
      */
     boolean matches(Name oldName, int oldIndex) {
@@ -1052,7 +1052,7 @@ public class NodeEntryImpl extends Hiera
 
     /**
      * @param oldName
-     * @return <code>true</code> if the given oldName matches
+     * @return {@code true} if the given oldName matches
      * {@link #getName(boolean)}.
      */
     boolean matches(Name oldName) {
@@ -1089,8 +1089,8 @@ public class NodeEntryImpl extends Hiera
     /**
      *
      * @param childId
-     * @return the entry or <code>null</code> if building the corresponding
-     * <code>NodeState</code> failed with <code>ItemNotFoundException</code>.
+     * @return the entry or {@code null} if building the corresponding
+     * <code>NodeState</code> failed with {@code ItemNotFoundException}.
      */
     private NodeEntry loadNodeEntry(NodeId childId) throws RepositoryException {
         try {
@@ -1103,8 +1103,8 @@ public class NodeEntryImpl extends Hiera
 
     /**
      * @param childId
-     * @return the entry or <code>null</code> if building the corresponding
-     * <code>PropertyState</code> failed with <code>ItemNotFoundException</code>.
+     * @return the entry or {@code null} if building the corresponding
+     * <code>PropertyState</code> failed with {@code ItemNotFoundException}.
      * @throws ItemNotFoundException
      * @throws RepositoryException
      */
@@ -1125,8 +1125,8 @@ public class NodeEntryImpl extends Hiera
      *
      * @param eventId
      * @param eventPath
-     * @return the entry or <code>null</code> if the matching entry has a status
-     * <code>Status#NEW</code>.
+     * @return the entry or {@code null} if the matching entry has a status
+     * {@code Status#NEW}.
      */
     private HierarchyEntry lookupEntry(ItemId eventId, Path eventPath) {
         Name childName = eventPath.getName();
@@ -1212,9 +1212,9 @@ public class NodeEntryImpl extends Hiera
     }
 
     /**
-     * @return The <code>ChildNodeEntries</code> defined for this
-     * <code>NodeEntry</code>. Please note, that this method never returns
-     * <code>null</code>, since the child node entries are loaded/reloaded
+     * @return The {@code ChildNodeEntries} defined for this
+     * {@code NodeEntry}. Please note, that this method never returns
+     * {@code null}, since the child node entries are loaded/reloaded
      * in case they have not been loaded yet.
      */
     private ChildNodeEntries getCompleteChildNodeEntries() throws RepositoryException {
@@ -1257,13 +1257,13 @@ public class NodeEntryImpl extends Hiera
     }
 
     /**
-     * Returns the index of the given <code>NodeEntry</code>.
+     * Returns the index of the given {@code NodeEntry}.
      *
-     * @param cne  the <code>NodeEntry</code> instance.
-     * @param wspIndex if <code>true</code> transiently removed siblings are respected.
+     * @param cne  the {@code NodeEntry} instance.
+     * @param wspIndex if {@code true} transiently removed siblings are respected.
      * @return the index of the child node entry.
      * @throws ItemNotFoundException if the given entry isn't a valid child of
-     * this <code>NodeEntry</code>.
+     * this {@code NodeEntry}.
      */
     private int getChildIndex(NodeEntry cne, boolean wspIndex) throws RepositoryException {
         List<NodeEntry> sns = new ArrayList<NodeEntry>(childNodeEntries.get(cne.getName()));
@@ -1315,7 +1315,7 @@ public class NodeEntryImpl extends Hiera
     }
 
     /**
-     * Returns <code>true</code> if the attic contains a matching child entry or
+     * Returns {@code true} if the attic contains a matching child entry or
      * if any of the remaining child entries present in the siblings list has
      * been modified in a way that its original index is equal to the given
      * child index.
@@ -1323,7 +1323,7 @@ public class NodeEntryImpl extends Hiera
      * @param siblings
      * @param childName
      * @param childIndex
-     * @return <code>true</code> if there is a child entry in the attic that
+     * @return {@code true} if there is a child entry in the attic that
      * matches the given name/index or if the siblings list contain a reordered
      * entry that matches.
      */

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntry.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntry.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntry.java Tue Sep  6 16:13:51 2011
@@ -24,19 +24,19 @@ import javax.jcr.ItemNotFoundException;
 import javax.jcr.InvalidItemStateException;
 
 /**
- * <code>PropertyEntry</code>...
+ * {@code PropertyEntry}...
  */
 public interface PropertyEntry extends HierarchyEntry {
 
     /**
-     * @return the <code>NodeId</code> of this child node entry.
+     * @return the {@code NodeId} of this child node entry.
      */
     PropertyId getId() throws InvalidItemStateException, RepositoryException;
 
     /**
      * Returns the ID that must be used for resolving this entry OR loading its
      * children entries from the persistent layer. This is the same as
-     * <code>getId()</code> unless any of its ancestors has been transiently
+     * {@code getId()} unless any of its ancestors has been transiently
      * moved.
      *
      * @return
@@ -45,11 +45,11 @@ public interface PropertyEntry extends H
     PropertyId getWorkspaceId() throws InvalidItemStateException, RepositoryException;
 
     /**
-     * @return the referenced <code>PropertyState</code>.
-     * @throws ItemNotFoundException if the <code>PropertyState</code> does not
+     * @return the referenced {@code PropertyState}.
+     * @throws ItemNotFoundException if the {@code PropertyState} does not
      * exist anymore.
      * @throws RepositoryException if an error occurs while retrieving the
-     * <code>PropertyState</code>.
+     * {@code PropertyState}.
      */
     PropertyState getPropertyState() throws ItemNotFoundException, RepositoryException;
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java Tue Sep  6 16:13:51 2011
@@ -30,14 +30,14 @@ import org.apache.jackrabbit.spi.Path;
 import org.apache.jackrabbit.spi.PropertyId;
 
 /**
- * <code>PropertyEntryImpl</code> implements a reference to a property state.
+ * {@code PropertyEntryImpl} implements a reference to a property state.
  */
 public class PropertyEntryImpl extends HierarchyEntryImpl implements PropertyEntry {
 
     /**
-     * Creates a new <code>PropertyEntryImpl</code>.
+     * Creates a new {@code PropertyEntryImpl}.
      *
-     * @param parent    the parent <code>NodeEntry</code> where the property
+     * @param parent    the parent {@code NodeEntry} where the property
      *                  belongs to.
      * @param name      the name of the property.
      * @param factory
@@ -47,12 +47,12 @@ public class PropertyEntryImpl extends H
     }
 
     /**
-     * Creates a new <code>PropertyEntry</code>.
+     * Creates a new {@code PropertyEntry}.
      *
      * @param parent
      * @param name
      * @param factory
-     * @return new <code>PropertyEntry</code>
+     * @return new {@code PropertyEntry}
      */
     static PropertyEntry create(NodeEntryImpl parent, Name name, EntryFactory factory) {
         return new PropertyEntryImpl(parent, name, factory);

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/UniqueIdResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/UniqueIdResolver.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/UniqueIdResolver.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/UniqueIdResolver.java Tue Sep  6 16:13:51 2011
@@ -33,7 +33,7 @@ import java.util.Map;
 import static org.apache.jackrabbit.jcr2spi.util.Unchecked.cast;
 
 /**
- * <code>UniqueIdResolver</code> allows to retrieve <code>NodeEntry</code> instances
+ * <code>UniqueIdResolver</code> allows to retrieve {@code NodeEntry} instances
  * that are identified by a uniqueID.
  */
 public class UniqueIdResolver implements ItemStateCreationListener, EntryFactory.NodeEntryListener {
@@ -47,7 +47,7 @@ public class UniqueIdResolver implements
     private final Map<String, NodeEntry> lookUp;
 
     /**
-     * Creates a new <code>UniqueIdResolver</code>.
+     * Creates a new {@code UniqueIdResolver}.
      */
     public UniqueIdResolver(ItemStateFactory isf) {
         lookUp = cast(new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT));

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java Tue Sep  6 16:13:51 2011
@@ -50,7 +50,7 @@ import java.util.Map;
 import java.util.Date;
 
 /**
- * <code>LockManagerImpl</code>...
+ * {@code LockManagerImpl}...
  * TODO: Lock objects obtained through this mgr are not informed if another session is or becomes lock-holder and
  * removes the lock again.
  */
@@ -70,8 +70,8 @@ public class LockManagerImpl implements 
     private final CacheBehaviour cacheBehaviour;
 
     /**
-     * Map holding all locks that where created by this <code>Session</code> upon
-     * calls to {@link LockStateManager#lock(NodeState,boolean,boolean)} or to
+     * Map holding all locks that where created by this {@code Session} upon
+     * calls to {@link LockStateManager#lock(NodeState, boolean, boolean)} or to
      * {@link LockStateManager#getLock(NodeState)}. The map entries are removed
      * only if a lock ends his life by {@link Node#unlock()} or by implicit
      * unlock upon {@link Session#logout()}.
@@ -176,7 +176,7 @@ public class LockManagerImpl implements 
 
 
     /**
-     * Returns the lock tokens present on the <code>SessionInfo</code> this
+     * Returns the lock tokens present on the {@code SessionInfo} this
      * manager has been created with.
      *
      */
@@ -265,7 +265,7 @@ public class LockManagerImpl implements 
     //------------------------------------------------------------< private >---
 
     /**
-     * Search nearest ancestor that is locked. Returns <code>null</code> if neither
+     * Search nearest ancestor that is locked. Returns {@code null} if neither
      * the given state nor any of its ancestors is locked.
      * Note, that this methods does NOT check if the given node state would
      * be affected by the lock present on an ancestor state.
@@ -275,9 +275,9 @@ public class LockManagerImpl implements 
      * to search for jcr:lockIsDeep property only and omitting all kind of
      * verification regarding nodetypes present.
      *
-     * @param nodeState <code>NodeState</code> from which searching starts.
+     * @param nodeState {@code NodeState} from which searching starts.
      * Note, that the given state must not have an overlaid state.
-     * @return a state holding a lock or <code>null</code> if neither the
+     * @return a state holding a lock or {@code null} if neither the
      * given state nor any of its ancestors is locked.
      */
     private static NodeState getLockHoldingState(NodeState nodeState) {
@@ -333,14 +333,14 @@ public class LockManagerImpl implements 
 
     /**
      * Returns the Lock that applies to the given node state (directly or
-     * by an inherited deep lock) or <code>null</code> if the state is not
+     * by an inherited deep lock) or {@code null} if the state is not
      * locked at all.
      *
      * @param nodeState
      * @param lazyLockDiscovery If true, no extra check with the server is made in order to
      * determine, whether there is really no lock present. Otherwise, the server
      * is asked if a lock is present.
-     * @return LockImpl that applies to the given state or <code>null</code>.
+     * @return LockImpl that applies to the given state or {@code null}.
      * @throws RepositoryException
      */
     private LockImpl getLockImpl(NodeState nodeState, boolean lazyLockDiscovery) throws RepositoryException {
@@ -417,7 +417,7 @@ public class LockManagerImpl implements 
     //----------------------------< Notification about modified lock-tokens >---
 
     /**
-     * Notify all <code>Lock</code>s that have been accessed so far about the
+     * Notify all {@code Lock}s that have been accessed so far about the
      * new lock token present on the session and allow them to reload their
      * lock info.
      *
@@ -432,7 +432,7 @@ public class LockManagerImpl implements 
     }
 
     /**
-     * Notify all <code>Lock</code>s that have been accessed so far about the
+     * Notify all {@code Lock}s that have been accessed so far about the
      * removed lock token and allow them to reload their lock info, if necessary.
      *
      * @param lt
@@ -513,7 +513,7 @@ public class LockManagerImpl implements 
         }
 
         /**
-         * @return <code>true</code> if the lock is still alive.
+         * @return {@code true} if the lock is still alive.
          */
         private boolean isLive() {
             if (isLive) {
@@ -644,7 +644,7 @@ public class LockManagerImpl implements 
          *
          * @param lockState
          * Note, that the given state must not have an overlaid state.
-         * @param lockHoldingNode the lock holding <code>Node</code> itself.
+         * @param lockHoldingNode the lock holding {@code Node} itself.
          */
         public LockImpl(LockState lockState, Node lockHoldingNode) {
             this.lockState = lockState;
@@ -782,7 +782,7 @@ public class LockManagerImpl implements 
         //--------------------------------------------------------< private >---
 
         /**
-         * @return <code>LockInfo</code> stored within the <code>LockState</code>
+         * @return <code>LockInfo</code> stored within the {@code LockState}
          */
         private LockInfo getLockInfo() {
             return lockState.lockInfo;

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java Tue Sep  6 16:13:51 2011
@@ -36,7 +36,7 @@ public interface LockStateManager {
      * @param isSessionScoped whether the lock is session scoped
      * @return lock object
      * @throws LockException if this node already is locked, or some descendant
-     *         node is locked and <code>isDeep</code> is <code>true</code>
+     *         node is locked and <code>isDeep</code> is {@code true}
      * @see javax.jcr.Node#lock
      */
     Lock lock(NodeState nodeState, boolean isDeep, boolean isSessionScoped)
@@ -54,7 +54,7 @@ public interface LockStateManager {
      * displayed.
      * @return lock object
      * @throws LockException if this node already is locked, or some descendant
-     *         node is locked and <code>isDeep</code> is <code>true</code>
+     *         node is locked and <code>isDeep</code> is {@code true}
      * @see javax.jcr.Node#lock
      */
     Lock lock(NodeState nodeState, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerHint)
@@ -83,14 +83,14 @@ public interface LockStateManager {
     Lock getLock(NodeState nodeState) throws LockException, RepositoryException;
 
     /**
-     * Returns <code>true</code> if this node is locked either as a result
+     * Returns {@code true} if this node is locked either as a result
      * of a lock held by this node or by a deep lock on a node above this
-     * node; otherwise returns <code>false</code>.
+     * node; otherwise returns {@code false}.
      *
      * @param nodeState
-     * @return <code>true</code> if this node is locked either as a result
+     * @return {@code true} if this node is locked either as a result
      * of a lock held by this node or by a deep lock on a node above this
-     * node; otherwise returns <code>false</code>
+     * node; otherwise returns {@code false}
      * @throws RepositoryException If an error occurs.
      * @see javax.jcr.Node#isLocked
      */
@@ -111,7 +111,7 @@ public interface LockStateManager {
 
     /**
      *
-     * @return The lock tokens associated with the <code>Session</code> this
+     * @return The lock tokens associated with the {@code Session} this
      * lock manager has been created for.
      */
     String[] getLockTokens() throws RepositoryException;

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java Tue Sep  6 16:13:51 2011
@@ -181,7 +181,7 @@ class BitsetENTCacheImpl implements Effe
      * Removes the effective node type for the given key from the cache.
      *
      * @param key the key of the effective node type to remove
-     * @return the removed effective node type or <code>null</code> if it was
+     * @return the removed effective node type or {@code null} if it was
      *         never cached.
      */
     private EffectiveNodeType remove(Key key) {
@@ -285,7 +285,7 @@ class BitsetENTCacheImpl implements Effe
 
         /**
          * Returns the bit number of the next bit that is set, starting at
-         * <code>fromIndex</code> inclusive.
+         * {@code fromIndex} inclusive.
          *
          * @param fromIndex the bit position to start the search
          * @return the bit position of the bit or -1 if none found.

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java Tue Sep  6 16:13:51 2011
@@ -44,7 +44,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 /**
- * <code>DefinitionValidator</code>...
+ * {@code DefinitionValidator}...
  */
 class DefinitionValidator {
     private static final Logger log = LoggerFactory.getLogger(DefinitionValidator.class);
@@ -520,8 +520,8 @@ class DefinitionValidator {
     }
 
     /**
-     * Utility method for verifying that the namespace of a <code>Name</code>
-     * is registered; a <code>null</code> argument is silently ignored.
+     * Utility method for verifying that the namespace of a {@code Name}
+     * is registered; a {@code null} argument is silently ignored.
      * @param name name whose namespace is to be checked
      * @throws RepositoryException if the namespace of the given name is not
      *                             registered or if an unspecified error occurred



Mime
View raw message