toString() considered helpful

22 files changed, 122 insertions, 48 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java
index 4b67456ff2..64e7dc0067 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java
@@ -32,4 +32,9 @@ public abstract class AbstractResourceModel
 		// do nothing by default
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.file.getName());
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java
index 17a73165f2..c206c3f10b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java
@@ -125,9 +125,10 @@ public class GenericJpaFile extends AbstractJpaNode implements JpaFile
 	
 	@Override
 	public void toString(StringBuilder sb) {
-		sb.append(getFile().toString());
-		sb.append(" (resourceType: ");
-		sb.append(getResourceType());
-		sb.append(")");
+		sb.append(this.file);
+		sb.append(" (resourceType: "); //$NON-NLS-1$
+		sb.append(this.getResourceType());
+		sb.append(')');
 	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
index 7a7777f224..755f81fef1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java
@@ -182,4 +182,10 @@ public abstract class AbstractJavaQuery extends AbstractJavaJpaContextNode
 		// java is at the base of the tree
 		return false;
 	}
+
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
index 0072201a5e..d03e9a660c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java
@@ -67,4 +67,10 @@ public class GenericJavaQueryHint extends AbstractJavaJpaContextNode implements
 	public TextRange getValidationTextRange(CompilationUnit astRoot) {
 		return this.resourceQueryHint.getTextRange(astRoot);
 	}
+
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+	
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java
index ee891e1d6a..625560adb5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java
@@ -104,4 +104,9 @@ public class VirtualAttributeOverride extends AbstractJavaResourceNode implement
 		return null;
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
index 4e0f2b7a17..0b87f918bd 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java
@@ -187,5 +187,9 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn>  extends
 		return this.getOwner().getDefaultColumnName();
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.getName());
+	}
 
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
index 8934aebc39..8cd0716754 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java
@@ -172,4 +172,10 @@ public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractOrmJp
 	public TextRange getNameTextRange() {
 		return this.getResourceQuery().getNameTextRange();
 	}
+
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java
index 3be2bcee19..a1a29ae753 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java
@@ -187,6 +187,11 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode
 		return null;
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+
 	class JoinColumnOwner implements OrmJoinColumn.Owner
 	{
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java
index fb14e2094a..ce3e7b9739 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java
@@ -213,4 +213,9 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode
 		}
 	}
 	
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java
index 53e8683f49..b58990e3d5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java
@@ -67,4 +67,10 @@ public class GenericOrmQueryHint extends AbstractOrmJpaContextNode implements Or
 	public TextRange getValidationTextRange() {
 		return this.resourceQueryHint.getValidationTextRange();
 	}
+
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java
index f3d17d64ec..63a53683ad 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java
@@ -79,13 +79,10 @@ public class GenericProperty extends AbstractPersistenceJpaContextNode
 	
 	// **************** toString
 	@Override
-	public void toString(StringBuilder sb)
-	{
-		sb.append(" (name: ");
-		sb.append(name);
-		sb.append(", value: ");
-		sb.append(value);
-		sb.append(')');
+	public void toString(StringBuilder sb) {
+		sb.append(this.name);
+		sb.append(" = "); //$NON-NLS-1$
+		sb.append(this.value);
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java
index a4354ff0dd..5dbd2b38d1 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourcePersistentMember.java
@@ -520,6 +520,11 @@ public abstract class AbstractJavaResourcePersistentMember<E extends Member>
 		};
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.getMember());
+	}
+
 
 	// ********** AST visitor **********
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java
index 1036203dc1..acf1790ccc 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceAnnotation.java
@@ -130,4 +130,9 @@ public abstract class AbstractResourceAnnotation<E extends Member>
 		return (elementTextRange != null) && elementTextRange.touches(pos);
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.getAnnotationName());
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
index 9e5345f80c..94e7ab2841 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResourceTable.java
@@ -339,5 +339,10 @@ public abstract class AbstractResourceTable extends AbstractResourceAnnotation<M
 			return AbstractResourceTable.this.getUniqueConstraintsElementName();
 		}
 
+		@Override
+		public void toString(StringBuilder sb) {
+			sb.append(this.getAnnotationName());
+		}
+
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
index 7d40db7435..6270a8797a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java
@@ -43,7 +43,7 @@ public class AssociationOverrideImpl
 {		
 	public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME);
 		
