fixed annotation test failures that were a result of the latest platform build fixing bug 262517

58 files changed, 735 insertions, 686 deletions

diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
index b0bd0c22f0..d840b85a24 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java
@@ -624,7 +624,7 @@ public class JavaEntityTests extends ContextModelTestCase
 		assertSourceDoesNotContain("@Table", cu);
 		
 		table.setSpecifiedName(TABLE_NAME);
-		assertSourceContains("@Table(name=\"" + TABLE_NAME + "\")", cu);
+		assertSourceContains("@Table(name = \"" + TABLE_NAME + "\")", cu);
 		
 		assertEquals(TABLE_NAME, getJavaEntity().getPrimaryTableName());
 		assertEquals(TABLE_NAME, table.getName());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java
index b64f907cc6..d86c38e831 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverrideTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class AssociationOverrideTests extends JavaResourceModelTestCase {
 	
 	private static final String ASSOCIATION_OVERRIDE_NAME = "MY_ASSOCIATION_OVERRIDE";
@@ -34,7 +35,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\")");
+				sb.append("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\")");
 			}
 		});
 	}
@@ -47,7 +48,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"BAR\"), @JoinColumn})");
+				sb.append("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn})");
 			}
 		});
 	}
@@ -73,7 +74,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 
 		associationOverride.setName("Foo");
 		assertEquals("Foo", associationOverride.getName());
-		assertSourceContains("@AssociationOverride(name=\"Foo\")", cu);
+		assertSourceContains("@AssociationOverride(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -87,7 +88,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 		associationOverride.setName(null);
 		assertNull(associationOverride.getName());
 		
-		assertSourceDoesNotContain("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\")", cu);
+		assertSourceDoesNotContain("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\")", cu);
 		assertSourceContains("@AssociationOverride", cu);
 	}
 	
@@ -141,7 +142,7 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", associationOverride.joinColumnAt(1).getName());
 		assertNull(associationOverride.joinColumnAt(2).getName());
 
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name=\"BAR\"),@JoinColumn(name=\"FOO\"), @JoinColumn})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\"),@JoinColumn(name = \"FOO\"), @JoinColumn})", cu);
 	}
 	
 	public void testRemoveJoinColumn() throws Exception {
@@ -157,20 +158,20 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", joinColumns.next().getName());
 		assertNull(joinColumns.next().getName());
 		assertEquals(false, joinColumns.hasNext());
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\"), @JoinColumn})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\"), @JoinColumn})", cu);
 		
 		associationOverride.removeJoinColumn(1);
 		joinColumns = associationOverride.joinColumns();
 		assertEquals("FOO", joinColumns.next().getName());
 		assertNull(joinColumns.next().getName());
 		assertEquals(false, joinColumns.hasNext());
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn})", cu);
 
 		associationOverride.removeJoinColumn(0);
 		joinColumns = associationOverride.joinColumns();
 		assertNull(joinColumns.next().getName());
 		assertEquals(false, joinColumns.hasNext());
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns=@JoinColumn)", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = @JoinColumn)", cu);
 
 		
 		associationOverride.setName(null);
@@ -194,14 +195,14 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 		joinColumn.setTable("TABLE");
 		associationOverride.addJoinColumn(0).setName("FOO");
 		
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
 
 		associationOverride.moveJoinColumn(2, 0);
 		assertEquals("BAR", associationOverride.joinColumnAt(0).getName());
 		assertNull(associationOverride.joinColumnAt(1).getName());
 		assertEquals("FOO", associationOverride.joinColumnAt(2).getName());
 		assertEquals(3, associationOverride.joinColumnsSize());
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu);
 	}
 	
 	public void testMoveJoinColumn2() throws Exception {
@@ -221,14 +222,14 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 		joinColumn.setTable("TABLE");
 		associationOverride.addJoinColumn(0).setName("FOO");
 		
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
 
 		associationOverride.moveJoinColumn(0, 2);
 		assertNull(associationOverride.joinColumnAt(0).getName());
 		assertEquals("FOO", associationOverride.joinColumnAt(1).getName());
 		assertEquals("BAR", associationOverride.joinColumnAt(2).getName());
 		assertEquals(3, associationOverride.joinColumnsSize());
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn, @JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu);
 	}
 	
 	public void testSetJoinColumnName() throws Exception {
@@ -247,6 +248,6 @@ public class AssociationOverrideTests extends JavaResourceModelTestCase {
 		joinColumn.setName("foo");
 		assertEquals("foo", joinColumn.getName());
 		
-		assertSourceContains("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"foo\"), @JoinColumn})", cu);
+		assertSourceContains("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"foo\"), @JoinColumn})", cu);
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java
index 4e44ff3d8f..c7a207c3c5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AssociationOverridesTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -39,7 +39,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\"))");
+				sb.append("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\"))");
 			}
 		});
 	}
@@ -52,7 +52,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"BAR\"), @JoinColumn}))");
+				sb.append("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn}))");
 			}
 		});
 	}
@@ -67,7 +67,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@AssociationOverride(name=\"FOO\", joinColumns=@JoinColumn(name=\"FOO\", columnDefinition=\"BAR\", referencedColumnName=\"BAZ\"))");
+				sb.append("@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))");
 			}
 		});
 	}
@@ -95,7 +95,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 
 		associationOverride.setName("Foo");
 		assertEquals("Foo", associationOverride.getName());
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"Foo\"))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"Foo\"))", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -109,7 +109,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		associationOverride.setName(null);
 		assertNull(associationOverride.getName());
 		
-		assertSourceDoesNotContain("@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\")", cu);
+		assertSourceDoesNotContain("@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\")", cu);
 		assertSourceContains("@AssociationOverride", cu);
 		assertSourceContains("@AssociationOverrides", cu);
 	}
@@ -120,7 +120,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		
 		AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES);
 		associationOverride.setName("BAR");
-		assertSourceContains("@AssociationOverrides({@AssociationOverride(name=\"FOO\", joinColumns = @JoinColumn(name=\"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.ASSOCIATION_OVERRIDES));
@@ -133,11 +133,11 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		
 		AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES);
 		associationOverride.setName("BAR");
-		assertSourceContains("@AssociationOverrides({@AssociationOverride(name=\"FOO\", joinColumns = @JoinColumn(name=\"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu);
 		
 		associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES);
 		associationOverride.setName("BAZ");
-		assertSourceContains("@AssociationOverrides({@AssociationOverride(name=\"BAZ\"),@AssociationOverride(name=\"FOO\", joinColumns = @JoinColumn(name=\"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"BAZ\"),@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")), @AssociationOverride(name = \"BAR\")})", cu);
 
 		Iterator<NestableAnnotation> associationOverrides = typeResource.supportingAnnotations(JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES);
 		assertEquals("BAZ", ((AssociationOverrideAnnotation) associationOverrides.next()).getName());
@@ -155,10 +155,10 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		
 		AssociationOverrideAnnotation associationOverride = (AssociationOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES);
 		associationOverride.setName("BAR");
-		assertSourceContains("@AssociationOverrides({@AssociationOverride(name=\"FOO\", joinColumns = @JoinColumn(name=\"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AssociationOverrides({@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\")),@AssociationOverride(name = \"BAR\")})", cu);
 		
 		typeResource.removeSupportingAnnotation(1, JPA.ASSOCIATION_OVERRIDE, JPA.ASSOCIATION_OVERRIDES);
-		assertSourceContains("@AssociationOverride(name=\"FOO\", joinColumns = @JoinColumn(name=\"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))", cu);
+		assertSourceContains("@AssociationOverride(name = \"FOO\", joinColumns = @JoinColumn(name = \"FOO\", columnDefinition = \"BAR\", referencedColumnName = \"BAZ\"))", cu);
 	}
 	
 	public void testJoinColumns() throws Exception {
@@ -211,7 +211,7 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", joinColumns.next().getName());
 		assertNull(joinColumns.next().getName());
 	
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name=\"BAR\"),@JoinColumn(name=\"FOO\"), @JoinColumn}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\"),@JoinColumn(name = \"FOO\"), @JoinColumn}))", cu);
 	}
 	
 	public void testRemoveJoinColumn() throws Exception {
@@ -227,20 +227,20 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", joinColumns.next().getName());
 		assertNull(joinColumns.next().getName());
 		assertEquals(false, joinColumns.hasNext());
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\"), @JoinColumn}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\"), @JoinColumn}))", cu);
 		
 		associationOverride.removeJoinColumn(1);
 		joinColumns = associationOverride.joinColumns();
 		assertEquals("FOO", joinColumns.next().getName());
 		assertNull(joinColumns.next().getName());
 		assertEquals(false, joinColumns.hasNext());
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn}))", cu);
 
 		associationOverride.removeJoinColumn(0);
 		joinColumns = associationOverride.joinColumns();
 		assertNull(joinColumns.next().getName());
 		assertEquals(false, joinColumns.hasNext());
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns=@JoinColumn))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = @JoinColumn))", cu);
 
 		
 		associationOverride.setName(null);
@@ -263,14 +263,14 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		joinColumn.setColumnDefinition("COLUMN_DEF");
 		joinColumn.setTable("TABLE");
 		associationOverride.addJoinColumn(0).setName("FOO");
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn}))", cu);
 
 		associationOverride.moveJoinColumn(2, 0);
 		assertEquals("BAR", associationOverride.joinColumnAt(0).getName());
 		assertNull(associationOverride.joinColumnAt(1).getName());
 		assertEquals("FOO", associationOverride.joinColumnAt(2).getName());
 		assertEquals(3, associationOverride.joinColumnsSize());
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name=\"FOO\")}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")}))", cu);
 	}
 	
 	public void testMoveJoinColumn2() throws Exception {
@@ -290,13 +290,13 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		joinColumn.setTable("TABLE");
 		associationOverride.addJoinColumn(0).setName("FOO");
 		
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn}))", cu);
 		associationOverride.moveJoinColumn(0, 2);
 		assertNull(associationOverride.joinColumnAt(0).getName());
 		assertEquals("FOO", associationOverride.joinColumnAt(1).getName());
 		assertEquals("BAR", associationOverride.joinColumnAt(2).getName());
 		assertEquals(3, associationOverride.joinColumnsSize());
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn, @JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")}))", cu);
 	}
 	
 	public void testSetJoinColumnName() throws Exception {
@@ -315,6 +315,6 @@ public class AssociationOverridesTests extends JavaResourceModelTestCase {
 		joinColumn.setName("foo");
 		assertEquals("foo", joinColumn.getName());
 		
-		assertSourceContains("@AssociationOverrides(@AssociationOverride(name=\"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns={@JoinColumn(name=\"foo\"), @JoinColumn}))", cu);
+		assertSourceContains("@AssociationOverrides(@AssociationOverride(name = \"" + ASSOCIATION_OVERRIDE_NAME + "\", joinColumns = {@JoinColumn(name = \"foo\"), @JoinColumn}))", cu);
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java
index 67246b4ad3..74aa6296ef 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverrideTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class AttributeOverrideTests extends JavaResourceModelTestCase {
 	
 	private static final String COLUMN_NAME = "MY_COLUMN";
@@ -35,7 +36,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\")");
+				sb.append("@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\")");
 			}
 		});
 	}
@@ -48,7 +49,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name=\"" + COLUMN_NAME + "\"))");
+				sb.append("@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name = \"" + COLUMN_NAME + "\"))");
 			}
 		});
 	}
@@ -84,7 +85,7 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase {
 
 		attributeOverride.setName("Foo");
 		assertEquals("Foo", attributeOverride.getName());
-		assertSourceContains("@AttributeOverride(name=\"Foo\")", cu);
+		assertSourceContains("@AttributeOverride(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -121,11 +122,11 @@ public class AttributeOverrideTests extends JavaResourceModelTestCase {
 		
 		column.setName("Foo");
 		
-		assertSourceContains("@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name=\"Foo\"))", cu);
+		assertSourceContains("@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name = \"Foo\"))", cu);
 		
 		column.setName(null);
 		assertNull(attributeOverride.getColumn());
-		assertSourceContains("@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\")", cu);
+		assertSourceContains("@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\")", cu);
 	}
 	
 	public void testAddColumn() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java
index 1cd63a6107..51b5418cc6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/AttributeOverridesTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -40,7 +40,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AttributeOverrides(@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\"))");
+				sb.append("@AttributeOverrides(@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\"))");
 			}
 		});
 	}
@@ -53,7 +53,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@AttributeOverrides(@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name=\"" + COLUMN_NAME + "\")))");
+				sb.append("@AttributeOverrides(@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name = \"" + COLUMN_NAME + "\")))");
 			}
 		});
 	}
@@ -68,7 +68,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@AttributeOverride(name=\"FOO\", column=@Column(name=\"FOO\", columnDefinition=\"BAR\", table=\"BAZ\", unique=false, nullable=false, insertable=false, updatable=false, length=1, precision=1, scale=1))");
+				sb.append("@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1))");
 			}
 		});
 	}
@@ -107,7 +107,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 
 		attributeOverride.setName("Foo");
 		assertEquals("Foo", attributeOverride.getName());
-		assertSourceContains("@AttributeOverrides(@AttributeOverride(name=\"Foo\"))", cu);
+		assertSourceContains("@AttributeOverrides(@AttributeOverride(name = \"Foo\"))", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -149,11 +149,11 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 		
 		column.setName("Foo");
 		
-		assertSourceContains("@AttributeOverrides(@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name=\"Foo\")))", cu);
+		assertSourceContains("@AttributeOverrides(@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\", column = @Column(name = \"Foo\")))", cu);
 		
 		column.setName(null);
 		assertNull(attributeOverride.getColumn());
-		assertSourceContains("@AttributeOverride(name=\"" + ATTRIBUTE_OVERRIDE_NAME + "\")", cu);
+		assertSourceContains("@AttributeOverride(name = \"" + ATTRIBUTE_OVERRIDE_NAME + "\")", cu);
 	}
 	
 	public void testAddAttributeOverrideCopyExisting() throws Exception {
@@ -162,7 +162,7 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 		
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAR");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\", column = @Column(name=\"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES));
@@ -175,11 +175,11 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 		
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAR");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\", column = @Column(name=\"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu);
 		
 		attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAZ");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"BAZ\"),@AttributeOverride(name=\"FOO\", column = @Column(name=\"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)), @AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"),@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)), @AttributeOverride(name = \"BAR\")})", cu);
 
 		Iterator<NestableAnnotation> attributeOverrides = typeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		assertEquals("BAZ", ((AttributeOverrideAnnotation) attributeOverrides.next()).getName());
@@ -197,10 +197,10 @@ public class AttributeOverridesTests extends JavaResourceModelTestCase {
 		
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) typeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAR");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\", column = @Column(name=\"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1)),@AttributeOverride(name = \"BAR\")})", cu);
 		
 		typeResource.removeSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
-		assertSourceContains("@AttributeOverride(name=\"FOO\", column = @Column(name=\"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1))", cu);
+		assertSourceContains("@AttributeOverride(name = \"FOO\", column = @Column(name = \"FOO\", columnDefinition = \"BAR\", table = \"BAZ\", unique = false, nullable = false, insertable = false, updatable = false, length = 1, precision = 1, scale = 1))", cu);
 	}
 	//not sure i want to test this api, how can we keep ContainerAnnotation.add, move, remove from being public?
 	//users should go throught AbstractJavapersistenceResource. this gets confusing because you would handle it differently
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java
index 7466cedd90..f2077b9595 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/BasicTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class BasicTests extends JavaResourceModelTestCase {
 	
 	public BasicTests(String name) {
@@ -45,7 +46,7 @@ public class BasicTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Basic(optional=true)");
+				sb.append("@Basic(optional = true)");
 			}
 		});
 	}
@@ -58,7 +59,7 @@ public class BasicTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Basic(fetch=FetchType.EAGER)");
+				sb.append("@Basic(fetch = FetchType.EAGER)");
 			}
 		});
 	}
@@ -78,7 +79,7 @@ public class BasicTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		
 		BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC);
-		assertTrue(basic.getOptional());
+		assertEquals(Boolean.TRUE, basic.getOptional());
 	}
 
 	public void testSetOptional() throws Exception {
@@ -87,12 +88,12 @@ public class BasicTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		
 		BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC);
-		assertTrue(basic.getOptional());
+		assertEquals(Boolean.TRUE, basic.getOptional());
 		
-		basic.setOptional(false);
-		assertFalse(basic.getOptional());
+		basic.setOptional(Boolean.FALSE);
+		assertEquals(Boolean.FALSE, basic.getOptional());
 		
-		assertSourceContains("@Basic(optional=false)", cu);
+		assertSourceContains("@Basic(optional = false)", cu);
 	}
 	
 	public void testSetOptionalNull() throws Exception {
@@ -101,7 +102,7 @@ public class BasicTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		
 		BasicAnnotation basic = (BasicAnnotation) attributeResource.getMappingAnnotation(JPA.BASIC);
-		assertTrue(basic.getOptional());
+		assertEquals(Boolean.TRUE, basic.getOptional());
 		
 		basic.setOptional(null);
 		assertNull(basic.getOptional());
@@ -130,7 +131,7 @@ public class BasicTests extends JavaResourceModelTestCase {
 		basic.setFetch(FetchType.LAZY);
 		assertEquals(FetchType.LAZY, basic.getFetch());
 		
-		assertSourceContains("@Basic(fetch=LAZY)", cu);
+		assertSourceContains("@Basic(fetch = LAZY)", cu);
 	}
 	
 	public void testSetFetchNull() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java
index ebb20fb54d..f82a4966ea 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ColumnTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class ColumnTests extends JavaResourceModelTestCase {
 	
 	private static final String COLUMN_NAME = "MY_COLUMN";
@@ -48,7 +49,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(name=\"" + COLUMN_NAME + "\")");
+				sb.append("@Column(name = \"" + COLUMN_NAME + "\")");
 			}
 		});
 	}
@@ -61,7 +62,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(table=\"" + COLUMN_TABLE + "\")");
+				sb.append("@Column(table = \"" + COLUMN_TABLE + "\")");
 			}
 		});
 	}
@@ -74,7 +75,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(columnDefinition=\"" + COLUMN_COLUMN_DEFINITION + "\")");
+				sb.append("@Column(columnDefinition = \"" + COLUMN_COLUMN_DEFINITION + "\")");
 			}
 		});
 	}
@@ -87,7 +88,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(" + booleanElement + "=true)");
+				sb.append("@Column(" + booleanElement + " = true)");
 			}
 		});
 	}
@@ -100,7 +101,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(" + intElement + "=5)");
+				sb.append("@Column(" + intElement + " = 5)");
 			}
 		});
 	}
@@ -141,7 +142,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setName("Foo");
 		assertEquals("Foo", column.getName());
 		
-		assertSourceContains("@Column(name=\"Foo\")", cu);
+		assertSourceContains("@Column(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -178,7 +179,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setTable("Foo");
 		assertEquals("Foo", column.getTable());
 		
-		assertSourceContains("@Column(table=\"Foo\")", cu);
+		assertSourceContains("@Column(table = \"Foo\")", cu);
 
 		
 		column.setTable(null);
@@ -205,7 +206,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setColumnDefinition("Foo");
 		assertEquals("Foo", column.getColumnDefinition());
 		
-		assertSourceContains("@Column(columnDefinition=\"Foo\")", cu);
+		assertSourceContains("@Column(columnDefinition = \"Foo\")", cu);
 
 		
 		column.setColumnDefinition(null);
@@ -233,7 +234,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setUnique(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, column.getUnique());
 		
-		assertSourceContains("@Column(unique=false)", cu);
+		assertSourceContains("@Column(unique = false)", cu);
 		
 		column.setUnique(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -260,7 +261,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setNullable(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, column.getNullable());
 		
-		assertSourceContains("@Column(nullable=false)", cu);
+		assertSourceContains("@Column(nullable = false)", cu);
 		
 		column.setNullable(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -287,7 +288,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setInsertable(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, column.getInsertable());
 		
-		assertSourceContains("@Column(insertable=false)", cu);
+		assertSourceContains("@Column(insertable = false)", cu);
 		
 		column.setInsertable(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -314,7 +315,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setUpdatable(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, column.getUpdatable());
 		
-		assertSourceContains("@Column(updatable=false)", cu);
+		assertSourceContains("@Column(updatable = false)", cu);
 		
 		column.setUpdatable(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -341,7 +342,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setLength(Integer.valueOf(5));
 		assertEquals(Integer.valueOf(5), column.getLength());
 		
-		assertSourceContains("@Column(length=5)", cu);
+		assertSourceContains("@Column(length = 5)", cu);
 		
 		column.setLength(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -368,7 +369,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setPrecision(Integer.valueOf(5));
 		assertEquals(Integer.valueOf(5), column.getPrecision());
 		
-		assertSourceContains("@Column(precision=5)", cu);
+		assertSourceContains("@Column(precision = 5)", cu);
 		
 		column.setPrecision(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -395,7 +396,7 @@ public class ColumnTests extends JavaResourceModelTestCase {
 		column.setScale(Integer.valueOf(5));
 		assertEquals(Integer.valueOf(5), column.getScale());
 		
-		assertSourceContains("@Column(scale=5)", cu);
+		assertSourceContains("@Column(scale = 5)", cu);
 		
 		column.setScale(null);
 		assertSourceDoesNotContain("@Column", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java
index ed0f56f01f..3ca4deeb88 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorColumnTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 	
 	private static final String COLUMN_NAME = "MY_COLUMN";
@@ -47,7 +48,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@DiscriminatorColumn(name=\"" + COLUMN_NAME + "\")");
+				sb.append("@DiscriminatorColumn(name = \"" + COLUMN_NAME + "\")");
 			}
 		});
 	}
@@ -60,7 +61,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@DiscriminatorColumn(columnDefinition=\"" + COLUMN_COLUMN_DEFINITION + "\")");
+				sb.append("@DiscriminatorColumn(columnDefinition = \"" + COLUMN_COLUMN_DEFINITION + "\")");
 			}
 		});
 	}
@@ -73,7 +74,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@DiscriminatorColumn(discriminatorType=DiscriminatorType.CHAR)");
+				sb.append("@DiscriminatorColumn(discriminatorType = DiscriminatorType.CHAR)");
 			}
 		});
 	}
@@ -86,7 +87,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@DiscriminatorColumn(" + intElement + "=5)");
+				sb.append("@DiscriminatorColumn(" + intElement + " = 5)");
 			}
 		});
 	}
@@ -120,7 +121,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 		column.setName("Foo");
 		assertEquals("Foo", column.getName());
 		
-		assertSourceContains("@DiscriminatorColumn(name=\"Foo\")", cu);
+		assertSourceContains("@DiscriminatorColumn(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -154,7 +155,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 		column.setColumnDefinition("Foo");
 		assertEquals("Foo", column.getColumnDefinition());
 		
-		assertSourceContains("@DiscriminatorColumn(columnDefinition=\"Foo\")", cu);
+		assertSourceContains("@DiscriminatorColumn(columnDefinition = \"Foo\")", cu);
 
 		
 		column.setColumnDefinition(null);
@@ -180,7 +181,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 		column.setLength(Integer.valueOf(5));
 		assertEquals(Integer.valueOf(5), column.getLength());
 		
-		assertSourceContains("@DiscriminatorColumn(length=5)", cu);
+		assertSourceContains("@DiscriminatorColumn(length = 5)", cu);
 		
 		column.setLength(null);
 		assertSourceDoesNotContain("@DiscriminatorColumn", cu);
@@ -203,7 +204,7 @@ public class DiscriminatorColumnTests extends JavaResourceModelTestCase {
 		column.setDiscriminatorType(DiscriminatorType.INTEGER);
 		assertEquals(DiscriminatorType.INTEGER, column.getDiscriminatorType());
 		
-		assertSourceContains("@DiscriminatorColumn(discriminatorType=INTEGER)", cu);
+		assertSourceContains("@DiscriminatorColumn(discriminatorType = INTEGER)", cu);
 		
 		column.setDiscriminatorType(null);
 		assertSourceDoesNotContain("@DiscriminatorColumn", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java
index 007fb692dc..c5beed484f 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/DiscriminatorValueTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,6 +16,7 @@ import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class DiscriminatorValueTests extends JavaResourceModelTestCase {
 
 	public DiscriminatorValueTests(String name) {
@@ -43,7 +44,7 @@ public class DiscriminatorValueTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@DiscriminatorValue(value=\"discriminator\")");
+				sb.append("@DiscriminatorValue(value = \"discriminator\")");
 			}
 		});
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java
index c3b08cf132..6ad9f3b0c8 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddableTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourceNode;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class EmbeddableTests extends JavaResourceModelTestCase {
 
 	public EmbeddableTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java
index 82dfa43ab2..42acc30c0c 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedIdTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class EmbeddedIdTests extends JavaResourceModelTestCase {
 
 	public EmbeddedIdTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java
index b85694061f..f34354a840 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EmbeddedTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class EmbeddedTests extends JavaResourceModelTestCase {
 
 	public EmbeddedTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java
index e66d4e0799..6297416b63 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EntityTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class EntityTests extends JavaResourceModelTestCase {
 
 	private static final String ENTITY_NAME = "Foo";
@@ -47,7 +48,7 @@ public class EntityTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Entity(name=\"" + ENTITY_NAME + "\")");
+				sb.append("@Entity(name = \"" + ENTITY_NAME + "\")");
 			}
 		});
 	}
@@ -93,7 +94,7 @@ public class EntityTests extends JavaResourceModelTestCase {
 		entity.setName("Foo");
 		assertEquals("Foo", entity.getName());
 		
-		assertSourceContains("@Entity(name=\"Foo\")", cu);
+		assertSourceContains("@Entity(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -107,7 +108,7 @@ public class EntityTests extends JavaResourceModelTestCase {
 		assertNull(entity.getName());
 		
 		assertSourceContains("@Entity", cu);
-		assertSourceDoesNotContain("@Entity(name=\"Foo\")", cu);
+		assertSourceDoesNotContain("@Entity(name = \"Foo\")", cu);
 	}
 	
 	public void testMappedSuperclassAndEntity() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java
index 64ba2af0a9..919676c0f0 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/EnumeratedTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class EnumeratedTests extends JavaResourceModelTestCase {
 
 	public EnumeratedTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java
index bf5cbc1b96..e65a912113 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/GeneratedValueTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class GeneratedValueTests extends JavaResourceModelTestCase {
 
 	private static final String GENERATOR = "MY_GENERATOR";
@@ -46,7 +47,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@GeneratedValue(generator=\"" + GENERATOR + "\")");
+				sb.append("@GeneratedValue(generator = \"" + GENERATOR + "\")");
 			}
 		});
 	}
@@ -59,7 +60,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@GeneratedValue(strategy=GenerationType.SEQUENCE)");
+				sb.append("@GeneratedValue(strategy = GenerationType.SEQUENCE)");
 			}
 		});
 	}
