1 files changed, 11 insertions, 31 deletions
diff --git a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/util/OrderSwitch.java b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/util/OrderSwitch.java
index 73b626261..d3bcd35ee 100644
--- a/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/util/OrderSwitch.java
+++ b/tests/org.eclipse.emf.test.common/src/org/eclipse/emf/test/models/order/util/OrderSwitch.java
@@ -10,10 +10,9 @@
  */
 package org.eclipse.emf.test.models.order.util;
 
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.emf.test.models.order.CustomerOrder;
 import org.eclipse.emf.test.models.order.DocumentRoot;
 import org.eclipse.emf.test.models.order.Order;
@@ -32,7 +31,7 @@ import org.eclipse.emf.test.models.order.OrderPackage;
  * @see org.eclipse.emf.test.models.order.OrderPackage
  * @generated
  */
-public class OrderSwitch<T>
+public class OrderSwitch<T> extends Switch<T>
 {
   /**
    * The cached model package
@@ -57,38 +56,17 @@ public class OrderSwitch<T>
   }
 
   /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * Checks whether this is a switch for the given package.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @param ePackage the package in question.
+   * @return whether this is a switch for the given package.
    * @generated
    */
-  public T doSwitch(EObject theEObject)
+  @Override
+  protected boolean isSwitchFor(EPackage ePackage)
   {
-    return doSwitch(theEObject.eClass(), theEObject);
-  }
-
-  /**
-   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the first non-null result returned by a <code>caseXXX</code> call.
-   * @generated
-   */
-  protected T doSwitch(EClass theEClass, EObject theEObject)
-  {
-    if (theEClass.eContainer() == modelPackage)
-    {
-      return doSwitch(theEClass.getClassifierID(), theEObject);
-    }
-    else
-    {
-      List<EClass> eSuperTypes = theEClass.getESuperTypes();
-      return
-        eSuperTypes.isEmpty() ?
-          defaultCase(theEObject) :
-          doSwitch(eSuperTypes.get(0), theEObject);
-    }
+    return ePackage == modelPackage;
   }
 
   /**
@@ -98,6 +76,7 @@ public class OrderSwitch<T>
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
+  @Override
   protected T doSwitch(int classifierID, EObject theEObject)
   {
     switch (classifierID)
@@ -186,6 +165,7 @@ public class OrderSwitch<T>
    * @see #doSwitch(org.eclipse.emf.ecore.EObject)
    * @generated
    */
+  @Override
   public T defaultCase(EObject object)
   {
     return null;