Improve setup related models

Change-Id: I2401d47184d70d5bd5610e7bca3feae362600f95
Signed-off-by: Ed Merks <ed.merks@gmail.com>

11 files changed, 181 insertions, 724 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/NamePredicate.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/NamePredicate.java
deleted file mode 100644
index daabac1170..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/NamePredicate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
- * 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:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.releng.workingsets;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Name Predicate</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.NamePredicate#getPattern <em>Pattern</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getNamePredicate()
- * @model
- * @generated
- */
-public interface NamePredicate extends Predicate
-{
-  /**
-   * Returns the value of the '<em><b>Pattern</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Pattern</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Pattern</em>' attribute.
-   * @see #setPattern(String)
-   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getNamePredicate_Pattern()
-   * @model required="true"
-   * @generated
-   */
-  String getPattern();
-
-  /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.workingsets.NamePredicate#getPattern <em>Pattern</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Pattern</em>' attribute.
-   * @see #getPattern()
-   * @generated
-   */
-  void setPattern(String value);
-
-} // NamePredicate
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/Predicate.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/Predicate.java
deleted file mode 100644
index a81f910094..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/Predicate.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
- * 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:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.releng.workingsets;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.core.resources.IProject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Predicate</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getPredicate()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Predicate extends EObject
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @model projectDataType="org.eclipse.emf.cdo.releng.workingsets.Project"
-   * @generated
-   */
-  boolean matches(IProject project);
-
-} // Predicate
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java
index 615044bc6e..7ebf110ab6 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSet.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets;
 
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
@@ -21,8 +22,9 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getPredicates <em>Predicates</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getPredicates <em>Predicates</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getId <em>Id</em>}</li>
  * </ul>
  * </p>
  *