@@ -93,7 +94,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase {
 		generatedValue.setGenerator("foo");
 		assertEquals("foo", generatedValue.getGenerator());
 		
-		assertSourceContains("@GeneratedValue(generator=\"foo\")", cu);
+		assertSourceContains("@GeneratedValue(generator = \"foo\")", cu);
 		
 		generatedValue.setGenerator(null);
 		assertNull(generatedValue.getGenerator());
@@ -122,7 +123,7 @@ public class GeneratedValueTests extends JavaResourceModelTestCase {
 		generatedValue.setStrategy(GenerationType.TABLE);
 		assertEquals(GenerationType.TABLE, generatedValue.getStrategy());
 		
-		assertSourceContains("@GeneratedValue(strategy=TABLE)", cu);
+		assertSourceContains("@GeneratedValue(strategy = TABLE)", cu);
 		
 		generatedValue.setStrategy(null);
 		assertNull(generatedValue.getStrategy());
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java
index b9389bba52..f86e5805c1 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdClassTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,6 +16,7 @@ import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class IdClassTests extends JavaResourceModelTestCase {
 
 	private static final String ID_CLASS_VALUE = "MyClass";
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java
index 6f72af1f62..3574e4d649 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/IdTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class IdTests extends JavaResourceModelTestCase {
 
 	public IdTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java
index 21c3acafe8..d3901a3956 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/InheritanceTests.java
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JPA;
 import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class InheritanceTests extends JavaResourceModelTestCase {
 
 	public InheritanceTests(String name) {
@@ -44,7 +45,7 @@ public class InheritanceTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Inheritance(strategy=InheritanceType.JOINED)");
+				sb.append("@Inheritance(strategy = InheritanceType.JOINED)");
 			}
 		});
 	}
@@ -72,7 +73,7 @@ public class InheritanceTests extends JavaResourceModelTestCase {
 		InheritanceAnnotation inheritance = (InheritanceAnnotation) typeResource.getSupportingAnnotation(JPA.INHERITANCE);
 		inheritance.setStrategy(InheritanceType.TABLE_PER_CLASS);
 		
-		assertSourceContains("@Inheritance(strategy=TABLE_PER_CLASS)", cu);
+		assertSourceContains("@Inheritance(strategy = TABLE_PER_CLASS)", cu);
 		
 		inheritance.setStrategy(null);
 		
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JPTToolsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JPTToolsTests.java
index 4df0a87c68..94093fd136 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JPTToolsTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JPTToolsTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -19,6 +19,7 @@ import org.eclipse.jpt.core.utility.jdt.FieldAttribute;
 import org.eclipse.jpt.core.utility.jdt.MethodAttribute;
 import org.eclipse.jpt.core.utility.jdt.Type;
 
+@SuppressWarnings("nls")
 public class JPTToolsTests extends JavaResourceModelTestCase {
 
 	public JPTToolsTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java
index cd399c8a2f..498b2d580d 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentAttributeTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -11,7 +11,6 @@ package org.eclipse.jpt.core.tests.internal.resource.java;
 
 import java.util.Iterator;
 import java.util.List;
-
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jpt.core.internal.resource.java.IdImpl;
@@ -120,7 +119,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 				sb.append("@Id");
 				sb.append(CR);
 				sb.append("    ");
-				sb.append("@Column(name=\"baz\")");
+				sb.append("@Column(name = \"baz\")");
 				sb.append("    private String foo, bar;").append(CR);
 				sb.append(CR);
 			}
@@ -181,7 +180,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 			
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(name=\"FOO\", table=\"MY_TABLE\")");
+				sb.append("@Column(name = \"FOO\", table = \"MY_TABLE\")");
 			}
 		});
 	}
@@ -221,9 +220,9 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 			
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Column(name=\"FOO\")");
+				sb.append("@Column(name = \"FOO\")");
 				sb.append(CR);
-				sb.append("@Column(name=\"BAR\")");
+				sb.append("@Column(name = \"BAR\")");
 			}
 		});
 	}
@@ -238,7 +237,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
 				sb.append("@Embedded");
 				sb.append(CR);
-				sb.append("@AttributeOverride(name=\"FOO\")");
+				sb.append("@AttributeOverride(name = \"FOO\")");
 			}
 		});
 	}
@@ -252,7 +251,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
 				sb.append("@Embedded");
 				sb.append(CR);
-				sb.append("@AttributeOverrides(@AttributeOverride(name=\"FOO\"))");
+				sb.append("@AttributeOverrides(@AttributeOverride(name = \"FOO\"))");
 			}
 		});
 	}
@@ -281,7 +280,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
 				sb.append("@Embedded");
 				sb.append(CR);
-				sb.append("@AttributeOverrides({@AttributeOverride(name=\"FOO\"), @AttributeOverride(name=\"BAR\")})");
+				sb.append("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\")})");
 			}
 		});
 	}
@@ -296,9 +295,9 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
 				sb.append("@Embedded");
 				sb.append(CR);
-				sb.append("@AttributeOverride(name=\"FOO\")");
+				sb.append("@AttributeOverride(name = \"FOO\")");
 				sb.append(CR);
-				sb.append("@AttributeOverrides({@AttributeOverride(name=\"BAR\"), @AttributeOverride(name=\"BAZ\")})");
+				sb.append("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\")})");
 			}
 		});
 	}
@@ -388,7 +387,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 
 		ColumnAnnotation columnResource = (ColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.COLUMN);
 		columnResource.setTable(null);
-		assertSourceContains("@Column(name=\"FOO\")", cu);
+		assertSourceContains("@Column(name = \"FOO\")", cu);
 
 		columnResource.setName(null);
 		assertSourceDoesNotContain("@Column", cu);
@@ -565,7 +564,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("FOO");
-		assertSourceContains("@AttributeOverride(name=\"FOO\")", cu);
+		assertSourceContains("@AttributeOverride(name = \"FOO\")", cu);
 	}
 	
 	//  @Embedded     				-->>    @Embedded
@@ -577,7 +576,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 		
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAR");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\"),@AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu);
 		
 		assertNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE));
 		assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES));
@@ -597,7 +596,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 	
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAR");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\"),@AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"),@AttributeOverride(name = \"BAR\")})", cu);
 		
 		assertNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE));
 		assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES));
@@ -611,7 +610,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 		
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		attributeOverride.setName("BAR");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"BAR\"),@AttributeOverride(name=\"FOO\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"),@AttributeOverride(name = \"FOO\")})", cu);
 		
 		assertNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDE));
 		assertNotNull(attributeResource.getSupportingAnnotation(JPA.ATTRIBUTE_OVERRIDES));
@@ -636,7 +635,7 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 		assertEquals(2, CollectionTools.size(attributeResource.supportingAnnotations(JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES)));
 
 		AttributeOverrideAnnotation attributeOverride = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"BAR\"), @AttributeOverride(name=\"BAZ\"),", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\"),", cu);
 		assertSourceContains("@AttributeOverride})", cu);
 		attributeOverride.setName("BOO");
 		
@@ -652,8 +651,8 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 		attributeOverride = (AttributeOverrideAnnotation) attributeOverrideAnnotations.next();	
 		assertEquals("BOO", attributeOverride.getName());
 		
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"BAR\"), @AttributeOverride(name=\"BAZ\"),", cu);
-		assertSourceContains("@AttributeOverride(name=\"BOO\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"BAZ\"),", cu);
+		assertSourceContains("@AttributeOverride(name = \"BOO\")})", cu);
 	}
 
 	//@Entity
@@ -689,8 +688,8 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 	
 		attributeResource.removeSupportingAnnotation(0, JPA.ATTRIBUTE_OVERRIDE , JPA.ATTRIBUTE_OVERRIDES);
 		
-		assertSourceDoesNotContain("@AttributeOverride(name=\"FOO\"", cu);
-		assertSourceContains("@AttributeOverride(name=\"BAR\"", cu);
+		assertSourceDoesNotContain("@AttributeOverride(name = \"FOO\"", cu);
+		assertSourceContains("@AttributeOverride(name = \"BAR\"", cu);
 		assertSourceDoesNotContain("@AttributeOverrides", cu);
 	}
 	
@@ -701,11 +700,11 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 
 		AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		newAnnotation.setName("BAZ");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\"), @AttributeOverride(name=\"BAR\"),", cu);
-		assertSourceContains("@AttributeOverride(name=\"BAZ\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu);
+		assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu);
 		
 		attributeResource.removeSupportingAnnotation(1, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\"), @AttributeOverride(name=\"BAZ\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAZ\")})", cu);
 	}
 	
 	public void testMoveJavaTypeAnnotation() throws Exception {
@@ -715,13 +714,13 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 	
 		AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation)attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		newAnnotation.setName("BAZ");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\"), @AttributeOverride(name=\"BAR\"),", cu);
-		assertSourceContains("@AttributeOverride(name=\"BAZ\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu);
+		assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu);
 		
 		
 		attributeResource.moveSupportingAnnotation(0, 2, JPA.ATTRIBUTE_OVERRIDES);
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"BAZ\"), @AttributeOverride(name=\"FOO\"),", cu);
-		assertSourceContains("@AttributeOverride(name=\"BAR\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAZ\"), @AttributeOverride(name = \"FOO\"),", cu);
+		assertSourceContains("@AttributeOverride(name = \"BAR\")})", cu);
 	}
 	
 	public void testMoveJavaTypeAnnotation2() throws Exception {
@@ -731,12 +730,12 @@ public class JavaResourcePersistentAttributeTests extends JavaResourceModelTestC
 	
 		AttributeOverrideAnnotation newAnnotation = (AttributeOverrideAnnotation) attributeResource.addSupportingAnnotation(2, JPA.ATTRIBUTE_OVERRIDE, JPA.ATTRIBUTE_OVERRIDES);
 		newAnnotation.setName("BAZ");
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"FOO\"), @AttributeOverride(name=\"BAR\"),", cu);
-		assertSourceContains("@AttributeOverride(name=\"BAZ\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"FOO\"), @AttributeOverride(name = \"BAR\"),", cu);
+		assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu);
 		
 		attributeResource.moveSupportingAnnotation(1, 0, JPA.ATTRIBUTE_OVERRIDES);
-		assertSourceContains("@AttributeOverrides({@AttributeOverride(name=\"BAR\"), @AttributeOverride(name=\"FOO\"),", cu);
-		assertSourceContains("@AttributeOverride(name=\"BAZ\")})", cu);
+		assertSourceContains("@AttributeOverrides({@AttributeOverride(name = \"BAR\"), @AttributeOverride(name = \"FOO\"),", cu);
+		assertSourceContains("@AttributeOverride(name = \"BAZ\")})", cu);
 	}	
 
 	//more detailed tests in JPTToolsTests
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java
index 19234bb53b..f09c41f3a8 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourcePersistentTypeTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -98,8 +98,8 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Entity(name=\"FirstEntity\")").append(CR);
-				sb.append("@Entity(name=\"SecondEntity\")");
+				sb.append("@Entity(name = \"FirstEntity\")").append(CR);
+				sb.append("@Entity(name = \"SecondEntity\")");
 			}
 		});
 	}
@@ -293,7 +293,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@Table(name=\"FOO\", schema=\"BAR\")");
+				sb.append("@Table(name = \"FOO\", schema = \"BAR\")");
 			}
 		});
 	}
@@ -329,9 +329,9 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@Table(name=\"FOO\")");
+				sb.append("@Table(name = \"FOO\")");
 				sb.append(CR);
-				sb.append("@Table(name=\"BAR\")");
+				sb.append("@Table(name = \"BAR\")");
 			}
 		});
 	}
@@ -346,7 +346,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@SecondaryTable(name=\"FOO\")");
+				sb.append("@SecondaryTable(name = \"FOO\")");
 			}
 		});
 	}
@@ -375,7 +375,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@SecondaryTables(@SecondaryTable(name=\"FOO\"))");
+				sb.append("@SecondaryTables(@SecondaryTable(name = \"FOO\"))");
 			}
 		});
 	}
@@ -390,7 +390,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@SecondaryTables({@SecondaryTable(name=\"FOO\"), @SecondaryTable(name=\"BAR\")})");
+				sb.append("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})");
 			}
 		});
 	}
@@ -405,9 +405,9 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@SecondaryTable(name=\"FOO\")");
+				sb.append("@SecondaryTable(name = \"FOO\")");
 				sb.append(CR);
-				sb.append("@SecondaryTables({@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\")})");
+				sb.append("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})");
 			}
 		});
 	}
@@ -475,7 +475,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 
 		TableAnnotation tableAnnotation = (TableAnnotation) jrpt.getSupportingAnnotation(JPA.TABLE);
 		tableAnnotation.setSchema(null);
-		assertSourceContains("@Table(name=\"FOO\")", cu);
+		assertSourceContains("@Table(name = \"FOO\")", cu);
 
 		tableAnnotation.setName(null);
 		assertSourceDoesNotContain("@Table", cu);
@@ -616,7 +616,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentType typeResource = buildJavaTypeResource(cu);
 		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTableResource.setName("FOO");
-		assertSourceContains("@SecondaryTable(name=\"FOO\")", cu);
+		assertSourceContains("@SecondaryTable(name = \"FOO\")", cu);
 	}
 	
 	//  @Entity     				-->>    @Entity
@@ -627,7 +627,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTableResource.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\"),@SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES));
@@ -646,7 +646,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTableResource.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\"),@SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"),@SecondaryTable(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES));
@@ -659,7 +659,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTableResource.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAR\"),@SecondaryTable(name=\"FOO\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES));
@@ -672,7 +672,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTableResource.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAR\"),@SecondaryTable(name=\"FOO\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"),@SecondaryTable(name = \"FOO\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES));
@@ -680,7 +680,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 
 		secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTableResource.setName("BAZ");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAZ\"),@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"FOO\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"FOO\")})", cu);
 
 		assertEquals(3, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES)));
 	}
@@ -702,7 +702,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		assertEquals(2, CollectionTools.size(typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES)));
 
 		SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\"), @SecondaryTable})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable})", cu);
 		secondaryTableResource.setName("BOO");
 		
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE));
@@ -717,7 +717,7 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 		secondaryTableResource = (SecondaryTableAnnotation) secondaryTableAnnotations.next();	
 		assertEquals("BOO", secondaryTableResource.getName());
 		
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\"), @SecondaryTable(name=\"BOO\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"BOO\")})", cu);
 	}
 
 	//@Entity
@@ -750,8 +750,8 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 	
 		typeResource.removeSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		
-		assertSourceDoesNotContain("@SecondaryTable(name=\"FOO\"", cu);
-		assertSourceContains("@SecondaryTable(name=\"BAR\"", cu);
+		assertSourceDoesNotContain("@SecondaryTable(name = \"FOO\"", cu);
+		assertSourceContains("@SecondaryTable(name = \"BAR\"", cu);
 		assertSourceDoesNotContain("@SecondaryTables", cu);
 	}
 	
@@ -761,10 +761,10 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 	
 		SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		newAnnotation.setName("BAZ");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\"), @SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ", cu);
 		
 		typeResource.removeSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\"), @SecondaryTable(name=\"BAZ\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAZ\")})", cu);
 	}
 	
 	public void testMoveJavaTypeAnnotation() throws Exception {
@@ -773,10 +773,10 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 	
 		SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		newAnnotation.setName("BAZ");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\"), @SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu);
 		
 		typeResource.moveSupportingAnnotation(0, 2, JPA.SECONDARY_TABLES);
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAZ\"), @SecondaryTable(name=\"FOO\"), @SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\")})", cu);
 	}
 	
 	public void testMoveJavaTypeAnnotation2() throws Exception {
@@ -785,10 +785,10 @@ public class JavaResourcePersistentTypeTests extends JavaResourceModelTestCase {
 	
 		SecondaryTableAnnotation newAnnotation = (SecondaryTableAnnotation)typeResource.addSupportingAnnotation(2, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		newAnnotation.setName("BAZ");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\"), @SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\"), @SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\")})", cu);
 		
 		typeResource.moveSupportingAnnotation(2, 0, JPA.SECONDARY_TABLES);
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAR\"), @SecondaryTable(name=\"BAZ\"), @SecondaryTable(name=\"FOO\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAR\"), @SecondaryTable(name = \"BAZ\"), @SecondaryTable(name = \"FOO\")})", cu);
 	}
 	
 	public void testNestedTypes() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java
index 266cf5ce7b..7b5953c283 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class JoinColumnTests extends JavaResourceModelTestCase {
 	
 	private static final String COLUMN_NAME = "MY_COLUMN";
@@ -49,7 +50,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumn(name=\"" + COLUMN_NAME + "\")");
+				sb.append("@JoinColumn(name = \"" + COLUMN_NAME + "\")");
 			}
 		});
 	}
@@ -62,7 +63,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumn(table=\"" + COLUMN_TABLE + "\")");
+				sb.append("@JoinColumn(table = \"" + COLUMN_TABLE + "\")");
 			}
 		});
 	}
@@ -75,7 +76,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumn(referencedColumnName=\"" + COLUMN_REFERENCED_COLUMN_NAME + "\")");
+				sb.append("@JoinColumn(referencedColumnName = \"" + COLUMN_REFERENCED_COLUMN_NAME + "\")");
 			}
 		});
 	}
@@ -88,7 +89,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumn(columnDefinition=\"" + COLUMN_COLUMN_DEFINITION + "\")");
+				sb.append("@JoinColumn(columnDefinition = \"" + COLUMN_COLUMN_DEFINITION + "\")");
 			}
 		});
 	}
@@ -101,7 +102,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumn(" + booleanElement + "=true)");
+				sb.append("@JoinColumn(" + booleanElement + " = true)");
 			}
 		});
 	}
@@ -143,7 +144,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		column.setName("Foo");
 		assertEquals("Foo", column.getName());
 		
-		assertSourceContains("@JoinColumn(name=\"Foo\")", cu);
+		assertSourceContains("@JoinColumn(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -180,7 +181,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		column.setTable("Foo");
 		assertEquals("Foo", column.getTable());
 		
-		assertSourceContains("@JoinColumn(table=\"Foo\")", cu);
+		assertSourceContains("@JoinColumn(table = \"Foo\")", cu);
 
 		
 		column.setTable(null);
@@ -207,7 +208,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		column.setReferencedColumnName("Foo");
 		assertEquals("Foo", column.getReferencedColumnName());
 		
-		assertSourceContains("@JoinColumn(referencedColumnName=\"Foo\")", cu);
+		assertSourceContains("@JoinColumn(referencedColumnName = \"Foo\")", cu);
 
 		
 		column.setReferencedColumnName(null);
@@ -234,7 +235,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		column.setColumnDefinition("Foo");
 		assertEquals("Foo", column.getColumnDefinition());
 		
-		assertSourceContains("@JoinColumn(columnDefinition=\"Foo\")", cu);
+		assertSourceContains("@JoinColumn(columnDefinition = \"Foo\")", cu);
 
 		
 		column.setColumnDefinition(null);
@@ -247,7 +248,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN);
 
-		assertTrue(column.getUnique());
+		assertEquals(Boolean.TRUE, column.getUnique());
 	}
 	
 	public void testSetUnique() throws Exception {
@@ -259,10 +260,10 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		assertNotNull(column);
 		assertNull(column.getUnique());
 
-		column.setUnique(false);
-		assertFalse(column.getUnique());
+		column.setUnique(Boolean.FALSE);
+		assertEquals(Boolean.FALSE, column.getUnique());
 		
-		assertSourceContains("@JoinColumn(unique=false)", cu);
+		assertSourceContains("@JoinColumn(unique = false)", cu);
 		
 		column.setUnique(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -274,7 +275,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN);
 
-		assertTrue(column.getNullable());
+		assertEquals(Boolean.TRUE, column.getNullable());
 	}
 	
 	public void testSetNullable() throws Exception {
@@ -286,10 +287,10 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		assertNotNull(column);
 		assertNull(column.getNullable());
 
-		column.setNullable(false);
-		assertFalse(column.getNullable());
+		column.setNullable(Boolean.FALSE);
+		assertEquals(Boolean.FALSE, column.getNullable());
 		
-		assertSourceContains("@JoinColumn(nullable=false)", cu);
+		assertSourceContains("@JoinColumn(nullable = false)", cu);
 		
 		column.setNullable(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -301,7 +302,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN);
 
-		assertTrue(column.getInsertable());
+		assertEquals(Boolean.TRUE, column.getInsertable());
 	}
 	
 	public void testSetInsertable() throws Exception {
@@ -313,10 +314,10 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		assertNotNull(column);
 		assertNull(column.getInsertable());
 
-		column.setInsertable(false);
-		assertFalse(column.getInsertable());
+		column.setInsertable(Boolean.FALSE);
+		assertEquals(Boolean.FALSE, column.getInsertable());
 		
-		assertSourceContains("@JoinColumn(insertable=false)", cu);
+		assertSourceContains("@JoinColumn(insertable = false)", cu);
 		
 		column.setInsertable(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -328,7 +329,7 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		JoinColumnAnnotation column = (JoinColumnAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN);
 
-		assertTrue(column.getUpdatable());
+		assertEquals(Boolean.TRUE, column.getUpdatable());
 	}
 	
 	public void testSetUpdatable() throws Exception {
@@ -340,10 +341,10 @@ public class JoinColumnTests extends JavaResourceModelTestCase {
 		assertNotNull(column);
 		assertNull(column.getUpdatable());
 
-		column.setUpdatable(false);
-		assertFalse(column.getUpdatable());
+		column.setUpdatable(Boolean.FALSE);
+		assertEquals(Boolean.FALSE, column.getUpdatable());
 		
-		assertSourceContains("@JoinColumn(updatable=false)", cu);
+		assertSourceContains("@JoinColumn(updatable = false)", cu);
 		
 		column.setUpdatable(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java
index ba06fbcef3..8be5c3e571 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinColumnsTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -53,7 +53,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumns(@JoinColumn(name=\"" + COLUMN_NAME + "\"))");
+				sb.append("@JoinColumns(@JoinColumn(name = \"" + COLUMN_NAME + "\"))");
 			}
 		});
 	}
@@ -66,7 +66,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumns(@JoinColumn(table=\"" + COLUMN_TABLE + "\"))");
+				sb.append("@JoinColumns(@JoinColumn(table = \"" + COLUMN_TABLE + "\"))");
 			}
 		});
 	}
@@ -79,7 +79,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumns(@JoinColumn(referencedColumnName=\"" + COLUMN_REFERENCED_COLUMN_NAME + "\"))");
+				sb.append("@JoinColumns(@JoinColumn(referencedColumnName = \"" + COLUMN_REFERENCED_COLUMN_NAME + "\"))");
 			}
 		});
 	}
@@ -92,7 +92,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumns(@JoinColumn(columnDefinition=\"" + COLUMN_COLUMN_DEFINITION + "\"))");
+				sb.append("@JoinColumns(@JoinColumn(columnDefinition = \"" + COLUMN_COLUMN_DEFINITION + "\"))");
 			}
 		});
 	}
@@ -105,7 +105,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumns(@JoinColumn(" + booleanElement + "=true))");
+				sb.append("@JoinColumns(@JoinColumn(" + booleanElement + " = true))");
 			}
 		});
 	}
@@ -118,7 +118,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")");
+				sb.append("@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")");
 			}
 		});
 	}
