[jbosstools-commits] JBoss Tools SVN: r30352 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java.

[jbosstools-commits at lists.jboss.org]

Author: dgeraskov
Date: 2011-04-06 04:24:41 -0400 (Wed, 06 Apr 2011)
New Revision: 30352

Modified:
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaType.java
   trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java
Log:
https://issues.jboss.org/browse/JBIDE-8683
@Type update

Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaType.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaType.java	2011-04-06 08:24:21 UTC (rev 30351)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaType.java	2011-04-06 08:24:41 UTC (rev 30352)
@@ -25,10 +25,7 @@
 	void setType(String name);
 		String TYPE_TYPE = "type"; //$NON-NLS-1$
 	
-	public void initialize(TypeAnnotation typeResource);
-
-	public void update(TypeAnnotation typeResource);
-	
 	public TextRange getTypeTextRange(CompilationUnit astRoot);
+	TypeAnnotation getTypeAnnotation();
 
 }

Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java	2011-04-06 08:24:21 UTC (rev 30351)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/TypeImpl.java	2011-04-06 08:24:41 UTC (rev 30352)
@@ -36,22 +36,18 @@
  */
 public class TypeImpl extends AbstractJavaJpaContextNode implements JavaType, Messages {
 
-	private TypeAnnotation typeResource;
+	private TypeAnnotation annotation;
 	
 	private String type;
 	
-	public TypeImpl(JavaJpaContextNode parent) {
+	public TypeImpl(JavaJpaContextNode parent, TypeAnnotation annotation) {
 		super(parent);
+		this.annotation = annotation;
+		this.type = annotation.getType();
 	}
-
-	public void initialize(TypeAnnotation indexResource) {
-		this.typeResource = indexResource;
-		this.type = indexResource.getType();
-	}
 	
-	public void update(TypeAnnotation indexResource) {
-		this.typeResource = indexResource;
-		this.setType_(indexResource.getType());
+	public void synchronizeWithResourceModel() {
+		this.setType_(annotation.getType());
 	}
 
 	// ***** name
@@ -63,7 +59,7 @@
 	public void setType(String name) {
 		String old = this.type;
 		this.type = name;
-		this.getTypeResource().setType(name);
+		this.getTypeAnnotation().setType(name);
 		this.firePropertyChanged(TYPE_TYPE, old, name);
 	}
 	
@@ -73,12 +69,12 @@
 		this.firePropertyChanged(TYPE_TYPE, old, name);
 	}
 	
-	public TypeAnnotation getTypeResource() {
-		return typeResource;
+	public TypeAnnotation getTypeAnnotation() {
+		return annotation;
 	}
 
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
-		return this.typeResource.getTextRange(astRoot);
+		return this.annotation.getTextRange(astRoot);
 	}
 	
 	@Override
@@ -94,7 +90,7 @@
 	}
 	
 	public TextRange getTypeTextRange(CompilationUnit astRoot) {
-		return this.typeResource.getTypeTextRange(astRoot);
+		return this.annotation.getTypeTextRange(astRoot);
 	}
 
 	/*