[262233] - org.eclipse.gmf.tests.xpand.migration does not like new EMF
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/MigrationTestsPackage.java b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/MigrationTestsPackage.java
index a387709..03ce8d3 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/MigrationTestsPackage.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/MigrationTestsPackage.java
@@ -161,7 +161,6 @@
*/
int CHILD_FEATURE_COUNT = 0;
-
/**
* The meta object id for the '{@link org.eclipse.gmf.tests.xpand.migration.testModel.impl.SubContainerImpl <em>Sub Container</em>}' class.
* <!-- begin-user-doc -->
@@ -244,7 +243,6 @@
*/
int SUB_CONTAINER_FEATURE_COUNT = CONTAINER_FEATURE_COUNT + 0;
-
/**
* The meta object id for the '{@link org.eclipse.gmf.tests.xpand.migration.testModel.impl.DefaultAttributeContainerImpl <em>Default Attribute Container</em>}' class.
* <!-- begin-user-doc -->
@@ -273,7 +271,6 @@
*/
int DEFAULT_ATTRIBUTE_CONTAINER_FEATURE_COUNT = 1;
-
/**
* The meta object id for the '{@link org.eclipse.gmf.tests.xpand.migration.testModel.Enumeration <em>Enumeration</em>}' enum.
* <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ChildImpl.java b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ChildImpl.java
index 1442201..4b10a86 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ChildImpl.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ChildImpl.java
@@ -6,10 +6,8 @@
*/
package org.eclipse.gmf.tests.xpand.migration.testModel.impl;
-import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.gmf.tests.xpand.migration.testModel.Child;
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ContainerImpl.java b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ContainerImpl.java
index 8e3d58d..13abb4b 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ContainerImpl.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/ContainerImpl.java
@@ -377,7 +377,7 @@
case MigrationTestsPackage.CONTAINER__CHILDREN:
return getChildren();
case MigrationTestsPackage.CONTAINER__IT:
- return isIt() ? Boolean.TRUE : Boolean.FALSE;
+ return isIt();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -414,7 +414,7 @@
getChildren().addAll((Collection<? extends Child>)newValue);
return;
case MigrationTestsPackage.CONTAINER__IT:
- setIt(((Boolean)newValue).booleanValue());
+ setIt((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/DefaultAttributeContainerImpl.java b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/DefaultAttributeContainerImpl.java
index 28cc1f2..26dc3fc 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/DefaultAttributeContainerImpl.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/DefaultAttributeContainerImpl.java
@@ -99,7 +99,7 @@
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case MigrationTestsPackage.DEFAULT_ATTRIBUTE_CONTAINER__DEFAULT:
- return isDefault() ? Boolean.TRUE : Boolean.FALSE;
+ return isDefault();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -113,7 +113,7 @@
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case MigrationTestsPackage.DEFAULT_ATTRIBUTE_CONTAINER__DEFAULT:
- setDefault(((Boolean)newValue).booleanValue());
+ setDefault((Boolean)newValue);
return;
}
super.eSet(featureID, newValue);
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsFactoryImpl.java b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsFactoryImpl.java
index 252ca73..1652c5a 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsFactoryImpl.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsFactoryImpl.java
@@ -105,7 +105,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public Container createContainer() {
+ public org.eclipse.gmf.tests.xpand.migration.testModel.Container createContainer() {
ContainerImpl container = new ContainerImpl();
return container;
}
diff --git a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsPackageImpl.java b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsPackageImpl.java
index 455eb80..45d6e97 100644
--- a/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsPackageImpl.java
+++ b/tests/org.eclipse.gmf.tests.xpand.migration/src-model/org/eclipse/gmf/tests/xpand/migration/testModel/impl/MigrationTestsPackageImpl.java
@@ -15,7 +15,6 @@
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.gmf.tests.xpand.migration.testModel.Child;
-import org.eclipse.gmf.tests.xpand.migration.testModel.Container;
import org.eclipse.gmf.tests.xpand.migration.testModel.DefaultAttributeContainer;
import org.eclipse.gmf.tests.xpand.migration.testModel.Enumeration;
import org.eclipse.gmf.tests.xpand.migration.testModel.MigrationTestsFactory;
@@ -328,14 +327,14 @@
subContainerEClass.getESuperTypes().add(this.getContainer());
// Initialize classes and features; add operations and parameters
- initEClass(containerEClass, Container.class, "Container", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getContainer_SingletonChild(), this.getChild(), null, "singletonChild", null, 0, 1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getContainer_SingletonChildConstrained(), this.getChild(), null, "singletonChildConstrained", null, 1, 1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getContainer_OrderedChildren(), this.getChild(), null, "orderedChildren", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getContainer_UniqueChildren(), this.getChild(), null, "uniqueChildren", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEReference(getContainer_OrderedUniqueChildren(), this.getChild(), null, "orderedUniqueChildren", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getContainer_Children(), this.getChild(), null, "children", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
- initEAttribute(getContainer_It(), ecorePackage.getEBoolean(), "it", null, 0, 1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(containerEClass, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, "Container", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getContainer_SingletonChild(), this.getChild(), null, "singletonChild", null, 0, 1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getContainer_SingletonChildConstrained(), this.getChild(), null, "singletonChildConstrained", null, 1, 1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getContainer_OrderedChildren(), this.getChild(), null, "orderedChildren", null, 0, -1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getContainer_UniqueChildren(), this.getChild(), null, "uniqueChildren", null, 0, -1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEReference(getContainer_OrderedUniqueChildren(), this.getChild(), null, "orderedUniqueChildren", null, 0, -1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getContainer_Children(), this.getChild(), null, "children", null, 0, -1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ initEAttribute(getContainer_It(), ecorePackage.getEBoolean(), "it", null, 0, 1, org.eclipse.gmf.tests.xpand.migration.testModel.Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(containerEClass, this.getChild(), "singletonChildOp", 0, 1, IS_UNIQUE, IS_ORDERED);
