[430979] [Oomph] Add a Location(Pattern)Predicate

https://bugs.eclipse.org/bugs/show_bug.cgi?id=430979

6 files changed, 51 insertions, 51 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/model/workingsets.ecore b/plugins/org.eclipse.emf.cdo.releng.workingsets/model/workingsets.ecore
index 05cc9a79f2..1f69064804 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/model/workingsets.ecore
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/model/workingsets.ecore
@@ -21,12 +21,12 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="Project" instanceClassName="org.eclipse.core.resources.IProject"
       serializable="false"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ExclusionPredicate" eSuperTypes="../../org.eclipse.emf.cdo.releng.predicates/model/predicates.ecore#//Predicate">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="excludedWorkingSets" upperBound="-1"
-        eType="#//WorkingSet"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="InclusionPredicate" eSuperTypes="../../org.eclipse.emf.cdo.releng.predicates/model/predicates.ecore#//Predicate">
     <eStructuralFeatures xsi:type="ecore:EReference" name="includedWorkingSets" upperBound="-1"
         eType="#//WorkingSet"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ExclusionPredicate" eSuperTypes="../../org.eclipse.emf.cdo.releng.predicates/model/predicates.ecore#//Predicate">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="excludedWorkingSets" upperBound="-1"
+        eType="#//WorkingSet"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java
index 5aa19bd7d9..1977855885 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsPackage.java
@@ -187,34 +187,35 @@ public interface WorkingSetsPackage extends EPackage
    * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getExclusionPredicate()
    * @generated
    */
-  int EXCLUSION_PREDICATE = 2;
+  int EXCLUSION_PREDICATE = 3;
 
   /**
-   * The feature id for the '<em><b>Excluded Working Sets</b></em>' reference list.
+   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl <em>Inclusion Predicate</em>}' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @see org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl
+   * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getInclusionPredicate()
    * @generated
-   * @ordered
    */
-  int EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS = PredicatesPackage.PREDICATE_FEATURE_COUNT + 0;
+  int INCLUSION_PREDICATE = 2;
 
   /**
-   * The number of structural features of the '<em>Exclusion Predicate</em>' class.
+   * The feature id for the '<em><b>Included Working Sets</b></em>' reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int EXCLUSION_PREDICATE_FEATURE_COUNT = PredicatesPackage.PREDICATE_FEATURE_COUNT + 1;
+  int INCLUSION_PREDICATE__INCLUDED_WORKING_SETS = PredicatesPackage.PREDICATE_FEATURE_COUNT + 0;
 
   /**
-   * The operation id for the '<em>Matches</em>' operation.
+   * The number of structural features of the '<em>Inclusion Predicate</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int EXCLUSION_PREDICATE___MATCHES__IPROJECT = PredicatesPackage.PREDICATE___MATCHES__IPROJECT;
+  int INCLUSION_PREDICATE_FEATURE_COUNT = PredicatesPackage.PREDICATE_FEATURE_COUNT + 1;
 
   /**
    * The operation id for the '<em>Matches</em>' operation.
@@ -223,44 +224,43 @@ public interface WorkingSetsPackage extends EPackage
    * @generated
    * @ordered
    */
-  int EXCLUSION_PREDICATE___MATCHES__FILE = PredicatesPackage.PREDICATE___MATCHES__FILE;
+  int INCLUSION_PREDICATE___MATCHES__IPROJECT = PredicatesPackage.PREDICATE___MATCHES__IPROJECT;
 
   /**
-   * The number of operations of the '<em>Exclusion Predicate</em>' class.
+   * The operation id for the '<em>Matches</em>' operation.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int EXCLUSION_PREDICATE_OPERATION_COUNT = PredicatesPackage.PREDICATE_OPERATION_COUNT + 0;
+  int INCLUSION_PREDICATE___MATCHES__FILE = PredicatesPackage.PREDICATE___MATCHES__FILE;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl <em>Inclusion Predicate</em>}' class.
+   * The number of operations of the '<em>Inclusion Predicate</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.releng.workingsets.impl.InclusionPredicateImpl
-   * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getInclusionPredicate()
    * @generated
+   * @ordered
    */
