Bug 465009: Table should allow EOperation as an entry of the Table. fix some obvious error in the previous commit

10 files changed, 15 insertions, 88 deletions

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
index 8ff486d32ef..a4c5032845f 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/model/nattable.ecore
@@ -680,8 +680,10 @@
       <eStructuralFeatures xsi:type="ecore:EReference" name="localLabelConfiguration"

           eType="#//nattablelabelprovider/OperationLabelProviderConfiguration" containment="true"/>

     </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="FeatureTreeItemAxis" eSuperTypes="#//nattableaxis/FeatureAxis #//nattableaxis/ITreeItemAxis"/>

-    <eClassifiers xsi:type="ecore:EClass" name="OperationTreeItemAxis" eSuperTypes="#//nattableaxis/OperationAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="FeatureTreeItemAxis" abstract="true"

+        eSuperTypes="#//nattableaxis/FeatureAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="OperationTreeItemAxis" abstract="true"

+        eSuperTypes="#//nattableaxis/OperationAxis #//nattableaxis/ITreeItemAxis"/>

     <eClassifiers xsi:type="ecore:EClass" name="ObjectAxis" abstract="true" eSuperTypes="#//nattableaxis/IAxis">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="Abstract class used to reference object"/>

@@ -693,7 +695,8 @@
         </eAnnotations>

       </eStructuralFeatures>

     </eClassifiers>

-    <eClassifiers xsi:type="ecore:EClass" name="ObjectTreeItemAxis" eSuperTypes="#//nattableaxis/ObjectAxis #//nattableaxis/ITreeItemAxis"/>

+    <eClassifiers xsi:type="ecore:EClass" name="ObjectTreeItemAxis" abstract="true"

