diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Conflict.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Conflict.java | 84 |
1 files changed, 84 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Conflict.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Conflict.java new file mode 100644 index 000000000..8d31c95fe --- /dev/null +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Conflict.java @@ -0,0 +1,84 @@ +/**
+ * Copyright (c) 2012 Obeo.
+ * 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:
+ * Obeo - initial API and implementation
+ */
+package org.eclipse.emf.compare;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Conflict</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * Instances of this class describe conflicts between one or more differences in the left model as compared to differences in the right model. Conflicts can only happen in the case of three-way comparisons, when we have a common ancestor of both sides.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.compare.Conflict#getDifferences <em>Differences</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.compare.ComparePackage#getConflict()
+ * @model
+ * @generated
+ */
+public interface Conflict extends EObject {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
+
+ /**
+ * Returns the value of the '<em><b>Differences</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.compare.Diff}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.compare.Diff#getConflict <em>Conflict</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This will reference all differences that are related to this conflict. The number of elements contained in this list is <u>at least</u> two.
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Differences</em>' reference list.
+ * @see org.eclipse.emf.compare.ComparePackage#getConflict_Differences()
+ * @see org.eclipse.emf.compare.Diff#getConflict
+ * @model opposite="conflict" lower="2"
+ * @generated
+ */
+ EList<Diff> getDifferences();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This can be used to retrieve the list of differences that were made in the left element.
+ * <!-- end-model-doc -->
+ * @model kind="operation" required="true"
+ * @generated
+ */
+ EList<Diff> getLeftDifferences();
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * This can be used to retrieve the list of differences that were made in the right element.
+ * <!-- end-model-doc -->
+ * @model kind="operation" required="true"
+ * @generated
+ */
+ EList<Diff> getRightDifferences();
+
+} // Conflict
|