-	private final List<NestableJoinColumn> joinColumns;
+	protected final List<NestableJoinColumn> joinColumns;
 	
 	private final JoinColumnsContainerAnnotation joinColumnsContainerAnnotation;
 	
@@ -109,7 +109,7 @@ public class AssociationOverrideImpl
 		ContainerAnnotationTools.synchAnnotationsAfterRemove(index, this.joinColumnsContainerAnnotation);
 	}
 
-	private void removeJoinColumn(NestableJoinColumn joinColumn) {
+	protected void removeJoinColumn(NestableJoinColumn joinColumn) {
 		removeItemFromList(joinColumn, this.joinColumns, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST);
 	}
 
@@ -249,6 +249,11 @@ public class AssociationOverrideImpl
 			return JPA.ASSOCIATION_OVERRIDE__JOIN_COLUMNS;
 		}
 
+		@Override
+		public void toString(StringBuilder sb) {
+			sb.append(this.getAnnotationName());
+		}
+
 	}
 
 	public static class AssociationOverrideAnnotationDefinition implements AnnotationDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
index 60bb103718..24f2dcaedd 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java
@@ -43,9 +43,9 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 
 	private static final DeclarationAnnotationElementAdapter<String> CATALOG_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__CATALOG);
 	
-	private final List<NestableJoinColumn> joinColumns;
+	protected final List<NestableJoinColumn> joinColumns;
 	
-	private final List<NestableJoinColumn> inverseJoinColumns;
+	protected final List<NestableJoinColumn> inverseJoinColumns;
 	
 	private final JoinColumnsContainerAnnotation joinColumnsContainerAnnotation;
 	
@@ -215,7 +215,7 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 		return JoinColumnImpl.createJoinTableInverseJoinColumn(this, getMember(), index);
 	}
 