@@ -159,7 +159,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setName("Foo");
 		assertEquals("Foo", column.getName());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(name=\"Foo\"))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(name = \"Foo\"))", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -196,7 +196,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setTable("Foo");
 		assertEquals("Foo", column.getTable());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(table=\"Foo\"))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(table = \"Foo\"))", cu);
 
 		
 		column.setTable(null);
@@ -223,7 +223,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setReferencedColumnName("Foo");
 		assertEquals("Foo", column.getReferencedColumnName());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(referencedColumnName=\"Foo\"))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(referencedColumnName = \"Foo\"))", cu);
 
 		
 		column.setReferencedColumnName(null);
@@ -250,7 +250,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setColumnDefinition("Foo");
 		assertEquals("Foo", column.getColumnDefinition());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(columnDefinition=\"Foo\"))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(columnDefinition = \"Foo\"))", cu);
 
 		
 		column.setColumnDefinition(null);
@@ -278,7 +278,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setUnique(Boolean.FALSE);
 		assertFalse(column.getUnique().booleanValue());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(unique=false))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(unique = false))", cu);
 		
 		column.setUnique(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -305,7 +305,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setNullable(Boolean.FALSE);
 		assertFalse(column.getNullable().booleanValue());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(nullable=false))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(nullable = false))", cu);
 		
 		column.setNullable(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -332,7 +332,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setInsertable(Boolean.FALSE);
 		assertFalse(column.getInsertable().booleanValue());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(insertable=false))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(insertable = false))", cu);
 		
 		column.setInsertable(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -359,7 +359,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		column.setUpdatable(Boolean.FALSE);
 		assertFalse(column.getUpdatable().booleanValue());
 		
-		assertSourceContains("@JoinColumns(@JoinColumn(updatable=false))", cu);
+		assertSourceContains("@JoinColumns(@JoinColumn(updatable = false))", cu);
 		
 		column.setUpdatable(null);
 		assertSourceDoesNotContain("@JoinColumn", cu);
@@ -374,7 +374,7 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		
 		JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS);
 		joinColumn.setName("FOO");
-		assertSourceContains("@JoinColumns({@JoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu);
 		
 		assertNull(attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMN));
 		assertNotNull(attributeResource.getSupportingAnnotation(JPA.JOIN_COLUMNS));
@@ -388,11 +388,11 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		
 		JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS);
 		joinColumn.setName("FOO");
-		assertSourceContains("@JoinColumns({@JoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu);
 				
 		joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS);
 		joinColumn.setName("BAZ");
-		assertSourceContains("@JoinColumns({@JoinColumn(name=\"BAZ\"),@JoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"), @JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAZ\"),@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"), @JoinColumn(name = \"FOO\")})", cu);
 
 		Iterator<NestableAnnotation> joinColumns = attributeResource.supportingAnnotations(JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS);
 		assertEquals("BAZ", ((JoinColumnAnnotation) joinColumns.next()).getName());
@@ -412,10 +412,10 @@ public class JoinColumnsTests extends JavaResourceModelTestCase {
 		
 		JoinColumnAnnotation joinColumn = (JoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS);
 		joinColumn.setName("FOO");
-		assertSourceContains("@JoinColumns({@JoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinColumns({@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\"),@JoinColumn(name = \"FOO\")})", cu);
 		
 		attributeResource.removeSupportingAnnotation(1, JPA.JOIN_COLUMN, JPA.JOIN_COLUMNS);
-		assertSourceContains("@JoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\")", cu);
+		assertSourceContains("@JoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", table = \"TABLE\", unique = false, nullable = false, insertable = false, updatable = false, referencedColumnName = \"REF_NAME\")", cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java
index ba3b324010..ef488c5f90 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JoinTableTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation;
 import org.eclipse.jpt.core.resource.java.JoinTableAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class JoinTableTests extends JavaResourceModelTestCase {
 	
 	private static final String TABLE_NAME = "MY_TABLE";
@@ -49,7 +50,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinTable(name=\"" + TABLE_NAME + "\")");
+				sb.append("@JoinTable(name = \"" + TABLE_NAME + "\")");
 			}
 		});
 	}
@@ -63,7 +64,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 			
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinTable(schema=\"" + SCHEMA_NAME + "\")");
+				sb.append("@JoinTable(schema = \"" + SCHEMA_NAME + "\")");
 			}
 		});
 	}
@@ -76,7 +77,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinTable(catalog=\"" + CATALOG_NAME + "\")");
+				sb.append("@JoinTable(catalog = \"" + CATALOG_NAME + "\")");
 			}
 		});
 	}
@@ -89,7 +90,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"})})");
+				sb.append("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})");
 			}
 		});
 	}
@@ -102,7 +103,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinTable(joinColumns={@JoinColumn(name=\"BAR\"), @JoinColumn})");
+				sb.append("@JoinTable(joinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn})");
 			}
 		});
 	}
@@ -115,7 +116,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@JoinTable(inverseJoinColumns={@JoinColumn(name=\"BAR\"), @JoinColumn})");
+				sb.append("@JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn})");
 			}
 		});
 	}
@@ -154,7 +155,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		table.setName("Foo");
 		assertEquals("Foo", table.getName());
 		
-		assertSourceContains("@JoinTable(name=\"Foo\")", cu);
+		assertSourceContains("@JoinTable(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -193,7 +194,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		table.setCatalog("Foo");
 		assertEquals("Foo", table.getCatalog());
 		
-		assertSourceContains("@JoinTable(catalog=\"Foo\")", cu);
+		assertSourceContains("@JoinTable(catalog = \"Foo\")", cu);
 	}
 	
 	public void testSetCatalogNull() throws Exception {
@@ -232,7 +233,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		table.setSchema("Foo");
 		assertEquals("Foo", table.getSchema());
 		
-		assertSourceContains("@JoinTable(schema=\"Foo\")", cu);
+		assertSourceContains("@JoinTable(schema = \"Foo\")", cu);
 	}
 	
 	public void testSetSchemaNull() throws Exception {
@@ -298,7 +299,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next());
 		assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize());
 
-		assertSourceContains("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames=\"BAR\"),@UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint})", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu);
 	}
 	
 	public void testRemoveUniqueConstraint() throws Exception {
@@ -316,12 +317,12 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", table.uniqueConstraintAt(0).columnNames().next());
 		assertEquals("BAZ", table.uniqueConstraintAt(1).columnNames().next());
 		assertEquals(2, table.uniqueConstraintsSize());		
-		assertSourceContains("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"BAZ\"})})", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu);
 		
 		table.removeUniqueConstraint(0);
 		assertEquals("BAZ", table.uniqueConstraintAt(0).columnNames().next());
 		assertEquals(1, table.uniqueConstraintsSize());		
-		assertSourceContains("@JoinTable(uniqueConstraints=@UniqueConstraint(columnNames={\"BAZ\"}))", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu);
 		
 		table.removeUniqueConstraint(0);
 		assertEquals(0, table.uniqueConstraintsSize());		
@@ -334,10 +335,10 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		
 		JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE);
-		assertSourceContains("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"})})", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu);
 		
 		table.moveUniqueConstraint(2, 0);
-		assertSourceContains("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"})})", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu);
 	}
 	
 	public void testMoveUniqueConstraint2() throws Exception {
@@ -346,10 +347,10 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		JavaResourcePersistentAttribute attributeResource = typeResource.fields().next();
 		
 		JoinTableAnnotation table = (JoinTableAnnotation) attributeResource.getSupportingAnnotation(JPA.JOIN_TABLE);
-		assertSourceContains("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"})})", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu);
 		
 		table.moveUniqueConstraint(0, 2);
-		assertSourceContains("@JoinTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"})})", cu);
+		assertSourceContains("@JoinTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu);
 	}
 	
 	public void testJoinColumns() throws Exception {
@@ -400,7 +401,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", table.joinColumnAt(0).getName());
 		assertEquals("FOO", table.joinColumnAt(1).getName());
 		assertNull(table.joinColumnAt(2).getName());
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn(name=\"BAR\"),@JoinColumn(name=\"FOO\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"BAR\"),@JoinColumn(name = \"FOO\"), @JoinColumn})", cu);
 	}
 	
 	public void testRemoveJoinColumn() throws Exception {
@@ -420,12 +421,12 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", table.joinColumnAt(0).getName());
 		assertNull(table.joinColumnAt(1).getName());
 		assertEquals(2, table.joinColumnsSize());
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn})", cu);
 
 		table.removeJoinColumn(0);
 		assertNull(table.joinColumnAt(0).getName());
 		assertEquals(1, table.joinColumnsSize());
-		assertSourceContains("@JoinTable(joinColumns=@JoinColumn)", cu);
+		assertSourceContains("@JoinTable(joinColumns = @JoinColumn)", cu);
 
 		
 		table.removeJoinColumn(0);
@@ -449,14 +450,14 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		joinColumn.setTable("TABLE");
 		table.addJoinColumn(0).setName("FOO");
 		
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
 
 		table.moveJoinColumn(2, 0);
 		assertEquals("BAR", table.joinColumnAt(0).getName());
 		assertNull(table.joinColumnAt(1).getName());
 		assertEquals("FOO", table.joinColumnAt(2).getName());
 		assertEquals(3, table.joinColumnsSize());
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu);
 	}
 	
 	public void testMoveJoinColumn2() throws Exception {
@@ -477,7 +478,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		
 		table.addJoinColumn(0).setName("FOO");
 		
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\"), @JoinColumn})", cu);
 
 
 		table.moveJoinColumn(0, 2);
@@ -485,7 +486,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", table.joinColumnAt(1).getName());
 		assertEquals("BAR", table.joinColumnAt(2).getName());
 		assertEquals(3, table.joinColumnsSize());
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn, @JoinColumn(name=\"FOO\"), @JoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn, @JoinColumn(name = \"FOO\"), @JoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", unique = false, nullable = false, insertable = false, updatable = false, columnDefinition = \"COLUMN_DEF\", table = \"TABLE\")})", cu);
 	}
 	
 	public void testSetJoinColumnName() throws Exception {
@@ -504,7 +505,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		joinColumn.setName("foo");
 		assertEquals("foo", joinColumn.getName());
 		
-		assertSourceContains("@JoinTable(joinColumns={@JoinColumn(name=\"foo\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(joinColumns = {@JoinColumn(name = \"foo\"), @JoinColumn})", cu);
 	}
 
 	public void testInverseJoinColumns() throws Exception {
@@ -555,7 +556,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", table.inverseJoinColumnAt(0).getName());
 		assertEquals("FOO", table.inverseJoinColumnAt(1).getName());
 		assertNull(table.inverseJoinColumnAt(2).getName());
-		assertSourceContains("@JoinTable(inverseJoinColumns={@JoinColumn(name=\"BAR\"),@JoinColumn(name=\"FOO\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"),@JoinColumn(name = \"FOO\"), @JoinColumn})", cu);
 	}
 	
 	public void testRemoveInverseJoinColumn() throws Exception {
@@ -573,14 +574,14 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertFalse(inverseJoinColumns.hasNext());
 		
 		table.removeInverseJoinColumn(1);
-		assertSourceContains("@JoinTable(inverseJoinColumns={@JoinColumn(name=\"BAR\"), @JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn(name = \"FOO\")})", cu);
 		inverseJoinColumns = table.inverseJoinColumns();
 		assertEquals("BAR", inverseJoinColumns.next().getName());
 		assertEquals("FOO", inverseJoinColumns.next().getName());
 		assertFalse(inverseJoinColumns.hasNext());
 
 		table.removeInverseJoinColumn(0);
-		assertSourceContains("@JoinTable(inverseJoinColumns=@JoinColumn(name=\"FOO\"))", cu);
+		assertSourceContains("@JoinTable(inverseJoinColumns = @JoinColumn(name = \"FOO\"))", cu);
 		inverseJoinColumns = table.inverseJoinColumns();
 		assertEquals("FOO", inverseJoinColumns.next().getName());
 		assertFalse(inverseJoinColumns.hasNext());
@@ -608,7 +609,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertNull(inverseJoinColumns.next().getName());
 		assertEquals("FOO", inverseJoinColumns.next().getName());
 		
-		assertSourceContains("@JoinTable(inverseJoinColumns={@JoinColumn(name=\"BAR\"), @JoinColumn, @JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinTable(inverseJoinColumns = {@JoinColumn(name = \"BAR\"), @JoinColumn, @JoinColumn(name = \"FOO\")})", cu);
 	}
 	
 	public void testMoveInverseJoinColumn2() throws Exception {
@@ -630,7 +631,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", inverseJoinColumns.next().getName());
 		assertEquals("FOO", inverseJoinColumns.next().getName());
 
-		assertSourceContains("@JoinTable(inverseJoinColumns={@JoinColumn, @JoinColumn(name=\"BAR\"), @JoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@JoinTable(inverseJoinColumns = {@JoinColumn, @JoinColumn(name = \"BAR\"), @JoinColumn(name = \"FOO\")})", cu);
 	}
 	
 	public void testSetInverseJoinColumnName() throws Exception {
@@ -649,7 +650,7 @@ public class JoinTableTests extends JavaResourceModelTestCase {
 		joinColumn.setName("foo");
 		assertEquals("foo", joinColumn.getName());
 		
-		assertSourceContains("@JoinTable(inverseJoinColumns={@JoinColumn(name=\"foo\"), @JoinColumn})", cu);
+		assertSourceContains("@JoinTable(inverseJoinColumns = {@JoinColumn(name = \"foo\"), @JoinColumn})", cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java
index 55af8011c5..908fd5a763 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/LobTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.LobAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class LobTests extends JavaResourceModelTestCase {
 
 	public LobTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java
index 179d399f2e..cedf30b44a 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToManyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.ManyToManyAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class ManyToManyTests extends JavaResourceModelTestCase {
 	
 	public ManyToManyTests(String name) {
@@ -45,7 +46,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToMany(fetch=FetchType.EAGER)");
+				sb.append("@ManyToMany(fetch = FetchType.EAGER)");
 			}
 		});
 	}
@@ -58,7 +59,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToMany(targetEntity=AnnotationTestType.class)");
+				sb.append("@ManyToMany(targetEntity = AnnotationTestType.class)");
 			}
 		});
 	}
@@ -71,7 +72,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToMany(mappedBy=\"foo\")");
+				sb.append("@ManyToMany(mappedBy = \"foo\")");
 			}
 		});
 	}
@@ -84,7 +85,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToMany(cascade=CascadeType.ALL)");
+				sb.append("@ManyToMany(cascade = CascadeType.ALL)");
 			}
 		});
 	}
@@ -97,7 +98,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToMany(cascade={CascadeType.MERGE, CascadeType.REMOVE})");
+				sb.append("@ManyToMany(cascade = {CascadeType.MERGE, CascadeType.REMOVE})");
 			}
 		});
 	}
@@ -110,7 +111,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToMany(cascade={CascadeType.MERGE, CascadeType.MERGE})");
+				sb.append("@ManyToMany(cascade = {CascadeType.MERGE, CascadeType.MERGE})");
 			}
 		});
 	}
@@ -144,7 +145,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		manyToMany.setFetch(FetchType.LAZY);
 		assertEquals(FetchType.LAZY, manyToMany.getFetch());
 		
-		assertSourceContains("@ManyToMany(fetch=LAZY)", cu);
+		assertSourceContains("@ManyToMany(fetch = LAZY)", cu);
 	}
 	
 	public void testSetFetchNull() throws Exception {
@@ -181,7 +182,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		
 		manyToMany.setTargetEntity("Foo");
 		
-		assertSourceContains("@ManyToMany(targetEntity=Foo.class)", cu);
+		assertSourceContains("@ManyToMany(targetEntity = Foo.class)", cu);
 	}
 	
 	public void testSetTargetEntityNull() throws Exception {
@@ -209,7 +210,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		
 		manyToMany.setTargetEntity("Foo");
 		
-		assertSourceContains("@ManyToMany(targetEntity=Foo.class)", cu);
+		assertSourceContains("@ManyToMany(targetEntity = Foo.class)", cu);
 		
 		assertEquals("Foo", manyToMany.getTargetEntity());
 		
@@ -244,7 +245,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		manyToMany.setMappedBy("bar");
 		assertEquals("bar", manyToMany.getMappedBy());
 		
-		assertSourceContains("@ManyToMany(mappedBy=\"bar\")", cu);
+		assertSourceContains("@ManyToMany(mappedBy = \"bar\")", cu);
 	}
 	
 	public void testSetMappedByNull() throws Exception {
@@ -271,7 +272,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		assertFalse(manyToMany.isCascadeAll());
 	
 		manyToMany.setCascadeAll(true);
-		assertSourceContains("@ManyToMany(cascade=ALL)", cu);
+		assertSourceContains("@ManyToMany(cascade = ALL)", cu);
 		
 		assertTrue(manyToMany.isCascadeAll());
 	}
@@ -285,7 +286,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		assertFalse(manyToMany.isCascadeMerge());
 	
 		manyToMany.setCascadeMerge(true);
-		assertSourceContains("@ManyToMany(cascade=MERGE)", cu);
+		assertSourceContains("@ManyToMany(cascade = MERGE)", cu);
 		
 		assertTrue(manyToMany.isCascadeMerge());
 	}
@@ -299,7 +300,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		assertFalse(manyToMany.isCascadePersist());
 	
 		manyToMany.setCascadePersist(true);
-		assertSourceContains("@ManyToMany(cascade=PERSIST)", cu);
+		assertSourceContains("@ManyToMany(cascade = PERSIST)", cu);
 		
 		assertTrue(manyToMany.isCascadePersist());
 	}
@@ -313,7 +314,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		assertFalse(manyToMany.isCascadeRemove());
 	
 		manyToMany.setCascadeRemove(true);
-		assertSourceContains("@ManyToMany(cascade=REMOVE)", cu);
+		assertSourceContains("@ManyToMany(cascade = REMOVE)", cu);
 		
 		assertTrue(manyToMany.isCascadeRemove());
 	}
@@ -327,7 +328,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		assertFalse(manyToMany.isCascadeRefresh());
 	
 		manyToMany.setCascadeRefresh(true);
-		assertSourceContains("@ManyToMany(cascade=REFRESH)", cu);
+		assertSourceContains("@ManyToMany(cascade = REFRESH)", cu);
 		
 		assertTrue(manyToMany.isCascadeRefresh());
 	}
@@ -343,7 +344,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		manyToMany.setCascadeAll(true);
 		assertTrue(manyToMany.isCascadeAll());
 		//a second CascadeType.All should not have been added
-		assertSourceContains("@ManyToMany(cascade=CascadeType.ALL)", cu);
+		assertSourceContains("@ManyToMany(cascade = CascadeType.ALL)", cu);
 		
 		manyToMany.setCascadeAll(false);
 		assertFalse(manyToMany.isCascadeAll());
@@ -385,7 +386,7 @@ public class ManyToManyTests extends JavaResourceModelTestCase {
 		assertTrue(manyToMany.isCascadeRemove());
 		
 		manyToMany.setCascadeMerge(false);
-		assertSourceContains("@ManyToMany(cascade=REMOVE)", cu);
+		assertSourceContains("@ManyToMany(cascade = REMOVE)", cu);
 		
 		manyToMany.setCascadeRemove(false);		
 		assertSourceDoesNotContain("cascade", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java
index 9adfeca2e7..19561acfb5 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/ManyToOneTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.ManyToOneAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class ManyToOneTests extends JavaResourceModelTestCase {
 	
 	public ManyToOneTests(String name) {
@@ -45,7 +46,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToOne(fetch=FetchType.EAGER)");
+				sb.append("@ManyToOne(fetch = FetchType.EAGER)");
 			}
 		});
 	}
@@ -58,7 +59,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToOne(targetEntity=AnnotationTestType.class)");
+				sb.append("@ManyToOne(targetEntity = AnnotationTestType.class)");
 			}
 		});
 	}
@@ -71,7 +72,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToOne(optional=true)");
+				sb.append("@ManyToOne(optional = true)");
 			}
 		});
 	}
@@ -84,7 +85,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToOne(cascade=CascadeType.ALL)");
+				sb.append("@ManyToOne(cascade = CascadeType.ALL)");
 			}
 		});
 	}
@@ -97,7 +98,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToOne(cascade={CascadeType.MERGE, CascadeType.REMOVE})");
+				sb.append("@ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REMOVE})");
 			}
 		});
 	}
@@ -110,7 +111,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ManyToOne(cascade={CascadeType.MERGE, CascadeType.MERGE})");
+				sb.append("@ManyToOne(cascade = {CascadeType.MERGE, CascadeType.MERGE})");
 			}
 		});
 	}
@@ -144,7 +145,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		manyToOne.setFetch(FetchType.LAZY);
 		assertEquals(FetchType.LAZY, manyToOne.getFetch());
 		
-		assertSourceContains("@ManyToOne(fetch=LAZY)", cu);
+		assertSourceContains("@ManyToOne(fetch = LAZY)", cu);
 	}
 	
 	public void testSetFetchNull() throws Exception {
@@ -182,7 +183,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		
 		manyToOne.setTargetEntity("Foo");
 		
-		assertSourceContains("@ManyToOne(targetEntity=Foo.class)", cu);
+		assertSourceContains("@ManyToOne(targetEntity = Foo.class)", cu);
 	}
 	
 	public void testSetTargetEntityNull() throws Exception {
@@ -210,7 +211,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		
 		manyToOne.setTargetEntity("Foo");
 		
-		assertSourceContains("@ManyToOne(targetEntity=Foo.class)", cu);
+		assertSourceContains("@ManyToOne(targetEntity = Foo.class)", cu);
 		
 		assertEquals("Foo", manyToOne.getTargetEntity());
 		
@@ -237,7 +238,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		manyToOne.setOptional(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, manyToOne.getOptional());
 		
-		assertSourceContains("@ManyToOne(optional=false)", cu);
+		assertSourceContains("@ManyToOne(optional = false)", cu);
 	}
 	
 	public void testSetOptionalNull() throws Exception {
@@ -264,7 +265,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		assertFalse(manyToOne.isCascadeAll());
 	
 		manyToOne.setCascadeAll(true);
-		assertSourceContains("@ManyToOne(cascade=ALL)", cu);
+		assertSourceContains("@ManyToOne(cascade = ALL)", cu);
 		
 		assertTrue(manyToOne.isCascadeAll());
 	}
@@ -278,7 +279,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		assertFalse(manyToOne.isCascadeMerge());
 	
 		manyToOne.setCascadeMerge(true);
-		assertSourceContains("@ManyToOne(cascade=MERGE)", cu);
+		assertSourceContains("@ManyToOne(cascade = MERGE)", cu);
 		
 		assertTrue(manyToOne.isCascadeMerge());
 	}
@@ -292,7 +293,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		assertFalse(manyToOne.isCascadePersist());
 	
 		manyToOne.setCascadePersist(true);
-		assertSourceContains("@ManyToOne(cascade=PERSIST)", cu);
+		assertSourceContains("@ManyToOne(cascade = PERSIST)", cu);
 		
 		assertTrue(manyToOne.isCascadePersist());
 	}
@@ -306,7 +307,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		assertFalse(manyToOne.isCascadeRemove());
 	
 		manyToOne.setCascadeRemove(true);
-		assertSourceContains("@ManyToOne(cascade=REMOVE)", cu);
+		assertSourceContains("@ManyToOne(cascade = REMOVE)", cu);
 		
 		assertTrue(manyToOne.isCascadeRemove());
 	}
@@ -320,7 +321,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		assertFalse(manyToOne.isCascadeRefresh());
 	
 		manyToOne.setCascadeRefresh(true);
-		assertSourceContains("@ManyToOne(cascade=REFRESH)", cu);
+		assertSourceContains("@ManyToOne(cascade = REFRESH)", cu);
 		
 		assertTrue(manyToOne.isCascadeRefresh());
 	}
@@ -336,7 +337,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		manyToOne.setCascadeAll(true);
 		assertTrue(manyToOne.isCascadeAll());
 		//a second CascadeType.All should not have been added
-		assertSourceContains("@ManyToOne(cascade=CascadeType.ALL)", cu);
+		assertSourceContains("@ManyToOne(cascade = CascadeType.ALL)", cu);
 		
 		manyToOne.setCascadeAll(false);
 		assertFalse(manyToOne.isCascadeAll());
@@ -378,7 +379,7 @@ public class ManyToOneTests extends JavaResourceModelTestCase {
 		assertTrue(manyToOne.isCascadeRemove());
 		
 		manyToOne.setCascadeMerge(false);
-		assertSourceContains("@ManyToOne(cascade=REMOVE)", cu);
+		assertSourceContains("@ManyToOne(cascade = REMOVE)", cu);
 		
 		manyToOne.setCascadeRemove(false);		
 		assertSourceDoesNotContain("cascade", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java
index a13d665524..409de12160 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MapKeyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.MapKeyAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class MapKeyTests extends JavaResourceModelTestCase {
 
 	public MapKeyTests(String name) {
@@ -44,7 +45,7 @@ public class MapKeyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@MapKey(name=\"key\")");
+				sb.append("@MapKey(name = \"key\")");
 			}
 		});
 	}
@@ -76,12 +77,12 @@ public class MapKeyTests extends JavaResourceModelTestCase {
 
 		mapKey.setName("foo");
 	
-		assertSourceContains("@MapKey(name=\"foo\")", cu);
+		assertSourceContains("@MapKey(name = \"foo\")", cu);
 		
 		mapKey.setName(null);
 		
 		assertSourceContains("@MapKey", cu);
-		assertSourceDoesNotContain("@MapKey(name=\"foo\")", cu);
+		assertSourceDoesNotContain("@MapKey(name = \"foo\")", cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java
index 9ab47ea88d..5f20d3d322 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/MappedSuperclassTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class MappedSuperclassTests extends JavaResourceModelTestCase {
 
 	public MappedSuperclassTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java
index bbe55c305e..bec49b4701 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueriesTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -66,7 +66,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQueries(@NamedNativeQuery(" + elementName + "=\"" + value + "\"))");
+				sb.append("@NamedNativeQueries(@NamedNativeQuery(" + elementName + " = \"" + value + "\"))");
 			}
 		});
 	}
