[170217]

11 files changed, 483 insertions, 58 deletions

diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java
index b5ad45d98..2250b0f64 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdFactory.java,v 1.1 2006/07/11 16:56:55 mtaal Exp $
+ * $Id: IdFactory.java,v 1.2 2007/01/24 23:30:16 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id;
 
@@ -53,6 +53,15 @@ public interface IdFactory extends EFactory {
 	TableID createTableID();
 
 	/**
+	 * Returns a new object of class '<em>Table Generator ID</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Table Generator ID</em>'.
+	 * @generated
+	 */
+	TableGeneratorID createTableGeneratorID();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java
index dc37e8020..7b380157b 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/IdPackage.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdPackage.java,v 1.2 2006/11/07 10:22:27 mtaal Exp $
+ * $Id: IdPackage.java,v 1.3 2007/01/24 23:30:17 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id;
 
@@ -146,6 +146,35 @@ public interface IdPackage extends EPackage {
 
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl <em>Table Generator ID</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdPackageImpl#getTableGeneratorID()
+	 * @generated
+	 */
+	int TABLE_GENERATOR_ID = 3;
+
+	/**
+	 * The feature id for the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_GENERATOR_ID__MYID = 0;
+
+	/**
+	 * The number of structural features of the '<em>Table Generator ID</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TABLE_GENERATOR_ID_FEATURE_COUNT = 1;
+
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID <em>Identity ID</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -209,6 +238,27 @@ public interface IdPackage extends EPackage {
 	EAttribute getTableID_Myid();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID <em>Table Generator ID</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Table Generator ID</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID
+	 * @generated
+	 */
+	EClass getTableGeneratorID();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Myid</em>'.
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid()
+	 * @see #getTableGeneratorID()
+	 * @generated
+	 */
+	EAttribute getTableGeneratorID_Myid();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -284,6 +334,24 @@ public interface IdPackage extends EPackage {
 		 */
 		EAttribute TABLE_ID__MYID = eINSTANCE.getTableID_Myid();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl <em>Table Generator ID</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl
+		 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.impl.IdPackageImpl#getTableGeneratorID()
+		 * @generated
+		 */
+		EClass TABLE_GENERATOR_ID = eINSTANCE.getTableGeneratorID();
+
+		/**
+		 * The meta object literal for the '<em><b>Myid</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute TABLE_GENERATOR_ID__MYID = eINSTANCE.getTableGeneratorID_Myid();
+
 	}
 
 } //IdPackage
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/TableGeneratorID.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/TableGeneratorID.java
new file mode 100644
index 000000000..9651fb0cd
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/TableGeneratorID.java
@@ -0,0 +1,83 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TableGeneratorID.java,v 1.1 2007/01/24 23:30:16 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.id;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Table Generator ID</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage#getTableGeneratorID()
+ * @model extendedMetaData="name='TableID' kind='elementOnly'"
+ * @generated
+ */
+public interface TableGeneratorID extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Myid</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Myid</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #setMyid(long)
+	 * @see org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage#getTableGeneratorID_Myid()
+	 * @model unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Long" required="true"
+	 *        annotation="teneo.jpa appinfo='\n\t\t\t\t@Id\n\t\t\t\t@TableGenerator(name=\"TGENERATOR\", table=\"TGEN\", initialValue=\"2\", valueColumnName=\"VAL_COL\")\n\t\t\t\t@GeneratedValue(strategy=TABLE, generator=\"TGENERATOR\")\n\t\t\t'"
+	 *        extendedMetaData="kind='element' name='myid'"
+	 * @generated
+	 */
+	long getMyid();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Myid</em>' attribute.
+	 * @see #isSetMyid()
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @generated
+	 */
+	void setMyid(long value);
+
+	/**
+	 * Unsets the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isSetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	void unsetMyid();
+
+	/**
+	 * Returns whether the value of the '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID#getMyid <em>Myid</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return whether the value of the '<em>Myid</em>' attribute is set.
+	 * @see #unsetMyid()
+	 * @see #getMyid()
+	 * @see #setMyid(long)
+	 * @generated
+	 */
+	boolean isSetMyid();
+
+} // TableGeneratorID
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java
index 5e514e68c..f4e0d7837 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdFactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdFactoryImpl.java,v 1.1 2006/07/11 16:57:06 mtaal Exp $
+ * $Id: IdFactoryImpl.java,v 1.2 2007/01/24 23:30:15 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.impl;
 
@@ -62,6 +62,7 @@ public class IdFactoryImpl extends EFactoryImpl implements IdFactory {
 			case IdPackage.IDENTITY_ID: return createIdentityID();
 			case IdPackage.SIMPLE_ID: return createSimpleID();
 			case IdPackage.TABLE_ID: return createTableID();
+			case IdPackage.TABLE_GENERATOR_ID: return createTableGeneratorID();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
@@ -102,6 +103,16 @@ public class IdFactoryImpl extends EFactoryImpl implements IdFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public TableGeneratorID createTableGeneratorID() {
+		TableGeneratorIDImpl tableGeneratorID = new TableGeneratorIDImpl();
+		return tableGeneratorID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public IdPackage getIdPackage() {
 		return (IdPackage)getEPackage();
 	}
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java
index 39ed6f48c..79423f33d 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/IdPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdPackageImpl.java,v 1.2 2006/11/07 10:22:27 mtaal Exp $
+ * $Id: IdPackageImpl.java,v 1.3 2007/01/24 23:30:14 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.impl;
 
@@ -15,6 +15,7 @@ import org.eclipse.emf.teneo.samples.emf.annotations.id.IdFactory;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.IdPackage;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.IdentityID;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.SimpleID;
+import org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID;
 import org.eclipse.emf.teneo.samples.emf.annotations.id.TableID;
 
 /**
@@ -46,6 +47,13 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 	private EClass tableIDEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass tableGeneratorIDEClass = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
@@ -175,6 +183,24 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getTableGeneratorID() {
+		return tableGeneratorIDEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getTableGeneratorID_Myid() {
+		return (EAttribute)tableGeneratorIDEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public IdFactory getIdFactory() {
 		return (IdFactory)getEFactoryInstance();
 	}
@@ -206,6 +232,9 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 
 		tableIDEClass = createEClass(TABLE_ID);
 		createEAttribute(tableIDEClass, TABLE_ID__MYID);
+
+		tableGeneratorIDEClass = createEClass(TABLE_GENERATOR_ID);
+		createEAttribute(tableGeneratorIDEClass, TABLE_GENERATOR_ID__MYID);
 	}
 
 	/**
@@ -246,6 +275,9 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 		initEClass(tableIDEClass, TableID.class, "TableID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getTableID_Myid(), theXMLTypePackage.getLong(), "myid", null, 1, 1, TableID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+		initEClass(tableGeneratorIDEClass, TableGeneratorID.class, "TableGeneratorID", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTableGeneratorID_Myid(), theXMLTypePackage.getLong(), "myid", null, 1, 1, TableGeneratorID.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
 		// Create resource
 		createResource(eNS_URI);
 
@@ -287,6 +319,12 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 		   source, 
 		   new String[] {
 			 "appinfo", "\n\t\t\t\t@Id\n\t\t\t\t@GeneratedValue(strategy=\"TABLE\")\n\t\t\t"
+		   });				
+		addAnnotation
+		  (getTableGeneratorID_Myid(), 
+		   source, 
+		   new String[] {
+			 "appinfo", "\n\t\t\t\t@Id\n\t\t\t\t@TableGenerator(name=\"TGENERATOR\", table=\"TGEN\", initialValue=\"2\", valueColumnName=\"VAL_COL\")\n\t\t\t\t@GeneratedValue(strategy=TABLE, generator=\"TGENERATOR\")\n\t\t\t"
 		   });	
 	}
 
@@ -339,6 +377,20 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 		   new String[] {
 			 "kind", "element",
 			 "name", "myid"
+		   });		
+		addAnnotation
+		  (tableGeneratorIDEClass, 
+		   source, 
+		   new String[] {
+			 "name", "TableID",
+			 "kind", "elementOnly"
+		   });			
+		addAnnotation
+		  (getTableGeneratorID_Myid(), 
+		   source, 
+		   new String[] {
+			 "kind", "element",
+			 "name", "myid"
 		   });
 	}
 
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/TableGeneratorIDImpl.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/TableGeneratorIDImpl.java
new file mode 100644
index 000000000..12f06db5a
--- /dev/null
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/impl/TableGeneratorIDImpl.java
@@ -0,0 +1,195 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id: TableGeneratorIDImpl.java,v 1.1 2007/01/24 23:30:15 mtaal Exp $
+ */
+package org.eclipse.emf.teneo.samples.emf.annotations.id.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.emf.teneo.samples.emf.annotations.id.IdPackage;
+import org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Table Generator ID</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.emf.teneo.samples.emf.annotations.id.impl.TableGeneratorIDImpl#getMyid <em>Myid</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class TableGeneratorIDImpl extends EObjectImpl implements TableGeneratorID {
+	/**
+	 * The default value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final long MYID_EDEFAULT = 0L;
+
+	/**
+	 * The cached value of the '{@link #getMyid() <em>Myid</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getMyid()
+	 * @generated
+	 * @ordered
+	 */
+	protected long myid = MYID_EDEFAULT;
+
+	/**
+	 * This is true if the Myid attribute has been set.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean myidESet = false;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected TableGeneratorIDImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EClass eStaticClass() {
+		return IdPackage.Literals.TABLE_GENERATOR_ID;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public long getMyid() {
+		return myid;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setMyid(long newMyid) {
+		long oldMyid = myid;
+		myid = newMyid;
+		boolean oldMyidESet = myidESet;
+		myidESet = true;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, IdPackage.TABLE_GENERATOR_ID__MYID, oldMyid, myid, !oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void unsetMyid() {
+		long oldMyid = myid;
+		boolean oldMyidESet = myidESet;
+		myid = MYID_EDEFAULT;
+		myidESet = false;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.UNSET, IdPackage.TABLE_GENERATOR_ID__MYID, oldMyid, MYID_EDEFAULT, oldMyidESet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetMyid() {
+		return myidESet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				return new Long(getMyid());
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				setMyid(((Long)newValue).longValue());
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				unsetMyid();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case IdPackage.TABLE_GENERATOR_ID__MYID:
+				return isSetMyid();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (myid: ");
+		if (myidESet) result.append(myid); else result.append("<unset>");
+		result.append(')');
+		return result.toString();
+	}
+
+} //TableGeneratorIDImpl
\ No newline at end of file
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore
index 49f0c3c40..1a00a027b 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.ecore
@@ -55,4 +55,20 @@
       </eAnnotations>
     </eStructuralFeatures>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="TableGeneratorID">
+    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+      <details key="name" value="TableID"/>
+      <details key="kind" value="elementOnly"/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="myid" unique="false" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Long" unsettable="true">
+      <eAnnotations source="teneo.jpa">
+        <details key="appinfo" value="&#xA;&#x9;&#x9;&#x9;&#x9;@Id&#xA;&#x9;&#x9;&#x9;&#x9;@TableGenerator(name=&quot;TGENERATOR&quot;, table=&quot;TGEN&quot;, initialValue=&quot;2&quot;, valueColumnName=&quot;VAL_COL&quot;)&#xA;&#x9;&#x9;&#x9;&#x9;@GeneratedValue(strategy=TABLE, generator=&quot;TGENERATOR&quot;)&#xA;&#x9;&#x9;&#x9;"/>
+      </eAnnotations>
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="myid"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel
index 7b3897526..167d92dfd 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.genmodel
@@ -2,8 +2,8 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.teneo.samples/src"
-    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Id" importerID="org.eclipse.xsd.ecore.importer">
-  <foreignModel>id.xsd</foreignModel>
+    modelPluginID="org.eclipse.emf.teneo.samples" modelName="Id" importerID="org.eclipse.emf.importer.ecore">
+  <foreignModel>id.ecore</foreignModel>
   <genPackages prefix="Id" basePackage="org.eclipse.emf.teneo.samples.emf.annotations"
       resource="XML" disposableProviderFactory="true" ecorePackage="id.ecore#/">
     <genClasses ecoreClass="id.ecore#//IdentityID">
@@ -15,5 +15,8 @@
     <genClasses ecoreClass="id.ecore#//TableID">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//TableID/myid"/>
     </genClasses>
+    <genClasses ecoreClass="id.ecore#//TableGeneratorID">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute id.ecore#//TableGeneratorID/myid"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.xsd b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.xsd
deleted file mode 100644
index 90e263cf7..000000000
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/model/id.xsd
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://www.eclipse.org/emf/teneo/samples/emf/annotations/id"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:lib="http://www.eclipse.org/emf/teneo/samples/emf/annotations/id"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-    <xsd:annotation>
-		<xsd:appinfo source="teneo.jpa">
-			@SequenceGenerator(name="GENERATOR" sequenceName="mySequenceName")
-		</xsd:appinfo>
-	</xsd:annotation>
-
-  <xsd:complexType name="SimpleID">
-    <xsd:sequence>
-      <xsd:element name="autoID" type="xsd:long">
-	 	<xsd:annotation>
-			<xsd:appinfo source="teneo.jpa">
-				@Id
-				@GeneratedValue
-				@Column(name="AUTOD" nullable="false")
-			</xsd:appinfo>
-	    </xsd:annotation>
-	  </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="TableID">
-    <xsd:sequence>
-      <xsd:element name="myid" type="xsd:long">
-	 	<xsd:annotation>
-			<xsd:appinfo source="teneo.jpa">
-				@Id
-				@GeneratedValue(strategy="TABLE")
-			</xsd:appinfo>
-	    </xsd:annotation>
-	  </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="IdentityID">
-    <xsd:sequence>
-      <xsd:element name="myid" type="xsd:long">
-	 	<xsd:annotation>
-			<xsd:appinfo source="teneo.jpa">
-				@Id
-				@GeneratedValue(strategy="IDENTITY")
-			</xsd:appinfo>
-	    </xsd:annotation>
-	  </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
- </xsd:schema>
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java
index 310d792a2..3d77411ae 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdAdapterFactory.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdAdapterFactory.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: IdAdapterFactory.java,v 1.2 2007/01/24 23:30:13 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.util;
 
@@ -79,6 +79,9 @@ public class IdAdapterFactory extends AdapterFactoryImpl {
 			public Object caseTableID(TableID object) {
 				return createTableIDAdapter();
 			}
+			public Object caseTableGeneratorID(TableGeneratorID object) {
+				return createTableGeneratorIDAdapter();
+			}
 			public Object defaultCase(EObject object) {
 				return createEObjectAdapter();
 			}
@@ -140,6 +143,20 @@ public class IdAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.teneo.samples.emf.annotations.id.TableGeneratorID <em>Table Generator ID</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.teneo.samples.emf.annotations.id.TableGeneratorID
+	 * @generated
+	 */
+	public Adapter createTableGeneratorIDAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
diff --git a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java
index b2f5a476a..c120e22dc 100644
--- a/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java
+++ b/examples/org.eclipse.emf.teneo.samples/src/org/eclipse/emf/teneo/samples/emf/annotations/id/util/IdSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: IdSwitch.java,v 1.1 2006/07/11 16:57:17 mtaal Exp $
+ * $Id: IdSwitch.java,v 1.2 2007/01/24 23:30:12 mtaal Exp $
  */
 package org.eclipse.emf.teneo.samples.emf.annotations.id.util;
 
@@ -105,6 +105,12 @@ public class IdSwitch {
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case IdPackage.TABLE_GENERATOR_ID: {
+				TableGeneratorID tableGeneratorID = (TableGeneratorID)theEObject;
+				Object result = caseTableGeneratorID(tableGeneratorID);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -155,6 +161,21 @@ public class IdSwitch {
 	}
 
 	/**
+	 * Returns the result of interpretting the object as an instance of '<em>Table Generator ID</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 interpretting the object as an instance of '<em>Table Generator ID</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public Object caseTableGeneratorID(TableGeneratorID object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;