jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1164026 [8/11] - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ./ config/ hierarchy/ lock/ nodetype/ observation/ operation/ query/ security/ state/ util/ version/ xml/
Date Thu, 01 Sep 2011 11:52:13 GMT
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java Thu Sep  1 11:52:08 2011
@@ -40,9 +40,6 @@ import org.slf4j.LoggerFactory;
  * <code>AddNode</code>...
  */
 public class AddNode extends TransientOperation {
-
-    private static Logger log = LoggerFactory.getLogger(AddNode.class);
-
     private final NodeId parentId;
     private final NodeState parentState;
     private final Name nodeName;
@@ -60,7 +57,7 @@ public class AddNode extends TransientOp
                     String uuid, int options)
             throws RepositoryException {
         super(options);
-        this.parentId = parentState.getNodeId();
+        parentId = parentState.getNodeId();
         this.parentState = parentState;
         this.nodeName = nodeName;
         this.nodeTypeName = nodeTypeName;
@@ -70,11 +67,13 @@ public class AddNode extends TransientOp
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      */
-    public void accept(OperationVisitor visitor) throws LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -84,6 +83,7 @@ public class AddNode extends TransientOp
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -101,6 +101,7 @@ public class AddNode extends TransientOp
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getParentId() {
         return parentId;
     }
@@ -130,6 +131,7 @@ public class AddNode extends TransientOp
     }
 
     //------------------------------------------------------------< Factory >---
