removed generics from JavaGenerator and JavaQuery

18 files changed, 97 insertions, 74 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
index 36f7586a98..018caa8d2a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java
@@ -311,5 +311,5 @@ public interface JpaFactory
 	
 	JavaNamedNativeQuery buildJavaNamedNativeQuery(JavaJpaContextNode parent);
 	
-	JavaQueryHint buildJavaQueryHint(JavaQuery<?> parent);
+	JavaQueryHint buildJavaQueryHint(JavaQuery parent);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java
index ebadde283b..9e423205ae 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java
@@ -10,12 +10,8 @@
 package org.eclipse.jpt.core.context.java;
 
 import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.resource.java.GeneratorAnnotation;
 
-public interface JavaGenerator<T extends GeneratorAnnotation> extends Generator, JavaJpaContextNode
+public interface JavaGenerator extends Generator, JavaJpaContextNode
 {
-	void initializeFromResource(T generator);
-	
-	void update(T generator);
 
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java
index 6c8785c863..7a4c1fef29 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java
@@ -9,10 +9,17 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.java;
 
+import java.util.ListIterator;
 import org.eclipse.jpt.core.context.NamedNativeQuery;
 import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
 
-public interface JavaNamedNativeQuery extends NamedNativeQuery, JavaQuery<NamedNativeQueryAnnotation>
+public interface JavaNamedNativeQuery extends NamedNativeQuery, JavaQuery
 {
+	ListIterator<JavaQueryHint> hints();
+	
+	
+	void initializeFromResource(NamedNativeQueryAnnotation queryResource);
+	
+	void update(NamedNativeQueryAnnotation queryResource);
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java
index dbb0599c6d..909b9d4084 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java
@@ -9,10 +9,16 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.context.java;
 
+import java.util.ListIterator;
 import org.eclipse.jpt.core.context.NamedQuery;
 import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
 
-public interface JavaNamedQuery extends NamedQuery, JavaQuery<NamedQueryAnnotation>
+public interface JavaNamedQuery extends NamedQuery, JavaQuery
 {
+	ListIterator<JavaQueryHint> hints();
+
+	void initializeFromResource(NamedQueryAnnotation queryResource);
+	
+	void update(NamedQueryAnnotation queryResource);
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java
index a206c43bf6..cbf43699d5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java
@@ -11,18 +11,14 @@ package org.eclipse.jpt.core.context.java;
 
 import java.util.ListIterator;
 import org.eclipse.jpt.core.context.Query;
-import org.eclipse.jpt.core.resource.java.QueryAnnotation;
 
-public interface JavaQuery<E extends QueryAnnotation> extends Query, JavaJpaContextNode
+public interface JavaQuery extends Query, JavaJpaContextNode
 {
 
 	@SuppressWarnings("unchecked")
 	ListIterator<JavaQueryHint> hints();
-	JavaQueryHint addHint(int index);
-	
 	
-	void initializeFromResource(E queryResource);
+	JavaQueryHint addHint(int index);
 	
-	void update(E queryResource);
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java
index 1a09769d6e..ca8051414d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java
@@ -12,7 +12,10 @@ package org.eclipse.jpt.core.context.java;
 import org.eclipse.jpt.core.context.SequenceGenerator;
 import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
 
-public interface JavaSequenceGenerator extends JavaGenerator<SequenceGeneratorAnnotation>, SequenceGenerator
+public interface JavaSequenceGenerator extends JavaGenerator, SequenceGenerator
 {
+	void initializeFromResource(SequenceGeneratorAnnotation generator);
+	
+	void update(SequenceGeneratorAnnotation generator);
 
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java
index 26c02205d9..3457f1b214 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java
@@ -12,7 +12,10 @@ package org.eclipse.jpt.core.context.java;
 import org.eclipse.jpt.core.context.TableGenerator;
 import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
 
-public interface JavaTableGenerator extends JavaGenerator<TableGeneratorAnnotation>, TableGenerator
+public interface JavaTableGenerator extends JavaGenerator, TableGenerator
 {
+	void initializeFromResource(TableGeneratorAnnotation generator);
+	
+	void update(TableGeneratorAnnotation generator);
 
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java
index bc7004172c..98ef6f2e4b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java
@@ -12,12 +12,11 @@ package org.eclipse.jpt.core.internal.context.java;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jpt.core.TextRange;
 import org.eclipse.jpt.core.context.Generator;
-import org.eclipse.jpt.core.context.java.JavaGenerator;
 import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
 import org.eclipse.jpt.core.resource.java.GeneratorAnnotation;
 
 
-public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> extends AbstractJavaJpaContextNode implements JavaGenerator<T>
+public abstract class AbstractJavaGenerator extends AbstractJavaJpaContextNode implements Generator
 {
 	protected String name;
 
@@ -25,20 +24,20 @@ public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> exten
 	
 	protected Integer specifiedAllocationSize;
 
-	protected T generatorResource;
+	protected GeneratorAnnotation generatorResource;
 	
 	protected AbstractJavaGenerator(JavaJpaContextNode parent) {
 		super(parent);
 	}
 
-	public void initializeFromResource(T generatorResource) {
+	public void initializeFromResource(GeneratorAnnotation generatorResource) {
 		this.generatorResource = generatorResource;
 		this.name = this.name(generatorResource);
 		this.specifiedInitialValue = this.specifiedInitialValue(generatorResource);
 		this.specifiedAllocationSize = this.specifiedAllocationSize(generatorResource);
 	}
 	
-	protected T generatorResource() {
+	protected GeneratorAnnotation generatorResource() {
 		return this.generatorResource;
 	}
 	
@@ -62,13 +61,13 @@ public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> exten
 		String oldName = this.name;
 		this.name = newName;
 		generatorResource().setName(newName);
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+		firePropertyChanged(Generator.NAME_PROPERTY, oldName, newName);
 	}
 
 	protected void setName_(String newName) {
 		String oldName = this.name;
 		this.name = newName;
-		firePropertyChanged(NAME_PROPERTY, oldName, newName);
+		firePropertyChanged(Generator.NAME_PROPERTY, oldName, newName);
 	}
 
 	public Integer getInitialValue() {
@@ -83,13 +82,13 @@ public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> exten
 		Integer oldSpecifiedInitialValue = this.specifiedInitialValue;
 		this.specifiedInitialValue = newSpecifiedInitialValue;
 		generatorResource().setInitialValue(newSpecifiedInitialValue);
-		firePropertyChanged(SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
+		firePropertyChanged(Generator.SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
 	}
 
 	protected void setSpecifiedInitialValue_(Integer newSpecifiedInitialValue) {
 		Integer oldSpecifiedInitialValue = this.specifiedInitialValue;
 		this.specifiedInitialValue = newSpecifiedInitialValue;
-		firePropertyChanged(SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
+		firePropertyChanged(Generator.SPECIFIED_INITIAL_VALUE_PROPERTY, oldSpecifiedInitialValue, newSpecifiedInitialValue);
 	}
 
 	public Integer getAllocationSize() {
@@ -104,13 +103,13 @@ public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> exten
 		Integer oldSpecifiedAllocationSize = this.specifiedAllocationSize;
 		this.specifiedAllocationSize = newSpecifiedAllocationSize;
 		generatorResource().setAllocationSize(newSpecifiedAllocationSize);
-		firePropertyChanged(SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
+		firePropertyChanged(Generator.SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
 	}
 
 	protected void setSpecifiedAllocationSize_(Integer newSpecifiedAllocationSize) {
 		Integer oldSpecifiedAllocationSize = this.specifiedAllocationSize;
 		this.specifiedAllocationSize = newSpecifiedAllocationSize;
-		firePropertyChanged(SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
+		firePropertyChanged(Generator.SPECIFIED_ALLOCATION_SIZE_PROPERTY, oldSpecifiedAllocationSize, newSpecifiedAllocationSize);
 	}
 
 	public Integer getDefaultAllocationSize() {
@@ -126,7 +125,7 @@ public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> exten
 		return this.generatorResource.textRange(astRoot);
 	}
 
-	public void update(T generatorResource) {
+	protected void update(GeneratorAnnotation generatorResource) {
 		this.generatorResource = generatorResource;
 		this.setName_(this.name(generatorResource));
 		this.setSpecifiedInitialValue_(this.specifiedInitialValue(generatorResource));
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java
index 25db7d4394..1f8815929d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java
@@ -20,26 +20,26 @@ import org.eclipse.jpt.utility.internal.StringTools;
 import org.eclipse.jpt.utility.internal.iterators.FilteringIterator;
 
 
-public abstract class AbstractJavaOverride<T extends OverrideAnnotation> extends AbstractJavaJpaContextNode implements BaseOverride
+public abstract class AbstractJavaOverride extends AbstractJavaJpaContextNode implements BaseOverride
 {
 
 	protected String name;
 
 	protected final Owner owner;
 
-	protected T overrideResource;
+	protected OverrideAnnotation overrideResource;
 	
 	public AbstractJavaOverride(JavaJpaContextNode parent, Owner owner) {
 		super(parent);
 		this.owner = owner;
 	}
 	
-	public void initializeFromResource(T overrideResource) {
+	protected void initializeFromResource(OverrideAnnotation overrideResource) {
 		this.overrideResource = overrideResource;
 		this.name = this.name(overrideResource);
 	}
 
-	protected T getOverrideResource() {
+	protected OverrideAnnotation getOverrideResource() {
 		return this.overrideResource;
 	}
 	
@@ -60,7 +60,7 @@ public abstract class AbstractJavaOverride<T extends OverrideAnnotation> extends
 		firePropertyChanged(NAME_PROPERTY, oldName, newName);
 	}
 
-	public void update(T overrideResource) {
+	protected void update(OverrideAnnotation overrideResource) {
 		this.overrideResource = overrideResource;
 		this.setName_(this.name(overrideResource));
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
index 7c12cde818..0fbcbee3f9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
 
 
-public abstract class AbstractJavaQuery<E extends QueryAnnotation> extends AbstractJavaJpaContextNode implements JavaQuery<E>
+public abstract class AbstractJavaQuery extends AbstractJavaJpaContextNode implements JavaQuery
 {
 	protected String name;
 
@@ -33,14 +33,14 @@ public abstract class AbstractJavaQuery<E extends QueryAnnotation> extends Abstr
 
 	protected final List<JavaQueryHint> hints;
 
-	protected E queryResource;
+	protected QueryAnnotation queryResource;
 	
 	protected AbstractJavaQuery(JavaJpaContextNode parent) {
 		super(parent);
 		this.hints = new ArrayList<JavaQueryHint>();
 	}
 
-	protected E query() {
+	protected QueryAnnotation query() {
 		return this.queryResource;
 	}
 	
@@ -106,28 +106,29 @@ public abstract class AbstractJavaQuery<E extends QueryAnnotation> extends Abstr
 		fireItemMoved(Query.HINTS_LIST, targetIndex, sourceIndex);		
 	}
 	
-	public void initializeFromResource(E queryResource) {
+	protected void initializeFromResource(QueryAnnotation queryResource) {
 		this.queryResource = queryResource;
 		this.name = queryResource.getName();
 		this.query = queryResource.getQuery();
 		this.initializeQueryHints(queryResource);
 	}
 
-	public void update(E queryResource) {
+	protected void update(QueryAnnotation queryResource) {
 		this.queryResource = queryResource;
 		this.setName(queryResource.getName());
 		this.setQuery(queryResource.getQuery());
 		this.updateQueryHints(queryResource);
 	}
 
-	protected void initializeQueryHints(E queryResource) {
+	protected void initializeQueryHints(QueryAnnotation queryResource) {
 		ListIterator<QueryHintAnnotation> annotations = queryResource.hints();
 		
 		while(annotations.hasNext()) {
 			this.hints.add(createQueryHint(annotations.next()));
 		}
 	}
-	protected void updateQueryHints(E queryResource) {
+	
+	protected void updateQueryHints(QueryAnnotation queryResource) {
 		ListIterator<JavaQueryHint> hints = hints();
 		ListIterator<QueryHintAnnotation> resourceHints = queryResource.hints();
 		
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java
index 1c72f14144..6228216dd3 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java
@@ -30,7 +30,7 @@ import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.Filter;
 import org.eclipse.jpt.utility.internal.iterators.CloneListIterator;
 
-public class GenericJavaAssociationOverride extends AbstractJavaOverride<AssociationOverrideAnnotation>
+public class GenericJavaAssociationOverride extends AbstractJavaOverride
 	implements JavaAssociationOverride
 {
 
@@ -46,6 +46,11 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride<Associa
 	}
 
 	@Override
+	protected AssociationOverrideAnnotation getOverrideResource() {
+		return (AssociationOverrideAnnotation) super.getOverrideResource();
+	}
+	
+	@Override
 	public AssociationOverride.Owner owner() {
 		return (AssociationOverride.Owner) super.owner();
 	}
@@ -77,7 +82,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride<Associa
 	public JavaJoinColumn addSpecifiedJoinColumn(int index) {
 		JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner());
 		this.specifiedJoinColumns.add(index, joinColumn);
-		JoinColumnAnnotation joinColumnResource = this.overrideResource.addJoinColumn(index);
+		JoinColumnAnnotation joinColumnResource = getOverrideResource().addJoinColumn(index);
 		joinColumn.initializeFromResource(joinColumnResource);
 		this.fireItemAdded(AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn);
 		return joinColumn;
@@ -93,7 +98,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride<Associa
 	
 	public void removeSpecifiedJoinColumn(int index) {
 		JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index);
-		this.overrideResource.removeJoinColumn(index);
+		getOverrideResource().removeJoinColumn(index);
 		fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn);
 	}
 
@@ -102,7 +107,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride<Associa
 	}
 	
 	public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) {
-		this.overrideResource.moveJoinColumn(targetIndex, sourceIndex);
+		getOverrideResource().moveJoinColumn(targetIndex, sourceIndex);
 		moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST);		
 	}
 
@@ -131,7 +136,6 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride<Associa
 		return null;
 	}
 
-	@Override
 	public void initializeFromResource(AssociationOverrideAnnotation associationOverride) {
 		super.initializeFromResource(associationOverride);
 		this.name = associationOverride.getName();
@@ -146,7 +150,6 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride<Associa
 		}
 	}
 
-	@Override
 	public void update(AssociationOverrideAnnotation associationOverride) {
 		super.update(associationOverride);
 		updateSpecifiedJoinColumns(associationOverride);
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java
index 3380397d42..c083552535 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.db.internal.Table;
 import org.eclipse.jpt.utility.internal.Filter;
 
 
-public class GenericJavaAttributeOverride extends AbstractJavaOverride<AttributeOverrideAnnotation>
+public class GenericJavaAttributeOverride extends AbstractJavaOverride
 	implements JavaAttributeOverride
 {
 
@@ -36,6 +36,11 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride<Attribute
 	}
 	
 	@Override
+	protected AttributeOverrideAnnotation getOverrideResource() {
+		return (AttributeOverrideAnnotation) super.getOverrideResource();
+	}
+	
+	@Override
 	public AttributeOverride.Owner owner() {
 		return (AttributeOverride.Owner) super.owner();
 	}
@@ -91,13 +96,11 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride<Attribute
 	}
 	
 	//************* java resource model -> java context model **************	
-	@Override
 	public void initializeFromResource(AttributeOverrideAnnotation attributeOverrideResource) {
 		super.initializeFromResource(attributeOverrideResource);
 		this.column.initializeFromResource(this.columnResource());
 	}
 
-	@Override
 	public void update(AttributeOverrideAnnotation attributeOverrideResource) {
 		super.update(attributeOverrideResource);
 		this.column.update(this.columnResource());		
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java
index 8a2e3f3504..e9f6ae429a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java
@@ -9,15 +9,13 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.context.java;
 
-import java.util.ListIterator;
 import org.eclipse.jpt.core.context.NamedNativeQuery;
 import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
 import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery;
-import org.eclipse.jpt.core.context.java.JavaQueryHint;
 import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
 
 
-public class GenericJavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQueryAnnotation>
+public class GenericJavaNamedNativeQuery extends AbstractJavaQuery
 	implements JavaNamedNativeQuery
 {
 
@@ -29,6 +27,11 @@ public class GenericJavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQu
 		super(parent);
 	}
 
+	@Override
+	protected NamedNativeQueryAnnotation query() {
+		return (NamedNativeQueryAnnotation) super.query();
+	}
+	
 	public String getResultClass() {
 		return this.resultClass;
 	}
@@ -51,24 +54,16 @@ public class GenericJavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQu
 		firePropertyChanged(NamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping);
 	}
 
-	@Override
 	public void initializeFromResource(NamedNativeQueryAnnotation queryResource) {
 		super.initializeFromResource(queryResource);
 		this.resultClass = queryResource.getResultClass();
 		this.resultSetMapping = queryResource.getResultSetMapping();
 	}
 	
-	@Override
 	public void update(NamedNativeQueryAnnotation queryResource) {
 		super.update(queryResource);
 		this.setResultClass(queryResource.getResultClass());
 		this.setResultSetMapping(queryResource.getResultSetMapping());
 	}
-	
-	
-	@SuppressWarnings("unchecked")
-	@Override
-	public ListIterator<JavaQueryHint> hints() {
-		return super.hints();
-	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java
index 226e217cab..d0574fdffd 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java
@@ -9,24 +9,29 @@
  ******************************************************************************/
 package org.eclipse.jpt.core.internal.context.java;
 
-import java.util.ListIterator;
 import org.eclipse.jpt.core.context.java.JavaJpaContextNode;
 import org.eclipse.jpt.core.context.java.JavaNamedQuery;
-import org.eclipse.jpt.core.context.java.JavaQueryHint;
 import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
 
 
 
-public class GenericJavaNamedQuery extends AbstractJavaQuery<NamedQueryAnnotation> implements JavaNamedQuery
+public class GenericJavaNamedQuery extends AbstractJavaQuery implements JavaNamedQuery
 {
 	
 	public GenericJavaNamedQuery(JavaJpaContextNode parent) {
 		super(parent);
 	}
-
-	@SuppressWarnings("unchecked")
+	
 	@Override
-	public ListIterator<JavaQueryHint> hints() {
-		return super.hints();
+	protected NamedQueryAnnotation query() {
+		return (NamedQueryAnnotation) super.query();
+	}
+
+	public void initializeFromResource(NamedQueryAnnotation queryResource) {
+		super.initializeFromResource(queryResource);
+	}
+	
+	public void update(NamedQueryAnnotation queryResource) {
+		super.update(queryResource);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
index 3bca7e7d00..14665cbedc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
@@ -24,7 +24,7 @@ public class GenericJavaQueryHint extends AbstractJavaJpaContextNode implements
 
 	protected QueryHintAnnotation queryHint;
 	
-	public GenericJavaQueryHint(JavaQuery<?> parent) {
+	public GenericJavaQueryHint(JavaQuery parent) {
 		super(parent);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java
index a91e253a6a..75bc5d129c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.context.java.JavaSequenceGenerator;
 import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
 
 
-public class GenericJavaSequenceGenerator extends AbstractJavaGenerator<SequenceGeneratorAnnotation>
+public class GenericJavaSequenceGenerator extends AbstractJavaGenerator
 	implements JavaSequenceGenerator
 {
 	protected String specifiedSequenceName;
@@ -25,6 +25,10 @@ public class GenericJavaSequenceGenerator extends AbstractJavaGenerator<Sequence
 	}
 
 	@Override
+	protected SequenceGeneratorAnnotation generatorResource() {
+		return (SequenceGeneratorAnnotation) super.generatorResource();
+	}
+
 	public void initializeFromResource(SequenceGeneratorAnnotation sequenceGenerator) {
 		super.initializeFromResource(sequenceGenerator);
 		this.specifiedSequenceName = this.specifiedSequenceName(sequenceGenerator);
@@ -59,7 +63,6 @@ public class GenericJavaSequenceGenerator extends AbstractJavaGenerator<Sequence
 		return null;
 	}
 
-	@Override
 	public void update(SequenceGeneratorAnnotation sequenceGenerator) {
 		super.update(sequenceGenerator);
 		this.setSpecifiedSequenceName_(this.specifiedSequenceName(sequenceGenerator)); 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java
index 993e24304d..318a319af4 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
 
 
-public class GenericJavaTableGenerator extends AbstractJavaGenerator<TableGeneratorAnnotation>
+public class GenericJavaTableGenerator extends AbstractJavaGenerator
 	implements JavaTableGenerator
 {
 
@@ -52,6 +52,10 @@ public class GenericJavaTableGenerator extends AbstractJavaGenerator<TableGenera
 	}
 
 	@Override
+	protected TableGeneratorAnnotation generatorResource() {
+		return (TableGeneratorAnnotation) super.generatorResource();
+	}
+	
 	public void initializeFromResource(TableGeneratorAnnotation tableGenerator) {
 		super.initializeFromResource(tableGenerator);
 		this.specifiedTable = this.specifiedTable(tableGenerator);
@@ -234,7 +238,6 @@ public class GenericJavaTableGenerator extends AbstractJavaGenerator<TableGenera
 
 
 	// ********** java resource model -> context model model **********
-	@Override
 	public void update(TableGeneratorAnnotation tableGenerator) {
 		super.update(tableGenerator);
 		this.setSpecifiedTable_(this.specifiedTable(tableGenerator));
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
index a735f5db54..bce33a6502 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java
@@ -461,7 +461,7 @@ public class GenericJpaFactory implements JpaFactory
 		return new GenericJavaNamedNativeQuery(parent);
 	}
 	
-	public JavaQueryHint buildJavaQueryHint(JavaQuery<?> parent) {
+	public JavaQueryHint buildJavaQueryHint(JavaQuery parent) {
 		return new GenericJavaQueryHint(parent);
 	}