@@ -79,7 +79,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQueries(@NamedNativeQuery(resultClass=" + QUERY_RESULT_CLASS + ".class))");
+				sb.append("@NamedNativeQueries(@NamedNativeQuery(resultClass = " + QUERY_RESULT_CLASS + ".class))");
 			}
 		});
 	}
@@ -92,7 +92,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQueries(@NamedNativeQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint}))");
+				sb.append("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint}))");
 			}
 		});
 	}
@@ -105,7 +105,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQuery(name=\"foo\", query=\"bar\", hints=@QueryHint(name=\"BAR\", value=\"FOO\"), resultClass=Foo.class, resultSetMapping=\"mapping\")");
+				sb.append("@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\")");
 			}
 		});
 	}
@@ -139,7 +139,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setName("foo");
 		assertEquals("foo", namedQuery.getName());
 		
-		assertSourceContains("@NamedNativeQuery(name=\"foo\")", cu);
+		assertSourceContains("@NamedNativeQuery(name = \"foo\")", cu);
 		
 		namedQuery.setName(null);
 		assertNull(namedQuery.getName());
@@ -167,7 +167,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setQuery("foo");
 		assertEquals("foo", namedQuery.getQuery());
 		
-		assertSourceContains("@NamedNativeQuery(query=\"foo\")", cu);
+		assertSourceContains("@NamedNativeQuery(query = \"foo\")", cu);
 		
 		namedQuery.setQuery(null);
 		assertNull(namedQuery.getQuery());
@@ -195,7 +195,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setResultClass("foo");
 		assertEquals("foo", namedQuery.getResultClass());
 		
-		assertSourceContains("@NamedNativeQuery(resultClass=foo.class)", cu);
+		assertSourceContains("@NamedNativeQuery(resultClass = foo.class)", cu);
 		
 		namedQuery.setResultClass(null);
 		assertNull(namedQuery.getResultClass());
@@ -215,7 +215,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setResultClass(TYPE_NAME);		
 		
 		assertEquals(FULLY_QUALIFIED_TYPE_NAME, namedQuery.getFullyQualifiedResultClass());				
-		assertSourceContains("@NamedNativeQuery(resultClass=" + TYPE_NAME + ".class)", cu);
+		assertSourceContains("@NamedNativeQuery(resultClass = " + TYPE_NAME + ".class)", cu);
 	}
 	
 	public void testGetResultSetMapping() throws Exception {
@@ -238,7 +238,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setResultSetMapping("foo");
 		assertEquals("foo", namedQuery.getResultSetMapping());
 		
-		assertSourceContains("@NamedNativeQuery(resultSetMapping=\"foo\")", cu);
+		assertSourceContains("@NamedNativeQuery(resultSetMapping = \"foo\")", cu);
 		
 		namedQuery.setResultSetMapping(null);
 		assertNull(namedQuery.getResultSetMapping());
@@ -293,7 +293,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals("FOO", namedQuery.hintAt(1).getName());
 		assertNull(namedQuery.hintAt(2).getName());
-		assertSourceContains("@NamedNativeQuery(hints={@QueryHint(name=\"BAR\"),@QueryHint(name=\"FOO\"), @QueryHint})", cu);
+		assertSourceContains("@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\"),@QueryHint(name = \"FOO\"), @QueryHint})", cu);
 	}
 	
 	public void testRemoveHint() throws Exception {
@@ -313,12 +313,12 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(0).getName());
 		assertEquals("BAR", namedQuery.hintAt(1).getName());
 		assertEquals(2, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints={@QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")}))", cu);
+		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu);
 		
 		namedQuery.removeHint(0);
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals(1, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints=@QueryHint(name=\"BAR\", value=\"FOO\")))", cu);
+		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\")))", cu);
 		
 	
 		namedQuery.removeHint(0);
@@ -346,7 +346,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		assertNull(namedQuery.hintAt(1).getName());
 		assertEquals("BAZ", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint, @QueryHint(name=\"BAZ\")}))", cu);
+		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")}))", cu);
 	}
 	
 	public void testMoveHint2() throws Exception {
@@ -369,7 +369,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(1).getName());
 		assertEquals("BAR", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints={@QueryHint, @QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")}))", cu);
+		assertSourceContains("@NamedNativeQueries(@NamedNativeQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu);
 	}
 	
 	public void testAddNamedNativeQueryCopyExisting() throws Exception {
@@ -378,7 +378,7 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		
 		NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES);
 		namedQuery.setName("BAR");
-		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERY));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.NAMED_NATIVE_QUERIES));
@@ -391,11 +391,11 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		
 		NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES);
 		namedQuery.setName("BAR");
-		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu);
 		
 		namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(0, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES);
 		namedQuery.setName("BAZ");
-		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name=\"BAZ\"),@NamedNativeQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"), @NamedNativeQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"BAZ\"),@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"), @NamedNativeQuery(name = \"BAR\")})", cu);
 
 		Iterator<NestableAnnotation> namedQueries = typeResource.supportingAnnotations(JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES);
 		assertEquals("BAZ", ((NamedNativeQueryAnnotation) namedQueries.next()).getName());
@@ -413,9 +413,9 @@ public class NamedNativeQueriesTests extends JavaResourceModelTestCase {
 		
 		NamedNativeQueryAnnotation namedQuery = (NamedNativeQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES);
 		namedQuery.setName("BAR");
-		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedNativeQueries({@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\"),@NamedNativeQuery(name = \"BAR\")})", cu);
 		
 		typeResource.removeSupportingAnnotation(1, JPA.NAMED_NATIVE_QUERY, JPA.NAMED_NATIVE_QUERIES);
-		assertSourceContains("@NamedNativeQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\")", cu);
+		assertSourceContains("@NamedNativeQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"), resultClass = Foo.class, resultSetMapping = \"mapping\")", cu);
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java
index d204997c32..41455e25ab 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedNativeQueryTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,6 +16,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 
 	private static final String QUERY_NAME = "myQuery";
@@ -61,7 +62,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQuery(" + elementName + "=\"" + value + "\")");
+				sb.append("@NamedNativeQuery(" + elementName + " = \"" + value + "\")");
 			}
 		});
 	}
@@ -74,7 +75,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQuery(resultClass=" + QUERY_RESULT_CLASS + ".class)");
+				sb.append("@NamedNativeQuery(resultClass = " + QUERY_RESULT_CLASS + ".class)");
 			}
 		});
 	}
@@ -87,7 +88,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedNativeQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint})");
+				sb.append("@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint})");
 			}
 		});
 	}
@@ -118,7 +119,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setName("foo");
 		assertEquals("foo", namedQuery.getName());
 		
-		assertSourceContains("@NamedNativeQuery(name=\"foo\")", cu);
+		assertSourceContains("@NamedNativeQuery(name = \"foo\")", cu);
 		
 		namedQuery.setName(null);
 		assertNull(namedQuery.getName());
@@ -144,7 +145,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setQuery("foo");
 		assertEquals("foo", namedQuery.getQuery());
 		
-		assertSourceContains("@NamedNativeQuery(query=\"foo\")", cu);
+		assertSourceContains("@NamedNativeQuery(query = \"foo\")", cu);
 		
 		namedQuery.setQuery(null);
 		assertNull(namedQuery.getQuery());
@@ -170,7 +171,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setResultClass("foo");
 		assertEquals("foo", namedQuery.getResultClass());
 		
-		assertSourceContains("@NamedNativeQuery(resultClass=foo.class)", cu);
+		assertSourceContains("@NamedNativeQuery(resultClass = foo.class)", cu);
 		
 		namedQuery.setResultClass(null);
 		assertNull(namedQuery.getResultClass());
@@ -189,7 +190,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setResultClass(TYPE_NAME);		
 		
 		assertEquals(FULLY_QUALIFIED_TYPE_NAME, namedQuery.getFullyQualifiedResultClass());				
-		assertSourceContains("@NamedNativeQuery(resultClass=" + TYPE_NAME + ".class)", cu);
+		assertSourceContains("@NamedNativeQuery(resultClass = " + TYPE_NAME + ".class)", cu);
 	}
 	
 	public void testGetResultSetMapping() throws Exception {
@@ -210,7 +211,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setResultSetMapping("foo");
 		assertEquals("foo", namedQuery.getResultSetMapping());
 		
-		assertSourceContains("@NamedNativeQuery(resultSetMapping=\"foo\")", cu);
+		assertSourceContains("@NamedNativeQuery(resultSetMapping = \"foo\")", cu);
 		
 		namedQuery.setResultSetMapping(null);
 		assertNull(namedQuery.getResultSetMapping());
@@ -262,7 +263,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals("FOO", namedQuery.hintAt(1).getName());
 		assertNull(namedQuery.hintAt(2).getName());
-		assertSourceContains("@NamedNativeQuery(hints={@QueryHint(name=\"BAR\"),@QueryHint(name=\"FOO\"), @QueryHint})", cu);
+		assertSourceContains("@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\"),@QueryHint(name = \"FOO\"), @QueryHint})", cu);
 	}
 	
 	public void testRemoveHint() throws Exception {
@@ -281,12 +282,12 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(0).getName());
 		assertEquals("BAR", namedQuery.hintAt(1).getName());
 		assertEquals(2, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQuery(hints={@QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")})", cu);
+		assertSourceContains("@NamedNativeQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu);
 		
 		namedQuery.removeHint(0);
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals(1, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQuery(hints=@QueryHint(name=\"BAR\", value=\"FOO\"))", cu);
+		assertSourceContains("@NamedNativeQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu);
 		
 	
 		namedQuery.removeHint(0);
@@ -313,7 +314,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		assertNull(namedQuery.hintAt(1).getName());
 		assertEquals("BAZ", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint, @QueryHint(name=\"BAZ\")})", cu);
+		assertSourceContains("@NamedNativeQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")})", cu);
 	}
 	
 	public void testMoveHint2() throws Exception {
@@ -334,7 +335,7 @@ public class NamedNativeQueryTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(1).getName());
 		assertEquals("BAR", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedNativeQuery(hints={@QueryHint, @QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")})", cu);
+		assertSourceContains("@NamedNativeQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu);
 	}
 	
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java
index 0bd1f90d19..20796246b3 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueriesTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -59,7 +59,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedQueries(@NamedQuery(" + elementName + "=\"" + value + "\"))");
+				sb.append("@NamedQueries(@NamedQuery(" + elementName + " = \"" + value + "\"))");
 			}
 		});
 	}
@@ -72,7 +72,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedQueries(@NamedQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint}))");
+				sb.append("@NamedQueries(@NamedQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint}))");
 			}
 		});
 	}
@@ -86,7 +86,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedQuery(name=\"foo\", query=\"bar\", hints=@QueryHint(name=\"BAR\", value=\"FOO\"))");
+				sb.append("@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"))");
 			}
 		});
 	}
@@ -120,7 +120,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setName("foo");
 		assertEquals("foo", namedQuery.getName());
 		
-		assertSourceContains("@NamedQuery(name=\"foo\")", cu);
+		assertSourceContains("@NamedQuery(name = \"foo\")", cu);
 		
 		namedQuery.setName(null);
 		assertNull(namedQuery.getName());
@@ -148,7 +148,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		namedQuery.setQuery("foo");
 		assertEquals("foo", namedQuery.getQuery());
 		
-		assertSourceContains("@NamedQuery(query=\"foo\")", cu);
+		assertSourceContains("@NamedQuery(query = \"foo\")", cu);
 		
 		namedQuery.setQuery(null);
 		assertNull(namedQuery.getQuery());
@@ -204,7 +204,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", namedQuery.hintAt(1).getName());
 		assertNull(namedQuery.hintAt(2).getName());
 
-		assertSourceContains("@NamedQuery(hints={@QueryHint(name=\"BAR\"),@QueryHint(name=\"FOO\"), @QueryHint})", cu);
+		assertSourceContains("@NamedQuery(hints = {@QueryHint(name = \"BAR\"),@QueryHint(name = \"FOO\"), @QueryHint})", cu);
 	}
 	
 	public void testRemoveHint() throws Exception {
@@ -224,12 +224,12 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(0).getName());
 		assertEquals("BAR", namedQuery.hintAt(1).getName());
 		assertEquals(2, namedQuery.hintsSize());
-		assertSourceContains("@NamedQueries(@NamedQuery(hints={@QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")}))", cu);
+		assertSourceContains("@NamedQueries(@NamedQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu);
 		
 		namedQuery.removeHint(0);
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals(1, namedQuery.hintsSize());
-		assertSourceContains("@NamedQueries(@NamedQuery(hints=@QueryHint(name=\"BAR\", value=\"FOO\")))", cu);
+		assertSourceContains("@NamedQueries(@NamedQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\")))", cu);
 		
 		namedQuery.removeHint(0);
 		assertEquals(0, namedQuery.hintsSize());
@@ -255,7 +255,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		assertNull(namedQuery.hintAt(1).getName());
 		assertEquals("BAZ", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedQueries(@NamedQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint, @QueryHint(name=\"BAZ\")}))", cu);
+		assertSourceContains("@NamedQueries(@NamedQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")}))", cu);
 	}
 	
 	public void testMoveHint2() throws Exception {
@@ -277,7 +277,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(1).getName());
 		assertEquals("BAR", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedQueries(@NamedQuery(hints={@QueryHint, @QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")}))", cu);
+		assertSourceContains("@NamedQueries(@NamedQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")}))", cu);
 	}
 	
 	public void testAddNamedQueryCopyExisting() throws Exception {
@@ -286,7 +286,7 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		
 		NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES);
 		namedQuery.setName("BAR");
-		assertSourceContains("@NamedQueries({@NamedQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\")),@NamedQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.NAMED_QUERY));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.NAMED_QUERIES));
@@ -299,12 +299,12 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		
 		NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES);
 		namedQuery.setName("BAR");
-		assertSourceContains("@NamedQueries({@NamedQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\")),@NamedQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu);
 		
 		
 		namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(0, JPA.NAMED_QUERY, JPA.NAMED_QUERIES);
 		namedQuery.setName("BAZ");
-		assertSourceContains("@NamedQueries({@NamedQuery(name=\"BAZ\"),@NamedQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\")), @NamedQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedQueries({@NamedQuery(name = \"BAZ\"),@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")), @NamedQuery(name = \"BAR\")})", cu);
 
 		Iterator<NestableAnnotation> namedQueries = typeResource.supportingAnnotations(JPA.NAMED_QUERY, JPA.NAMED_QUERIES);
 		assertEquals("BAZ", ((NamedQueryAnnotation) namedQueries.next()).getName());
@@ -322,10 +322,10 @@ public class NamedQueriesTests extends JavaResourceModelTestCase {
 		
 		NamedQueryAnnotation namedQuery = (NamedQueryAnnotation) typeResource.addSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES);
 		namedQuery.setName("BAR");
-		assertSourceContains("@NamedQueries({@NamedQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\")),@NamedQuery(name=\"BAR\")})", cu);
+		assertSourceContains("@NamedQueries({@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\")),@NamedQuery(name = \"BAR\")})", cu);
 		
 		typeResource.removeSupportingAnnotation(1, JPA.NAMED_QUERY, JPA.NAMED_QUERIES);
-		assertSourceContains("@NamedQuery(name=\"foo\", query = \"bar\", hints = @QueryHint(name=\"BAR\", value = \"FOO\"))", cu);
+		assertSourceContains("@NamedQuery(name = \"foo\", query = \"bar\", hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu);
 	}
 	
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java
index dd04b381bf..520c3c6425 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/NamedQueryTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
 import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class NamedQueryTests extends JavaResourceModelTestCase {
 
 	private static final String QUERY_NAME = "myQuery";
@@ -56,7 +57,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedQuery(" + elementName + "=\"" + value + "\")");
+				sb.append("@NamedQuery(" + elementName + " = \"" + value + "\")");
 			}
 		});
 	}
@@ -69,7 +70,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint})");
+				sb.append("@NamedQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint})");
 			}
 		});
 	}
@@ -100,7 +101,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setName("foo");
 		assertEquals("foo", namedQuery.getName());
 		
-		assertSourceContains("@NamedQuery(name=\"foo\")", cu);
+		assertSourceContains("@NamedQuery(name = \"foo\")", cu);
 		
 		namedQuery.setName(null);
 		assertNull(namedQuery.getName());
@@ -126,7 +127,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 		namedQuery.setQuery("foo");
 		assertEquals("foo", namedQuery.getQuery());
 		
-		assertSourceContains("@NamedQuery(query=\"foo\")", cu);
+		assertSourceContains("@NamedQuery(query = \"foo\")", cu);
 		
 		namedQuery.setQuery(null);
 		assertNull(namedQuery.getQuery());
@@ -182,7 +183,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals("FOO", namedQuery.hintAt(1).getName());
 		assertNull(namedQuery.hintAt(2).getName());
-		assertSourceContains("@NamedQuery(hints={@QueryHint(name=\"BAR\"),@QueryHint(name=\"FOO\"), @QueryHint})", cu);
+		assertSourceContains("@NamedQuery(hints = {@QueryHint(name = \"BAR\"),@QueryHint(name = \"FOO\"), @QueryHint})", cu);
 	}
 	
 	public void testRemoveHint() throws Exception {
@@ -201,12 +202,12 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(0).getName());
 		assertEquals("BAR", namedQuery.hintAt(1).getName());
 		assertEquals(2, namedQuery.hintsSize());
-		assertSourceContains("@NamedQuery(hints={@QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")})", cu);
+		assertSourceContains("@NamedQuery(hints = {@QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu);
 		
 		namedQuery.removeHint(0);
 		assertEquals("BAR", namedQuery.hintAt(0).getName());
 		assertEquals(1, namedQuery.hintsSize());
-		assertSourceContains("@NamedQuery(hints=@QueryHint(name=\"BAR\", value=\"FOO\"))", cu);
+		assertSourceContains("@NamedQuery(hints = @QueryHint(name = \"BAR\", value = \"FOO\"))", cu);
 		
 		namedQuery.removeHint(0);
 		assertEquals(0, namedQuery.hintsSize());
@@ -231,7 +232,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 		assertNull(namedQuery.hintAt(1).getName());
 		assertEquals("BAZ", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedQuery(hints={@QueryHint(name=\"BAR\", value=\"FOO\"), @QueryHint, @QueryHint(name=\"BAZ\")})", cu);
+		assertSourceContains("@NamedQuery(hints = {@QueryHint(name = \"BAR\", value = \"FOO\"), @QueryHint, @QueryHint(name = \"BAZ\")})", cu);
 	}
 	
 	public void testMoveHint2() throws Exception {
@@ -252,7 +253,7 @@ public class NamedQueryTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", namedQuery.hintAt(1).getName());
 		assertEquals("BAR", namedQuery.hintAt(2).getName());
 		assertEquals(3, namedQuery.hintsSize());
-		assertSourceContains("@NamedQuery(hints={@QueryHint, @QueryHint(name=\"BAZ\"), @QueryHint(name=\"BAR\", value=\"FOO\")})", cu);
+		assertSourceContains("@NamedQuery(hints = {@QueryHint, @QueryHint(name = \"BAZ\"), @QueryHint(name = \"BAR\", value = \"FOO\")})", cu);
 	}
 	
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java
index fa348fc10e..697f8e7d2f 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToManyTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.OneToManyAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OneToManyTests extends JavaResourceModelTestCase {
 	
 	public OneToManyTests(String name) {
@@ -45,7 +46,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToMany(fetch=FetchType.EAGER)");
+				sb.append("@OneToMany(fetch = FetchType.EAGER)");
 			}
 		});
 	}
@@ -58,7 +59,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToMany(targetEntity=AnnotationTestType.class)");
+				sb.append("@OneToMany(targetEntity = AnnotationTestType.class)");
 			}
 		});
 	}
@@ -71,7 +72,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToMany(mappedBy=\"foo\")");
+				sb.append("@OneToMany(mappedBy = \"foo\")");
 			}
 		});
 	}
@@ -84,7 +85,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToMany(cascade=CascadeType.ALL)");
+				sb.append("@OneToMany(cascade = CascadeType.ALL)");
 			}
 		});
 	}
@@ -97,7 +98,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToMany(cascade={CascadeType.MERGE, CascadeType.REMOVE})");
+				sb.append("@OneToMany(cascade = {CascadeType.MERGE, CascadeType.REMOVE})");
 			}
 		});
 	}
@@ -110,7 +111,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToMany(cascade={CascadeType.MERGE, CascadeType.MERGE})");
+				sb.append("@OneToMany(cascade = {CascadeType.MERGE, CascadeType.MERGE})");
 			}
 		});
 	}
@@ -144,7 +145,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		oneToMany.setFetch(FetchType.LAZY);
 		assertEquals(FetchType.LAZY, oneToMany.getFetch());
 		
-		assertSourceContains("@OneToMany(fetch=LAZY)", cu);
+		assertSourceContains("@OneToMany(fetch = LAZY)", cu);
 	}
 	
 	public void testSetFetchNull() throws Exception {
@@ -182,7 +183,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		
 		oneToMany.setTargetEntity("Foo");
 		
-		assertSourceContains("@OneToMany(targetEntity=Foo.class)", cu);
+		assertSourceContains("@OneToMany(targetEntity = Foo.class)", cu);
 	}
 	
 	public void testSetTargetEntityNull() throws Exception {
@@ -210,7 +211,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		
 		oneToMany.setTargetEntity("Foo");
 		
-		assertSourceContains("@OneToMany(targetEntity=Foo.class)", cu);
+		assertSourceContains("@OneToMany(targetEntity = Foo.class)", cu);
 		
 		assertEquals("Foo", oneToMany.getTargetEntity());
 		
@@ -246,7 +247,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		oneToMany.setMappedBy("bar");
 		assertEquals("bar", oneToMany.getMappedBy());
 		
-		assertSourceContains("@OneToMany(mappedBy=\"bar\")", cu);
+		assertSourceContains("@OneToMany(mappedBy = \"bar\")", cu);
 	}
 	
 	public void testSetMappedByNull() throws Exception {
@@ -273,7 +274,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		assertFalse(oneToMany.isCascadeAll());
 	
 		oneToMany.setCascadeAll(true);
-		assertSourceContains("@OneToMany(cascade=ALL)", cu);
+		assertSourceContains("@OneToMany(cascade = ALL)", cu);
 		
 		assertTrue(oneToMany.isCascadeAll());
 	}
@@ -287,7 +288,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		assertFalse(oneToMany.isCascadeMerge());
 	
 		oneToMany.setCascadeMerge(true);
-		assertSourceContains("@OneToMany(cascade=MERGE)", cu);
+		assertSourceContains("@OneToMany(cascade = MERGE)", cu);
 		
 		assertTrue(oneToMany.isCascadeMerge());
 	}
@@ -301,7 +302,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		assertFalse(oneToMany.isCascadePersist());
 	
 		oneToMany.setCascadePersist(true);
-		assertSourceContains("@OneToMany(cascade=PERSIST)", cu);
+		assertSourceContains("@OneToMany(cascade = PERSIST)", cu);
 		
 		assertTrue(oneToMany.isCascadePersist());
 	}
@@ -315,7 +316,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		assertFalse(oneToMany.isCascadeRemove());
 	
 		oneToMany.setCascadeRemove(true);
-		assertSourceContains("@OneToMany(cascade=REMOVE)", cu);
+		assertSourceContains("@OneToMany(cascade = REMOVE)", cu);
 		
 		assertTrue(oneToMany.isCascadeRemove());
 	}
@@ -329,7 +330,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		assertFalse(oneToMany.isCascadeRefresh());
 	
 		oneToMany.setCascadeRefresh(true);
-		assertSourceContains("@OneToMany(cascade=REFRESH)", cu);
+		assertSourceContains("@OneToMany(cascade = REFRESH)", cu);
 		
 		assertTrue(oneToMany.isCascadeRefresh());
 	}
@@ -345,7 +346,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		oneToMany.setCascadeAll(true);
 		assertTrue(oneToMany.isCascadeAll());
 		//a second CascadeType.All should not have been added
-		assertSourceContains("@OneToMany(cascade=CascadeType.ALL)", cu);
+		assertSourceContains("@OneToMany(cascade = CascadeType.ALL)", cu);
 		
 		oneToMany.setCascadeAll(false);
 		assertFalse(oneToMany.isCascadeAll());
@@ -387,7 +388,7 @@ public class OneToManyTests extends JavaResourceModelTestCase {
 		assertTrue(oneToMany.isCascadeRemove());
 		
 		oneToMany.setCascadeMerge(false);
-		assertSourceContains("@OneToMany(cascade=REMOVE)", cu);
+		assertSourceContains("@OneToMany(cascade = REMOVE)", cu);
 		
 		oneToMany.setCascadeRemove(false);		
 		assertSourceDoesNotContain("cascade", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java
index c671e4f25a..3f8683dcb6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OneToOneTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.OneToOneAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OneToOneTests extends JavaResourceModelTestCase {
 	
 	public OneToOneTests(String name) {
@@ -45,7 +46,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(fetch=FetchType.EAGER)");
+				sb.append("@OneToOne(fetch = FetchType.EAGER)");
 			}
 		});
 	}
