You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/09/06 18:13:55 UTC
svn commit: r1165743 [4/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/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java Tue Sep 6 16:13:51 2011
@@ -64,10 +64,10 @@ public class NodeIteratorImpl implements
private double nextScore;
/**
- * Creates a new <code>NodeIteratorImpl</code> instance.
+ * Creates a new {@code NodeIteratorImpl} instance.
*
- * @param itemMgr The <code>ItemManager</code> to build <code>Node</code> instances.
- * @param hierarchyMgr The <code>HierarchyManager</code> used to retrieve the
+ * @param itemMgr The <code>ItemManager</code> to build {@code Node} instances.
+ * @param hierarchyMgr The {@code HierarchyManager} used to retrieve the
* HierarchyEntry objects from the ids returned by the query.
* @param queryInfo the query result.
*/
@@ -83,7 +83,7 @@ public class NodeIteratorImpl implements
/**
* Returns the score of the node returned by {@link #nextNode()}. In other
- * words, this method returns the score value of the next <code>Node</code>.
+ * words, this method returns the score value of the next {@code Node}.
*
* @return the score of the node returned by {@link #nextNode()}.
* @throws NoSuchElementException if there is no next node.
@@ -99,10 +99,10 @@ public class NodeIteratorImpl implements
//-------------------------------------------------------< NodeIterator >---
/**
- * Returns the next <code>Node</code> in the result set.
+ * Returns the next {@code Node} in the result set.
*
- * @return the next <code>Node</code> in the result set.
- * @throws NoSuchElementException if iteration has no more <code>Node</code>s.
+ * @return the next {@code Node} in the result set.
+ * @throws NoSuchElementException if iteration has no more {@code Node}s.
* @see javax.jcr.NodeIterator#nextNode()
*/
@Override
@@ -118,10 +118,10 @@ public class NodeIteratorImpl implements
//------------------------------------------------------< RangeIterator >---
/**
- * Skip a number of <code>Node</code>s in this iterator.
+ * Skip a number of {@code Node}s in this iterator.
*
- * @param skipNum the non-negative number of <code>Node</code>s to skip
- * @throws NoSuchElementException if skipped past the last <code>Node</code>
+ * @param skipNum the non-negative number of {@code Node}s to skip
+ * @throws NoSuchElementException if skipped past the last {@code Node}
* in this iterator.
* @see javax.jcr.NodeIterator#skip(long)
*/
@@ -162,9 +162,9 @@ public class NodeIteratorImpl implements
}
/**
- * Returns the current position in this <code>NodeIterator</code>.
+ * Returns the current position in this {@code NodeIterator}.
*
- * @return the current position in this <code>NodeIterator</code>.
+ * @return the current position in this {@code NodeIterator}.
* @see javax.jcr.RangeIterator#getPosition()
*/
@Override
@@ -173,10 +173,10 @@ public class NodeIteratorImpl implements
}
/**
- * Returns the next <code>Node</code> in the result set.
+ * Returns the next {@code Node} in the result set.
*
- * @return the next <code>Node</code> in the result set.
- * @throws NoSuchElementException if iteration has no more <code>Node</code>s.
+ * @return the next {@code Node} in the result set.
+ * @throws NoSuchElementException if iteration has no more {@code Node}s.
* @see java.util.Iterator#next()
*/
@Override
@@ -185,11 +185,11 @@ public class NodeIteratorImpl implements
}
/**
- * Returns <code>true</code> if there is another <code>Node</code>
- * available; <code>false</code> otherwise.
+ * Returns <code>true</code> if there is another {@code Node}
+ * available; {@code false} otherwise.
*
- * @return <code>true</code> if there is another <code>Node</code>
- * available; <code>false</code> otherwise.
+ * @return <code>true</code> if there is another {@code Node}
+ * available; {@code false} otherwise.
* @see java.util.Iterator#hasNext()
*/
@Override
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java Tue Sep 6 16:13:51 2011
@@ -119,7 +119,7 @@ public class QueryImpl implements Query
* @param statement the query statement.
* @param language the language of the query statement.
* @param node the node from where the query was read or
- * <code>null</code> if this query is not a stored
+ * {@code null} if this query is not a stored
* query.
* @throws InvalidQueryException if the query is invalid.
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java Tue Sep 6 16:13:51 2011
@@ -42,7 +42,7 @@ import org.apache.jackrabbit.spi.commons
public class QueryManagerImpl implements QueryManager {
/**
- * The <code>Session</code> for this QueryManager.
+ * The {@code Session} for this QueryManager.
*/
private final Session session;
@@ -57,18 +57,18 @@ public class QueryManagerImpl implements
private final ManagerProvider mgrProvider;
/**
- * The <code>ItemManager</code> of for item retrieval in search results
+ * The {@code ItemManager} of for item retrieval in search results
*/
private final ItemManager itemMgr;
/**
- * The <code>WorkspaceManager</code> where queries are executed.
+ * The {@code WorkspaceManager} where queries are executed.
*/
private final WorkspaceManager wspManager;
/**
- * Creates a new <code>QueryManagerImpl</code> for the passed
- * <code>Session</code>.
+ * Creates a new {@code QueryManagerImpl} for the passed
+ * {@code Session}.
*
* @param session the current session.
* @param mgrProvider the manager provider.
@@ -131,7 +131,7 @@ public class QueryManagerImpl implements
//------------------------------------------------------------< private >---
/**
- * Checks if this <code>QueryManagerImpl</code> instance is still usable,
+ * Checks if this {@code QueryManagerImpl} instance is still usable,
* otherwise throws a {@link javax.jcr.RepositoryException}.
*
* @throws RepositoryException if this query manager is not usable anymore,
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java Tue Sep 6 16:13:51 2011
@@ -43,7 +43,7 @@ import org.apache.jackrabbit.jcr2spi.Wor
import org.apache.jackrabbit.spi.commons.query.qom.QueryObjectModelTree;
/**
- * <code>QueryObjectModelImpl</code> implements the jcr2spi query object model.
+ * {@code QueryObjectModelImpl} implements the jcr2spi query object model.
*/
public class QueryObjectModelImpl extends QueryImpl implements QueryObjectModel {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java Tue Sep 6 16:13:51 2011
@@ -28,7 +28,7 @@ import javax.jcr.query.QueryResult;
import javax.jcr.query.RowIterator;
/**
- * Implements the <code>javax.jcr.query.QueryResult</code> interface.
+ * Implements the {@code javax.jcr.query.QueryResult} interface.
*/
class QueryResultImpl implements QueryResult {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java Tue Sep 6 16:13:51 2011
@@ -57,7 +57,7 @@ class RowIteratorImpl implements RowIter
private final String[] columnNames;
/**
- * The <code>NamePathResolver</code> of the user <code>Session</code>.
+ * The <code>NamePathResolver</code> of the user {@code Session}.
*/
private final NamePathResolver resolver;
@@ -77,12 +77,12 @@ class RowIteratorImpl implements RowIter
private final HierarchyManager hierarchyManager;
/**
- * Creates a new <code>RowIteratorImpl</code> that iterates over the result
+ * Creates a new {@code RowIteratorImpl} that iterates over the result
* nodes.
*
* @param queryInfo the query info.
- * @param resolver <code>NameResolver</code> of the user
- * <code>Session</code>.
+ * @param resolver {@code NameResolver} of the user
+ * {@code Session}.
* @param vFactory the JCR value factory.
* @param itemMgr the item manager.
* @param hierarchyManager the hierarchy manager.
@@ -101,10 +101,10 @@ class RowIteratorImpl implements RowIter
//--------------------------------------------------------< RowIterator >---
/**
- * Returns the next <code>Row</code> in the iteration.
+ * Returns the next {@code Row} in the iteration.
*
- * @return the next <code>Row</code> in the iteration.
- * @throws NoSuchElementException if iteration has no more <code>Row</code>s.
+ * @return the next {@code Row} in the iteration.
+ * @throws NoSuchElementException if iteration has no more {@code Row}s.
*/
@Override
public Row nextRow() throws NoSuchElementException {
@@ -114,10 +114,10 @@ class RowIteratorImpl implements RowIter
//------------------------------------------------------< RangeIterator >---
/**
- * Skip a number of <code>Row</code>s in this iterator.
+ * Skip a number of {@code Row}s in this iterator.
*
- * @param skipNum the non-negative number of <code>Row</code>s to skip
- * @throws NoSuchElementException if skipped past the last <code>Row</code>
+ * @param skipNum the non-negative number of {@code Row}s to skip
+ * @throws NoSuchElementException if skipped past the last {@code Row}
* in this iterator.
* @see javax.jcr.RangeIterator#skip(long)
*/
@@ -127,9 +127,9 @@ class RowIteratorImpl implements RowIter
}
/**
- * Returns the number of <code>Row</code>s in this iterator.
+ * Returns the number of {@code Row}s in this iterator.
*
- * @return the number of <code>Row</code>s in this iterator.
+ * @return the number of {@code Row}s in this iterator.
* @see RangeIterator#getSize()
*/
@Override
@@ -139,8 +139,8 @@ class RowIteratorImpl implements RowIter
/**
* Returns the current position within this iterator. The number
- * returned is the 0-based index of the next <code>Row</code> in the iterator,
- * i.e. the one that will be returned on the subsequent <code>next</code> call.
+ * returned is the 0-based index of the next {@code Row} in the iterator,
+ * i.e. the one that will be returned on the subsequent {@code next} call.
* <p/>
* Note that this method does not check if there is a next element,
* i.e. an empty iterator will always return 0.
@@ -163,11 +163,11 @@ class RowIteratorImpl implements RowIter
}
/**
- * Returns <code>true</code> if the iteration has more <code>Row</code>s.
- * (In other words, returns <code>true</code> if <code>next</code> would
- * return an <code>Row</code> rather than throwing an exception.)
+ * Returns <code>true</code> if the iteration has more {@code Row}s.
+ * (In other words, returns <code>true</code> if {@code next} would
+ * return an {@code Row} rather than throwing an exception.)
*
- * @return <code>true</code> if the iterator has more elements.
+ * @return {@code true} if the iterator has more elements.
* @see Iterator#hasNext()
*/
@Override
@@ -176,10 +176,10 @@ class RowIteratorImpl implements RowIter
}
/**
- * Returns the next <code>Row</code> in the iteration.
+ * Returns the next {@code Row} in the iteration.
*
- * @return the next <code>Row</code> in the iteration.
- * @throws NoSuchElementException if iteration has no more <code>Row</code>s.
+ * @return the next {@code Row} in the iteration.
+ * @throws NoSuchElementException if iteration has no more {@code Row}s.
* @see Iterator#next()
*/
@Override
@@ -196,7 +196,7 @@ class RowIteratorImpl implements RowIter
class RowImpl implements Row {
/**
- * The underlying <code>QueryResultRow</code>.
+ * The underlying {@code QueryResultRow}.
*/
private final QueryResultRow row;
@@ -212,7 +212,7 @@ class RowIteratorImpl implements RowIter
private Map<String, Integer> propertyMap;
/**
- * Creates a new <code>RowImpl</code> instance based on a SPI result
+ * Creates a new {@code RowImpl} instance based on a SPI result
* row.
*
* @param row the underlying query result row
@@ -228,9 +228,9 @@ class RowIteratorImpl implements RowIter
* names (column names) returned by
* {@link javax.jcr.query.QueryResult#getColumnNames()}.
*
- * @return a <code>Value</code> array.
+ * @return a {@code Value} array.
* @throws RepositoryException if an error occurs while retrieving the
- * values from the <code>Node</code>.
+ * values from the {@code Node}.
*/
@Override
public Value[] getValues() throws RepositoryException {
@@ -254,15 +254,15 @@ class RowIteratorImpl implements RowIter
}
/**
- * Returns the value of the indicated property in this <code>Row</code>.
+ * Returns the value of the indicated property in this {@code Row}.
* <p/>
- * If <code>propertyName</code> is not among the column names of the
- * query result table, an <code>ItemNotFoundException</code> is thrown.
+ * If {@code propertyName} is not among the column names of the
+ * query result table, an {@code ItemNotFoundException} is thrown.
*
- * @return a <code>Value</code>
- * @throws ItemNotFoundException if <code>propertyName</code> is not
+ * @return a {@code Value}
+ * @throws ItemNotFoundException if {@code propertyName} is not
* among the column names of the query result table.
- * @throws RepositoryException if <code>propertyName</code> is not a
+ * @throws RepositoryException if {@code propertyName} is not a
* valid property name.
*/
@Override
@@ -331,11 +331,11 @@ class RowIteratorImpl implements RowIter
}
/**
- * Returns the node with the given <code>id</code> or <code>null</code>
- * if <code>id</code> is <code>null</code>.
+ * Returns the node with the given <code>id</code> or {@code null}
+ * if <code>id</code> is {@code null}.
*
- * @param id a node id or <code>null</code>.
- * @return the node with the given id or <code>null</code>.
+ * @param id a node id or {@code null}.
+ * @return the node with the given id or {@code null}.
* @throws RepositoryException if an error occurs while retrieving the
* node.
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java Tue Sep 6 16:13:51 2011
@@ -28,7 +28,7 @@ public interface ScoreNodeIterator exten
/**
* Returns the score of the node returned by {@link #nextNode()}. In other
* words, this method returns the score value of the next
- * <code>Node</code>.
+ * {@code Node}.
*
* @return the score of the node returned by {@link #nextNode()}.
* @throws java.util.NoSuchElementException if there is no next node.
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/AccessManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/AccessManager.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/AccessManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/AccessManager.java Tue Sep 6 16:13:51 2011
@@ -25,7 +25,7 @@ import javax.jcr.NoSuchWorkspaceExceptio
import javax.jcr.RepositoryException;
/**
- * The <code>AccessManager</code> can be queried to determines whether permission
+ * The {@code AccessManager} can be queried to determines whether permission
* is granted to perform a specific action on a specific item.
*/
public interface AccessManager {
@@ -42,13 +42,13 @@ public interface AccessManager {
String[] REMOVE = new String[] {REMOVE_ACTION};
/**
- * Determines whether the specified <code>permissions</code> are granted
+ * Determines whether the specified {@code permissions} are granted
* on the item with the specified path.
*
* @param parentState The node state of the next existing ancestor.
* @param relPath The relative path pointing to the non-existing target item.
* @param actions An array of actions that need to be checked.
- * @return <code>true</code> if the actions are granted; otherwise <code>false</code>
+ * @return <code>true</code> if the actions are granted; otherwise {@code false}
* @throws ItemNotFoundException if the target item does not exist
* @throws RepositoryException if another error occurs
*/
@@ -56,12 +56,12 @@ public interface AccessManager {
RepositoryException;
/**
- * Determines whether the specified <code>permissions</code> are granted
+ * Determines whether the specified {@code permissions} are granted
* on the item with the specified path.
*
* @param itemState
* @param actions An array of actions that need to be checked.
- * @return <code>true</code> if the actions are granted; otherwise <code>false</code>
+ * @return <code>true</code> if the actions are granted; otherwise {@code false}
* @throws ItemNotFoundException if the target item does not exist
* @throws RepositoryException if another error occurs
*/
@@ -69,7 +69,7 @@ public interface AccessManager {
/**
- * Returns true if the existing item with the given <code>ItemId</code> can
+ * Returns true if the existing item with the given {@code ItemId} can
* be read.
*
* @param itemState
@@ -94,8 +94,8 @@ public interface AccessManager {
* to the given workspace.
*
* @param workspaceName name of workspace
- * @return <code>true</code> if the subject of the current context is
- * granted access to the given workspace; otherwise <code>false</code>.
+ * @return {@code true} if the subject of the current context is
+ * granted access to the given workspace; otherwise {@code false}.
* @throws NoSuchWorkspaceException if a workspace with the given name does not exist.
* @throws RepositoryException if another error occurs
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/SecurityConstants.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/SecurityConstants.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/SecurityConstants.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/SecurityConstants.java Tue Sep 6 16:13:51 2011
@@ -22,8 +22,8 @@ package org.apache.jackrabbit.jcr2spi.se
public interface SecurityConstants {
/**
- * Name of the internal <code>SimpleCredentials</code> attribute where
- * the <code>Subject</code> of the <i>impersonating</i> <code>Session</code>
+ * Name of the internal {@code SimpleCredentials} attribute where
+ * the <code>Subject</code> of the <i>impersonating</i> {@code Session}
* is stored.
*
* @see javax.jcr.Session#impersonate(javax.jcr.Credentials)
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java Tue Sep 6 16:13:51 2011
@@ -19,11 +19,8 @@ package org.apache.jackrabbit.jcr2spi.st
import java.util.HashSet;
import java.util.Set;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- * <code>AbstractItemStateFactory</code>...
+ * {@code AbstractItemStateFactory}...
*/
public abstract class AbstractItemStateFactory implements ItemStateFactory {
private final Set<ItemStateCreationListener> creationListeners = new HashSet<ItemStateCreationListener>();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java Tue Sep 6 16:13:51 2011
@@ -191,7 +191,7 @@ public class ChangeLog {
}
/**
- * @return true if no <code>operations</code> are present.
+ * @return true if no {@code operations} are present.
*/
public boolean isEmpty() {
return operations.isEmpty();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java Tue Sep 6 16:13:51 2011
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <code>ItemState</code> represents the state of an <code>Item</code>.
+ * <code>ItemState</code> represents the state of an {@code Item}.
*/
public abstract class ItemState {
@@ -61,8 +61,8 @@ public abstract class ItemState {
private final transient Collection<ItemStateLifeCycleListener> listeners = new WeakIdentityCollection(5);
/**
- * The <code>ItemStateFactory</code> which is used to create new
- * <code>ItemState</code> instances.
+ * The {@code ItemStateFactory} which is used to create new
+ * {@code ItemState} instances.
*/
final ItemStateFactory isf;
@@ -130,16 +130,16 @@ public abstract class ItemState {
//----------------------------------------------------------< ItemState >---
/**
- * The <code>HierarchyEntry</code> corresponding to this <code>ItemState</code>.
+ * The <code>HierarchyEntry</code> corresponding to this {@code ItemState}.
*
- * @return The <code>HierarchyEntry</code> corresponding to this <code>ItemState</code>.
+ * @return The <code>HierarchyEntry</code> corresponding to this {@code ItemState}.
*/
public HierarchyEntry getHierarchyEntry() {
return hierarchyEntry;
}
/**
- * Returns <code>true</code> if this item state is valid and can be accessed.
+ * Returns {@code true} if this item state is valid and can be accessed.
* @return
* @see Status#isValid(int)
* @see Status#isStale(int)
@@ -263,7 +263,7 @@ public abstract class ItemState {
/**
* Merge all data from the given state into this state. If
- * '<code>keepChanges</code>' is true, transient modifications present on
+ * '{@code keepChanges}' is true, transient modifications present on
* this state are not touched. Otherwise this state is completely reset
* according to the given other state.
*
@@ -282,7 +282,7 @@ public abstract class ItemState {
public abstract boolean revert();
/**
- * Add an <code>ItemStateLifeCycleListener</code>
+ * Add an {@code ItemStateLifeCycleListener}
*
* @param listener the new listener to be informed on modifications
*/
@@ -293,7 +293,7 @@ public abstract class ItemState {
}
/**
- * Remove an <code>ItemStateLifeCycleListener</code>
+ * Remove an {@code ItemStateLifeCycleListener}
*
* @param listener an existing listener
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateCreationListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateCreationListener.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateCreationListener.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateCreationListener.java Tue Sep 6 16:13:51 2011
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.jcr2spi.state;
/**
- * <code>ItemStateCreationListener</code>...
+ * {@code ItemStateCreationListener}...
*/
public interface ItemStateCreationListener extends ItemStateLifeCycleListener {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateFactory.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateFactory.java Tue Sep 6 16:13:51 2011
@@ -28,9 +28,9 @@ import javax.jcr.ItemNotFoundException;
import java.util.Iterator;
/**
- * <code>ItemStateFactory</code> provides methods to create child
- * <code>NodeState</code>s and <code>PropertyState</code>s for a given
- * <code>NodeState</code>.
+ * {@code ItemStateFactory} provides methods to create child
+ * <code>NodeState</code>s and {@code PropertyState}s for a given
+ * {@code NodeState}.
*/
public interface ItemStateFactory {
@@ -43,65 +43,65 @@ public interface ItemStateFactory {
NodeState createRootState(NodeEntry entry) throws ItemNotFoundException, RepositoryException;
/**
- * Creates the child <code>NodeState</code> with the given
- * <code>nodeId</code>.
+ * Creates the child {@code NodeState} with the given
+ * {@code nodeId}.
*
- * @param nodeId the id of the <code>NodeState</code> to create.
- * @param entry the <code>HierarchyEntry</code> the new state should
+ * @param nodeId the id of the {@code NodeState} to create.
+ * @param entry the {@code HierarchyEntry} the new state should
* be attached to.
- * @return the created <code>NodeState</code>.
- * @throws ItemNotFoundException if there is no such <code>NodeState</code>.
- * @throws RepositoryException if an error occurs while retrieving the <code>NodeState</code>.
+ * @return the created {@code NodeState}.
+ * @throws ItemNotFoundException if there is no such {@code NodeState}.
+ * @throws RepositoryException if an error occurs while retrieving the {@code NodeState}.
*/
NodeState createNodeState(NodeId nodeId, NodeEntry entry) throws ItemNotFoundException, RepositoryException;
/**
- * Tries to retrieve the <code>NodeState</code> with the given <code>NodeId</code>
+ * Tries to retrieve the <code>NodeState</code> with the given {@code NodeId}
* and if the state exists, fills in the NodeEntries missing between the
- * last known NodeEntry marked by <code>anyParent</code>.
+ * last known NodeEntry marked by {@code anyParent}.
*
* @param nodeId
* @param anyParent
- * @return the created <code>NodeState</code>.
- * @throws ItemNotFoundException if there is no such <code>NodeState</code>.
- * @throws RepositoryException if an error occurs while retrieving the <code>NodeState</code>.
+ * @return the created {@code NodeState}.
+ * @throws ItemNotFoundException if there is no such {@code NodeState}.
+ * @throws RepositoryException if an error occurs while retrieving the {@code NodeState}.
*/
NodeState createDeepNodeState(NodeId nodeId, NodeEntry anyParent) throws ItemNotFoundException, RepositoryException;
/**
- * Creates the <code>PropertyState</code> with the given
- * <code>propertyId</code>.
+ * Creates the {@code PropertyState} with the given
+ * {@code propertyId}.
*
- * @param propertyId the id of the <code>PropertyState</code> to create.
- * @param entry the <code>HierarchyEntry</code> the new state should
+ * @param propertyId the id of the {@code PropertyState} to create.
+ * @param entry the {@code HierarchyEntry} the new state should
* be attached to.
- * @return the created <code>PropertyState</code>.
- * @throws ItemNotFoundException if there is no such <code>PropertyState</code>.
+ * @return the created {@code PropertyState}.
+ * @throws ItemNotFoundException if there is no such {@code PropertyState}.
* @throws RepositoryException if an error occurs while retrieving the
- * <code>PropertyState</code>.
+ * {@code PropertyState}.
*/
PropertyState createPropertyState(PropertyId propertyId, PropertyEntry entry) throws ItemNotFoundException,
RepositoryException;
/**
- * Tries to retrieve the <code>PropertyState</code> with the given <code>PropertyId</code>
+ * Tries to retrieve the <code>PropertyState</code> with the given {@code PropertyId}
* and if the state exists, fills in the HierarchyEntries missing between the
- * last known NodeEntry marked by <code>anyParent</code>.
+ * last known NodeEntry marked by {@code anyParent}.
*
* @param propertyId
* @param anyParent
* @return
- * @throws ItemNotFoundException if there is no such <code>NodeState</code>.
- * @throws RepositoryException if an error occurs while retrieving the <code>NodeState</code>.
+ * @throws ItemNotFoundException if there is no such {@code NodeState}.
+ * @throws RepositoryException if an error occurs while retrieving the {@code NodeState}.
*/
PropertyState createDeepPropertyState(PropertyId propertyId, NodeEntry anyParent) throws ItemNotFoundException,
RepositoryException;
/**
- * Returns an Iterator over <code>ChildInfo</code>s for the given <code>NodeState</code>.
+ * Returns an Iterator over <code>ChildInfo</code>s for the given {@code NodeState}.
*
* @param nodeId
* @throws ItemNotFoundException
@@ -122,14 +122,14 @@ public interface ItemStateFactory {
Iterator<PropertyId> getNodeReferences(NodeState nodeState, Name propertyName, boolean weak);
/**
- * Adds the given <code>ItemStateCreationListener</code>.
+ * Adds the given {@code ItemStateCreationListener}.
*
* @param listener
*/
void addCreationListener(ItemStateCreationListener listener);
/**
- * Removes the given <code>ItemStateCreationListener</code>.
+ * Removes the given {@code ItemStateCreationListener}.
*
* @param listener
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateLifeCycleListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateLifeCycleListener.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateLifeCycleListener.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateLifeCycleListener.java Tue Sep 6 16:13:51 2011
@@ -17,17 +17,17 @@
package org.apache.jackrabbit.jcr2spi.state;
/**
- * <code>ItemStateLifeCycleListener</code> allows an implementing class to get
+ * {@code ItemStateLifeCycleListener} allows an implementing class to get
* notifications about the life cycle of an item state.
*/
public interface ItemStateLifeCycleListener {
/**
- * Called after an <code>ItemState</code> has changed its status. The new
+ * Called after an {@code ItemState} has changed its status. The new
* status can be retrieved by calling {@link ItemState#getStatus()}.
*
- * @param state the item state, which changed its <code>status</code>.
- * @param previousStatus the previous status of <code>state</code>.
+ * @param state the item state, which changed its {@code status}.
+ * @param previousStatus the previous status of {@code state}.
*/
void statusChanged(ItemState state, int previousStatus);
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java Tue Sep 6 16:13:51 2011
@@ -55,35 +55,35 @@ public class ItemStateValidator {
private static final Logger log = LoggerFactory.getLogger(ItemStateValidator.class);
/**
- * option for <code>{@link #checkAddNode}</code> and
- * <code>{@link #checkRemoveItem}</code> methods:<p/>
+ * option for {@code }{@link #checkAddNode}</code> and
+ * {@code }{@link #checkRemoveItem}</code> methods:<p/>
* check access rights
*/
public static final int CHECK_ACCESS = 1;
/**
- * option for <code>{@link #checkAddNode}</code> and
- * <code>{@link #checkRemoveItem}</code> methods:<p/>
+ * option for {@code }{@link #checkAddNode}</code> and
+ * {@code }{@link #checkRemoveItem}</code> methods:<p/>
* check lock status
*/
public static final int CHECK_LOCK = 2;
/**
- * option for <code>{@link #checkAddNode}</code> and
- * <code>{@link #checkRemoveItem}</code> methods:<p/>
+ * option for {@code }{@link #checkAddNode}</code> and
+ * {@code }{@link #checkRemoveItem}</code> methods:<p/>
* check checked-out status
*/
public static final int CHECK_VERSIONING = 4;
/**
- * option for <code>{@link #checkAddNode}</code> and
- * <code>{@link #checkRemoveItem}</code> methods:<p/>
+ * option for {@code }{@link #checkAddNode}</code> and
+ * {@code }{@link #checkRemoveItem}</code> methods:<p/>
* check constraints defined in node type
*/
public static final int CHECK_CONSTRAINTS = 8;
/**
- * option for <code>{@link #checkRemoveItem}</code> method:<p/>
+ * option for {@code }{@link #checkRemoveItem}</code> method:<p/>
* check that target node is not being referenced
*/
public static final int CHECK_COLLISION = 32;
@@ -98,7 +98,7 @@ public class ItemStateValidator {
private final PathFactory pathFactory;
/**
- * Creates a new <code>ItemStateValidator</code> instance.
+ * Creates a new {@code ItemStateValidator} instance.
*
* @param mgrProvider manager provider
*/
@@ -110,12 +110,12 @@ public class ItemStateValidator {
//-------------------------------------------------< misc. helper methods >
/**
- * Fail safe translation of internal <code>ItemState</code> to JCR path for use
+ * Fail safe translation of internal {@code ItemState} to JCR path for use
* in error messages etc.
*
* @param itemState
* @return JCR path
- * @see LogUtil#safeGetJCRPath(ItemState,org.apache.jackrabbit.spi.commons.conversion.PathResolver)
+ * @see LogUtil#safeGetJCRPath(ItemState, org.apache.jackrabbit.spi.commons.conversion.PathResolver)
*/
private String safeGetJCRPath(ItemState itemState) {
return LogUtil.safeGetJCRPath(itemState, mgrProvider.getPathResolver());
@@ -166,16 +166,16 @@ public class ItemStateValidator {
* @param options bit-wise OR ed flags specifying the checks that should be
* performed; any combination of the following constants:
* <ul>
- * <li><code>{@link #CHECK_ACCESS}</code>: make sure current session is
+ * <li>{@code }{@link #CHECK_ACCESS}</code>: make sure current session is
* granted read access on parent node and can add a child node with the
* given name.</li>
- * <li><code>{@link #CHECK_LOCK}</code>: make sure there's no foreign lock
+ * <li>{@code }{@link #CHECK_LOCK}</code>: make sure there's no foreign lock
* on parent node</li>
- * <li><code>{@link #CHECK_VERSIONING}</code>: make sure parent node is
+ * <li>{@code }{@link #CHECK_VERSIONING}</code>: make sure parent node is
* checked-out</li>
- * <li><code>{@link #CHECK_CONSTRAINTS}</code>: make sure no node type
+ * <li>{@code }{@link #CHECK_CONSTRAINTS}</code>: make sure no node type
* constraints would be violated</li>
- * <li><code>{@link #CHECK_COLLISION}</code>: check for collision with
+ * <li>{@code }{@link #CHECK_COLLISION}</code>: check for collision with
* existing properties or nodes</li>
* </ul>
*
@@ -201,16 +201,16 @@ public class ItemStateValidator {
* @param options bit-wise OR ed flags specifying the checks that should be
* performed; any combination of the following constants:
* <ul>
- * <li><code>{@link #CHECK_ACCESS}</code>: make sure current session is
+ * <li>{@code }{@link #CHECK_ACCESS}</code>: make sure current session is
* granted read access on parent node and can add a child node with the
* given name.</li>
- * <li><code>{@link #CHECK_LOCK}</code>: make sure there's no foreign lock
+ * <li>{@code }{@link #CHECK_LOCK}</code>: make sure there's no foreign lock
* on parent node</li>
- * <li><code>{@link #CHECK_VERSIONING}</code>: make sure parent node is
+ * <li>{@code }{@link #CHECK_VERSIONING}</code>: make sure parent node is
* checked-out</li>
- * <li><code>{@link #CHECK_CONSTRAINTS}</code>: make sure no node type
+ * <li>{@code }{@link #CHECK_CONSTRAINTS}</code>: make sure no node type
* constraints would be violated</li>
- * <li><code>{@link #CHECK_COLLISION}</code>: check for collision with
+ * <li>{@code }{@link #CHECK_COLLISION}</code>: check for collision with
* existing properties or nodes</li>
* </ul>
*
@@ -274,8 +274,8 @@ public class ItemStateValidator {
}
/**
- * Checks if adding a child node called <code>nodeName</code> of node type
- * <code>nodeTypeName</code> to the given parent node is allowed in the
+ * Checks if adding a child node called {@code nodeName} of node type
+ * {@code nodeTypeName} to the given parent node is allowed in the
* current context.
*
* @param parentState
@@ -284,16 +284,16 @@ public class ItemStateValidator {
* @param options bit-wise OR ed flags specifying the checks that should be
* performed; any combination of the following constants:
* <ul>
- * <li><code>{@link #CHECK_ACCESS}</code>: make sure current session is
+ * <li>{@code }{@link #CHECK_ACCESS}</code>: make sure current session is
* granted read access on parent node and can add a child node with the
* given name.</li>
- * <li><code>{@link #CHECK_LOCK}</code>: make sure there's no foreign lock
+ * <li>{@code }{@link #CHECK_LOCK}</code>: make sure there's no foreign lock
* on parent node</li>
- * <li><code>{@link #CHECK_VERSIONING}</code>: make sure parent node is
+ * <li>{@code }{@link #CHECK_VERSIONING}</code>: make sure parent node is
* checked-out</li>
- * <li><code>{@link #CHECK_CONSTRAINTS}</code>: make sure no node type
+ * <li>{@code }{@link #CHECK_CONSTRAINTS}</code>: make sure no node type
* constraints would be violated</li>
- * <li><code>{@link #CHECK_COLLISION}</code>: check for collision with
+ * <li>{@code }{@link #CHECK_COLLISION}</code>: check for collision with
* existing properties or nodes</li>
* </ul>
*
@@ -341,14 +341,14 @@ public class ItemStateValidator {
* @param options bit-wise OR ed flags specifying the checks that should be
* performed; any combination of the following constants:
* <ul>
- * <li><code>{@link #CHECK_ACCESS}</code>: make sure
+ * <li>{@code }{@link #CHECK_ACCESS}</code>: make sure
* current session is granted read access on parent
* and remove privilege on target node</li>
- * <li><code>{@link #CHECK_LOCK}</code>: make sure
+ * <li>{@code }{@link #CHECK_LOCK}</code>: make sure
* there's no foreign lock on parent node</li>
- * <li><code>{@link #CHECK_VERSIONING}</code>: make sure
+ * <li>{@code }{@link #CHECK_VERSIONING}</code>: make sure
* parent node is checked-out</li>
- * <li><code>{@link #CHECK_CONSTRAINTS}</code>:
+ * <li>{@code }{@link #CHECK_CONSTRAINTS}</code>:
* make sure no node type constraints would be violated</li>
* </ul>
* @throws ConstraintViolationException
@@ -390,7 +390,7 @@ public class ItemStateValidator {
/**
* Verifies that the item represented by the given state is checked-out;
- * throws a <code>VersionException</code> if that's not the case.
+ * throws a {@code VersionException} if that's not the case.
* <p/>
* A node is considered <i>checked-out</i> if it is versionable and
* checked-out, or is non-versionable but its nearest versionable ancestor
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Tue Sep 6 16:13:51 2011
@@ -38,7 +38,7 @@ import java.util.Iterator;
import java.util.List;
/**
- * <code>NodeState</code> represents the state of a <code>Node</code>.
+ * <code>NodeState</code> represents the state of a {@code Node}.
*/
public class NodeState extends ItemState {
private static final Logger log = LoggerFactory.getLogger(NodeState.class);
@@ -167,7 +167,7 @@ public class NodeState extends ItemState
//----------------------------------------------------------< NodeState >---
/**
- * @return The <code>NodeEntry</code> associated with this state.
+ * @return The {@code NodeEntry} associated with this state.
*/
public NodeEntry getNodeEntry() {
return (NodeEntry) getHierarchyEntry();
@@ -183,7 +183,7 @@ public class NodeState extends ItemState
}
/**
- * @return the unique ID of this node state or <code>null</code> if this
+ * @return the unique ID of this node state or {@code null} if this
* node cannot be identified with a unique ID.
*/
public String getUniqueID() {
@@ -191,9 +191,9 @@ public class NodeState extends ItemState
}
/**
- * Returns true, if this <code>NodeState</code> represent the root node.
+ * Returns true, if this {@code NodeState} represent the root node.
*
- * @return true if this <code>NodeState</code> represent the root node.
+ * @return true if this {@code NodeState} represent the root node.
*/
public boolean isRoot() {
return getHierarchyEntry().getParent() == null;
@@ -229,7 +229,7 @@ public class NodeState extends ItemState
}
/**
- * Return all nodetype names that are defined to this <code>NodeState</code>
+ * Return all nodetype names that are defined to this {@code NodeState}
* including the primary nodetype and the mixins.
*
* @return array of NodeType names
@@ -306,7 +306,7 @@ public class NodeState extends ItemState
* this node.
*
* @param propertyName name filter of referring properties to be returned;
- * if <code>null</code> then all references are returned.
+ * if {@code null} then all references are returned.
* @param weak Boolean flag indicating whether weak references should be
* returned or not.
* @return reference property identifiers
@@ -317,13 +317,13 @@ public class NodeState extends ItemState
/**
* Utility
- * 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 name <code>Name</code> object specifying a node name.
+ * @param name {@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}.
*/
public boolean hasChildNodeEntry(Name name, int index) {
return getNodeEntry().hasNodeEntry(name, index);
@@ -331,13 +331,13 @@ public class NodeState extends ItemState
/**
* Utility
- * Returns the child <code>NodeState</code> with the specified name
- * and index. Throws <code>ItemNotFoundException</code> if there's no
+ * Returns the child {@code NodeState} with the specified name
+ * and index. Throws {@code ItemNotFoundException} if there's no
* matching, valid 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>NodeState</code> with the specified name and index
+ * @return The {@code NodeState} with the specified name and index
* @throws ItemNotFoundException
* @throws RepositoryException
*/
@@ -354,9 +354,9 @@ public class NodeState extends ItemState
/**
* Utility
*
- * @param propName <code>Name</code> object specifying a property name
- * @return <code>true</code> if there is a valid property entry with the
- * specified <code>Name</code>.
+ * @param propName {@code Name} object specifying a property name
+ * @return {@code true} if there is a valid property entry with the
+ * specified {@code Name}.
*/
public boolean hasPropertyName(Name propName) {
return getNodeEntry().hasPropertyEntry(propName);
@@ -364,7 +364,7 @@ public class NodeState extends ItemState
/**
* Utility method that returns the property state with the given name or
- * throws an <code>ItemNotFoundException</code> if no matching, valid
+ * throws an {@code ItemNotFoundException} if no matching, valid
* property could be found.
*
* @param propertyName The name of the property state to return.
@@ -386,15 +386,15 @@ public class NodeState extends ItemState
}
/**
- * Reorders the child node <code>insertNode</code> before the child node
- * <code>beforeNode</code>.
+ * Reorders the child node {@code insertNode} before the child node
+ * {@code beforeNode}.
*
* @param insertNode the child node to reorder.
* @param beforeNode the child node where to insert the node before. If
- * <code>null</code> the child node <code>insertNode</code> is moved to the
+ * <code>null</code> the child node {@code insertNode} is moved to the
* end of the child node entries.
- * @throws ItemNotFoundException if <code>insertNode</code> or
- * <code>beforeNode</code> is not a child node of this <code>NodeState</code>.
+ * @throws ItemNotFoundException if {@code insertNode} or
+ * <code>beforeNode</code> is not a child node of this {@code NodeState}.
*/
synchronized void reorderChildNodeEntries(NodeState insertNode, NodeState beforeNode)
throws RepositoryException {
@@ -407,13 +407,13 @@ public class NodeState extends ItemState
}
/**
- * Moves a <code>NodeEntry</code> to a new parent. If the new parent
- * is this <code>NodeState</code>, the child state is renamed and moved
+ * Moves a {@code NodeEntry} to a new parent. If the new parent
+ * is this {@code NodeState}, the child state is renamed and moved
* to the end of the child entries collection.
*
* @param newParent
* @param childState
- * @param newName <code>Name</code> object specifying the entry's new name
+ * @param newName {@code Name} object specifying the entry's new name
* @throws RepositoryException if the given child state is not a child
* of this node state.
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java Tue Sep 6 16:13:51 2011
@@ -32,7 +32,7 @@ import javax.jcr.ValueFormatException;
import javax.jcr.nodetype.ConstraintViolationException;
/**
- * <code>PropertyState</code> represents the state of a <code>Property</code>.
+ * <code>PropertyState</code> represents the state of a {@code Property}.
*/
public class PropertyState extends ItemState {
private static final Logger log = LoggerFactory.getLogger(PropertyState.class);
@@ -115,7 +115,7 @@ public class PropertyState extends ItemS
}
/**
- * If <code>keepChanges</code> is true, this method only compares the existing
+ * If {@code keepChanges} is true, this method only compares the existing
* values with the values from 'another' and returns true, if the underlying
* persistent state is different to the stored persistent values. Otherwise
* the transient changes will be discarded.
@@ -188,7 +188,7 @@ public class PropertyState extends ItemS
/**
* Returns the {@link QPropertyDefinition definition} defined for this
* property state. Note that the definition has been set upon creation of
- * this <code>PropertyState</code>.
+ * this {@code PropertyState}.
*
* @return definition of this state
* @throws RepositoryException If an error occurs.
@@ -305,7 +305,7 @@ public class PropertyState extends ItemS
*
* @param p1
* @param p2
- * @return if the 2 <code>PropertyState</code>s are different in terms of
+ * @return if the 2 {@code PropertyState}s are different in terms of
* type and/or values.
*/
private static boolean diff(PropertyData p1, PropertyData p2) {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Tue Sep 6 16:13:51 2011
@@ -63,7 +63,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <code>SessionItemStateManager</code> ...
+ * {@code SessionItemStateManager} ...
*/
public class SessionItemStateManager extends TransientOperationVisitor implements UpdateableItemStateManager {
private static final Logger log = LoggerFactory.getLogger(SessionItemStateManager.class);
@@ -85,7 +85,7 @@ public class SessionItemStateManager ext
private final SessionImpl mgrProvider;
/**
- * Creates a new <code>SessionItemStateManager</code> instance.
+ * Creates a new {@code SessionItemStateManager} instance.
*
* @param workspaceItemStateMgr
* @param validator
@@ -106,16 +106,16 @@ public class SessionItemStateManager ext
}
/**
- * @return <code>true</code> if this manager has any transient state;
- * <code>false</code> otherwise.
+ * @return {@code true} if this manager has any transient state;
+ * {@code false} otherwise.
*/
public boolean hasPendingChanges() {
return transientStateMgr.hasPendingChanges();
}
/**
- * This will save <code>state</code> and all descendants items of
- * <code>state</code> that are transiently modified in a single step. If
+ * This will save {@code state} and all descendants items of
+ * {@code state} that are transiently modified in a single step. If
* this operation fails, no item will have been saved.
*
* @param state the root state of the update operation
@@ -139,12 +139,12 @@ public class SessionItemStateManager ext
}
/**
- * This will undo all changes made to <code>state</code> and descendant
- * items of <code>state</code> inside this item state manager.
+ * This will undo all changes made to {@code state} and descendant
+ * items of {@code state} inside this item state manager.
*
* @param itemState the root state of the cancel operation.
* @throws ConstraintViolationException
- * @throws RepositoryException if undoing changes made to <code>state</code>
+ * @throws RepositoryException if undoing changes made to {@code state}
* and descendant items is not a closed set of changes. That is, at least
* another item needs to be canceled as well in another sub-tree.
*/
@@ -578,7 +578,7 @@ public class SessionItemStateManager ext
/**
* @param qNames
* @param factory
- * @return An array of QValue objects from the given <code>Name</code>s
+ * @return An array of QValue objects from the given {@code Name}s
*/
private static QValue[] getQValues(Name[] qNames, QValueFactory factory) throws RepositoryException {
QValue[] ret = new QValue[qNames.length];
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/Status.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/Status.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/Status.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/Status.java Tue Sep 6 16:13:51 2011
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.jcr2spi.state;
/**
- * <code>Status</code>...
+ * {@code Status}...
*/
public final class Status {
@@ -84,7 +84,7 @@ public final class Status {
};
/**
- * Returns <code>true</code> if the given status is a terminal status, i.e.
+ * Returns {@code true} if the given status is a terminal status, i.e.
* the given status one of:
* <ul>
* <li>{@link #REMOVED}</li>
@@ -99,7 +99,7 @@ public final class Status {
}
/**
- * Returns <code>true</code> if this item state is valid, that is its status
+ * Returns {@code true} if this item state is valid, that is its status
* is one of:
* <ul>
* <li>{@link #EXISTING}</li>
@@ -115,14 +115,14 @@ public final class Status {
}
/**
- * Returns <code>true</code> if <code>status</code> is one of:
+ * Returns <code>true</code> if {@code status} is one of:
* <ul>
* <li>{@link #STALE_DESTROYED}</li>
* <li>{@link #STALE_MODIFIED}</li>
* </ul>
*
* @param status the status to check.
- * @return <code>true</code> if <code>status</code> indicates that an item
+ * @return <code>true</code> if {@code status} indicates that an item
* state is stale.
*/
public static boolean isStale(int status) {
@@ -130,7 +130,7 @@ public final class Status {
}
/**
- * Returns <code>true</code> if <code>status</code> is one of:
+ * Returns <code>true</code> if {@code status} is one of:
* <ul>
* <li>{@link #EXISTING_MODIFIED}</li>
* <li>{@link #EXISTING_REMOVED}</li>
@@ -138,7 +138,7 @@ public final class Status {
* </ul>
*
* @param status the status to check.
- * @return <code>true</code> if <code>status</code> indicates that an item
+ * @return <code>true</code> if {@code status} indicates that an item
* state is transiently modified.
*/
public static boolean isTransient(int status) {
@@ -147,13 +147,13 @@ public final class Status {
/**
* Returns true, if the status of an item state can be changed from
- * <code>oldStatus</code> to <code>newStatus</code>, and false if the
+ * <code>oldStatus</code> to {@code newStatus}, and false if the
* change is illegal or if any of the given status flags is illegal.
*
* @param oldStatus
* @param newStatus
- * @return true if a status change from <code>oldStatus</code> to
- * <code>newStatus</code> is allowed or if the two status are the same.
+ * @return true if a status change from {@code oldStatus} to
+ * {@code newStatus} is allowed or if the two status are the same.
*/
public static boolean isValidStatusChange(int oldStatus, int newStatus) {
if (oldStatus == newStatus) {
@@ -205,7 +205,7 @@ public final class Status {
}
/**
- * Returns the given <code>newStatusHint</code> unless the new status
+ * Returns the given {@code newStatusHint} unless the new status
* collides with a pending modification or removal which results in a
* stale item state.
*
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java Tue Sep 6 16:13:51 2011
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <code>TransientISFactory</code>...
+ * {@code TransientISFactory}...
*/
public final class TransientISFactory extends AbstractItemStateFactory implements TransientItemStateFactory,
ItemStateCreationListener {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateFactory.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateFactory.java Tue Sep 6 16:13:51 2011
@@ -26,30 +26,30 @@ import org.apache.jackrabbit.spi.QValue;
import javax.jcr.RepositoryException;
/**
- * <code>TransientItemStateFactory</code> extends the item state factory and
+ * {@code TransientItemStateFactory} extends the item state factory and
* adds new methods for creating node states and property states that are new.
*/
public interface TransientItemStateFactory extends ItemStateFactory {
/**
- * Creates a transient child <code>NodeState</code> with the given
- * <code>name</code>.
+ * Creates a transient child {@code NodeState} with the given
+ * {@code name}.
*
* @param entry
* @param nodeTypeName
* @param definition
- * @return the created <code>NodeState</code>
+ * @return the created {@code NodeState}
*/
NodeState createNewNodeState(NodeEntry entry, Name nodeTypeName, QNodeDefinition definition);
/**
- * Creates a transient <code>PropertyState</code>.
+ * Creates a transient {@code PropertyState}.
*
* @param entry
* @param definition
* @param values
* @param propertyType
- * @return the created <code>PropertyState</code>.
+ * @return the created {@code PropertyState}.
*/
PropertyState createNewPropertyState(PropertyEntry entry, QPropertyDefinition definition, QValue[] values,
int propertyType) throws RepositoryException;
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java Tue Sep 6 16:13:51 2011
@@ -39,7 +39,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
/**
- * <code>TransientItemStateManager</code> adds support for transient changes on
+ * {@code TransientItemStateManager} adds support for transient changes on
* {@link ItemState}s and also provides methods to create new item states.
* While all other modifications can be invoked on the item state instances itself,
* creating a new node state is done using
@@ -95,14 +95,14 @@ public class TransientItemStateManager i
}
/**
- * @return <code>true</code> if this transient ISM has pending changes.
+ * @return {@code true} if this transient ISM has pending changes.
*/
boolean hasPendingChanges() {
return !operations.isEmpty();
}
/**
- * Create the change log for the tree starting at <code>target</code>. This
+ * Create the change log for the tree starting at {@code target}. This
* includes a check if the ChangeLog to be created is totally 'self-contained'
* and independent; items within the scope of this update operation (i.e.
* below the target) must not have dependencies outside of this tree (e.g.
@@ -111,13 +111,13 @@ public class TransientItemStateManager i
*
* @param target
* @param throwOnStale Throws InvalidItemStateException if either the given
- * <code>ItemState</code> or any of its descendants is stale and the flag is true.
+ * {@code ItemState} or any of its descendants is stale and the flag is true.
* @return
- * @throws InvalidItemStateException if a stale <code>ItemState</code> is
- * encountered while traversing the state hierarchy. The <code>changeLog</code>
+ * @throws InvalidItemStateException if a stale {@code ItemState} is
+ * encountered while traversing the state hierarchy. The {@code changeLog}
* might have been populated with some transient item states. A client should
- * therefore not reuse the <code>changeLog</code> if such an exception is thrown.
- * @throws RepositoryException if <code>state</code> is a new item state.
+ * therefore not reuse the {@code changeLog} if such an exception is thrown.
+ * @throws RepositoryException if {@code state} is a new item state.
*/
ChangeLog getChangeLog(ItemState target, boolean throwOnStale) throws RepositoryException {
// fail-fast test: check status of this item's state
@@ -208,9 +208,9 @@ public class TransientItemStateManager i
* Creates a new transient {@link NodeState} that does not overlay any other
* {@link NodeState}.
*
- * @param nodeName the name of the <code>NodeState</code> to create.
- * @param uniqueID the uniqueID of the <code>NodeState</code> to create or
- * <code>null</code> if the created <code>NodeState</code>
+ * @param nodeName the name of the {@code NodeState} to create.
+ * @param uniqueID the uniqueID of the {@code NodeState} to create or
+ * <code>null</code> if the created {@code NodeState}
* cannot be identified by a unique ID.
* @param nodeTypeName name of the node type of the new node state.
* @param definition The definition for the new node state.
@@ -231,14 +231,14 @@ public class TransientItemStateManager i
}
/**
- * Creates a new transient property state for a given <code>parent</code>
+ * Creates a new transient property state for a given {@code parent}
* node state.
*
* @param propName the name of the property state to create.
* @param parent the node state where to the new property is added.
* @param definition
* @return the created property state.
- * @throws ItemExistsException if <code>parent</code> already has a property
+ * @throws ItemExistsException if {@code parent} already has a property
* with the given name.
* @throws ConstraintViolationException
* @throws RepositoryException
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/UpdateableItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/UpdateableItemStateManager.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/UpdateableItemStateManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/UpdateableItemStateManager.java Tue Sep 6 16:13:51 2011
@@ -21,7 +21,7 @@ import org.apache.jackrabbit.jcr2spi.ope
import javax.jcr.RepositoryException;
/**
- * An <code>ItemStateManager</code> that deals with state modifications.
+ * An {@code ItemStateManager} that deals with state modifications.
*/
public interface UpdateableItemStateManager {
@@ -43,7 +43,7 @@ public interface UpdateableItemStateMana
void execute(ChangeLog changes) throws RepositoryException;
/**
- * Disposes this <code>UpdateableItemStateManager</code> and frees resources.
+ * Disposes this {@code UpdateableItemStateManager} and frees resources.
*/
void dispose();
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java Tue Sep 6 16:13:51 2011
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <code>WorkspaceItemStateFactory</code>...
+ * {@code WorkspaceItemStateFactory}...
*/
public class WorkspaceItemStateFactory extends AbstractItemStateFactory {
private static final Logger log = LoggerFactory.getLogger(WorkspaceItemStateFactory.class);
@@ -79,7 +79,7 @@ public class WorkspaceItemStateFactory e
}
/**
- * Creates the node with information retrieved from the <code>RepositoryService</code>.
+ * Creates the node with information retrieved from the {@code RepositoryService}.
*/
@Override
public NodeState createNodeState(NodeId nodeId, NodeEntry entry) throws
@@ -108,7 +108,7 @@ public class WorkspaceItemStateFactory e
}
/**
- * Creates the node with information retrieved from the <code>RepositoryService</code>.
+ * Creates the node with information retrieved from the {@code RepositoryService}.
* Intermediate entries are created as needed.
*/
@Override
@@ -159,7 +159,7 @@ public class WorkspaceItemStateFactory e
}
/**
- * Creates the PropertyState with information retrieved from the <code>RepositoryService</code>.
+ * Creates the PropertyState with information retrieved from the {@code RepositoryService}.
*/
@Override
public PropertyState createPropertyState(PropertyId propertyId, PropertyEntry entry)
@@ -189,7 +189,7 @@ public class WorkspaceItemStateFactory e
}
/**
- * Creates the PropertyState with information retrieved from the <code>RepositoryService</code>.
+ * Creates the PropertyState with information retrieved from the {@code RepositoryService}.
* Intermediate entries are created as needed.
*/
@Override
@@ -269,9 +269,9 @@ public class WorkspaceItemStateFactory e
//------------------------------------------------------------< private >---
/**
- * Returns the first item in the iterator if it exists. Otherwise returns <code>null</code>.
- * If <code>cache</code> is not <code>null</code>, caches all items by the given
- * <code>generation</code>.
+ * Returns the first item in the iterator if it exists. Otherwise returns {@code null}.
+ * If <code>cache</code> is not {@code null}, caches all items by the given
+ * {@code generation}.
*/
private static ItemInfo first(Iterator<? extends ItemInfo> infos, ItemInfoCache cache, long generation) {
ItemInfo first = null;
@@ -292,11 +292,11 @@ public class WorkspaceItemStateFactory e
}
/**
- * Create the node state with the information from <code>info</code>.
+ * Create the node state with the information from {@code info}.
*
- * @param info the <code>NodeInfo</code> to use to create the <code>NodeState</code>.
+ * @param info the <code>NodeInfo</code> to use to create the {@code NodeState}.
* @param entry the hierarchy entry for of this state
- * @return the new <code>NodeState</code>.
+ * @return the new {@code NodeState}.
* @throws ItemNotFoundException
* @throws RepositoryException
*/
@@ -361,11 +361,11 @@ public class WorkspaceItemStateFactory e
}
/**
- * Create the property state with the information from <code>info</code>.
+ * Create the property state with the information from {@code info}.
*
- * @param info the <code>PropertyInfo</code> to use to create the <code>PropertyState</code>.
+ * @param info the <code>PropertyInfo</code> to use to create the {@code PropertyState}.
* @param entry the hierarchy entry for of this state
- * @return the new <code>PropertyState</code>.
+ * @return the new {@code PropertyState}.
* @throws RepositoryException
*/
private PropertyState createPropertyState(PropertyInfo info, PropertyEntry entry)
@@ -402,12 +402,12 @@ public class WorkspaceItemStateFactory e
}
/**
- * Create missing hierarchy entries on the path from <code>anyParent</code> to the path
- * of the <code>itemInfo</code>.
+ * Create missing hierarchy entries on the path from {@code anyParent} to the path
+ * of the {@code itemInfo}.
*
* @param info
* @param anyParent
- * @return the hierarchy entry for <code>info</code>
+ * @return the hierarchy entry for {@code info}
* @throws RepositoryException
*/
private HierarchyEntry createHierarchyEntries(ItemInfo info, NodeEntry anyParent)
@@ -453,7 +453,7 @@ public class WorkspaceItemStateFactory e
}
/**
- * Returns true if <code>cache</code> is not <code>null</code> and
+ * Returns true if <code>cache</code> is not {@code null} and
* the cached entry is up to date.
* @param cacheEntry
* @param entry
@@ -467,7 +467,7 @@ public class WorkspaceItemStateFactory e
}
/**
- * Returns true if <code>cache</code> is not <code>null</code> and
+ * Returns true if <code>cache</code> is not {@code null} and
* the cached entry is not up to date.
* @param cacheEntry
* @param entry
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java Tue Sep 6 16:13:51 2011
@@ -29,7 +29,7 @@ import javax.jcr.RepositoryException;
import javax.jcr.NamespaceException;
/**
- * <code>LogUtil</code>...
+ * {@code LogUtil}...
*/
public final class LogUtil {
private static final Logger log = LoggerFactory.getLogger(LogUtil.class);
@@ -40,7 +40,7 @@ public final class LogUtil {
private LogUtil() {}
/**
- * Fail safe conversion of internal <code>Path</code> to JCR path for use in
+ * Fail safe conversion of internal {@code Path} to JCR path for use in
* error messages etc.
*
* @param qPath path to convert
@@ -58,7 +58,7 @@ public final class LogUtil {
}
/**
- * Fail safe conversion of an <code>ItemState</code> to JCR path for use in
+ * Fail safe conversion of an {@code ItemState} to JCR path for use in
* error messages etc.
*
* @param itemState
@@ -75,12 +75,12 @@ public final class LogUtil {
}
/**
- * Fail safe conversion of a <code>Name</code> to a JCR name for use in
+ * Fail safe conversion of a {@code Name} to a JCR name for use in
* error messages etc.
*
* @param qName
* @param nameResolver
- * @return JCR name or String representation of the given <code>Name</code>
+ * @return JCR name or String representation of the given {@code Name}
* in case the resolution fails.
*/
public static String saveGetJCRName(Name qName, NameResolver nameResolver) {
@@ -93,12 +93,12 @@ public final class LogUtil {
}
/**
- * Fail safe conversion of an <code>ItemId</code> to a human readable string
+ * Fail safe conversion of an {@code ItemId} to a human readable string
* resolving the path part of the specified id using the given path resolver.
*
* @param itemId
* @param pathResolver
- * @return a String representation of the given <code>ItemId</code>.
+ * @return a String representation of the given {@code ItemId}.
*/
public static String saveGetIdString(ItemId itemId, PathResolver pathResolver) {
Path p = itemId.getPath();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java Tue Sep 6 16:13:51 2011
@@ -59,7 +59,7 @@ public class ReferenceChangeTracker {
/**
* Store the given uuid mapping for later lookup using
- * <code>#adjustReferences(UpdateableItemStateManager, ItemStateValidator)</code>.
+ * {@code #adjustReferences(UpdateableItemStateManager, ItemStateValidator)}.
*
* @param oldUUID
* @param newUUID
@@ -73,13 +73,13 @@ public class ReferenceChangeTracker {
}
/**
- * Returns the new UUID to which <code>oldUUID</code> has been mapped
- * or <code>null</code> if no such mapping exists.
+ * Returns the new UUID to which {@code oldUUID} has been mapped
+ * or {@code null} if no such mapping exists.
*
- * @param oldReference old uuid represented by the given <code>QValue</code>.
+ * @param oldReference old uuid represented by the given {@code QValue}.
* @param factory
- * @return mapped new QValue of the reference value or <code>null</code> if no such mapping exists
- * @see #mappedUUIDs(String,String)
+ * @return mapped new QValue of the reference value or {@code null} if no such mapping exists
+ * @see #mappedUUIDs(String, String)
*/
public QValue getMappedReference(QValue oldReference, QValueFactory factory) {
QValue remapped = null;
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java Tue Sep 6 16:13:51 2011
@@ -27,7 +27,7 @@ import org.apache.jackrabbit.spi.commons
import javax.jcr.RepositoryException;
/**
- * <code>StateUtility</code>...
+ * {@code StateUtility}...
*/
public final class StateUtility {
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java Tue Sep 6 16:13:51 2011
@@ -52,7 +52,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <code>VersionHistoryImpl</code>...
+ * {@code VersionHistoryImpl}...
*/
public class VersionHistoryImpl extends NodeImpl implements VersionHistory {
private static final Logger log = LoggerFactory.getLogger(VersionHistoryImpl.class);
@@ -366,9 +366,9 @@ public class VersionHistoryImpl extends
}
/**
- * Checks if the specified version belongs to this <code>VersionHistory</code>.
- * This method throws <code>VersionException</code> if {@link Version#getContainingHistory()}
- * is not the same item than this <code>VersionHistory</code>.
+ * Checks if the specified version belongs to this {@code VersionHistory}.
+ * This method throws {@code VersionException} if {@link Version#getContainingHistory()}
+ * is not the same item than this {@code VersionHistory}.
*
* @param version
* @throws javax.jcr.version.VersionException
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java?rev=1165743&r1=1165742&r2=1165743&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java Tue Sep 6 16:13:51 2011
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * <code>VersionImpl</code>...
+ * {@code VersionImpl}...
*/
public class VersionImpl extends NodeImpl implements Version {
private static final Logger log = LoggerFactory.getLogger(VersionImpl.class);