-  int INCLUSION_PREDICATE = 3;
+  int INCLUSION_PREDICATE_OPERATION_COUNT = PredicatesPackage.PREDICATE_OPERATION_COUNT + 0;
 
   /**
-   * The feature id for the '<em><b>Included Working Sets</b></em>' reference list.
+   * The feature id for the '<em><b>Excluded Working Sets</b></em>' reference list.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INCLUSION_PREDICATE__INCLUDED_WORKING_SETS = PredicatesPackage.PREDICATE_FEATURE_COUNT + 0;
+  int EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS = PredicatesPackage.PREDICATE_FEATURE_COUNT + 0;
 
   /**
-   * The number of structural features of the '<em>Inclusion Predicate</em>' class.
+   * The number of structural features of the '<em>Exclusion Predicate</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INCLUSION_PREDICATE_FEATURE_COUNT = PredicatesPackage.PREDICATE_FEATURE_COUNT + 1;
+  int EXCLUSION_PREDICATE_FEATURE_COUNT = PredicatesPackage.PREDICATE_FEATURE_COUNT + 1;
 
   /**
    * The operation id for the '<em>Matches</em>' operation.
@@ -269,7 +269,7 @@ public interface WorkingSetsPackage extends EPackage
    * @generated
    * @ordered
    */
-  int INCLUSION_PREDICATE___MATCHES__IPROJECT = PredicatesPackage.PREDICATE___MATCHES__IPROJECT;
+  int EXCLUSION_PREDICATE___MATCHES__IPROJECT = PredicatesPackage.PREDICATE___MATCHES__IPROJECT;
 
   /**
    * The operation id for the '<em>Matches</em>' operation.
@@ -278,16 +278,16 @@ public interface WorkingSetsPackage extends EPackage
    * @generated
    * @ordered
    */
