You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2012/06/16 18:24:56 UTC
svn commit: r1350955 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/api/ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/

Author: mduerig
Date: Sat Jun 16 16:24:56 2012
New Revision: 1350955

URL: http://svn.apache.org/viewvc?rev=1350955&view=rev
Log:
OAK-133: Session.refresh(true) should allow for manual conflict reconciliation
fix refactoring accident: use Tree instead of TreeImpl in API method signature

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ConflictHandler.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/DefaultConflictHandler.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ConflictHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ConflictHandler.java?rev=1350955&r1=1350954&r2=1350955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ConflictHandler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/ConflictHandler.java Sat Jun 16 16:24:56 2012
@@ -18,7 +18,6 @@
  */
 package org.apache.jackrabbit.oak.api;
 
-import org.apache.jackrabbit.oak.core.TreeImpl;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 
 /**
@@ -96,7 +95,7 @@ public interface ConflictHandler {
      * @param ours  our version of the property
      * @return  {@link Resolution} of the conflict
      */
-    Resolution deleteDeletedProperty(TreeImpl parent, PropertyState ours);
+    Resolution deleteDeletedProperty(Tree parent, PropertyState ours);
 
     /**
      * The property {@code theirs} changed in the persistence store while it has been

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/DefaultConflictHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/DefaultConflictHandler.java?rev=1350955&r1=1350954&r2=1350955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/DefaultConflictHandler.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/DefaultConflictHandler.java Sat Jun 16 16:24:56 2012
@@ -73,7 +73,7 @@ public class DefaultConflictHandler impl
     }
 
     @Override
-    public Resolution deleteDeletedProperty(TreeImpl parent, PropertyState ours) {
+    public Resolution deleteDeletedProperty(Tree parent, PropertyState ours) {
         return resolution;
     }
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java?rev=1350955&r1=1350954&r2=1350955&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionDelegate.java Sat Jun 16 16:24:56 2012
@@ -54,7 +54,6 @@ import org.apache.jackrabbit.oak.api.Roo
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.core.DefaultConflictHandler;
-import org.apache.jackrabbit.oak.core.TreeImpl;
 import org.apache.jackrabbit.oak.jcr.value.ValueFactoryImpl;
 import org.apache.jackrabbit.oak.namepath.AbstractNameMapper;
 import org.apache.jackrabbit.oak.namepath.NameMapper;
@@ -521,7 +520,7 @@ public class SessionDelegate {
         }
 
         @Override
-        public Resolution deleteDeletedProperty(TreeImpl parent, PropertyState ours) {
+        public Resolution deleteDeletedProperty(Tree parent, PropertyState ours) {
             Tree marker = addConflictMarker(parent);
             setProperty(getOrCreateNode(marker, DELETE_DELETED), ours);
             return Resolution.THEIRS;