1 files changed, 24 insertions, 23 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
index e1c6e07801..f177c1cae4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * The following features are implemented:
  * <ul>
  *   <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl#getListOfB <em>List Of B</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl#getDbId <em>Db Id</em>}</li>
  * </ul>
  * </p>
  *
@@ -49,23 +49,24 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 	protected EList<Bz398057B> listOfB;
 
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getDbId()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final String ID_EDEFAULT = null;
+	protected static final String DB_ID_EDEFAULT = null;
+
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+	 * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
+	 * @see #getDbId()
 	 * @generated
 	 * @ordered
 	 */
-	protected String id = ID_EDEFAULT;
+	protected String dbId = DB_ID_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -103,8 +104,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public String getId() {
-		return id;
+	public String getDbId() {
+		return dbId;
 	}
 
 	/**
@@ -112,11 +113,11 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
+	public void setDbId(String newDbId) {
+		String oldDbId = dbId;
+		dbId = newDbId;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__ID, oldId, id));
+			eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__DB_ID, oldDbId, dbId));
 	}
 
 	/**
@@ -158,8 +159,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 		switch (featureID) {
 			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
 				return getListOfB();
-			case HibernateTestPackage.BZ398057_A__ID:
-				return getId();
+			case HibernateTestPackage.BZ398057_A__DB_ID:
+				return getDbId();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -177,8 +178,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 				getListOfB().clear();
 				getListOfB().addAll((Collection<? extends Bz398057B>)newValue);
 				return;
-			case HibernateTestPackage.BZ398057_A__ID:
-				setId((String)newValue);
+			case HibernateTestPackage.BZ398057_A__DB_ID:
+				setDbId((String)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -195,8 +196,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
 				getListOfB().clear();
 				return;
-			case HibernateTestPackage.BZ398057_A__ID:
-				setId(ID_EDEFAULT);
+			case HibernateTestPackage.BZ398057_A__DB_ID:
+				setDbId(DB_ID_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -212,8 +213,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 		switch (featureID) {
 			case HibernateTestPackage.BZ398057_A__LIST_OF_B:
 				return listOfB != null && !listOfB.isEmpty();
-			case HibernateTestPackage.BZ398057_A__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+			case HibernateTestPackage.BZ398057_A__DB_ID:
+				return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -228,8 +229,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
+		result.append(" (dbId: ");
+		result.append(dbId);
 		result.append(')');
 		return result.toString();
 	}