Author: mduerig Date: Tue Oct 9 13:43:59 2012 New Revision: 1396036 URL: http://svn.apache.org/viewvc?rev=1396036&view=rev Log: OAK-350: Unify PropertyState and CoreValue - Remove CoreValueFactory member from AnnotatingConflictHandler
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandlerProvider.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandlerProvider.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java?rev=1396036&r1=1396035&r2=1396036&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java Tue Oct 9 13:43:59 2012 @@ -76,7 +76,7 @@ class ContentSessionImpl implements Cont public Root getLatestRoot() { RootImpl root = new RootImpl(store, workspaceName, loginContext.getSubject(), accProvider, indexProvider); if (conflictHandlerProvider != null) { - root.setConflictHandler(conflictHandlerProvider.getConflictHandler(getCoreValueFactory())); + root.setConflictHandler(conflictHandlerProvider.getConflictHandler()); } return root; } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java?rev=1396036&r1=1396035&r2=1396036&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandler.java Tue Oct 9 13:43:59 2012 @@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import com.google.common.collect.Lists; -import org.apache.jackrabbit.oak.api.CoreValueFactory; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.spi.commit.ConflictHandler; @@ -54,11 +53,6 @@ import static org.apache.jackrabbit.oak. * @see ConflictValidator */ public class AnnotatingConflictHandler implements ConflictHandler { - private final CoreValueFactory valueFactory; - - public AnnotatingConflictHandler(CoreValueFactory valueFactory) { - this.valueFactory = valueFactory; - } @Override public Resolution addExistingProperty(Tree parent, PropertyState ours, PropertyState theirs) { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandlerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandlerProvider.java?rev=1396036&r1=1396035&r2=1396036&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandlerProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/AnnotatingConflictHandlerProvider.java Tue Oct 9 13:43:59 2012 @@ -1,12 +1,11 @@ package org.apache.jackrabbit.oak.plugins.commit; -import org.apache.jackrabbit.oak.api.CoreValueFactory; import org.apache.jackrabbit.oak.spi.commit.ConflictHandler; import org.apache.jackrabbit.oak.spi.commit.ConflictHandlerProvider; public class AnnotatingConflictHandlerProvider implements ConflictHandlerProvider { @Override - public ConflictHandler getConflictHandler(CoreValueFactory valueFactory) { - return new AnnotatingConflictHandler(valueFactory); + public ConflictHandler getConflictHandler() { + return new AnnotatingConflictHandler(); } } Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandlerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandlerProvider.java?rev=1396036&r1=1396035&r2=1396036&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandlerProvider.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/ConflictHandlerProvider.java Tue Oct 9 13:43:59 2012 @@ -1,7 +1,5 @@ package org.apache.jackrabbit.oak.spi.commit; -import org.apache.jackrabbit.oak.api.CoreValueFactory; - public interface ConflictHandlerProvider { - ConflictHandler getConflictHandler(CoreValueFactory valueFactory); + ConflictHandler getConflictHandler(); }