@@ -58,7 +59,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(targetEntity=AnnotationTestType.class)");
+				sb.append("@OneToOne(targetEntity = AnnotationTestType.class)");
 			}
 		});
 	}
@@ -71,7 +72,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(optional=true)");
+				sb.append("@OneToOne(optional = true)");
 			}
 		});
 	}
@@ -84,7 +85,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(mappedBy=\"foo\")");
+				sb.append("@OneToOne(mappedBy = \"foo\")");
 			}
 		});
 	}
@@ -97,7 +98,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(cascade=CascadeType.ALL)");
+				sb.append("@OneToOne(cascade = CascadeType.ALL)");
 			}
 		});
 	}
@@ -110,7 +111,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(cascade={CascadeType.MERGE, CascadeType.REMOVE})");
+				sb.append("@OneToOne(cascade = {CascadeType.MERGE, CascadeType.REMOVE})");
 			}
 		});
 	}
@@ -123,7 +124,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OneToOne(cascade={CascadeType.MERGE, CascadeType.MERGE})");
+				sb.append("@OneToOne(cascade = {CascadeType.MERGE, CascadeType.MERGE})");
 			}
 		});
 	}
@@ -157,7 +158,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		oneToOne.setFetch(FetchType.LAZY);
 		assertEquals(FetchType.LAZY, oneToOne.getFetch());
 		
-		assertSourceContains("@OneToOne(fetch=LAZY)", cu);
+		assertSourceContains("@OneToOne(fetch = LAZY)", cu);
 	}
 	
 	public void testSetFetchNull() throws Exception {
@@ -195,7 +196,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		
 		oneToOne.setTargetEntity("Foo");
 		
-		assertSourceContains("@OneToOne(targetEntity=Foo.class)", cu);
+		assertSourceContains("@OneToOne(targetEntity = Foo.class)", cu);
 	}
 	
 	public void testSetTargetEntityNull() throws Exception {
@@ -223,7 +224,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		
 		oneToOne.setTargetEntity("Foo");
 		
-		assertSourceContains("@OneToOne(targetEntity=Foo.class)", cu);
+		assertSourceContains("@OneToOne(targetEntity = Foo.class)", cu);
 		
 		assertEquals("Foo", oneToOne.getTargetEntity());
 		
@@ -250,7 +251,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		oneToOne.setOptional(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, oneToOne.getOptional());
 		
-		assertSourceContains("@OneToOne(optional=false)", cu);
+		assertSourceContains("@OneToOne(optional = false)", cu);
 	}
 	
 	public void testSetOptionalNull() throws Exception {
@@ -296,7 +297,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		oneToOne.setMappedBy("bar");
 		assertEquals("bar", oneToOne.getMappedBy());
 		
-		assertSourceContains("@OneToOne(mappedBy=\"bar\")", cu);
+		assertSourceContains("@OneToOne(mappedBy = \"bar\")", cu);
 	}
 	
 	public void testSetMappedByNull() throws Exception {
@@ -323,7 +324,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		assertFalse(oneToOne.isCascadeAll());
 	
 		oneToOne.setCascadeAll(true);
-		assertSourceContains("@OneToOne(cascade=ALL)", cu);
+		assertSourceContains("@OneToOne(cascade = ALL)", cu);
 		
 		assertTrue(oneToOne.isCascadeAll());
 	}
@@ -337,7 +338,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		assertFalse(oneToOne.isCascadeMerge());
 	
 		oneToOne.setCascadeMerge(true);
-		assertSourceContains("@OneToOne(cascade=MERGE)", cu);
+		assertSourceContains("@OneToOne(cascade = MERGE)", cu);
 		
 		assertTrue(oneToOne.isCascadeMerge());
 	}
@@ -351,7 +352,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		assertFalse(oneToOne.isCascadePersist());
 	
 		oneToOne.setCascadePersist(true);
-		assertSourceContains("@OneToOne(cascade=PERSIST)", cu);
+		assertSourceContains("@OneToOne(cascade = PERSIST)", cu);
 		
 		assertTrue(oneToOne.isCascadePersist());
 	}
@@ -365,7 +366,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		assertFalse(oneToOne.isCascadeRemove());
 	
 		oneToOne.setCascadeRemove(true);
-		assertSourceContains("@OneToOne(cascade=REMOVE)", cu);
+		assertSourceContains("@OneToOne(cascade = REMOVE)", cu);
 		
 		assertTrue(oneToOne.isCascadeRemove());
 	}
@@ -379,7 +380,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		assertFalse(oneToOne.isCascadeRefresh());
 	
 		oneToOne.setCascadeRefresh(true);
-		assertSourceContains("@OneToOne(cascade=REFRESH)", cu);
+		assertSourceContains("@OneToOne(cascade = REFRESH)", cu);
 		
 		assertTrue(oneToOne.isCascadeRefresh());
 	}
@@ -395,7 +396,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		oneToOne.setCascadeAll(true);
 		assertTrue(oneToOne.isCascadeAll());
 		//a second CascadeType.All should not have been added
-		assertSourceContains("@OneToOne(cascade=CascadeType.ALL)", cu);
+		assertSourceContains("@OneToOne(cascade = CascadeType.ALL)", cu);
 		
 		oneToOne.setCascadeAll(false);
 		assertFalse(oneToOne.isCascadeAll());
@@ -437,7 +438,7 @@ public class OneToOneTests extends JavaResourceModelTestCase {
 		assertTrue(oneToOne.isCascadeRemove());
 		
 		oneToOne.setCascadeMerge(false);
-		assertSourceContains("@OneToOne(cascade=REMOVE)", cu);
+		assertSourceContains("@OneToOne(cascade = REMOVE)", cu);
 		
 		oneToOne.setCascadeRemove(false);		
 		assertSourceDoesNotContain("cascade", cu);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java
index 61c727e0c4..55120e4a94 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/OrderByTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.OrderByAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class OrderByTests extends JavaResourceModelTestCase {
 
 	public OrderByTests(String name) {
@@ -44,7 +45,7 @@ public class OrderByTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@OrderBy(value=\"key\")");
+				sb.append("@OrderBy(value = \"key\")");
 			}
 		});
 	}
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java
index c83b997017..025e347a3f 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 	
 	private static final String COLUMN_NAME = "MY_COLUMN";
@@ -48,7 +49,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumn(name=\"" + COLUMN_NAME + "\")");
+				sb.append("@PrimaryKeyJoinColumn(name = \"" + COLUMN_NAME + "\")");
 			}
 		});
 	}
@@ -61,7 +62,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumn(referencedColumnName=\"" + COLUMN_REFERENCED_COLUMN_NAME + "\")");
+				sb.append("@PrimaryKeyJoinColumn(referencedColumnName = \"" + COLUMN_REFERENCED_COLUMN_NAME + "\")");
 			}
 		});
 	}
@@ -74,7 +75,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumn(columnDefinition=\"" + COLUMN_COLUMN_DEFINITION + "\")");
+				sb.append("@PrimaryKeyJoinColumn(columnDefinition = \"" + COLUMN_COLUMN_DEFINITION + "\")");
 			}
 		});
 	}
@@ -110,7 +111,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 		column.setName("Foo");
 		assertEquals("Foo", column.getName());
 		
-		assertSourceContains("@PrimaryKeyJoinColumn(name=\"Foo\")", cu);
+		assertSourceContains("@PrimaryKeyJoinColumn(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -149,7 +150,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 		column.setReferencedColumnName("Foo");
 		assertEquals("Foo", column.getReferencedColumnName());
 		
-		assertSourceContains("@PrimaryKeyJoinColumn(referencedColumnName=\"Foo\")", cu);
+		assertSourceContains("@PrimaryKeyJoinColumn(referencedColumnName = \"Foo\")", cu);
 
 		
 		column.setReferencedColumnName(null);
@@ -176,7 +177,7 @@ public class PrimaryKeyJoinColumnTests extends JavaResourceModelTestCase {
 		column.setColumnDefinition("Foo");
 		assertEquals("Foo", column.getColumnDefinition());
 		
-		assertSourceContains("@PrimaryKeyJoinColumn(columnDefinition=\"Foo\")", cu);
+		assertSourceContains("@PrimaryKeyJoinColumn(columnDefinition = \"Foo\")", cu);
 
 		
 		column.setColumnDefinition(null);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java
index 06b6b524c3..1e01f24d38 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/PrimaryKeyJoinColumnsTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -52,7 +52,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(name=\"" + COLUMN_NAME + "\"))");
+				sb.append("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(name = \"" + COLUMN_NAME + "\"))");
 			}
 		});
 	}
@@ -65,7 +65,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(referencedColumnName=\"" + COLUMN_REFERENCED_COLUMN_NAME + "\"))");
+				sb.append("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(referencedColumnName = \"" + COLUMN_REFERENCED_COLUMN_NAME + "\"))");
 			}
 		});
 	}
@@ -78,7 +78,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(columnDefinition=\"" + COLUMN_COLUMN_DEFINITION + "\"))");
+				sb.append("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(columnDefinition = \"" + COLUMN_COLUMN_DEFINITION + "\"))");
 			}
 		});
 	}
@@ -91,7 +91,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@PrimaryKeyJoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")");
+				sb.append("@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")");
 			}
 		});
 	}
@@ -128,7 +128,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 		column.setName("Foo");
 		assertEquals("Foo", column.getName());
 		
-		assertSourceContains("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(name=\"Foo\"))", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(name = \"Foo\"))", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -165,7 +165,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 		column.setReferencedColumnName("Foo");
 		assertEquals("Foo", column.getReferencedColumnName());
 		
-		assertSourceContains("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(referencedColumnName=\"Foo\"))", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(referencedColumnName = \"Foo\"))", cu);
 
 		
 		column.setReferencedColumnName(null);
@@ -192,7 +192,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 		column.setColumnDefinition("Foo");
 		assertEquals("Foo", column.getColumnDefinition());
 		
-		assertSourceContains("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(columnDefinition=\"Foo\"))", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns(@PrimaryKeyJoinColumn(columnDefinition = \"Foo\"))", cu);
 
 		
 		column.setColumnDefinition(null);
@@ -207,7 +207,7 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 		
 		PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS);
 		joinColumn.setName("FOO");
-		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu);
 		
 		assertNull(attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMN));
 		assertNotNull(attributeResource.getSupportingAnnotation(JPA.PRIMARY_KEY_JOIN_COLUMNS));
@@ -220,11 +220,11 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 		
 		PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS);
 		joinColumn.setName("FOO");
-		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu);
 		
 		joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(0, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS);
 		joinColumn.setName("BAZ");
-		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name=\"BAZ\"),@PrimaryKeyJoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"), @PrimaryKeyJoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAZ\"),@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"), @PrimaryKeyJoinColumn(name = \"FOO\")})", cu);
 
 		Iterator<NestableAnnotation> pkJoinColumns = attributeResource.supportingAnnotations(JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS);
 		assertEquals("BAZ", ((PrimaryKeyJoinColumnAnnotation) pkJoinColumns.next()).getName());
@@ -243,10 +243,10 @@ public class PrimaryKeyJoinColumnsTests extends JavaResourceModelTestCase {
 		
 		PrimaryKeyJoinColumnAnnotation joinColumn = (PrimaryKeyJoinColumnAnnotation) attributeResource.addSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS);
 		joinColumn.setName("FOO");
-		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@PrimaryKeyJoinColumns({@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\"),@PrimaryKeyJoinColumn(name = \"FOO\")})", cu);
 		
 		attributeResource.removeSupportingAnnotation(1, JPA.PRIMARY_KEY_JOIN_COLUMN, JPA.PRIMARY_KEY_JOIN_COLUMNS);
-		assertSourceContains("@PrimaryKeyJoinColumn(name=\"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")", cu);
+		assertSourceContains("@PrimaryKeyJoinColumn(name = \"BAR\", columnDefinition = \"COLUMN_DEF\", referencedColumnName = \"REF_NAME\")", cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java
index 33e1eae121..b522972feb 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/QueryHintTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation;
 import org.eclipse.jpt.core.resource.java.QueryHintAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class QueryHintTests extends JavaResourceModelTestCase {
 
 	private static final String QUERY_HINT_NAME = "myHint";
@@ -34,7 +35,7 @@ public class QueryHintTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@NamedQuery(hints={@QueryHint(name=\"" + QUERY_HINT_NAME + "\", value=\"" + QUERY_HINT_VALUE + "\"), @QueryHint})");
+				sb.append("@NamedQuery(hints = {@QueryHint(name = \"" + QUERY_HINT_NAME + "\", value = \"" + QUERY_HINT_VALUE + "\"), @QueryHint})");
 			}
 		});
 	}
@@ -59,6 +60,6 @@ public class QueryHintTests extends JavaResourceModelTestCase {
 		queryHint.setName("foo");
 		assertEquals("foo", queryHint.getName());
 		
-		assertSourceContains("@QueryHint(name=\"foo\", value=\"" + QUERY_HINT_VALUE + "\")", cu);
+		assertSourceContains("@QueryHint(name = \"foo\", value = \"" + QUERY_HINT_VALUE + "\")", cu);
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java
index 63ec66b916..357596a1f6 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTableTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation;
 import org.eclipse.jpt.core.resource.java.UniqueConstraintAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class SecondaryTableTests extends JavaResourceModelTestCase {
 	
 	private static final String TABLE_NAME = "MY_TABLE";
@@ -49,7 +50,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTable(name=\"" + TABLE_NAME + "\")");
+				sb.append("@SecondaryTable(name = \"" + TABLE_NAME + "\")");
 			}
 		});
 	}
@@ -62,7 +63,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTable(schema=\"" + SCHEMA_NAME + "\")");
+				sb.append("@SecondaryTable(schema = \"" + SCHEMA_NAME + "\")");
 			}
 		});
 	}
@@ -75,7 +76,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTable(catalog=\"" + CATALOG_NAME + "\")");
+				sb.append("@SecondaryTable(catalog = \"" + CATALOG_NAME + "\")");
 			}
 		});
 	}
@@ -88,7 +89,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"})})");
+				sb.append("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})");
 			}
 		});
 	}
@@ -101,7 +102,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAR\"), @PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn(name=\"BAZ\")})");
+				sb.append("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn(name = \"BAZ\")})");
 			}
 		});
 	}
@@ -137,7 +138,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		table.setName("Foo");
 		assertEquals("Foo", table.getName());
 		
-		assertSourceContains("@SecondaryTable(name=\"Foo\")", cu);
+		assertSourceContains("@SecondaryTable(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -173,7 +174,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		table.setCatalog("Foo");
 		assertEquals("Foo", table.getCatalog());
 		
-		assertSourceContains("@SecondaryTable(catalog=\"Foo\")", cu);
+		assertSourceContains("@SecondaryTable(catalog = \"Foo\")", cu);
 	}
 	
 	public void testSetCatalogNull() throws Exception {
@@ -209,7 +210,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		table.setSchema("Foo");
 		assertEquals("Foo", table.getSchema());
 		
-		assertSourceContains("@SecondaryTable(schema=\"Foo\")", cu);
+		assertSourceContains("@SecondaryTable(schema = \"Foo\")", cu);
 	}
 	
 	public void testSetSchemaNull() throws Exception {
@@ -266,7 +267,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next());
 		assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize());
 
-		assertSourceContains("@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames=\"BAR\"),@UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint})", cu);
+		assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu);
 	}
 	
 	public void testRemoveUniqueConstraint() throws Exception {
@@ -279,13 +280,13 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", uniqueConstraints.next().columnNames().next());
 		assertEquals("BAZ", uniqueConstraints.next().columnNames().next());
 		assertFalse(uniqueConstraints.hasNext());
-		assertSourceContains("@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"BAZ\"})})", cu);
+		assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu);
 		
 		table.removeUniqueConstraint(0);
 		uniqueConstraints = table.uniqueConstraints();
 		assertEquals("BAZ", uniqueConstraints.next().columnNames().next());
 		assertFalse(uniqueConstraints.hasNext());
-		assertSourceContains("@SecondaryTable(uniqueConstraints=@UniqueConstraint(columnNames={\"BAZ\"}))", cu);
+		assertSourceContains("@SecondaryTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu);
 		
 		table.removeUniqueConstraint(0);
 		uniqueConstraints = table.uniqueConstraints();
@@ -308,7 +309,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAZ", secondaryTable.uniqueConstraintAt(1).columnNames().next());
 		assertEquals("BAR", secondaryTable.uniqueConstraintAt(2).columnNames().next());
 		assertEquals(3, secondaryTable.uniqueConstraintsSize());
-		assertSourceContains("@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"})})", cu);
+		assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu);
 	}
 	
 	public void testMoveUniqueConstraint2() throws Exception {
@@ -326,7 +327,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", secondaryTable.uniqueConstraintAt(1).columnNames().next());
 		assertEquals("FOO", secondaryTable.uniqueConstraintAt(2).columnNames().next());
 		assertEquals(3, secondaryTable.uniqueConstraintsSize());
-		assertSourceContains("@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"})})", cu);
+		assertSourceContains("@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu);
 	}
 	
 	
@@ -372,7 +373,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", table.pkJoinColumnAt(2).getName());
 
 		assertEquals(3, table.pkJoinColumnsSize());
-		assertSourceContains("@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAR\"),@PrimaryKeyJoinColumn, @PrimaryKeyJoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"),@PrimaryKeyJoinColumn, @PrimaryKeyJoinColumn(name = \"FOO\")})", cu);
 	}
 	
 	public void testRemovePkJoinColumn() throws Exception {
@@ -381,10 +382,10 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE);
 		
 		table.removePkJoinColumn(1);
-		assertSourceContains("@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAR\"), @PrimaryKeyJoinColumn(name=\"BAZ\")})", cu);
+		assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"BAZ\")})", cu);
 
 		table.removePkJoinColumn(0);
-		assertSourceContains("@SecondaryTable(pkJoinColumns=@PrimaryKeyJoinColumn(name=\"BAZ\"))", cu);
+		assertSourceContains("@SecondaryTable(pkJoinColumns = @PrimaryKeyJoinColumn(name = \"BAZ\"))", cu);
 
 		
 		table.removePkJoinColumn(0);
@@ -399,7 +400,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		joinColumn.setReferencedColumnName("REF_NAME");
 		joinColumn.setColumnDefinition("COLUMN_DEF");
 		table.movePkJoinColumn(2, 0);
-		assertSourceContains("@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn(name=\"BAZ\"), @PrimaryKeyJoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\")})", cu);
+		assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn(name = \"BAZ\"), @PrimaryKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\")})", cu);
 	}
 	
 	public void testMovePkJoinColumn2() throws Exception {
@@ -412,7 +413,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		joinColumn.setReferencedColumnName("REF_NAME");
 		joinColumn.setColumnDefinition("COLUMN_DEF");
 		table.movePkJoinColumn(0, 2);
-		assertSourceContains("@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAZ\"), @PrimaryKeyJoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\"), @PrimaryKeyJoinColumn(name=\"FOO\")})", cu);
+		assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAZ\"), @PrimaryKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\"), @PrimaryKeyJoinColumn(name = \"FOO\")})", cu);
 	}
 	
 	public void testSetPkJoinColumnName() throws Exception {
@@ -429,7 +430,7 @@ public class SecondaryTableTests extends JavaResourceModelTestCase {
 		joinColumn.setName("foo");
 		assertEquals("foo", joinColumn.getName());
 		
-		assertSourceContains("@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"foo\"), @PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn(name=\"BAZ\")})", cu);
+		assertSourceContains("@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"foo\"), @PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn(name = \"BAZ\")})", cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java
index 85d4c937ac..7f059230c0 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SecondaryTablesTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -53,7 +53,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTables(@SecondaryTable(name=\"" + TABLE_NAME + "\"))");
+				sb.append("@SecondaryTables(@SecondaryTable(name = \"" + TABLE_NAME + "\"))");
 			}
 		});
 	}
@@ -66,7 +66,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTables(@SecondaryTable(schema=\"" + SCHEMA_NAME + "\"))");
+				sb.append("@SecondaryTables(@SecondaryTable(schema = \"" + SCHEMA_NAME + "\"))");
 			}
 		});
 	}
@@ -78,7 +78,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTables(@SecondaryTable(catalog=\"" + CATALOG_NAME + "\"))");
+				sb.append("@SecondaryTables(@SecondaryTable(catalog = \"" + CATALOG_NAME + "\"))");
 			}
 		});
 	}
@@ -92,7 +92,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTables(@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint}))");
+				sb.append("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint}))");
 			}
 		});
 	}
@@ -107,7 +107,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 			public void appendTypeAnnotationTo(StringBuilder sb) {
 				sb.append("@Entity");
 				sb.append(CR);
-				sb.append("@SecondaryTable(name=\"FOO\", catalog=\"BAR\", schema=\"BAZ\", uniqueConstraints=@UniqueConstraint(columnNames={\"BAR\"}))");
+				sb.append("@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = {\"BAR\"}))");
 			}
 		});
 	}
@@ -120,7 +120,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@SecondaryTables(@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAR\"), @PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn(name=\"BAZ\")}))");
+				sb.append("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn(name = \"BAZ\")}))");
 			}
 		});
 	}
@@ -161,7 +161,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		secondaryTable.setName("Foo");
 		assertEquals("Foo", secondaryTable.getName());
 		
-		assertSourceContains("@SecondaryTables(@SecondaryTable(name=\"Foo\"))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(name = \"Foo\"))", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -198,7 +198,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		secondaryTable.setCatalog("Foo");
 		assertEquals("Foo", secondaryTable.getCatalog());
 		
-		assertSourceContains("@SecondaryTables(@SecondaryTable(catalog=\"Foo\"))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(catalog = \"Foo\"))", cu);
 	}
 	
 	public void testSetCatalogNull() throws Exception {
@@ -236,7 +236,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		secondaryTable.setSchema("Foo");
 		assertEquals("Foo", secondaryTable.getSchema());
 		
-		assertSourceContains("@SecondaryTables(@SecondaryTable(schema=\"Foo\"))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(schema = \"Foo\"))", cu);
 	}
 	
 	public void testSetSchemaNull() throws Exception {
@@ -298,7 +298,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next());
 		assertEquals(0, secondaryTable.uniqueConstraintAt(2).columnNamesSize());
 
-		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames=\"BAR\"),@UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint}))", cu);
 	}
 	
 	public void testRemoveUniqueConstraint() throws Exception {
@@ -309,10 +309,10 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		secondaryTable.addUniqueConstraint(0).addColumnName("FOO");
 		
 		secondaryTable.removeUniqueConstraint(2);
-		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint(columnNames={\"BAR\"})})", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint(columnNames = {\"BAR\"})})", cu);
 		
 		secondaryTable.removeUniqueConstraint(0);
-		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints=@UniqueConstraint(columnNames={\"BAR\"}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAR\"}))", cu);
 		
 		secondaryTable.removeUniqueConstraint(0);
 		assertSourceDoesNotContain("@SecondaryTable", cu);
@@ -333,7 +333,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		assertEquals("BAR", secondaryTable.uniqueConstraintAt(0).columnNames().next());
 		assertFalse(secondaryTable.uniqueConstraintAt(1).columnNames().hasNext());
 		assertEquals("FOO", secondaryTable.uniqueConstraintAt(2).columnNames().next());
-		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint, @UniqueConstraint(columnNames=\"FOO\")}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint, @UniqueConstraint(columnNames = \"FOO\")}))", cu);
 	}
 	
 	public void testMoveUniqueConstraint2() throws Exception {
@@ -351,7 +351,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		assertFalse(secondaryTable.uniqueConstraintAt(0).columnNames().hasNext());
 		assertEquals("FOO", secondaryTable.uniqueConstraintAt(1).columnNames().next());
 		assertEquals("BAR", secondaryTable.uniqueConstraintAt(2).columnNames().next());
-		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints={@UniqueConstraint, @UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint(columnNames={\"BAR\"})}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(uniqueConstraints = {@UniqueConstraint, @UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint(columnNames = {\"BAR\"})}))", cu);
 	}
 	
 	
@@ -363,7 +363,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTable.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames=\"BAR\")),@SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu);
 		
 		assertNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLE));
 		assertNotNull(typeResource.getSupportingAnnotation(JPA.SECONDARY_TABLES));
@@ -376,11 +376,11 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTable.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames=\"BAR\")),@SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu);
 		
 		secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(0, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTable.setName("BAZ");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"BAZ\"),@SecondaryTable(name=\"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames=\"BAR\")), @SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"BAZ\"),@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")), @SecondaryTable(name = \"BAR\")})", cu);
 
 		Iterator<NestableAnnotation> secondaryTables = typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		assertEquals("BAZ", ((SecondaryTableAnnotation) secondaryTables.next()).getName());
@@ -398,10 +398,10 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		
 		SecondaryTableAnnotation secondaryTable = (SecondaryTableAnnotation) typeResource.addSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
 		secondaryTable.setName("BAR");
-		assertSourceContains("@SecondaryTables({@SecondaryTable(name=\"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames=\"BAR\")),@SecondaryTable(name=\"BAR\")})", cu);
+		assertSourceContains("@SecondaryTables({@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\")),@SecondaryTable(name = \"BAR\")})", cu);
 		
 		typeResource.removeSupportingAnnotation(1, JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES);
-		assertSourceContains("@SecondaryTable(name=\"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames=\"BAR\"))", cu);
+		assertSourceContains("@SecondaryTable(name = \"FOO\", catalog = \"BAR\", schema = \"BAZ\", uniqueConstraints = @UniqueConstraint(columnNames = \"BAR\"))", cu);
 	}
 
 	
@@ -441,7 +441,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		table.addPkJoinColumn(1);
 		table.addPkJoinColumn(0).setName("BAR");
 
-		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAR\"),@PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"),@PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn}))", cu);
 	}
 	
 	public void testRemovePkJoinColumn() throws Exception {
@@ -450,10 +450,10 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		SecondaryTableAnnotation table = (SecondaryTableAnnotation) typeResource.supportingAnnotations(JPA.SECONDARY_TABLE, JPA.SECONDARY_TABLES).next();
 		
 		table.removePkJoinColumn(1);
-		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAR\"), @PrimaryKeyJoinColumn(name=\"BAZ\")}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAR\"), @PrimaryKeyJoinColumn(name = \"BAZ\")}))", cu);
 
 		table.removePkJoinColumn(0);
