fixed some compiler warnings

17 files changed, 71 insertions, 81 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.java
index 6964efd961..7ae91fc9c9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratorHolder.java
@@ -18,7 +18,8 @@ package org.eclipse.jpt.core.context;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface GeneratorHolder extends JpaContextNode
+public interface GeneratorHolder
+	extends JpaContextNode
 {
 	//******************** table generator *****************
 	TableGenerator getTableGenerator();
@@ -27,7 +28,7 @@ public interface GeneratorHolder extends JpaContextNode
 
 	void removeTableGenerator();
 
-	String TABLE_GENERATOR_PROPERTY = "tableGeneratorProperty";
+	String TABLE_GENERATOR_PROPERTY = "tableGenerator"; //$NON-NLS-1$
 
 	
 	//******************** sequence generator *****************
@@ -37,5 +38,6 @@ public interface GeneratorHolder extends JpaContextNode
 
 	void removeSequenceGenerator();
 
-	String SEQUENCE_GENERATOR_PROPERTY = "sequenceGeneratorProperty";
-}
\ No newline at end of file
+	String SEQUENCE_GENERATOR_PROPERTY = "sequenceGenerator"; //$NON-NLS-1$
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java
index f9ca8245e1..640734b32b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java
@@ -21,22 +21,23 @@ import org.eclipse.jpt.db.Table;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface NamedColumn extends JpaContextNode
+public interface NamedColumn
+	extends JpaContextNode
 {
 	String getName();
 
 	String getDefaultName();
-		String DEFAULT_NAME_PROPERTY = "defaultNameProperty";
+		String DEFAULT_NAME_PROPERTY = "defaultName"; //$NON-NLS-1$
 
 	String getSpecifiedName();
 	void setSpecifiedName(String value);
-		String SPECIFIED_NAME_PROPERTY = "specifiedNameProperty";
+		String SPECIFIED_NAME_PROPERTY = "specifiedName"; //$NON-NLS-1$
 
 
 	String getColumnDefinition();
 
 	void setColumnDefinition(String value);
-		String COLUMN_DEFINITION_PROPERTY = "columnDefinitionProperty";
+		String COLUMN_DEFINITION_PROPERTY = "columnDefinition"; //$NON-NLS-1$
 
 
 	/**
@@ -60,8 +61,7 @@ public interface NamedColumn extends JpaContextNode
 	 * interface allowing columns to be used in multiple places
 	 * (e.g. basic mappings and attribute overrides)
 	 */
-	interface Owner
-	{
+	interface Owner {
 		/**
 		 * Return the type mapping that contains the column.
 		 */
@@ -77,4 +77,5 @@ public interface NamedColumn extends JpaContextNode
 		 */
 		String getDefaultColumnName();
 	}
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java
index 2c0a252b2c..385f541bcf 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java
@@ -18,15 +18,19 @@ package org.eclipse.jpt.core.context;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface SequenceGenerator extends Generator
+public interface SequenceGenerator
+	extends Generator
 {
 	Integer DEFAULT_INITIAL_VALUE = Integer.valueOf(1);
 
-	String getSequenceName();
-	
-	String getDefaultSequenceName();
-		String DEFAULT_SEQUENCE_NAME_PROPERTY = "defaultSequenceNameProperty";
+
+	// ********** sequence name **********
+
 	String getSpecifiedSequenceName();
 	void setSpecifiedSequenceName(String value);
-		String SPECIFIED_SEQUENCE_NAME_PROPERTY = "specifiedSequenceNameProperty";
+		String SPECIFIED_SEQUENCE_NAME_PROPERTY = "specifiedSequenceName"; //$NON-NLS-1$
+	String getSequenceName();
+	String getDefaultSequenceName();
+		String DEFAULT_SEQUENCE_NAME_PROPERTY = "defaultSequenceName"; //$NON-NLS-1$
+
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.java
index 94db69939a..d77ace489c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/UniqueConstraint.java
@@ -56,7 +56,7 @@ public interface UniqueConstraint extends JpaContextNode
 	 * Move the column name from the source index to the target index.
 	 */
 	void moveColumnName(int targetIndex, int sourceIndex);
-		String COLUMN_NAMES_LIST = "columnNamesList";
+		String COLUMN_NAMES_LIST = "columnNames"; //$NON-NLS-1$
 		
 	/**
 	 * All containers must implement this interface.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java
index 20e89d685d..6c059289c5 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java
@@ -39,6 +39,6 @@ public interface OrmJoinColumn extends JoinColumn, OrmBaseJoinColumn, OrmBaseCol
 	 */
 	interface Owner extends JoinColumn.Owner, OrmBaseJoinColumn.Owner, OrmBaseColumn.Owner
 	{
-
+		// nothing yet
 	}
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java
index fba346368d..acf75e0219 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java
@@ -15,7 +15,8 @@ import org.eclipse.jpt.core.utility.TextRange;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
 /**
- * 
+ * ORM JPA context nodes have slightly different validation protocol than Java
+ * JPA context nodes.
  * 
  * Provisional API: This interface is part of an interim API that is still
  * under development and expected to change significantly before reaching
@@ -23,12 +24,12 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage;
  * pioneering adopters on the understanding that any code that uses this API
  * will almost certainly be broken (repeatedly) as the API evolves.
  */
-public interface OrmJpaContextNode extends JpaContextNode
+public interface OrmJpaContextNode
+	extends JpaContextNode
 {
-	// **************** validation **************************************
 
 	/**
-	 * Add to the list of current validation messages
+	 * Add to the list of current validation messages.
 	 */
 	void addToMessages(List<IMessage> messages);
 
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java
index 3e839c9a0a..cea868cb76 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java
@@ -61,7 +61,7 @@ public interface OrmPersistentType extends PersistentType, OrmJpaContextNode
 
 	
 	//******************* vritual attributes *******************
-	String VIRTUAL_ATTRIBUTES_LIST = "virtualAttributesList";
+	String VIRTUAL_ATTRIBUTES_LIST = "virtualAttributes"; //$NON-NLS-1$
 
 	/**
 	 * Return a read only iterator of the virtual orm persistent attributes.  These
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
index e3cf890046..26da7b6795 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/MappingTools.java
@@ -31,7 +31,7 @@ public class MappingTools
 	 * [owning table name]_[target table name]
 	 */
 	public static String buildJoinTableDefaultName(RelationshipMapping relationshipMapping) {
-		if (!relationshipMapping.isRelationshipOwner()) {
+		if ( ! relationshipMapping.isRelationshipOwner()) {
 			return null;
 		}
 		String owningTableName = relationshipMapping.getTypeMapping().getTableName();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.java
index 34bcc085f8..96f693146a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaJpaContextNode.java
@@ -18,7 +18,9 @@ import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode;
 import org.eclipse.jpt.utility.Filter;
 import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 
-public abstract class AbstractJavaJpaContextNode extends AbstractJpaContextNode implements JavaJpaContextNode
+public abstract class AbstractJavaJpaContextNode
+	extends AbstractJpaContextNode
+	implements JavaJpaContextNode
 {
 	// ********** constructor **********
 
@@ -43,6 +45,7 @@ public abstract class AbstractJavaJpaContextNode extends AbstractJpaContextNode
 	 * only return candidates for the current object. The cascading is
 	 * handled by #javaCompletionProposals(int, Filter, CompilationUnit).
 	 */
+	@SuppressWarnings("unused")
 	public Iterator<String> connectedJavaCompletionProposals(int pos, Filter<String> filter, CompilationUnit astRoot) {
 		return null;
 	}
@@ -54,7 +57,7 @@ public abstract class AbstractJavaJpaContextNode extends AbstractJpaContextNode
 	 * should be preceded by a "super" call to this method
 	 */
 	public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) {
-		
+		// do nothing by default
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.java
index 44629289ff..83f19e0f93 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraintAnnotation.java
@@ -38,7 +38,7 @@ public interface UniqueConstraintAnnotation extends JavaResourceNode
 	void removeColumnName(int index);
 	
 	void moveColumnName(int targetIndex, int sourceIndex);
-		String COLUMN_NAMES_LIST = "columnNamesList";
+		String COLUMN_NAMES_LIST = "columnNames"; //$NON-NLS-1$
 		
 	/**
 	 * Return whether the specified postition touches the columnNames element.
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java
index 40f595db55..6b6f88ceae 100644
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java
+++ b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenTools.java
@@ -58,11 +58,7 @@ public class EntityGenTools {
 			// leave mixed case identifiers alone?
 			result = StringTools.convertUnderscoresToCamelCase(result, capitalizeFirstLetter);
 		} else {
-			if (capitalizeFirstLetter) {
-				result = StringTools.capitalize(result);
-			} else {
-				result = StringTools.uncapitalize(result);
-			}
+			result = capitalizeFirstLetter ? StringTools.capitalize(result) : StringTools.uncapitalize(result);
 		}
 		result = NameTools.convertToJavaIdentifier(result);
 		// assume that converting to a unique name will not result in a Java reserved word
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java
index 3d138638e7..d2620857f5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java
@@ -1,11 +1,12 @@
 /*******************************************************************************
- *  Copyright (c) 2008 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
+ * Copyright (c) 2008 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.
  *
- *  Contributors: Oracle. - initial API and implementation
- *******************************************************************************/
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.ui.internal;
 
 import org.eclipse.core.runtime.Platform;
@@ -83,14 +84,8 @@ public final class Tracing
 	 */
 	public static boolean booleanDebugOption(String flag, boolean defaultValue)
 	{
-		String result = Platform.getDebugOption(JptUiPlugin.PLUGIN_ID + flag);
-
-		if (result == null)
-		{
-			return defaultValue;
-		}
-
-		return Boolean.valueOf(result.trim());
+		String string = Platform.getDebugOption(JptUiPlugin.PLUGIN_ID + flag);
+		return (string == null) ? defaultValue : Boolean.parseBoolean(string.trim());
 	}
 
 	/**
@@ -119,14 +114,8 @@ public final class Tracing
 	 */
 	public static int intDebugOption(String flag, int defaultValue)
 	{
-		String result = Platform.getDebugOption(JptUiPlugin.PLUGIN_ID + flag);
-
-		if (result == null)
-		{
-			return defaultValue;
-		}
-
-		return Integer.valueOf(result);
+		String string = Platform.getDebugOption(JptUiPlugin.PLUGIN_ID + flag);
+		return (string == null) ?  defaultValue : Integer.parseInt(string);
 	}
 
 	/**
@@ -166,13 +155,7 @@ public final class Tracing
 	 */
 	public static String stringDebugOption(String flag, String defaultValue)
 	{
-		String result = Platform.getDebugOption(JptUiPlugin.PLUGIN_ID + flag);
-
-		if (result == null)
-		{
-			result = defaultValue;
-		}
-
-		return result;
+		String string = Platform.getDebugOption(JptUiPlugin.PLUGIN_ID + flag);
+		return (string != null) ? string : defaultValue;
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTCollectionChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTCollectionChangeListenerWrapper.java
index 4f11110b9e..6b9b1b1558 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTCollectionChangeListenerWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTCollectionChangeListenerWrapper.java
@@ -55,7 +55,7 @@ public class SWTCollectionChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "items added";
+				return "items added"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -67,7 +67,7 @@ public class SWTCollectionChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "items removed";
+				return "items removed"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -79,7 +79,7 @@ public class SWTCollectionChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "collection cleared";
+				return "collection cleared"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -91,7 +91,7 @@ public class SWTCollectionChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "collection changed";
+				return "collection changed"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -124,7 +124,7 @@ public class SWTCollectionChangeListenerWrapper
 
 	@Override
 	public String toString() {
-		return "SWT(" + this.listener.toString() + ")";
+		return "SWT(" + this.listener.toString() + ')'; //$NON-NLS-1$
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTListChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTListChangeListenerWrapper.java
index 1cfcb99091..16e51c73b1 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTListChangeListenerWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTListChangeListenerWrapper.java
@@ -63,7 +63,7 @@ public class SWTListChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "items added";
+				return "items added"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -75,7 +75,7 @@ public class SWTListChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "items removed";
+				return "items removed"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -87,7 +87,7 @@ public class SWTListChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "items moved";
+				return "items moved"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -99,7 +99,7 @@ public class SWTListChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "items replaced";
+				return "items replaced"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -111,7 +111,7 @@ public class SWTListChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "list cleared";
+				return "list cleared"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -123,7 +123,7 @@ public class SWTListChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "list changed";
+				return "list changed"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -164,7 +164,7 @@ public class SWTListChangeListenerWrapper
 
 	@Override
 	public String toString() {
-		return "SWT(" + this.listener.toString() + ")";
+		return "SWT(" + this.listener.toString() + ')'; //$NON-NLS-1$
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTPropertyChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTPropertyChangeListenerWrapper.java
index 25fd34f79f..58fc3b3c66 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTPropertyChangeListenerWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTPropertyChangeListenerWrapper.java
@@ -60,7 +60,7 @@ public class SWTPropertyChangeListenerWrapper
 
 	@Override
 	public String toString() {
-		return "SWT(" + this.listener.toString() + ")";
+		return "SWT(" + this.listener.toString() + ')'; //$NON-NLS-1$
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTStateChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTStateChangeListenerWrapper.java
index 655226bbb6..f334d66296 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTStateChangeListenerWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTStateChangeListenerWrapper.java
@@ -60,7 +60,7 @@ public class SWTStateChangeListenerWrapper
 
 	@Override
 	public String toString() {
-		return "SWT(" + this.listener.toString() + ")";
+		return "SWT(" + this.listener.toString() + ')'; //$NON-NLS-1$
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTTreeChangeListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTTreeChangeListenerWrapper.java
index 1b9a97447d..726f73846d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTTreeChangeListenerWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/listeners/SWTTreeChangeListenerWrapper.java
@@ -55,7 +55,7 @@ public class SWTTreeChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "node added";
+				return "node added"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -67,7 +67,7 @@ public class SWTTreeChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "node removed";
+				return "node removed"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -79,7 +79,7 @@ public class SWTTreeChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "tree cleared";
+				return "tree cleared"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -91,7 +91,7 @@ public class SWTTreeChangeListenerWrapper
 			}
 			@Override
 			public String toString() {
-				return "tree changed";
+				return "tree changed"; //$NON-NLS-1$
 			}
 		};
 	}
@@ -124,7 +124,7 @@ public class SWTTreeChangeListenerWrapper
 
 	@Override
 	public String toString() {
-		return "SWT(" + this.listener.toString() + ")";
+		return "SWT(" + this.listener.toString() + ')'; //$NON-NLS-1$
 	}
 
 }