+    
     /**
      *
      * @param parentState
@@ -144,7 +146,6 @@ public class AddNode extends TransientOp
         // in order to be able to detect conflicts.
         assertChildNodeEntries(parentState);
 
-        AddNode an = new AddNode(parentState, nodeName, nodeTypeName, uuid);
-        return an;
+        return new AddNode(parentState, nodeName, nodeTypeName, uuid);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java Thu Sep  1 11:52:08 2011
@@ -35,7 +35,6 @@ import org.apache.jackrabbit.spi.QValue;
  * <code>AddProperty</code>...
  */
 public class AddProperty extends TransientOperation {
-
     private final NodeId parentId;
     private final NodeState parentState;
     private final Name propertyName;
@@ -44,19 +43,19 @@ public class AddProperty extends Transie
 
     private final QPropertyDefinition definition;
 
-    private AddProperty(NodeState parentState, Name propName,
-                        int propertyType, QValue[] values,
-                        QPropertyDefinition definition) throws RepositoryException {
+    private AddProperty(NodeState parentState, Name propName, int propertyType, QValue[] values,
+            QPropertyDefinition definition) throws RepositoryException {
+        
         this(parentState, propName, propertyType, values, definition, DEFAULT_OPTIONS);
     }
     
-    private AddProperty(NodeState parentState, Name propName,
-                        int propertyType, QValue[] values,
-                        QPropertyDefinition definition, int options) throws RepositoryException {
+    private AddProperty(NodeState parentState, Name propName, int propertyType, QValue[] values,
+            QPropertyDefinition definition, int options) throws RepositoryException {
+        
         super(options);
-        this.parentId = parentState.getNodeId();
+        parentId = parentState.getNodeId();
         this.parentState = parentState;
-        this.propertyName = propName;
+        propertyName = propName;
         this.propertyType = propertyType;
         this.values = values;
         this.definition = definition;
@@ -65,11 +64,13 @@ public class AddProperty extends Transie
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      */
-    public void accept(OperationVisitor visitor) throws ValueFormatException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -77,6 +78,7 @@ public class AddProperty extends Transie
     /**
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -93,6 +95,7 @@ public class AddProperty extends Transie
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getParentId() {
         return parentId;
     }
@@ -122,6 +125,7 @@ public class AddProperty extends Transie
     }
 
     //------------------------------------------------------------< Factory >---
+    
     /**
      *
      * @param parentState
@@ -132,8 +136,8 @@ public class AddProperty extends Transie
      * @return
      */
     public static Operation create(NodeState parentState, Name propName, int propertyType,
-                                   QPropertyDefinition def, QValue[] values) throws RepositoryException {
-        AddProperty ap = new AddProperty(parentState, propName, propertyType, values, def);
-        return ap;
+            QPropertyDefinition def, QValue[] values) throws RepositoryException {
+        
+        return new AddProperty(parentState, propName, propertyType, values, def);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java Thu Sep  1 11:52:08 2011
@@ -37,8 +37,7 @@ import java.util.Iterator;
  * <code>Checkin</code>...
  */
 public class Checkin extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(Checkin.class);
+    private static final Logger log = LoggerFactory.getLogger(Checkin.class);
 
     private final NodeState nodeState;
     private final VersionManager mgr;
@@ -56,7 +55,8 @@ public class Checkin extends AbstractOpe
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -66,6 +66,7 @@ public class Checkin extends AbstractOpe
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -84,6 +85,7 @@ public class Checkin extends AbstractOpe
         }
         nodeState.getHierarchyEntry().invalidate(false);
     }
+
     //----------------------------------------< Access Operation Parameters >---
     
     /**
@@ -99,10 +101,12 @@ public class Checkin extends AbstractOpe
     }
 
     public NodeId getNewVersionId() {
-        return this.newVersionId;
+        return newVersionId;
     }
-    
+
+
     //------------------------------------------------------------< Factory >---
+    
     /**
      *
      * @param nodeState

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java Thu Sep  1 11:52:08 2011
@@ -37,8 +37,7 @@ import java.util.Iterator;
  * <code>Checkout</code>...
  */
 public class Checkout extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(Checkout.class);
+    private static final Logger log = LoggerFactory.getLogger(Checkout.class);
 
     private final NodeState nodeState;
     private final NodeId activityId;
@@ -62,7 +61,9 @@ public class Checkout extends AbstractOp
     }
 
     //----------------------------------------------------------< Operation >---
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -72,6 +73,7 @@ public class Checkout extends AbstractOp
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -94,6 +96,7 @@ public class Checkout extends AbstractOp
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     /**
      *
      * @return
@@ -123,6 +126,7 @@ public class Checkout extends AbstractOp
     }
 
     //------------------------------------------------------------< Factory >---
+    
     public static Operation create(NodeState nodeState, VersionManager mgr) {
         return new Checkout(nodeState, mgr);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java Thu Sep  1 11:52:08 2011
@@ -37,8 +37,7 @@ import java.util.Iterator;
  * <code>Checkout</code>...
  */
 public class Checkpoint extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(Checkpoint.class);
+    private static final Logger log = LoggerFactory.getLogger(Checkpoint.class);
 
     private final NodeState nodeState;
     private final VersionManager mgr;
@@ -65,7 +64,9 @@ public class Checkpoint extends Abstract
     }
 
     //----------------------------------------------------------< Operation >---
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -75,6 +76,7 @@ public class Checkpoint extends Abstract
      *
      * @see org.apache.jackrabbit.jcr2spi.operation.Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -97,6 +99,7 @@ public class Checkpoint extends Abstract
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     /**
      *
      * @return
@@ -130,10 +133,11 @@ public class Checkpoint extends Abstract
     }
 
     public NodeId getNewVersionId() {
-        return this.newVersionId;
+        return newVersionId;
     }
 
     //------------------------------------------------------------< Factory >---
+    
     public static Checkpoint create(NodeState nodeState, VersionManager mgr) {
         return new Checkpoint(nodeState, mgr);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java Thu Sep  1 11:52:08 2011
@@ -35,14 +35,11 @@ import org.slf4j.LoggerFactory;
  * <code>Clone</code>...
  */
 public class Clone extends AbstractCopy {
-
-    private static Logger log = LoggerFactory.getLogger(Clone.class);
-
     private final boolean removeExisting;
 
-    private Clone(Path srcPath, Path destPath, String srcWorkspaceName,
-                  boolean removeExisting, ManagerProvider srcMgrProvider,
-                  ManagerProvider destMgrProvider)
+    private Clone(Path srcPath, Path destPath, String srcWorkspaceName, boolean removeExisting,
+            ManagerProvider srcMgrProvider, ManagerProvider destMgrProvider)
+
         throws RepositoryException {
         super(srcPath, destPath, srcWorkspaceName, srcMgrProvider, destMgrProvider);
 
@@ -50,11 +47,13 @@ public class Clone extends AbstractCopy 
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      */
-    public void accept(OperationVisitor visitor) throws NoSuchWorkspaceException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -79,20 +78,17 @@ public class Clone extends AbstractCopy 
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public boolean isRemoveExisting() {
         return removeExisting;
     }
 
     //------------------------------------------------------------< Factory >---
+    
 
-    public static Operation create(Path srcPath, Path destPath,
-                                   String srcWorkspaceName, boolean removeExisting,
-                                   ManagerProvider srcMgrProvider,
-                                   ManagerProvider destMgrProvider)
-        throws RepositoryException, ConstraintViolationException, AccessDeniedException,
-        ItemExistsException, VersionException {
+    public static Operation create(Path srcPath, Path destPath, String srcWorkspaceName, boolean removeExisting,
+        ManagerProvider srcMgrProvider, ManagerProvider destMgrProvider) throws RepositoryException {
 
-        Clone cl = new Clone(srcPath, destPath, srcWorkspaceName, removeExisting, srcMgrProvider, destMgrProvider);
-        return cl;
+        return new Clone(srcPath, destPath, srcWorkspaceName, removeExisting, srcMgrProvider, destMgrProvider);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java Thu Sep  1 11:52:08 2011
@@ -34,27 +34,28 @@ import javax.jcr.version.VersionExceptio
 public class Copy extends AbstractCopy  {
 
     private Copy(Path srcPath, Path destPath, String srcWorkspaceName,
-                 ManagerProvider srcMgrProvider, ManagerProvider destMgrProvider) throws RepositoryException {
+            ManagerProvider srcMgrProvider, ManagerProvider destMgrProvider) throws RepositoryException {
+        
         super(srcPath, destPath, srcWorkspaceName, srcMgrProvider, destMgrProvider);
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      */
-    public void accept(OperationVisitor visitor) throws NoSuchWorkspaceException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
 
     //------------------------------------------------------------< Factory >---
-    public static Operation create(Path srcPath, Path destPath,
-                                   String srcWorkspaceName,
-                                   ManagerProvider srcMgrProvider,
-                                   ManagerProvider destMgrProvider)
-        throws RepositoryException, ConstraintViolationException, AccessDeniedException,
-        ItemExistsException, VersionException {
+
+    public static Operation create(Path srcPath, Path destPath, String srcWorkspaceName, ManagerProvider srcMgrProvider,
+            ManagerProvider destMgrProvider) throws RepositoryException {
+        
         Copy cp = new Copy(srcPath, destPath, srcWorkspaceName, srcMgrProvider, destMgrProvider);
         return cp;
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java Thu Sep  1 11:52:08 2011
@@ -33,22 +33,19 @@ import javax.jcr.version.VersionExceptio
  * <code>Checkout</code>...
  */
 public class CreateActivity extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(CreateActivity.class);
-
     private final String title;
-    private final VersionManager mgr;
 
     private NodeId newActivityId;
 
     private CreateActivity(String title, VersionManager mgr) {
         this.title = title;
-        this.mgr = mgr;
         // NOTE: affected-states only needed for transient modifications
     }
 
     //----------------------------------------------------------< Operation >---
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -58,6 +55,7 @@ public class CreateActivity extends Abst
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -66,6 +64,7 @@ public class CreateActivity extends Abst
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     /**
      *
      * @return
@@ -79,10 +78,11 @@ public class CreateActivity extends Abst
     }
 
     public NodeId getNewActivityId() {
-        return this.newActivityId;
+        return newActivityId;
     }
 
     //------------------------------------------------------------< Factory >---
+    
     public static CreateActivity create(String title, VersionManager mgr) {
         return new CreateActivity(title, mgr);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java Thu Sep  1 11:52:08 2011
@@ -34,23 +34,18 @@ import javax.jcr.version.VersionExceptio
  * <code>CreateConfiguration</code>...
  */
 public class CreateConfiguration extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(CreateConfiguration.class);
-
     private final NodeState nodeState;
-
-    private final VersionManager mgr;
-
     private NodeId newConfigurationId;
 
     private CreateConfiguration(NodeState nodeState, VersionManager mgr) {
         this.nodeState = nodeState;
-        this.mgr = mgr;
         // NOTE: affected-states only needed for transient modifications
     }
 
     //----------------------------------------------------------< Operation >---
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -60,6 +55,7 @@ public class CreateConfiguration extends
      *
      * @see org.apache.jackrabbit.jcr2spi.operation.Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -70,6 +66,7 @@ public class CreateConfiguration extends
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     /**
      *
      * @return
@@ -88,6 +85,7 @@ public class CreateConfiguration extends
     }
 
     //------------------------------------------------------------< Factory >---
+    
     public static CreateConfiguration create(NodeState nodeState, VersionManager mgr) {
         return new CreateConfiguration(nodeState, mgr);
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java Thu Sep  1 11:52:08 2011
@@ -39,10 +39,11 @@ public class LockOperation extends Abstr
     private final long timeoutHint;
     private final String ownerHint;
 
-    private LockInfo lockInfo = null;
+    private LockInfo lockInfo;
+
+    private LockOperation(NodeState nodeState, boolean isDeep, boolean isSessionScoped, long timeoutHint,
+            String ownerHint) {
 
-    private LockOperation(NodeState nodeState, boolean isDeep, boolean isSessionScoped,
-                          long timeoutHint, String ownerHint) {
         this.nodeState = nodeState;
         this.isDeep = isDeep;
         this.isSessionScoped = isSessionScoped;
@@ -53,10 +54,12 @@ public class LockOperation extends Abstr
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -66,6 +69,7 @@ public class LockOperation extends Abstr
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -74,6 +78,7 @@ public class LockOperation extends Abstr
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getNodeId() throws RepositoryException {
         return nodeState.getNodeId();
     }
@@ -111,6 +116,7 @@ public class LockOperation extends Abstr
         return lockInfo;
     }
     //------------------------------------------------------------< Factory >---
+    
     /**
      *
      * @param nodeState
@@ -122,7 +128,6 @@ public class LockOperation extends Abstr
     }
 
     public static LockOperation create(NodeState nodeState, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerHint) {
-        LockOperation lck = new LockOperation(nodeState, isDeep, isSessionScoped, timeoutHint, ownerHint);
-        return lck;
+        return new LockOperation(nodeState, isDeep, isSessionScoped, timeoutHint, ownerHint);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java Thu Sep  1 11:52:08 2011
@@ -41,10 +41,12 @@ public class LockRefresh extends Abstrac
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -52,6 +54,7 @@ public class LockRefresh extends Abstrac
     /**
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -59,18 +62,19 @@ public class LockRefresh extends Abstrac
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getNodeId() throws RepositoryException {
         return nodeState.getNodeId();
     }
 
     //------------------------------------------------------------< Factory >---
+    
     /**
      *
      * @param nodeState
      * @return
      */
     public static Operation create(NodeState nodeState) {
-        Operation lck = new LockRefresh(nodeState);
-        return lck;
+        return new LockRefresh(nodeState);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java Thu Sep  1 11:52:08 2011
@@ -34,7 +34,6 @@ import java.util.Iterator;
  * <code>LockRelease</code>...
  */
 public class LockRelease extends AbstractOperation {
-
     private final NodeState nodeState;
 
     private LockRelease(NodeState nodeState) {
@@ -44,10 +43,12 @@ public class LockRelease extends Abstrac
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -58,6 +59,7 @@ public class LockRelease extends Abstrac
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -72,18 +74,19 @@ public class LockRelease extends Abstrac
     }
 
     //----------------------------------------< Access Operation Parameters >---
+    
     public NodeId getNodeId() throws RepositoryException {
         return nodeState.getNodeId();
     }
 
     //------------------------------------------------------------< Factory >---
+
     /**
      *
      * @param nodeState
      * @return
      */
     public static Operation create(NodeState nodeState) {
-        Operation lck = new LockRelease(nodeState);
-        return lck;
+        return new LockRelease(nodeState);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java Thu Sep  1 11:52:08 2011
@@ -38,8 +38,7 @@ import org.slf4j.LoggerFactory;
  * <code>Merge</code>...
  */
 public class Merge extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(Merge.class);
+    private static final Logger log = LoggerFactory.getLogger(Merge.class);
 
     private final NodeState nodeState;
     private final String srcWorkspaceName;
@@ -47,7 +46,7 @@ public class Merge extends AbstractOpera
     private final boolean isShallow;
     private final VersionManager mgr;
 
-    private Iterator<NodeId> failedIds = null;
+    private Iterator<NodeId> failedIds;
 
     private Merge(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean isShallow, VersionManager mgr) {
         this.nodeState = nodeState;
@@ -60,19 +59,22 @@ public class Merge extends AbstractOpera
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
 
     /**
-     * Invalidates the target nodestate and all descendants.
+     * Invalidates the target node state and all descendants.
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -98,6 +100,7 @@ public class Merge extends AbstractOpera
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getNodeId() throws RepositoryException {
         return nodeState.getNodeEntry().getWorkspaceId();
     }
@@ -134,14 +137,18 @@ public class Merge extends AbstractOpera
         }
         return failedIds;
     }
+
     //------------------------------------------------------------< Factory >---
+    
     /**
      *
      * @param nodeState
      * @param srcWorkspaceName
      * @return
      */
-    public static Merge create(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean isShallow, VersionManager mgr) {
+    public static Merge create(NodeState nodeState, String srcWorkspaceName, boolean bestEffort, boolean isShallow,
+            VersionManager mgr) {
+        
         return new Merge(nodeState, srcWorkspaceName, bestEffort, isShallow, mgr);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java Thu Sep  1 11:52:08 2011
@@ -42,8 +42,7 @@ import org.slf4j.LoggerFactory;
  * <code>Move</code>...
  */
 public class Move extends TransientOperation {
-
-    private static Logger log = LoggerFactory.getLogger(Move.class);
+    private static final Logger log = LoggerFactory.getLogger(Move.class);
 
     private static final int MOVE_OPTIONS = ItemStateValidator.CHECK_ACCESS
             | ItemStateValidator.CHECK_LOCK
@@ -60,15 +59,16 @@ public class Move extends TransientOpera
 
     private final boolean sessionMove;
 
-    private Move(NodeState srcNodeState, NodeState srcParentState, NodeState destParentState, Name destName, boolean sessionMove)
-            throws RepositoryException {
+    private Move(NodeState srcNodeState, NodeState srcParentState, NodeState destParentState, Name destName,
+            boolean sessionMove) throws RepositoryException {
+        
         super(sessionMove ? MOVE_OPTIONS : ItemStateValidator.CHECK_NONE);
 
-        this.srcId = (NodeId) srcNodeState.getId();
-        this.destParentId = destParentState.getNodeId();
+        srcId = (NodeId) srcNodeState.getId();
+        destParentId = destParentState.getNodeId();
         this.destName = destName;
 
-        this.srcState = srcNodeState;
+        srcState = srcNodeState;
         this.srcParentState = srcParentState;
         this.destParentState = destParentState;
 
@@ -80,11 +80,13 @@ public class Move extends TransientOpera
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      */
-    public void accept(OperationVisitor visitor) throws LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -96,6 +98,7 @@ public class Move extends TransientOpera
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -105,7 +108,7 @@ public class Move extends TransientOpera
             // non-recursive invalidation
             try {
                 srcState.getNodeEntry().move(destName, destParentState.getNodeEntry(), false);
-                // TODO: TOBEFIXED. moved state ev. got a new definition.
+                // TODO: moved state ev. got a new definition.
             } catch (RepositoryException e) {
                 // should not occur
                 log.error("Internal error", e);
@@ -131,6 +134,7 @@ public class Move extends TransientOpera
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getSourceId() {
         return srcId;
     }
@@ -156,14 +160,14 @@ public class Move extends TransientOpera
     }
 
     //------------------------------------------------------------< Factory >---
-    public static Operation create(Path srcPath, Path destPath,
-                                   HierarchyManager hierMgr,
-                                                    PathResolver resolver,
-                                                    boolean sessionMove)
-        throws ItemExistsException, NoSuchNodeTypeException, RepositoryException {
+
+    public static Operation create(Path srcPath, Path destPath, HierarchyManager hierarchyManager, PathResolver resolver,
+            boolean sessionMove) throws RepositoryException {
+
         // src must not be ancestor of destination
         if (srcPath.isAncestorOf(destPath)) {
-            String msg = "Invalid destination path: cannot be descendant of source path (" + LogUtil.safeGetJCRPath(destPath, resolver) + "," + LogUtil.safeGetJCRPath(srcPath, resolver) + ")";
+            String msg = "Invalid destination path: cannot be descendant of source path (" +
+                    LogUtil.safeGetJCRPath(destPath, resolver) + ',' + LogUtil.safeGetJCRPath(srcPath, resolver) + ')';
             log.debug(msg);
             throw new RepositoryException(msg);
         }
@@ -172,7 +176,8 @@ public class Move extends TransientOpera
         int index = destPath.getIndex();
         if (index != Path.INDEX_UNDEFINED) {
             // subscript in name element
-            String msg = "Invalid destination path: subscript in name element is not allowed (" + LogUtil.safeGetJCRPath(destPath, resolver) + ")";
+            String msg = "Invalid destination path: subscript in name element is not allowed (" +
+                    LogUtil.safeGetJCRPath(destPath, resolver) + ')';
             log.debug(msg);
             throw new RepositoryException(msg);
         }
@@ -183,9 +188,9 @@ public class Move extends TransientOpera
             throw new RepositoryException(msg);
         }
 
-        NodeState srcState = getNodeState(srcPath, hierMgr);
-        NodeState srcParentState = getNodeState(srcPath.getAncestor(1), hierMgr);
-        NodeState destParentState = getNodeState(destPath.getAncestor(1), hierMgr);
+        NodeState srcState = getNodeState(srcPath, hierarchyManager);
+        NodeState srcParentState = getNodeState(srcPath.getAncestor(1), hierarchyManager);
+        NodeState destParentState = getNodeState(destPath.getAncestor(1), hierarchyManager);
         Name destName = destPath.getName();
 
         if (sessionMove) {
@@ -210,7 +215,6 @@ public class Move extends TransientOpera
             }
         }
 
-        Move move = new Move(srcState, srcParentState, destParentState, destName, sessionMove);
-        return move;
+        return new Move(srcState, srcParentState, destParentState, destName, sessionMove);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Operation.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Operation.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Operation.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Operation.java Thu Sep  1 11:52:08 2011
@@ -31,7 +31,6 @@ import java.util.Collection;
  * <code>Operation</code>...
  */
 public interface Operation {
-
     int STATUS_PENDING = 0;
     int STATUS_PERSISTED = 1;
     int STATUS_UNDO = 2;
@@ -41,7 +40,7 @@ public interface Operation {
      *
      * @return the name of <code>this</code> operation.
      */
-    public String getName();
+    String getName();
 
     /**
      * Calls the appropriate <code>visit</code> method on <code>visitor</code>
@@ -49,33 +48,35 @@ public interface Operation {
      *
      * @param visitor the visitor to call back.
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException;
+    void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException,
+            AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException,
+            VersionException;
 
     /**
      * A collection of {@link ItemState}s that are affected by this operation.
      *
      * @return collection of affected <code>ItemState</code>s.
      */
-    public Collection<ItemState> getAffectedItemStates();
+    Collection<ItemState> getAffectedItemStates();
 
     /**
      * Informs this Operation that it has been successfully executed.
      *
      * @throws RepositoryException
      */
-    public void persisted() throws RepositoryException;
+    void persisted() throws RepositoryException;
 
     /**
      * Revert changes made by this operation.
      * 
      * @throws RepositoryException
      */
-    public void undo() throws RepositoryException;
+    void undo() throws RepositoryException;
 
     /**
      * Returns the status of this operation.
      *
      * @return status of this operation.
      */
-    public int getStatus();
+    int getStatus();
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java Thu Sep  1 11:52:08 2011
@@ -34,72 +34,86 @@ import javax.jcr.version.VersionExceptio
  */
 public interface OperationVisitor {
 
-    public void visit(AddNode operation) throws RepositoryException;
+    void visit(AddNode operation) throws RepositoryException;
 
-    public void visit(AddProperty operation) throws RepositoryException;
+    void visit(AddProperty operation) throws RepositoryException;
 
-    public void visit(Remove operation) throws RepositoryException;
+    void visit(Remove operation) throws RepositoryException;
 
-    public void visit(SetMixin operation) throws RepositoryException;
+    void visit(SetMixin operation) throws RepositoryException;
 
     /**
      * @since JCR 2.0
      */
-    public void visit(SetPrimaryType operation) throws RepositoryException;
+    void visit(SetPrimaryType operation) throws RepositoryException;
 
-    public void visit(SetPropertyValue operation) throws RepositoryException;
+    void visit(SetPropertyValue operation) throws RepositoryException;
 
-    public void visit(ReorderNodes operation) throws RepositoryException;
+    void visit(ReorderNodes operation) throws RepositoryException;
 
-    public void visit(Clone operation) throws NoSuchWorkspaceException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException;
+    void visit(Clone operation) throws NoSuchWorkspaceException, LockException, ConstraintViolationException,
+            AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException,
+            RepositoryException;
 
-    public void visit(Copy operation) throws NoSuchWorkspaceException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException;
+    void visit(Copy operation) throws NoSuchWorkspaceException, LockException, ConstraintViolationException,
+            AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException,
+            RepositoryException;
 
-    public void visit(Move operation) throws LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException;
+    void visit(Move operation) throws LockException, ConstraintViolationException, AccessDeniedException,
+            ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException;
 
-    public void visit(Update operation) throws NoSuchWorkspaceException, AccessDeniedException, LockException, InvalidItemStateException, RepositoryException;
+    void visit(Update operation) throws NoSuchWorkspaceException, AccessDeniedException, LockException,
+            InvalidItemStateException, RepositoryException;
 
-    public void visit(Checkout operation) throws RepositoryException, UnsupportedRepositoryOperationException;
+    void visit(Checkout operation) throws RepositoryException, UnsupportedRepositoryOperationException;
 
-    public void visit(Checkin operation) throws UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException;
+    void visit(Checkin operation) throws UnsupportedRepositoryOperationException, LockException,
+            InvalidItemStateException, RepositoryException;
 
     /**
      * @since JCR 2.0
      */
-    public void visit(Checkpoint operation) throws RepositoryException;
+    void visit(Checkpoint operation) throws RepositoryException;
 
-    public void visit(Restore operation) throws VersionException, PathNotFoundException, ItemExistsException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException;
+    void visit(Restore operation) throws VersionException, PathNotFoundException, ItemExistsException,
+            UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException;
 
-    public void visit(Merge operation) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException;
+    void visit(Merge operation) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException,
+            InvalidItemStateException, RepositoryException;
 
-    public void visit(ResolveMergeConflict operation) throws VersionException, InvalidItemStateException, UnsupportedRepositoryOperationException, RepositoryException;
+    void visit(ResolveMergeConflict operation) throws VersionException, InvalidItemStateException,
+            UnsupportedRepositoryOperationException, RepositoryException;
 
-    public void visit(LockOperation operation) throws AccessDeniedException, InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException;
+    void visit(LockOperation operation) throws AccessDeniedException, InvalidItemStateException,
+            UnsupportedRepositoryOperationException, LockException, RepositoryException;
 
-    public void visit(LockRefresh operation) throws AccessDeniedException, InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException;
+    void visit(LockRefresh operation) throws AccessDeniedException, InvalidItemStateException,
+            UnsupportedRepositoryOperationException, LockException, RepositoryException;
 
-    public void visit(LockRelease operation) throws AccessDeniedException, InvalidItemStateException, UnsupportedRepositoryOperationException, LockException, RepositoryException;
+    void visit(LockRelease operation) throws AccessDeniedException, InvalidItemStateException,
+            UnsupportedRepositoryOperationException, LockException, RepositoryException;
 
-    public void visit(AddLabel operation) throws VersionException, RepositoryException;
+    void visit(AddLabel operation) throws VersionException, RepositoryException;
 
-    public void visit(RemoveLabel operation) throws VersionException, RepositoryException;
+    void visit(RemoveLabel operation) throws VersionException, RepositoryException;
 
-    public void visit(RemoveVersion operation) throws VersionException, AccessDeniedException, ReferentialIntegrityException, RepositoryException;
+    void visit(RemoveVersion operation) throws VersionException, AccessDeniedException,
+            ReferentialIntegrityException, RepositoryException;
 
-    public void visit(WorkspaceImport operation) throws RepositoryException;
+    void visit(WorkspaceImport operation) throws RepositoryException;
 
     /**
      * @since JCR 2.0
      */
-    public void visit(CreateActivity operation) throws RepositoryException;
+    void visit(CreateActivity operation) throws RepositoryException;
 
     /**
      * @since JCR 2.0
      */
-    public void visit(RemoveActivity operation) throws RepositoryException;
+    void visit(RemoveActivity operation) throws RepositoryException;
 
     /**
      * @since JCR 2.0
      */
-    public void visit(CreateConfiguration operation) throws RepositoryException;
+    void visit(CreateConfiguration operation) throws RepositoryException;
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java Thu Sep  1 11:52:08 2011
@@ -32,11 +32,7 @@ import org.slf4j.LoggerFactory;
  * <code>Remove</code>...
  */
 public class Remove extends TransientOperation {
-
-    private static Logger log = LoggerFactory.getLogger(Remove.class);
-
-    private static final int REMOVE_OPTIONS =
-            ItemStateValidator.CHECK_LOCK
+    private static final int REMOVE_OPTIONS = ItemStateValidator.CHECK_LOCK
             | ItemStateValidator.CHECK_VERSIONING
             | ItemStateValidator.CHECK_CONSTRAINTS;
 
@@ -50,7 +46,7 @@ public class Remove extends TransientOpe
 
     private Remove(ItemState removeState, NodeState parent, int options) throws RepositoryException {
         super(options);
-        this.removeId = removeState.getId();
+        removeId = removeState.getId();
         this.removeState = removeState;
         this.parent = parent;
 
@@ -59,10 +55,12 @@ public class Remove extends TransientOpe
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -70,6 +68,7 @@ public class Remove extends TransientOpe
     /**
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -87,6 +86,7 @@ public class Remove extends TransientOpe
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public ItemId getRemoveId() throws RepositoryException {
         return removeId;
     }
@@ -100,6 +100,7 @@ public class Remove extends TransientOpe
     }
 
     //------------------------------------------------------------< Factory >---
+
     public static Operation create(ItemState state) throws RepositoryException {
         if (state.isNode() && ((NodeState) state).getDefinition().allowsSameNameSiblings()) {
             // in case of SNS-siblings make sure the parent hierarchy entry has

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java Thu Sep  1 11:52:08 2011
@@ -34,34 +34,35 @@ import org.slf4j.LoggerFactory;
  * <code>RemoveActivity</code>...
  */
 public class RemoveActivity extends AbstractRemove {
-
-    private static Logger log = LoggerFactory.getLogger(RemoveActivity.class);
-
     private final Iterator<PropertyId> refs;
     private final HierarchyManager hMgr;
 
     private RemoveActivity(NodeState removeActivity, HierarchyManager hierarchyMgr)
             throws RepositoryException {
+
         super(removeActivity, removeActivity.getParent());
         refs = removeActivity.getNodeReferences(null, false);
         hMgr = hierarchyMgr;
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see org.apache.jackrabbit.jcr2spi.operation.Operation#accept(org.apache.jackrabbit.jcr2spi.operation.OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
 
     /**
      * Invalidates the <code>NodeState</code> that has been updated and all
-     * its decendants. Second, the parent state gets invalidated.
+     * its descendants. Second, the parent state gets invalidated.
      *
      * @see org.apache.jackrabbit.jcr2spi.operation.Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -79,9 +80,10 @@ public class RemoveActivity extends Abst
     }
 
     //------------------------------------------------------------< Factory >---
+    
     public static Operation create(NodeState activityState, HierarchyManager hierarchyMgr)
             throws RepositoryException {
-        RemoveActivity rm = new RemoveActivity(activityState, hierarchyMgr);
-        return rm;
+        
+        return new RemoveActivity(activityState, hierarchyMgr);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java Thu Sep  1 11:52:08 2011
@@ -37,8 +37,7 @@ import javax.jcr.version.VersionExceptio
  * <code>RemoveLabel</code>...
  */
 public class RemoveLabel extends AbstractOperation {
-
-    private static Logger log = LoggerFactory.getLogger(RemoveLabel.class);
+    private static final Logger log = LoggerFactory.getLogger(RemoveLabel.class);
 
     private final NodeState versionHistoryState;
     private final NodeState versionState;
@@ -51,7 +50,9 @@ public class RemoveLabel extends Abstrac
 
         // NOTE: affected-states only needed for transient modifications
     }
+
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
@@ -63,17 +64,19 @@ public class RemoveLabel extends Abstrac
      * @throws UnsupportedRepositoryOperationException
      * @throws VersionException
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException {       
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
 
     /**
-     * Invalidates the jcr:versionlabel nodestate present with the given
-     * version history and all decendant states (property states).
+     * Invalidates the jcr:versionLabel node state present with the given
+     * version history and all descendant states (property states).
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         status = STATUS_PERSISTED;
         try {
@@ -88,6 +91,7 @@ public class RemoveLabel extends Abstrac
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getVersionHistoryId() throws RepositoryException {
         return versionHistoryState.getNodeEntry().getWorkspaceId();
     }
@@ -101,6 +105,7 @@ public class RemoveLabel extends Abstrac
     }
 
     //------------------------------------------------------------< Factory >---
+
     /**
      *
      * @param versionHistoryState

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java Thu Sep  1 11:52:08 2011
@@ -35,13 +35,11 @@ import org.slf4j.LoggerFactory;
  * <code>RemoveVersion</code>...
  */
 public class RemoveVersion extends AbstractRemove {
+    private static final Logger log = LoggerFactory.getLogger(RemoveVersion.class);
 
-    private static Logger log = LoggerFactory.getLogger(RemoveVersion.class);
+    private NodeEntry versionableEntry;
 
-    private NodeEntry versionableEntry = null;
-
-    private RemoveVersion(ItemState removeState, NodeState parent, VersionManager mgr)
-            throws RepositoryException {
+    private RemoveVersion(ItemState removeState, NodeState parent, VersionManager mgr) {
         super(removeState, parent);
         try {
             versionableEntry = mgr.getVersionableNodeEntry((NodeState) removeState);
@@ -51,10 +49,12 @@ public class RemoveVersion extends Abstr
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -65,6 +65,7 @@ public class RemoveVersion extends Abstr
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -78,15 +79,14 @@ public class RemoveVersion extends Abstr
             versionableEntry.invalidate(false);
         }
 
-        // invalidate the versionhistory entry and all its children
+        // invalidate the version history entry and all its children
         // in order to have the v-graph recalculated
         parent.getNodeEntry().invalidate(true);
     }
 
     //------------------------------------------------------------< Factory >---
-    public static Operation create(NodeState versionState, NodeState vhState, VersionManager mgr)
-            throws RepositoryException {
-        RemoveVersion rm = new RemoveVersion(versionState, vhState, mgr);
-        return rm;
+    
+    public static Operation create(NodeState versionState, NodeState vhState, VersionManager mgr) {
+        return new RemoveVersion(versionState, vhState, mgr);
     }
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java Thu Sep  1 11:52:08 2011
@@ -31,7 +31,6 @@ import org.apache.jackrabbit.spi.Path;
  * <code>ReorderNodes</code>...
  */
 public class ReorderNodes extends TransientOperation {
-
     private final NodeId parentId;
     private final NodeId insertId;
     private final NodeId beforeId;
@@ -42,24 +41,27 @@ public class ReorderNodes extends Transi
 
     private ReorderNodes(NodeState parentState, NodeState insert, NodeState before)
             throws RepositoryException {
+
         super(NO_OPTIONS);
         this.parentState = parentState;
         this.insert = insert;
         this.before = before;
 
-        this.parentId = parentState.getNodeId();
-        this.insertId = insert.getNodeId();
-        this.beforeId = (before == null) ? null : before.getNodeId();
+        parentId = parentState.getNodeId();
+        insertId = insert.getNodeId();
+        beforeId = before == null ? null : before.getNodeId();
 
         addAffectedItemState(parentState);
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      */
-    public void accept(OperationVisitor visitor) throws ConstraintViolationException, AccessDeniedException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -69,6 +71,7 @@ public class ReorderNodes extends Transi
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -113,9 +116,7 @@ public class ReorderNodes extends Transi
 
     //------------------------------------------------------------< Factory >---
 
-    public static Operation create(
-            NodeState parentState, Path srcPath, Path beforePath)
-            throws ItemNotFoundException, RepositoryException {
+    public static Operation create(NodeState parentState, Path srcPath, Path beforePath) throws RepositoryException {
         // make sure the parent hierarchy entry has its child entries loaded
         assertChildNodeEntries(parentState);
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java Thu Sep  1 11:52:08 2011
@@ -34,27 +34,26 @@ import java.util.Iterator;
  * <code>ResolveMergeConflict</code>...
  */
 public class ResolveMergeConflict extends AbstractOperation {
-
     private final NodeState nodeState;
     private final NodeId[] mergeFailedIds;
     private final NodeId[] predecessorIds;
-    private final boolean resolveDone;
 
-    private ResolveMergeConflict(NodeState nodeState, NodeId[] mergeFailedIds, NodeId[] predecessorIds, boolean resolveDone) {
+    private ResolveMergeConflict(NodeState nodeState, NodeId[] mergeFailedIds, NodeId[] predecessorIds,
+            boolean resolveDone) {
+
         this.nodeState = nodeState;
         this.mergeFailedIds = mergeFailedIds;
         this.predecessorIds = predecessorIds;
-        this.resolveDone = resolveDone;
-
-
         // NOTE: affected-states only needed for transient modifications
     }
 
     //----------------------------------------------------------< Operation >---
+    
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws RepositoryException, ConstraintViolationException, AccessDeniedException, ItemExistsException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -65,6 +64,7 @@ public class ResolveMergeConflict extend
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -76,7 +76,9 @@ public class ResolveMergeConflict extend
         }
         nodeState.getHierarchyEntry().invalidate(false);
     }
+
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeId getNodeId() throws RepositoryException {
         return nodeState.getNodeEntry().getWorkspaceId();
     }
@@ -89,11 +91,8 @@ public class ResolveMergeConflict extend
         return predecessorIds;
     }
 
-    public boolean resolveDone() {
-        return resolveDone;
-    }
-
     //------------------------------------------------------------< Factory >---
+
     /**
      *
      * @param nodeState
@@ -101,8 +100,9 @@ public class ResolveMergeConflict extend
      * @param predecessorIds
      * @param resolveDone
      */
-    public static Operation create(NodeState nodeState, NodeId[] mergeFailedIds, NodeId[] predecessorIds, boolean resolveDone) {
-        ResolveMergeConflict up = new ResolveMergeConflict(nodeState, mergeFailedIds, predecessorIds, resolveDone);
-        return up;
+    public static Operation create(NodeState nodeState, NodeId[] mergeFailedIds, NodeId[] predecessorIds,
+            boolean resolveDone) {
+        
+        return new ResolveMergeConflict(nodeState, mergeFailedIds, predecessorIds, resolveDone);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java Thu Sep  1 11:52:08 2011
@@ -35,7 +35,6 @@ import javax.jcr.nodetype.ConstraintViol
  * <code>Restore</code>...
  */
 public class Restore extends AbstractOperation {
-
     private final NodeState nodeState;
     private final Path relQPath;
     private final NodeState[] versionStates;
@@ -51,10 +50,12 @@ public class Restore extends AbstractOpe
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws PathNotFoundException, ItemExistsException, VersionException, ConstraintViolationException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -66,6 +67,7 @@ public class Restore extends AbstractOpe
      *
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -73,8 +75,8 @@ public class Restore extends AbstractOpe
         if (nodeState == null || removeExisting) {
             // invalidate the complete tree
             // -> start searching root-entry from any version-entry or
-            //    from the given nodestate
-            entry = (nodeState == null) ? versionStates[0].getNodeEntry() : nodeState.getNodeEntry();
+            //    from the given node state
+            entry = nodeState == null ? versionStates[0].getNodeEntry() : nodeState.getNodeEntry();
             while (entry.getParent() != null) {
                 entry = entry.getParent();
             }
@@ -85,6 +87,7 @@ public class Restore extends AbstractOpe
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     /**
      * Returns id of state or the closest existing state of the restore target or
      * <code>null</code> in case of a {@link javax.jcr.Workspace#restore(Version[], boolean)}
@@ -92,7 +95,7 @@ public class Restore extends AbstractOpe
      * @return
      */
     public NodeId getNodeId() throws RepositoryException {
-        return (nodeState == null) ? null : nodeState.getNodeEntry().getWorkspaceId();
+        return nodeState == null ? null : nodeState.getNodeEntry().getWorkspaceId();
     }
 
     /**
@@ -119,6 +122,7 @@ public class Restore extends AbstractOpe
     }
 
     //------------------------------------------------------------< Factory >---
+
     /**
      *
      * @param nodeState
@@ -129,8 +133,7 @@ public class Restore extends AbstractOpe
         if (nodeState == null || versionState == null) {
             throw new IllegalArgumentException("Neither nodeState nor versionState must be null.");
         }
-        Restore up = new Restore(nodeState, relQPath, new NodeState[] {versionState}, removeExisting);
-        return up;
+        return new Restore(nodeState, relQPath, new NodeState[] {versionState}, removeExisting);
     }
 
     /**
@@ -142,7 +145,6 @@ public class Restore extends AbstractOpe
         if (versionStates == null || versionStates.length == 0) {
             throw new IllegalArgumentException("Version states must not be null.");
         }
-        Restore up = new Restore(null, null, versionStates, removeExisting);
-        return up;
+        return new Restore(null, null, versionStates, removeExisting);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java Thu Sep  1 11:52:08 2011
@@ -32,9 +32,7 @@ import org.apache.jackrabbit.spi.commons
  * <code>SetMixin</code>...
  */
 public class SetMixin extends TransientOperation {
-
-    private static final int SET_MIXIN_OPTIONS =
-            ItemStateValidator.CHECK_LOCK
+    private static final int SET_MIXIN_OPTIONS = ItemStateValidator.CHECK_LOCK
             | ItemStateValidator.CHECK_VERSIONING;
 
     private final NodeId nodeId;
@@ -48,7 +46,7 @@ public class SetMixin extends TransientO
     private SetMixin(NodeState nodeState, Name[] mixinNames, int options) throws RepositoryException {
         super(options);
         this.nodeState = nodeState;
-        this.nodeId = nodeState.getNodeId();
+        nodeId = nodeState.getNodeId();
         this.mixinNames = mixinNames;
 
         // remember node state as affected state
@@ -65,12 +63,14 @@ public class SetMixin extends TransientO
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws AccessDeniedException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -78,6 +78,7 @@ public class SetMixin extends TransientO
     /**
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -95,6 +96,7 @@ public class SetMixin extends TransientO
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeState getNodeState() {
         return nodeState;
     }
@@ -114,7 +116,6 @@ public class SetMixin extends TransientO
         if (nodeState == null || mixinNames == null) {
             throw new IllegalArgumentException();
         }
-        SetMixin sm = new SetMixin(nodeState, mixinNames);
-        return sm;
+        return new SetMixin(nodeState, mixinNames);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java Thu Sep  1 11:52:08 2011
@@ -31,8 +31,7 @@ import org.apache.jackrabbit.spi.NodeId;
  * <code>SetPrimaryNodeType</code>...
  */
 public class SetPrimaryType extends TransientOperation {
-
-    private final static int SET_PRIMARY_TYPE_OPTIONS =
+    private static final int SET_PRIMARY_TYPE_OPTIONS =
             ItemStateValidator.CHECK_VERSIONING
             | ItemStateValidator.CHECK_LOCK;
 
@@ -43,10 +42,11 @@ public class SetPrimaryType extends Tran
     private SetPrimaryType(NodeState nodeState, Name primaryTypeName) throws RepositoryException {
         this(nodeState, primaryTypeName, SET_PRIMARY_TYPE_OPTIONS);
     }
+
     private SetPrimaryType(NodeState nodeState, Name primaryTypeName, int options) throws RepositoryException {
         super(options);
         this.nodeState = nodeState;
-        this.nodeId = nodeState.getNodeId();
+        nodeId = nodeState.getNodeId();
         this.primaryTypeName = primaryTypeName;
 
         // remember node state as affected state
@@ -54,12 +54,14 @@ public class SetPrimaryType extends Tran
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws AccessDeniedException, NoSuchNodeTypeException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -67,6 +69,7 @@ public class SetPrimaryType extends Tran
     /**
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -84,6 +87,7 @@ public class SetPrimaryType extends Tran
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public NodeState getNodeState() {
         return nodeState;
     }
@@ -103,7 +107,6 @@ public class SetPrimaryType extends Tran
         if (nodeState == null || primaryTypeName == null) {
             throw new IllegalArgumentException();
         }
-        SetPrimaryType op = new SetPrimaryType(nodeState, primaryTypeName);
-        return op;
+        return new SetPrimaryType(nodeState, primaryTypeName);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java Thu Sep  1 11:52:08 2011
@@ -37,9 +37,7 @@ import org.apache.jackrabbit.spi.QValue;
  * <code>SetPropertyValue</code>...
  */
 public class SetPropertyValue extends TransientOperation {
-
-    private static final int SET_PROPERTY_OPTIONS =
-            ItemStateValidator.CHECK_LOCK
+    private static final int SET_PROPERTY_OPTIONS = ItemStateValidator.CHECK_LOCK
             | ItemStateValidator.CHECK_VERSIONING
             | ItemStateValidator.CHECK_CONSTRAINTS;
     
@@ -52,12 +50,13 @@ public class SetPropertyValue extends Tr
 
     private SetPropertyValue(PropertyState propertyState, int valueType, QValue[] values)
             throws RepositoryException {
-        this(propertyState, valueType, values, SET_PROPERTY_OPTIONS);
 
+        this(propertyState, valueType, values, SET_PROPERTY_OPTIONS);
     }
 
-    private SetPropertyValue(PropertyState propertyState, int valueType,
-                             QValue[] values, int options) throws RepositoryException {
+    private SetPropertyValue(PropertyState propertyState, int valueType, QValue[] values, int options)
+            throws RepositoryException {
+
         super(options);
         this.propertyState = propertyState;
 
@@ -72,12 +71,14 @@ public class SetPropertyValue extends Tr
     }
 
     //----------------------------------------------------------< Operation >---
+
     /**
      *
      * @param visitor
      * @see Operation#accept(OperationVisitor)
      */
-    public void accept(OperationVisitor visitor) throws ValueFormatException, LockException, ConstraintViolationException, AccessDeniedException, ItemExistsException, UnsupportedRepositoryOperationException, VersionException, RepositoryException {
+    @Override
+    public void accept(OperationVisitor visitor) throws RepositoryException {
         assert status == STATUS_PENDING;
         visitor.visit(this);
     }
@@ -85,6 +86,7 @@ public class SetPropertyValue extends Tr
     /**
      * @see Operation#persisted()
      */
+    @Override
     public void persisted() throws RepositoryException {
         assert status == STATUS_PENDING;
         status = STATUS_PERSISTED;
@@ -112,6 +114,7 @@ public class SetPropertyValue extends Tr
     }
 
     //----------------------------------------< Access Operation Parameters >---
+
     public PropertyId getPropertyId() {
         return propertyId;
     }
@@ -133,8 +136,8 @@ public class SetPropertyValue extends Tr
     }
 
     //------------------------------------------------------------< Factory >---
-    public static Operation create(PropertyState propState, QValue[] qValues,
-                                   int valueType) throws RepositoryException {
+
+    public static Operation create(PropertyState propState, QValue[] qValues, int valueType) throws RepositoryException {
         // compact array (purge null entries)
         List<QValue> list = new ArrayList<QValue>();
         for (QValue qValue : qValues) {
@@ -143,7 +146,6 @@ public class SetPropertyValue extends Tr
             }
         }
         QValue[] cleanValues = list.toArray(new QValue[list.size()]);
-        SetPropertyValue sv = new SetPropertyValue(propState, valueType, cleanValues);
-        return sv;
+        return new SetPropertyValue(propState, valueType, cleanValues);
     }
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperation.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperation.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperation.java Thu Sep  1 11:52:08 2011
@@ -22,13 +22,11 @@ import org.apache.jackrabbit.jcr2spi.sta
  * <code>TransientOperation</code>...
  */
 public abstract class TransientOperation extends AbstractOperation {
-
     static final int NO_OPTIONS = ItemStateValidator.CHECK_NONE;
-    static final int DEFAULT_OPTIONS =
-            ItemStateValidator.CHECK_LOCK |
-            ItemStateValidator.CHECK_COLLISION |
-            ItemStateValidator.CHECK_VERSIONING |
-            ItemStateValidator.CHECK_CONSTRAINTS;
+    static final int DEFAULT_OPTIONS = ItemStateValidator.CHECK_LOCK
+            | ItemStateValidator.CHECK_COLLISION
+            | ItemStateValidator.CHECK_VERSIONING
+            | ItemStateValidator.CHECK_CONSTRAINTS;
 
     private final int options;
 



Mime
View raw message