Author: dgeraskov Date: 2011-06-22 08:04:36 -0400 (Wed, 22 Jun 2011) New Revision: 32280 Modified: branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java Log: https://issues.jboss.org/browse/JBIDE-9218 JPA: Null text range in HibernateQuery validation process Modified: branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java =================================================================== --- branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java 2011-06-22 12:03:47 UTC (rev 32279) +++ branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedNativeQueryAnnotation.java 2011-06-22 12:04:36 UTC (rev 32280) @@ -53,6 +53,7 @@ private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; private final AnnotationElementAdapter<String> nameAdapter; private String name; + TextRange nameTextRange; private final DeclarationAnnotationElementAdapter<String> queryDeclarationAdapter; private final AnnotationElementAdapter<String> queryAdapter; @@ -147,6 +148,7 @@ @Override public void initialize(CompilationUnit astRoot) { this.name = this.buildName(astRoot); + this.nameTextRange = this.buildNameTextRange(astRoot); this.query = this.buildQuery(astRoot); this.flushMode = this.buildFlushMode(astRoot); this.cacheMode = this.buildCacheMode(astRoot); @@ -164,6 +166,7 @@ @Override public void synchronizeWith(CompilationUnit astRoot) { this.syncName(this.buildName(astRoot)); + this.nameTextRange = this.buildNameTextRange(astRoot); this.syncQuery(this.buildQuery(astRoot)); this.syncFlushMode(this.buildFlushMode(astRoot)); this.syncCacheMode(this.buildCacheMode(astRoot)); @@ -215,6 +218,10 @@ @Override public TextRange getNameTextRange(CompilationUnit astRoot) { + return this.nameTextRange; + } + + private TextRange buildNameTextRange(CompilationUnit astRoot) { return this.getElementTextRange(this.nameDeclarationAdapter, astRoot); } Modified: branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java =================================================================== --- branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java 2011-06-22 12:03:47 UTC (rev 32279) +++ branches/jbosstools-3.3.0.M2/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQueryAnnotation.java 2011-06-22 12:04:36 UTC (rev 32280) @@ -51,6 +51,7 @@ private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; private final AnnotationElementAdapter<String> nameAdapter; private String name; + TextRange nameTextRange; private final DeclarationAnnotationElementAdapter<String> queryDeclarationAdapter; private final AnnotationElementAdapter<String> queryAdapter; @@ -121,6 +122,7 @@ @Override public void initialize(CompilationUnit astRoot) { this.name = this.buildName(astRoot); + this.nameTextRange = this.buildNameTextRange(astRoot); this.query = this.buildQuery(astRoot); this.flushMode = this.buildFlushMode(astRoot); this.cacheMode = this.buildCacheMode(astRoot); @@ -135,6 +137,7 @@ @Override public void synchronizeWith(CompilationUnit astRoot) { this.syncName(this.buildName(astRoot)); + this.nameTextRange = this.buildNameTextRange(astRoot); this.syncQuery(this.buildQuery(astRoot)); this.syncFlushMode(this.buildFlushMode(astRoot)); this.syncCacheMode(this.buildCacheMode(astRoot)); @@ -178,12 +181,16 @@ private String buildName(CompilationUnit astRoot) { return this.nameAdapter.getValue(astRoot); } - + @Override public TextRange getNameTextRange(CompilationUnit astRoot) { + return this.nameTextRange; + } + + private TextRange buildNameTextRange(CompilationUnit astRoot) { return this.getElementTextRange(this.nameDeclarationAdapter, astRoot); } - + // ***** query @Override public String getQuery() {