Attachment #104497 for bug #234628

View | Details | Raw Unified | Return to bug 234628
Collapse All | Expand All




	protected void initializeTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
		TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute);
		if (tableGeneratorResource != null) {
			this.tableGenerator = buildTableGenerator(tableGeneratorResource);
			this.tableGenerator.initializeFromResource(tableGeneratorResource);
		}
	}
	
	protected void initializeSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
		SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
		if (sequenceGeneratorResource != null) {
			this.sequenceGenerator = buildSequenceGenerator(sequenceGeneratorResource);
			this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
		}
	}
	
	protected void initializeGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
		GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
		if (generatedValueResource != null) {
			this.generatedValue = buildGeneratedValue(generatedValueResource);
			this.generatedValue.initializeFromResource(generatedValueResource);
		}
	}
	

		}
		else {
			if (getTableGenerator() == null) {
				setTableGenerator(buildTableGenerator(tableGeneratorResource));
				getTableGenerator().initializeFromResource(tableGeneratorResource);
			}
			else {
				getTableGenerator().update(tableGeneratorResource);

		}
	}
	
	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) {

		}
		else {
			if (getSequenceGenerator() == null) {
				setSequenceGenerator(buildSequenceGenerator(sequenceGeneratorResource));
				getSequenceGenerator().initializeFromResource(sequenceGeneratorResource);
			}
			else {
				getSequenceGenerator().update(sequenceGeneratorResource);

		}
	}
	
	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) {

		}
		else {
			if (getGeneratedValue() == null) {
				setGeneratedValue(buildGeneratedValue(generatedValueResource));
				getGeneratedValue().initializeFromResource(generatedValueResource);
			}
			else {
				getGeneratedValue().update(generatedValueResource);

		}
	}
	
	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);
	}

Return to bug 234628

Lines 77-100 Link Here

(-)src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java (-12 / +24 lines)
77	protected void initializeTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {	77	protected void initializeTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
78	TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute);	78	TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute);
79	if (tableGeneratorResource != null) {	79	if (tableGeneratorResource != null) {
80	this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this);	80	this.tableGenerator = buildTableGenerator(tableGeneratorResource);
81	this.tableGenerator.initializeFromResource(tableGeneratorResource);
82	}	81	}
83	}	82	}
84		83
85	protected void initializeSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {	84	protected void initializeSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
86	SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);	85	SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
87	if (sequenceGeneratorResource != null) {	86	if (sequenceGeneratorResource != null) {
88	this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);	87	this.sequenceGenerator = buildSequenceGenerator(sequenceGeneratorResource);
89	this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
90	}	88	}
91	}	89	}
92		90
93	protected void initializeGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {	91	protected void initializeGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
94	GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);	92	GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
95	if (generatedValueResource != null) {	93	if (generatedValueResource != null) {
96	this.generatedValue = getJpaFactory().buildJavaGeneratedValue(this);	94	this.generatedValue = buildGeneratedValue(generatedValueResource);
97	this.generatedValue.initializeFromResource(generatedValueResource);
98	}	95	}
99	}	96	}
100		97
Lines 287-294 Link Here
287	}	284	}
288	else {	285	else {
289	if (getTableGenerator() == null) {	286	if (getTableGenerator() == null) {
290	setTableGenerator(getJpaFactory().buildJavaTableGenerator(this));	287	setTableGenerator(buildTableGenerator(tableGeneratorResource));
291	getTableGenerator().initializeFromResource(tableGeneratorResource);
292	}	288	}
293	else {	289	else {
294	getTableGenerator().update(tableGeneratorResource);	290	getTableGenerator().update(tableGeneratorResource);
Lines 296-301 Link Here
296	}	292	}
297	}	293	}
298		294
		295	protected JavaTableGenerator buildTableGenerator(TableGeneratorAnnotation tableGeneratorResource) {
		296	JavaTableGenerator tableGenerator = getJpaFactory().buildJavaTableGenerator(this);
		297	tableGenerator.initializeFromResource(tableGeneratorResource);
		298	return tableGenerator;
		299	}
		300
299	protected void updateSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {	301	protected void updateSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
300	SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);	302	SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute);
301	if (sequenceGeneratorResource == null) {	303	if (sequenceGeneratorResource == null) {
Lines 305-312 Link Here
305	}	307	}
306	else {	308	else {
307	if (getSequenceGenerator() == null) {	309	if (getSequenceGenerator() == null) {
308	setSequenceGenerator(getJpaFactory().buildJavaSequenceGenerator(this));	310	setSequenceGenerator(buildSequenceGenerator(sequenceGeneratorResource));
309	getSequenceGenerator().initializeFromResource(sequenceGeneratorResource);
310	}	311	}
311	else {	312	else {
312	getSequenceGenerator().update(sequenceGeneratorResource);	313	getSequenceGenerator().update(sequenceGeneratorResource);
Lines 314-319 Link Here
314	}	315	}
315	}	316	}
316		317
		318	protected JavaSequenceGenerator buildSequenceGenerator(SequenceGeneratorAnnotation sequenceGeneratorResource) {
		319	JavaSequenceGenerator sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this);
		320	sequenceGenerator.initializeFromResource(sequenceGeneratorResource);
		321	return sequenceGenerator;
		322	}
		323
317	protected void updateGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {	324	protected void updateGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) {
318	GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);	325	GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute);
319	if (generatedValueResource == null) {	326	if (generatedValueResource == null) {
Lines 323-330 Link Here
323	}	330	}
324	else {	331	else {
325	if (getGeneratedValue() == null) {	332	if (getGeneratedValue() == null) {
326	setGeneratedValue(getJpaFactory().buildJavaGeneratedValue(this));	333	setGeneratedValue(buildGeneratedValue(generatedValueResource));
327	getGeneratedValue().initializeFromResource(generatedValueResource);
328	}	334	}
329	else {	335	else {
330	getGeneratedValue().update(generatedValueResource);	336	getGeneratedValue().update(generatedValueResource);
Lines 332-337 Link Here
332	}	338	}
333	}	339	}
334		340
		341	protected JavaGeneratedValue buildGeneratedValue(GeneratedValueAnnotation generatedValueResource) {
		342	JavaGeneratedValue generatedValue = getJpaFactory().buildJavaGeneratedValue(this);
		343	generatedValue.initializeFromResource(generatedValueResource);
		344	return generatedValue;
		345	}
		346
335	protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {	347	protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) {
336	return (TableGeneratorAnnotation) resourcePersistentAttribute.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);	348	return (TableGeneratorAnnotation) resourcePersistentAttribute.getAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME);
337	}	349	}