Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2011-08-03 09:44:21 +0000
committerlgoubet2011-08-04 09:24:36 +0000
commitb5688a799d6b55848ae85f2a02ea34345f7c9af6 (patch)
treee3c4f62bf433e8ccf62e6a489df44752ceb0e5c6 /plugins
parentb6bb074372c377261c18735c0aa6a701330ebd1c (diff)
downloadorg.eclipse.emf.compare-b5688a799d6b55848ae85f2a02ea34345f7c9af6.tar.gz
org.eclipse.emf.compare-b5688a799d6b55848ae85f2a02ea34345f7c9af6.tar.xz
org.eclipse.emf.compare-b5688a799d6b55848ae85f2a02ea34345f7c9af6.zip
Enhancing "test" metamodel with single and multi-valued attributes
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.compare.tests/model/merge.ecore8
-rw-r--r--plugins/org.eclipse.emf.compare.tests/model/merge.genmodel6
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergeFactory.java18
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergePackage.java171
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeMultiValuedAttribute.java55
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeSingleValueAttribute.java64
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergeFactoryImpl.java22
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergePackageImpl.java66
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeMultiValuedAttributeImpl.java162
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeSingleValueAttributeImpl.java177
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeAdapterFactory.java36
-rw-r--r--plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeSwitch.java44
12 files changed, 829 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.tests/model/merge.ecore b/plugins/org.eclipse.emf.compare.tests/model/merge.ecore
index 745abf2e7..2bef4c735 100644
--- a/plugins/org.eclipse.emf.compare.tests/model/merge.ecore
+++ b/plugins/org.eclipse.emf.compare.tests/model/merge.ecore
@@ -17,4 +17,12 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="singleValueContainment"
eType="#//Node" containment="true"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="NodeSingleValueAttribute" eSuperTypes="#//Node">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="singleValuedAttribute"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="NodeMultiValuedAttribute" eSuperTypes="#//Node">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiValuedAttribute" upperBound="-1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.compare.tests/model/merge.genmodel b/plugins/org.eclipse.emf.compare.tests/model/merge.genmodel
index d1cbd4c9b..29bbb2784 100644
--- a/plugins/org.eclipse.emf.compare.tests/model/merge.genmodel
+++ b/plugins/org.eclipse.emf.compare.tests/model/merge.genmodel
@@ -18,5 +18,11 @@
<genClasses ecoreClass="merge.ecore#//NodeSingleValueContainment">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference merge.ecore#//NodeSingleValueContainment/singleValueContainment"/>
</genClasses>
+ <genClasses ecoreClass="merge.ecore#//NodeSingleValueAttribute">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute merge.ecore#//NodeSingleValueAttribute/singleValuedAttribute"/>
+ </genClasses>
+ <genClasses ecoreClass="merge.ecore#//NodeMultiValuedAttribute">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute merge.ecore#//NodeMultiValuedAttribute/multiValuedAttribute"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergeFactory.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergeFactory.java
index bd5267055..e60758981 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergeFactory.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergeFactory.java
@@ -64,6 +64,24 @@ public interface MergeFactory extends EFactory {
NodeSingleValueContainment createNodeSingleValueContainment();
/**
+ * Returns a new object of class '<em>Node Single Value Attribute</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Node Single Value Attribute</em>'.
+ * @generated
+ */
+ NodeSingleValueAttribute createNodeSingleValueAttribute();
+
+ /**
+ * Returns a new object of class '<em>Node Multi Valued Attribute</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Node Multi Valued Attribute</em>'.
+ * @generated
+ */
+ NodeMultiValuedAttribute createNodeMultiValuedAttribute();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergePackage.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergePackage.java
index 1753ada89..679804b47 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergePackage.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/MergePackage.java
@@ -202,6 +202,99 @@ public interface MergePackage extends EPackage {
/**
+ * The meta object id for the '{@link org.eclipse.emf.compare.tests.merge.impl.NodeSingleValueAttributeImpl <em>Node Single Value Attribute</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.tests.merge.impl.NodeSingleValueAttributeImpl
+ * @see org.eclipse.emf.compare.tests.merge.impl.MergePackageImpl#getNodeSingleValueAttribute()
+ * @generated
+ */
+ int NODE_SINGLE_VALUE_ATTRIBUTE = 3;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_SINGLE_VALUE_ATTRIBUTE__NAME = NODE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Containment Ref1</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_SINGLE_VALUE_ATTRIBUTE__CONTAINMENT_REF1 = NODE__CONTAINMENT_REF1;
+
+ /**
+ * The feature id for the '<em><b>Single Valued Attribute</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE = NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>Node Single Value Attribute</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_SINGLE_VALUE_ATTRIBUTE_FEATURE_COUNT = NODE_FEATURE_COUNT + 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.compare.tests.merge.impl.NodeMultiValuedAttributeImpl <em>Node Multi Valued Attribute</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.tests.merge.impl.NodeMultiValuedAttributeImpl
+ * @see org.eclipse.emf.compare.tests.merge.impl.MergePackageImpl#getNodeMultiValuedAttribute()
+ * @generated
+ */
+ int NODE_MULTI_VALUED_ATTRIBUTE = 4;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_MULTI_VALUED_ATTRIBUTE__NAME = NODE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Containment Ref1</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_MULTI_VALUED_ATTRIBUTE__CONTAINMENT_REF1 = NODE__CONTAINMENT_REF1;
+
+ /**
+ * The feature id for the '<em><b>Multi Valued Attribute</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE = NODE_FEATURE_COUNT + 0;
+
+ /**
+ * The number of structural features of the '<em>Node Multi Valued Attribute</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_MULTI_VALUED_ATTRIBUTE_FEATURE_COUNT = NODE_FEATURE_COUNT + 1;
+
+
+ /**
* Returns the meta object for class '{@link org.eclipse.emf.compare.tests.merge.Node <em>Node</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -276,6 +369,48 @@ public interface MergePackage extends EPackage {
EReference getNodeSingleValueContainment_SingleValueContainment();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute <em>Node Single Value Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Node Single Value Attribute</em>'.
+ * @see org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute
+ * @generated
+ */
+ EClass getNodeSingleValueAttribute();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute#getSingleValuedAttribute <em>Single Valued Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Single Valued Attribute</em>'.
+ * @see org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute#getSingleValuedAttribute()
+ * @see #getNodeSingleValueAttribute()
+ * @generated
+ */
+ EAttribute getNodeSingleValueAttribute_SingleValuedAttribute();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute <em>Node Multi Valued Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Node Multi Valued Attribute</em>'.
+ * @see org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute
+ * @generated
+ */
+ EClass getNodeMultiValuedAttribute();
+
+ /**
+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute#getMultiValuedAttribute <em>Multi Valued Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute list '<em>Multi Valued Attribute</em>'.
+ * @see org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute#getMultiValuedAttribute()
+ * @see #getNodeMultiValuedAttribute()
+ * @generated
+ */
+ EAttribute getNodeMultiValuedAttribute_MultiValuedAttribute();
+
+ /**
* Returns the factory that creates the instances of the model.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -359,6 +494,42 @@ public interface MergePackage extends EPackage {
*/
EReference NODE_SINGLE_VALUE_CONTAINMENT__SINGLE_VALUE_CONTAINMENT = eINSTANCE.getNodeSingleValueContainment_SingleValueContainment();
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.compare.tests.merge.impl.NodeSingleValueAttributeImpl <em>Node Single Value Attribute</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.tests.merge.impl.NodeSingleValueAttributeImpl
+ * @see org.eclipse.emf.compare.tests.merge.impl.MergePackageImpl#getNodeSingleValueAttribute()
+ * @generated
+ */
+ EClass NODE_SINGLE_VALUE_ATTRIBUTE = eINSTANCE.getNodeSingleValueAttribute();
+
+ /**
+ * The meta object literal for the '<em><b>Single Valued Attribute</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE = eINSTANCE.getNodeSingleValueAttribute_SingleValuedAttribute();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.compare.tests.merge.impl.NodeMultiValuedAttributeImpl <em>Node Multi Valued Attribute</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.compare.tests.merge.impl.NodeMultiValuedAttributeImpl
+ * @see org.eclipse.emf.compare.tests.merge.impl.MergePackageImpl#getNodeMultiValuedAttribute()
+ * @generated
+ */
+ EClass NODE_MULTI_VALUED_ATTRIBUTE = eINSTANCE.getNodeMultiValuedAttribute();
+
+ /**
+ * The meta object literal for the '<em><b>Multi Valued Attribute</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE = eINSTANCE.getNodeMultiValuedAttribute_MultiValuedAttribute();
+
}
} //MergePackage
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeMultiValuedAttribute.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeMultiValuedAttribute.java
new file mode 100644
index 000000000..386f7c2c4
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeMultiValuedAttribute.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2011 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.tests.merge;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Node Multi Valued Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute#getMultiValuedAttribute <em>Multi Valued Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.compare.tests.merge.MergePackage#getNodeMultiValuedAttribute()
+ * @model
+ * @generated
+ */
+public interface NodeMultiValuedAttribute extends Node {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String copyright = "Copyright (c) 2011 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>Multi Valued Attribute</b></em>' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Multi Valued Attribute</em>' attribute list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Multi Valued Attribute</em>' attribute list.
+ * @see org.eclipse.emf.compare.tests.merge.MergePackage#getNodeMultiValuedAttribute_MultiValuedAttribute()
+ * @model
+ * @generated
+ */
+ EList<String> getMultiValuedAttribute();
+
+} // NodeMultiValuedAttribute
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeSingleValueAttribute.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeSingleValueAttribute.java
new file mode 100644
index 000000000..604f5c494
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/NodeSingleValueAttribute.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2011 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.tests.merge;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Node Single Value Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute#getSingleValuedAttribute <em>Single Valued Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.compare.tests.merge.MergePackage#getNodeSingleValueAttribute()
+ * @model
+ * @generated
+ */
+public interface NodeSingleValueAttribute extends Node {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ String copyright = "Copyright (c) 2011 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>Single Valued Attribute</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Single Valued Attribute</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Single Valued Attribute</em>' attribute.
+ * @see #setSingleValuedAttribute(String)
+ * @see org.eclipse.emf.compare.tests.merge.MergePackage#getNodeSingleValueAttribute_SingleValuedAttribute()
+ * @model
+ * @generated
+ */
+ String getSingleValuedAttribute();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute#getSingleValuedAttribute <em>Single Valued Attribute</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Single Valued Attribute</em>' attribute.
+ * @see #getSingleValuedAttribute()
+ * @generated
+ */
+ void setSingleValuedAttribute(String value);
+
+} // NodeSingleValueAttribute
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergeFactoryImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergeFactoryImpl.java
index c7d972a4e..df1fc5fe7 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergeFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergeFactoryImpl.java
@@ -74,6 +74,8 @@ public class MergeFactoryImpl extends EFactoryImpl implements MergeFactory {
case MergePackage.NODE: return createNode();
case MergePackage.NODE_MULTIPLE_CONTAINMENT: return createNodeMultipleContainment();
case MergePackage.NODE_SINGLE_VALUE_CONTAINMENT: return createNodeSingleValueContainment();
+ case MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE: return createNodeSingleValueAttribute();
+ case MergePackage.NODE_MULTI_VALUED_ATTRIBUTE: return createNodeMultiValuedAttribute();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -114,6 +116,26 @@ public class MergeFactoryImpl extends EFactoryImpl implements MergeFactory {
* <!-- end-user-doc -->
* @generated
*/
+ public NodeSingleValueAttribute createNodeSingleValueAttribute() {
+ NodeSingleValueAttributeImpl nodeSingleValueAttribute = new NodeSingleValueAttributeImpl();
+ return nodeSingleValueAttribute;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NodeMultiValuedAttribute createNodeMultiValuedAttribute() {
+ NodeMultiValuedAttributeImpl nodeMultiValuedAttribute = new NodeMultiValuedAttributeImpl();
+ return nodeMultiValuedAttribute;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public MergePackage getMergePackage() {
return (MergePackage)getEPackage();
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergePackageImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergePackageImpl.java
index c8c577a56..424a289ca 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergePackageImpl.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/MergePackageImpl.java
@@ -13,8 +13,10 @@ package org.eclipse.emf.compare.tests.merge.impl;
import org.eclipse.emf.compare.tests.merge.MergeFactory;
import org.eclipse.emf.compare.tests.merge.MergePackage;
import org.eclipse.emf.compare.tests.merge.Node;
+import org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute;
import org.eclipse.emf.compare.tests.merge.NodeMultipleContainment;
+import org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute;
import org.eclipse.emf.compare.tests.merge.NodeSingleValueContainment;
import org.eclipse.emf.ecore.EAttribute;
import org.eclipse.emf.ecore.EClass;
@@ -59,6 +61,20 @@ public class MergePackageImpl extends EPackageImpl implements MergePackage {
private EClass nodeSingleValueContainmentEClass = null;
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass nodeSingleValueAttributeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass nodeMultiValuedAttributeEClass = null;
+
+ /**
* Creates an instance of the model <b>Package</b>, registered with
* {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
* package URI value.
@@ -187,6 +203,42 @@ public class MergePackageImpl extends EPackageImpl implements MergePackage {
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getNodeSingleValueAttribute() {
+ return nodeSingleValueAttributeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getNodeSingleValueAttribute_SingleValuedAttribute() {
+ return (EAttribute)nodeSingleValueAttributeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getNodeMultiValuedAttribute() {
+ return nodeMultiValuedAttributeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getNodeMultiValuedAttribute_MultiValuedAttribute() {
+ return (EAttribute)nodeMultiValuedAttributeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public MergeFactory getMergeFactory() {
return (MergeFactory)getEFactoryInstance();
}
@@ -219,6 +271,12 @@ public class MergePackageImpl extends EPackageImpl implements MergePackage {
nodeSingleValueContainmentEClass = createEClass(NODE_SINGLE_VALUE_CONTAINMENT);
createEReference(nodeSingleValueContainmentEClass, NODE_SINGLE_VALUE_CONTAINMENT__SINGLE_VALUE_CONTAINMENT);
+
+ nodeSingleValueAttributeEClass = createEClass(NODE_SINGLE_VALUE_ATTRIBUTE);
+ createEAttribute(nodeSingleValueAttributeEClass, NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE);
+
+ nodeMultiValuedAttributeEClass = createEClass(NODE_MULTI_VALUED_ATTRIBUTE);
+ createEAttribute(nodeMultiValuedAttributeEClass, NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE);
}
/**
@@ -251,6 +309,8 @@ public class MergePackageImpl extends EPackageImpl implements MergePackage {
// Add supertypes to classes
nodeMultipleContainmentEClass.getESuperTypes().add(this.getNode());
nodeSingleValueContainmentEClass.getESuperTypes().add(this.getNode());
+ nodeSingleValueAttributeEClass.getESuperTypes().add(this.getNode());
+ nodeMultiValuedAttributeEClass.getESuperTypes().add(this.getNode());
// Initialize classes and features; add operations and parameters
initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -263,6 +323,12 @@ public class MergePackageImpl extends EPackageImpl implements MergePackage {
initEClass(nodeSingleValueContainmentEClass, NodeSingleValueContainment.class, "NodeSingleValueContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getNodeSingleValueContainment_SingleValueContainment(), this.getNode(), null, "singleValueContainment", null, 0, 1, NodeSingleValueContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(nodeSingleValueAttributeEClass, NodeSingleValueAttribute.class, "NodeSingleValueAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getNodeSingleValueAttribute_SingleValuedAttribute(), ecorePackage.getEString(), "singleValuedAttribute", null, 0, 1, NodeSingleValueAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
+ initEClass(nodeMultiValuedAttributeEClass, NodeMultiValuedAttribute.class, "NodeMultiValuedAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getNodeMultiValuedAttribute_MultiValuedAttribute(), ecorePackage.getEString(), "multiValuedAttribute", null, 0, -1, NodeMultiValuedAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+
// Create resource
createResource(eNS_URI);
}
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeMultiValuedAttributeImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeMultiValuedAttributeImpl.java
new file mode 100644
index 000000000..ba4e4ccee
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeMultiValuedAttributeImpl.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) 2011 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.tests.merge.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.compare.tests.merge.MergePackage;
+import org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Node Multi Valued Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.compare.tests.merge.impl.NodeMultiValuedAttributeImpl#getMultiValuedAttribute <em>Multi Valued Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class NodeMultiValuedAttributeImpl extends NodeImpl implements NodeMultiValuedAttribute {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String copyright = "Copyright (c) 2011 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$
+
+ /**
+ * The cached value of the '{@link #getMultiValuedAttribute() <em>Multi Valued Attribute</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMultiValuedAttribute()
+ * @generated
+ * @ordered
+ */
+ protected EList<String> multiValuedAttribute;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected NodeMultiValuedAttributeImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return MergePackage.Literals.NODE_MULTI_VALUED_ATTRIBUTE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<String> getMultiValuedAttribute() {
+ if (multiValuedAttribute == null) {
+ multiValuedAttribute = new EDataTypeUniqueEList<String>(String.class, this, MergePackage.NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE);
+ }
+ return multiValuedAttribute;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case MergePackage.NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE:
+ return getMultiValuedAttribute();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case MergePackage.NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE:
+ getMultiValuedAttribute().clear();
+ getMultiValuedAttribute().addAll((Collection<? extends String>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case MergePackage.NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE:
+ getMultiValuedAttribute().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case MergePackage.NODE_MULTI_VALUED_ATTRIBUTE__MULTI_VALUED_ATTRIBUTE:
+ return multiValuedAttribute != null && !multiValuedAttribute.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (multiValuedAttribute: "); //$NON-NLS-1$
+ result.append(multiValuedAttribute);
+ result.append(')');
+ return result.toString();
+ }
+
+} //NodeMultiValuedAttributeImpl
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeSingleValueAttributeImpl.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeSingleValueAttributeImpl.java
new file mode 100644
index 000000000..c488391db
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/impl/NodeSingleValueAttributeImpl.java
@@ -0,0 +1,177 @@
+/**
+ * Copyright (c) 2011 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.tests.merge.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.compare.tests.merge.MergePackage;
+import org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Node Single Value Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.compare.tests.merge.impl.NodeSingleValueAttributeImpl#getSingleValuedAttribute <em>Single Valued Attribute</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class NodeSingleValueAttributeImpl extends NodeImpl implements NodeSingleValueAttribute {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String copyright = "Copyright (c) 2011 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$
+
+ /**
+ * The default value of the '{@link #getSingleValuedAttribute() <em>Single Valued Attribute</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSingleValuedAttribute()
+ * @generated
+ * @ordered
+ */
+ protected static final String SINGLE_VALUED_ATTRIBUTE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getSingleValuedAttribute() <em>Single Valued Attribute</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getSingleValuedAttribute()
+ * @generated
+ * @ordered
+ */
+ protected String singleValuedAttribute = SINGLE_VALUED_ATTRIBUTE_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected NodeSingleValueAttributeImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return MergePackage.Literals.NODE_SINGLE_VALUE_ATTRIBUTE;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getSingleValuedAttribute() {
+ return singleValuedAttribute;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setSingleValuedAttribute(String newSingleValuedAttribute) {
+ String oldSingleValuedAttribute = singleValuedAttribute;
+ singleValuedAttribute = newSingleValuedAttribute;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE, oldSingleValuedAttribute, singleValuedAttribute));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE:
+ return getSingleValuedAttribute();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE:
+ setSingleValuedAttribute((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE:
+ setSingleValuedAttribute(SINGLE_VALUED_ATTRIBUTE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE__SINGLE_VALUED_ATTRIBUTE:
+ return SINGLE_VALUED_ATTRIBUTE_EDEFAULT == null ? singleValuedAttribute != null : !SINGLE_VALUED_ATTRIBUTE_EDEFAULT.equals(singleValuedAttribute);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (singleValuedAttribute: "); //$NON-NLS-1$
+ result.append(singleValuedAttribute);
+ result.append(')');
+ return result.toString();
+ }
+
+} //NodeSingleValueAttributeImpl
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeAdapterFactory.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeAdapterFactory.java
index 95ad402a9..709883a00 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeAdapterFactory.java
@@ -95,6 +95,14 @@ public class MergeAdapterFactory extends AdapterFactoryImpl {
return createNodeSingleValueContainmentAdapter();
}
@Override
+ public Adapter caseNodeSingleValueAttribute(NodeSingleValueAttribute object) {
+ return createNodeSingleValueAttributeAdapter();
+ }
+ @Override
+ public Adapter caseNodeMultiValuedAttribute(NodeMultiValuedAttribute object) {
+ return createNodeMultiValuedAttributeAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -157,6 +165,34 @@ public class MergeAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute <em>Node Single Value Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.compare.tests.merge.NodeSingleValueAttribute
+ * @generated
+ */
+ public Adapter createNodeSingleValueAttributeAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute <em>Node Multi Valued Attribute</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.emf.compare.tests.merge.NodeMultiValuedAttribute
+ * @generated
+ */
+ public Adapter createNodeMultiValuedAttributeAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
diff --git a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeSwitch.java b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeSwitch.java
index a1c0d1c40..e86d30856 100644
--- a/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeSwitch.java
+++ b/plugins/org.eclipse.emf.compare.tests/src-gen/org/eclipse/emf/compare/tests/merge/util/MergeSwitch.java
@@ -101,6 +101,20 @@ public class MergeSwitch<T> extends Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case MergePackage.NODE_SINGLE_VALUE_ATTRIBUTE: {
+ NodeSingleValueAttribute nodeSingleValueAttribute = (NodeSingleValueAttribute)theEObject;
+ T result = caseNodeSingleValueAttribute(nodeSingleValueAttribute);
+ if (result == null) result = caseNode(nodeSingleValueAttribute);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case MergePackage.NODE_MULTI_VALUED_ATTRIBUTE: {
+ NodeMultiValuedAttribute nodeMultiValuedAttribute = (NodeMultiValuedAttribute)theEObject;
+ T result = caseNodeMultiValuedAttribute(nodeMultiValuedAttribute);
+ if (result == null) result = caseNode(nodeMultiValuedAttribute);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -151,6 +165,36 @@ public class MergeSwitch<T> extends Switch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Node Single Value Attribute</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Node Single Value Attribute</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseNodeSingleValueAttribute(NodeSingleValueAttribute object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Node Multi Valued Attribute</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Node Multi Valued Attribute</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseNodeMultiValuedAttribute(NodeMultiValuedAttribute object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;

Back to the top