@@ -34,7 +36,7 @@ public interface WorkingSet extends EObject
 {
   /**
    * Returns the value of the '<em><b>Predicates</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.emf.cdo.releng.workingsets.Predicate}.
+   * The list contents are of type {@link org.eclipse.emf.cdo.releng.predicates.Predicate}.
    * <!-- begin-user-doc -->
    * <p>
    * If the meaning of the '<em>Predicates</em>' containment reference list isn't clear,
@@ -49,19 +51,45 @@ public interface WorkingSet extends EObject
   EList<Predicate> getPredicates();
 
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * Returns the value of the '<em><b>Id</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * If the meaning of the '<em>Id</em>' attribute isn't clear,
    * there really should be more of a description here...
    * </p>
    * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getWorkingSet_Name()
-   * @model required="true"
+   * @return the value of the '<em>Id</em>' attribute.
+   * @see #setId(String)
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getWorkingSet_Id()
+   * @model
    * @generated
    */
+  String getId();
+
+  /**
+  	 * Sets the value of the '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getId <em>Id</em>}' attribute.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @param value the new value of the '<em>Id</em>' attribute.
+  	 * @see #getId()
+  	 * @generated
+  	 */
+  void setId(String value);
+
+  /**
+  	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+  	 * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+  	 * @return the value of the '<em>Name</em>' attribute.
+  	 * @see #setName(String)
+  	 * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage#getWorkingSet_Name()
+  	 * @model required="true"
+  	 * @generated
+  	 */
   String getName();
 
   /**
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java
index 8bf4547757..7956d18d5f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/WorkingSetsFactory.java
@@ -49,15 +49,6 @@ public interface WorkingSetsFactory extends EFactory
   WorkingSetGroup createWorkingSetGroup();
 
   /**
-   * Returns a new object of class '<em>Name Predicate</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Name Predicate</em>'.
-   * @generated
-   */
-  NamePredicate createNamePredicate();
-
-  /**
    * Returns the package supported by this factory.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
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 4450bdf9d2..59d098ee3a 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
@@ -13,7 +13,6 @@ package org.eclipse.emf.cdo.releng.workingsets;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
@@ -78,31 +77,40 @@ public interface WorkingSetsPackage extends EPackage
   int WORKING_SET = 0;
 
   /**
-   * The feature id for the '<em><b>Predicates</b></em>' containment reference list.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int WORKING_SET__PREDICATES = 0;
+  int WORKING_SET__NAME = 0;
 
   /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * The feature id for the '<em><b>Predicates</b></em>' containment reference list.
    * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
+     * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int WORKING_SET__NAME = 1;
+  int WORKING_SET__PREDICATES = 1;
 
   /**
-   * The number of structural features of the '<em>Working Set</em>' class.
+   * The feature id for the '<em><b>Id</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    * @ordered
    */
-  int WORKING_SET_FEATURE_COUNT = 2;
+  int WORKING_SET__ID = 2;
+
+  /**
+  	 * The number of structural features of the '<em>Working Set</em>' class.
+  	 * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+  	 * @generated
+  	 * @ordered
+  	 */
+  int WORKING_SET_FEATURE_COUNT = 3;
 
   /**
    * The number of operations of the '<em>Working Set</em>' class.
@@ -151,89 +159,6 @@ public interface WorkingSetsPackage extends EPackage
   int WORKING_SET_GROUP_OPERATION_COUNT = 0;
 
   /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.Predicate <em>Predicate</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.releng.workingsets.Predicate
-   * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getPredicate()
-   * @generated
-   */
-  int PREDICATE = 2;
-
-  /**
-   * The number of structural features of the '<em>Predicate</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PREDICATE_FEATURE_COUNT = 0;
-
-  /**
-   * The operation id for the '<em>Matches</em>' operation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PREDICATE___MATCHES__IPROJECT = 0;
-
-  /**
-   * The number of operations of the '<em>Predicate</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PREDICATE_OPERATION_COUNT = 1;
-
-  /**
-   * The meta object id for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.NamePredicateImpl <em>Name Predicate</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.cdo.releng.workingsets.impl.NamePredicateImpl
-   * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getNamePredicate()
-   * @generated
-   */
-  int NAME_PREDICATE = 3;
-
-  /**
-   * The feature id for the '<em><b>Pattern</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAME_PREDICATE__PATTERN = PREDICATE_FEATURE_COUNT + 0;
-
-  /**
-   * The number of structural features of the '<em>Name Predicate</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAME_PREDICATE_FEATURE_COUNT = PREDICATE_FEATURE_COUNT + 1;
-
-  /**
-   * The operation id for the '<em>Matches</em>' operation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAME_PREDICATE___MATCHES__IPROJECT = PREDICATE___MATCHES__IPROJECT;
-
-  /**
-   * The number of operations of the '<em>Name Predicate</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int NAME_PREDICATE_OPERATION_COUNT = PREDICATE_OPERATION_COUNT + 0;
-
-  /**
    * The meta object id for the '<em>Project</em>' data type.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -241,7 +166,7 @@ public interface WorkingSetsPackage extends EPackage
    * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getProject()
    * @generated
    */
-  int PROJECT = 4;
+  int PROJECT = 2;
 
   /**
    * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet <em>Working Set</em>}'.
@@ -265,14 +190,25 @@ public interface WorkingSetsPackage extends EPackage
   EReference getWorkingSet_Predicates();
 
   /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName <em>Name</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getId <em>Id</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName()
+   * @return the meta object for the attribute '<em>Id</em>'.
+   * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getId()
    * @see #getWorkingSet()
    * @generated
    */
+  EAttribute getWorkingSet_Id();
+
+  /**
+  	 * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName <em>Name</em>}'.
+  	 * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+  	 * @return the meta object for the attribute '<em>Name</em>'.
+  	 * @see org.eclipse.emf.cdo.releng.workingsets.WorkingSet#getName()
+  	 * @see #getWorkingSet()
+  	 * @generated
+  	 */
   EAttribute getWorkingSet_Name();
 
   /**
@@ -297,47 +233,6 @@ public interface WorkingSetsPackage extends EPackage
   EReference getWorkingSetGroup_WorkingSets();
 
   /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.workingsets.Predicate <em>Predicate</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Predicate</em>'.
-   * @see org.eclipse.emf.cdo.releng.workingsets.Predicate
-   * @generated
-   */
-  EClass getPredicate();
-
-  /**
-   * Returns the meta object for the '{@link org.eclipse.emf.cdo.releng.workingsets.Predicate#matches(org.eclipse.core.resources.IProject) <em>Matches</em>}' operation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the '<em>Matches</em>' operation.
-   * @see org.eclipse.emf.cdo.releng.workingsets.Predicate#matches(org.eclipse.core.resources.IProject)
-   * @generated
-   */
-  EOperation getPredicate__Matches__IProject();
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.cdo.releng.workingsets.NamePredicate <em>Name Predicate</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Name Predicate</em>'.
-   * @see org.eclipse.emf.cdo.releng.workingsets.NamePredicate
-   * @generated
-   */
-  EClass getNamePredicate();
-
-  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.releng.workingsets.NamePredicate#getPattern <em>Pattern</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Pattern</em>'.
-   * @see org.eclipse.emf.cdo.releng.workingsets.NamePredicate#getPattern()
-   * @see #getNamePredicate()
-   * @generated
-   */
-  EAttribute getNamePredicate_Pattern();
-
-  /**
    * Returns the meta object for data type '{@link org.eclipse.core.resources.IProject <em>Project</em>}'.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -391,11 +286,19 @@ public interface WorkingSetsPackage extends EPackage
     EReference WORKING_SET__PREDICATES = eINSTANCE.getWorkingSet_Predicates();
 
     /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      */
+    EAttribute WORKING_SET__ID = eINSTANCE.getWorkingSet_Id();
+
+    /**
+    	 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+    	 * <!-- begin-user-doc -->
+       * <!-- end-user-doc -->
+    	 * @generated
+    	 */
     EAttribute WORKING_SET__NAME = eINSTANCE.getWorkingSet_Name();
 
     /**
@@ -417,42 +320,6 @@ public interface WorkingSetsPackage extends EPackage
     EReference WORKING_SET_GROUP__WORKING_SETS = eINSTANCE.getWorkingSetGroup_WorkingSets();
 
     /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.workingsets.Predicate <em>Predicate</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.releng.workingsets.Predicate
-     * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getPredicate()
-     * @generated
-     */
-    EClass PREDICATE = eINSTANCE.getPredicate();
-
-    /**
-     * The meta object literal for the '<em><b>Matches</b></em>' operation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EOperation PREDICATE___MATCHES__IPROJECT = eINSTANCE.getPredicate__Matches__IProject();
-
-    /**
-     * The meta object literal for the '{@link org.eclipse.emf.cdo.releng.workingsets.impl.NamePredicateImpl <em>Name Predicate</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.cdo.releng.workingsets.impl.NamePredicateImpl
-     * @see org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetsPackageImpl#getNamePredicate()
-     * @generated
-     */
-    EClass NAME_PREDICATE = eINSTANCE.getNamePredicate();
-
-    /**
-     * The meta object literal for the '<em><b>Pattern</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    EAttribute NAME_PREDICATE__PATTERN = eINSTANCE.getNamePredicate_Pattern();
-
-    /**
      * The meta object literal for the '<em>Project</em>' data type.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/NamePredicateImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/NamePredicateImpl.java
deleted file mode 100644
index b0fe91c634..0000000000
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/NamePredicateImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2013 Eike Stepper (Berlin, Germany) and others.
- * 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:
- *    Eike Stepper - initial API and implementation
- */
-package org.eclipse.emf.cdo.releng.workingsets.impl;
-
-import org.eclipse.emf.cdo.releng.workingsets.NamePredicate;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import org.eclipse.core.resources.IProject;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Name Predicate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.NamePredicateImpl#getPattern <em>Pattern</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NamePredicateImpl extends MinimalEObjectImpl.Container implements NamePredicate
-{
-  /**
-   * The default value of the '{@link #getPattern() <em>Pattern</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPattern()
-   * @generated
-   * @ordered
-   */
-  protected static final String PATTERN_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPattern() <em>Pattern</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPattern()
-   * @generated
-   * @ordered
-   */
-  protected String pattern = PATTERN_EDEFAULT;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected NamePredicateImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return WorkingSetsPackage.Literals.NAME_PREDICATE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getPattern()
-  {
-    return pattern;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPattern(String newPattern)
-  {
-    String oldPattern = pattern;
-    pattern = newPattern;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, WorkingSetsPackage.NAME_PREDICATE__PATTERN, oldPattern,
-          pattern));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean matches(IProject project)
-  {
-    return pattern != null && project != null && project.getName().matches(pattern);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-    case WorkingSetsPackage.NAME_PREDICATE__PATTERN:
-      return getPattern();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-    case WorkingSetsPackage.NAME_PREDICATE__PATTERN:
-      setPattern((String)newValue);
-      return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-    case WorkingSetsPackage.NAME_PREDICATE__PATTERN:
-      setPattern(PATTERN_EDEFAULT);
-      return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-    case WorkingSetsPackage.NAME_PREDICATE__PATTERN:
-      return PATTERN_EDEFAULT == null ? pattern != null : !PATTERN_EDEFAULT.equals(pattern);
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException
-  {
-    switch (operationID)
-    {
-    case WorkingSetsPackage.NAME_PREDICATE___MATCHES__IPROJECT:
-      return matches((IProject)arguments.get(0));
-    }
-    return super.eInvoke(operationID, arguments);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy())
-      return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (pattern: ");
-    result.append(pattern);
-    result.append(')');
-    return result.toString();
-  }
-
-} // NamePredicateImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java
index 2a489abc72..4f4648b555 100644
--- a/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.workingsets/src/org/eclipse/emf/cdo/releng/workingsets/impl/WorkingSetImpl.java
@@ -10,10 +10,8 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.impl;
 
-import org.eclipse.emf.cdo.releng.workingsets.Predicate;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
@@ -23,8 +21,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import java.util.Collection;
+import org.eclipse.emf.cdo.releng.predicates.Predicate;
 
 /**
  * <!-- begin-user-doc -->
@@ -33,8 +31,9 @@ import java.util.Collection;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetImpl#getPredicates <em>Predicates</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetImpl#getPredicates <em>Predicates</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.releng.workingsets.impl.WorkingSetImpl#getId <em>Id</em>}</li>
  * </ul>
  * </p>
  *
@@ -43,40 +42,60 @@ import java.util.Collection;
 public class WorkingSetImpl extends MinimalEObjectImpl.Container implements WorkingSet
 {
   /**
-   * The cached value of the '{@link #getPredicates() <em>Predicates</em>}' containment reference list.
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @see #getPredicates()
+   * @see #getName()
    * @generated
    * @ordered
    */
-  protected EList<Predicate> predicates;
+  protected static final String NAME_EDEFAULT = null;
 
   /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @see #getName()
    * @generated
    * @ordered
    */
-  protected static final String NAME_EDEFAULT = null;
+  protected String name = NAME_EDEFAULT;
 
   /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The cached value of the '{@link #getPredicates() <em>Predicates</em>}' containment reference list.
    * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
+     * <!-- end-user-doc -->
+   * @see #getPredicates()
    * @generated
    * @ordered
    */
-  protected String name = NAME_EDEFAULT;
+  protected EList<Predicate> predicates;
 
   /**
+   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
+   * @see #getId()
    * @generated
+   * @ordered
    */
+  protected static final String ID_EDEFAULT = null;
+
+  /**
+  	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @see #getId()
+  	 * @generated
+  	 * @ordered
+  	 */
+  protected String id = ID_EDEFAULT;
+
+  /**
+  	 * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+  	 * @generated
+  	 */
   protected WorkingSetImpl()
   {
     super();
@@ -113,6 +132,29 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
    * <!-- end-user-doc -->
    * @generated
    */
+  public String getId()
+  {
+    return id;
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+  	 * <!-- end-user-doc -->
+  	 * @generated
+  	 */
+  public void setId(String newId)
+  {
+    String oldId = id;
+    id = newId;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, WorkingSetsPackage.WORKING_SET__ID, oldId, id));
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+  	 * @generated
+  	 */
   public String getName()
   {
     return name;
@@ -157,10 +199,12 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   {
     switch (featureID)
     {
-    case WorkingSetsPackage.WORKING_SET__PREDICATES:
-      return getPredicates();
     case WorkingSetsPackage.WORKING_SET__NAME:
       return getName();
+    case WorkingSetsPackage.WORKING_SET__PREDICATES:
+      return getPredicates();
+    case WorkingSetsPackage.WORKING_SET__ID:
+      return getId();
     }
     return super.eGet(featureID, resolve, coreType);
   }
@@ -176,12 +220,15 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   {
     switch (featureID)
     {
+    case WorkingSetsPackage.WORKING_SET__NAME:
+      setName((String)newValue);
+      return;
     case WorkingSetsPackage.WORKING_SET__PREDICATES:
       getPredicates().clear();
       getPredicates().addAll((Collection<? extends Predicate>)newValue);
       return;
-    case WorkingSetsPackage.WORKING_SET__NAME:
-      setName((String)newValue);
+    case WorkingSetsPackage.WORKING_SET__ID:
+      setId((String)newValue);
       return;
     }
     super.eSet(featureID, newValue);
@@ -197,11 +244,14 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   {
     switch (featureID)
     {
+    case WorkingSetsPackage.WORKING_SET__NAME:
+      setName(NAME_EDEFAULT);
+      return;
     case WorkingSetsPackage.WORKING_SET__PREDICATES:
       getPredicates().clear();
       return;
-    case WorkingSetsPackage.WORKING_SET__NAME:
-      setName(NAME_EDEFAULT);
+    case WorkingSetsPackage.WORKING_SET__ID:
+      setId(ID_EDEFAULT);
       return;
     }
     super.eUnset(featureID);
@@ -217,10 +267,12 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
   {
     switch (featureID)
     {
-    case WorkingSetsPackage.WORKING_SET__PREDICATES:
-      return predicates != null && !predicates.isEmpty();
     case WorkingSetsPackage.WORKING_SET__NAME:
       return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+    case WorkingSetsPackage.WORKING_SET__PREDICATES:
+      return predicates != null && !predicates.isEmpty();
+    case WorkingSetsPackage.WORKING_SET__ID:
+      return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
     }
     return super.eIsSet(featureID);
   }
@@ -239,6 +291,8 @@ public class WorkingSetImpl extends MinimalEObjectImpl.Container implements Work
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
     result.append(name);
+    result.append(", id: ");
+    result.append(id);
     result.append(')');
     return result.toString();
   }
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 eaa1411f84..bed7e75bbd 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
@@ -10,11 +10,7 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.impl;
 
-import org.eclipse.emf.cdo.releng.workingsets.NamePredicate;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
+import org.eclipse.emf.cdo.releng.workingsets.*;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
@@ -79,8 +75,6 @@ public class WorkingSetsFactoryImpl extends EFactoryImpl implements WorkingSetsF
       return createWorkingSet();
     case WorkingSetsPackage.WORKING_SET_GROUP:
       return createWorkingSetGroup();
-    case WorkingSetsPackage.NAME_PREDICATE:
-      return createNamePredicate();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
@@ -143,17 +137,6 @@ public class WorkingSetsFactoryImpl extends EFactoryImpl implements WorkingSetsF
    * <!-- end-user-doc -->
    * @generated
    */
-  public NamePredicate createNamePredicate()
-  {
-    NamePredicateImpl namePredicate = new NamePredicateImpl();
-    return namePredicate;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   public WorkingSetsPackage getWorkingSetsPackage()
   {
     return (WorkingSetsPackage)getEPackage();
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 1fbf3786bf..b1241d98a6 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
@@ -10,22 +10,18 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.impl;
 
-import org.eclipse.emf.cdo.releng.workingsets.NamePredicate;
-import org.eclipse.emf.cdo.releng.workingsets.Predicate;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsFactory;
 import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
-
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
 import org.eclipse.core.resources.IProject;
+import org.eclipse.emf.cdo.releng.predicates.PredicatesPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -54,20 +50,6 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
    * <!-- end-user-doc -->
    * @generated
    */
-  private EClass predicateEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass namePredicateEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   private EDataType projectEDataType = null;
 
   /**
@@ -120,6 +102,9 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
 
     isInited = true;
 
+    // Initialize simple dependencies
+    PredicatesPackage.eINSTANCE.eClass();
+
     // Create package meta-data objects
     theWorkingSetsPackage.createPackageContents();
 
@@ -151,7 +136,7 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
    */
   public EReference getWorkingSet_Predicates()
   {
-    return (EReference)workingSetEClass.getEStructuralFeatures().get(0);
+    return (EReference)workingSetEClass.getEStructuralFeatures().get(1);
   }
 
   /**
@@ -159,9 +144,19 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
    * <!-- end-user-doc -->
    * @generated
    */
+  public EAttribute getWorkingSet_Id()
+  {
+    return (EAttribute)workingSetEClass.getEStructuralFeatures().get(2);
+  }
+
+  /**
+  	 * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+  	 * @generated
+  	 */
   public EAttribute getWorkingSet_Name()
   {
-    return (EAttribute)workingSetEClass.getEStructuralFeatures().get(1);
+    return (EAttribute)workingSetEClass.getEStructuralFeatures().get(0);
   }
 
   /**
@@ -189,46 +184,6 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
    * <!-- end-user-doc -->
    * @generated
    */
-  public EClass getPredicate()
-  {
-    return predicateEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EOperation getPredicate__Matches__IProject()
-  {
-    return predicateEClass.getEOperations().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getNamePredicate()
-  {
-    return namePredicateEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getNamePredicate_Pattern()
-  {
-    return (EAttribute)namePredicateEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
   public EDataType getProject()
   {
     return projectEDataType;
@@ -266,18 +221,13 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
 
     // Create classes and their features
     workingSetEClass = createEClass(WORKING_SET);
-    createEReference(workingSetEClass, WORKING_SET__PREDICATES);
     createEAttribute(workingSetEClass, WORKING_SET__NAME);
+    createEReference(workingSetEClass, WORKING_SET__PREDICATES);
+    createEAttribute(workingSetEClass, WORKING_SET__ID);
 
     workingSetGroupEClass = createEClass(WORKING_SET_GROUP);
     createEReference(workingSetGroupEClass, WORKING_SET_GROUP__WORKING_SETS);
 
-    predicateEClass = createEClass(PREDICATE);
-    createEOperation(predicateEClass, PREDICATE___MATCHES__IPROJECT);
-
-    namePredicateEClass = createEClass(NAME_PREDICATE);
-    createEAttribute(namePredicateEClass, NAME_PREDICATE__PATTERN);
-
     // Create data types
     projectEDataType = createEDataType(PROJECT);
   }
@@ -307,21 +257,26 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
     setNsPrefix(eNS_PREFIX);
     setNsURI(eNS_URI);
 
+    // Obtain other dependent packages
+    PredicatesPackage thePredicatesPackage = (PredicatesPackage)EPackage.Registry.INSTANCE
+        .getEPackage(PredicatesPackage.eNS_URI);
+
     // Create type parameters
 
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    namePredicateEClass.getESuperTypes().add(this.getPredicate());
 
     // Initialize classes, features, and operations; add parameters
     initEClass(workingSetEClass, WorkingSet.class, "WorkingSet", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getWorkingSet_Predicates(), this.getPredicate(), null, "predicates", null, 0, -1, WorkingSet.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
     initEAttribute(getWorkingSet_Name(), ecorePackage.getEString(), "name", null, 1, 1, WorkingSet.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getWorkingSet_Predicates(), thePredicatesPackage.getPredicate(), null, "predicates", null, 0, -1,
+        WorkingSet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getWorkingSet_Id(), ecorePackage.getEString(), "id", null, 0, 1, WorkingSet.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(workingSetGroupEClass, WorkingSetGroup.class, "WorkingSetGroup", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
@@ -330,17 +285,6 @@ public class WorkingSetsPackageImpl extends EPackageImpl implements WorkingSetsP
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     getWorkingSetGroup_WorkingSets().getEKeys().add(this.getWorkingSet_Name());
 
-    initEClass(predicateEClass, Predicate.class, "Predicate", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    EOperation op = initEOperation(getPredicate__Matches__IProject(), ecorePackage.getEBoolean(), "matches", 0, 1,
-        IS_UNIQUE, IS_ORDERED);
-    addEParameter(op, this.getProject(), "project", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-    initEClass(namePredicateEClass, NamePredicate.class, "NamePredicate", !IS_ABSTRACT, !IS_INTERFACE,
-        IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNamePredicate_Pattern(), ecorePackage.getEString(), "pattern", null, 1, 1, NamePredicate.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, 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 3a82879a1c..4ffaac018a 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
@@ -10,11 +10,7 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.util;
 
-import org.eclipse.emf.cdo.releng.workingsets.NamePredicate;
-import org.eclipse.emf.cdo.releng.workingsets.Predicate;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
+import org.eclipse.emf.cdo.releng.workingsets.*;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
@@ -95,18 +91,6 @@ public class WorkingSetsAdapterFactory extends AdapterFactoryImpl
     }
 
     @Override
-    public Adapter casePredicate(Predicate object)
-    {
-      return createPredicateAdapter();
-    }
-
-    @Override
-    public Adapter caseNamePredicate(NamePredicate object)
-    {
-      return createNamePredicateAdapter();
-    }
-
-    @Override
     public Adapter defaultCase(EObject object)
     {
       return createEObjectAdapter();
@@ -158,36 +142,6 @@ public class WorkingSetsAdapterFactory extends AdapterFactoryImpl
   }
 
   /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.workingsets.Predicate <em>Predicate</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.cdo.releng.workingsets.Predicate
-   * @generated
-   */
-  public Adapter createPredicateAdapter()
-  {
-    return null;
-  }
-
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.releng.workingsets.NamePredicate <em>Name Predicate</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.cdo.releng.workingsets.NamePredicate
-   * @generated
-   */
-  public Adapter createNamePredicateAdapter()
-  {
-    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.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 0001938b45..0269b870ad 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
@@ -10,11 +10,7 @@
  */
 package org.eclipse.emf.cdo.releng.workingsets.util;
 
-import org.eclipse.emf.cdo.releng.workingsets.NamePredicate;
-import org.eclipse.emf.cdo.releng.workingsets.Predicate;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSet;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetGroup;
-import org.eclipse.emf.cdo.releng.workingsets.WorkingSetsPackage;
+import org.eclipse.emf.cdo.releng.workingsets.*;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
@@ -98,24 +94,6 @@ public class WorkingSetsSwitch<T> extends Switch<T>
         result = defaultCase(theEObject);
       return result;
     }
-    case WorkingSetsPackage.PREDICATE:
-    {
-      Predicate predicate = (Predicate)theEObject;
-      T result = casePredicate(predicate);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
-    case WorkingSetsPackage.NAME_PREDICATE:
-    {
-      NamePredicate namePredicate = (NamePredicate)theEObject;
-      T result = caseNamePredicate(namePredicate);
-      if (result == null)
-        result = casePredicate(namePredicate);
-      if (result == null)
-        result = defaultCase(theEObject);
-      return result;
-    }
     default:
       return defaultCase(theEObject);
     }
@@ -154,38 +132,6 @@ public class WorkingSetsSwitch<T> extends Switch<T>
   }
 
   /**
-   * Returns the result of interpreting the object as an instance of '<em>Predicate</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>Predicate</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePredicate(Predicate object)
-  {
-    return null;
-  }
-
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Name Predicate</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>Name Predicate</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseNamePredicate(NamePredicate object)
-  {
-    return null;
-  }
-
-  /**
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
    * <!-- begin-user-doc -->
    * This implementation returns null;