diff options
| author | Mikaël Barbero | 2012-04-27 09:42:20 +0000 |
|---|---|---|
| committer | Mikaël Barbero | 2012-04-27 09:42:20 +0000 |
| commit | af64496619e463da7a46459ccaa75bf3f285a5cf (patch) | |
| tree | 19b3d71ebaeb05c29f08f0503a77204b0198e0d6 /plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf | |
| parent | dbdb5442bdde2984cc4ff2a609fd54f0fc277478 (diff) | |
| download | org.eclipse.emf.compare-af64496619e463da7a46459ccaa75bf3f285a5cf.tar.gz org.eclipse.emf.compare-af64496619e463da7a46459ccaa75bf3f285a5cf.tar.xz org.eclipse.emf.compare-af64496619e463da7a46459ccaa75bf3f285a5cf.zip | |
add Match#getComparison() EOperation
add override_factory extension point instead of modifying
CompareFactoryImpl
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf')
4 files changed, 27 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Match.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Match.java index d6827007d..b9d1dc776 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Match.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/Match.java @@ -153,4 +153,15 @@ public interface Match extends EObject { */
void setOrigin(EObject value);
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ * Finds and return the Comparison containing this Match.
+ * <!-- end-model-doc -->
+ * @model kind="operation"
+ * @generated
+ */
+ Comparison getComparison();
+
} // Match
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java index 0bdc7ed40..ca40ebd10 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java @@ -139,11 +139,10 @@ public class CompareFactoryImpl extends EFactoryImpl implements CompareFactory { /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
- * @generated NOT
+ * @generated
*/
public Comparison createComparison() {
- ComparisonImpl comparison = new ComparisonSpec();
+ ComparisonImpl comparison = new ComparisonImpl();
return comparison;
}
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java index b58cea60c..328905670 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java @@ -780,6 +780,8 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { null,
"origin", null, 0, 1, Match.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ addEOperation(matchEClass, this.getComparison(), "getComparison", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+
initEClass(diffEClass, Diff.class, "Diff", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(
getDiff_Match(),
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java index de34ec440..35bb9f66d 100644 --- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java +++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java @@ -18,6 +18,7 @@ import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.compare.ComparePackage;
+import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.Match;
@@ -276,6 +277,17 @@ public class MatchImpl extends MinimalEObjectImpl implements Match { * <!-- end-user-doc -->
* @generated
*/
+ public Comparison getComparison() {
+ // TODO: implement this method
+ // Ensure that you remove @generated or mark it @generated NOT
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
|