-	private class JoinColumnsContainerAnnotation extends AbstractContainerAnnotation {
+	protected class JoinColumnsContainerAnnotation extends AbstractContainerAnnotation {
 
 		public NestableJoinColumn addInternal(int index) {
 			NestableJoinColumn joinColumn = JoinTableImpl.this.createJoinColumn(index);
@@ -261,7 +261,7 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 		}
 	}
 	
-	private class InverseJoinColumnsContainerAnnotation extends AbstractContainerAnnotation {
+	protected class InverseJoinColumnsContainerAnnotation extends AbstractContainerAnnotation {
 
 		public NestableJoinColumn addInternal(int index) {
 			NestableJoinColumn joinColumn = JoinTableImpl.this.createInverseJoinColumn(index);
@@ -358,6 +358,12 @@ public class JoinTableImpl extends AbstractResourceTable implements JoinTableAnn
 		public TextRange getTextRange(CompilationUnit astRoot) {
 			return JoinTableImpl.this.getTextRange(astRoot);
 		}
+		
+		@Override
+		public void toString(StringBuilder sb) {
+			sb.append(this.getAnnotationName());
+		}
+		
 	}
 	public static class JoinTableAnnotationDefinition implements AnnotationDefinition
 	{
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java
index c00fb97128..e96a8592fb 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java
@@ -113,4 +113,9 @@ public class NullAssociationOverride extends AbstractJavaResourceNode implements
 		return null;
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.getName());
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java
index b0663e2009..185dcec16c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java
@@ -83,18 +83,18 @@ public abstract class NullBaseTable extends AbstractJavaResourceNode implements
 		return createTableResource().addUniqueConstraint(index);		
 	}
 
-	public void removeUniqueConstraint(int index) {
+	public void removeUniqueConstraint(@SuppressWarnings("unused") int index) {
 		throw new UnsupportedOperationException();
 	}
 
-	public int indexOfUniqueConstraint(UniqueConstraintAnnotation uniqueConstraint) {
+	public int indexOfUniqueConstraint(@SuppressWarnings("unused") UniqueConstraintAnnotation uniqueConstraint) {
 		throw new UnsupportedOperationException();
 	}
 
-	public void moveUniqueConstraint(int targetIndex, int sourceIndex) {
+	public void moveUniqueConstraint(@SuppressWarnings("unused") int targetIndex, @SuppressWarnings("unused") int sourceIndex) {
 		throw new UnsupportedOperationException();
 	}
-	public UniqueConstraintAnnotation uniqueConstraintAt(int index) {
+	public UniqueConstraintAnnotation uniqueConstraintAt(@SuppressWarnings("unused") int index) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -110,27 +110,27 @@ public abstract class NullBaseTable extends AbstractJavaResourceNode implements
 		return null;
 	}
 
-	public TextRange getNameTextRange(CompilationUnit astRoot) {
+	public TextRange getNameTextRange(@SuppressWarnings("unused") CompilationUnit astRoot) {
 		return null;
 	}
 
-	public TextRange getCatalogTextRange(CompilationUnit astRoot) {
+	public TextRange getCatalogTextRange(@SuppressWarnings("unused") CompilationUnit astRoot) {
 		return null;
 	}
 
-	public TextRange getSchemaTextRange(CompilationUnit astRoot) {
+	public TextRange getSchemaTextRange(@SuppressWarnings("unused") CompilationUnit astRoot) {
 		return null;
 	}
 
-	public boolean nameTouches(int pos, CompilationUnit astRoot) {
+	public boolean nameTouches(@SuppressWarnings("unused") int pos, @SuppressWarnings("unused") CompilationUnit astRoot) {
 		return false;
 	}
 
-	public boolean catalogTouches(int pos, CompilationUnit astRoot) {
+	public boolean catalogTouches(@SuppressWarnings("unused") int pos, @SuppressWarnings("unused") CompilationUnit astRoot) {
 		return false;
 	}
 
-	public boolean schemaTouches(int pos, CompilationUnit astRoot) {
+	public boolean schemaTouches(@SuppressWarnings("unused") int pos, @SuppressWarnings("unused") CompilationUnit astRoot) {
 		return false;
 	}
 
@@ -138,4 +138,9 @@ public abstract class NullBaseTable extends AbstractJavaResourceNode implements
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
+	public void toString(StringBuilder sb) {
+		sb.append(this.getName());
+	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
index 9d7d8b54f7..386b0dbe47 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java
@@ -45,7 +45,7 @@ public class SecondaryTableImpl extends AbstractResourceTable implements Nestabl
 {	
 	private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(SecondaryTableAnnotation.ANNOTATION_NAME);
 	
-	private final List<NestablePrimaryKeyJoinColumn> pkJoinColumns;
+	protected final List<NestablePrimaryKeyJoinColumn> pkJoinColumns;
 	
 	private final PkJoinColumnsContainerAnnotation pkJoinColumnsContainerAnnotation;
 	
@@ -290,6 +290,12 @@ public class SecondaryTableImpl extends AbstractResourceTable implements Nestabl
 		public String getElementName() {
 			return JPA.SECONDARY_TABLE__PK_JOIN_COLUMNS;
 		}
+
+		@Override
+		public void toString(StringBuilder sb) {
+			sb.append(this.getAnnotationName());
+		}
+
 	}
 
 	public static class SecondaryTableAnnotationDefinition implements AnnotationDefinition
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
index 962e20757a..91e1ddc4ea 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java
@@ -478,6 +478,12 @@ public class TableGeneratorImpl
 		public String getElementName() {
 			return JPA.TABLE_GENERATOR__UNIQUE_CONSTRAINTS;
 		}
+
+		@Override
+		public void toString(StringBuilder sb) {
+			sb.append(this.getAnnotationName());
+		}
+
 	}
 	
 
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCacheProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCacheProperties.java
index a8c5217f44..a34b9aa5ca 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCacheProperties.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCacheProperties.java
@@ -183,16 +183,6 @@ public class EntityCacheProperties extends AbstractModel {
 	}
 
 	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		StringTools.buildSimpleToStringOn(this, sb);
-		sb.append(" (");
-		this.toString(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	@Override
 	public void toString(StringBuilder sb) {
 		sb.append("name: ");
 		sb.append(this.entityName);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizerProperties.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizerProperties.java
index 1d619b1a46..b855e687f8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizerProperties.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizerProperties.java
@@ -105,16 +105,6 @@ public class EntityCustomizerProperties extends AbstractModel {
 	}
 
 	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		StringTools.buildSimpleToStringOn(this, sb);
-		sb.append(" (");
-		this.toString(sb);
-		sb.append(')');
-		return sb.toString();
-	}
-
-	@Override
 	public void toString(StringBuilder sb) {
 		sb.append("name: ");
 		sb.append(this.entityName);