-		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns=@PrimaryKeyJoinColumn(name=\"BAZ\")))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = @PrimaryKeyJoinColumn(name = \"BAZ\")))", cu);
 		
 		table.removePkJoinColumn(0);
 		assertSourceDoesNotContain("@SecondaryTable", cu);
@@ -467,7 +467,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		joinColumn.setReferencedColumnName("REF_NAME");
 		joinColumn.setColumnDefinition("COLUMN_DEF");
 		table.movePkJoinColumn(2, 0);
-		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn(name=\"BAZ\"), @PrimaryKeyJoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\")}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn(name = \"BAZ\"), @PrimaryKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\")}))", cu);
 	}
 	
 	public void testMovePkJoinColumn2() throws Exception {
@@ -480,7 +480,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		joinColumn.setReferencedColumnName("REF_NAME");
 		joinColumn.setColumnDefinition("COLUMN_DEF");
 		table.movePkJoinColumn(0, 2);
-		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"BAZ\"), @PrimaryKeyJoinColumn(name=\"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\"), @PrimaryKeyJoinColumn(name=\"FOO\")}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"BAZ\"), @PrimaryKeyJoinColumn(name = \"BAR\", referencedColumnName = \"REF_NAME\", columnDefinition = \"COLUMN_DEF\"), @PrimaryKeyJoinColumn(name = \"FOO\")}))", cu);
 	}
 	
 	public void testSetPkJoinColumnName() throws Exception {
@@ -497,7 +497,7 @@ public class SecondaryTablesTests extends JavaResourceModelTestCase {
 		joinColumn.setName("foo");
 		assertEquals("foo", joinColumn.getName());
 		
-		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns={@PrimaryKeyJoinColumn(name=\"foo\"), @PrimaryKeyJoinColumn(name=\"FOO\"), @PrimaryKeyJoinColumn(name=\"BAZ\")}))", cu);
+		assertSourceContains("@SecondaryTables(@SecondaryTable(pkJoinColumns = {@PrimaryKeyJoinColumn(name = \"foo\"), @PrimaryKeyJoinColumn(name = \"FOO\"), @PrimaryKeyJoinColumn(name = \"BAZ\")}))", cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java
index bff5089003..69287a9a64 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/SequenceGeneratorTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 
 	private static final String GENERATOR_NAME = "MY_GENERATOR";
@@ -69,17 +70,17 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@SequenceGenerator(" + elementName + "=\"" + value + "\")");
+				sb.append("@SequenceGenerator(" + elementName + " = \"" + value + "\")");
 			}
 		});
 	}
 	
 	private ICompilationUnit createTestSequenceGeneratorWithAllocationSize() throws Exception {
-		return createTestSequenceGeneratorWithIntElement("allocationSize", GENERATOR_ALLOCATION_SIZE);
+		return createTestSequenceGeneratorWithIntElement("allocationSize", GENERATOR_ALLOCATION_SIZE.intValue());
 	}
 	
 	private ICompilationUnit createTestSequenceGeneratorWithInitialValue() throws Exception {
-		return createTestSequenceGeneratorWithIntElement("initialValue", GENERATOR_INITIAL_VALUE);
+		return createTestSequenceGeneratorWithIntElement("initialValue", GENERATOR_INITIAL_VALUE.intValue());
 	}
 	
 	private ICompilationUnit createTestSequenceGeneratorWithIntElement(final String elementName, final int value) throws Exception {
@@ -90,7 +91,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@SequenceGenerator(" + elementName + "=" + value + ")");
+				sb.append("@SequenceGenerator(" + elementName + " = " + value + ")");
 			}
 		});
 	}
@@ -132,7 +133,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 		sequenceGenerator.setName("foo");
 		assertEquals("foo", sequenceGenerator.getName());
 		
-		assertSourceContains("@SequenceGenerator(name=\"foo\")", cu);
+		assertSourceContains("@SequenceGenerator(name = \"foo\")", cu);
 		
 		sequenceGenerator.setName(null);
 		assertNull(sequenceGenerator.getName());
@@ -160,7 +161,7 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 		sequenceGenerator.setSequenceName("foo");
 		assertEquals("foo", sequenceGenerator.getSequenceName());
 		
-		assertSourceContains("@SequenceGenerator(sequenceName=\"foo\")", cu);
+		assertSourceContains("@SequenceGenerator(sequenceName = \"foo\")", cu);
 		
 		sequenceGenerator.setSequenceName(null);
 		assertNull(sequenceGenerator.getSequenceName());
@@ -188,14 +189,14 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 		sequenceGenerator.setAllocationSize(Integer.valueOf(500));
 		assertEquals(Integer.valueOf(500), sequenceGenerator.getAllocationSize());
 		
-		assertSourceContains("@SequenceGenerator(allocationSize=500)", cu);
+		assertSourceContains("@SequenceGenerator(allocationSize = 500)", cu);
 		
 		sequenceGenerator.setAllocationSize(null);
 		
 		assertSourceDoesNotContain("@SequenceGenerator", cu);
 
 		sequenceGenerator.setAllocationSize(Integer.valueOf(0));
-		assertSourceContains("@SequenceGenerator(allocationSize=0)", cu);
+		assertSourceContains("@SequenceGenerator(allocationSize = 0)", cu);
 	}
 	
 	public void testGetInitialValue() throws Exception {
@@ -218,13 +219,13 @@ public class SequenceGeneratorTests extends JavaResourceModelTestCase {
 		sequenceGenerator.setInitialValue(Integer.valueOf(500));
 		assertEquals(Integer.valueOf(500), sequenceGenerator.getInitialValue());
 		
-		assertSourceContains("@SequenceGenerator(initialValue=500)", cu);
+		assertSourceContains("@SequenceGenerator(initialValue = 500)", cu);
 		
 		sequenceGenerator.setInitialValue(null);
 		
 		assertSourceDoesNotContain("@SequenceGenerator", cu);
 
 		sequenceGenerator.setInitialValue(Integer.valueOf(0));
-		assertSourceContains("@SequenceGenerator(initialValue=0)", cu);
+		assertSourceContains("@SequenceGenerator(initialValue = 0)", cu);
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java
index 32bfe379c3..c4067dec1c 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableGeneratorTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class TableGeneratorTests extends JavaResourceModelTestCase {
 
 	private static final String GENERATOR_NAME = "MY_GENERATOR";
@@ -94,17 +95,17 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@TableGenerator(" + elementName + "=\"" + value + "\")");
+				sb.append("@TableGenerator(" + elementName + " = \"" + value + "\")");
 			}
 		});
 	}
 	
 	private ICompilationUnit createTestTableGeneratorWithAllocationSize() throws Exception {
-		return createTestTableGeneratorWithIntElement("allocationSize", GENERATOR_ALLOCATION_SIZE);
+		return createTestTableGeneratorWithIntElement("allocationSize", GENERATOR_ALLOCATION_SIZE.intValue());
 	}
 	
 	private ICompilationUnit createTestTableGeneratorWithInitialValue() throws Exception {
-		return createTestTableGeneratorWithIntElement("initialValue", GENERATOR_INITIAL_VALUE);
+		return createTestTableGeneratorWithIntElement("initialValue", GENERATOR_INITIAL_VALUE.intValue());
 	}
 	
 	private ICompilationUnit createTestTableGeneratorWithIntElement(final String elementName, final int value) throws Exception {
@@ -115,7 +116,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@TableGenerator(" + elementName + "=" + value + ")");
+				sb.append("@TableGenerator(" + elementName + " = " + value + ")");
 			}
 		});
 	}
@@ -128,7 +129,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@TableGenerator(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"})})");
+				sb.append("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})");
 			}
 		});
 	}
@@ -170,7 +171,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setName("foo");
 		assertEquals("foo", tableGenerator.getName());
 		
-		assertSourceContains("@TableGenerator(name=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(name = \"foo\")", cu);
 		
 		tableGenerator.setName(null);
 		assertNull(tableGenerator.getName());
@@ -198,7 +199,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setTable("foo");
 		assertEquals("foo", tableGenerator.getTable());
 		
-		assertSourceContains("@TableGenerator(table=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(table = \"foo\")", cu);
 		
 		tableGenerator.setTable(null);
 		assertNull(tableGenerator.getTable());
@@ -226,7 +227,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setCatalog("foo");
 		assertEquals("foo", tableGenerator.getCatalog());
 		
-		assertSourceContains("@TableGenerator(catalog=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(catalog = \"foo\")", cu);
 		
 		tableGenerator.setCatalog(null);
 		assertNull(tableGenerator.getCatalog());
@@ -254,7 +255,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setSchema("foo");
 		assertEquals("foo", tableGenerator.getSchema());
 		
-		assertSourceContains("@TableGenerator(schema=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(schema = \"foo\")", cu);
 		
 		tableGenerator.setSchema(null);
 		assertNull(tableGenerator.getSchema());
@@ -282,7 +283,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setPkColumnName("foo");
 		assertEquals("foo", tableGenerator.getPkColumnName());
 		
-		assertSourceContains("@TableGenerator(pkColumnName=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(pkColumnName = \"foo\")", cu);
 		
 		tableGenerator.setPkColumnName(null);
 		assertNull(tableGenerator.getPkColumnName());
@@ -310,7 +311,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setValueColumnName("foo");
 		assertEquals("foo", tableGenerator.getValueColumnName());
 		
-		assertSourceContains("@TableGenerator(valueColumnName=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(valueColumnName = \"foo\")", cu);
 		
 		tableGenerator.setValueColumnName(null);
 		assertNull(tableGenerator.getValueColumnName());
@@ -338,7 +339,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setPkColumnValue("foo");
 		assertEquals("foo", tableGenerator.getPkColumnValue());
 		
-		assertSourceContains("@TableGenerator(pkColumnValue=\"foo\")", cu);
+		assertSourceContains("@TableGenerator(pkColumnValue = \"foo\")", cu);
 		
 		tableGenerator.setPkColumnValue(null);
 		assertNull(tableGenerator.getPkColumnValue());
@@ -366,14 +367,14 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setAllocationSize(Integer.valueOf(500));
 		assertEquals(Integer.valueOf(500), tableGenerator.getAllocationSize());
 		
-		assertSourceContains("@TableGenerator(allocationSize=500)", cu);
+		assertSourceContains("@TableGenerator(allocationSize = 500)", cu);
 		
 		tableGenerator.setAllocationSize(null);
 		
 		assertSourceDoesNotContain("@TableGenerator", cu);
 
 		tableGenerator.setAllocationSize(Integer.valueOf(0));
-		assertSourceContains("@TableGenerator(allocationSize=0)", cu);
+		assertSourceContains("@TableGenerator(allocationSize = 0)", cu);
 	}
 	
 	public void testGetInitialValue() throws Exception {
@@ -396,14 +397,14 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		tableGenerator.setInitialValue(Integer.valueOf(500));
 		assertEquals(Integer.valueOf(500), tableGenerator.getInitialValue());
 		
-		assertSourceContains("@TableGenerator(initialValue=500)", cu);
+		assertSourceContains("@TableGenerator(initialValue = 500)", cu);
 		
 		tableGenerator.setInitialValue(null);
 		
 		assertSourceDoesNotContain("@TableGenerator", cu);
 
 		tableGenerator.setInitialValue(Integer.valueOf(0));
-		assertSourceContains("@TableGenerator(initialValue=0)", cu);
+		assertSourceContains("@TableGenerator(initialValue = 0)", cu);
 	}
 	
 	public void testUniqueConstraints() throws Exception {
@@ -455,7 +456,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		assertEquals(0, tableGenerator.uniqueConstraintAt(2).columnNamesSize());
 
 		assertEquals(3, tableGenerator.uniqueConstraintsSize());
-		assertSourceContains("@TableGenerator(uniqueConstraints={@UniqueConstraint(columnNames=\"BAR\"),@UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint})", cu);
+		assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu);
 	}
 	
 	public void testRemoveUniqueConstraint() throws Exception {
@@ -466,10 +467,10 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR);
 		
 		tableGenerator.removeUniqueConstraint(1);
-		assertSourceContains("@TableGenerator(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"BAZ\"})})", cu);
+		assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu);
 		
 		tableGenerator.removeUniqueConstraint(0);
-		assertSourceContains("@TableGenerator(uniqueConstraints=@UniqueConstraint(columnNames={\"BAZ\"}))", cu);
+		assertSourceContains("@TableGenerator(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu);
 		
 		tableGenerator.removeUniqueConstraint(0);
 		assertSourceDoesNotContain("@TableGenerator", cu);
@@ -483,7 +484,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR);
 		
 		tableGenerator.moveUniqueConstraint(2, 0);
-		assertSourceContains("@TableGenerator(uniqueConstraints={@UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"})})", cu);
+		assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu);
 	}
 	
 	public void testMoveUniqueConstraint2() throws Exception {
@@ -494,7 +495,7 @@ public class TableGeneratorTests extends JavaResourceModelTestCase {
 		TableGeneratorAnnotation tableGenerator = (TableGeneratorAnnotation) attributeResource.getSupportingAnnotation(JPA.TABLE_GENERATOR);
 		
 		tableGenerator.moveUniqueConstraint(0, 2);
-		assertSourceContains("@TableGenerator(uniqueConstraints={@UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"})})", cu);
+		assertSourceContains("@TableGenerator(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu);
 	}
 	
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java
index 88092e7627..a2cf4d9c83 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TableTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -17,6 +17,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.TableAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class TableTests extends JavaResourceModelTestCase {
 	
 	private static final String TABLE_NAME = "MY_TABLE";
@@ -48,7 +49,7 @@ public class TableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Table(name=\"" + TABLE_NAME + "\")");
+				sb.append("@Table(name = \"" + TABLE_NAME + "\")");
 			}
 		});
 	}
@@ -61,7 +62,7 @@ public class TableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Table(schema=\"" + SCHEMA_NAME + "\")");
+				sb.append("@Table(schema = \"" + SCHEMA_NAME + "\")");
 			}
 		});
 	}
@@ -74,7 +75,7 @@ public class TableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Table(catalog=\"" + CATALOG_NAME + "\")");
+				sb.append("@Table(catalog = \"" + CATALOG_NAME + "\")");
 			}
 		});
 	}
@@ -87,7 +88,7 @@ public class TableTests extends JavaResourceModelTestCase {
 			}
 			@Override
 			public void appendTypeAnnotationTo(StringBuilder sb) {
-				sb.append("@Table(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"})})");
+				sb.append("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})");
 			}
 		});
 	}
@@ -123,7 +124,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		table.setName("Foo");
 		assertEquals("Foo", table.getName());
 		
-		assertSourceContains("@Table(name=\"Foo\")", cu);
+		assertSourceContains("@Table(name = \"Foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -159,7 +160,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		table.setCatalog("Foo");
 		assertEquals("Foo", table.getCatalog());
 		
-		assertSourceContains("@Table(catalog=\"Foo\")", cu);
+		assertSourceContains("@Table(catalog = \"Foo\")", cu);
 	}
 	
 	public void testSetCatalogNull() throws Exception {
@@ -195,7 +196,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		table.setSchema("Foo");
 		assertEquals("Foo", table.getSchema());
 		
-		assertSourceContains("@Table(schema=\"Foo\")", cu);
+		assertSourceContains("@Table(schema = \"Foo\")", cu);
 	}
 	
 	public void testSetSchemaNull() throws Exception {
@@ -251,7 +252,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		assertEquals("FOO", table.uniqueConstraintAt(1).columnNames().next());
 		assertEquals(0, table.uniqueConstraintAt(2).columnNamesSize());
 		
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames=\"BAR\"),@UniqueConstraint(columnNames=\"FOO\"), @UniqueConstraint})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"FOO\"), @UniqueConstraint})", cu);
 	}
 	
 	public void testAddUniqueConstraint2() throws Exception {
@@ -264,7 +265,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		table.addUniqueConstraint(1).addColumnName("BAR");
 		table.uniqueConstraintAt(1).addColumnName("BAZ");
 		
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint,@UniqueConstraint(columnNames={ \"BAR\", \"BAZ\" }), @UniqueConstraint(columnNames=\"FOO\")})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint,@UniqueConstraint(columnNames = { \"BAR\", \"BAZ\" }), @UniqueConstraint(columnNames = \"FOO\")})", cu);
 		
 		assertEquals("FOO", table.uniqueConstraintAt(2).columnNames().next());
 		ListIterator<String> columnNames = table.uniqueConstraintAt(1).columnNames();
@@ -277,10 +278,10 @@ public class TableTests extends JavaResourceModelTestCase {
 		TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE);
 		
 		table.removeUniqueConstraint(1);
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"BAZ\"})})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"BAZ\"})})", cu);
 		
 		table.removeUniqueConstraint(0);
-		assertSourceContains("@Table(uniqueConstraints=@UniqueConstraint(columnNames={\"BAZ\"}))", cu);
+		assertSourceContains("@Table(uniqueConstraints = @UniqueConstraint(columnNames = {\"BAZ\"}))", cu);
 		
 		table.removeUniqueConstraint(0);
 		assertSourceDoesNotContain("@Table", cu);
@@ -293,13 +294,13 @@ public class TableTests extends JavaResourceModelTestCase {
 		table.addUniqueConstraint(0).addColumnName("FOO");
 		table.addUniqueConstraint(1).addColumnName("BAR");
 		table.addUniqueConstraint(2).addColumnName("BAZ");
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames=\"FOO\"),@UniqueConstraint(columnNames=\"BAR\"), @UniqueConstraint(columnNames=\"BAZ\")})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = \"FOO\"),@UniqueConstraint(columnNames = \"BAR\"), @UniqueConstraint(columnNames = \"BAZ\")})", cu);
 		
 		table.removeUniqueConstraint(0);
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames=\"BAR\"),@UniqueConstraint(columnNames=\"BAZ\")})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = \"BAR\"),@UniqueConstraint(columnNames = \"BAZ\")})", cu);
 		
 		table.removeUniqueConstraint(0);
-		assertSourceContains("@Table(uniqueConstraints=@UniqueConstraint(columnNames=\"BAZ\"))", cu);
+		assertSourceContains("@Table(uniqueConstraints = @UniqueConstraint(columnNames = \"BAZ\"))", cu);
 		
 		table.removeUniqueConstraint(0);
 		assertSourceDoesNotContain("@Table", cu);
@@ -312,13 +313,13 @@ public class TableTests extends JavaResourceModelTestCase {
 		table.addUniqueConstraint(0).addColumnName("FOO");
 		table.addUniqueConstraint(1).addColumnName("BAR");
 		table.addUniqueConstraint(2).addColumnName("BAZ");
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames=\"FOO\"),@UniqueConstraint(columnNames=\"BAR\"), @UniqueConstraint(columnNames=\"BAZ\")})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = \"FOO\"),@UniqueConstraint(columnNames = \"BAR\"), @UniqueConstraint(columnNames = \"BAZ\")})", cu);
 		
 		table.removeUniqueConstraint(2);
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames=\"FOO\"),@UniqueConstraint(columnNames=\"BAR\")})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = \"FOO\"),@UniqueConstraint(columnNames = \"BAR\")})", cu);
 		
 		table.removeUniqueConstraint(1);
-		assertSourceContains("@Table(uniqueConstraints=@UniqueConstraint(columnNames=\"FOO\"))", cu);
+		assertSourceContains("@Table(uniqueConstraints = @UniqueConstraint(columnNames = \"FOO\"))", cu);
 		
 		table.removeUniqueConstraint(0);
 		assertSourceDoesNotContain("@Table", cu);