+        eSuperTypes="#//nattableaxis/ObjectAxis #//nattableaxis/ITreeItemAxis"/>

     <eClassifiers xsi:type="ecore:EClass" name="FeatureIdAxis" eSuperTypes="#//nattableaxis/IdAxis #//nattableaxis/FeatureAxis">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="IAxis used to represent feature using a string."/>

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
index 5f5608bc627..25826859e94 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/FeatureTreeItemAxis.java
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
  *

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getFeatureTreeItemAxis()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface FeatureTreeItemAxis extends FeatureAxis, ITreeItemAxis {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
index fb29f20bacc..08d4083449a 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/NattableaxisFactory.java
@@ -60,33 +60,6 @@ public interface NattableaxisFactory extends EFactory {
 	EObjectTreeItemAxis createEObjectTreeItemAxis();

 

 	/**

-	 * Returns a new object of class '<em>Feature Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Feature Tree Item Axis</em>'.

-	 * @generated

-	 */

-	FeatureTreeItemAxis createFeatureTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>Operation Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Operation Tree Item Axis</em>'.

-	 * @generated

-	 */

-	OperationTreeItemAxis createOperationTreeItemAxis();

-

-	/**

-	 * Returns a new object of class '<em>Object Tree Item Axis</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Object Tree Item Axis</em>'.

-	 * @generated

-	 */

-	ObjectTreeItemAxis createObjectTreeItemAxis();

-

-	/**

 	 * Returns a new object of class '<em>Feature Id Axis</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
index cd80215c34e..241b335639d 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/ObjectTreeItemAxis.java
@@ -19,7 +19,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
  *

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getObjectTreeItemAxis()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface ObjectTreeItemAxis extends ObjectAxis, ITreeItemAxis {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
index 37072da06ba..773810964e7 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/OperationTreeItemAxis.java
@@ -20,7 +20,7 @@ package org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis;
  *

  *

  * @see org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage#getOperationTreeItemAxis()

- * @model

+ * @model abstract="true"

  * @generated

  */

 public interface OperationTreeItemAxis extends OperationAxis, ITreeItemAxis {

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
index 83069065a12..207b6956833 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/FeatureTreeItemAxisImpl.java
@@ -41,7 +41,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.Nattableax
  *

  * @generated

  */

-public class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {

+public abstract class FeatureTreeItemAxisImpl extends FeatureAxisImpl implements FeatureTreeItemAxis {

 

 	/**

 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
index 66d5aa8394f..12e9fbf68dc 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisFactoryImpl.java
@@ -18,20 +18,6 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.*;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.AxisGroup;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EObjectTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.EStructuralFeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.FeatureTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.IdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisFactory;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.NattableaxisPackage;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectIdTreeItemAxis;

-import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTreeItemAxis;

 

 /**

  * <!-- begin-user-doc -->

@@ -81,9 +67,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 			case NattableaxisPackage.ID_TREE_ITEM_AXIS: return createIdTreeItemAxis();

 			case NattableaxisPackage.EOBJECT_AXIS: return createEObjectAxis();

 			case NattableaxisPackage.EOBJECT_TREE_ITEM_AXIS: return createEObjectTreeItemAxis();

-			case NattableaxisPackage.FEATURE_TREE_ITEM_AXIS: return createFeatureTreeItemAxis();

-			case NattableaxisPackage.OPERATION_TREE_ITEM_AXIS: return createOperationTreeItemAxis();

-			case NattableaxisPackage.OBJECT_TREE_ITEM_AXIS: return createObjectTreeItemAxis();

 			case NattableaxisPackage.FEATURE_ID_AXIS: return createFeatureIdAxis();

 			case NattableaxisPackage.FEATURE_ID_TREE_ITEM_AXIS: return createFeatureIdTreeItemAxis();

 			case NattableaxisPackage.ESTRUCTURAL_FEATURE_AXIS: return createEStructuralFeatureAxis();

@@ -137,38 +120,6 @@ public class NattableaxisFactoryImpl extends EFactoryImpl implements Nattableaxi
 	 * @generated

 	 */

 	@Override

-	public FeatureTreeItemAxis createFeatureTreeItemAxis() {

-		FeatureTreeItemAxisImpl featureTreeItemAxis = new FeatureTreeItemAxisImpl();

-		return featureTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public OperationTreeItemAxis createOperationTreeItemAxis() {

-		OperationTreeItemAxisImpl operationTreeItemAxis = new OperationTreeItemAxisImpl();

-		return operationTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public ObjectTreeItemAxis createObjectTreeItemAxis() {

-		ObjectTreeItemAxisImpl objectTreeItemAxis = new ObjectTreeItemAxisImpl();

-		return objectTreeItemAxis;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

 	public FeatureIdAxis createFeatureIdAxis() {

 		FeatureIdAxisImpl featureIdAxis = new FeatureIdAxisImpl();

 		return featureIdAxis;

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
index 5bd790ff37a..38dc3e714ff 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/NattableaxisPackageImpl.java
@@ -844,14 +844,14 @@ public class NattableaxisPackageImpl extends EPackageImpl implements Nattableaxi
 		initEClass(operationAxisEClass, OperationAxis.class, "OperationAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getOperationAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getOperationLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, OperationAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 

-		initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEClass(featureTreeItemAxisEClass, FeatureTreeItemAxis.class, "FeatureTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 

-		initEClass(operationTreeItemAxisEClass, OperationTreeItemAxis.class, "OperationTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEClass(operationTreeItemAxisEClass, OperationTreeItemAxis.class, "OperationTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 

 		initEClass(objectAxisEClass, ObjectAxis.class, "ObjectAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 		initEReference(getObjectAxis_LocalLabelConfiguration(), theNattablelabelproviderPackage.getObjectLabelProviderConfiguration(), null, "localLabelConfiguration", null, 0, 1, ObjectAxis.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 

-		initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEClass(objectTreeItemAxisEClass, ObjectTreeItemAxis.class, "ObjectTreeItemAxis", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 

 		initEClass(featureIdAxisEClass, FeatureIdAxis.class, "FeatureIdAxis", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

 

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
index 41ee1e23090..a2afc4a1e38 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/ObjectTreeItemAxisImpl.java
@@ -41,7 +41,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.ObjectTree
  *

  * @generated

  */

-public class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {

+public abstract class ObjectTreeItemAxisImpl extends ObjectAxisImpl implements ObjectTreeItemAxis {

 

 	/**

 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
index 1365e3962c3..e07f14d6ec2 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.model/src-gen/org/eclipse/papyrus/infra/nattable/model/nattable/nattableaxis/impl/OperationTreeItemAxisImpl.java
@@ -46,7 +46,7 @@ import org.eclipse.papyrus.infra.nattable.model.nattable.nattableaxis.OperationT
  *

  * @generated

  */

-public class OperationTreeItemAxisImpl extends OperationAxisImpl implements OperationTreeItemAxis {

+public abstract class OperationTreeItemAxisImpl extends OperationAxisImpl implements OperationTreeItemAxis {

 	/**

 	 * The cached value of the '{@link #getParent() <em>Parent</em>}' reference.

 	 * <!-- begin-user-doc -->