-  int INCLUSION_PREDICATE___MATCHES__FILE = PredicatesPackage.PREDICATE___MATCHES__FILE;
+  int EXCLUSION_PREDICATE___MATCHES__FILE = PredicatesPackage.PREDICATE___MATCHES__FILE;
 
   /**
-   * The number of operations of the '<em>Inclusion Predicate</em>' class.
+   * The number of operations of the '<em>Exclusion Predicate</em>' class.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int INCLUSION_PREDICATE_OPERATION_COUNT = PredicatesPackage.PREDICATE_OPERATION_COUNT + 0;
+  int EXCLUSION_PREDICATE_OPERATION_COUNT = PredicatesPackage.PREDICATE_OPERATION_COUNT + 0;
 
   /**
    * The meta object id for the '<em>Project</em>' data type.
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java
index 763797294c..96250b5fa5 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsFactoryImpl.java
@@ -81,10 +81,10 @@ public class WorkingSetsFactoryImpl extends EFactoryImpl implements WorkingSetsF
       return createWorkingSet();
     case WorkingSetsPackage.WORKING_SET_GROUP:
       return createWorkingSetGroup();
-    case WorkingSetsPackage.EXCLUSION_PREDICATE:
-      return createExclusionPredicate();
     case WorkingSetsPackage.INCLUSION_PREDICATE:
       return createInclusionPredicate();
+    case WorkingSetsPackage.EXCLUSION_PREDICATE:
+      return createExclusionPredicate();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java
index 16a4735c5e..8c42b6c89e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetsPackageImpl.java
@@ -313,12 +313,12 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
     createEReference(workingSetGroupEClass, WORKING_SET_GROUP__WORKING_SETS);
     createEOperation(workingSetGroupEClass, WORKING_SET_GROUP___GET_WORKING_SET__STRING);
 
-    exclusionPredicateEClass = createEClass(EXCLUSION_PREDICATE);
-    createEReference(exclusionPredicateEClass, EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS);
-
     inclusionPredicateEClass = createEClass(INCLUSION_PREDICATE);
     createEReference(inclusionPredicateEClass, INCLUSION_PREDICATE__INCLUDED_WORKING_SETS);
 
+    exclusionPredicateEClass = createEClass(EXCLUSION_PREDICATE);
+    createEReference(exclusionPredicateEClass, EXCLUSION_PREDICATE__EXCLUDED_WORKING_SETS);
+
     // Create data types
     projectEDataType = createEDataType(PROJECT);
   }
@@ -359,8 +359,8 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    exclusionPredicateEClass.getESuperTypes().add(thePredicatesPackage.getPredicate());
     inclusionPredicateEClass.getESuperTypes().add(thePredicatesPackage.getPredicate());
+    exclusionPredicateEClass.getESuperTypes().add(thePredicatesPackage.getPredicate());
 
     // Initialize classes, features, and operations; add parameters
     initEClass(workingSetEClass, WorkingSet.class, "WorkingSet", !IS_ABSTRACT, !IS_INTERFACE,
@@ -388,18 +388,18 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
         IS_ORDERED);
     addEParameter(op, ecorePackage.getEString(), "name", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-    initEClass(exclusionPredicateEClass, ExclusionPredicate.class, "ExclusionPredicate", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getExclusionPredicate_ExcludedWorkingSets(), getWorkingSet(), null, "excludedWorkingSets", null, 0,
-        -1, ExclusionPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
     initEClass(inclusionPredicateEClass, InclusionPredicate.class, "InclusionPredicate", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
     initEReference(getInclusionPredicate_IncludedWorkingSets(), getWorkingSet(), null, "includedWorkingSets", null, 0,
         -1, InclusionPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+    initEClass(exclusionPredicateEClass, ExclusionPredicate.class, "ExclusionPredicate", !IS_ABSTRACT, !IS_INTERFACE,
+        IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getExclusionPredicate_ExcludedWorkingSets(), getWorkingSet(), null, "excludedWorkingSets", null, 0,
+        -1, ExclusionPredicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
     // Initialize data types
     initEDataType(projectEDataType, IProject.class, "Project", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java
index 9872e9496b..cd52129e0e 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsAdapterFactory.java
@@ -97,15 +97,15 @@ public class WorkingSetsAdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
-    public Adapter caseExclusionPredicate(ExclusionPredicate object)
+    public Adapter caseInclusionPredicate(InclusionPredicate object)
     {
-      return createExclusionPredicateAdapter();
+      return createInclusionPredicateAdapter();
     }
 
     @Override
-    public Adapter caseInclusionPredicate(InclusionPredicate object)
+    public Adapter caseExclusionPredicate(ExclusionPredicate object)
     {
-      return createInclusionPredicateAdapter();
+      return createExclusionPredicateAdapter();
     }
 
     @Override
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java
index e166a9cca2..c8e9fadaa8 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/util/WorkingSetsSwitch.java
@@ -104,13 +104,13 @@ public class WorkingSetsSwitch<T> extends Switch<T>
       }
       return result;
     }
-    case WorkingSetsPackage.EXCLUSION_PREDICATE:
+    case WorkingSetsPackage.INCLUSION_PREDICATE:
     {
-      ExclusionPredicate exclusionPredicate = (ExclusionPredicate)theEObject;
-      T result = caseExclusionPredicate(exclusionPredicate);
+      InclusionPredicate inclusionPredicate = (InclusionPredicate)theEObject;
+      T result = caseInclusionPredicate(inclusionPredicate);
       if (result == null)
       {
-        result = casePredicate(exclusionPredicate);
+        result = casePredicate(inclusionPredicate);
       }
       if (result == null)
       {
@@ -118,13 +118,13 @@ public class WorkingSetsSwitch<T> extends Switch<T>
       }
       return result;
     }
-    case WorkingSetsPackage.INCLUSION_PREDICATE:
+    case WorkingSetsPackage.EXCLUSION_PREDICATE:
     {
-      InclusionPredicate inclusionPredicate = (InclusionPredicate)theEObject;
-      T result = caseInclusionPredicate(inclusionPredicate);
+      ExclusionPredicate exclusionPredicate = (ExclusionPredicate)theEObject;
+      T result = caseExclusionPredicate(exclusionPredicate);
       if (result == null)
       {
-        result = casePredicate(inclusionPredicate);
+        result = casePredicate(exclusionPredicate);
       }
       if (result == null)
       {