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 2010/02/02 17:43:58 UTC
svn commit: r905699 [1/3] - in /jackrabbit/trunk/jackrabbit-jcr2spi/src:
main/java/org/apache/jackrabbit/jcr2spi/
main/java/org/apache/jackrabbit/jcr2spi/hierarchy/
main/java/org/apache/jackrabbit/jcr2spi/nodetype/
main/java/org/apache/jackrabbit/jcr2s...
Author: mduerig
Date: Tue Feb 2 16:41:59 2010
New Revision: 905699
URL: http://svn.apache.org/viewvc?rev=905699&view=rev
Log:
JCR-2482: Reduce number of compiler warning by adding @Override and generics where appropriate
Modified:
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AbstractMoveTreeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddNewPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/AddPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ExternalModificationTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetItemsTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/GetPropertyTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/HierarchyNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/LazyItemIteratorTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveCombinedTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveMultipleTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveNewTreeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveReferenceableTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveSNSTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveToNewTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/MoveTreeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/NodeOrderTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshFalseTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshTrueTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveItemTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveMovedNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNewNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveReferenceableNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveSNSTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMixedTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewAndSavedTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewSNSTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderReferenceableSNSTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderSNSTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReplaceNodeTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/SessionScopedLockTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/AddMixinTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/MandatoryItemTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImplTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/RemoveMixinTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java
jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/xml/SessionImportTest.java
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.jcr2spi.state.ItemState;
-import org.apache.jackrabbit.jcr2spi.util.Dumpable;
-import org.apache.commons.collections.map.LRUMap;
+import java.io.PrintStream;
+import java.util.Map;
import javax.jcr.Item;
import javax.jcr.RepositoryException;
-import java.util.Map;
-import java.io.PrintStream;
+
+import org.apache.commons.collections.map.LRUMap;
+import org.apache.jackrabbit.jcr2spi.state.ItemState;
+import org.apache.jackrabbit.jcr2spi.util.Dumpable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ItemCacheImpl</code>...
@@ -36,6 +37,7 @@
private final Map<ItemState, Item> cache;
+ @SuppressWarnings("unchecked")
ItemCacheImpl(int maxSize) {
cache = new LRUMap(maxSize);
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java Tue Feb 2 16:41:59 2010
@@ -69,6 +69,7 @@
/**
* Listeners (weak references)
*/
+ @SuppressWarnings("unchecked")
protected final Map<ItemLifeCycleListener, ItemLifeCycleListener> listeners =
Collections.synchronizedMap(new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK));
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Tue Feb 2 16:41:59 2010
@@ -38,11 +38,11 @@
import javax.jcr.Property;
import javax.jcr.PropertyIterator;
import javax.jcr.PropertyType;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.Value;
import javax.jcr.ValueFormatException;
-import javax.jcr.Repository;
import javax.jcr.lock.Lock;
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
@@ -64,8 +64,8 @@
import org.apache.jackrabbit.jcr2spi.operation.Operation;
import org.apache.jackrabbit.jcr2spi.operation.ReorderNodes;
import org.apache.jackrabbit.jcr2spi.operation.SetMixin;
-import org.apache.jackrabbit.jcr2spi.operation.Update;
import org.apache.jackrabbit.jcr2spi.operation.SetPrimaryType;
+import org.apache.jackrabbit.jcr2spi.operation.Update;
import org.apache.jackrabbit.jcr2spi.state.ItemState;
import org.apache.jackrabbit.jcr2spi.state.ItemStateValidator;
import org.apache.jackrabbit.jcr2spi.state.NodeState;
@@ -73,12 +73,12 @@
import org.apache.jackrabbit.jcr2spi.util.LogUtil;
import org.apache.jackrabbit.jcr2spi.util.StateUtility;
import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NodeId;
import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.spi.PropertyId;
import org.apache.jackrabbit.spi.QNodeDefinition;
import org.apache.jackrabbit.spi.QPropertyDefinition;
import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.spi.PropertyId;
-import org.apache.jackrabbit.spi.NodeId;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
import org.apache.jackrabbit.spi.commons.value.ValueFormat;
@@ -110,6 +110,7 @@
/**
* @see Item#getName()
*/
+ @Override
public String getName() throws RepositoryException {
checkStatus();
return session.getNameResolver().getJCRName(getQName());
@@ -122,6 +123,7 @@
* @throws RepositoryException
* @see Item#accept(javax.jcr.ItemVisitor)
*/
+ @Override
public void accept(ItemVisitor visitor) throws RepositoryException {
checkStatus();
visitor.visit(this);
@@ -133,6 +135,7 @@
* @return true
* @see Item#isNode()
*/
+ @Override
public boolean isNode() {
return true;
}
@@ -670,7 +673,7 @@
if (nt.isMixin() || nt.isAbstract()) {
throw new ConstraintViolationException("Cannot change the primary type: '" + nodeTypeName + "' is a mixin type or abstract.");
}
-
+
// perform the operation
Operation op = SetPrimaryType.create(getNodeState(), ntName);
session.getSessionItemStateManager().execute(op);
@@ -898,7 +901,7 @@
NodeEntry newVersion = session.getVersionStateManager().checkpoint(getNodeState());
return (Version) getItemManager().getItem(newVersion);
}
-
+
/**
* @see Node#doneMerge(Version)
*/
@@ -1593,7 +1596,7 @@
}
/**
- *
+ *
* @param name
* @param weak
* @return
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java Tue Feb 2 16:41:59 2010
@@ -38,9 +38,9 @@
import org.apache.jackrabbit.jcr2spi.operation.SetPropertyValue;
import org.apache.jackrabbit.jcr2spi.state.PropertyState;
import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.QPropertyDefinition;
import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
import org.apache.jackrabbit.spi.commons.value.ValueFormat;
@@ -67,6 +67,7 @@
/**
* @see Item#getName()
*/
+ @Override
public String getName() throws RepositoryException {
checkStatus();
Name name = getQName();
@@ -79,6 +80,7 @@
* @param visitor
* @see Item#accept(javax.jcr.ItemVisitor)
*/
+ @Override
public void accept(ItemVisitor visitor) throws RepositoryException {
checkStatus();
visitor.visit(this);
@@ -90,6 +92,7 @@
* @return false
* @see javax.jcr.Item#isNode()
*/
+ @Override
public boolean isNode() {
return false;
}
@@ -475,6 +478,7 @@
* @see PropertyState#getName()
* @see ItemImpl#getName()
*/
+ @Override
Name getQName() {
return getPropertyState().getName();
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Tue Feb 2 16:41:59 2010
@@ -33,13 +33,13 @@
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
+import javax.jcr.Property;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.ValueFactory;
import javax.jcr.Workspace;
-import javax.jcr.Property;
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.retention.RetentionManager;
@@ -61,8 +61,8 @@
import org.apache.jackrabbit.jcr2spi.lock.LockStateManager;
import org.apache.jackrabbit.jcr2spi.nodetype.EffectiveNodeTypeProvider;
import org.apache.jackrabbit.jcr2spi.nodetype.ItemDefinitionProvider;
-import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeManagerImpl;
import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeDefinitionProvider;
+import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeManagerImpl;
import org.apache.jackrabbit.jcr2spi.operation.Move;
import org.apache.jackrabbit.jcr2spi.operation.Operation;
import org.apache.jackrabbit.jcr2spi.security.AccessManager;
@@ -86,12 +86,12 @@
import org.apache.jackrabbit.spi.SessionInfo;
import org.apache.jackrabbit.spi.XASessionInfo;
import org.apache.jackrabbit.spi.commons.conversion.DefaultNamePathResolver;
+import org.apache.jackrabbit.spi.commons.conversion.IdentifierResolver;
+import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
import org.apache.jackrabbit.spi.commons.conversion.PathResolver;
-import org.apache.jackrabbit.spi.commons.conversion.IdentifierResolver;
-import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
import org.apache.jackrabbit.spi.commons.value.ValueFactoryQImpl;
@@ -114,7 +114,9 @@
/**
* Listeners (weak references)
*/
- private final Map listeners = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
+ @SuppressWarnings("unchecked")
+ private final Map<SessionListener, SessionListener> listeners
+ = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK);
private final Repository repository;
private final RepositoryConfig config;
@@ -205,6 +207,7 @@
/**
* @see javax.jcr.Session#impersonate(Credentials)
*/
+ @Override
public Session impersonate(Credentials credentials) throws LoginException, RepositoryException {
checkIsAlive();
SessionInfo info = config.getRepositoryService().impersonate(sessionInfo, credentials);
@@ -278,6 +281,7 @@
/**
* @see javax.jcr.Session#getItem(String)
*/
+ @Override
public Item getItem(String absPath) throws PathNotFoundException, RepositoryException {
checkIsAlive();
try {
@@ -296,6 +300,7 @@
/**
* @see javax.jcr.Session#itemExists(String)
*/
+ @Override
public boolean itemExists(String absPath) throws RepositoryException {
checkIsAlive();
Path qPath = getQPath(absPath).getNormalizedPath();
@@ -380,6 +385,7 @@
/**
* @see javax.jcr.Session#importXML(String, java.io.InputStream, int)
*/
+ @Override
public void importXML(String parentAbsPath, InputStream in, int uuidBehavior) throws IOException, PathNotFoundException, ItemExistsException, ConstraintViolationException, VersionException, InvalidSerializedDataException, LockException, RepositoryException {
// NOTE: checks are performed by 'getImportContentHandler'
ImportHandler handler = (ImportHandler) getImportContentHandler(parentAbsPath, uuidBehavior);
@@ -419,6 +425,7 @@
/**
* @see javax.jcr.Session#logout()
*/
+ @Override
public void logout() {
if (!alive) {
// ignore
@@ -466,7 +473,7 @@
try {
return getLockStateManager().getLockTokens();
} catch (RepositoryException e) {
- log.warn("Unable to retrieve lock tokens for this session. (" + e.getMessage() + ")");
+ log.warn("Unable to retrieve lock tokens for this session. (" + e.getMessage() + ")");
return new String[0];
}
}
@@ -491,8 +498,9 @@
}
/**
- * @see Session#getNode(String)
+ * @see Session#getNode(String)
*/
+ @Override
public Node getNode(String absPath) throws RepositoryException {
checkIsAlive();
try {
@@ -514,6 +522,7 @@
/**
* @see Session#getProperty(String)
*/
+ @Override
public Property getProperty(String absPath) throws RepositoryException {
checkIsAlive();
try {
@@ -580,6 +589,7 @@
/**
* @see Session#nodeExists(String)
*/
+ @Override
public boolean nodeExists(String absPath) throws RepositoryException {
checkIsAlive();
Path qPath = getQPath(absPath).getNormalizedPath();
@@ -590,6 +600,7 @@
/**
* @see Session#propertyExists(String)
*/
+ @Override
public boolean propertyExists(String absPath) throws RepositoryException {
checkIsAlive();
Path qPath = getQPath(absPath).getNormalizedPath();
@@ -600,6 +611,7 @@
/**
* @see Session#removeItem(String)
*/
+ @Override
public void removeItem(String absPath) throws RepositoryException {
Item item = getItem(absPath);
item.remove();
@@ -620,7 +632,7 @@
}
/**
- * @see NamespaceResolver#getURI(String)
+ * @see NamespaceResolver#getURI(String)
*/
public String getURI(String prefix) throws NamespaceException {
try {
@@ -658,7 +670,7 @@
*/
private void notifyLoggingOut() {
// copy listeners to array to avoid ConcurrentModificationException
- SessionListener[] la = (SessionListener[])listeners.values().toArray(new SessionListener[listeners.size()]);
+ SessionListener[] la = listeners.values().toArray(new SessionListener[listeners.size()]);
for (int i = 0; i < la.length; i++) {
if (la[i] != null) {
la[i].loggingOut(this);
@@ -671,7 +683,7 @@
*/
private void notifyLoggedOut() {
// copy listeners to array to avoid ConcurrentModificationException
- SessionListener[] la = (SessionListener[])listeners.values().toArray(new SessionListener[listeners.size()]);
+ SessionListener[] la = listeners.values().toArray(new SessionListener[listeners.size()]);
for (int i = 0; i < la.length; i++) {
if (la[i] != null) {
la[i].loggedOut(this);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java Tue Feb 2 16:41:59 2010
@@ -698,30 +698,18 @@
return service.getRegisteredNamespaces(sessionInfo);
}
- /**
- * @inheritDoc
- */
public String getPrefix(String uri) throws NamespaceException, RepositoryException {
return service.getNamespacePrefix(sessionInfo, uri);
}
- /**
- * @inheritDoc
- */
public String getURI(String prefix) throws NamespaceException, RepositoryException {
return service.getNamespaceURI(sessionInfo, prefix);
}
- /**
- * @inheritDoc
- */
public void registerNamespace(String prefix, String uri) throws NamespaceException, UnsupportedRepositoryOperationException, AccessDeniedException, RepositoryException {
service.registerNamespace(sessionInfo, prefix, uri);
}
- /**
- * @inheritDoc
- */
public void unregisterNamespace(String uri) throws NamespaceException, UnsupportedRepositoryOperationException, AccessDeniedException, RepositoryException {
service.unregisterNamespace(sessionInfo, uri);
}
@@ -854,7 +842,6 @@
//-----------------------------------------------< OperationVisitor >---
/**
- * @inheritDoc
* @see OperationVisitor#visit(AddNode)
*/
public void visit(AddNode operation) throws RepositoryException {
@@ -863,7 +850,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(AddProperty)
*/
public void visit(AddProperty operation) throws RepositoryException {
@@ -878,7 +864,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Clone)
*/
public void visit(Clone operation) throws NoSuchWorkspaceException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -888,7 +873,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Copy)
*/
public void visit(Copy operation) throws NoSuchWorkspaceException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -898,7 +882,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Move)
*/
public void visit(Move operation) throws LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
@@ -913,7 +896,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Update)
*/
public void visit(Update operation) throws NoSuchWorkspaceException, AccessDeniedException, LockException, InvalidItemStateException, RepositoryException {
@@ -922,7 +904,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Remove)
*/
public void visit(Remove operation) throws RepositoryException {
@@ -930,7 +911,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(SetMixin)
*/
public void visit(SetMixin operation) throws RepositoryException {
@@ -938,7 +918,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(SetPrimaryType)
*/
public void visit(SetPrimaryType operation) throws RepositoryException {
@@ -946,7 +925,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(SetPropertyValue)
*/
public void visit(SetPropertyValue operation) throws RepositoryException {
@@ -959,7 +937,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(ReorderNodes)
*/
public void visit(ReorderNodes operation) throws RepositoryException {
@@ -970,7 +947,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Checkout)
*/
public void visit(Checkout operation) throws UnsupportedRepositoryOperationException, LockException, RepositoryException {
@@ -982,7 +958,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Checkin)
*/
public void visit(Checkin operation) throws UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
@@ -991,7 +966,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Checkpoint)
*/
public void visit(Checkpoint operation) throws UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
@@ -1000,7 +974,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Restore)
*/
public void visit(Restore operation) throws VersionException, PathNotFoundException, ItemExistsException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
@@ -1021,7 +994,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(Merge)
*/
public void visit(Merge operation) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
@@ -1036,7 +1008,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(ResolveMergeConflict)
*/
public void visit(ResolveMergeConflict operation) throws VersionException, InvalidItemStateException, UnsupportedRepositoryOperationException, RepositoryException {
@@ -1047,7 +1018,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(LockOperation)
*/
public void visit(LockOperation operation) throws AccessDeniedException, InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException {
@@ -1056,7 +1026,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(LockRefresh)
*/
public void visit(LockRefresh operation) throws AccessDeniedException, InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException {
@@ -1064,7 +1033,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(LockRelease)
*/
public void visit(LockRelease operation) throws AccessDeniedException, InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException {
@@ -1072,7 +1040,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(AddLabel)
*/
public void visit(AddLabel operation) throws VersionException, RepositoryException {
@@ -1082,7 +1049,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(RemoveLabel)
*/
public void visit(RemoveLabel operation) throws VersionException, RepositoryException {
@@ -1092,7 +1058,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(RemoveVersion)
*/
public void visit(RemoveVersion operation) throws VersionException, AccessDeniedException, ReferentialIntegrityException, RepositoryException {
@@ -1102,7 +1067,6 @@
}
/**
- * @inheritDoc
* @see OperationVisitor#visit(WorkspaceImport)
*/
public void visit(WorkspaceImport operation) throws RepositoryException {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java Tue Feb 2 16:41:59 2010
@@ -18,11 +18,11 @@
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.spi.XASessionInfo;
-import org.apache.jackrabbit.jcr2spi.config.RepositoryConfig;
-
import javax.transaction.xa.XAResource;
+import org.apache.jackrabbit.jcr2spi.config.RepositoryConfig;
+import org.apache.jackrabbit.spi.XASessionInfo;
+
/**
* <code>XASessionImpl</code> extends the regular session implementation with
* access to the <code>XAResource</code>.
@@ -51,7 +51,6 @@
//--------------------------------< XASession >-----------------------------
/**
- * @inheritDoc
* @see org.apache.jackrabbit.jcr2spi.XASession#getXAResource()
*/
public XAResource getXAResource() {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java Tue Feb 2 16:41:59 2010
@@ -591,6 +591,7 @@
* @return a wrapping {@link LinkedEntries.LinkNode}.
* @see AbstractLinkedList#createNode(Object)
*/
+ @Override
protected Node createNode(Object value) {
return new LinkedEntries.LinkNode(value, Path.INDEX_DEFAULT);
}
@@ -599,6 +600,7 @@
* @return a new <code>LinkNode</code>.
* @see AbstractLinkedList#createHeaderNode()
*/
+ @Override
protected Node createHeaderNode() {
return new LinkedEntries.LinkNode();
}
@@ -626,14 +628,16 @@
protected LinkNode(Object value, int index) {
// add soft reference from linkNode to the NodeEntry (value)
// unless the entry is a SNSibling. TODO: review again.
- super(index > Path.INDEX_DEFAULT ? value : new SoftReference(value));
+ super(index > Path.INDEX_DEFAULT ? value : new SoftReference<Object>(value));
qName = ((NodeEntry) value).getName();
}
+ @Override
protected void setValue(Object value) {
throw new UnsupportedOperationException("Not implemented");
}
+ @Override
protected Object getValue() {
Object val = super.getValue();
NodeEntry ne;
@@ -723,7 +727,7 @@
*/
private static class NameMap {
- private final Map<Name, List> snsMap = new HashMap<Name, List>();
+ private final Map<Name, List<LinkedEntries.LinkNode>> snsMap = new HashMap<Name, List<LinkedEntries.LinkNode>>();
private final Map<Name, LinkedEntries.LinkNode> nameMap = new HashMap<Name, LinkedEntries.LinkNode>();
/**
@@ -745,15 +749,15 @@
* NodeEntry objects.
*/
private Object get(Name qName) {
- Object val = nameMap.get(qName);
+ LinkedEntries.LinkNode val = nameMap.get(qName);
if (val != null) {
- return ((LinkedEntries.LinkNode) val).getNodeEntry();
+ return val.getNodeEntry();
} else {
- List l = snsMap.get(qName);
+ List<LinkedEntries.LinkNode> l = snsMap.get(qName);
if (l != null) {
List<NodeEntry> nodeEntries = new ArrayList<NodeEntry>(l.size());
- for (Iterator it = l.iterator(); it.hasNext();) {
- LinkedEntries.LinkNode ln = (LinkedEntries.LinkNode) it.next();
+ for (Iterator<LinkedEntries.LinkNode> it = l.iterator(); it.hasNext();) {
+ LinkedEntries.LinkNode ln = it.next();
nodeEntries.add(ln.getNodeEntry());
}
return nodeEntries;
@@ -770,12 +774,13 @@
* @param name
* @return list of entries or an empty list.
*/
+ @SuppressWarnings("unchecked")
public List<NodeEntry> getList(Name name) {
Object obj = get(name);
if (obj == null) {
return Collections.emptyList();
} else if (obj instanceof List) {
- List<NodeEntry> l = new ArrayList<NodeEntry>((List)obj);
+ List<NodeEntry> l = new ArrayList<NodeEntry>((List<NodeEntry>) obj);
return Collections.unmodifiableList(l);
} else {
// NodeEntry
@@ -783,6 +788,7 @@
}
}
+ @SuppressWarnings("unchecked")
public NodeEntry getNodeEntry(Name name, int index) {
Object obj = get(name);
if (obj == null) {
@@ -790,7 +796,7 @@
}
if (obj instanceof List) {
// map entry is a list of siblings
- return findMatchingEntry((List) obj, index);
+ return findMatchingEntry((List<NodeEntry>) obj, index);
} else {
// map entry is a single child node entry
if (index == Path.INDEX_DEFAULT) {
@@ -810,9 +816,9 @@
return (index == Path.INDEX_DEFAULT) ? val : null;
} else {
// look in snsMap
- List l = snsMap.get(name);
+ List<LinkedEntries.LinkNode> l = snsMap.get(name);
int pos = index - 1; // Index of NodeEntry is 1-based
- return (l != null && pos < l.size()) ? (LinkedEntries.LinkNode) l.get(pos) : null;
+ return (l != null && pos < l.size()) ? l.get(pos) : null;
}
}
@@ -828,10 +834,10 @@
}
} else {
// look in snsMap
- List l = snsMap.get(name);
+ List<LinkedEntries.LinkNode> l = snsMap.get(name);
if (l != null) {
- for (Iterator it = l.iterator(); it.hasNext();) {
- LinkedEntries.LinkNode ln = (LinkedEntries.LinkNode) it.next();
+ for (Iterator<LinkedEntries.LinkNode> it = l.iterator(); it.hasNext();) {
+ LinkedEntries.LinkNode ln = it.next();
if (uniqueID.equals(ln.getNodeEntry().getUniqueID())) {
return ln;
}
@@ -874,7 +880,7 @@
public LinkedEntries.LinkNode remove(Name name, LinkedEntries.LinkNode value) {
LinkedEntries.LinkNode rm = nameMap.remove(name);
if (rm == null) {
- List l = snsMap.get(name);
+ List<LinkedEntries.LinkNode> l = snsMap.get(name);
if (l != null && l.remove(value)) {
rm = value;
}
@@ -883,7 +889,7 @@
}
public void reorder(Name name, LinkedEntries.LinkNode insertValue, int position) {
- List sns = snsMap.get(name);
+ List<LinkedEntries.LinkNode> sns = snsMap.get(name);
if (sns == null) {
// no same name siblings -> no special handling required
return;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java Tue Feb 2 16:41:59 2010
@@ -46,7 +46,7 @@
/**
* Cached soft reference to the target ItemState.
*/
- private Reference target;
+ private Reference<ItemState> target;
/**
* The name of the target item state.
@@ -165,14 +165,13 @@
ItemState internalGetItemState() {
ItemState state = null;
if (target != null) {
- state = (ItemState) target.get();
+ state = target.get();
}
return state;
}
//-----------------------------------------------------< HierarchyEntry >---
/**
- * @inheritDoc
* @see HierarchyEntry#getName()
*/
public Name getName() {
@@ -180,7 +179,6 @@
}
/**
- * @inheritDoc
* @see HierarchyEntry#getPath()
*/
public Path getPath() throws RepositoryException {
@@ -188,7 +186,6 @@
}
/**
- * @inheritDoc
* @see HierarchyEntry#getWorkspacePath()
*/
public Path getWorkspacePath() throws RepositoryException {
@@ -196,7 +193,6 @@
}
/**
- * @inheritDoc
* @see HierarchyEntry#getParent()
*/
public NodeEntry getParent() {
@@ -204,7 +200,6 @@
}
/**
- * @inheritDoc
* @see HierarchyEntry#getStatus()
*/
public int getStatus() {
@@ -217,7 +212,6 @@
}
/**
- * @inheritDoc
* @see HierarchyEntry#isAvailable()
*/
public boolean isAvailable() {
@@ -245,7 +239,7 @@
if (currentState == null) {
// not connected yet to an item state. either a new entry or
// an unresolved hierarchy entry.
- target = new SoftReference(state);
+ target = new SoftReference<ItemState>(state);
} else {
// was already resolved before -> merge the existing state
// with the passed state.
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java Tue Feb 2 16:41:59 2010
@@ -165,13 +165,13 @@
/**
* Returns true.
*
- * @inheritDoc
* @see HierarchyEntry#denotesNode()
*/
public boolean denotesNode() {
return true;
}
+ @Override
public void invalidate(boolean recursive) {
getInvalidationStrategy().invalidate(this, recursive);
}
@@ -187,6 +187,7 @@
*
* @see HierarchyEntry#reload(boolean)
*/
+ @Override
public void reload(boolean recursive) {
// reload this entry
super.reload(recursive);
@@ -208,9 +209,9 @@
* transiently moved, it is in addition moved back to its old parent.
* Similarly reordering of child node entries is reverted.
*
- * @inheritDoc
* @see HierarchyEntry#revert()
*/
+ @Override
public void revert() throws RepositoryException {
// move all properties from attic back to properties map
if (!propertiesInAttic.isEmpty()) {
@@ -227,6 +228,7 @@
/**
* @see HierarchyEntry#transientRemove()
*/
+ @Override
public void transientRemove() throws RepositoryException {
for (Iterator<HierarchyEntry> it = getAllChildEntries(false); it.hasNext();) {
HierarchyEntry ce = it.next();
@@ -246,6 +248,7 @@
/**
* @see HierarchyEntry#remove()
*/
+ @Override
public void remove() {
// handle this entry first
super.internalRemove(false);
@@ -257,6 +260,7 @@
}
}
+ @Override
void internalRemove(boolean staleParent) {
// handle this entry first
super.internalRemove(staleParent);
@@ -293,7 +297,6 @@
}
//----------------------------------------------------------< NodeEntry >---
/**
- * @inheritDoc
* @see NodeEntry#getId()
*/
public NodeId getId() throws InvalidItemStateException, RepositoryException {
@@ -343,7 +346,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#getUniqueID()
*/
public String getUniqueID() {
@@ -351,7 +353,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#setUniqueID(String)
*/
public void setUniqueID(String uniqueID) {
@@ -364,7 +365,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#getIndex()
*/
public int getIndex() throws InvalidItemStateException, RepositoryException {
@@ -372,7 +372,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#getNodeState()
*/
public NodeState getNodeState() throws ItemNotFoundException, RepositoryException {
@@ -380,7 +379,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#getDeepNodeEntry(Path)
*/
public NodeEntry getDeepNodeEntry(Path path) throws PathNotFoundException, RepositoryException {
@@ -736,7 +734,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#getPropertyEntries()
*/
public synchronized Iterator<PropertyEntry> getPropertyEntries() {
@@ -850,7 +847,6 @@
}
/**
- * @inheritDoc
* @see NodeEntry#orderBefore(NodeEntry)
*/
public void orderBefore(NodeEntry beforeEntry) throws RepositoryException {
@@ -1002,6 +998,7 @@
* <p/>
* Returns a <code>NodeState</code>.
*/
+ @Override
ItemState doResolve() throws ItemNotFoundException, RepositoryException {
return getItemStateFactory().createNodeState(getWorkspaceId(), this);
}
@@ -1009,6 +1006,7 @@
/**
* @see HierarchyEntryImpl#buildPath(boolean)
*/
+ @Override
Path buildPath(boolean wspPath) throws RepositoryException {
PathFactory pf = getPathFactory();
// shortcut for root state
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java Tue Feb 2 16:41:59 2010
@@ -16,6 +16,10 @@
*/
package org.apache.jackrabbit.jcr2spi.hierarchy;
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.jcr2spi.operation.Operation;
import org.apache.jackrabbit.jcr2spi.operation.SetPropertyValue;
import org.apache.jackrabbit.jcr2spi.state.ItemState;
@@ -25,10 +29,6 @@
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.PropertyId;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.RepositoryException;
-
/**
* <code>PropertyEntryImpl</code> implements a reference to a property state.
*/
@@ -60,11 +60,11 @@
//------------------------------------------------------< HierarchyEntryImpl >---
/**
- * @inheritDoc
* @see HierarchyEntryImpl#doResolve()
* <p/>
* Returns a <code>PropertyState</code>.
*/
+ @Override
ItemState doResolve() throws ItemNotFoundException, RepositoryException {
return getItemStateFactory().createPropertyState(getWorkspaceId(), this);
}
@@ -72,6 +72,7 @@
/**
* @see HierarchyEntryImpl#buildPath(boolean)
*/
+ @Override
Path buildPath(boolean workspacePath) throws RepositoryException {
Path parentPath = parent.buildPath(workspacePath);
return getPathFactory().create(parentPath, getName(), true);
@@ -124,7 +125,7 @@
case Operation.STATUS_PERSISTED:
// Property can only be the change log target if it was existing and has
// been modified. This includes the case where a property was changed and
- // then removed by removing its parent. See JCR-2462.
+ // then removed by removing its parent. See JCR-2462.
// Removal, add and implicit modification of protected
// properties must be persisted by save on parent.
PropertyState state = op.getPropertyState();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Tue Feb 2 16:41:59 2010
@@ -16,24 +16,25 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
-import org.apache.jackrabbit.spi.QItemDefinition;
-import org.apache.jackrabbit.spi.QNodeDefinition;
-import org.apache.jackrabbit.spi.QPropertyDefinition;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.QNodeTypeDefinition;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
-
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
import java.util.ArrayList;
-import java.util.List;
-import java.util.TreeSet;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.HashSet;
-import java.util.Set;
+import java.util.List;
import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.QItemDefinition;
+import org.apache.jackrabbit.spi.QNodeDefinition;
+import org.apache.jackrabbit.spi.QNodeTypeDefinition;
+import org.apache.jackrabbit.spi.QPropertyDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An <code>EffectiveNodeType</code> represents one or more
@@ -114,7 +115,7 @@
defs.add(qDef);
}
}
-
+
for (List<QItemDefinition> list : namedItemDefs.values()) {
for (QItemDefinition qDef : list) {
if (qDef.definesNode()) {
@@ -324,22 +325,15 @@
return defs.toArray(new QPropertyDefinition[defs.size()]);
}
- /**
- * @inheritDoc
- */
public boolean includesNodeType(Name nodeTypeName) {
return allNodeTypes.contains(nodeTypeName);
}
- /**
- * @inheritDoc
- */
public boolean includesNodeTypes(Name[] nodeTypeNames) {
return allNodeTypes.containsAll(Arrays.asList(nodeTypeNames));
}
/**
- * @inheritDoc
* @see EffectiveNodeType#supportsMixin(Name)
*/
public boolean supportsMixin(Name mixin) {
@@ -352,7 +346,6 @@
}
/**
- * @inheritDoc
* @see EffectiveNodeType#checkAddNodeConstraints(Name, ItemDefinitionProvider)
*/
public void checkAddNodeConstraints(Name name, ItemDefinitionProvider definitionProvider)
@@ -367,7 +360,6 @@
}
/**
- * @inheritDoc
* @see EffectiveNodeType#checkAddNodeConstraints(org.apache.jackrabbit.spi.Name,QNodeTypeDefinition, ItemDefinitionProvider)
*/
public void checkAddNodeConstraints(Name name, QNodeTypeDefinition nodeTypeDefinition, ItemDefinitionProvider definitionProvider)
@@ -388,7 +380,6 @@
}
/**
- * @inheritDoc
* @see EffectiveNodeType#checkRemoveItemConstraints(Name)
*/
public void checkRemoveItemConstraints(Name name) throws ConstraintViolationException {
@@ -403,7 +394,6 @@
}
/**
- * @inheritDoc
* @see EffectiveNodeType#hasRemoveNodeConstraint(Name)
*/
public boolean hasRemoveNodeConstraint(Name nodeName) {
@@ -412,7 +402,6 @@
}
/**
- * @inheritDoc
* @see EffectiveNodeType#hasRemovePropertyConstraint(Name)
*/
public boolean hasRemovePropertyConstraint(Name propertyName) {
@@ -680,6 +669,7 @@
}
}
+ @Override
protected Object clone() {
EffectiveNodeTypeImpl clone = new EffectiveNodeTypeImpl(mergedNodeTypes,
inheritedNodeTypes, allNodeTypes, namedItemDefs, unnamedItemDefs,
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java Tue Feb 2 16:41:59 2010
@@ -54,9 +54,6 @@
this.sessionInfo = sessionInfo;
}
- /**
- * @inheritDoc
- */
public QNodeDefinition getRootNodeDefinition() throws RepositoryException {
if (rootNodeDefinition == null) {
IdFactory idFactory = service.getIdFactory();
@@ -68,9 +65,6 @@
return rootNodeDefinition;
}
- /**
- * @inheritDoc
- */
public QNodeDefinition getQNodeDefinition(Name[] parentNodeTypeNames,
Name nodeName, Name ntName,
NodeId nodeId) throws RepositoryException {
@@ -89,9 +83,6 @@
return definition;
}
- /**
- * @inheritDoc
- */
public QNodeDefinition getQNodeDefinition(Name[] parentNodeTypeNames, Name name, Name nodeTypeName)
throws NoSuchNodeTypeException, ConstraintViolationException {
EffectiveNodeType ent = entProvider.getEffectiveNodeType(parentNodeTypeNames);
@@ -99,17 +90,11 @@
return getQNodeDefinition(ent, entTarget, name);
}
- /**
- * @inheritDoc
- */
public QNodeDefinition getQNodeDefinition(EffectiveNodeType ent, Name name, Name nodeTypeName) throws NoSuchNodeTypeException, ConstraintViolationException {
EffectiveNodeType entTarget = getEffectiveNodeType(nodeTypeName);
return getQNodeDefinition(ent, entTarget, name);
}
- /**
- * @inheritDoc
- */
public QPropertyDefinition getQPropertyDefinition(Name[] parentNodeTypeNames,
Name propertyName,
int propertType,
@@ -126,9 +111,6 @@
return definition;
}
- /**
- * @inheritDoc
- */
public QPropertyDefinition getQPropertyDefinition(Name ntName, Name propName,
int type, boolean multiValued)
throws ConstraintViolationException, NoSuchNodeTypeException {
@@ -136,9 +118,6 @@
return getQPropertyDefinition(ent, propName, type, multiValued, false);
}
- /**
- * @inheritDoc
- */
public QPropertyDefinition getQPropertyDefinition(Name[] parentNodeTypeNames,
Name name, int type,
boolean multiValued)
@@ -147,9 +126,6 @@
return getQPropertyDefinition(ent, name, type, multiValued, false);
}
- /**
- * @inheritDoc
- */
public QPropertyDefinition getQPropertyDefinition(Name[] parentNodeTypeNames,
Name name, int type)
throws ConstraintViolationException, NoSuchNodeTypeException {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java Tue Feb 2 16:41:59 2010
@@ -16,6 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
+import java.util.ArrayList;
+
+import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.NodeTypeDefinition;
+import javax.jcr.nodetype.PropertyDefinition;
+
import org.apache.jackrabbit.jcr2spi.ManagerProvider;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.QNodeDefinition;
@@ -24,24 +36,13 @@
import org.apache.jackrabbit.spi.QValue;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.nodetype.constraint.ValueConstraint;
import org.apache.jackrabbit.spi.commons.nodetype.AbstractNodeType;
+import org.apache.jackrabbit.spi.commons.nodetype.constraint.ValueConstraint;
import org.apache.jackrabbit.spi.commons.value.ValueFormat;
import org.apache.jackrabbit.value.ValueHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.PropertyType;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.PropertyDefinition;
-import javax.jcr.nodetype.NodeTypeDefinition;
-import java.util.ArrayList;
-
/**
* <code>NodeTypeImpl</code> ...
*/
@@ -100,6 +101,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isNodeType(Name nodeTypeName) {
return ent.includesNodeType(nodeTypeName);
}
@@ -122,7 +124,7 @@
throws ConstraintViolationException, RepositoryException {
ValueConstraint.checkValueConstraints(def, values);
}
-
+
//-------------------------------------------------< NodeTypeDefinition >---
/**
@@ -309,7 +311,7 @@
}
/**
- * @see javax.jcr.nodetype.NodeType#canAddChildNode(String, String)
+ * @see javax.jcr.nodetype.NodeType#canAddChildNode(String, String)
*/
public boolean canAddChildNode(String childNodeName, String nodeTypeName) {
try {
@@ -326,7 +328,7 @@
}
/**
- * @see javax.jcr.nodetype.NodeType#canRemoveItem(String)
+ * @see javax.jcr.nodetype.NodeType#canRemoveItem(String)
*/
public boolean canRemoveItem(String itemName) {
try {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java Tue Feb 2 16:41:59 2010
@@ -16,45 +16,45 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
-import org.apache.commons.collections.map.ReferenceMap;
-import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
-import org.apache.jackrabbit.commons.iterator.NodeTypeIteratorAdapter;
-import org.apache.jackrabbit.spi.commons.conversion.NameException;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.nodetype.AbstractNodeTypeManager;
-import org.apache.jackrabbit.spi.commons.nodetype.NodeDefinitionImpl;
-import org.apache.jackrabbit.spi.commons.nodetype.PropertyDefinitionImpl;
-import org.apache.jackrabbit.spi.commons.QNodeTypeDefinitionImpl;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.jcr2spi.util.Dumpable;
-import org.apache.jackrabbit.jcr2spi.ManagerProvider;
-import org.apache.jackrabbit.spi.QNodeDefinition;
-import org.apache.jackrabbit.spi.QPropertyDefinition;
-import org.apache.jackrabbit.spi.QNodeTypeDefinition;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
-import javax.jcr.RepositoryException;
+import javax.jcr.NamespaceException;
import javax.jcr.PropertyType;
+import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.ValueFactory;
-import javax.jcr.NamespaceException;
-import javax.jcr.version.OnParentVersionAction;
import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.nodetype.NodeDefinition;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeDefinition;
+import javax.jcr.nodetype.NodeTypeExistsException;
import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeTypeManager;
import javax.jcr.nodetype.PropertyDefinition;
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.NodeTypeExistsException;
+import javax.jcr.version.OnParentVersionAction;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.List;
-import java.io.PrintStream;
+import org.apache.commons.collections.map.ReferenceMap;
+import org.apache.jackrabbit.commons.iterator.NodeTypeIteratorAdapter;
+import org.apache.jackrabbit.jcr2spi.ManagerProvider;
+import org.apache.jackrabbit.jcr2spi.util.Dumpable;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.QNodeDefinition;
+import org.apache.jackrabbit.spi.QNodeTypeDefinition;
+import org.apache.jackrabbit.spi.QPropertyDefinition;
+import org.apache.jackrabbit.spi.commons.QNodeTypeDefinitionImpl;
+import org.apache.jackrabbit.spi.commons.conversion.NameException;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
+import org.apache.jackrabbit.spi.commons.nodetype.AbstractNodeTypeManager;
+import org.apache.jackrabbit.spi.commons.nodetype.NodeDefinitionImpl;
+import org.apache.jackrabbit.spi.commons.nodetype.PropertyDefinitionImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A <code>NodeTypeManagerImpl</code> implements a session dependant
@@ -132,6 +132,7 @@
/**
* @see AbstractNodeTypeManager#getNodeType(org.apache.jackrabbit.spi.Name)
*/
+ @Override
public NodeTypeImpl getNodeType(Name name) throws NoSuchNodeTypeException {
synchronized (ntCache) {
NodeTypeImpl nt = ntCache.get(name);
@@ -146,8 +147,9 @@
}
/**
- * @see org.apache.jackrabbit.spi.commons.nodetype.AbstractNodeTypeManager#getNamePathResolver()
+ * @see org.apache.jackrabbit.spi.commons.nodetype.AbstractNodeTypeManager#getNamePathResolver()
*/
+ @Override
public NamePathResolver getNamePathResolver() {
return mgrProvider.getNamePathResolver();
}
@@ -172,6 +174,7 @@
* @param def
* @return
*/
+ @Override
public NodeDefinition getNodeDefinition(QNodeDefinition def) {
synchronized (ndCache) {
NodeDefinition ndi = ndCache.get(def);
@@ -190,6 +193,7 @@
* @param def
* @return
*/
+ @Override
public PropertyDefinition getPropertyDefinition(QPropertyDefinition def) {
synchronized (pdCache) {
PropertyDefinition pdi = pdCache.get(def);
@@ -210,7 +214,7 @@
//-----------------------------------------< NodeTypeDefinitionProvider >---
/**
- * @see NodeTypeDefinitionProvider#getNodeTypeDefinition(org.apache.jackrabbit.spi.Name)
+ * @see NodeTypeDefinitionProvider#getNodeTypeDefinition(org.apache.jackrabbit.spi.Name)
*/
public QNodeTypeDefinition getNodeTypeDefinition(Name ntName) throws NoSuchNodeTypeException, RepositoryException {
NodeTypeImpl nt = getNodeType(ntName);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java Tue Feb 2 16:41:59 2010
@@ -16,22 +16,22 @@
*/
package org.apache.jackrabbit.jcr2spi.observation;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.observation.Event;
-import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
-import org.apache.jackrabbit.spi.commons.value.ValueFormat;
-import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.IdFactory;
import org.apache.jackrabbit.spi.ItemId;
+import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.NodeId;
import org.apache.jackrabbit.spi.PropertyId;
-import org.slf4j.LoggerFactory;
+import org.apache.jackrabbit.spi.QValue;
+import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
+import org.apache.jackrabbit.spi.commons.value.ValueFormat;
import org.slf4j.Logger;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.observation.Event;
+import org.slf4j.LoggerFactory;
/**
* Implementation of the {@link javax.jcr.observation.Event} interface.
@@ -53,7 +53,7 @@
* The IdFactory
*/
private final IdFactory idFactory;
-
+
/**
* The underlying SPI event.
*/
@@ -151,6 +151,7 @@
*
* @return a String representation of this <code>Event</code>.
*/
+ @Override
public String toString() {
if (stringValue == null) {
StringBuffer sb = new StringBuffer();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java Tue Feb 2 16:41:59 2010
@@ -31,11 +31,11 @@
import org.apache.jackrabbit.commons.iterator.EventListenerIteratorAdapter;
import org.apache.jackrabbit.jcr2spi.WorkspaceManager;
import org.apache.jackrabbit.jcr2spi.nodetype.NodeTypeRegistry;
+import org.apache.jackrabbit.spi.Event;
import org.apache.jackrabbit.spi.EventBundle;
import org.apache.jackrabbit.spi.EventFilter;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
-import org.apache.jackrabbit.spi.Event;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.slf4j.Logger;
@@ -92,9 +92,6 @@
this.ntRegistry = ntRegistry;
}
- /**
- * @inheritDoc
- */
public void addEventListener(EventListener listener,
int eventTypes,
String absPath,
@@ -116,9 +113,6 @@
}
}
- /**
- * @inheritDoc
- */
public void removeEventListener(EventListener listener) throws RepositoryException {
synchronized (subscriptions) {
if (subscriptions.remove(listener) != null) {
@@ -132,9 +126,6 @@
}
}
- /**
- * @inheritDoc
- */
public EventListenerIterator getRegisteredEventListeners() throws RepositoryException {
Map<EventListener, EventFilter> activeListeners;
synchronized (subscriptions) {
@@ -163,7 +154,7 @@
}
/**
- * @see javax.jcr.observation.ObservationManager#setUserData(String)
+ * @see javax.jcr.observation.ObservationManager#setUserData(String)
*/
public void setUserData(String userData) throws RepositoryException {
wspManager.setUserData(userData);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager;
import org.apache.jackrabbit.jcr2spi.state.ItemState;
import org.apache.jackrabbit.jcr2spi.state.NodeState;
import org.apache.jackrabbit.spi.Path;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.RepositoryException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
/**
* <code>AbstractOperation</code>...
*/
@@ -48,9 +49,6 @@
return getClass().getName();
}
- /**
- * @inheritDoc
- */
public Collection<ItemState> getAffectedItemStates() {
if (affectedStates.isEmpty()) {
return Collections.emptySet();
@@ -60,9 +58,6 @@
}
}
- /**
- * @inheritDoc
- */
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
throw new UnsupportedOperationException("Undo not supported.");
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java Tue Feb 2 16:41:59 2010
@@ -16,12 +16,8 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.state.ItemState;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.spi.NodeId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.List;
import javax.jcr.AccessDeniedException;
import javax.jcr.ItemExistsException;
@@ -31,8 +27,13 @@
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
import javax.jcr.version.VersionException;
-import java.util.ArrayList;
-import java.util.List;
+
+import org.apache.jackrabbit.jcr2spi.state.ItemState;
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NodeId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>AddNode</code>...
@@ -47,7 +48,7 @@
private final Name nodeTypeName;
private final String uuid;
- private List<ItemState> addedStates = new ArrayList<ItemState>();
+ private final List<ItemState> addedStates = new ArrayList<ItemState>();
private AddNode(NodeState parentState, Name nodeName, Name nodeTypeName, String uuid)
throws RepositoryException {
@@ -84,6 +85,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
status = STATUS_UNDO;
@@ -133,7 +135,7 @@
// make sure the parent hierarchy entry has its child entries loaded
// in order to be able to detect conflicts.
assertChildNodeEntries(parentState);
-
+
AddNode an = new AddNode(parentState, nodeName, nodeTypeName, uuid);
return an;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java Tue Feb 2 16:41:59 2010
@@ -16,20 +16,20 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.spi.QPropertyDefinition;
-import org.apache.jackrabbit.spi.QValue;
-import org.apache.jackrabbit.spi.NodeId;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ValueFormatException;
import javax.jcr.AccessDeniedException;
+import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.VersionException;
+import javax.jcr.ValueFormatException;
import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.spi.NodeId;
+import org.apache.jackrabbit.spi.QPropertyDefinition;
+import org.apache.jackrabbit.spi.QValue;
/**
* <code>AddProperty</code>...
@@ -79,11 +79,12 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
status = STATUS_UNDO;
parentState.getHierarchyEntry().complete(this);
}
-
+
//----------------------------------------< Access Operation Parameters >---
public NodeId getParentId() {
return parentId;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java Tue Feb 2 16:41:59 2010
@@ -16,21 +16,21 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.ManagerProvider;
-import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
-import org.apache.jackrabbit.spi.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemExistsException;
import javax.jcr.AccessDeniedException;
+import javax.jcr.ItemExistsException;
import javax.jcr.NoSuchWorkspaceException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.version.VersionException;
+import org.apache.jackrabbit.jcr2spi.ManagerProvider;
+import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
+import org.apache.jackrabbit.spi.Path;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>Clone</code>...
*/
@@ -62,6 +62,7 @@
/**
* @see Operation#persisted()
*/
+ @Override
public void persisted() {
assert status == STATUS_PENDING;
if (removeExisting) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java Tue Feb 2 16:41:59 2010
@@ -16,23 +16,23 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
-import org.apache.jackrabbit.jcr2spi.state.NodeState;
-import org.apache.jackrabbit.jcr2spi.version.VersionManager;
-import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
-import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
-import org.apache.jackrabbit.spi.ItemId;
-import org.apache.jackrabbit.spi.NodeId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Iterator;
-import javax.jcr.RepositoryException;
import javax.jcr.AccessDeniedException;
import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.VersionException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import java.util.Iterator;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
+import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
+import org.apache.jackrabbit.jcr2spi.state.NodeState;
+import org.apache.jackrabbit.jcr2spi.version.VersionManager;
+import org.apache.jackrabbit.spi.NodeId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>Merge</code>...
@@ -47,7 +47,7 @@
private final boolean isShallow;
private final VersionManager mgr;
- private Iterator<? extends ItemId> failedIds = null;
+ private Iterator<NodeId> failedIds = null;
private Merge(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean isShallow, VersionManager mgr) {
this.nodeState = nodeState;
@@ -118,7 +118,7 @@
return srcWorkspaceName == null;
}
- public void setFailedIds(Iterator<? extends ItemId> failedIds) {
+ public void setFailedIds(Iterator<NodeId> failedIds) {
if (failedIds == null) {
throw new IllegalArgumentException("IdIterator must not be null.");
}
@@ -128,7 +128,7 @@
this.failedIds = failedIds;
}
- public Iterator<? extends ItemId> getFailedIds() {
+ public Iterator<NodeId> getFailedIds() {
if (failedIds == null) {
throw new IllegalStateException("Merge operation has not been executed yet.");
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java Tue Feb 2 16:41:59 2010
@@ -16,6 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
+import javax.jcr.AccessDeniedException;
+import javax.jcr.ItemExistsException;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.version.VersionException;
+
import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyManager;
import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry;
import org.apache.jackrabbit.jcr2spi.state.NodeState;
@@ -27,16 +37,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.AccessDeniedException;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.version.VersionException;
-
/**
* <code>Move</code>...
*/
@@ -112,6 +112,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
if (sessionMove) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi.operation;
+import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.version.VersionException;
+
import org.apache.jackrabbit.jcr2spi.state.ItemState;
import org.apache.jackrabbit.jcr2spi.state.NodeState;
import org.apache.jackrabbit.spi.ItemId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.AccessDeniedException;
-import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.version.VersionException;
-
/**
* <code>Remove</code>...
*/
@@ -34,7 +34,7 @@
private static Logger log = LoggerFactory.getLogger(Remove.class);
- private ItemId removeId;
+ private final ItemId removeId;
protected ItemState removeState;
protected NodeState parent;
@@ -68,6 +68,7 @@
/**
* @see Operation#undo()
*/
+ @Override
public void undo() throws RepositoryException {
assert status == STATUS_PENDING;
status = STATUS_UNDO;