[396804] CDOMergingConflictResolver tests

https://bugs.eclipse.org/bugs/show_bug.cgi?id=396804

4 files changed, 35 insertions, 6 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java
index 69a36d2899..5a5b2aed69 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -12,8 +12,8 @@
 package org.eclipse.emf.cdo.common.revision.delta;
 
 /**
- * Visits all {@link CDOFeatureDelta feature deltas} of a {@link CDORevisionDelta revision delta}.
- * 
+ * Visits {@link CDOFeatureDelta feature deltas} of a {@link CDORevisionDelta revision delta}.
+ *
  * @see CDORevisionDelta#accept(CDOFeatureDeltaVisitor)
  * @author Simon McDuff
  * @apiviz.uses {@link CDOFeatureDelta} - - visits
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java
index 47c22c4b3c..0c241699e3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOListFeatureDelta.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Simon McDuff - initial API and implementation
  *    Eike Stepper - maintenance
@@ -19,13 +19,13 @@ import java.util.List;
  * A {@link CDOFeatureDelta feature delta} that represents any modification of the list of a many-valued
  * {@link EStructuralFeature feature}. The detailed changes to this list are returned by the {@link #getListChanges()}
  * method.
- * 
+ *
  * @author Simon McDuff
  * @noextend This interface is not intended to be extended by clients.
  * @noimplement This interface is not intended to be implemented by clients.
  * @apiviz.composedOf {@link CDOFeatureDelta} - - listChanges
  */
-public interface CDOListFeatureDelta extends CDOFeatureDelta
+public interface CDOListFeatureDelta extends CDOFeatureDelta, CDOOriginSizeProvider
 {
   public List<CDOFeatureDelta> getListChanges();
 }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java
new file mode 100644
index 0000000000..73a4897d83
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDOOriginSizeProvider.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.common.revision.delta;
+
+/**
+ * If the meaning of this type isn't clear, there really should be more of a description here...
+ *
+ * @author Eike Stepper
+ * @since 4.2
+ */
+public interface CDOOriginSizeProvider
+{
+  public int getOriginSize();
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java
index 990fcda9f9..720c0be346 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/revision/delta/CDORevisionDelta.java
@@ -19,6 +19,8 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionData;
 import org.eclipse.emf.cdo.common.revision.CDORevisionKey;
 import org.eclipse.emf.cdo.internal.common.revision.delta.CDODetachedRevisionDeltaImpl;
 
+import org.eclipse.net4j.util.Predicate;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
@@ -90,4 +92,9 @@ public interface CDORevisionDelta extends CDORevisionKey
   public void apply(CDORevision revision);
 
   public void accept(CDOFeatureDeltaVisitor visitor);
+
+  /**
+   * @since 4.2
+   */
+  public void accept(CDOFeatureDeltaVisitor visitor, Predicate<EStructuralFeature> filter);
 }