committing the changes from RefactoringPart1.xml script

2 files changed, 13 insertions, 13 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AccessAnnotationTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java
index 838c7304cf..e60429a760 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/AccessAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/Access2_0AnnotationTests.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.core.tests.internal.jpa2.resource.java;
 
 import java.util.Iterator;
 import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.core.jpa2.resource.java.AccessAnnotation;
+import org.eclipse.jpt.core.jpa2.resource.java.Access2_0Annotation;
 import org.eclipse.jpt.core.resource.java.AccessType;
 import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
@@ -19,9 +19,9 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
 @SuppressWarnings("nls")
-public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
+public class Access2_0AnnotationTests extends JavaResourceModel2_0TestCase {
 	
-	public AccessAnnotationTests(String name) {
+	public Access2_0AnnotationTests(String name) {
 		super(name);
 	}
 
@@ -71,7 +71,7 @@ public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
 		ICompilationUnit cu = this.createTestAccessOnType();
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); 
 		
-		AccessAnnotation access = (AccessAnnotation) typeResource.getSupportingAnnotation(JPA.ACCESS);
+		Access2_0Annotation access = (Access2_0Annotation) typeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNotNull(access);
 		assertEquals(AccessType.PROPERTY, access.getValue());
 	}
@@ -80,13 +80,13 @@ public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
 		ICompilationUnit cu = this.createTestType();
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu);
 		
-		AccessAnnotation access = (AccessAnnotation) typeResource.getSupportingAnnotation(JPA.ACCESS);
+		Access2_0Annotation access = (Access2_0Annotation) typeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNull(access);
 		
 		typeResource.addSupportingAnnotation(JPA.ACCESS);
 		assertSourceContains("@Access", cu);
 
-		access = (AccessAnnotation) typeResource.getSupportingAnnotation(JPA.ACCESS);
+		access = (Access2_0Annotation) typeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNotNull(access);
 		
 		access.setValue(AccessType.FIELD);
@@ -107,7 +107,7 @@ public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); 
 		JavaResourcePersistentAttribute attributeResource = typeResource.persistableFields().next();
 		
-		AccessAnnotation access = (AccessAnnotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
+		Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNotNull(access);
 		assertEquals(AccessType.FIELD, access.getValue());
 	}
@@ -117,13 +117,13 @@ public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu);
 		JavaResourcePersistentAttribute attributeResource = typeResource.persistableFields().next();
 		
-		AccessAnnotation access = (AccessAnnotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
+		Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNull(access);
 		
 		attributeResource.addSupportingAnnotation(JPA.ACCESS);
 		assertSourceContains("@Access", cu);
 
-		access = (AccessAnnotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
+		access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNotNull(access);
 		
 		access.setValue(AccessType.FIELD);
@@ -144,7 +144,7 @@ public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu); 
 		JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next();
 		
-		AccessAnnotation access = (AccessAnnotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
+		Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNotNull(access);
 		assertEquals(AccessType.PROPERTY, access.getValue());
 	}
@@ -154,13 +154,13 @@ public class AccessAnnotationTests extends JavaResourceModel2_0TestCase {
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu);
 		JavaResourcePersistentAttribute attributeResource = typeResource.persistableProperties().next();
 		
-		AccessAnnotation access = (AccessAnnotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
+		Access2_0Annotation access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNull(access);
 		
 		attributeResource.addSupportingAnnotation(JPA.ACCESS);
 		assertSourceContains("@Access", cu);
 
-		access = (AccessAnnotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
+		access = (Access2_0Annotation) attributeResource.getSupportingAnnotation(JPA.ACCESS);
 		assertNotNull(access);
 		
 		access.setValue(AccessType.FIELD);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/JavaResource2_0Tests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/JavaResource2_0Tests.java
index 894b74ce59..81b428ea69 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/JavaResource2_0Tests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/jpa2/resource/java/JavaResource2_0Tests.java
@@ -17,7 +17,7 @@ public class JavaResource2_0Tests {
 	public static Test suite() {
 		TestSuite suite = new TestSuite(JavaResource2_0Tests.class.getName());
 		
-		suite.addTestSuite(AccessAnnotationTests.class);
+		suite.addTestSuite(Access2_0AnnotationTests.class);
 		suite.addTestSuite(AssociationOverride2_0Tests.class);
 		suite.addTestSuite(AssociationOverrides2_0Tests.class);
 		suite.addTestSuite(SequenceGenerator2_0Tests.class);