### Eclipse Workspace Patch 1.0
#P org.eclipse.jpt.core
Index: src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java
===================================================================
RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java,v
retrieving revision 1.15
diff -u -r1.15 GenericJavaIdMapping.java
--- src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java	27 Mar 2008 04:41:34 -0000	1.15
+++ src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java	11 Jun 2008 15:10:50 -0000
@@ -77,24 +77,21 @@
 	protected void initializeTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
 		TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute);
 		if (tableGeneratorResource != null) {
-			this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
-			this.tableGenerator.initializeFromResource(tableGeneratorResource);
+			this.tableGenerator = buildTableGenerator(tableGeneratorResource);
 		}
 	}
 	
 	protected void initializeSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
 		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
 		if (sequenceGeneratorResource != null) {
-			this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
-			this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
+			this.sequenceGenerator = buildSequenceGenerator(sequenceGeneratorResource);
 		}
 	}
 	
 	protected void initializeGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
 		GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
 		if (generatedValueResource != null) {
-			this.generatedValue = getJpaFactory().buildJavaGeneratedValue(this);
-			this.generatedValue.initializeFromResource(generatedValueResource);
+			this.generatedValue = buildGeneratedValue(generatedValueResource);
 		}
 	}
 	
@@ -287,8 +284,7 @@
 		}
 		else {
 			if (getTableGenerator() == null) {
-				setTableGenerator(getJpaFactory().buildJavaTableGenerator(this));
-				getTableGenerator().initializeFromResource(tableGeneratorResource);
+				setTableGenerator(buildTableGenerator(tableGeneratorResource));
 			}
 			else {
 				getTableGenerator().update(tableGeneratorResource);
@@ -296,6 +292,12 @@
 		}
 	}
 	
+	protected JavaTableGenerator buildTableGenerator(TableGeneratorAnnotation tableGeneratorResource) {
+		JavaTableGenerator tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
+		tableGenerator.initializeFromResource(tableGeneratorResource);
+		return tableGenerator;
+	}
+	
 	protected void updateSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
 		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
 		if (sequenceGeneratorResource == null) {
@@ -305,8 +307,7 @@
 		}
 		else {
 			if (getSequenceGenerator() == null) {
-				setSequenceGenerator(getJpaFactory().buildJavaSequenceGenerator(this));
-				getSequenceGenerator().initializeFromResource(sequenceGeneratorResource);
+				setSequenceGenerator(buildSequenceGenerator(sequenceGeneratorResource));
 			}
 			else {
 				getSequenceGenerator().update(sequenceGeneratorResource);
@@ -314,6 +315,12 @@
 		}
 	}
 	
+	protected JavaSequenceGenerator buildSequenceGenerator(SequenceGeneratorAnnotation sequenceGeneratorResource) {
+		JavaSequenceGenerator sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
+		sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
+		return sequenceGenerator;
+	}
+	
 	protected void updateGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
 		GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
 		if (generatedValueResource == null) {
@@ -323,8 +330,7 @@
 		}
 		else {
 			if (getGeneratedValue() == null) {
-				setGeneratedValue(getJpaFactory().buildJavaGeneratedValue(this));
-				getGeneratedValue().initializeFromResource(generatedValueResource);
+				setGeneratedValue(buildGeneratedValue(generatedValueResource));
 			}
 			else {
 				getGeneratedValue().update(generatedValueResource);
@@ -332,6 +338,12 @@
 		}
 	}
 	
+	protected JavaGeneratedValue buildGeneratedValue(GeneratedValueAnnotation generatedValueResource) {
+		JavaGeneratedValue generatedValue = getJpaFactory().buildJavaGeneratedValue(this);
+		generatedValue.initializeFromResource(generatedValueResource);
+		return generatedValue;
+	}
+
 	protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
 		return (TableGeneratorAnnotation) resourcePersistentAttribute.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
 	}