@@ -330,7 +331,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE);
 		
 		table.moveUniqueConstraint(2, 0);
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames={\"FOO\"}), @UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"})})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"FOO\"}), @UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"})})", cu);
 	}
 	
 	public void testMoveUniqueConstraint2() throws Exception {
@@ -339,7 +340,7 @@ public class TableTests extends JavaResourceModelTestCase {
 		TableAnnotation table = (TableAnnotation) typeResource.getSupportingAnnotation(JPA.TABLE);
 		
 		table.moveUniqueConstraint(0, 2);
-		assertSourceContains("@Table(uniqueConstraints={@UniqueConstraint(columnNames={\"BAZ\"}), @UniqueConstraint(columnNames={\"BAR\"}), @UniqueConstraint(columnNames={\"FOO\"})})", cu);
+		assertSourceContains("@Table(uniqueConstraints = {@UniqueConstraint(columnNames = {\"BAZ\"}), @UniqueConstraint(columnNames = {\"BAR\"}), @UniqueConstraint(columnNames = {\"FOO\"})})", cu);
 	}
 	
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java
index e095aa7bda..0769884ced 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TemporalTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.TemporalAnnotation;
 import org.eclipse.jpt.core.resource.java.TemporalType;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class TemporalTests extends JavaResourceModelTestCase {
 
 	public TemporalTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java
index 912877343a..e268318116 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/TransientTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.TransientAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class TransientTests extends JavaResourceModelTestCase {
 
 	public TransientTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java
index 7e43758f03..5abf709599 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/VersionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -18,6 +18,7 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType;
 import org.eclipse.jpt.core.resource.java.VersionAnnotation;
 import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
 
+@SuppressWarnings("nls")
 public class VersionTests extends JavaResourceModelTestCase {
 
 	public VersionTests(String name) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapterTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapterTests.java
index ddcb9209a7..1dd7f59e30 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/CombinationIndexedDeclarationAnnotationAdapterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -324,7 +324,7 @@ public class CombinationIndexedDeclarationAnnotationAdapterTests extends Annotat
 		assertNull(annotation);
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@JoinColumns(columns={@JoinColumn,@JoinColumn})", cu);
+		this.assertSourceContains("@JoinColumns(columns = { @JoinColumn, @JoinColumn })", cu);
 	}
 
 	public void testNewMarkerAnnotation3() throws Exception {
@@ -397,7 +397,7 @@ public class CombinationIndexedDeclarationAnnotationAdapterTests extends Annotat
 		assertNull(annotation);
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@JoinColumns(columns={@JoinColumn(77),@JoinColumn})", cu);
+		this.assertSourceContains("@JoinColumns(columns = { @JoinColumn(77), @JoinColumn })", cu);
 	}
 
 	public void testNewMarkerAnnotation8() throws Exception {
@@ -425,29 +425,32 @@ public class CombinationIndexedDeclarationAnnotationAdapterTests extends Annotat
 		assertNull(annotation);
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@JoinColumns(columns={@JoinColumn(text=\"blah\", num=42),@JoinColumn})", cu);
+		this.assertSourceContains("@JoinColumns(columns = { @JoinColumn(text = \"blah\", num = 42), @JoinColumn })", cu);
 	}
 
 	public void testNewMarkerAnnotation23() throws Exception {
 		this.createAnnotationAndMembers("JoinColumn", "String name(); String text(); int num();");
 		this.createAnnotationAndMembers("JoinColumns", "JoinColumn[] columns();");
-		ICompilationUnit cu = this.createTestType("@annot.JoinColumn(text=\"blah\",num=42)");
-		String expected = "@JoinColumns(columns={@JoinColumn(text=\"blah\", num=42),null,@JoinColumn})";
-		this.assertSourceDoesNotContain(expected, cu);
+		ICompilationUnit cu = this.createTestType("@annot.JoinColumn(text=\"b\",num=4)");
+		String expected1 = "@JoinColumns(columns = { @JoinColumn(text = \"b\", num = 4), null,";
+		String expected2 = "@JoinColumn })";
+		this.assertSourceDoesNotContain(expected1, cu);
+		this.assertSourceDoesNotContain(expected2, cu);
 		DeclarationAnnotationAdapter daa = new CombinationIndexedDeclarationAnnotationAdapter(
 				"annot.JoinColumn", "annot.JoinColumns", "columns", 2);
 		AnnotationAdapter aa = new MemberAnnotationAdapter(this.idField(cu), daa);
 		aa.newMarkerAnnotation();
-		this.assertSourceContains(expected, cu);
+		this.assertSourceContains(expected1, cu);
+		this.assertSourceContains(expected2, cu);
 	}
 
 	public void testNewMarkerAnnotation24() throws Exception {
 		this.createAnnotationAndMembers("JoinColumn", "String name(); String text(); int num();");
 		this.createAnnotationAndMembers("JoinColumns", "JoinColumn[] value();");
 		ICompilationUnit cu = this.createTestType("@annot.JoinColumn(text=\"blah\",num=42)");
-		String expected1 = "@JoinColumns({";
-		String expected2 = "@JoinColumn(text=\"blah\", num=42),null,";
-		String expected3 = "@JoinColumn" + CR + "    })";
+		String expected1 = "@JoinColumns( {";
+		String expected2 = "@JoinColumn(text = \"blah\", num = 42), null,";
+		String expected3 = "@JoinColumn " + CR + "    })";
 		this.assertSourceDoesNotContain(expected1, cu);
 		this.assertSourceDoesNotContain(expected2, cu);
 		this.assertSourceDoesNotContain(expected3, cu);
@@ -496,7 +499,7 @@ public class CombinationIndexedDeclarationAnnotationAdapterTests extends Annotat
 		this.createAnnotationAndMembers("JoinColumn", "String name();");
 		this.createAnnotationAndMembers("JoinColumns", "JoinColumn[] columns();");
 		ICompilationUnit cu = this.createTestType("@annot.JoinColumn(name=\"ADDRESS_ID0\")");
-		String expected = "@JoinColumns(columns={null,@JoinColumn(name=\"ADDRESS_ID0\")})";
+		String expected = "@JoinColumns(columns = { null, @JoinColumn(name = \"ADDRESS_ID0\") })";
 		this.assertSourceDoesNotContain(expected, cu);
 		IndexedDeclarationAnnotationAdapter cidaa = new CombinationIndexedDeclarationAnnotationAdapter(
 				"annot.JoinColumn", "annot.JoinColumns", "columns", 0);
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/MemberAnnotationElementAdapterTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/MemberAnnotationElementAdapterTests.java
index d39bc59c15..0f0f35ef29 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/MemberAnnotationElementAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/MemberAnnotationElementAdapterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -465,7 +465,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 
 		aea.setValue("xxx");
-		this.assertSourceContains("@Foo(bar=\"xxx\")", cu);
+		this.assertSourceContains("@Foo(bar = \"xxx\")", cu);
 	}
 
 	public void testSetValue5() throws Exception {
@@ -498,7 +498,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		AnnotationElementAdapter<Boolean> aea = new MemberAnnotationElementAdapter<Boolean>(this.idField(cu), daea);
 
 		aea.setValue(Boolean.TRUE);
-		this.assertSourceContains("@Foo(@Bar(jimmy=@Baz(fred=true)))", cu);
+		this.assertSourceContains("@Foo(@Bar(jimmy = @Baz(fred = true)))", cu);
 	}
 
 	public void testSetValue7() throws Exception {
@@ -525,7 +525,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 
 		aea.setValue("xxx");
-		this.assertSourceContains("@Foo(bar=\"xxx\")", cu);
+		this.assertSourceContains("@Foo(bar = \"xxx\")", cu);
 	}
 
 	public void testSetValue9() throws Exception {
@@ -539,7 +539,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 
 		aea.setValue("xxx");
 		this.assertSourceDoesNotContain(annotation, cu);
-		this.assertSourceContains("@Foo(value=\"zzz\", bar=\"xxx\")", cu);
+		this.assertSourceContains("@Foo(value = \"zzz\", bar = \"xxx\")", cu);
 	}
 
 	public void testSetValue10() throws Exception {
@@ -617,7 +617,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		DeclarationAnnotationElementAdapter<String> daea = new ConversionDeclarationAnnotationElementAdapter<String>(daa, "bar", SimpleTypeStringExpressionConverter.instance());
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 		aea.setValue("java.lang.Object");
-		this.assertSourceContains("@Foo(bar=java.lang.Object.class)", cu);
+		this.assertSourceContains("@Foo(bar = java.lang.Object.class)", cu);
 	}
 
 	public void testSimpleTypeLiteral3() throws Exception {
@@ -654,7 +654,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		DeclarationAnnotationElementAdapter<String> daea = new ConversionDeclarationAnnotationElementAdapter<String>(daa, "bar", PrimitiveTypeStringExpressionConverter.instance());
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 		aea.setValue("int");
-		this.assertSourceContains("@Foo(bar=int.class)", cu);
+		this.assertSourceContains("@Foo(bar = int.class)", cu);
 	}
 
 	public void testPrimitiveTypeLiteral3() throws Exception {
@@ -691,7 +691,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		DeclarationAnnotationElementAdapter<String> daea = new ConversionDeclarationAnnotationElementAdapter<String>(daa, "bar", TypeStringExpressionConverter.instance());
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 		aea.setValue("java.lang.Object");
-		this.assertSourceContains("@Foo(bar=java.lang.Object.class)", cu);
+		this.assertSourceContains("@Foo(bar = java.lang.Object.class)", cu);
 	}
 
 	public void testTypeLiteral3() throws Exception {
@@ -719,7 +719,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		DeclarationAnnotationElementAdapter<String> daea = new ConversionDeclarationAnnotationElementAdapter<String>(daa, "bar", TypeStringExpressionConverter.instance());
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 		aea.setValue("int");
-		this.assertSourceContains("@Foo(bar=int.class)", cu);
+		this.assertSourceContains("@Foo(bar = int.class)", cu);
 	}
 
 	public void testTypeLiteral6() throws Exception {
@@ -774,9 +774,9 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 	public void testSetValueEnum1() throws Exception {
 		this.createEnum("TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum bar();");
-		String annotation = "@annot.Foo(bar=XXX)";
-		ICompilationUnit cu = this.createTestType("static enums.TestEnum.XXX", annotation);
-		this.assertSourceContains(annotation, cu);
+		String expected = "@annot.Foo(bar=XXX)";
+		ICompilationUnit cu = this.createTestType("static enums.TestEnum.XXX", expected);
+		this.assertSourceContains(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String> daea = new EnumDeclarationAnnotationElementAdapter(daa, "bar");
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
@@ -787,24 +787,24 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 	public void testSetValueEnum2() throws Exception {
 		this.createEnum("TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum bar();");
-		String annotation = "@Foo(bar=XXX)";
+		String expected = "@Foo(bar = XXX)";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String> daea = new EnumDeclarationAnnotationElementAdapter(daa, "bar");
 		AnnotationElementAdapter<String> aea = new MemberAnnotationElementAdapter<String>(this.idField(cu), daea);
 		aea.setValue("enums.TestEnum.XXX");
 		this.assertSourceContains("import static enums.TestEnum.XXX;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumImportCollision1() throws Exception {
 		this.createEnum("enums1", "TestEnum", "XXX, YYY, ZZZ");
 		this.createEnum("enums2", "TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums1.TestEnum bar1();  enums2.TestEnum bar2();");
-		String annotation = "@Foo(bar1=XXX, bar2 = TestEnum.XXX)";
+		String expected = "@Foo(bar1 = XXX, bar2 = TestEnum.XXX)";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -819,16 +819,16 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceContains("import static enums1.TestEnum.XXX;", cu);
 		this.assertSourceDoesNotContain("import static enums2.TestEnum.XXX;", cu);
 		this.assertSourceContains("import enums2.TestEnum;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumImportCollision2() throws Exception {
 		this.createEnum("enums1", "TestEnum", "XXX, YYY, ZZZ");
 		this.createEnum("enums2", "TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums1.TestEnum bar1();  enums2.TestEnum bar2();");
-		String annotation = "@annot.Foo(bar1=XXX, bar2 = TestEnum.XXX)";
+		String expected = "@annot.Foo(bar1=XXX, bar2 = TestEnum.XXX)";
 		ICompilationUnit cu = this.createTestType("static enums1.TestEnum.*", "@annot.Foo(bar1=XXX)");
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -843,16 +843,16 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceContains("import static enums1.TestEnum.*;", cu);
 		this.assertSourceDoesNotContain("import static enums2.TestEnum.XXX;", cu);
 		this.assertSourceContains("import enums2.TestEnum;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumImportCollision3() throws Exception {
 		this.createEnum("TestEnum1", "XXX, YYY, ZZZ");
 		this.createEnum("TestEnum2", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum1 bar1();  enums.TestEnum2 bar2();");
-		String annotation = "@Foo(bar1=XXX, bar2 = TestEnum2.XXX)";
+		String expected = "@Foo(bar1 = XXX, bar2 = TestEnum2.XXX)";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -866,16 +866,16 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 
 		this.assertSourceContains("import static enums.TestEnum1.XXX;", cu);
 		this.assertSourceContains("import enums.TestEnum2;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumImportCollision4() throws Exception {
 		this.createEnum("TestEnum1", "XXX, YYY, ZZZ");
 		this.createEnum("TestEnum2", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum1 bar1();  enums.TestEnum2 bar2();");
-		String annotation = "@annot.Foo(bar1=XXX, bar2 = TestEnum2.XXX)";
+		String expected = "@annot.Foo(bar1=XXX, bar2 = TestEnum2.XXX)";
 		ICompilationUnit cu = this.createTestType("static enums.TestEnum1.*", "@annot.Foo(bar1=XXX)");
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -889,7 +889,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 
 		this.assertSourceContains("import static enums.TestEnum1.*;", cu);
 		this.assertSourceContains("import enums.TestEnum2;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	/**
@@ -900,9 +900,9 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.createEnum("TestEnum1", "XXX, YYY, ZZZ");
 		this.createEnum("TestEnum2", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum1 bar1();  enums.TestEnum2 bar2();");
-		String annotation = "@Foo(bar1=XXX, bar2 = TestEnum2.XXX)";
+		String expected = "@Foo(bar1 = XXX, bar2 = TestEnum2.XXX)";
 		ICompilationUnit cu = this.createTestType("enums.*", "");
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -917,7 +917,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceContains("import enums.*;", cu);
 		this.assertSourceContains("import static enums.TestEnum1.XXX;", cu);
 		this.assertSourceDoesNotContain("import enums.TestEnum2;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumImportCollision6() throws Exception {
@@ -925,9 +925,9 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.createEnum("enums2", "TestEnum", "XXX, YYY, ZZZ");
 		this.createEnum("enums3", "TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums1.TestEnum bar1();  enums2.TestEnum bar2();  enums3.TestEnum bar3();");
-		String annotation = "@Foo(bar1=XXX, bar2 = TestEnum.XXX, bar3 = enums3.TestEnum.XXX)";
+		String expected = "@Foo(bar1 = XXX, bar2 = TestEnum.XXX, bar3 = enums3.TestEnum.XXX)";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -948,7 +948,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceContains("import enums2.TestEnum;", cu);
 		this.assertSourceDoesNotContain("import static enums3", cu);
 		this.assertSourceDoesNotContain("import enums3", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testValueStringArray() throws Exception {
@@ -998,44 +998,44 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 
 	public void testSetValueStringArray() throws Exception {
 		this.createAnnotationAndMembers("Foo", "String[] bar();");
-		String annotation = "@Foo(bar={\"string0\",\"string1\"})";
+		String expected = "@Foo(bar = { \"string0\", \"string1\" })";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String[]> daea = new ConversionDeclarationAnnotationElementAdapter<String[]>(daa, "bar", AnnotationStringArrayExpressionConverter.forStrings());
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[] {"string0", "string1"});
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueStringArrayEmptyRemove() throws Exception {
 		this.createAnnotationAndMembers("Foo", "String[] bar();");
-		String annotation = "@Foo";
+		String expected = "@Foo";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String[]> daea = new ConversionDeclarationAnnotationElementAdapter<String[]>(daa, "bar", AnnotationStringArrayExpressionConverter.forStrings());
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[0]);
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 	}
 
 	public void testSetValueStringArrayEmpty() throws Exception {
 		this.createAnnotationAndMembers("Foo", "String[] bar();");
-		String annotation = "@Foo(bar={})";
+		String expected = "@Foo(bar = {})";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		ExpressionConverter<String[]> expressionConverter = new AnnotationStringArrayExpressionConverter(StringExpressionConverter.instance(), false);
 		DeclarationAnnotationElementAdapter<String[]> daea = new ConversionDeclarationAnnotationElementAdapter<String[]>(daa, "bar", expressionConverter);
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[0]);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueStringArraySingleElement() throws Exception {
 		this.createAnnotationAndMembers("Foo", "String[] bar();");
-		String annotation = "@Foo(bar=\"string0\")";
+		String annotation = "@Foo(bar = \"string0\")";
 		ICompilationUnit cu = this.createTestType();
 		this.assertSourceDoesNotContain(annotation, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
@@ -1108,65 +1108,65 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 	public void testSetValueEnumArray() throws Exception {
 		this.createEnum("TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum[] bar();");
-		String annotation = "@Foo(bar={XXX,YYY})";
+		String expected = "@Foo(bar = { XXX, YYY })";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String[]> daea = new EnumArrayDeclarationAnnotationElementAdapter(daa, "bar");
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[] {"enums.TestEnum.XXX", "enums.TestEnum.YYY"});
 		this.assertSourceContains("import static enums.TestEnum.XXX;", cu);
 		this.assertSourceContains("import static enums.TestEnum.YYY;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArrayEmptyRemove() throws Exception {
 		this.createEnum("TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum[] bar();");
-		String annotation = "@Foo";
+		String expected = "@Foo";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String[]> daea = new EnumArrayDeclarationAnnotationElementAdapter(daa, "bar");
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[0]);
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 	}
 
 	public void testSetValueEnumArrayEmpty() throws Exception {
 		this.createEnum("TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum[] bar();");
-		String annotation = "@Foo(bar={})";
+		String expected = "@Foo(bar = {})";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String[]> daea = new EnumArrayDeclarationAnnotationElementAdapter(daa, "bar", true, false);
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[0]);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArraySingleElement() throws Exception {
 		this.createEnum("TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum[] bar();");
-		String annotation = "@Foo(bar=XXX)";
+		String expected = "@Foo(bar = XXX)";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 		DeclarationAnnotationElementAdapter<String[]> daea = new EnumArrayDeclarationAnnotationElementAdapter(daa, "bar");
 		AnnotationElementAdapter<String[]> aea = new MemberAnnotationElementAdapter<String[]>(this.idField(cu), daea);
 		aea.setValue(new String[] {"enums.TestEnum.XXX"});
 		this.assertSourceContains("import static enums.TestEnum.XXX;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArrayImportCollision1() throws Exception {
 		this.createEnum("enums1", "TestEnum", "XXX, YYY, ZZZ");
 		this.createEnum("enums2", "TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums1.TestEnum[] bar1();  enums2.TestEnum[] bar2();");
-		String annotation = "@Foo(bar1={XXX,YYY}, bar2 = { TestEnum.XXX, TestEnum.YYY })";
+		String expected = "@Foo(bar1 = { XXX, YYY }, bar2 = { TestEnum.XXX, TestEnum.YYY })";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -1183,16 +1183,16 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceDoesNotContain("import static enums2.TestEnum.XXX;", cu);
 		this.assertSourceDoesNotContain("import static enums2.TestEnum.YYY;", cu);
 		this.assertSourceContains("import enums2.TestEnum;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArrayImportCollision2() throws Exception {
 		this.createEnum("enums1", "TestEnum", "XXX, YYY, ZZZ");
 		this.createEnum("enums2", "TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums1.TestEnum[] bar1();  enums2.TestEnum[] bar2();");
-		String annotation = "@annot.Foo(bar1={XXX,YYY}, bar2 = { TestEnum.XXX, TestEnum.YYY })";
+		String expected = "@annot.Foo(bar1={XXX,YYY}, bar2 = { TestEnum.XXX, TestEnum.YYY })";
 		ICompilationUnit cu = this.createTestType("static enums1.TestEnum.*", "@annot.Foo(bar1={XXX,YYY})");
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -1208,16 +1208,16 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceDoesNotContain("import static enums2.TestEnum.XXX;", cu);
 		this.assertSourceDoesNotContain("import static enums2.TestEnum.YYY;", cu);
 		this.assertSourceContains("import enums2.TestEnum;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArrayImportCollision3() throws Exception {
 		this.createEnum("TestEnum1", "XXX, YYY, ZZZ");
 		this.createEnum("TestEnum2", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum1[] bar1();  enums.TestEnum2[] bar2();");
-		String annotation = "@Foo(bar1={XXX,YYY}, bar2 = { TestEnum2.XXX, TestEnum2.YYY })";
+		String expected = "@Foo(bar1 = { XXX, YYY }, bar2 = { TestEnum2.XXX, TestEnum2.YYY })";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -1234,16 +1234,16 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceDoesNotContain("import static enums.TestEnum2.XXX;", cu);
 		this.assertSourceDoesNotContain("import static enums.TestEnum2.YYY;", cu);
 		this.assertSourceContains("import enums.TestEnum2;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArrayImportCollision4() throws Exception {
 		this.createEnum("TestEnum1", "XXX, YYY, ZZZ");
 		this.createEnum("TestEnum2", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums.TestEnum1[] bar1();  enums.TestEnum2[] bar2();");
-		String annotation = "@annot.Foo(bar1={XXX,YYY}, bar2 = { TestEnum2.XXX, TestEnum2.YYY })";
+		String expected = "@annot.Foo(bar1={XXX,YYY}, bar2 = { TestEnum2.XXX, TestEnum2.YYY })";
 		ICompilationUnit cu = this.createTestType("static enums.TestEnum1.*", "@annot.Foo(bar1={XXX,YYY})");
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -1259,7 +1259,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceDoesNotContain("import static enums.TestEnum2.XXX;", cu);
 		this.assertSourceDoesNotContain("import static enums.TestEnum2.YYY;", cu);
 		this.assertSourceContains("import enums.TestEnum2;", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 	public void testSetValueEnumArrayImportCollision6() throws Exception {
@@ -1267,9 +1267,9 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.createEnum("enums2", "TestEnum", "XXX, YYY, ZZZ");
 		this.createEnum("enums3", "TestEnum", "XXX, YYY, ZZZ");
 		this.createAnnotationAndMembers("Foo", "enums1.TestEnum[] bar1();  enums2.TestEnum[] bar2();  enums3.TestEnum[] bar3();");
-		String annotation = "@Foo(bar1={XXX,YYY}, bar2 = { TestEnum.XXX, TestEnum.YYY }, bar3 = { enums3.TestEnum.XXX, enums3.TestEnum.YYY })";
+		String expected = "@Foo(bar1 = { XXX, YYY }, bar2 = { TestEnum.XXX, TestEnum.YYY }, bar3 = { enums3.TestEnum.XXX, enums3.TestEnum.YYY })";
 		ICompilationUnit cu = this.createTestType();
-		this.assertSourceDoesNotContain(annotation, cu);
+		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new SimpleDeclarationAnnotationAdapter("annot.Foo");
 
@@ -1291,7 +1291,7 @@ public class MemberAnnotationElementAdapterTests extends AnnotationTestCase {
 		this.assertSourceContains("import enums2.TestEnum;", cu);
 		this.assertSourceDoesNotContain("import static enums3", cu);
 		this.assertSourceDoesNotContain("import enums3", cu);
-		this.assertSourceContains(annotation, cu);
+		this.assertSourceContains(expected, cu);
 	}
 
 }
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedDeclarationAnnotationAdapterTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedDeclarationAnnotationAdapterTests.java
index ff46aa3ab0..a6687e348b 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedDeclarationAnnotationAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedDeclarationAnnotationAdapterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -22,6 +22,7 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter;
 import org.eclipse.jpt.core.utility.jdt.Member;
 import org.eclipse.jpt.core.utility.jdt.ModifiedDeclaration;
 
+@SuppressWarnings("nls")
 public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase {
 
 	public NestedDeclarationAnnotationAdapterTests(String name) {
@@ -253,7 +254,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		assertNull(annotation);
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@Foo(nestedAnnotation=@Bar)", cu);
+		this.assertSourceContains("@Foo(nestedAnnotation = @Bar)", cu);
 	}
 
 	public void testNewMarkerAnnotation2() throws Exception {
@@ -276,7 +277,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String value();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar nestedAnnotation();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(nestedAnnotation=@Bar)";
+		String expected = "@Foo(nestedAnnotation = @Bar)";
 		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new NestedDeclarationAnnotationAdapter(
@@ -310,7 +311,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String value();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar nestedAnnotation(); String value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@Foo(value=\"something\", nestedAnnotation=@Bar)";
+		String expected = "@Foo(value = \"something\", nestedAnnotation = @Bar)";
 		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new NestedDeclarationAnnotationAdapter(
@@ -384,7 +385,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 				NestedDeclarationAnnotationAdapterTests.this.editNewSingleMemberAnnotation1(declaration);
 			}
 		});
-		this.assertSourceContains("@Foo(nestedAnnotation=@Bar(\"test string literal\"))", cu);
+		this.assertSourceContains("@Foo(nestedAnnotation = @Bar(\"test string literal\"))", cu);
 	}
 
 	void editNewSingleMemberAnnotation1(ModifiedDeclaration declaration) {
@@ -433,7 +434,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String value();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar nestedAnnotation();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(nestedAnnotation=@Bar(\"test string literal\"))";
+		String expected = "@Foo(nestedAnnotation = @Bar(\"test string literal\"))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -483,7 +484,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String value();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar nestedAnnotation(); String value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@Foo(value=\"something\", nestedAnnotation=@Bar(\"test string literal\"))";
+		String expected = "@Foo(value = \"something\", nestedAnnotation = @Bar(\"test string literal\"))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -589,7 +590,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 				NestedDeclarationAnnotationAdapterTests.this.editNewNormalAnnotation1(declaration);
 			}
 		});
-		this.assertSourceContains("@Foo(nestedAnnotation=@Bar(yyy=\"test string literal\"))", cu);
+		this.assertSourceContains("@Foo(nestedAnnotation = @Bar(yyy = \"test string literal\"))", cu);
 	}
 
 	void editNewNormalAnnotation1(ModifiedDeclaration declaration) {
@@ -611,7 +612,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 				NestedDeclarationAnnotationAdapterTests.this.editNewNormalAnnotation2(declaration);
 			}
 		});
-		this.assertSourceContains("@Foo(@Bar(yyy=\"test string literal\"))", cu);
+		this.assertSourceContains("@Foo(@Bar(yyy = \"test string literal\"))", cu);
 	}
 
 	void editNewNormalAnnotation2(ModifiedDeclaration declaration) {
@@ -627,7 +628,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String yyy();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar nestedAnnotation();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(nestedAnnotation=@Bar(yyy=\"test string literal\"))";
+		String expected = "@Foo(nestedAnnotation = @Bar(yyy = \"test string literal\"))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -650,7 +651,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String yyy();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(@Bar(yyy=\"test string literal\"))";
+		String expected = "@Foo(@Bar(yyy = \"test string literal\"))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -673,7 +674,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String yyy();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar nestedAnnotation(); String value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@Foo(value=\"something\", nestedAnnotation=@Bar(yyy=\"test string literal\"))";
+		String expected = "@Foo(value = \"something\", nestedAnnotation = @Bar(yyy = \"test string literal\"))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -696,7 +697,7 @@ public class NestedDeclarationAnnotationAdapterTests extends AnnotationTestCase
 		this.createAnnotationAndMembers("Bar", "String yyy();");
 		this.createAnnotationAndMembers("Foo", "Object value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@annot.Foo(@Bar(yyy=\"test string literal\"))";
+		String expected = "@annot.Foo(@Bar(yyy = \"test string literal\"))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapterTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapterTests.java
index 697a2d2fc5..383ad73660 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/NestedIndexedDeclarationAnnotationAdapterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -632,7 +632,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(annotation);
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@Foo(nestedAnnotations=@Bar)", cu);
+		this.assertSourceContains("@Foo(nestedAnnotations = @Bar)", cu);
 	}
 
 	public void testNewMarkerAnnotation2() throws Exception {
@@ -655,7 +655,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int value();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(nestedAnnotations=@Bar)";
+		String expected = "@Foo(nestedAnnotations = @Bar)";
 		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new NestedIndexedDeclarationAnnotationAdapter(
@@ -689,7 +689,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int value();");
 		this.createAnnotationAndMembers("Foo", "String value(); annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@Foo(value=\"something\", nestedAnnotations=@Bar)";
+		String expected = "@Foo(value = \"something\", nestedAnnotations = @Bar)";
 		this.assertSourceDoesNotContain(expected, cu);
 
 		DeclarationAnnotationAdapter daa = new NestedIndexedDeclarationAnnotationAdapter(
@@ -764,13 +764,15 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(aa.getAnnotation(this.buildASTRoot(cu)));
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@Foo(nestedAnnotations={null,null,null,null,null,@Bar})", cu);
+		this.assertSourceContains("@Foo(nestedAnnotations = { null, null, null, null, null, @Bar })", cu);
 	}
 
 	public void testNewMarkerAnnotation10() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int value();");
 		this.createAnnotationAndMembers("Foo", "String value(); annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
+		String expected1 = "@Foo(value = \"something\", nestedAnnotations = { null, null, null, null,";
+		String expected2 = "null, @Bar })";
 		this.assertSourceDoesNotContain("Bar", cu);
 
 		DeclarationAnnotationAdapter daa = new NestedIndexedDeclarationAnnotationAdapter(
@@ -780,7 +782,8 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(annotation);
 
 		aa.newMarkerAnnotation();
-		this.assertSourceContains("@Foo(value=\"something\", nestedAnnotations={null,null,null,null,null,@Bar})", cu);
+		this.assertSourceContains(expected1, cu);
+		this.assertSourceContains(expected2, cu);
 	}
 
 	public void testNewMarkerAnnotation11() throws Exception {
@@ -1055,7 +1058,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 				NestedIndexedDeclarationAnnotationAdapterTests.this.editNewSingleMemberAnnotation1(declaration);
 			}
 		});
-		this.assertSourceContains("@Foo(nestedAnnotations=@Bar(88))", cu);
+		this.assertSourceContains("@Foo(nestedAnnotations = @Bar(88))", cu);
 	}
 
 	void editNewSingleMemberAnnotation1(ModifiedDeclaration declaration) {
@@ -1097,7 +1100,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int value();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(nestedAnnotations=@Bar(88))";
+		String expected = "@Foo(nestedAnnotations = @Bar(88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1147,7 +1150,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int value();");
 		this.createAnnotationAndMembers("Foo", "String value(); annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@Foo(value=\"something\", nestedAnnotations=@Bar(88))";
+		String expected = "@Foo(value = \"something\", nestedAnnotations = @Bar(88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1256,13 +1259,15 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(annotation);
 
 		aa.newSingleMemberAnnotation();
-		this.assertSourceContains("@Foo(nestedAnnotations={null,null,null,null,null,@Bar(MISSING)})", cu);  // ???
+		this.assertSourceContains("@Foo(nestedAnnotations = { null, null, null, null, null, @Bar(MISSING) })", cu);  // ???
 	}
 
 	public void testNewSingleMemberAnnotation10() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int value();");
 		this.createAnnotationAndMembers("Foo", "String value(); annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
+		String expected1 = "@Foo(value = \"something\", nestedAnnotations = { null, null, null, null,";
+		String expected2 = "null, @Bar(MISSING) })";  // ???
 		this.assertSourceDoesNotContain("@Bar", cu);
 
 		DeclarationAnnotationAdapter daa = new NestedIndexedDeclarationAnnotationAdapter(
@@ -1272,7 +1277,8 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(annotation);
 
 		aa.newSingleMemberAnnotation();
-		this.assertSourceContains("@Foo(value=\"something\", nestedAnnotations={null,null,null,null,null,@Bar(MISSING)})", cu);  // ???
+		this.assertSourceContains(expected1, cu);
+		this.assertSourceContains(expected2, cu);
 	}
 
 	public void testNewSingleMemberAnnotation11() throws Exception {
@@ -1550,7 +1556,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 				NestedIndexedDeclarationAnnotationAdapterTests.this.editNewNormalAnnotation1(declaration);
 			}
 		});
-		this.assertSourceContains("@Foo(nestedAnnotations=@Bar(xxx=88))", cu);
+		this.assertSourceContains("@Foo(nestedAnnotations = @Bar(xxx = 88))", cu);
 	}
 
 	void editNewNormalAnnotation1(ModifiedDeclaration declaration) {
@@ -1572,7 +1578,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 				NestedIndexedDeclarationAnnotationAdapterTests.this.editNewNormalAnnotation2(declaration);
 			}
 		});
-		this.assertSourceContains("@Foo(@Bar(xxx=88))", cu);
+		this.assertSourceContains("@Foo(@Bar(xxx = 88))", cu);
 	}
 
 	void editNewNormalAnnotation2(ModifiedDeclaration declaration) {
@@ -1588,7 +1594,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(nestedAnnotations=@Bar(xxx=88))";
+		String expected = "@Foo(nestedAnnotations = @Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1611,7 +1617,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] nestedAnnotations();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo");
-		String expected = "@Foo(@Bar(xxx=88))";
+		String expected = "@Foo(@Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1634,7 +1640,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] nestedAnnotations(); String value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@Foo(value=\"something\", nestedAnnotations=@Bar(xxx=88))";
+		String expected = "@Foo(value = \"something\", nestedAnnotations = @Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1657,7 +1663,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
-		String expected = "@annot.Foo(@Bar(xxx=88))";
+		String expected = "@annot.Foo(@Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1735,13 +1741,15 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(annotation);
 
 		aa.newNormalAnnotation();
-		this.assertSourceContains("@Foo(nestedAnnotations={null,null,null,null,null,@Bar()})", cu);
+		this.assertSourceContains("@Foo(nestedAnnotations = { null, null, null, null, null, @Bar() })", cu);
 	}
 
 	public void testNewNormalAnnotation10() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "annot.Bar[] nestedAnnotations(); String value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(\"something\")");
+		String expected1 = "@Foo(value = \"something\", nestedAnnotations = { null, null, null, null,";
+		String expected2 = "null, @Bar() })";
 		this.assertSourceDoesNotContain("@Bar", cu);
 
 		DeclarationAnnotationAdapter daa = new NestedIndexedDeclarationAnnotationAdapter(
@@ -1751,14 +1759,15 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		assertNull(annotation);
 
 		aa.newNormalAnnotation();
-		this.assertSourceContains("@Foo(value=\"something\", nestedAnnotations={null,null,null,null,null,@Bar()})", cu);
+		this.assertSourceContains(expected1, cu);
+		this.assertSourceContains(expected2, cu);
 	}
 
 	public void testNewNormalAnnotation11() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] value();");
-		ICompilationUnit cu = this.createTestType("@annot.Foo({\"one\", \"two\"})");
-		String expected = "@annot.Foo({@Bar(xxx=88), \"two\"})";
+		ICompilationUnit cu = this.createTestType("@annot.Foo({ \"one\", \"two\" })");
+		String expected = "@annot.Foo({ @Bar(xxx = 88), \"two\" })";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1797,7 +1806,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(7)");
-		String expected = "@annot.Foo(@Bar(xxx=88))";
+		String expected = "@annot.Foo(@Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1837,7 +1846,7 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] value();");
 		ICompilationUnit cu = this.createTestType("@annot.Foo(@annot.NotBar)");
-		String expected = "@annot.Foo(@Bar(xxx=88))";
+		String expected = "@annot.Foo(@Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1882,8 +1891,8 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 	public void testNewNormalAnnotation17() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] nestedAnnotations();");
-		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations={\"something\"})");
-		String expected = "@annot.Foo(nestedAnnotations={@Bar(xxx=88)})";
+		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations = { \"something\" })");
+		String expected = "@annot.Foo(nestedAnnotations = { @Bar(xxx = 88) })";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1921,8 +1930,8 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 	public void testNewNormalAnnotation19() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] nestedAnnotations();");
-		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations=\"something\")");
-		String expected = "@annot.Foo(nestedAnnotations=@Bar(xxx=88))";
+		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations = \"something\")");
+		String expected = "@annot.Foo(nestedAnnotations = @Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1945,8 +1954,8 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 		this.createAnnotationAndMembers("NotBar", "int xxx();");
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] nestedAnnotations();");
-		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations=@annot.NotBar)");
-		String expected = "@annot.Foo(nestedAnnotations=@Bar(xxx=88))";
+		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations = @annot.NotBar)");
+		String expected = "@annot.Foo(nestedAnnotations = @Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
@@ -1985,8 +1994,8 @@ public class NestedIndexedDeclarationAnnotationAdapterTests extends AnnotationTe
 	public void testNewNormalAnnotation22() throws Exception {
 		this.createAnnotationAndMembers("Bar", "int xxx();");
 		this.createAnnotationAndMembers("Foo", "Object[] nestedAnnotations();");
-		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations=@annot.Bar(77))");
-		String expected = "@annot.Foo(nestedAnnotations=@Bar(xxx=88))";
+		ICompilationUnit cu = this.createTestType("@annot.Foo(nestedAnnotations = @annot.Bar(77))");
+		String expected = "@annot.Foo(nestedAnnotations = @Bar(xxx = 88))";
 		this.assertSourceDoesNotContain(expected, cu);
 		this.idField(cu).edit(new Member.Editor() {
 			public void edit(ModifiedDeclaration declaration) {
diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/SimpleDeclarationAnnotationAdapterTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/SimpleDeclarationAnnotationAdapterTests.java
index 0082dbfc95..58846359db 100644
--- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/SimpleDeclarationAnnotationAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/utility/jdt/SimpleDeclarationAnnotationAdapterTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -196,7 +196,7 @@ public class SimpleDeclarationAnnotationAdapterTests extends AnnotationTestCase
 			}
 		});
 		this.assertSourceContains("import annot.Foo;", cu);
-		this.assertSourceContains("@Foo(bar=\"test string literal\")", cu);
+		this.assertSourceContains("@Foo(bar = \"test string literal\")", cu);
 	}
 
 	void editNewNormalAnnotation(ModifiedDeclaration declaration) {
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/CacheTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/CacheTests.java
index ac7bb55dc6..8a912175b8 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/CacheTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/CacheTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -340,7 +340,7 @@ public class CacheTests extends EclipseLinkJavaResourceModelTestCase {
 		
 		assertNotNull(cache.getExpiryTimeOfDay());
 		
-		assertSourceContains("@Cache(expiryTimeOfDay=@TimeOfDay)", cu);
+		assertSourceContains("@Cache(expiryTimeOfDay = @TimeOfDay)", cu);
 	}
 	
 	public void testRemoveExpiryTimeOfDay() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ConversionValueAnnotationTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ConversionValueAnnotationTests.java
index 64d9fefb26..3b9c74b938 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ConversionValueAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ConversionValueAnnotationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -63,7 +63,7 @@ public class ConversionValueAnnotationTests extends EclipseLinkJavaResourceModel
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue=\"F\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})");
+				sb.append("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue = \"F\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})");
 			}
 		});
 	}
@@ -89,7 +89,7 @@ public class ConversionValueAnnotationTests extends EclipseLinkJavaResourceModel
 		converter.conversionValueAt(0).setDataValue("FOO");
 		assertEquals("FOO", converter.conversionValueAt(0).getDataValue());
 		
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue=\"FOO\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue = \"FOO\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})", cu);
 	}
 	
 	public void testSetDataValueNull() throws Exception {
@@ -101,10 +101,10 @@ public class ConversionValueAnnotationTests extends EclipseLinkJavaResourceModel
 		assertEquals(0, converter.conversionValuesSize());
 		
 		converter.addConversionValue(0).setDataValue("FOO");
-		assertSourceContains("@ObjectTypeConverter(conversionValues=@ConversionValue(dataValue=\"FOO\"))", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = @ConversionValue(dataValue = \"FOO\"))", cu);
 		
 		converter.conversionValueAt(0).setDataValue(null);
-		assertSourceContains("@ObjectTypeConverter(conversionValues=@ConversionValue)", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = @ConversionValue)", cu);
 		assertEquals(1, converter.conversionValuesSize());
 	}
 	
@@ -128,7 +128,7 @@ public class ConversionValueAnnotationTests extends EclipseLinkJavaResourceModel
 		converter.conversionValueAt(0).setObjectValue("FOO");
 		assertEquals("FOO", converter.conversionValueAt(0).getObjectValue());
 		
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue=\"F\", objectValue = \"FOO\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue = \"F\", objectValue = \"FOO\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})", cu);
 	}
 	
 	public void testSetObjectValueNull() throws Exception {
@@ -140,10 +140,10 @@ public class ConversionValueAnnotationTests extends EclipseLinkJavaResourceModel
 		assertEquals(0, converter.conversionValuesSize());
 		
 		converter.addConversionValue(0).setObjectValue("FOO");
-		assertSourceContains("@ObjectTypeConverter(conversionValues=@ConversionValue(objectValue=\"FOO\"))", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = @ConversionValue(objectValue = \"FOO\"))", cu);
 		
 		converter.conversionValueAt(0).setObjectValue(null);
-		assertSourceContains("@ObjectTypeConverter(conversionValues=@ConversionValue)", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = @ConversionValue)", cu);
 		assertEquals(1, converter.conversionValuesSize());
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ObjectTypeConverterAnnotationTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ObjectTypeConverterAnnotationTests.java
index dc096a1f54..df7519274f 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ObjectTypeConverterAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/ObjectTypeConverterAnnotationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -93,7 +93,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ObjectTypeConverter(name=\"bar\")");
+				sb.append("@ObjectTypeConverter(name = \"bar\")");
 			}
 		});
 	}
@@ -107,7 +107,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ObjectTypeConverter(defaultObjectValue=\"f\")");
+				sb.append("@ObjectTypeConverter(defaultObjectValue = \"f\")");
 			}
 		});
 	}
