Author: dgeraskov Date: 2011-06-22 08:05:45 -0400 (Wed, 22 Jun 2011) New Revision: 32283 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnnotationImpl.java Log: https://issues.jboss.org/browse/JBIDE-9216 JPA: Null text range in GenericGenerator validation process Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnnotationImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnnotationImpl.java 2011-06-22 12:05:27 UTC (rev 32282) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnnotationImpl.java 2011-06-22 12:05:45 UTC (rev 32283) @@ -55,10 +55,12 @@ private DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; private AnnotationElementAdapter<String> nameAdapter; private String name; + private TextRange nameTextRange; private DeclarationAnnotationElementAdapter<String> strategyDeclarationAdapter; private AnnotationElementAdapter<String> strategyAdapter; private String strategy; + private TextRange strategyTextRange; final Vector<NestableParameterAnnotation> parameters = new Vector<NestableParameterAnnotation>(); final ParametersAnnotationContainer parametersContainer = new ParametersAnnotationContainer(); @@ -78,13 +80,17 @@ public void initialize(CompilationUnit astRoot) { this.name = this.buildName(astRoot); + this.nameTextRange = this.buildNameTextRange(astRoot); this.strategy = this.buildStrategy(astRoot); + this.strategyTextRange = this.buildStrategyTextRange(astRoot); AnnotationContainerTools.initialize(this.parametersContainer, astRoot); } public void synchronizeWith(CompilationUnit astRoot) { this.syncName(this.buildName(astRoot)); + this.nameTextRange = this.buildNameTextRange(astRoot); this.syncStrategy(this.buildStrategy(astRoot)); + this.strategyTextRange = this.buildStrategyTextRange(astRoot); AnnotationContainerTools.synchronize(this.parametersContainer, astRoot); } @@ -127,10 +133,18 @@ } public TextRange getNameTextRange(CompilationUnit astRoot) { + return this.nameTextRange; + } + + private TextRange buildNameTextRange(CompilationUnit astRoot) { return this.getElementTextRange(this.nameDeclarationAdapter, astRoot); } public TextRange getStrategyTextRange(CompilationUnit astRoot) { + return this.strategyTextRange; + } + + private TextRange buildStrategyTextRange(CompilationUnit astRoot) { return this.getElementTextRange(this.strategyDeclarationAdapter, astRoot); }