@@ -121,7 +121,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue=\"F\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})");
+				sb.append("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue = \"F\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})");
 			}
 		});
 	}
@@ -244,7 +244,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		converter.setName("foo");
 		assertEquals("foo", converter.getName());
 		
-		assertSourceContains("@ObjectTypeConverter(name=\"foo\")", cu);
+		assertSourceContains("@ObjectTypeConverter(name = \"foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
@@ -283,7 +283,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		converter.setDefaultObjectValue("foo");
 		assertEquals("foo", converter.getDefaultObjectValue());
 		
-		assertSourceContains("@ObjectTypeConverter(defaultObjectValue=\"foo\")", cu);
+		assertSourceContains("@ObjectTypeConverter(defaultObjectValue = \"foo\")", cu);
 	}
 	
 	public void testSetDefaultObjectValueNull() throws Exception {
@@ -367,7 +367,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		assertNull(converter.conversionValueAt(2).getDataValue());
 		assertNull(converter.conversionValueAt(2).getObjectValue());
 
-		assertSourceContains("@ObjectTypeConverter(name=\"bar\", conversionValues = {@ConversionValue(dataValue=\"BAR\"),@ConversionValue(objectValue=\"FOO\"), @ConversionValue})", cu);
+		assertSourceContains("@ObjectTypeConverter(name = \"bar\", conversionValues = {@ConversionValue(dataValue = \"BAR\"),@ConversionValue(objectValue = \"FOO\"), @ConversionValue})", cu);
 	}
 	
 	public void testRemoveConversionValue() throws Exception {
@@ -383,20 +383,20 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		assertEquals("Female", conversionValues.next().getObjectValue());
 		assertEquals("Male", conversionValues.next().getObjectValue());
 		assertFalse(conversionValues.hasNext());
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue=\"FOO\"), @ConversionValue(dataValue=\"F\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue = \"FOO\"), @ConversionValue(dataValue = \"F\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})", cu);
 		
 		converter.removeConversionValue(1);
 		conversionValues = converter.conversionValues();
 		assertEquals("FOO", conversionValues.next().getObjectValue());
 		assertEquals("Male", conversionValues.next().getObjectValue());
 		assertFalse(conversionValues.hasNext());
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue=\"FOO\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue = \"FOO\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})", cu);
 
 		converter.removeConversionValue(0);
 		conversionValues = converter.conversionValues();
 		assertEquals("Male", conversionValues.next().getObjectValue());
 		assertFalse(conversionValues.hasNext());
-		assertSourceContains("@ObjectTypeConverter(conversionValues = @ConversionValue(dataValue=\"M\", objectValue = \"Male\"))", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = @ConversionValue(dataValue = \"M\", objectValue = \"Male\"))", cu);
 
 		
 		converter.removeConversionValue(0);
@@ -412,7 +412,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		ObjectTypeConverterAnnotation converter = (ObjectTypeConverterAnnotation) attributeResource.getSupportingAnnotation(EclipseLinkJPA.OBJECT_TYPE_CONVERTER);
 		converter.addConversionValue(0).setObjectValue("FOO");
 		
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue=\"FOO\"), @ConversionValue(dataValue=\"F\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue = \"FOO\"), @ConversionValue(dataValue = \"F\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})", cu);
 
 		converter.moveConversionValue(2, 0);
 		assertEquals("Female", converter.conversionValueAt(0).getObjectValue());
@@ -422,7 +422,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		assertEquals("FOO", converter.conversionValueAt(2).getObjectValue());
 		assertEquals(null, converter.conversionValueAt(2).getDataValue());
 		assertEquals(3, converter.conversionValuesSize());
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue=\"F\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\"), @ConversionValue(objectValue=\"FOO\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue = \"F\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\"), @ConversionValue(objectValue = \"FOO\")})", cu);
 	}
 	
 	public void testMoveConversionValue2() throws Exception {
@@ -433,7 +433,7 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		ObjectTypeConverterAnnotation converter = (ObjectTypeConverterAnnotation) attributeResource.getSupportingAnnotation(EclipseLinkJPA.OBJECT_TYPE_CONVERTER);
 		converter.addConversionValue(0).setObjectValue("FOO");
 		
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue=\"FOO\"), @ConversionValue(dataValue=\"F\", objectValue = \"Female\"), @ConversionValue(dataValue=\"M\", objectValue = \"Male\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(objectValue = \"FOO\"), @ConversionValue(dataValue = \"F\", objectValue = \"Female\"), @ConversionValue(dataValue = \"M\", objectValue = \"Male\")})", cu);
 
 		converter.moveConversionValue(0, 2);
 		assertEquals("Male", converter.conversionValueAt(0).getObjectValue());
@@ -443,6 +443,6 @@ public class ObjectTypeConverterAnnotationTests extends EclipseLinkJavaResourceM
 		assertEquals("Female", converter.conversionValueAt(2).getObjectValue());
 		assertEquals("F", converter.conversionValueAt(2).getDataValue());
 		assertEquals(3, converter.conversionValuesSize());
-		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue=\"M\", objectValue = \"Male\"), @ConversionValue(objectValue=\"FOO\"), @ConversionValue(dataValue=\"F\", objectValue = \"Female\")})", cu);
+		assertSourceContains("@ObjectTypeConverter(conversionValues = {@ConversionValue(dataValue = \"M\", objectValue = \"Male\"), @ConversionValue(objectValue = \"FOO\"), @ConversionValue(dataValue = \"F\", objectValue = \"Female\")})", cu);
 	}
 }
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TransformationAnnotationTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TransformationAnnotationTests.java
index f0d624748b..cb1730bf57 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TransformationAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TransformationAnnotationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -49,7 +49,7 @@ public class TransformationAnnotationTests extends EclipseLinkJavaResourceModelT
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Transformation(optional=true)");
+				sb.append("@Transformation(optional = true)");
 			}
 		});
 	}
@@ -64,7 +64,7 @@ public class TransformationAnnotationTests extends EclipseLinkJavaResourceModelT
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@Transformation(fetch=FetchType.EAGER)");
+				sb.append("@Transformation(fetch = FetchType.EAGER)");
 			}
 		});
 	}
@@ -103,7 +103,7 @@ public class TransformationAnnotationTests extends EclipseLinkJavaResourceModelT
 		transformation.setOptional(Boolean.FALSE);
 		assertEquals(Boolean.FALSE, transformation.getOptional());
 		
-		assertSourceContains("@Transformation(optional=false)", cu);
+		assertSourceContains("@Transformation(optional = false)", cu);
 	}
 	
 	public void testSetOptionalNull() throws Exception {
@@ -141,7 +141,7 @@ public class TransformationAnnotationTests extends EclipseLinkJavaResourceModelT
 		transformation.setFetch(FetchType.LAZY);
 		assertEquals(FetchType.LAZY, transformation.getFetch());
 		
-		assertSourceContains("@Transformation(fetch=LAZY)", cu);
+		assertSourceContains("@Transformation(fetch = LAZY)", cu);
 	}
 	
 	public void testSetFetchNull() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TypeConverterAnnotationTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TypeConverterAnnotationTests.java
index 33fd46dab0..65831e799e 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TypeConverterAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/TypeConverterAnnotationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -47,7 +47,7 @@ public class TypeConverterAnnotationTests extends EclipseLinkJavaResourceModelTe
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@TypeConverter(dataType=Foo.class)");
+				sb.append("@TypeConverter(dataType = Foo.class)");
 			}
 		});
 	}
@@ -61,7 +61,7 @@ public class TypeConverterAnnotationTests extends EclipseLinkJavaResourceModelTe
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@TypeConverter(objectType=Foo.class)");
+				sb.append("@TypeConverter(objectType = Foo.class)");
 			}
 		});
 	}
@@ -75,7 +75,7 @@ public class TypeConverterAnnotationTests extends EclipseLinkJavaResourceModelTe
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@TypeConverter(name=\"bar\")");
+				sb.append("@TypeConverter(name = \"bar\")");
 			}
 		});
 	}
@@ -114,11 +114,11 @@ public class TypeConverterAnnotationTests extends EclipseLinkJavaResourceModelTe
 		converter.setDataType("Bar");
 		assertEquals("Bar", converter.getDataType());
 		
-		assertSourceContains("@TypeConverter(dataType=Bar.class)", cu);
+		assertSourceContains("@TypeConverter(dataType = Bar.class)", cu);
 		
 		converter.setDataType("int");
 		assertEquals("int", converter.getDataType());
-		assertSourceContains("@TypeConverter(dataType=int.class)", cu);
+		assertSourceContains("@TypeConverter(dataType = int.class)", cu);
 	}
 	
 	public void testSetDataTypeNull() throws Exception {
@@ -156,11 +156,11 @@ public class TypeConverterAnnotationTests extends EclipseLinkJavaResourceModelTe
 		converter.setObjectType("Bar");
 		assertEquals("Bar", converter.getObjectType());
 		
-		assertSourceContains("@TypeConverter(objectType=Bar.class)", cu);
+		assertSourceContains("@TypeConverter(objectType = Bar.class)", cu);
 		
 		converter.setObjectType("int");
 		assertEquals("int", converter.getObjectType());
-		assertSourceContains("@TypeConverter(objectType=int.class)", cu);
+		assertSourceContains("@TypeConverter(objectType = int.class)", cu);
 	}
 	
 	public void testSetObjectTypeNull() throws Exception {
@@ -198,7 +198,7 @@ public class TypeConverterAnnotationTests extends EclipseLinkJavaResourceModelTe
 		converter.setName("foo");
 		assertEquals("foo", converter.getName());
 		
-		assertSourceContains("@TypeConverter(name=\"foo\")", cu);
+		assertSourceContains("@TypeConverter(name = \"foo\")", cu);
 	}
 	
 	public void testSetNameNull() throws Exception {
diff --git a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/WriteTransformerAnnotationTests.java b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/WriteTransformerAnnotationTests.java
index 101d776e33..6879da3b88 100644
--- a/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/WriteTransformerAnnotationTests.java
+++ b/jpa/tests/org.eclipse.jpt.eclipselink.core.tests/src/org/eclipse/jpt/eclipselink/core/tests/internal/resource/java/WriteTransformerAnnotationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -67,7 +67,7 @@ public class WriteTransformerAnnotationTests extends EclipseLinkJavaResourceMode
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@WriteTransformer(transformerClass=Foo.class)");
+				sb.append("@WriteTransformer(transformerClass = Foo.class)");
 			}
 		});
 	}
@@ -81,7 +81,7 @@ public class WriteTransformerAnnotationTests extends EclipseLinkJavaResourceMode
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@WriteTransformer(method=\"transformerMethod\")");
+				sb.append("@WriteTransformer(method = \"transformerMethod\")");
 			}
 		});
 	}
@@ -95,7 +95,7 @@ public class WriteTransformerAnnotationTests extends EclipseLinkJavaResourceMode
 			}
 			@Override
 			public void appendIdFieldAnnotationTo(StringBuilder sb) {
-				sb.append("@WriteTransformer(column=@Column(name=\"FOO\"))");
+				sb.append("@WriteTransformer(column = @Column(name = \"FOO\"))");
 			}
 		});
 	}
@@ -135,7 +135,7 @@ public class WriteTransformerAnnotationTests extends EclipseLinkJavaResourceMode
 		writeTransformer.setTransformerClass("Bar");
 		assertEquals("Bar", writeTransformer.getTransformerClass());
 		
-		assertSourceContains("@WriteTransformer(transformerClass=Bar.class)", cu);
+		assertSourceContains("@WriteTransformer(transformerClass = Bar.class)", cu);
 	}
 	
 	public void testSetTransformerClassNull() throws Exception {
@@ -173,7 +173,7 @@ public class WriteTransformerAnnotationTests extends EclipseLinkJavaResourceMode
 		writeTransformer.setMethod("foo");
 		assertEquals("foo", writeTransformer.getMethod());
 		
-		assertSourceContains("@WriteTransformer(method=\"foo\")", cu);
+		assertSourceContains("@WriteTransformer(method = \"foo\")", cu);
 	}
 	
 	public void testSetMethodNull() throws Exception {
@@ -213,10 +213,10 @@ public class WriteTransformerAnnotationTests extends EclipseLinkJavaResourceMode
 		writeTransformer.addColumn();
 		
 		assertNotNull(writeTransformer.getColumn());		
-		assertSourceContains("@WriteTransformer(method=\"transformerMethod\", column = @Column)", cu);
+		assertSourceContains("@WriteTransformer(method = \"transformerMethod\", column = @Column)", cu);
 		
 		writeTransformer.getColumn().setName("BAR");
-		assertSourceContains("@WriteTransformer(method=\"transformerMethod\", column = @Column(name=\"BAR\"))", cu);
+		assertSourceContains("@WriteTransformer(method = \"transformerMethod\", column = @Column(name = \"BAR\"))", cu);
 		
 	}