Bug 526303 - Clean up code to compile with Tycho 1.0

Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
index 31904a2..6c78797 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/core/BeanInfoCacheController.java
@@ -58,7 +58,7 @@
  * Now roots can either be in a project, or they can be an external jar (which can be shared between projects).
  * <p>
  * Now all roots for a project will be stored in the project's working location
- * {@link org.eclipse.core.resources.IProject#getWorkingLocation(java.lang.String)}under the ".cache" directory. It will be this format in each
+ * { @link org.eclipse.core.resources.IProject#getWorkingLocation(java.lang.String)}under the ".cache" directory. It will be this format in each
  * project location (under the org.eclipse.jem.beaninfo directory):
  * 
  * <pre>
@@ -72,7 +72,7 @@
  * root's in the directory.
  * <p>
  * All of the external jar roots will be stored in the org.eclipse.jem.beaninfo plugin's state location
- * {@link org.eclipse.core.runtime.Platform#getStateLocation(org.osgi.framework.Bundle)}under the ".cache" directory. The format of this directory
+ * { @link org.eclipse.core.runtime.Platform#getStateLocation(org.osgi.framework.Bundle)}under the ".cache" directory. The format of this directory
  * will be the same as for each project. And the roots will be for each unique shared external jar (such as the differnt jre's rt.jars).
  * <p>
  * Note: There are so many places where synchronization is needed, so it is decided to synchronize only on BeanInfoCacheController.INSTANCE. It would
diff --git a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
index 2e4df75..afe6402 100644
--- a/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
+++ b/plugins/org.eclipse.jem.beaninfo/beaninfo/org/eclipse/jem/internal/beaninfo/impl/BeaninfoPackageImpl.java
@@ -116,7 +116,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
index 0c553ff..4590381 100644
--- a/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
+++ b/plugins/org.eclipse.jem.proxy/initParser/org/eclipse/jem/internal/proxy/initParser/tree/ExpressionProcesser.java
@@ -686,7 +686,7 @@
 	/**
 	 * Pull the value of the expression proxy, dereferencing it if necessary. This is for resolution only purposes at the
 	 * end of the expression being processed. Not meant for general access to the value of expression proxy. Use 
-	 * {@link ExpressionProcesser#getExpressionProxyValue(int, Object[])} instead for general access to the value.
+	 * { @link ExpressionProcesser#getExpressionProxyValue(int, Object[])} instead for general access to the value.
 	 * 
 	 * @param proxyid
 	 * @param value
diff --git a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
index 8d99c47..57bc45d 100644
--- a/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
+++ b/plugins/org.eclipse.jem.workbench/workbench/org/eclipse/jem/workbench/utility/JavaModelListener.java
@@ -233,7 +233,7 @@
 	/**
 	 * Answers whether this element delta is a classpath change. I.e. something added/removed/moved around for the classpath. This should only be
 	 * called for a delta that is for an {@link IPackageFragmentRoot}. Should be called from an override of
-	 * {@link #processJavaElementChanged(IPackageFragmentRoot, IJavaElementDelta)}
+	 * { @link #processJavaElementChanged(IPackageFragmentRoot, IJavaElementDelta)}
 	 * 
 	 * @param delta
 	 * @return <code>true</code> if it is classpath change or <code>false</code> if not.
@@ -276,7 +276,7 @@
 
 	/**
 	 * Answers whether the file specified by the path is one that when changed can result in a classpath change. This is called from
-	 * {@link #isClasspathResourceChange(IJavaElementDelta)}. The file must be in the root of the project. The default is <code>false</code>.
+	 * { @link #isClasspathResourceChange(IJavaElementDelta)}. The file must be in the root of the project. The default is <code>false</code>.
 	 * Subclasses may override.
 	 * 
 	 * @param path
@@ -291,7 +291,7 @@
 	/**
 	 * Answers whether the given java project is in the classpath (including recursive). This currently will not walk through containers (such as the
 	 * PDE container). Only through the direct and recursive project references. The java project is determined by subclasses, see
-	 * {@link #getJavaProject()}.
+	 * { @link #getJavaProject()}.
 	 * 
 	 * @param javaProject
 	 * @return <code>true</code> if project is in classpath or <code>false</code> if not.
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
index d72a432..0e16b27 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/ParseVisitor.java
@@ -111,7 +111,7 @@
 	 * <p>
 	 * If they want to indicate an error, parse visitors can throw any other RuntimeException. 
 	 * Those will also stop visiting, but the exception will be passed on out of the 
-	 * {@link PTExpression#accept(ParseVisitor)}. StopVisiting will not be passed on
+	 * { @link PTExpression#accept(ParseVisitor)}. StopVisiting will not be passed on
 	 * but will be caught inside accept.
 	 * 
 	 * @since 1.1.0.1
diff --git a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
index 193d78f..410d26d 100644
--- a/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
+++ b/plugins/org.eclipse.jem/javainst/org/eclipse/jem/internal/instantiation/impl/InstantiationPackageImpl.java
@@ -304,7 +304,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
index 8327ad1..961ed05 100644
--- a/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
+++ b/plugins/org.eclipse.jem/mofjava/org/eclipse/jem/java/JavaClass.java
@@ -404,7 +404,7 @@
 	
 	/**
 	 * Return the reflection type, if it exists, for this class. If running within Eclipse this
-	 * will be an {@link org.eclipse.jdt.core.IType}, or running outside of Eclipse it will be a {@link java.lang.Class}.
+	 * will be an { @link org.eclipse.jdt.core.IType}, or running outside of Eclipse it will be a { @link java.lang.Class}.
 	 * 
 	 * @return IType if in Eclipse, Class if outside Eclipse, or <code>null</code> if type not found.
 	 * 
diff --git a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
index 76c0a8f..214bd1d 100644
--- a/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
+++ b/plugins/org.eclipse.jst.common.annotations.controller/controller/org/eclipse/jst/common/internal/annotations/registry/AttributeValuesHelper.java
@@ -24,7 +24,7 @@
 
 	/**
 	 * Return a simple String array containing the valid values for the given
-	 * {@link TagAttributeSpec}and {@link IJavaElement}.
+	 * { @link TagAttributeSpec}and {@link IJavaElement}.
 	 * 
 	 * @param tas
 	 * @param javaElement
diff --git a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
index 6806232..4a1e11a 100644
--- a/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
+++ b/plugins/org.eclipse.jst.common.annotations.ui/src/org/eclipse/jst/common/internal/annotations/ui/AbstractAnnotationTagProposal.java
@@ -594,7 +594,7 @@
 	 * proposal is still valid.
 	 * <p>
 	 * The default implementation checks if <code>prefix</code> is a prefix of the proposal's
-	 * {@link #getDisplayString() display string} using the {@link #isPrefix(String, String) }
+	 * { @link #getDisplayString() display string} using the {@link #isPrefix(String, String) }
 	 * method.
 	 * </p>
 	 * 
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java
index bb8ee41..a7e9808 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/IgnoreJavaInSourceFolderParticipant.java
@@ -57,7 +57,7 @@
 				 * one of it's consumed children, which may be a fileset, 
 				 * or some other unknown type of contributor
 				 */
-				IFile t = (IFile)file.getAdapter(IFile.class);
+				IFile t = file.getAdapter(IFile.class);
 				if( t != null ) {
 					Iterator<IPath> i = containers.iterator();
 					while(i.hasNext()) {
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java
index 257f197..6065fa3 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/ReplaceManifestExportParticipant.java
@@ -63,7 +63,7 @@
 				int originalIndex = 0;
 				for( int i = 0; i < children.length; i++) {
 					if( children[i].getName().equals(manifestPath.lastSegment())) {
-						original = (IFile)children[i].getAdapter(IFile.class);
+						original = children[i].getAdapter(IFile.class);
 						originalIndex = i;
 						File newManifest = getNewManifest(component.getProject(), original, javaClasspathURIs);
 						FlatFile newManifestExportable = new FlatFile(newManifest, newManifest.getName(), manifestPath.removeLastSegments(1));
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java
index a563e44..c5e12ba 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/SingleRootExportParticipant.java
@@ -126,7 +126,7 @@
 			IVirtualReference[] references) {
 		
 		for (IVirtualReference reference:references){
-			File f = (File)reference.getReferencedComponent().getAdapter(File.class);
+			File f = reference.getReferencedComponent().getAdapter(File.class);
 			IPath relativeReferenceRuntimePath = reference.getRuntimePath().makeRelative();
 			FlatFile file = new FlatFile(f, reference.getArchiveName(), relativeReferenceRuntimePath);
 			FlatResource existingRes = VirtualComponentFlattenUtility.getExistingModuleResource(resources, file.getModuleRelativePath().append(file.getName()));
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java
index 6c98551..ee23d9e 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/internal/modulecore/util/ManifestUtilities.java
@@ -83,7 +83,7 @@
 	}
 	
 	public static ArchiveManifest getBinaryComponentManifest(IVirtualComponent component, IPath manifestPath) {
-		java.io.File file = (File)component.getAdapter(File.class);
+		java.io.File file = component.getAdapter(File.class);
 		if( file != null && file.exists()) {
 			ArchiveManifest manifest = readBinaryManifest(file, manifestPath);
 			return manifest;
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
index fadb620..bd4f402 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/classpath/FlexibleProjectContainer.java
@@ -213,7 +213,7 @@
             if (comp.isBinary()) {
             	if( comp instanceof IClasspathDependencyComponent )
             		continue;
-            	newPath = (IPath)comp.getAdapter(IPath.class);
+            	newPath = comp.getAdapter(IPath.class);
             } else
                 newPath = comp.getProject().getFullPath();    
             
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java
index ced0aec..a8b18b1 100644
--- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java
+++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/javalite/IJavaProjectLite.java
@@ -13,7 +13,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaModel;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 
@@ -21,8 +20,8 @@
  * <p>
  * Represents a scaled down version of an {@link IJavaProject}. This subset of
  * methods is guaranteed to not force a load of the underlying
- * {@link IJavaModel}. This enables safe access to a limited set of
- * {@link IJavaProject} API for multi-threaded clients to call during times of
+ * { @link IJavaModel}. This enables safe access to a limited set of
+ * { @link IJavaProject} API for multi-threaded clients to call during times of
  * extreme concurrency, e.g. workbench startup.
  * </p>
  * <p>
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java
index 95a2bab..72248bb 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveAdapter.java
@@ -14,7 +14,7 @@
  * Abstract implementation of {@link IArchiveAdapter} intended for subclassing
  * by clients. See {@link IArchiveAdapter} for details. Clients will, however,
  * most likely wish to subclss either {@link AbstractArchiveLoadAdapter} or
- * {@link AbstractArchiveSaveAdapter} instead.
+ * { @link AbstractArchiveSaveAdapter} instead.
  */
 public abstract class AbstractArchiveAdapter implements IArchiveAdapter {
 
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java
index e932241..9794c25 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/AbstractArchiveSaveAdapter.java
@@ -99,7 +99,7 @@
 
 	/**
 	 * Subclasses should implement to perform the actual save on the specified
-	 * {@link IArchiveResource}.
+	 * { @link IArchiveResource}.
 	 * 
 	 * @param file
 	 * @throws ArchiveSaveFailureException
@@ -108,7 +108,7 @@
 
 	/**
 	 * Subclassess should override to avoid saving the specified
-	 * {@link IArchiveResource}. e.g. to avoid saving source files.
+	 * { @link IArchiveResource}. e.g. to avoid saving source files.
 	 * 
 	 * @param file
 	 * @return
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java
index 21b34fe..3fe4626 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/ArchiveOptions.java
@@ -15,7 +15,7 @@
 import java.util.Set;
 
 /**
- * {@link ArchiveOptions} is a means for passing data pertaining to opening and
+ * { @link ArchiveOptions} is a means for passing data pertaining to opening and
  * saving {@link IArchive}s. This class is simply a wrapper around {@link Map}
  * and a few well defined OptionKeys. Clients are welcome to define and set/get
  * any options deemed necessary.
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java
index d23f125..02b05bf 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchive.java
@@ -41,12 +41,12 @@
 
 	/**
 	 * Returns an {@link IArchive} for the specified archiveResource. If the
-	 * {@link IArchive} is successfully returned, it will be added to the list
+	 * { @link IArchive} is successfully returned, it will be added to the list
 	 * returned by {@link #getNestedArchives()}. Also, the original
-	 * {@link IArchiveResource} will be removed from this {@link IArchive}'s
+	 * { @link IArchiveResource} will be removed from this {@link IArchive}'s
 	 * list of {@link IArchiveResource}s returned by
-	 * {@link #getArchiveResources()} and replaced with the returned
-	 * {@link IArchive}.
+	 * { @link #getArchiveResources()} and replaced with the returned
+	 * { @link IArchive}.
 	 * 
 	 * @param archiveResource
 	 * @return
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java
index 0fb0bb9..c0fe993 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveAdapter.java
@@ -24,7 +24,7 @@
 
 	/**
 	 * Returns the {@link IArchive} associated with this adapter. Every
-	 * {@link IArchiveAdapter} is associated with exactly one {@link IArchive}.
+	 * { @link IArchiveAdapter} is associated with exactly one {@link IArchive}.
 	 * 
 	 * @return
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java
index 86ad66f..9d1d5bb 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveFactory.java
@@ -15,7 +15,7 @@
 import org.eclipse.jst.jee.archive.internal.ArchiveFactoryImpl;
 
 /**
- * {@link IArchiveFactory} is the where clients should open and save archives.
+ * { @link IArchiveFactory} is the where clients should open and save archives.
  * 
  * This interface is not intended to be implemented or subclassed by clients.
  * Clients should access through {@link #INSTANCE}
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java
index 1bb5c19..67e1242 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveHandler.java
@@ -12,7 +12,7 @@
 
 /**
  * An {@link IArchiveHandler} handles a specific type of {@link IArchive}.
- * {@link IArchiveHandler}s are defined via extension points.
+ * { @link IArchiveHandler}s are defined via extension points.
  * 
  * This interface is not intended to be implemented by or subclassed by clients.
  * Clients should instead subclass {@link AbstractArchiveHandler} or one if its
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java
index 711ecb2..9608941 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveLoadAdapter.java
@@ -18,13 +18,13 @@
 import org.eclipse.core.runtime.IPath;
 
 /**
- * {@link IArchiveLoadAdapter} knows how to load or read the contents for an
- * {@link IArchive}. This provides a delegation model for reading in the
+ * { @link IArchiveLoadAdapter} knows how to load or read the contents for an
+ * { @link IArchive}. This provides a delegation model for reading in the
  * contents of an {@link IArchive}.
  * 
  * By extending {@link AbstractArchiveLoadAdapter} and using
- * {@link ArchiveOptions} clients may "plug in" to an instance of an
- * {@link IArchive}. Examples might include reading from a zip file, from an
+ * { @link ArchiveOptions} clients may "plug in" to an instance of an
+ * { @link IArchive}. Examples might include reading from a zip file, from an
  * input stream, from the local file system, or from a workbench.
  * 
  * This interface is not intended to be implemented by or subclassed by clients.
@@ -42,8 +42,8 @@
 	 * Returns <code>true</code> if this {@link IArchiveLoadAdapter} contains
 	 * the {@link IArchiveResource} specified by the passed {@link IPath}. If
 	 * this method returns <code>true</code> then this
-	 * {@link IArchiveLoadAdapter} should be able to successfully return an
-	 * {@link IArchiveResource} from {@link #getArchiveResource(IPath)} using an
+	 * { @link IArchiveLoadAdapter} should be able to successfully return an
+	 * { @link IArchiveResource} from {@link #getArchiveResource(IPath)} using an
 	 * equal passed {@link IPath}.
 	 * 
 	 * @param resourcePath
@@ -53,8 +53,8 @@
 
 	/**
 	 * Returns the {@link IArchiveResource} specified by the passed
-	 * {@link IPath}. A {@link FileNotFoundException} is thrown if this
-	 * {@link IArchiveLoadAdapter} does not contain the {@link IArchiveResource}
+	 * { @link IPath}. A {@link FileNotFoundException} is thrown if this
+	 * { @link IArchiveLoadAdapter} does not contain the {@link IArchiveResource}
 	 * as specified by {@link #containsArchiveResource(IPath)}.
 	 * 
 	 * @param resourcePath
@@ -65,7 +65,7 @@
 
 	/**
 	 * Returns a {@link List} of all {@link IArchiveResource} contained by this
-	 * {@link IArchiveLoadAdapter}.
+	 * { @link IArchiveLoadAdapter}.
 	 * 
 	 * @return
 	 */
@@ -74,7 +74,7 @@
 	/**
 	 * Returns an {@link InputStream} for the specified {@link IArchiveResource}.
 	 * If the specified {@link IArchiveResource} is not contained by this
-	 * {@link IArchiveLoadAdapter}, then a {@link FileNotFoundException} is
+	 * { @link IArchiveLoadAdapter}, then a {@link FileNotFoundException} is
 	 * thrown. An {@link IOException} is thrown for all other errors.
 	 * 
 	 * @param archiveResource
@@ -95,8 +95,8 @@
 
 	/**
 	 * Returns the model Object specified by the passed {@link IPath}. An
-	 * {@link ArchiveModelLoadException} is thrown if this
-	 * {@link IArchiveLoadAdapter} does not contain the model Object as
+	 * { @link ArchiveModelLoadException} is thrown if this
+	 * { @link IArchiveLoadAdapter} does not contain the model Object as
 	 * specified by {@link #containsModelObject(IPath)}.
 	 * 
 	 * @param modelObjectPath
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java
index edde770..f5695e8 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/archive/IArchiveResource.java
@@ -53,8 +53,8 @@
 	/**
 	 * Returns an input stream for this {@link IArchiveResource} if its type is
 	 * either a {@link #FILE_TYPE} or {@link #ARCHIVE_TYPE} as defined by
-	 * {@link #getType()}. <code>null</code> is returned if the type is
-	 * {@link #DIRECTORY_TYPE}.
+	 * { @link #getType()}. <code>null</code> is returned if the type is
+	 * { @link #DIRECTORY_TYPE}.
 	 * 
 	 * @return
 	 * @throws java.io.FileNotFoundException
diff --git a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
index 295b3c5..914c480 100644
--- a/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
+++ b/plugins/org.eclipse.jst.j2ee.core/archive/org/eclipse/jst/jee/util/internal/JavaEEQuickPeek.java
@@ -77,14 +77,14 @@
 
 	/**
 	 * Returns the deployment descriptor type as defined by one of
-	 * {@link J2EEVersionConstants#UNKNOWN},
-	 * {@link J2EEVersionConstants#APPLICATION_CLIENT_TYPE},
-	 * {@link J2EEVersionConstants#APPLICATION_TYPE},
-	 * {@link J2EEVersionConstants#EJB_TYPE},
-	 * {@link J2EEVersionConstants#CONNECTOR_TYPE},
-	 * {@link J2EEVersionConstants#WEB_TYPE},
-	 * {@link J2EEVersionConstants#WEBSERVICES_TYPE}
-	 * {@link J2EEVersionConstants#WEBFRAGMENT_TYPE}
+	 * { @link J2EEVersionConstants#UNKNOWN},
+	 * { @link J2EEVersionConstants#APPLICATION_CLIENT_TYPE},
+	 * { @link J2EEVersionConstants#APPLICATION_TYPE},
+	 * { @link J2EEVersionConstants#EJB_TYPE},
+	 * { @link J2EEVersionConstants#CONNECTOR_TYPE},
+	 * { @link J2EEVersionConstants#WEB_TYPE},
+	 * { @link J2EEVersionConstants#WEBSERVICES_TYPE}
+	 * { @link J2EEVersionConstants#WEBFRAGMENT_TYPE}
 	 * 
 	 * @return
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java
index f9b8618..c20883e 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java
@@ -945,7 +945,7 @@
 
 	/**
 	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.Archive#getTypes <em>Types</em>}'. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.commonarchivecore.Archive#getTypes <em>Types</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute list '<em>Types</em>'.
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java
index 20c7545..a33fcab 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/EARFile.java
@@ -195,7 +195,7 @@
 
 	/**
 	 * Returns a filtered list of FARFiles; adds will not be reflected; use
-	 * {@link Archive#add(File)}
+	 * { @link Archive#add(File)}
 	 */
 	public List getFARFiles();
 
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java
index fc053ad..8499f20 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java
@@ -112,7 +112,7 @@
 
 	/**
 	 * Sets the value of the '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @param value
@@ -126,7 +126,7 @@
 
 	/**
 	 * Unsets the value of the '
-	 * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #isSetSize()
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java
index 051230a..2178114 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java
@@ -48,7 +48,7 @@
 	/**
 	 * Gets the uri from the {@link Module}referenced by this ref; if there is no module, (eg. a
 	 * standalone JAR), gets the uri from the {@link ModuleFile}. Assumption: The uri of the
-	 * {@link Module}and {@link ModuleFile}should stay in sync
+	 * { @link Module}and {@link ModuleFile}should stay in sync
 	 */
 	String getUri();
 
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java
index 8ee9450..c4f7ba4 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java
@@ -13,12 +13,11 @@
 
 
 import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy;
 
 /**
  * Object used for saving an archive with only a subset of its files. By default all files are
  * saved. Clients can create a custom filter and set it on a save strategy, and call
- * {@link Archive#save(SaveStrategy)}
+ * { @link Archive#save(SaveStrategy)}
  */
 public interface SaveFilter {
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
index ec87290..314e490 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java
@@ -85,7 +85,7 @@
 	/**
 	 * Returns an input stream on an entry named by the parameter, from the "resources path" of the
 	 * loose archive if it exists, Otherwise the default behavior is the same as
-	 * {@link #getInputStream(String)}
+	 * { @link #getInputStream(String)}
 	 */
 	public InputStream getResourceInputStream(String uri) throws IOException;
 
diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
index 0d73c16..43be1bb 100644
--- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java
@@ -208,7 +208,7 @@
 	 * archive is a module file and it is NOT read-only 2) If the load strategy is a directory 3) If
 	 * the archive is a utility JAR, and the files list has never been initialized, or if the
 	 * loading containers for all the files are the same AND not directories, AND the
-	 * {@link ArchiveOptions#isSaveLibrariesAsFiles()}of the archive is true.
+	 * { @link ArchiveOptions#isSaveLibrariesAsFiles()}of the archive is true.
 	 * 
 	 * @see com.ibm.etools.archive.LoadStrategy#requiresIterationOnSave()
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java
index fa6a512..442c684 100644
--- a/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java
+++ b/plugins/org.eclipse.jst.j2ee.core/j2eeCorePlugin/org/eclipse/jst/j2ee/core/internal/bindings/IJNDIBindingsHelper.java
@@ -26,7 +26,7 @@
 
 	/**
 	 * Clients should not call this method. This method is used by the
-	 * {@link JNDIBindingsHelperManager}.
+	 * { @link JNDIBindingsHelperManager}.
 	 * 
 	 * @param project
 	 * @return true if this {@link IJNDIBindingsHelper} can be used to load bindings for specified
@@ -36,7 +36,7 @@
 
 	/**
 	 * Clients should not call this method. This method is used by the
-	 * {@link JNDIBindingsHelperManager}.
+	 * { @link JNDIBindingsHelperManager}.
 	 * 
 	 * @param project
 	 * @return true if this {@link IJNDIBindingsHelper} can be used to load bindings for specified
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
index 6d40231..691617d 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/application/internal/impl/ApplicationPackageImpl.java
@@ -64,7 +64,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
index 7e25b7a..41d54d4 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/applicationclient/internal/impl/ApplicationclientPackageImpl.java
@@ -48,7 +48,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
index 1e07259..7266494 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/core/internal/impl/JavaeePackageImpl.java
@@ -628,7 +628,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
index d9302c4..b349e50 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/ejb/internal/impl/EjbPackageImpl.java
@@ -555,7 +555,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java
index 16ed933..713683c 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/internal/adapter/JavaEEArtifactAdapterFactory.java
@@ -49,9 +49,9 @@
 	
 	private IResource getResource(Object adaptableObject) {
 		if (adaptableObject instanceof IAdaptable) {
-			return (IResource) ((IAdaptable) adaptableObject).getAdapter(IResource.class);
+			return ((IAdaptable) adaptableObject).getAdapter(IResource.class);
 		} 
-		return (IResource) Platform.getAdapterManager().getAdapter(adaptableObject, IResource.class);
+		return Platform.getAdapterManager().getAdapter(adaptableObject, IResource.class);
 	}
 	
 	private IJavaElement getJavaElement(IJavaProject javaProject, String className) {
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
index 081dc80..daaa9bc 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jca/internal/impl/JcaPackageImpl.java
@@ -191,7 +191,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
index 6e12e01..6888e0d 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/jsp/internal/impl/JspPackageImpl.java
@@ -64,7 +64,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
index ec0d711..f0eacff 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/web/internal/impl/WebPackageImpl.java
@@ -423,7 +423,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
index 4720943..3607595 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webapp/internal/impl/WebappPackageImpl.java
@@ -39,7 +39,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
index 9cd51cb..7446d19 100644
--- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/impl/WebfragmentPackageImpl.java
@@ -39,7 +39,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java
index bdc063f..162bfdc 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/QName.java
@@ -114,7 +114,7 @@
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * Internal field used by implementation classes.  Clients should use 
-	 * {@link #getNamespaceURI()}.
+	 * { @link #getNamespaceURI()}.
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Internal Prefix Or Ns URI</em>' attribute.
@@ -129,7 +129,7 @@
 	 * Sets the value of the '{@link org.eclipse.jst.j2ee.common.QName#getInternalPrefixOrNsURI <em>Internal Prefix Or Ns URI</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * Internal field used by implementation classes.  Clients should use 
-	 * {@link #setValues(String, String, String)}.
+	 * { @link #setValues(String, String, String)}.
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Internal Prefix Or Ns URI</em>' attribute.
 	 * @see #getInternalPrefixOrNsURI()
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java
index 9f2a204..787b671 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/common/internal/impl/XMLResourceImpl.java
@@ -194,7 +194,7 @@
 	
 	/**
 	 * @deprecated use {@link TranslatorResource#setVersionID(int)}, 
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
+	 * { @link TranslatorResource#setDoctypeValues(String, String)}
 	 * Sets the system id of the XML document.
 	 * @see J2EEVersionConstants
 	 */
@@ -204,7 +204,7 @@
 	
 	/**
 	 * @deprecated use {@link TranslatorResource#setVersionID(int)},
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
+	 * { @link TranslatorResource#setDoctypeValues(String, String)}
 	 * Sets the public id of the XML document.
 	 * @see J2EEVersionConstants
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java
index 768f34b..d160392 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedException.java
@@ -59,7 +59,7 @@
  * <code>Throwable.getCause()</code>.
  */
 @Override
-public java.lang.Throwable getCause() {
+public synchronized java.lang.Throwable getCause() {
 	return getNestedException();
 }
 /**
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
index 97901ed..9e831d9 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/WrappedRuntimeException.java
@@ -60,7 +60,7 @@
  * @return The nested exception held by the receiver.
  */
 @Override
-public java.lang.Throwable getCause() {
+public synchronized java.lang.Throwable getCause() {
 	return getNestedException();
 }
 /**
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
index 08c2cfe..5c642a3 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/XMLResource.java
@@ -61,14 +61,14 @@
 	void setIsAlt(boolean isAlternateDD);
 	/**
 	 * @deprecated use {@link TranslatorResource#setVersionID(int)}, 
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
+	 * { @link TranslatorResource#setDoctypeValues(String, String)}
 	 * Sets the system id of the XML document.
 	 * @see J2EEVersionConstants
 	 */
 	void setSystemId(String id);
 	/**
 	 * @deprecated use {@link TranslatorResource#setVersionID(int)},
-	 * {@link TranslatorResource#setDoctypeValues(String, String)}
+	 * { @link TranslatorResource#setDoctypeValues(String, String)}
 	 * Sets the public id of the XML document.
 	 * @see J2EEVersionConstants
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
index b9c8f49..ec47be0 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/jsp/internal/impl/JspPackageImpl.java
@@ -57,7 +57,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
index 77da07e..f7c6f99 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsclient/internal/impl/Webservice_clientPackageImpl.java
@@ -73,7 +73,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
index dfaf2ce..33a9a3e 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wscommon/internal/impl/WscommonPackageImpl.java
@@ -82,7 +82,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
index f2b05f5..d9df81d 100644
--- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/webservice/wsdd/internal/impl/WsddPackageImpl.java
@@ -156,7 +156,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java
index 028c813..cf7ee3e 100644
--- a/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.core/webservices/org/eclipse/jst/j2ee/webservice/jaxrpcmap/internal/impl/JaxrpcmapPackageImpl.java
@@ -216,7 +216,7 @@
 
 	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * { @link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
 	 * package URI value.
 	 * <p>Note: the correct way to create the package is via the static
 	 * factory method {@link #init init()}, which also performs
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
index 661af54..ebd9b29 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ActivationSpecItemProvider.java
@@ -77,8 +77,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
index 24ff1c8..68fb227 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AdminObjectItemProvider.java
@@ -90,8 +90,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
index 6e04af1..46a7b68 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/AuthenticationMechanismItemProvider.java
@@ -130,8 +130,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
index 6d668fc..ae1f52a 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConfigPropertyItemProvider.java
@@ -118,8 +118,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
index 7ea966a..e42a886 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/ConnectionDefinitionItemProvider.java
@@ -129,8 +129,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
index 0da4b2c..3cf7de2 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/InboundResourceAdapterItemProvider.java
@@ -62,8 +62,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
index 572b6da..3fd0bb3 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/JcaItemProviderAdapterFactory.java
@@ -35,7 +35,7 @@
 
 /**
  * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
+ * { @link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
  * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
  * adapters are shared among multiple instances.
@@ -109,7 +109,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.InboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.jca.InboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -133,7 +133,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.OutboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.jca.OutboundResourceAdapter}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -180,7 +180,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.ConnectionDefinition}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.jca.ConnectionDefinition}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -273,7 +273,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.jca.RequiredConfigPropertyType}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.jca.RequiredConfigPropertyType}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
index 1f8fa30..5e0919d 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/LicenseItemProvider.java
@@ -93,8 +93,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
index 089e98e..acbb45f 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageAdapterItemProvider.java
@@ -62,8 +62,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
index 99fc195..ea25dfd 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/MessageListenerItemProvider.java
@@ -77,8 +77,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
index 27d3118..cadbabd 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/OutboundResourceAdapterItemProvider.java
@@ -91,8 +91,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
index 66581b6..0f1374f 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/RequiredConfigPropertyTypeItemProvider.java
@@ -78,8 +78,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
index b1c6341..45b25ea 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/providers/SecurityPermissionItemProvider.java
@@ -94,8 +94,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
index ddd17bf..df36215 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ejb/provider/J2EEEjbItemProviderAdapterFactory.java
@@ -28,7 +28,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.ejb.ContainerManagedEntity}.
 	 */
 	@Override
 	public Adapter createContainerManagedEntityAdapter() {
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
index 8ca0623..6da9553 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java
@@ -24,7 +24,7 @@
  * </p>
  * <p>
  * Subclasses must provide the methods that are required by
- * {@link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard}.
+ * { @link com.ibm.etools.j2ee.common.wizard.datamodel.WTPWizard}.
  * </p>
  * <p>
  * Optionally, subclasses may also override the following methods:
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
index 39a1e62..f376c0a 100644
--- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
+++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java
@@ -120,7 +120,7 @@
 	/**
 	 * <p>
 	 * Invoked after the selection has been saved off in
-	 * {@link #init(IWorkbench, IStructuredSelection)}. Should be used to handle any specific
+	 * { @link #init(IWorkbench, IStructuredSelection)}. Should be used to handle any specific
 	 * Wizard initialization.
 	 * </p>
 	 */
@@ -170,7 +170,7 @@
 	 * <p>
 	 * Invoked after the user has clicked the "Finish" button of the wizard. The default
 	 * implementation will attempt to update the final perspective to the value specified by
-	 * {@link #getFinalPerspectiveID() }
+	 * { @link #getFinalPerspectiveID() }
 	 * </p>
 	 * 
 	 * @throws InvocationTargetException
diff --git a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
index d66db9f..c6298d0 100644
--- a/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
+++ b/plugins/org.eclipse.jst.j2ee.web/war-validation/org/eclipse/jst/j2ee/internal/web/validation/UIWarValidator.java
@@ -147,7 +147,7 @@
 			IVirtualComponent comp = webLibs[i].getReferencedComponent();
 			String name = null;
 			if (comp.isBinary()) {
-				java.io.File diskFile = (java.io.File)comp.getAdapter(java.io.File.class);
+				java.io.File diskFile = comp.getAdapter(java.io.File.class);
 				checkLibName(diskFile.getName(), null, webLibMappings, true);
 			} else {
 				String archiveName = webLibs[i].getArchiveName();
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
index 1646bc1..adccc28 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
@@ -70,7 +70,7 @@
 		if (obj instanceof IModuleArtifact)
 			resource = ((IModuleArtifact) obj).getModule().getProject();
 		else if (obj instanceof IAdaptable)
-			resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
+			resource = ((IAdaptable) obj).getAdapter(IResource.class);
 		else if (obj instanceof EObject) {
 			resource = ProjectUtilities.getProject((EObject) obj);
 			if (obj instanceof Servlet) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
index 3717d2d..fec4c4b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/AuthConstraintItemProvider.java
@@ -120,8 +120,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -196,7 +196,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
index 5841516..f3e5611 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ContextParamItemProvider.java
@@ -185,7 +185,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
index f20bd78..1c8d4a8 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ErrorPageItemProvider.java
@@ -135,7 +135,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
index 687e1e7..dcb0559 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ExceptionTypeErrorPageItemProvider.java
@@ -26,7 +26,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}object.
  */
 public class ExceptionTypeErrorPageItemProvider extends ErrorPageItemProvider {
 
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
index be6fcd6..1ec5576 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java
@@ -21,7 +21,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -59,7 +58,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -104,7 +103,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
@@ -171,7 +170,7 @@
 
 	/**
 	 * This implements
-	 * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
+	 * { @link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
 	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
 	 * interface
 	 */
@@ -257,7 +256,7 @@
 
 	/**
 	 * This implements
-	 * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
+	 * { @link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
 	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
 	 * interface
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
index 82fdc4f..8b5e752 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterMappingItemProvider.java
@@ -191,7 +191,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
index cae4065..dd17331 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FormLoginConfigItemProvider.java
@@ -174,7 +174,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
index 634e0e3..48fdfc5 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/HTTPMethodTypeItemProvider.java
@@ -144,7 +144,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
index d2d105b..2cb85f7 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/InitParamItemProvider.java
@@ -128,7 +128,7 @@
 
 	/**
 	 * This implements
-	 * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
+	 * { @link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
 	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
 	 * interface
 	 */
@@ -191,7 +191,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
@@ -217,7 +217,7 @@
 
 	/**
 	 * This implements
-	 * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
+	 * { @link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
 	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
 	 * interface
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
index b14dacb..fbaef49 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JSPConfigItemProvider.java
@@ -64,8 +64,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
index 3c66df7..2883324 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/JspItemProviderAdapterFactory.java
@@ -32,7 +32,7 @@
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers. The
  * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
+ * { @link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
  * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
@@ -57,7 +57,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * { @link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
index d77fdff..c4b4027 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
index 18a9f93..8bddc50 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LocalEncodingMappingListItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
@@ -64,8 +64,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
index 064cd44..733e39b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/LoginConfigItemProvider.java
@@ -19,7 +19,6 @@
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -56,7 +55,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -86,7 +85,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	@Override
 	public String getCreateChildToolTipText(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
index e216e4f..46f5ea4 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/MimeMappingItemProvider.java
@@ -166,7 +166,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
index 32528bd..08ebc6b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/RoleNameTypeItemProvider.java
@@ -130,7 +130,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
index 08a2e4d..e283b45 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -65,7 +64,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -110,7 +109,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	@Override
 	public String getCreateChildToolTipText(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
index 82a76b5..b4f1d00 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -60,7 +59,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -110,7 +109,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
@@ -192,7 +191,7 @@
 
 	/**
 	 * This implements
-	 * {@link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
+	 * { @link IItemPropertySource#getPropertyValue IItemPropertySource.getPropertyValue}by
 	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
 	 * interface
 	 */
@@ -291,7 +290,7 @@
 
 	/**
 	 * This implements
-	 * {@link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
+	 * { @link IItemPropertySource#setPropertyValue IItemPropertySource.setPropertyValue}by
 	 * delegating to the descriptor, which is assumed to support the IItemPropertyDescriptor
 	 * interface
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
index 1c9463b..42b4ba6 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletMappingItemProvider.java
@@ -172,7 +172,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
index 8c5120c..255af45 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SessionConfigItemProvider.java
@@ -143,7 +143,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
index 11f328f..9697039 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/TagLibRefItemProvider.java
@@ -165,7 +165,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
index ecfb955..ad92ada 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/URLPatternTypeItemProvider.java
@@ -143,7 +143,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
index 5ed05b7..272857b 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/UserDataConstraintItemProvider.java
@@ -116,8 +116,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -185,7 +185,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
index 3361daa..2aea413 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java
@@ -18,8 +18,7 @@
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
+import org.eclipse.emf.edit.command.AddCommand;	
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.jst.j2ee.common.CommonFactory;
@@ -79,7 +78,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 
 
@@ -140,7 +139,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
index f72bd2b..53c73e3 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebResourceCollectionItemProvider.java
@@ -42,7 +42,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}object.
  */
 public class WebResourceCollectionItemProvider extends WebapplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
 
@@ -68,7 +68,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -112,7 +112,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	@Override
 	public String getCreateChildToolTipText(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
index 2d67ec1..7021c61 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebTypeItemProvider.java
@@ -99,7 +99,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
index fa80205..4f713ea 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapter.java
@@ -21,7 +21,7 @@
 
 /**
  * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
+ * { @link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
  * adapters using this common base class.
  */
 public class WebapplicationItemProviderAdapter extends org.eclipse.emf.edit.provider.ItemProviderAdapter {
@@ -35,7 +35,7 @@
 
 	/**
 	 * This implements the default behavior for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.command.CreateChildCommand}.
 	 */
 	public Object createChild(Object object) {
 		return null;
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
index 583d3fc..dac7834 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebapplicationItemProviderAdapterFactory.java
@@ -35,7 +35,7 @@
 
 /**
  * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
+ * { @link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
  * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
  * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}.
  */
@@ -55,7 +55,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
+	 * { @link #isFactoryForType isFactoryForType}.
 	 */
 	protected Collection supportedTypes = new ArrayList();
 	/**
@@ -65,17 +65,17 @@
 	protected WebAppItemProvider webAppItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ContextParam}instances.
 	 */
 	protected ContextParamItemProvider contextParamItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorPage}instances.
 	 */
 	protected ErrorPageItemProvider errorPageItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ExceptionTypeErrorPage}instances.
 	 */
 	protected ExceptionTypeErrorPageItemProvider exceptionTypeErrorPageItemProvider;
 	/**
@@ -85,122 +85,122 @@
 	protected FilterItemProvider filterItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.FilterMapping}instances.
 	 */
 	protected FilterMappingItemProvider filterMappingItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ErrorCodeErrorPage}instances.
 	 */
 	protected ErrorCodeErrorPageItemProvider errorCodeErrorPageItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFileList}instances.
 	 */
 	protected WelcomeFileListItemProvider welcomeFileListItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.WelcomeFile}instances.
 	 */
 	protected WelcomeFileItemProvider welcomeFileItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRef}instances.
 	 */
 	protected TagLibRefItemProvider tagLibRefItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRefType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.TagLibRefType}instances.
 	 */
 	protected TagLibRefTypeItemProvider tagLibRefTypeItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.SecurityConstraint}instances.
 	 */
 	protected SecurityConstraintItemProvider securityConstraintItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.WebResourceCollection}instances.
 	 */
 	protected WebResourceCollectionItemProvider webResourceCollectionItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances.
 	 */
 	protected URLPatternTypeItemProvider uRLPatternTypeItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances.
 	 */
 	protected HTTPMethodTypeItemProvider hTTPMethodTypeItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.AuthConstraint}instances.
 	 */
 	protected AuthConstraintItemProvider authConstraintItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.UserDataConstraint}instances.
 	 */
 	protected UserDataConstraintItemProvider userDataConstraintItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.LoginConfig}instances.
 	 */
 	protected LoginConfigItemProvider loginConfigItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.FormLoginConfig}instances.
 	 */
 	protected FormLoginConfigItemProvider formLoginConfigItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.MimeMapping}instances.
 	 */
 	protected MimeMappingItemProvider mimeMappingItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.SessionConfig}instances.
 	 */
 	protected SessionConfigItemProvider sessionConfigItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletMapping}instances.
 	 */
 	protected ServletMappingItemProvider servletMappingItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.Servlet}instances.
 	 */
 	protected ServletItemProvider servletItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.WebType}instances.
 	 */
 	protected WebTypeItemProvider webTypeItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.ServletType}instances.
 	 */
 	protected ServletTypeItemProvider servletTypeItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances.
 	 */
 	protected JSPTypeItemProvider jSPTypeItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.InitParam}instances.
 	 */
 	protected InitParamItemProvider initParamItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.Listener}instances.
 	 */
 	protected ListenerItemProvider listenerItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.RoleNameType}instances.
 	 */
 	protected RoleNameTypeItemProvider roleNameTypeItemProvider;
 	protected Disposable disposable = new Disposable();
@@ -324,7 +324,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMappingList}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -348,7 +348,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.LocalEncodingMapping}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -444,7 +444,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.URLPatternType}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -537,7 +537,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.JSPType}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -594,7 +594,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.HTTPMethodType}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
index bd1fefd..6abc57e 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileItemProvider.java
@@ -140,7 +140,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
+	 * { @link org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}
 	 * to return the empty enumeration, and this to check that enumeration, but we know there can't
 	 * be any children, so this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
index 1486fa0..321de83 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WelcomeFileListItemProvider.java
@@ -19,7 +19,6 @@
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
@@ -75,7 +74,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -101,7 +100,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webapplication.commandCreateChildCommand}.
 	 */
 	@Override
 	public String getCreateChildToolTipText(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
index a0adfda..929458f 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentLoadStrategyImpl.java
@@ -59,7 +59,7 @@
 			IVirtualReference iLibModule = libModules[i];
 			IVirtualComponent looseComponent = iLibModule.getReferencedComponent();
 			if (looseComponent.isBinary()) {
-				java.io.File diskFile = (java.io.File)looseComponent.getAdapter(java.io.File.class);
+				java.io.File diskFile = looseComponent.getAdapter(java.io.File.class);
 				String uri = iLibModule.getRuntimePath().makeRelative().toString() + "/" + diskFile.getName(); //$NON-NLS-1$
 				addExternalFile(uri, diskFile);				
 			} else {
@@ -109,7 +109,7 @@
 				// only process ../ mappings
 				if (ref.getReferencedComponent().isBinary()
 						&& runtimePath.equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
-					File cpEntryFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
+					File cpEntryFile = ref.getReferencedComponent().getAdapter(java.io.File.class);
 					addExternalFile("WEB-INF/lib/" + ref.getArchiveName(), cpEntryFile); //$NON-NLS-1$
 				}
 			}
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
index 7a8697f..14b0655 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/datamodel/properties/IWebComponentImportDataModelProperties.java
@@ -12,9 +12,7 @@
 
 import java.util.List;
 
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
 import org.eclipse.jst.j2ee.datamodel.properties.IJ2EEModuleImportDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
 /**
  * <p>
@@ -38,7 +36,7 @@
 	 * <p>
 	 * This optional {@link List} property is used to specify which nested web libraries should be
 	 * expanded into projects during import. The contents of this {@link List} property should be
-	 * {@link Archive}s.
+	 * { @link Archive}s.
 	 * </p>
 	 */
 	public static final String WEB_LIB_ARCHIVES_SELECTED = "WARImportDataModel.WEB_LIB_ARCHIVES_SELECTED"; //$NON-NLS-1$
@@ -46,7 +44,7 @@
 	/**
 	 * <p>
 	 * This {@link List} property should not be set by clients. This list contains the
-	 * {@link IDataModel}s for creating the new components to be created for each of the selected
+	 * { @link IDataModel}s for creating the new components to be created for each of the selected
 	 * archives. This list will contain one entry for each web lib archive regardless of whether it
 	 * is selected for import by the {@link #WEB_LIB_ARCHIVES_SELECTED} property.
 	 * </p>
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
index 7b5c538..63da92d 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
@@ -71,7 +71,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -173,7 +173,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
index f4d23c0..62561ca 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
@@ -70,7 +70,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -187,7 +187,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
index f443c24..02be229 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
@@ -71,7 +71,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -173,7 +173,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
index 6738352..cdd235a 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
@@ -63,7 +63,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -165,7 +165,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
index f0462e0..381ff28 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
@@ -48,7 +48,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -165,7 +165,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
index 7f5ccdb..85c3c27 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
@@ -58,7 +58,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -167,7 +167,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
index 4d4085c..bbadd70 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
@@ -58,7 +58,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -167,7 +167,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
index d971cb7..67c2c8f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
@@ -63,7 +63,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -173,7 +173,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
index 6d938ae..e8d0ba7 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
@@ -58,7 +58,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -167,7 +167,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
index 6b34fa0..7e9be7e 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
@@ -56,7 +56,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -165,7 +165,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
index bb37dbc..8b29c55 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
@@ -95,7 +95,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -275,7 +275,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
index 2aa91d9..8f814a1 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
@@ -64,7 +64,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -184,7 +184,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
index d888b9e..a092938 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
@@ -54,7 +54,7 @@
 
 	/**
 	 * Returns whether the comamad is valid to <code>execute</code>. The
-	 * {@link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
+	 * { @link UnexecutableCommand#INSTANCE}.<code>canExecute()</code> always returns
 	 * <code>false</code>. This <b>must </b> be called before calling <code>execute</code>.
 	 * 
 	 * @return whether the comamad is valid to <code>execute</code>.
@@ -182,7 +182,7 @@
 	 * </pre>
 	 * 
 	 * you should consider using a {@link org.eclipse.emf.common.command.CompoundCommand}and using
-	 * {@link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
+	 * { @link org.eclipse.emf.common.command.CompoundCommand#unwrap()}to optimize the result:
 	 * 
 	 * <pre>
 	 * CompoundCommand subcommands = new CompoundCommand();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
index 95fd652..e0ac02b 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIComponentScopedRefsItemProvider.java
@@ -68,8 +68,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
index 33ad020..5035175 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java
@@ -59,8 +59,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
index 2eb9d93..201a23a 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java
@@ -59,8 +59,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
index 87767e0..6d03267 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java
@@ -72,8 +72,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
index 4da1365..727107f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/AbstractATKUIItemProvider.java
@@ -42,8 +42,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
index 951badd..9531a02 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/BeanLinkItemProvider.java
@@ -130,8 +130,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
index 12e7016..cd2f3b8 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ComponentScopedRefsItemProvider.java
@@ -77,8 +77,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
index f7a0465..3da2c8b 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ConstructorParameterOrderItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}object. <!-- begin-user-doc
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
  * 
  * @generated
@@ -77,8 +77,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
index 37d9df2..54b58b6 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DescriptionTypeItemProvider.java
@@ -23,7 +23,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
index 0d15751..56328f1 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/DisplayNameTypeItemProvider.java
@@ -23,7 +23,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
index 2eb13f7..1d792a5 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ExceptionMappingItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
@@ -104,8 +104,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
index a7c7793..c1d8427 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/HandlerItemProvider.java
@@ -110,8 +110,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 *  
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
index d40813f..cbd5b18 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InitParamItemProvider.java
@@ -112,8 +112,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
index 7fce309..271b839 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/InterfaceMappingItemProvider.java
@@ -25,7 +25,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
index f512fe6..f182715 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaWSDLMappingItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
@@ -78,8 +78,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
index 85239e1..718beaf 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JavaXMLTypeMappingItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
@@ -117,8 +117,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
index 38fc666..a3aad84 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/JaxrpcmapItemProviderAdapterFactory.java
@@ -32,7 +32,7 @@
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers. The
  * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
+ * { @link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
  * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
@@ -57,7 +57,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * { @link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
@@ -78,7 +78,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaWSDLMapping}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -102,7 +102,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -126,7 +126,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.JavaXMLTypeMapping}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -150,7 +150,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ExceptionMapping}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -174,7 +174,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -183,7 +183,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -199,7 +199,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -208,7 +208,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -224,7 +224,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.RootTypeQname}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -248,7 +248,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -272,7 +272,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessage}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -296,7 +296,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -305,7 +305,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ConstructorParameterOrder}. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -321,7 +321,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ElementName}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -345,7 +345,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -369,7 +369,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PortMapping}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -393,7 +393,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLPortType}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -417,7 +417,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLBinding}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -441,7 +441,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -450,7 +450,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -466,7 +466,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLOperation}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -490,7 +490,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -499,7 +499,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -515,7 +515,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -524,7 +524,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -540,7 +540,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -564,7 +564,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -588,7 +588,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.InterfaceMapping}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
index 6c4c39a..430b8aa 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/MethodParamPartsMappingItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}object. <!-- begin-user-doc
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.MethodParamPartsMapping}object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
  * 
  * @generated
@@ -103,8 +103,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
index 69c683f..6c3ae34 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PackageMappingItemProvider.java
@@ -30,7 +30,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.PackageMapping}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
index a603fa1..1a61ce8 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/PortComponentItemProvider.java
@@ -165,8 +165,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -305,8 +305,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
index 5619867..da6a66f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointInterfaceMappingItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointInterfaceMapping}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
@@ -86,8 +86,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
index 84b1e72..ffa8031 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceEndpointMethodMappingItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceEndpointMethodMapping}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
@@ -117,8 +117,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
index 2589f8b..ec62ee1 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceImplBeanItemProvider.java
@@ -84,8 +84,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -223,8 +223,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
index bab1578..20b737a 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceInterfaceMappingItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}object. <!-- begin-user-doc
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.ServiceInterfaceMapping}object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
  * 
  * @generated
@@ -86,8 +86,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
index c8f8ed3..56f5826 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefEditorItemProvider.java
@@ -38,8 +38,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
index d97578d..5cbd3c2 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ServiceRefItemProvider.java
@@ -112,8 +112,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
index f0ecbe7..0017a47 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/VariableMappingItemProvider.java
@@ -30,7 +30,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.VariableMapping}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
index d2de2f0..c3bf87d 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessageMappingItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessageMapping}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
@@ -116,8 +116,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
index b4f64f3..f89b106 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLMessagePartNameItemProvider.java
@@ -30,7 +30,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLMessagePartName}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
index 417cae0..e3feafa 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLReturnValueMappingItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}object. <!-- begin-user-doc
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLReturnValueMapping}object. <!-- begin-user-doc
  * --> <!-- end-user-doc -->
  * 
  * @generated
@@ -103,8 +103,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
index 1ad9743..da7b38f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WSDLServiceNameItemProvider.java
@@ -23,7 +23,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.jaxrpcmap.WSDLServiceName}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
index fc6cfa9..b3710bf 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServiceDescriptionItemProvider.java
@@ -40,7 +40,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
@@ -179,8 +179,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -313,8 +313,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
index 54ec7b7..7f13891 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesClientItemProvider.java
@@ -63,8 +63,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
index 43918d2..a68fba0 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WebServicesItemProvider.java
@@ -73,8 +73,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
index e206045..3a6cd0f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/Webservice_clientItemProviderAdapterFactory.java
@@ -32,7 +32,7 @@
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers. The
  * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
+ * { @link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
  * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
@@ -57,7 +57,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * { @link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
@@ -101,7 +101,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.wsclient.PortComponentRef}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.wsclient.PortComponentRef}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -148,7 +148,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.wsclient.WebServicesClient}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.wsclient.WebServicesClient}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -172,7 +172,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.wsclient.ComponentScopedRefs}instances. <!-- begin-user-doc --> <!--
+	 * { @link com.ibm.etools.wsclient.ComponentScopedRefs}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
index 6f17cb0..a39d56f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WscommonItemProviderAdapterFactory.java
@@ -34,7 +34,7 @@
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers. The
  * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
+ * { @link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
  * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
@@ -59,7 +59,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * { @link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
@@ -81,7 +81,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.InitParam}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -105,7 +105,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPHeader}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -129,7 +129,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.SOAPRole}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -153,7 +153,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.PortName}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -177,7 +177,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DescriptionType}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -201,7 +201,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wscommon.DisplayNameType}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
index 0a72bc8..057f1e2 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/WsddItemProviderAdapterFactory.java
@@ -33,7 +33,7 @@
 /**
  * This is the factory that is used to provide the interfaces needed to support Viewers. The
  * adapters generated by this factory convert EMF adapter notifications into calls to
- * {@link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
+ * { @link #fireNotifyChanged fireNotifyChanged}. The adapters also support Eclipse property sheets.
  * Note that most of the adapters are shared among multiple instances. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
@@ -58,7 +58,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * { @link #isFactoryForType isFactoryForType}. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
@@ -79,7 +79,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServices}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -103,7 +103,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WebServiceDescription}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -127,7 +127,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.PortComponent}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -151,7 +151,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.WSDLPort}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -175,7 +175,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}instances. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServiceImplBean}instances. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -199,7 +199,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.ServletLink}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -223,7 +223,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.EJBLink}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -247,7 +247,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.Handler}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
@@ -271,7 +271,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}instances. <!-- begin-user-doc --> <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.webservice.wsdd.BeanLink}instances. <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
index da2e3ed..89ccb41 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/wsdd/provider/HandlerItemProvider.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.jst.j2ee.common.internal.provider.CompatibilityDescriptionGroupItemProvider;
 import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem;
@@ -113,8 +112,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -237,8 +236,8 @@
 
 	/**
 	 * This implements
-	 * {@link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
-	 * {@link #getChildrenReferences getChildrenReferences}and using those to collect the children.
+	 * { @link ITreeItemContentProvider#getChildren ITreeItemContentProvider.getChildren}by calling
+	 * { @link #getChildrenReferences getChildrenReferences}and using those to collect the children.
 	 */
 	@Override
 	public Collection getChildren(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
index c898a89..efc83ef 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/componentcore/util/AppClientArtifactEdit.java
@@ -380,11 +380,13 @@
 		return ((ApplicationClientResource)getDeploymentDescriptorResource()).getRootObject();
     }
 
+	@Override
 	public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
 		
 		return getAppClientArtifactEditForRead(aComponent);
 	}
 
+	@Override
 	public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
 		
 		return getAppClientArtifactEditForWrite(aComponent);
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
index 622652e..d005cdc 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientFacetProjectCreationDataModelProvider.java
@@ -50,6 +50,7 @@
 				J2EEPlugin.getDefault().getJ2EEPreferences().getString(Keys.APP_CLIENT_OUTPUT_FOLDER) );
 		
 		appClientFacet.addListener(new IDataModelListener() {
+			@Override
 			public void propertyChanged(DataModelEvent event) {
 				if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
 					if (isPropertySet(EAR_PROJECT_NAME))
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
index ed71a03..1078542 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientEditAdapterFactory.java
@@ -22,6 +22,7 @@
 		super();
 	}
 
+	@Override
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (adapterType == AppClientArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
 			ArtifactEditModel editModel = (ArtifactEditModel) adaptableObject;
@@ -31,6 +32,7 @@
 		return null;
 	}
 
+	@Override
 	public Class[] getAdapterList() {
 		return new Class[]{ArtifactEdit.class, AppClientArtifactEdit.class};
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
index ece0fcb..9ef330b 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDelegate.java
@@ -48,6 +48,7 @@
 
 public class AppClientFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
 		if (monitor != null)
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java
index 594365d..b4b2583 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetPostInstallDelegate.java
@@ -41,6 +41,7 @@
 
 public class AppClientFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
 		if (monitor != null)
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
index ff544cd..fa456c1 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/common/CreateChildCommand.java
@@ -113,6 +113,7 @@
 	/**
 	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildImage}.
 	 */
+	@Override
 	public Object getImage() {
 		return helper.getCreateChildImage(owner);
 	}
@@ -120,6 +121,7 @@
 	/**
 	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildText}.
 	 */
+	@Override
 	public String getText() {
 		return helper.getCreateChildText(owner);
 	}
@@ -127,6 +129,7 @@
 	/**
 	 * This delegates to {@link CreateChildCommand.Helper#getCreateChildToolTipText}.
 	 */
+	@Override
 	public String getToolTipText() {
 		return helper.getCreateChildToolTipText(owner);
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
index 964c02e..38d491f 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProvider.java
@@ -20,7 +20,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.jst.j2ee.application.Application;
@@ -35,7 +34,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.application.Application}object.
  */
 public class ApplicationItemProvider extends CompatibilityDescriptionGroupItemProvider {
 	/**
@@ -47,7 +46,7 @@
 
 	/**
 	 * This creates a new child for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public Object createChild(Object object) {
 		// TODO: check that this is what you want.
@@ -60,7 +59,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -87,7 +86,7 @@
 
 	/**
 	 * This returns the image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public Object getCreateChildImage(Object object) {
 		EObject refObject = (EObject) object;
@@ -96,7 +95,7 @@
 
 	/**
 	 * This returns the label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public String getCreateChildText(Object object) {
 		return ApplicationProvidersResourceHandler.getString("Create_Module_UI_"); //$NON-NLS-1$
@@ -104,7 +103,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java
index 173415d..329eb26 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapter.java
@@ -19,7 +19,7 @@
 
 /**
  * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. The
+ * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}. The
  * commands are implemented uniformly on all our item adapters using this common base class.
  */
 public class ApplicationItemProviderAdapter extends ItemProviderAdapter {
@@ -32,7 +32,7 @@
 
 	/**
 	 * This implements the default behavior for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public Object createChild(Object object) {
 		return null;
@@ -40,7 +40,7 @@
 
 	/**
 	 * This returns the default image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public Object getCreateChildImage(Object object) {
 		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$
@@ -48,7 +48,7 @@
 
 	/**
 	 * This returns the default label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public String getCreateChildText(Object object) {
 		return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
@@ -56,7 +56,7 @@
 
 	/**
 	 * This returns the default help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.command.CreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
index 0c773c6..8d0accf 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationItemProviderAdapterFactory.java
@@ -35,7 +35,7 @@
 
 /**
  * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
+ * { @link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
  * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
  * adapters are shared among multiple instances.
@@ -55,37 +55,37 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
+	 * { @link #isFactoryForType isFactoryForType}.
 	 */
 	protected Collection supportedTypes = new ArrayList();
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.Application}instances.
 	 */
 	protected ApplicationItemProvider applicationItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.Module}instances.
 	 */
 	protected ModuleItemProvider moduleItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.WebModule}instances.
 	 */
 	protected WebModuleItemProvider webModuleItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
 	 */
 	protected JavaClientModuleItemProvider javaClientModuleItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}instances.
 	 */
 	protected ConnectorModuleItemProvider connectorModuleItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}instances.
 	 */
 	protected EjbModuleItemProvider ejbModuleItemProvider;
 	protected Disposable disposable = new Disposable();
@@ -131,13 +131,14 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Application}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.Application}.
 	 */
 	@Override
 	public Adapter createApplicationAdapter() {
@@ -150,7 +151,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}.
 	 */
 	@Override
 	public Adapter createEjbModuleAdapter() {
@@ -163,7 +164,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}.
 	 */
 	@Override
 	public Adapter createJavaClientModuleAdapter() {
@@ -190,7 +191,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.Module}.
 	 */
 	@Override
 	public Adapter createModuleAdapter() {
@@ -203,7 +204,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.application.WebModule}.
 	 */
 	@Override
 	public Adapter createWebModuleAdapter() {
@@ -214,6 +215,7 @@
 		return webModuleItemProvider;
 	}
 
+	@Override
 	public void dispose() {
 		disposable.dispose();
 	}
@@ -236,6 +238,7 @@
 	/**
 	 * This returns the root adapter factory that contains this factory.
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -250,6 +253,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -260,6 +264,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -271,6 +276,7 @@
 	/**
 	 * This sets the composed adapter factory that contains this factory.
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
index 2bee279..e824573 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ApplicationProvidersResourceHandler.java
@@ -26,26 +26,32 @@
 
 	private static ResourceBundle fgResourceBundle;
 	public static ResourceLocator RESOURCE_LOCATOR = new ResourceLocator() {
+		@Override
 		public URL getBaseURL() {
 			return null;
 		}
 
+		@Override
 		public Object getImage(String arg0) {
 			return J2EEPlugin.getPlugin().getImage(arg0);
 		}
 
+		@Override
 		public String getString(String arg0) {
 			return ApplicationProvidersResourceHandler.getString(arg0);
 		}
 
+		@Override
 		public String getString(String arg0, Object[] arg1) {
 			return ApplicationProvidersResourceHandler.getString(arg0, arg1);
 		}
+		@Override
 		public String getString(String key, boolean translate) {
 			// TODO For now...  translate not supported
 			return getString(key);
 		}
 
+		@Override
 		public String getString(String key, Object[] substitutions, boolean translate) {
 			// TODO For now...  translate not supported
 			return getString(key,substitutions);
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
index 18bbeb0..cad132a 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/EjbModuleItemProvider.java
@@ -25,7 +25,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.application.EjbModule}object.
  */
 public class EjbModuleItemProvider extends ModuleItemProvider {
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
index c57ed9a..9fae7c5 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/JavaClientModuleItemProvider.java
@@ -25,7 +25,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.application.JavaClientModule}object.
  */
 public class JavaClientModuleItemProvider extends ModuleItemProvider {
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
index 708cea8..82cf097 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/ModuleItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.Module}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.application.Module}object.
  */
 public class ModuleItemProvider extends ApplicationItemProviderAdapter implements IEditingDomainItemProvider, IItemLabelProvider, IItemPropertySource, ITreeItemContentProvider {
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java
index 04f7d10..3be9375 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/application/provider/WebModuleItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.application.WebModule}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.application.WebModule}object.
  */
 public class WebModuleItemProvider extends ModuleItemProvider {
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
index 2804107..9af7891 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java
@@ -23,7 +23,6 @@
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
@@ -40,7 +39,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object.
+ * { @link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object.
  */
 public class ApplicationClientItemProvider extends CompatibilityDescriptionGroupItemProvider {
 	/**
@@ -52,7 +51,7 @@
 
 	/**
 	 * This creates a new child for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
 	public Object createChild(Object object) {
 		// TODO: create some child object.
@@ -61,7 +60,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
@@ -92,7 +91,7 @@
 
 	/**
 	 * This returns the image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
 	public Object getCreateChildImage(Object object) {
 		EObject refObject = (EObject) object;
@@ -101,7 +100,7 @@
 
 	/**
 	 * This returns the label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
 	public String getCreateChildText(Object object) {
 		return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
@@ -109,7 +108,7 @@
 
 	/**
 	 * This returns the help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java
index 4f54ce4..53fa143 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapter.java
@@ -24,7 +24,7 @@
 
 /**
  * This extended item provider supports the following commands:
- * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. The commands
+ * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}. The commands
  * are implemented uniformly on all our item adapters using this common base class.
  */
 public class ClientItemProviderAdapter extends ItemProviderAdapter implements org.eclipse.jst.j2ee.internal.application.common.CreateChildCommand.Helper {
@@ -37,8 +37,9 @@
 
 	/**
 	 * This implements the default behavior for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
+	@Override
 	public Object createChild(Object object) {
 		return null;
 	}
@@ -56,24 +57,27 @@
 
 	/**
 	 * This returns the default image for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
+	@Override
 	public Object getCreateChildImage(Object object) {
 		return org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin.getPlugin().getImage("CreateChild"); //$NON-NLS-1$
 	}
 
 	/**
 	 * This returns the default label for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
+	@Override
 	public String getCreateChildText(Object object) {
 		return ApplicationProvidersResourceHandler.getString("Create_Child_UI_"); //$NON-NLS-1$
 	}
 
 	/**
 	 * This returns the default help text for
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.command.CreateChildCommand}.
 	 */
+	@Override
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
 		return ApplicationProvidersResourceHandler.getString("Create_a_new_child_for_the_selected_UI_") + refObject.eClass().getName() + "."; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
index e5304f2..1695ca2 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ClientItemProviderAdapterFactory.java
@@ -36,7 +36,7 @@
 
 /**
  * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
+ * { @link org.eclipse.jface.viewers.Viewer}s. The adapters generated by this factory convert EMF
  * adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}. The adapters
  * also support property sheets, see {@link org.eclipse.ui.views.properties}. Note that most of the
  * adapters are shared among multiple instances.
@@ -52,12 +52,12 @@
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
+	 * { @link #isFactoryForType isFactoryForType}.
 	 */
 	protected Collection supportedTypes = new ArrayList();
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}instances.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}instances.
 	 */
 	protected ApplicationClientItemProvider applicationClientItemProvider;
 	protected Disposable disposable = new Disposable();
@@ -109,13 +109,14 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}.
+	 * { @link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}.
 	 */
 	@Override
 	public Adapter createApplicationClientAdapter() {
@@ -126,6 +127,7 @@
 		return applicationClientItemProvider;
 	}
 
+	@Override
 	public void dispose() {
 		disposable.dispose();
 	}
@@ -144,6 +146,7 @@
 	/**
 	 * This returns the root adapter factory that contains this factory.
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -158,6 +161,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -168,6 +172,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -179,6 +184,7 @@
 	/**
 	 * This sets the composed adapter factory that contains this factory.
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/FacetedProjectPropertyTester.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/FacetedProjectPropertyTester.java
index 489c9e5..b269d44 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/FacetedProjectPropertyTester.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/FacetedProjectPropertyTester.java
@@ -19,7 +19,8 @@
 public class FacetedProjectPropertyTester extends PropertyTester
     
 {
-    public boolean test( final Object receiver, 
+    @Override
+	public boolean test( final Object receiver, 
                          final String property, 
                          final Object[] args, 
                          final Object value )
diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
index 382bbd7..4e5bc9e 100644
--- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java
@@ -232,6 +232,7 @@
 	 * 
 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
 	 */
+	@Override
 	public Object getAdapter(Class adapter) {
 		if (adapter == IRESOURCE_CLASS || adapter == IFILE_CLASS)
 			return null; //return getAssociatedFile();
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/AppClientArchiveTypeHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/AppClientArchiveTypeHandler.java
index e839d80..c9b24a9 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/AppClientArchiveTypeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/AppClientArchiveTypeHandler.java
@@ -17,6 +17,7 @@
 
 public class AppClientArchiveTypeHandler implements IArchiveHandler {
 
+	@Override
 	public boolean handlesArchive(IArchive archive) {
 		if (archive.getLoadAdapter() instanceof AppClientComponentArchiveLoadAdapter) {
 			return true;
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveLoadAdapter.java
index 945bf2e..60a0530 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveLoadAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ComponentArchiveLoadAdapter.java
@@ -390,7 +390,7 @@
 			IVirtualComponent referencedComponent = reference.getReferencedComponent();
 
 			if (referencedComponent.isBinary() && reference.getDependencyType() == DependencyType.CONSUMES) {
-				java.io.File diskFile = (java.io.File) referencedComponent.getAdapter(java.io.File.class);
+				java.io.File diskFile = referencedComponent.getAdapter(java.io.File.class);
 				ZipFile zipFile;
 				IPath path = reference.getRuntimePath();
 				try {
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ConnectorComponentArchiveTypeHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ConnectorComponentArchiveTypeHandler.java
index 0393c78..7041d6c 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ConnectorComponentArchiveTypeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/ConnectorComponentArchiveTypeHandler.java
@@ -17,6 +17,7 @@
 
 public class ConnectorComponentArchiveTypeHandler implements IArchiveHandler {
 
+	@Override
 	public boolean handlesArchive(IArchive archive) {
 		if (archive.getLoadAdapter() instanceof ConnectorComponentArchiveLoadAdapter) {
 			return true;
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java
index 63becd6..a14d0f7 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveLoadAdapter.java
@@ -107,7 +107,7 @@
 			}
 			
 			if (referencedComponent.isBinary()) {
-				java.io.File diskFile = (java.io.File)referencedComponent.getAdapter(java.io.File.class);
+				java.io.File diskFile = referencedComponent.getAdapter(java.io.File.class);
 				binaryResourcesToDiskFiles.put(nestedModuleResource, diskFile);
 			} else if(null != nestedModuleArchive){
 				// Bug 220912 - set "export source" flag before calling JavaEEQuickPeek
@@ -145,7 +145,7 @@
 				final IVirtualReference ref = cpRefs[j];
 				// only ../ runtime paths contribute to the EAR
 				if (ref.getRuntimePath().equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
-					File cpEntryFile = (File)ref.getReferencedComponent().getAdapter(File.class);
+					File cpEntryFile = ref.getReferencedComponent().getAdapter(File.class);
 					addExternalFile(new Path(ref.getArchiveName()), cpEntryFile);
 				}
 			}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveTypeHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveTypeHandler.java
index c1b8143..8488fb6 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveTypeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EARComponentArchiveTypeHandler.java
@@ -17,6 +17,7 @@
 
 public class EARComponentArchiveTypeHandler implements IArchiveHandler {
 
+	@Override
 	public boolean handlesArchive(IArchive archive) {
 		if (archive.getLoadAdapter() instanceof EARComponentArchiveLoadAdapter) {
 			return true;
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EJBComponentArchiveTypeHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EJBComponentArchiveTypeHandler.java
index fd90d8d..564bddd 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EJBComponentArchiveTypeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/EJBComponentArchiveTypeHandler.java
@@ -17,6 +17,7 @@
 
 public class EJBComponentArchiveTypeHandler implements IArchiveHandler {
 
+	@Override
 	public boolean handlesArchive(IArchive archive) {
 		if (archive.getLoadAdapter() instanceof EJBComponentArchiveLoadAdapter) {
 			return true;
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
index 04f4074..58468fe 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/JavaEEArchiveUtilities.java
@@ -67,12 +67,12 @@
 	 * Default value = Boolean.TRUE Valid values = Boolean.TRUE or Boolean.FALSE
 	 * 
 	 * An ArchiveOption used to specify whether
-	 * {@link #openArchive(ArchiveOptions)} should attempt to discriminate
+	 * { @link #openArchive(ArchiveOptions)} should attempt to discriminate
 	 * between different Java EE archive types. The default behavior is to
 	 * always discriminate fully for all types except EJB 3.0 archives
-	 * {@link #DISCRIMINATE_EJB_ANNOTATIONS}. In order to fully discriminate
+	 * { @link #DISCRIMINATE_EJB_ANNOTATIONS}. In order to fully discriminate
 	 * EJB 3.0 archives, it is necessary to set both this flag and
-	 * {@link #DISCRIMINATE_EJB_ANNOTATIONS} to true.
+	 * { @link #DISCRIMINATE_EJB_ANNOTATIONS} to true.
 	 */
 	public static final String DISCRIMINATE_JAVA_EE = "DISCRIMINATE_EJB"; //$NON-NLS-1$
 
@@ -80,9 +80,9 @@
 	 * Default value = Boolean.TRUE Valid values = Boolean.TRUE or Boolean.FALSE
 	 * 
 	 * An ArchiveOption used to specify whether
-	 * {@link #openArchive(ArchiveOptions)} should attempt to fully discriminate
+	 * { @link #openArchive(ArchiveOptions)} should attempt to fully discriminate
 	 * a JAR file from an EJB JAR file. This option is only relevant if the
-	 * {@link #DISCRIMINATE_JAVA_EE} option is also set to Boolean.TRUE. If both
+	 * { @link #DISCRIMINATE_JAVA_EE} option is also set to Boolean.TRUE. If both
 	 * options are set to true then as a last resort all .class files byte codes
 	 * will be analyzed for EJB annotations in order to discriminate whether the
 	 * specified IArchive is an EJB 3.0 jar.
@@ -93,7 +93,7 @@
 	 * Default value = Boolean.TRUE Valid values = Boolean.TRUE or Boolean.FALSE
 	 * 
 	 * An ArchiveOption used to specify whether
-	 * {@link #openArchive(ArchiveOptions)} should attempt to fully discriminate
+	 * { @link #openArchive(ArchiveOptions)} should attempt to fully discriminate
 	 * a JAR file from an Application Client JAR file. This option is only relevant 
 	 * if the {@link #DISCRIMINATE_JAVA_EE} option is also set to Boolean.TRUE. If 
 	 * both options are set to true then as a last resort the MANIFEST.MF
@@ -359,7 +359,7 @@
 	 * META-INF/MANIFEST.MF file containing a Main-class attribute is considered
 	 * an Application Client </li>
 	 * <li> If the ArchiveOptions specify the
-	 * {@link #DISCRIMINATE_EJB_ANNOTATIONS} as Boolean.TRUE then if the archive
+	 * { @link #DISCRIMINATE_EJB_ANNOTATIONS} as Boolean.TRUE then if the archive
 	 * contains any .class file with EJB annotations it is considered an EJB
 	 * JAR. Be warned that this full check does have performance implications
 	 * and is not done by default.</li>
@@ -810,14 +810,17 @@
 			this.emfHelper = new JavaEEEMFArchiveAdapterHelper(this.simpleArchive);
 		}
 
+		@Override
 		public void close() {
 			simpleLoadAdapter.close();
 		}
 
+		@Override
 		public boolean containsArchiveResource(IPath resourcePath) {
 			return simpleLoadAdapter.containsArchiveResource(resourcePath);
 		}
 
+		@Override
 		public boolean containsModelObject(IPath modelObjectPath) {
 			IPath localModelObjectPath = modelObjectPath;
 			if (simpleLoadAdapter.containsArchiveResource(localModelObjectPath)) {
@@ -829,18 +832,22 @@
 			return emfHelper.containsModelObject(localModelObjectPath);
 		}
 
+		@Override
 		public IArchiveResource getArchiveResource(IPath resourcePath) throws FileNotFoundException {
 			return simpleLoadAdapter.getArchiveResource(resourcePath);
 		}
 
+		@Override
 		public List<IArchiveResource> getArchiveResources() {
 			return simpleLoadAdapter.getArchiveResources();
 		}
 
+		@Override
 		public InputStream getInputStream(IArchiveResource archiveResource) throws IOException, FileNotFoundException {
 			return simpleLoadAdapter.getInputStream(archiveResource);
 		}
 
+		@Override
 		public Object getModelObject(IPath modelObjectPath) throws ArchiveModelLoadException {
 			IPath localModelObjectPath = modelObjectPath;
 			if (IArchive.EMPTY_MODEL_PATH != localModelObjectPath 
@@ -853,10 +860,12 @@
 			return emfHelper.getModelObject(localModelObjectPath);
 		}
 
+		@Override
 		public IArchive getArchive() {
 			return simpleLoadAdapter.getArchive();
 		}
 
+		@Override
 		public void setArchive(IArchive archive) {
 			simpleLoadAdapter.setArchive(archive);
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveLoadAdapter.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveLoadAdapter.java
index c1c04b6..dce0279 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveLoadAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveLoadAdapter.java
@@ -82,7 +82,7 @@
 			IVirtualReference iLibModule = libModules[i];
 			IVirtualComponent looseComponent = iLibModule.getReferencedComponent();
 			if (looseComponent.isBinary()) {
-				java.io.File diskFile = (java.io.File)looseComponent.getAdapter(java.io.File.class);
+				java.io.File diskFile = looseComponent.getAdapter(java.io.File.class);
 				IPath uri = iLibModule.getRuntimePath().makeRelative().append("/" + diskFile.getName()); //$NON-NLS-1$
 				addExternalFile(uri, diskFile);				
 			} else {
@@ -147,7 +147,7 @@
 				// only process ../ mappings
 				if (ref.getReferencedComponent() instanceof IClasspathDependencyComponent
 						&& runtimePath.equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
-					File cpEntryFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
+					File cpEntryFile = ref.getReferencedComponent().getAdapter(java.io.File.class);
 					addExternalFile(new Path("WEB-INF/lib/" + ref.getArchiveName()), cpEntryFile); //$NON-NLS-1$
 				}
 			}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveTypeHandler.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveTypeHandler.java
index 5a239dc..89b7e9e 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveTypeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/WebComponentArchiveTypeHandler.java
@@ -17,6 +17,7 @@
 
 public class WebComponentArchiveTypeHandler implements IArchiveHandler {
 
+	@Override
 	public boolean handlesArchive(IArchive archive) {
 		if (archive.getLoadAdapter() instanceof WebComponentArchiveLoadAdapter) {
 			return true;
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
index 0d82452..d12bc13 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentLoadStrategyImpl.java
@@ -293,7 +293,7 @@
 			IVirtualReference reference = components[i];
 			IVirtualComponent referencedComponent = reference.getReferencedComponent();
 			if (referencedComponent.isBinary() && reference.getDependencyType() == DependencyType.CONSUMES) {
-				java.io.File diskFile = (java.io.File) referencedComponent.getAdapter(java.io.File.class);
+				java.io.File diskFile = referencedComponent.getAdapter(java.io.File.class);
 				ZipFile zipFile;
 				IPath path = reference.getRuntimePath();
 				try {
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
index b705d0a..d28f022 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ComponentSaveStrategyImpl.java
@@ -277,6 +277,7 @@
 		}
 	}
 
+	@Override
 	public void save(ArchiveManifest aManifest) throws SaveFailureException {
 	}
 }
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
index 826ff20..01ba72a 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARComponentLoadStrategyImpl.java
@@ -98,7 +98,7 @@
 					if(jeeVersion == J2EEVersionConstants.JEE_5_0_ID){
 						forceUtility = true;
 					}
-					diskFile = (java.io.File)referencedComponent.getAdapter(java.io.File.class);
+					diskFile = referencedComponent.getAdapter(java.io.File.class);
 				}
 				boolean isModule = false;
 				if(!forceUtility){
@@ -185,7 +185,7 @@
 				// only ../ runtime paths contribute to the EAR
 				if (ref.getRuntimePath().equals(IClasspathDependencyConstants.RUNTIME_MAPPING_INTO_CONTAINER_PATH)) {
 					if (ref.getReferencedComponent() instanceof IClasspathDependencyComponent) {
-						File cpEntryFile = (java.io.File)ref.getReferencedComponent().getAdapter(java.io.File.class);
+						File cpEntryFile = ref.getReferencedComponent().getAdapter(java.io.File.class);
 						addExternalFile(ref.getArchiveName(), cpEntryFile);
 					}
 				}
diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/FlatComponentArchiver.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/FlatComponentArchiver.java
index 2f46714..cb16ffd 100644
--- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/FlatComponentArchiver.java
+++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/FlatComponentArchiver.java
@@ -231,7 +231,7 @@
 			
 			if (f instanceof IFlatFolder) {
 				isFolder = true;
-				File folder = (File)((IFlatFolder)f).getAdapter(File.class);
+				File folder = ((IFlatFolder)f).getAdapter(File.class);
 				if (folder != null) {
 					lastModified = folder.lastModified();
 				}
@@ -247,9 +247,9 @@
 			
 			getZipOutputStream().putNextEntry(entry);
 			if (!isFolder) {
-				InputStream is = (InputStream) f.getAdapter(InputStream.class);
+				InputStream is = f.getAdapter(InputStream.class);
 				if (is == null){
-					File file = (File) f.getAdapter(File.class);
+					File file = f.getAdapter(File.class);
 					String msg = null;
 					if (file!= null)
 						msg = "Cannot find the file " + file.getAbsolutePath() + " in the file system. Make sure the file exists and try the operation again"; //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java
index a3653dc..ad5d36b 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/classpathdep/ClasspathDependencyUtil.java
@@ -202,7 +202,7 @@
 							IVirtualReference ref = (IVirtualReference) manifestRefs.get(j);
 							IVirtualComponent c = ref.getReferencedComponent();
 							if (c.isBinary()) {
-								IFile file = (IFile)c.getAdapter(IFile.class);
+								IFile file = c.getAdapter(IFile.class);
 								if (file != null && file.getFullPath().equals(entry.getPath())) {
 										foundEntry = true;
 										break;
@@ -502,7 +502,7 @@
 	 */
 	public static IPath getClasspathVirtualReferenceLocation(final IVirtualReference ref) {
 		if (ref != null && ref.getReferencedComponent() instanceof IClasspathDependencyComponent) {
-			return (IPath)ref.getReferencedComponent().getAdapter(IPath.class);
+			return ref.getReferencedComponent().getAdapter(IPath.class);
 		}
 		return null;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java
index 031d192..42761df 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyValidator.java
@@ -71,6 +71,7 @@
 		super();
 	}
 	
+	@Override
 	public IStatus validateInJob(IValidationContext helper, IReporter reporter)
 			throws ValidationException {
 		_reporter = reporter;
@@ -347,15 +348,18 @@
 		return (IMessage[]) results.toArray(new IMessage[results.size()]);
 	}
 	
+	@Override
 	public ISchedulingRule getSchedulingRule(IValidationContext helper) {
 		return null;
 	}
 
+	@Override
 	public void cleanup(IReporter reporter) {
 		_reporter = null;
 
 	}
 
+	@Override
 	public void validate(IValidationContext helper, IReporter reporter)
 			throws ValidationException {
 		// Forwarding to job method
diff --git a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyVirtualComponent.java
index 9b874ad..38999fb 100644
--- a/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyVirtualComponent.java
+++ b/plugins/org.eclipse.jst.j2ee/classpathdep/org/eclipse/jst/j2ee/internal/classpathdep/ClasspathDependencyVirtualComponent.java
@@ -40,6 +40,7 @@
 	 * Returns true if this component represents a library class folder entry.
 	 * @return True for class folders.
 	 */
+	@Override
 	public boolean isClassFolder() {
 		return isClassFolder;
 	}
@@ -48,6 +49,7 @@
 	 * Returns the container for the specified class folder or null if does not represent a class folder.
 	 * @return IContainer for the class folder or null if this reference does not match class folder.
 	 */
+	@Override
 	public IContainer getClassFolder() {
 		if (!isClassFolder) {
 			return null;
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
index 62f95a8..8034677 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java
@@ -71,6 +71,7 @@
 	protected ClassPathSelection classPathWLPSelection;
 
 	protected Comparator comparator = new Comparator() {
+		@Override
 		public int compare(Object o1, Object o2) {
 			IVirtualComponent e1 = (IVirtualComponent) o1;
 			IVirtualComponent e2 = (IVirtualComponent) o2;
@@ -229,7 +230,7 @@
 
 	/**
 	 * Sets the isSelected for the classpath element and sends out a notification of type
-	 * {@link ClasspathModelEvent#CLASS_PATH_CHANGED}
+	 * { @link ClasspathModelEvent#CLASS_PATH_CHANGED}
 	 */
 	public void setSelection(ClasspathElement element, boolean selected) {
 		element.setSelected(selected);
@@ -265,7 +266,7 @@
 
 	/**
 	 * Updates the manifest Class-Path:, and sends out a notification of type
-	 * {@link ClasspathModelEvent#CLASS_PATH_CHANGED}
+	 * { @link ClasspathModelEvent#CLASS_PATH_CHANGED}
 	 */
 	public void updateManifestClasspath() {
 		if (classPathSelection != null && classPathSelection.isModified()) {
@@ -276,7 +277,7 @@
 
 	/**
 	 * Updates the manifest Main-Class:, and sends out a notification of type
-	 * {@link ClasspathModelEvent#MAIN_CLASS_CHANGED}
+	 * { @link ClasspathModelEvent#MAIN_CLASS_CHANGED}
 	 */
 	public void updateMainClass(String mainClass) {
 		manifest.setMainClass(mainClass);
@@ -285,7 +286,7 @@
 
 	/**
 	 * Updates the manifest Main-Class:, and sends out a notification of type
-	 * {@link ClasspathModelEvent#MAIN_CLASS_CHANGED}
+	 * { @link ClasspathModelEvent#MAIN_CLASS_CHANGED}
 	 */
 	public void updateImplVersion(String implVersion) {
 		manifest.setImplemenationVersion(implVersion);
@@ -351,12 +352,14 @@
 	/**
 	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#cacheNonResourceValidateState(List)
 	 */
+	@Override
 	public void cacheNonResourceValidateState(List roNonResourceFiles) {
 	}
 
 	/**
 	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getNonResourceFiles()
 	 */
+	@Override
 	public List getNonResourceFiles() {
 		if (nonResourceFiles == null)
 			initNonResourceFiles();
@@ -385,6 +388,7 @@
 	/**
 	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getNonResourceInconsistentFiles()
 	 */
+	@Override
 	public List getNonResourceInconsistentFiles() {
 		return null;
 	}
@@ -392,6 +396,7 @@
 	/**
 	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#isDirty()
 	 */
+	@Override
 	public boolean isDirty() {
 		ClassPathSelection selection = getClassPathSelection();
 		if (selection == null)
@@ -416,6 +421,7 @@
 	/**
 	 * @see com.ibm.etools.emf.workbench.ResourceStateInputProvider#getResources()
 	 */
+	@Override
 	public List getResources() {
 		if(isWLPModel){
 			StructureEdit sEdit = null;
@@ -514,6 +520,7 @@
 	/**
 	 * @see ResourceStateValidator#checkActivation(ResourceStateValidatorPresenter)
 	 */
+	@Override
 	public void checkActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
 		getStateValidator().checkActivation(presenter);
 	}
@@ -521,6 +528,7 @@
 	/**
 	 * @see ResourceStateValidator#lostActivation(ResourceStateValidatorPresenter)
 	 */
+	@Override
 	public void lostActivation(ResourceStateValidatorPresenter presenter) throws CoreException {
 		getStateValidator().lostActivation(presenter);
 	}
@@ -528,6 +536,7 @@
 	/**
 	 * @see ResourceStateValidator#validateState(ResourceStateValidatorPresenter)
 	 */
+	@Override
 	public IStatus validateState(ResourceStateValidatorPresenter presenter) throws CoreException {
 		return getStateValidator().validateState(presenter);
 	}
@@ -535,6 +544,7 @@
 	/**
 	 * @see ResourceStateValidator#checkSave(ResourceStateValidatorPresenter)
 	 */
+	@Override
 	public boolean checkSave(ResourceStateValidatorPresenter presenter) throws CoreException {
 		return getStateValidator().checkSave(presenter);
 	}
@@ -542,6 +552,7 @@
 	/**
 	 * @see ResourceStateValidator#checkReadOnly()
 	 */
+	@Override
 	public boolean checkReadOnly() {
 		return getStateValidator().checkReadOnly();
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CleanBuildCacheCleanerListener.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CleanBuildCacheCleanerListener.java
index b13a047..3a782b4 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CleanBuildCacheCleanerListener.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CleanBuildCacheCleanerListener.java
@@ -22,6 +22,7 @@
 	private CleanBuildCacheCleanerListener() {
 	}
 
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		IResourceDelta delta = event.getDelta();
 		if(delta.getFlags() != IResourceDelta.MARKERS && delta.getAffectedChildren().length > 0){
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/FacetedProjectPropertyTester.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/FacetedProjectPropertyTester.java
index 69867cd..a78808b 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/FacetedProjectPropertyTester.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/FacetedProjectPropertyTester.java
@@ -20,6 +20,7 @@
 public final class FacetedProjectPropertyTester extends PropertyTester
 
 {
+@Override
 public boolean test( final Object receiver, 
                      final String property, 
                      final Object[] args, 
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEDependencyListener.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEDependencyListener.java
index bf5f11a..55aaa65 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEDependencyListener.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEDependencyListener.java
@@ -88,6 +88,7 @@
 	}
 
 	private long modStampAtResourceChanged = 0;
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		try {
 			switch (event.getType()) {
@@ -107,6 +108,7 @@
 		}
 	}
 
+	@Override
 	public boolean visit(IResourceDelta delta) throws CoreException {
 		if(modStampAtResourceChanged != getModStamp()){
 			//already incremented the modification stamp, no need to continue
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEPreferencePropertyTester.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEPreferencePropertyTester.java
index 2197923..455d045 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEPreferencePropertyTester.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/J2EEPreferencePropertyTester.java
@@ -19,6 +19,7 @@
 	/**
 	 * Test to see if the @param value preference is set to true in @link J2EEPreferences 
 	 */
+	@Override
 	public boolean test( final Object receiver, 
 						final String property, 
 						final Object[] args, 
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
index b0ddfc9..57bbf17 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
@@ -170,7 +170,7 @@
 			} 
 			IPath path = null;
 			if (comp.isBinary())
-				path = (IPath)comp.getAdapter(IPath.class);
+				path = comp.getAdapter(IPath.class);
 			else
 				path = comp.getProject().getFullPath();
 			if (!path.equals(paths[i])) {
@@ -365,7 +365,7 @@
 							continue;
 						}
 					}
-					lastUpdate.paths[i] = (IPath)comp.getAdapter(IPath.class);
+					lastUpdate.paths[i] = comp.getAdapter(IPath.class);
 					IClasspathEntry newEntry = createEntry(lastUpdate, i);
 					entriesList.add(newEntry);
 				} else {
@@ -465,7 +465,7 @@
 								IFlatFolder flatLibFolder = (IFlatFolder)flatLibResource;
 								IFlatResource [] flatLibs = flatLibFolder.members();
 								for(IFlatResource flatResource : flatLibs){
-									File file = (File) flatResource.getAdapter(File.class);
+									File file = flatResource.getAdapter(File.class);
 									if(file != null){
 										IVirtualComponent dynamicComponent = new VirtualArchiveComponent(earComp.getProject(), VirtualArchiveComponent.LIBARCHIVETYPE + "/" + file.getAbsolutePath(), new Path(libDir)); //$NON-NLS-1$
 										IVirtualReference dynamicRef = ComponentCore.createReference(earComp, dynamicComponent);
@@ -546,18 +546,22 @@
 		refresh(false);
 	}
 
+	@Override
 	public IClasspathEntry[] getClasspathEntries() {
 		return entries;
 	}
 
+	@Override
 	public String getDescription() {
 		return J2EECommonMessages.J2EE_MODULE_CLASSPATH_CONTAINER_NAME;
 	}
 
+	@Override
 	public int getKind() {
 		return K_APPLICATION;
 	}
 
+	@Override
 	public IPath getPath() {
 		return containerPath;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java
index 10f1083..6076128 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainerStore.java
@@ -165,10 +165,12 @@
 		@Override
 		protected IStatus run(IProgressMonitor monitor) {
 			SafeRunner.run(new ISafeRunnable() {
+				@Override
 				public void run() throws Exception {
 					persist();
 				}
 
+				@Override
 				public void handleException(Throwable exception) {
 					J2EEPlugin.logError(exception);
 				}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
index 16ff147..3cab845 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathUpdater.java
@@ -256,10 +256,12 @@
 		protected IStatus run(IProgressMonitor monitor) {
 
 			SafeRunner.run(new ISafeRunnable() {
+				@Override
 				public void handleException(Throwable e) {
 					J2EEPlugin.logError(e);
 				}
 
+				@Override
 				public void run() throws Exception {
 					
 					findNode(delta);
@@ -393,10 +395,12 @@
 		protected IStatus run(IProgressMonitor monitor) {
 
 			SafeRunner.run(new ISafeRunnable() {
+				@Override
 				public void handleException(Throwable e) {
 					J2EEPlugin.logError(e);
 				}
 
+				@Override
 				public void run() throws Exception {
 					try {
 						Object[] moduleProjects = moduleQueue.getListeners();
@@ -455,6 +459,7 @@
 		knownProjects.remove(project.getName());
 	}
 	
+	@Override
 	public void dependencyGraphUpdate(IDependencyGraphUpdateEvent event) {
 		if((event.getType() & IDependencyGraphUpdateEvent.ADDED) == IDependencyGraphUpdateEvent.ADDED){
 			Map<IProject, Set<IProject>> addedReferences = event.getAddedReferences();
@@ -467,6 +472,7 @@
 		}
 	}
 	
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		boolean scheduleJob = false;
 		try {
@@ -540,6 +546,7 @@
 		}
 	}
 	
+	@Override
 	public boolean visit(IResourceDelta delta) {
 		// If it is only a marker change, ignore the change
 		if(delta.getFlags() == IResourceDelta.MARKERS) {
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpOsgiBundlesLibraryProviderInstallOperationConfig.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpOsgiBundlesLibraryProviderInstallOperationConfig.java
index 7c06247..05bda58 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpOsgiBundlesLibraryProviderInstallOperationConfig.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpOsgiBundlesLibraryProviderInstallOperationConfig.java
@@ -121,7 +121,8 @@
         
         this.facetedProjectListener = new IFacetedProjectListener() 
         {
-            public void handleEvent( final IFacetedProjectEvent event ) 
+            @Override
+			public void handleEvent( final IFacetedProjectEvent event ) 
             {
                 final boolean moduleFaceted = hasModuleFacet( event.getWorkingCopy() );
                 setIncludeWithApplicationEnabled( moduleFaceted );
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpUserLibraryProviderInstallOperationConfig.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpUserLibraryProviderInstallOperationConfig.java
index c56fa56..2451d1c 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpUserLibraryProviderInstallOperationConfig.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/WtpUserLibraryProviderInstallOperationConfig.java
@@ -119,7 +119,8 @@
         
         this.facetedProjectListener = new IFacetedProjectListener() 
         {
-            public void handleEvent( final IFacetedProjectEvent event ) 
+            @Override
+			public void handleEvent( final IFacetedProjectEvent event ) 
             {
                 final boolean moduleFaceted = hasModuleFacet( event.getWorkingCopy() );
                 setIncludeWithApplicationEnabled( moduleFaceted );
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JEEHeirarchyExportParticipant.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JEEHeirarchyExportParticipant.java
index 8aec175..6edf6ef 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JEEHeirarchyExportParticipant.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JEEHeirarchyExportParticipant.java
@@ -64,11 +64,11 @@
 	public boolean isChildModule(IVirtualComponent rootComponent, FlatComponentTaskModel dataModel, IFlatFile file) {
 		if (isPossibleChild(file.getName())) {
 			String path = null;
-			IFile f = (IFile)file.getAdapter(IFile.class);
+			IFile f = file.getAdapter(IFile.class);
 			if (f != null && f.exists())
 				path = f.getFullPath().toString();
 			else {
-				File f2 = (File)file.getAdapter(File.class);
+				File f2 = file.getAdapter(File.class);
 				if (f2 != null && f2.exists()) {
 					path = f2.getAbsolutePath();
 				}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java
index c5df2bb..e646e37 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEEComponentExportCallback.java
@@ -53,6 +53,7 @@
 		isExportSource = exportSource;
 	}
 	
+	@Override
 	public boolean canSave(IVirtualComponent component) {
 		if (JavaEEProjectUtilities.isJCAComponent(component)) {
 			return true;
@@ -60,6 +61,7 @@
 		return false;
 	}
 
+	@Override
 	public IFlatVirtualComponent saveComponent(IVirtualComponent component, ZipOutputStream zipOutputStream, List<IPath> entries) throws ArchiveException {
 		IArchive archiveToSave = null;
 		zipEntries = entries;
@@ -154,6 +156,7 @@
 		return isExportSource;
 	}
 	
+	@Override
 	public boolean createManifest() {
 		return false;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
index 6847624..e538d57 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/exportmodel/JavaEESingleRootCallback.java
@@ -64,10 +64,12 @@
 		this.filteredSuffixes = filtered;
 	}
 	
+	@Override
 	public boolean canValidate(IVirtualComponent vc) {
 		return JavaEEProjectUtilities.usesJavaEEComponent(vc);
 	}
 
+	@Override
 	public void validate(SingleRootUtil util, IVirtualComponent vc, IProject project, List resourceMaps) {
 	
 		if (resourceMaps.size() == 1) {
@@ -259,6 +261,7 @@
 		return util.getValidateFlag() == CANCEL ? false : true;
 	}
 
+	@Override
 	public IFlattenParticipant[] getDelegateParticipants() {
 		List<IFlattenParticipant> participants = new ArrayList<IFlattenParticipant>();
 
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddJavaEEArtifactOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddJavaEEArtifactOperation.java
index 29ced25..546c527 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddJavaEEArtifactOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddJavaEEArtifactOperation.java
@@ -42,6 +42,7 @@
 		Runnable runnable = null;
 		if (provider.validateEdit(null, null).isOK()) {
 			runnable = new Runnable(){
+				@Override
 				public void run() {
 					try {
 						doExecute(monitor, info);
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryConstructor.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryConstructor.java
index c0ad1a7..166106e7 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryConstructor.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryConstructor.java
@@ -30,6 +30,7 @@
 	/**
 	 * @see Constructor#isParameterless()
 	 */
+	@Override
 	public boolean isParameterless() {
 		return method.getNumberOfParameters() == 0;
 	}
@@ -37,6 +38,7 @@
 	/**
 	 * @see Constructor#isPublic()
 	 */
+	@Override
 	public boolean isPublic() {
 		int flags;
 		try {
@@ -51,6 +53,7 @@
 	/**
 	 * @see Constructor#isProtected()
 	 */
+	@Override
 	public boolean isProtected() {
 		int flags;
 		try {
@@ -65,6 +68,7 @@
 	/**
 	 * @see Constructor#getParamsForCall()
 	 */
+	@Override
 	public String getParamsForCall() {
 		return this.getParams(false, true);
 	}
@@ -72,6 +76,7 @@
 	/**
 	 * @see Constructor#getParamsForDeclaration()
 	 */
+	@Override
 	public String getParamsForDeclaration() {
 		return this.getParams(true, true);
 	}
@@ -79,6 +84,7 @@
 	/**
 	 * @see Constructor#getParamsForJavadoc()()
 	 */
+	@Override
 	public String getParamsForJavadoc() {
 		return this.getParams(true, false);
 	}
@@ -86,6 +92,7 @@
 	/**
 	 * @see Constructor#getNonPrimitiveParameterTypes()
 	 */
+	@Override
 	public List<String> getNonPrimitiveParameterTypes() {
 		List<String> result = new ArrayList<String>();
 		
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryMethod.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryMethod.java
index 117f56a..07232c2 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryMethod.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/BinaryMethod.java
@@ -30,6 +30,7 @@
 	/**
 	 * @see Method#getSignature()
 	 */
+	@Override
 	public String getSignature() {
 		try {
 			return method.getSignature();
@@ -41,6 +42,7 @@
 	/**
 	 * @see Method#getName()
 	 */
+	@Override
 	public String getName() {
 		return method.getElementName();
 	}
@@ -48,6 +50,7 @@
 	/**
 	 * @see Method#getContainingJavaClass()
 	 */
+	@Override
 	public String getContainingJavaClass() {
 		return method.getDeclaringType().getElementName();
 	}
@@ -55,6 +58,7 @@
 	/**
 	 * @see Method#getReturnType()
 	 */
+	@Override
 	public String getReturnType() {
 		try {
 			return Signature.getSignatureSimpleName(method.getReturnType());
@@ -66,6 +70,7 @@
 	/**
 	 * @see Method#getDefaultReturnValue()
 	 */
+	@Override
 	public String getDefaultReturnValue() {
 		try {
 			String signature = method.getReturnType();
@@ -88,6 +93,7 @@
 	/**
 	 * @see Method#getReturnTypeImports()
 	 */
+	@Override
 	public Collection<String> getReturnTypeImports() {
 		try {
 			List<String> result = new ArrayList<String>();
@@ -104,6 +110,7 @@
 	/**
 	 * @see Method#getParamsForCall()
 	 */
+	@Override
 	public String getParamsForCall() {
 		return this.getParams(false, true);
 	}
@@ -111,6 +118,7 @@
 	/**
 	 * @see Method#getParamsForDeclaration()
 	 */
+	@Override
 	public String getParamsForDeclaration() {
 		return this.getParams(true, true);
 	}
@@ -118,6 +126,7 @@
 	/**
 	 * @see Method#getParamsForJavadoc()()
 	 */
+	@Override
 	public String getParamsForJavadoc() {
 		return this.getParams(true, false);
 	}
@@ -125,6 +134,7 @@
 	/**
 	 * @see Method#getParameterImports()
 	 */
+	@Override
 	public Collection<String> getParameterImports() {
 		List<String> result = new ArrayList<String>();
 		
@@ -142,6 +152,7 @@
 	 * @see Method#getExceptions()
 	 */
 	
+	@Override
 	public String getExceptions(){
 		StringBuffer exceptions = new StringBuffer(); 
 		try {
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/ImportsCollection.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/ImportsCollection.java
index a1ce7a7..dfe4bb7 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/ImportsCollection.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/ImportsCollection.java
@@ -26,6 +26,7 @@
 		this.model = model;
 	}
 
+	@Override
 	public boolean add(String o) {
 		if (!isImportInJavaLang(o) && !isImportInSamePackage(o))
 			return collection.add(o);
@@ -33,6 +34,7 @@
 		return false;
 	}
 
+	@Override
 	public boolean addAll(Collection<? extends String> c) {
 		boolean result = false;
 		
@@ -42,46 +44,57 @@
 		return result;
 	}
 
+	@Override
 	public void clear() {
 		collection.clear();
 	}
 
+	@Override
 	public boolean contains(Object o) {
 		return collection.contains(o);
 	}
 
+	@Override
 	public boolean containsAll(Collection<?> c) {
 		return collection.containsAll(c);
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return collection.isEmpty();
 	}
 
+	@Override
 	public Iterator<String> iterator() {
 		return collection.iterator();
 	}
 
+	@Override
 	public boolean remove(Object o) {
 		return collection.remove(o);
 	}
 
+	@Override
 	public boolean removeAll(Collection<?> c) {
 		return collection.removeAll(c);
 	}
 
+	@Override
 	public boolean retainAll(Collection<?> c) {
 		return collection.retainAll(c);
 	}
 
+	@Override
 	public int size() {
 		return collection.size();
 	}
 
+	@Override
 	public Object[] toArray() {
 		return collection.toArray();
 	}
 
+	@Override
 	public <T> T[] toArray(T[] a) {
 		return collection.toArray(a);
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
index 7a4c70e..aedc191 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProperties.java
@@ -11,10 +11,9 @@
 package org.eclipse.jst.j2ee.internal.common.operations;
 
 import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
 
 /**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
+ * { @link DoNotUseMeThisWillBeDeletedPost15}
  * 
  * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
  *             containers
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
index 9f5f21b..3c4eb0e 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModelProvider.java
@@ -25,10 +25,9 @@
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
 
 /**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
+ * { @link DoNotUseMeThisWillBeDeletedPost15}
  * 
  * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
  *             containers
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
index 0b622cb..cfd9064 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java
@@ -40,10 +40,9 @@
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
 
 /**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
+ * { @link DoNotUseMeThisWillBeDeletedPost15}
  * 
  * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
  *             containers
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
index a5b85c3..13f8307 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JavaModelUtil.java
@@ -41,7 +41,6 @@
 import org.eclipse.jdt.core.IOpenable;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IParent;
 import org.eclipse.jdt.core.ISourceReference;
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.ITypeHierarchy;
@@ -875,7 +874,7 @@
 	
 	/**
 	 * If <code>true</code>, then element can safely be cast to any of
-	 * {@link IParent}, {@link IOpenable}, {@link ISourceReference}, or {@link ICodeAssist}.
+	 * { @link IParent}, {@link IOpenable}, {@link ISourceReference}, or {@link ICodeAssist}.
 	 * @param element
 	 * @return <code>true</code> iff element is an {@link ICompilationUnit} or an {@link IClassFile}
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaEEArtifactClassOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaEEArtifactClassOperation.java
index c16c1ad..c416b12 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaEEArtifactClassOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaEEArtifactClassOperation.java
@@ -142,7 +142,7 @@
 
 	/**
 	 * This method checks the
-	 * {@link J2EEPlugin#DYNAMIC_TRANSLATION_OF_JET_TEMPLATES_PREF_KEY}
+	 * { @link J2EEPlugin#DYNAMIC_TRANSLATION_OF_JET_TEMPLATES_PREF_KEY}
 	 * preference to determine the method for generating the source code of the
 	 * Java EE artifact:
 	 * <ul>
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceConstructor.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceConstructor.java
index d143561..e9d3a42 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceConstructor.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceConstructor.java
@@ -31,6 +31,7 @@
 	/**
 	 * @see Constructor#isParameterless()
 	 */
+	@Override
 	public boolean isParameterless() {
 		return method.parameters().size() == 0;
 	}
@@ -38,6 +39,7 @@
 	/**
 	 * @see Constructor#isPublic()
 	 */
+	@Override
 	public boolean isPublic() {
 		int modifiers = method.getModifiers();
         return Modifier.isPublic(modifiers);
@@ -46,6 +48,7 @@
 	/**
 	 * @see Constructor#isProtected()
 	 */
+	@Override
 	public boolean isProtected() {
 		int modifiers = method.getModifiers();
         return Modifier.isProtected(modifiers);
@@ -54,6 +57,7 @@
 	/**
 	 * @see Constructor#getParamsForCall()
 	 */
+	@Override
 	public String getParamsForCall() {
 		return this.getParams(false, true);
 	}
@@ -61,6 +65,7 @@
 	/**
 	 * @see Constructor#getParamsForDeclaration()
 	 */
+	@Override
 	public String getParamsForDeclaration() {
 		return this.getParams(true, true);
 	}
@@ -68,6 +73,7 @@
 	/**
 	 * @see Constructor#getParamsForJavadoc()
 	 */
+	@Override
 	public String getParamsForJavadoc() {
 		return this.getParams(true, false);
 	}
@@ -75,6 +81,7 @@
 	/**
 	 * @see Constructor#getNonPrimitiveParameterTypes()
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public List<String> getNonPrimitiveParameterTypes() {
 		List<String> result = new ArrayList<String>();
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceMethod.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceMethod.java
index c130676..98405e5 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceMethod.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/SourceMethod.java
@@ -39,6 +39,7 @@
 	/**
 	 * @see Method#getSignature()
 	 */
+	@Override
 	public String getSignature() {
 		List<SingleVariableDeclaration> parameters = method.parameters();
 		List<String> parameterTypesList = new ArrayList<String>();
@@ -55,6 +56,7 @@
 	/**
 	 * @see Method#getName()
 	 */
+	@Override
 	public String getName() {
 		return method.getName().getIdentifier();
 	}
@@ -62,6 +64,7 @@
 	/**
 	 * @see Method#getContainingJavaClass()
 	 */
+	@Override
 	public String getContainingJavaClass() {
 		TypeDeclaration type = (TypeDeclaration) method.getParent();
 		return type.getName().getIdentifier();
@@ -70,6 +73,7 @@
 	/**
 	 * @see Method#getReturnType()
 	 */
+	@Override
 	public String getReturnType() {
 		return method.getReturnType2().resolveBinding().getName();
 	}
@@ -77,6 +81,7 @@
 	/**
 	 * @see Method#getDefaultReturnValue()
 	 */
+	@Override
 	public String getDefaultReturnValue() {
 		Type returnType = method.getReturnType2();
 		if (returnType.isPrimitiveType()) {
@@ -95,6 +100,7 @@
 	/**
 	 * @see Method#getReturnTypeImports()
 	 */
+	@Override
 	public Collection<String> getReturnTypeImports() {
 		List<String> result = new ArrayList<String>();
 		
@@ -107,6 +113,7 @@
 	/**
 	 * @see Method#getParamsForCall()
 	 */
+	@Override
 	public String getParamsForCall() {
 		return this.getParams(false, true);
 	}
@@ -114,6 +121,7 @@
 	/**
 	 * @see Method#getParamsForDeclaration()
 	 */
+	@Override
 	public String getParamsForDeclaration() {
 		return this.getParams(true, true);
 	}
@@ -121,6 +129,7 @@
 	/**
 	 * @see Method#getParamsForJavadoc()
 	 */
+	@Override
 	public String getParamsForJavadoc() {
 		return this.getParams(true, false);
 	}
@@ -128,6 +137,7 @@
 	/**
 	 * @see Method#getParameterImports()
 	 */
+	@Override
 	public Collection<String> getParameterImports() {
 		List<String> result = new ArrayList<String>();
 		
@@ -145,6 +155,7 @@
 	 * @see Method#getExceptions()
 	 */
 	
+	@Override
 	public String getExceptions(){
 		StringBuffer exceptions = new StringBuffer();
 		List exceptionTypes = method.thrownExceptions();
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
index aa72674..007affb 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java
@@ -28,12 +28,11 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection;
 import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement;
-import org.eclipse.wst.common.frameworks.internal.DoNotUseMeThisWillBeDeletedPost15;
 import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException;
 import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress;
 
 /**
- * {@link DoNotUseMeThisWillBeDeletedPost15}
+ * { @link DoNotUseMeThisWillBeDeletedPost15}
  * 
  * @deprecated This should no longer be necessary because of the new EAR & Web Lib classpath
  *             containers
@@ -207,6 +206,7 @@
 	 * 
 	 * @see IRunnableContext#run
 	 */
+	@Override
 	public void run(org.eclipse.core.runtime.IProgressMonitor monitor) throws java.lang.reflect.InvocationTargetException, InterruptedException {
 		try {
 			String[] prevRequiredProjects = javaProject.getRequiredProjectNames();
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
index c941756..a05b74d 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/DefaultWSDLServiceHelper.java
@@ -35,6 +35,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortName(java.lang.Object)
 	 */
+	@Override
 	public String getPortName(Object port) {
 		return null;
 	}
@@ -42,6 +43,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServicePorts(java.lang.Object)
 	 */
+	@Override
 	public Map getServicePorts(Object aService) {
 		return null;
 	}
@@ -49,6 +51,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceNamespaceURI(java.lang.Object)
 	 */
+	@Override
 	public String getServiceNamespaceURI(Object aService) {
 		return null;
 	}
@@ -56,6 +59,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceDefinitionLocation(org.eclipse.emf.ecore.EObject)
 	 */
+	@Override
 	public Object getServiceDefinitionLocation(EObject aService) {
 		return null;
 	}
@@ -63,6 +67,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getPortBindingNamespaceURI(java.lang.Object)
 	 */
+	@Override
 	public String getPortBindingNamespaceURI(Object aPort) {
 		return null;
 	}
@@ -70,6 +75,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceLocalPart(java.lang.Object)
 	 */
+	@Override
 	public String getServiceLocalPart(Object aService) {
 		return null;
 	}
@@ -77,6 +83,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getServiceQName(java.lang.Object)
 	 */
+	@Override
 	public Object getServiceQName(Object aService) {
 		return null;
 	}
@@ -84,6 +91,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getDefinitionServices(java.lang.Object)
 	 */
+	@Override
 	public Map getDefinitionServices(Object aDefinition) {
 		return null;
 	}
@@ -91,6 +99,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(java.lang.String)
 	 */
+	@Override
 	public Object getWSDLDefinition(String wsdlURL) {
 		return null;
 	}
@@ -98,6 +107,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWSDLDefinition(org.eclipse.emf.ecore.resource.Resource)
 	 */
+	@Override
 	public Object getWSDLDefinition(Resource wsdlResource) {
 		return null;
 	}
@@ -105,20 +115,25 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper#getWsdlServicesFromWsilFile(org.eclipse.core.resources.IFile)
 	 */
+	@Override
 	public List getWsdlServicesFromWsilFile(IFile wsil) {
 		return null;
 	}
 
+	@Override
 	public boolean isService(Object aService) {
 		return false;
 	}
+	@Override
 	public boolean isWSDLResource(Object aResource) {
 		return false;
 	}
+	@Override
 	public boolean isDefinition(Object aDefinition) {
 		return false;
 	}
 
+	@Override
 	public List get13ServiceRefs(EObject j2eeObject) {
 		return null;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/ModelProviderEvent.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/ModelProviderEvent.java
index 7032c21..bf8490a 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/ModelProviderEvent.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/model/ModelProviderEvent.java
@@ -30,50 +30,60 @@
 		setProject(proj);
 	}
 	
+	@Override
 	public void setProject(IProject project) {
 		proj = project;
 		
 	}
 
+	@Override
 	public void addResource(Object resource) {
 		changedResources.add(resource);
 
 	}
 
+	@Override
 	public void addResources(Collection<Object> someResources) {
 		changedResources.addAll(someResources);
 
 	}
 
+	@Override
 	public List<Object> getChangedResources() {
 		
 		return changedResources;
 	}
 
+	@Override
 	public int getEventCode() {
 		return event;
 	}
 
+	@Override
 	public IModelProvider getModel() {
 		
 		return model;
 	}
 
+	@Override
 	public void setChangedResources(List<Object> newChangedResources) {
 		changedResources = newChangedResources;
 
 	}
 
+	@Override
 	public void setEventCode(int newEventCode) {
 		event = newEventCode;
 
 	}
 
+	@Override
 	public void setModel(IModelProvider newModel) {
 		model = newModel;
 
 	}
 
+	@Override
 	public IProject getProject() {
 		return proj;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/project/facet/J2EEFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/project/facet/J2EEFacetVersionChangeDelegate.java
index b3a5672..69816b5 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/project/facet/J2EEFacetVersionChangeDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/project/facet/J2EEFacetVersionChangeDelegate.java
@@ -32,6 +32,7 @@
  */
 public class J2EEFacetVersionChangeDelegate implements IDelegate {
 
+	@Override
 	public void execute(IProject project, IProjectFacetVersion fv,
 			Object config, IProgressMonitor monitor) throws CoreException {
 		//do nothing
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
index 1b321b0..80043e7 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapter.java
@@ -26,7 +26,7 @@
 
 /**
  * This extended item provider supports two addition features, (@link CreateChildCommand} and
- * {@link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
+ * { @link CreateChildrenCommand}. These two actions are implemented uniformly on all our item
  * adapters using this common base class.
  */
 public class CommonItemProviderAdapter extends ItemProviderAdapter {
@@ -103,7 +103,7 @@
 
 	/**
 	 * This returns the default help text for
-	 * {@link com.ibm.etools.common.command.CreateChildCommand}.
+	 * { @link com.ibm.etools.common.command.CreateChildCommand}.
 	 */
 	public String getCreateChildToolTipText(Object object) {
 		EObject refObject = (EObject) object;
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
index 6382054..9a42c14 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CommonItemProviderAdapterFactory.java
@@ -36,7 +36,7 @@
 
 /**
  * This is the factory that is used to provide the interfaces needed to support
- * {@link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
+ * { @link org.eclipse.jface.viewer.ContentViewer}s. The adapters generated by this factory convert
  * MOF adapter notificiations into {@link org.eclipse.jface.DomainEvent}s. The adapters also
  * support property sheets, see {@link com.ibm.itp.ui.api.propertysheet}. Note that most of the
  * adapters are shared among multiple instances.
@@ -57,7 +57,7 @@
 
 	/**
 	 * This keeps track of all the supported types checked by
-	 * {@link #isFactoryForType isFactoryForType}.
+	 * { @link #isFactoryForType isFactoryForType}.
 	 */
 	protected Collection supportedTypes = new ArrayList();
 	/**
@@ -96,7 +96,7 @@
 	protected UseCallerIdentityItemProvider useCallerIdentityItemProvider;
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link com.ibm.etools.common.SecurityRoleRef}instances.
+	 * { @link com.ibm.etools.common.SecurityRoleRef}instances.
 	 */
 	protected SecurityRoleRefItemProvider securityRoleRefItemProvider;
 	protected Disposable disposable = new Disposable();
@@ -142,6 +142,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -174,7 +175,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.Description}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -183,7 +184,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.Description}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -199,7 +200,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.QName}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -223,7 +224,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.Listener}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.Listener}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -247,7 +248,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}
 	 * instances. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -256,7 +257,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -308,7 +309,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -317,7 +318,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -359,7 +360,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}instances. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.IconType}instances. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -383,7 +384,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -392,7 +393,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -408,7 +409,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -417,7 +418,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -433,7 +434,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -442,7 +443,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -458,7 +459,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -467,7 +468,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}. <!-- begin-user-doc -->
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -483,7 +484,7 @@
 
 	/**
 	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}instances. <!--
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -492,7 +493,7 @@
 
 	/**
 	 * This creates an adapter for a
-	 * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}. <!-- begin-user-doc
+	 * { @link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}. <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -539,6 +540,7 @@
 		return securityRoleRefItemProvider;
 	}
 
+	@Override
 	public void dispose() {
 		disposable.dispose();
 	}
@@ -546,6 +548,7 @@
 	/**
 	 * This returns the root adapter factory that contains the factory.
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return (parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory());
 	}
@@ -560,6 +563,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -570,6 +574,7 @@
 	 * 
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -581,6 +586,7 @@
 	/**
 	 * This sets the composed adapter factory that contains the factory.
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
index a09b221..51eea71 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/CompatibilityDescriptionGroupItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.CompatibilityDescriptionGroup}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
index c9d57fc..04c154d 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionGroupItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.DescriptionGroup}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
@@ -65,8 +65,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 */
 	@Override
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java
index 888bca7..ba3997c 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DescriptionItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.Description}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.Description}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java
index 8156704..da161d8 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/DisplayNameItemProvider.java
@@ -30,7 +30,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.DisplayName}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
index 98aa1ae..4440013 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EJBLocalRefItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.EJBLocalRef}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
index 7381a08..b2516b5 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.jst.j2ee.common.CommonFactory;
 import org.eclipse.jst.j2ee.common.CommonPackage;
 import org.eclipse.jst.j2ee.common.EJBLocalRef;
@@ -235,8 +234,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -293,7 +292,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
+	 * { @link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
 	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
 	 * this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
index 46a9d76..2dcacd7 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.jst.j2ee.common.CommonFactory;
 import org.eclipse.jst.j2ee.common.CommonPackage;
 import org.eclipse.jst.j2ee.common.EnvEntry;
@@ -171,8 +170,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -241,7 +240,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
+	 * { @link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
 	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
 	 * this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
index 99f3924..cf52bc6 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IconTypeItemProvider.java
@@ -31,7 +31,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.IconType}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.IconType}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
index b5865e8..092d65f 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/IdentityItemProvider.java
@@ -97,8 +97,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
index 424d7df..b7fb2f3 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/JNDIEnvRefsGroupItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.JNDIEnvRefsGroup}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.JNDIEnvRefsGroup}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
@@ -60,8 +60,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
index 8742080..be920cf 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationItemProvider.java
@@ -27,7 +27,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.MessageDestination}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
index dfcbb50..fb186f1 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/MessageDestinationRefItemProvider.java
@@ -34,7 +34,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}object. <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.MessageDestinationRef}object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
@@ -107,8 +107,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
index be87211..6e6475c 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ParamValueItemProvider.java
@@ -34,7 +34,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}object. <!-- begin-user-doc -->
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.ParamValue}object. <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * 
  * @generated
@@ -106,8 +106,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
index 113c298..15dc606 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/QNameItemProvider.java
@@ -32,7 +32,7 @@
 
 /**
  * This is the item provider adpater for a
- * {@link org.eclipse.jst.j2ee.internal.internal.common.QName}object. <!-- begin-user-doc --> <!--
+ * { @link org.eclipse.jst.j2ee.internal.internal.common.QName}object. <!-- begin-user-doc --> <!--
  * end-user-doc -->
  * 
  * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
index 6b0c14e..d1c0041 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.jst.j2ee.common.CommonFactory;
 import org.eclipse.jst.j2ee.common.CommonPackage;
 import org.eclipse.jst.j2ee.common.ResourceEnvRef;
@@ -131,8 +130,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -199,7 +198,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
+	 * { @link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
 	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
 	 * this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
index c79573f..7a4f6a0 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceRefItemProvider.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.jst.j2ee.common.CommonFactory;
 import org.eclipse.jst.j2ee.common.CommonPackage;
 import org.eclipse.jst.j2ee.common.ResourceRef;
@@ -202,8 +201,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -274,7 +273,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
+	 * { @link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
 	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
 	 * this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
index c26747d..93ef888 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.edit.command.AddCommand;
-import org.eclipse.emf.edit.command.RemoveCommand;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.jst.j2ee.common.CommonFactory;
@@ -65,7 +64,7 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and {@link AddCommand}and
-	 * {@link RemoveCommand}support in {@link #createCommand}.
+	 * { @link RemoveCommand}support in {@link #createCommand}.
 	 */
 	@Override
 	public Collection getChildrenReferences(Object object) {
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
index 44a786d..742dfa1 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityIdentityItemProvider.java
@@ -78,8 +78,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
index 6c2df00..c786729 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java
@@ -24,7 +24,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.jst.j2ee.common.CommonFactory;
 import org.eclipse.jst.j2ee.common.CommonPackage;
 import org.eclipse.jst.j2ee.common.SecurityRole;
@@ -132,8 +131,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -200,7 +199,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
+	 * { @link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
 	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
 	 * this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
index e2759d4..486a243 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.jst.j2ee.common.CommonFactory;
 import org.eclipse.jst.j2ee.common.CommonPackage;
 import org.eclipse.jst.j2ee.common.SecurityRoleRef;
@@ -129,8 +128,8 @@
 
 	/**
 	 * This specifies how to implement {@link #getChildren}and
-	 * {@link org.eclipse.emf.edit.command.AddCommand}and
-	 * {@link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
+	 * { @link org.eclipse.emf.edit.command.AddCommand}and
+	 * { @link org.eclipse.emf.edit.command.RemoveCommand}support in {@link #createCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -198,7 +197,7 @@
 
 	/**
 	 * This always returns false. The base class has already implemented
-	 * {@link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
+	 * { @link ItemProviderAdapter#getChildren ItemProviderAdapter.getChildren}to return the empty
 	 * enumeration, and this to check that enumeration, but we know there can't be any children, so
 	 * this is faster.
 	 */
diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
index ff54dbe..0e4ec1c 100644
--- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
+++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/internal/common/StructuredTextEditingDomain.java
@@ -45,6 +45,7 @@
 	/**
 	 * Execute a command within the editing domain.
 	 */
+	@Override
 	public void execute(Command command) {
 		execute(command.getLabel(), command);
 	}
@@ -52,6 +53,7 @@
 	/**
 	 * Execute a command within the editing domain.
 	 */
+	@Override
 	public void execute(String label, Command command) {
 		executeViaUndoManager(label, command);
 	}
@@ -77,10 +79,12 @@
 		}
 	}
 
+	@Override
 	public IStructuredTextUndoManager getUndoManager() {
 		return undoManager;
 	}
 
+	@Override
 	public void setUndoManager(IStructuredTextUndoManager newUndoManager) {
 		undoManager = newUndoManager;
 		undoManager.setCommandStack(commandStack);
diff --git a/plugins/org.eclipse.jst.j2ee/contenttype/org/eclipse/jst/j2ee/contenttype/J2EEContentDescriber.java b/plugins/org.eclipse.jst.j2ee/contenttype/org/eclipse/jst/j2ee/contenttype/J2EEContentDescriber.java
index 90f1baf..e288cbe 100644
--- a/plugins/org.eclipse.jst.j2ee/contenttype/org/eclipse/jst/j2ee/contenttype/J2EEContentDescriber.java
+++ b/plugins/org.eclipse.jst.j2ee/contenttype/org/eclipse/jst/j2ee/contenttype/J2EEContentDescriber.java
@@ -28,6 +28,7 @@
 
 	public final static QualifiedName JEEVERSION = new QualifiedName("jee-version", "1.4"); //$NON-NLS-1$ //$NON-NLS-2$
 
+	@Override
 	public int describe(InputStream contents, IContentDescription description) throws IOException {
 
 		JavaEEQuickPeek quickPeek = new JavaEEQuickPeek(contents);
@@ -69,6 +70,7 @@
 		return INVALID;
 	}
 
+	@Override
 	public QualifiedName[] getSupportedOptions() {
 		// this is not used
 		return new QualifiedName[] { JEEVERSION };
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
index 1458f50..84959f2 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOp.java
@@ -148,6 +148,7 @@
 									saveFlag = IModelProvider.FORCESAVE;
 								
 								earModel.modify(new Runnable() {
+									@Override
 									public void run() {
 										final ICommonApplication application = (ICommonApplication)earModel.getModelObject();
 										if(application != null) {
@@ -217,7 +218,7 @@
 		boolean useNewModel = earDDVersion.equals(J2EEVersionConstants.VERSION_5_0_TEXT) || earDDVersion.equals(J2EEVersionConstants.VERSION_6_0_TEXT) || earDDVersion.equals(J2EEVersionConstants.VERSION_7_0_TEXT);
 		String contextroot = null;
 		if (wc.isBinary()) {
-			IPath path = (IPath)wc.getAdapter(IPath.class);
+			IPath path = wc.getAdapter(IPath.class);
 			contextroot = path.removeFileExtension().lastSegment();
 		} else
 			contextroot = ComponentUtilities.getServerContextRoot(wc.getProject());
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
index 5eb78fc..a3a0fde 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java
@@ -98,6 +98,7 @@
 		/**
 		 * @see Comparator#compare(Object, Object)
 		 */
+		@Override
 		public int compare(Object o1, Object o2) {
 			int retVal = 0;
 			if (o1 instanceof Archive)
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
index 62c46c0..a513476 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentImportDataModelProvider.java
@@ -86,6 +86,7 @@
 	public static final String EAR_NAME_VALIDATION = "EARImportDataModel.EAR_NAME_VALIDATION";//$NON-NLS-1$
 
 	private IDataModelListener nestedListener = new IDataModelListener() {
+		@Override
 		public void propertyChanged(DataModelEvent event) {
 			if (event.getPropertyName().equals(PROJECT_NAME)) {
 				model.notifyPropertyChange(NESTED_PROJECTS_VALIDATION, IDataModel.DEFAULT_CHG);
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java
index 76d4d18..80e7cec 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModelProvider.java
@@ -52,17 +52,20 @@
         private IArchiveExportParticipant extension = null;
         private IDataModel datamodel = null;
 
-        public String getId()
+        @Override
+		public String getId()
         {
             return this.id;
         }
         
-        public IArchiveExportParticipant getParticipant()
+        @Override
+		public IArchiveExportParticipant getParticipant()
         {
             return this.extension;
         }
         
-        public IDataModel getDataModel()
+        @Override
+		public IDataModel getDataModel()
         {
             return this.datamodel;
         }
@@ -331,7 +334,8 @@
         			}
         			if(descriptors.length > 2){
         				Arrays.sort(descriptors, 0, descriptors.length, new Comparator() {
-        					public int compare(Object arg0, Object arg1) {
+        					@Override
+							public int compare(Object arg0, Object arg1) {
         						DataModelPropertyDescriptor d1 = (DataModelPropertyDescriptor)arg0;
         						DataModelPropertyDescriptor d2 = (DataModelPropertyDescriptor)arg1;
         						return d1.getPropertyDescription().compareTo(d2.getPropertyDescription());
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
index 11404d9..694a324 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
@@ -293,6 +293,7 @@
 		return super.getValidPropertyDescriptors(propertyName);
 	}
 
+	@Override
 	public void propertyChanged(DataModelEvent event) {
 		if (!doingComponentUpdate && event.getDataModel() == componentCreationDM && event.getPropertyName().equals(PROJECT_NAME) && getBooleanProperty(USE_DEFAULT_PROJECT_NAME)) {
 			setBooleanProperty(USE_DEFAULT_PROJECT_NAME, false);
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
index dd5df7c..78d8cbb 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/RemoveComponentFromEnterpriseApplicationOperation.java
@@ -90,6 +90,7 @@
 								saveFlag = IModelProvider.FORCESAVE;
 							
 							earModel.modify(new Runnable() {
+								@Override
 								public void run() {
 									ICommonApplication application = (ICommonApplication)earModel.getModelObject();
 									if (application == null)
@@ -150,6 +151,7 @@
 							}, saveFlag);
 						} else {
 							earModel.modify(new Runnable() {
+								@Override
 								public void run() {
 									ICommonApplication application = (ICommonApplication)earModel.getModelObject();
 									if (application == null)
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
index f8f1904..cf7089b 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARArtifactEdit.java
@@ -456,6 +456,7 @@
 		
 	}
 
+	@Override
 	public String getModuleURI(IVirtualComponent moduleComp) {
 		IVirtualReference [] refs = getComponent().getReferences();
 		for(int i=0; i<refs.length; i++){
@@ -586,11 +587,13 @@
 		return components;
 	}
 
+	@Override
 	public ArtifactEdit createArtifactEditForRead(IVirtualComponent aComponent) {
 
 		return getEARArtifactEditForRead(aComponent);
 	}
 
+	@Override
 	public ArtifactEdit createArtifactEditForWrite(IVirtualComponent aComponent) {
 
 		return getEARArtifactEditForWrite(aComponent);
@@ -636,6 +639,7 @@
 	 * @param webProject
 	 * @return contextRoot String
 	 */
+	@Override
 	public String getWebContextRoot(IProject webProject) {
 		verifyOperationSupported();
 		if (webProject == null || !JavaEEProjectUtilities.isDynamicWebProject(webProject))
@@ -661,6 +665,7 @@
 	 * @param webProject
 	 * @param aContextRoot
 	 */
+	@Override
 	public void setWebContextRoot(IProject webProject, String aContextRoot) {
 		verifyOperationSupported();
 		if (webProject == null || !JavaEEProjectUtilities.isDynamicWebProject(webProject))
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
index f884892..d627ac1 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/componentcore/util/EARVirtualComponent.java
@@ -68,14 +68,17 @@
 		super(aProject, aRuntimePath);
 	}
 
+	@Override
 	public IVirtualComponent createArchiveComponent(IProject aProject, String archiveLocation, IPath aRuntimePath) {
 		return new J2EEModuleVirtualArchiveComponent(aProject, archiveLocation, aRuntimePath);
 	}
 	
+	@Override
 	public IVirtualComponent createComponent(IProject aProject) {
 		return new EARVirtualComponent(aProject, new Path("/")); //$NON-NLS-1$
 	}
 
+	@Override
 	public IVirtualFolder createFolder(IProject aProject, IPath aRuntimePath) {
 		return new VirtualFolder(aProject, aRuntimePath);
 	}
@@ -264,10 +267,12 @@
 		cachedReferences = null;
 	}
 
+	@Override
 	public boolean canReceiveClasspathDependencies() {
 		return true;
 	}
 
+	@Override
 	public IPath getClasspathFolderPath(IClasspathDependencyComponent component) {
 		return Path.EMPTY;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
index fd059de..ec0f691 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ILooseConfigConstants.java
@@ -18,7 +18,7 @@
 public interface ILooseConfigConstants {
 	/**
 	 * The short name of the loose configuration file; will most often need to use
-	 * {@link #CONFIG_PATH}
+	 * { @link #CONFIG_PATH}
 	 */
 	String CONFIG_FILE_NAME = "looseconfig.xmi"; //$NON-NLS-1$
 	/** The absolute path to the loose configuration file */
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/ClasspathDependencyResolver.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/ClasspathDependencyResolver.java
index 915cf48..1be30b1 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/ClasspathDependencyResolver.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/ClasspathDependencyResolver.java
@@ -17,6 +17,7 @@
  */
 public class ClasspathDependencyResolver implements IReferenceResolver {
 
+	@Override
 	public boolean canResolve(IVirtualComponent context,
 			ReferencedComponent referencedComponent) {
 		URI handle = referencedComponent.getHandle();
@@ -26,6 +27,7 @@
 		return false;
 	}
 
+	@Override
 	public IVirtualReference resolve(IVirtualComponent context,
 			ReferencedComponent referencedComponent) {
 		IProject p = context.getProject();
@@ -39,6 +41,7 @@
 		return ref;
 	}
 
+	@Override
 	public boolean canResolve(IVirtualReference reference) {
 		IVirtualComponent vc = reference.getReferencedComponent();
 		if (vc instanceof DummyClasspathDependencyContainerVirtualComponent)
@@ -46,6 +49,7 @@
 		return false;
 	}
 
+	@Override
 	public ReferencedComponent resolve(IVirtualReference reference) {
 		IVirtualComponent vc = reference.getReferencedComponent();
 		DummyClasspathDependencyContainerVirtualComponent comp = (DummyClasspathDependencyContainerVirtualComponent)vc;
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
index 087967d..9757a91 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EarEditAdapterFactory.java
@@ -30,6 +30,7 @@
 	 * 
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
 	 */
+	@Override
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 
 		if (adapterType == EARArtifactEdit.ADAPTER_TYPE || adapterType == ArtifactEdit.ADAPTER_TYPE) {
@@ -47,6 +48,7 @@
 	 * 
 	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
 	 */
+	@Override
 	public Class[] getAdapterList() {
 
 		return new Class[]{ArtifactEdit.class, EARArtifactEdit.class};
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java
index 3747198..d2b0ac2 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/JEEManifestDiscerner.java
@@ -36,10 +36,12 @@
  */
 public class JEEManifestDiscerner implements IJavaComponentDiscerner {
 
+	@Override
 	public IProject[] findParentProjects(IProject child) {
 		return EarUtilities.getReferencingEARProjects(child);
 	}
 
+	@Override
 	public IVirtualReference[] findPossibleManifestEntries(
 			IProject parentProject, IProject childProject) {
 		if( EarUtilities.isEARProject(parentProject)) {
@@ -51,6 +53,7 @@
 		return new IVirtualReference[]{};
 	}
 	
+	@Override
 	public IVirtualReference[] findPossibleManifestEntries(
 			IProject parentProject, IProject childProject, IVirtualReference[] currentEntries) {
 		if( EarUtilities.isEARProject(parentProject)) {
@@ -153,6 +156,7 @@
 	}
 	
 
+	@Override
 	public IVirtualReference[] findCurrentManifestEntries(
 			IProject parentProject, IProject childProject) {
 		return findCurrentManifestEntries(parentProject, childProject, 
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java
index 260214d..3ee82e6 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java
@@ -34,12 +34,14 @@
 	 * 
 	 * @see org.eclipse.jst.j2ee.internal.internal.moduleextension.EarModuleExtension#createProjectCreationOperation(com.ibm.etools.archive.ear.operations.ImportOption)
 	 */
+	@Override
 	public IDataModelOperation createProjectCreationOperation(ImportOption option) {
 		if (option.getArchiveType() == ImportOption.MODULE)
 			return option.getModel().getDefaultOperation();
 		return null;
 	}
 
+	@Override
 	public IDataModelOperation createProjectCreationOperation(IDataModel dataModel) {
 		return dataModel.getDefaultOperation();
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
index 51e56b5..6ad972b 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetInstallDelegate.java
@@ -43,6 +43,7 @@
 
 public final class EarFacetInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
 		if (monitor != null) {
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java
index b60a49e..ae7b3c4 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetPostInstallDelegate.java
@@ -35,6 +35,7 @@
 
 public final class EarFacetPostInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
 		if (monitor != null) {
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
index b2b3eda..fd24c7e 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetRuntimeHandler.java
@@ -63,7 +63,8 @@
         implements IDelegate
         
     {
-        public void execute( final IProject project, 
+        @Override
+		public void execute( final IProject project, 
                              final IProjectFacetVersion fv, 
                              final Object cfg, 
                              final IProgressMonitor monitor ) 
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
index 6544525..fd8e008 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetValidator.java
@@ -37,7 +37,8 @@
     private static final String MARKER_ID 
         = J2EEPlugin.PLUGIN_ID + ".differentRuntimesDetected"; //$NON-NLS-1$
     
-    public void validate( final IFacetedProject fproj ) 
+    @Override
+	public void validate( final IFacetedProject fproj ) 
     
         throws CoreException
         
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
index 20c9a56..e01561e 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/EarFacetVersionChangeDelegate.java
@@ -26,7 +26,8 @@
     implements IDelegate
     
 {
-    public void execute( final IProject project, 
+    @Override
+	public void execute( final IProject project, 
                          final IProjectFacetVersion fv,
                          final Object cfg,
                          final IProgressMonitor monitor )
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
index 0e69e4a..c6e570b 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetInstallDelegate.java
@@ -38,6 +38,7 @@
 
 public final class UtilityFacetInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
 		if (monitor != null) {
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java
index e742e17..708d735 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetPostInstallDelegate.java
@@ -22,6 +22,7 @@
 
 public final class UtilityFacetPostInstallDelegate extends J2EEFacetInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
 		if (monitor != null) {
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
index d052ec9..b0574a6 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityFacetUnInstallDelegate.java
@@ -23,6 +23,7 @@
 
 public final class UtilityFacetUnInstallDelegate implements IDelegate {
 
+	@Override
 	public void execute(final IProject project, final IProjectFacetVersion fv, final Object cfg, final IProgressMonitor monitor) throws CoreException {
 		if (monitor != null) {
 			monitor.beginTask("", 1); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
index 43e0437..2873794 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/project/facet/UtilityProjectCreationDataModelProvider.java
@@ -44,6 +44,7 @@
 		
 		IDataModel utilFacet = map.getFacetDataModel(IJ2EEFacetConstants.UTILITY_FACET.getId());
 		utilFacet.addListener(new IDataModelListener() {
+			@Override
 			public void propertyChanged(DataModelEvent event) {
 				if (IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME.equals(event.getPropertyName())) {
 					if (isPropertySet(EAR_PROJECT_NAME))
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
index 4f4485d..cff2b71 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/EnterpriseArtifactEdit.java
@@ -190,6 +190,7 @@
 	 * @return the working copy of the compilation unit, or <code>null</code> if there is no
 	 *         remembered working copy for this compilation unit
 	 */
+	@Override
 	public ICompilationUnit getWorkingCopy(ICompilationUnit cu, boolean forNewCU) throws org.eclipse.core.runtime.CoreException {
 		if (isReadOnly())
 			return null;
@@ -227,6 +228,7 @@
 	 *         not encode an editor input, or if there is no remembered working copy for this
 	 *         compilation unit
 	 */
+	@Override
 	public ICompilationUnit getExistingWorkingCopy(ICompilationUnit cu) throws org.eclipse.core.runtime.CoreException {
 		return getWorkingCopyManager().getExistingWorkingCopy(cu);
 	}
@@ -242,6 +244,7 @@
 	 * 
 	 * @cu from the workbench and fix the internal references for this working copy manager.
 	 */
+	@Override
 	public void delete(org.eclipse.jdt.core.ICompilationUnit cu, org.eclipse.core.runtime.IProgressMonitor monitor) {
 		getWorkingCopyManager().delete(cu, monitor);
 	}
@@ -281,6 +284,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject()
 	 */
+	@Override
 	public Object getModelObject() {
 		if ( getWritableEdit() != null)
 			return getWritableEdit().getContentModelRoot();
@@ -290,6 +294,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.model.IModelProvider#getModelObject(org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public Object getModelObject(IPath modelPath) {
 		if ( getWritableEdit() != null) {
 			Resource res = ((ArtifactEditModel)getWritableEdit().getAdapter(ArtifactEditModel.ADAPTER_TYPE)).getResource(URI.createURI(modelPath.toString()));
@@ -300,10 +305,12 @@
 		return getContentModelRoot();
 	}
 
+	@Override
 	public IModelProvider create(IProject project) {
 		return (IModelProvider)getArtifactEditForRead(project);
 	}
 
+	@Override
 	public IModelProvider create(IVirtualComponent component) {
 		return (IModelProvider)getArtifactEditForRead(component);
 	}
@@ -311,6 +318,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jst.j2ee.model.IModelProvider#modify(java.lang.Runnable, org.eclipse.core.runtime.IPath)
 	 */
+	@Override
 	public void modify(Runnable runnable, IPath modelPath) {
 		//About to modify and save this model
 		
@@ -323,6 +331,7 @@
 		
 	}
 
+	@Override
 	public IStatus validateEdit(IPath modelPath, Object context) {
 		// ArtifactEdit will validate all files it manages, and uses its own context mechanism
 		return validateEdit();
@@ -342,6 +351,7 @@
 		return writableEdit;
 	}
 	
+	@Override
 	public void addListener(IModelProviderListener listener)
 	{
 		if (listener instanceof EditModelListener)
@@ -350,6 +360,7 @@
 		}
 	}
 
+	@Override
 	public void removeListener(IModelProviderListener listener)
 	{
 		if (listener instanceof EditModelListener)
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
index c88c567..e26c5ab 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/componentcore/J2EEModuleVirtualComponent.java
@@ -92,14 +92,17 @@
 		super(aProject, aRuntimePath);
 	}
 
+	@Override
 	public IVirtualComponent createComponent(IProject aProject) {
 		return new J2EEModuleVirtualComponent(aProject, new Path("/")); //$NON-NLS-1$
 	}
 
+	@Override
 	public IVirtualComponent createArchiveComponent(IProject aProject, String archiveLocation, IPath aRuntimePath) {
 		return new J2EEModuleVirtualArchiveComponent(aProject, archiveLocation, aRuntimePath);
 	}
 	
+	@Override
 	public IVirtualFolder createFolder(IProject aProject, IPath aRuntimePath) {
 		return new VirtualFolder(aProject, aRuntimePath);
 	}
@@ -129,6 +132,7 @@
 		return component.getReferences(map);
 	}
 
+	@Override
 	public IVirtualReference[] getJavaClasspathReferences() {
 		//broken by cache
 		//if (javaReferences == null || !checkIfStillValid())
@@ -280,7 +284,7 @@
 			for (int j = 0; j < innerHardReferences.length; j++) {
 				final IVirtualComponent comp = innerHardReferences[j].getReferencedComponent();
 				if (comp.isBinary()) {
-					hardRefPaths[j] = (IPath)comp.getAdapter(IPath.class);
+					hardRefPaths[j] = comp.getAdapter(IPath.class);
 				}
 			}
 
@@ -514,10 +518,12 @@
 		fuzzyEarManifestReferences = null;
 	}
 
+	@Override
 	public boolean canReceiveClasspathDependencies() {
 		return J2EEProjectUtilities.isDynamicWebProject(getProject());
 	}
 
+	@Override
 	public IPath getClasspathFolderPath(IClasspathDependencyComponent component) {
 		if( J2EEProjectUtilities.isDynamicWebProject(getProject())) {
 			return new Path(J2EEConstants.WEB_INF_LIB).makeAbsolute();
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java
index 886be7b..589b524 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/AppClientBinaryComponentHelper.java
@@ -29,6 +29,7 @@
  * @author jasholl
  *
  */
+@Deprecated
 public class AppClientBinaryComponentHelper extends EnterpriseBinaryComponentHelper {
 
 	public static boolean handlesComponent(IVirtualComponent component) {
@@ -67,6 +68,7 @@
 
 		private int count = 0;
 
+		@Override
 		public void access() {
 			synchronized (this) {
 				count++;
@@ -85,6 +87,7 @@
 			physicallyClose(this);
 		}
 		
+		@Override
 		public void forceClose(){
 			count = 0;
 			helper.aboutToClose();
@@ -93,10 +96,12 @@
 		
 		private EnterpriseBinaryComponentHelper helper = null;
 		
+		@Override
 		public EnterpriseBinaryComponentHelper getEnterpriseBinaryComponentHelper() {
 			return helper;
 		}
 
+		@Override
 		public void setEnterpriseBinaryComponentHelper(EnterpriseBinaryComponentHelper helper) {
 			this.helper = helper;
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java
index 777419c..c978fb2 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EJBBinaryComponentHelper.java
@@ -66,6 +66,7 @@
 
 		private int count = 0;
 
+		@Override
 		public void access() {
 			synchronized (this) {
 				count++;
@@ -84,6 +85,7 @@
 			physicallyClose(this);
 		}
 		
+		@Override
 		public void forceClose(){
 			count = 0;
 			helper.aboutToClose();
@@ -92,10 +94,12 @@
 		
 		private EnterpriseBinaryComponentHelper helper = null;
 		
+		@Override
 		public EnterpriseBinaryComponentHelper getEnterpriseBinaryComponentHelper() {
 			return helper;
 		}
 
+		@Override
 		public void setEnterpriseBinaryComponentHelper(EnterpriseBinaryComponentHelper helper) {
 			this.helper = helper;
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java
index 838b46a..6a2110b 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/EnterpriseBinaryComponentHelper.java
@@ -121,7 +121,7 @@
 	}
 
 	protected String getArchiveURI() {
-		java.io.File file = (java.io.File)getComponent().getAdapter(java.io.File.class);
+		java.io.File file = getComponent().getAdapter(java.io.File.class);
 		return file.getAbsolutePath();
 	}
 
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java
index 5a57a09..d297855 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JCABinaryComponentHelper.java
@@ -66,6 +66,7 @@
 
 		private int count = 0;
 
+		@Override
 		public void access() {
 			synchronized (this) {
 				count++;
@@ -84,6 +85,7 @@
 			physicallyClose(this);
 		}
 		
+		@Override
 		public void forceClose(){
 			count = 0;
 			helper.aboutToClose();
@@ -92,10 +94,12 @@
 		
 		private EnterpriseBinaryComponentHelper helper = null;
 		
+		@Override
 		public EnterpriseBinaryComponentHelper getEnterpriseBinaryComponentHelper() {
 			return helper;
 		}
 
+		@Override
 		public void setEnterpriseBinaryComponentHelper(EnterpriseBinaryComponentHelper helper) {
 			this.helper = helper;
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java
index 9045683..8531c1b 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEBinaryComponentHelper.java
@@ -496,8 +496,8 @@
 
 	/**
 	 * This cache manages IArchives across all
-	 * {@link JavaEEBinaryComponentHelper} instances. If multiple
-	 * {@link JavaEEBinaryComponentHelper} instances exist for the same
+	 * { @link JavaEEBinaryComponentHelper} instances. If multiple
+	 * { @link JavaEEBinaryComponentHelper} instances exist for the same
 	 * underlying archive file (e.g. a jar file on disk) all will use the exact
 	 * same IArchive instance. Care needs to be taken in managing the opening
 	 * and closing of this IArchive which should only be done through internal
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEModuleHandler.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEModuleHandler.java
index 352c25c..06fb0f6 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEModuleHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/JavaEEModuleHandler.java
@@ -22,6 +22,7 @@
 
 public class JavaEEModuleHandler implements IModuleHandler {
 
+	@Override
 	public String getArchiveName(IProject proj,IVirtualComponent comp) {
 		if (comp != null)
 			return JavaEEProjectUtilities.getComponentURI(comp);
@@ -29,10 +30,12 @@
 		
 	}
 	
+	@Override
 	public boolean setComponentAttributes(IProject proj) {
 		return true;
 	}
 
+	@Override
 	public List<IProject> getFilteredProjectListForAdd(IVirtualComponent sourceComponent, List<IProject> availableProjects) {
 		Iterator<IProject> i = availableProjects.iterator();
 		IProject p;
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java
index ac81dbf..5cb3699 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/UtilityBinaryComponentHelper.java
@@ -62,6 +62,7 @@
 			return null;
 		}
 
+		@Override
 		public String getUnableToOpenMessage() {
 			return "";//$NON-NLS-1$
 		}
@@ -71,6 +72,7 @@
 
 		private int count = 0;
 
+		@Override
 		public void access() {
 			synchronized (this) {
 				count++;
@@ -89,6 +91,7 @@
 			physicallyClose(this);
 		}
 		
+		@Override
 		public void forceClose(){
 			count = 0;
 			helper.aboutToClose();
@@ -97,10 +100,12 @@
 		
 		private EnterpriseBinaryComponentHelper helper = null;
 		
+		@Override
 		public EnterpriseBinaryComponentHelper getEnterpriseBinaryComponentHelper() {
 			return helper;
 		}
 
+		@Override
 		public void setEnterpriseBinaryComponentHelper(EnterpriseBinaryComponentHelper helper) {
 			this.helper = helper;
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java
index 8c7c624..8577820 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/componentcore/WebBinaryComponentHelper.java
@@ -66,6 +66,7 @@
 
 		private int count = 0;
 
+		@Override
 		public void access() {
 			synchronized (this) {
 				count++;
@@ -84,6 +85,7 @@
 			physicallyClose(this);
 		}
 		
+		@Override
 		public void forceClose(){
 			count = 0;
 			helper.aboutToClose();
@@ -92,10 +94,12 @@
 		
 		private EnterpriseBinaryComponentHelper helper = null;
 		
+		@Override
 		public EnterpriseBinaryComponentHelper getEnterpriseBinaryComponentHelper() {
 			return helper;
 		}
 
+		@Override
 		public void setEnterpriseBinaryComponentHelper(EnterpriseBinaryComponentHelper helper) {
 			this.helper = helper;
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
index 0336ebb..8904928 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EEProjectUtilities.java
@@ -844,7 +844,7 @@
 	/**
 	 * @deprecated use {@link JavaLiteUtilities#getJavaOutputContainer(IJavaProjectLite, IClasspathEntry)} 
 	 * 
-	 * {@link #getJavaOutputContainer(IJavaProjectLite, IClasspathEntry)}
+	 * { @link #getJavaOutputContainer(IJavaProjectLite, IClasspathEntry)}
 	 * @param project
 	 * @param sourceContainer
 	 * @return
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
index 6351f5e..5f42ba9 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/EarUtilities.java
@@ -281,6 +281,7 @@
 		IProject[] earProjects = (IProject[]) result.toArray(new IProject[result.size()]);
 		// sort the list so it is consistent
 		Arrays.sort(earProjects, new Comparator<IProject>() {
+			@Override
 			public int compare(IProject p0, IProject p1) {
 				return p0.getName().compareTo(p1.getName());
 			}
@@ -302,7 +303,7 @@
 
 	/**
 	 * Equivalent to calling
-	 * {@link #getUtilityModuleReferences(IVirtualComponent, boolean)} passing
+	 * { @link #getUtilityModuleReferences(IVirtualComponent, boolean)} passing
 	 * <code>false</code>.
 	 * 
 	 * @param earComponent
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
index 5b3e894..8d803a0 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/JavaEEProjectUtilities.java
@@ -225,7 +225,7 @@
 			ClasspathLibraryExpander classpathLibExpander = new ClasspathLibraryExpander(rootComponent, reference);
 			List<IFlatFile> flatLibs = classpathLibExpander.fetchFlatFiles();
 			for (IFlatFile flatFile : flatLibs) {
-				File file = (File) flatFile.getAdapter(File.class);
+				File file = flatFile.getAdapter(File.class);
 				if (file != null) {
 					String type = VirtualArchiveComponent.LIBARCHIVETYPE + IPath.SEPARATOR;
 					IVirtualComponent dynamicComponent = ComponentCore.createArchiveComponent(
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java
index 6c6fdee..cccb4f1 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/WebUtilities.java
@@ -279,6 +279,7 @@
 		IProject[] webProjects = (IProject[]) result.toArray(new IProject[result.size()]);
 		// sort the list so it is consistent
 		Arrays.sort(webProjects, new Comparator<IProject>() {
+			@Override
 			public int compare(IProject p0, IProject p1) {
 				return p0.getName().compareTo(p1.getName());
 			}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
index 8d59353..12d0de6 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEFacetRuntimeChangedDelegate.java
@@ -58,7 +58,8 @@
 	public static final String LEGACY_METADATA_FILE_NAME 
     = ".settings/org.eclipse.jst.common.project.facet.core.prefs"; //$NON-NLS-1$
 	private static final String OWNER_PROJECT_FACETS_ATTR = "owner.project.facets"; //$NON-NLS-1$
-    public void execute( final IProject project, 
+    @Override
+	public void execute( final IProject project, 
                          final IProjectFacetVersion fv,
                          final Object cfg,
                          final IProgressMonitor monitor )
@@ -188,7 +189,7 @@
 		IRuntime runtime = (oldRuntime != null) ? oldRuntime : fproj.getPrimaryRuntime();
 	
 		if (runtime != null) {
-			IClasspathProvider cpprov = (IClasspathProvider) runtime.getAdapter(IClasspathProvider.class);
+			IClasspathProvider cpprov = runtime.getAdapter(IClasspathProvider.class);
 			List cpentries = cpprov.getClasspathEntries(fv);
 			boolean realCPChanged = false;
 			if (cpentries != null) {
diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
index 40ec54d..5b7ec70 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/project/facet/J2EEModuleFacetInstallDataModelProvider.java
@@ -72,7 +72,8 @@
     private IEventListener<JavaFacetInstallConfig.ChangeEvent> javaFacetSourceFolderListener 
         = new IEventListener<JavaFacetInstallConfig.ChangeEvent>()
     {
-        public void handleEvent( final ChangeEvent event ) 
+        @Override
+		public void handleEvent( final ChangeEvent event ) 
         {
             handleJavaFacetSourceFoldersChanged( event );
         }
@@ -179,7 +180,8 @@
 
             this.fpjwcListener = new IFacetedProjectListener()
             {
-                public void handleEvent( final IFacetedProjectEvent event ) 
+                @Override
+				public void handleEvent( final IFacetedProjectEvent event ) 
                 {
                     handleProjectFacetsChanged();
                 }
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/BinaryFileModuleDelegate.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/BinaryFileModuleDelegate.java
index 370a386..54cce21 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/BinaryFileModuleDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/BinaryFileModuleDelegate.java
@@ -65,14 +65,17 @@
 	 * ProjectModule objects or IJ2EEModule objects,
 	 * which are heavy assumptions. 
 	 */
+	@Override
 	public IContainer[] getResourceFolders() {
 		return new IContainer[0];
 	}
 
+	@Override
 	public IContainer[] getJavaOutputFolders() {
 		return new IContainer[0];
 	}
 
+	@Override
 	public boolean isBinary() {
 		return true;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
index 15895d0..c8a119a 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEDeployableFactory.java
@@ -292,6 +292,7 @@
 		return new BinaryFileModuleDelegate(f);
 	}
 
+	@Override
 	public void resourceChanged(IResourceChangeEvent event) {
 		// If it is only a marker change, ignore the change 
 		if(event.getDelta() == null || event.getDelta().getFlags() == IResourceDelta.MARKERS) {
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
index 7396c7e..2dee525 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/J2EEFlexProjDeployable.java
@@ -168,7 +168,8 @@
     /**
      * This method returns the context root property from the deployable project's .component file
      */
-    public String getContextRoot() {
+    @Override
+	public String getContextRoot() {
 		Properties props = component.getMetaProperties();
 		if(props.containsKey(J2EEConstants.CONTEXTROOT))
 			return props.getProperty(J2EEConstants.CONTEXTROOT);
@@ -183,7 +184,8 @@
      * @param module
      * @return contextRoot String
      */
-    public String getContextRoot(IModule earModule) {
+    @Override
+	public String getContextRoot(IModule earModule) {
     	IProject deployProject = component.getProject();
     	String contextRoot = null;
     	if (earModule == null)
@@ -207,6 +209,7 @@
 	 * 
 	 * @return a possibly-empty array of resource folders
 	 */
+	@Override
 	public IContainer[] getResourceFolders() {
 		IVirtualComponent vc = ComponentCore.createComponent(getProject());
 		if (vc != null) {
@@ -223,6 +226,7 @@
 	 * @return a possibly-empty array of Java output folders
 	 * @deprecated
 	 */
+	@Override
 	public IContainer[] getJavaOutputFolders() {
 		return getJavaOutputFolders(component);
 	}
@@ -245,7 +249,8 @@
      * @deprecated
      * @return an array of paths
      */
-    public IPath[] getClasspath() {
+    @Override
+	public IPath[] getClasspath() {
 		List<IPath> paths = new ArrayList<IPath>();
         IJavaProject proj = JemProjectUtilities.getJavaProject(getProject());
         URL[] urls = JemProjectUtilities.getClasspathAsURLArray(proj);
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java
index ee78a98..f4916d9 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JEEFlattenParticipantProvider.java
@@ -52,6 +52,7 @@
 	public static final String FILTERED = "AddMappedOutputFoldersParticipant.FILTERED"; //$NON-NLS-1$
 	
 	
+	@Override
 	public IFlattenParticipant findParticipant(String id, Properties props) {
 		boolean forExport = props != null && props.get(PARTICIPANT_FOR_EXPORT) != null && 
 				((Boolean)props.get(PARTICIPANT_FOR_EXPORT)).booleanValue();
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java
index 69cb751..71cdc6e 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEGroupInitializer.java
@@ -40,6 +40,7 @@
 	 * 
 	 * @see org.eclipse.wst.common.frameworks.internal.group.IGroupInitializer#isGroupEnabled(org.eclipse.core.resources.IProject)
 	 */
+	@Override
 	public boolean isGroupEnabled(IProject project) {
 		return true;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
index 75abfad..fbcc729 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
@@ -186,6 +186,7 @@
 	/*
 	 * Javadoc copied from interface.
 	 */
+	@Override
 	public URL getBaseURL() {
 		return getBundle().getEntry("/"); //$NON-NLS-1$
 	}
@@ -310,6 +311,7 @@
 	/**
 	 * This gets a .gif from the icons folder.
 	 */
+	@Override
 	public Object getImage(String key) {
 		return getImageURL(key,this.getBundle());
 	}
@@ -456,6 +458,7 @@
 	/*
 	 * Javadoc copied from interface.
 	 */
+	@Override
 	public String getString(String key) {
 		try {
 			return Platform.getResourceString(getBundle(), key);
@@ -468,6 +471,7 @@
 	/*
 	 * Javadoc copied from interface.
 	 */
+	@Override
 	public String getString(String key, Object[] substitutions) {
 		return MessageFormat.format(getString(key), substitutions);
 	}
@@ -590,6 +594,7 @@
 
 	public static IWorkspaceRunnable getWorkspaceRunnable(final IHeadlessRunnableWithProgress op) {
 		return new IWorkspaceRunnable() {
+			@Override
 			public void run(IProgressMonitor monitor) throws CoreException {
 				try {
 					op.run(monitor);
@@ -615,11 +620,13 @@
 			this.preferences = new J2EEPreferences(this);
 		return this.preferences;
 	}
+	@Override
 	public String getString(String key, boolean translate) {
 		// TODO For now...  translate not supported
 		return getString(key);
 	}
 
+	@Override
 	public String getString(String key, Object[] substitutions, boolean translate) {
 		// TODO For now...  translate not supported
 		return getString(key,substitutions);
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
index ce9dd31..2a5f699 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/LibCopyBuilder.java
@@ -186,6 +186,7 @@
 		IResourceDeltaVisitor visitor = new IResourceDeltaVisitor() {
 			private List copiedClassFolders = new ArrayList(classesFolders.length);
 
+			@Override
 			public boolean visit(IResourceDelta subdelta) throws CoreException {
 				IResource resource = subdelta.getResource();
 				if (resource.getType() == IResource.FILE) {
@@ -306,6 +307,7 @@
 		final int sourcePathLength = source.getFullPath().segmentCount();
 
 		class Visitor implements IResourceVisitor {
+			@Override
 			public boolean visit(IResource res) throws CoreException {
 				if (res.getType() == IResource.FILE) {
 					IFile file = (IFile) res;
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
index 3c03a06..a5bb9eb 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ProjectValidationHelper.java
@@ -34,6 +34,7 @@
 			INSTANCE = new ProjectValidationHelper();
 		return INSTANCE;
 	}
+	@Override
 	public void disposeInstance(){
 		INSTANCE = null;
 	}
@@ -53,6 +54,7 @@
 		return outputs;
 	
 	}
+	@Override
 	public IContainer[] getOutputContainers(IProject project) {
 		ProjectValidationHelper inst = getInstance();
 		if(inst == null){
@@ -83,6 +85,7 @@
 		return sources;
 		
 	}
+	@Override
 	public IContainer[] getSourceContainers(IProject project) {
 		return getInstance().getCachedSourceContainers(project);
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
index da19e56..3590f89 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/ResourceUtil.java
@@ -27,6 +27,7 @@
 		super();
 	}
 
+	@Override
 	public int getLineNo(Object object) {
 		if (object == null) {
 			return IMessage.LINENO_UNSET;
diff --git a/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/EARReferenceRemoveChange.java b/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/EARReferenceRemoveChange.java
index 69fe90a..4f0f2f9 100644
--- a/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/EARReferenceRemoveChange.java
+++ b/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/EARReferenceRemoveChange.java
@@ -112,6 +112,7 @@
 				moduleInXML = true;
 		}
 		earModel.modify(new Runnable() {
+			@Override
 			public void run() {
 				ICommonApplication application = (ICommonApplication)earModel.getModelObject();
 				if (application == null)
diff --git a/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/NonEARModuleReferenceRemoveChange.java b/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/NonEARModuleReferenceRemoveChange.java
index d43d659..e8f291a 100644
--- a/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/NonEARModuleReferenceRemoveChange.java
+++ b/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/change/NonEARModuleReferenceRemoveChange.java
@@ -139,7 +139,8 @@
 	private void updateEJBDDWithEJBClientDeletion() {
 		IModelProvider ejbModel = ModelProviderManager.getModelProvider(referencingModuleProject);
         ejbModel.modify(new Runnable() {
-            public void run() {
+            @Override
+			public void run() {
                 IModelProvider writableEjbModel = ModelProviderManager.getModelProvider(referencingModuleProject);
                 Object modelObject = writableEjbModel.getModelObject();
                 
diff --git a/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/refactoringchecker/AbstractRefactoringCheckStateTester.java b/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/refactoringchecker/AbstractRefactoringCheckStateTester.java
index 6e0780e..7bedb72 100644
--- a/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/refactoringchecker/AbstractRefactoringCheckStateTester.java
+++ b/plugins/org.eclipse.jst.j2ee/ltkbasedrefactoring/org/eclipse/jst/javaee/ltk/core/refactoringchecker/AbstractRefactoringCheckStateTester.java
@@ -16,6 +16,7 @@
 
 public abstract class AbstractRefactoringCheckStateTester implements IRefactoringCheckStateTester{
 
+	@Override
 	public boolean testUncheckState(IProject project){
 		return false;
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
index ab4c111..dee7f05 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/J2EEElementChangedListener.java
@@ -63,6 +63,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.jdt.core.IElementChangedListener#elementChanged(org.eclipse.jdt.core.ElementChangedEvent)
 	 */
+	@Override
 	public void elementChanged(final ElementChangedEvent event) {
 		processJavaElementDelta(event.getDelta());
 	}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
index a4face2..59f45e9 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/listeners/ProjectRefactoringListener.java
@@ -71,6 +71,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
 	 */
+	@Override
 	public void resourceChanged(final IResourceChangeEvent event) {
 		// need to capture PRE_DELETE events so that metadata about the
 		// deleted project can be collected and cached
@@ -136,6 +137,7 @@
 	/* (non-Javadoc)
 	 * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclipse.core.resources.IResourceDelta)
 	 */
+	@Override
 	public boolean visit(final IResourceDelta delta) throws CoreException {
 		final IResource resource = delta.getResource();
 		if (resource instanceof IWorkspaceRoot) {
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java
index 167d10e..60a740c 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/AbstractOptionalRefactorHandler.java
@@ -22,28 +22,32 @@
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDeletedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorDeletedProject(final ProjectRefactorMetadata metadata) {
+    @Override
+	public boolean shouldRefactorDeletedProject(final ProjectRefactorMetadata metadata) {
         return true;
     }
     
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorRenamedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorRenamedProject(final ProjectRefactorMetadata metadata) {
+    @Override
+	public boolean shouldRefactorRenamedProject(final ProjectRefactorMetadata metadata) {
         return true;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnDelete(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorDependentProjectOnDelete(final ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata) {
+    @Override
+	public boolean shouldRefactorDependentProjectOnDelete(final ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata) {
         return true;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnRename(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorDependentProjectOnRename(final ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata) {
+    @Override
+	public boolean shouldRefactorDependentProjectOnRename(final ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata) {
         return true;
     }
 }
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java
index 53a8e08..a4fad72 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/OptionalRefactorHandler.java
@@ -31,10 +31,12 @@
 	private OptionalRefactorHandler () {
 		SafeRunner.run(new ISafeRunnable() {
 
+			@Override
 			public void handleException(Throwable exception) {
 				J2EEPlugin.logError(0, exception.getMessage(), exception);
 			}
 
+			@Override
 			public void run() throws Exception {
 				OptionalRefactorHandlerRegistryReader reader = new OptionalRefactorHandlerRegistryReader();
 				reader.readRegistry();
@@ -51,7 +53,8 @@
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDeletedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorDeletedProject(final ProjectRefactorMetadata metadata) {
+    @Override
+	public boolean shouldRefactorDeletedProject(final ProjectRefactorMetadata metadata) {
         for(int i=0;i<handlers.length; i++){
             if(!handlers[i].shouldRefactorDeletedProject(metadata)){
                 return false;
@@ -63,7 +66,8 @@
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorRenamedProject(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorRenamedProject(final ProjectRefactorMetadata metadata) {
+    @Override
+	public boolean shouldRefactorRenamedProject(final ProjectRefactorMetadata metadata) {
         for(int i=0;i<handlers.length; i++){
             if(!handlers[i].shouldRefactorRenamedProject(metadata)){
                 return false;
@@ -75,7 +79,8 @@
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnDelete(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorDependentProjectOnDelete(final ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata) {
+    @Override
+	public boolean shouldRefactorDependentProjectOnDelete(final ProjectRefactorMetadata deletedMetadata, ProjectRefactorMetadata dependentMetadata) {
         for(int i=0;i<handlers.length; i++){
             if(!handlers[i].shouldRefactorDependentProjectOnDelete(deletedMetadata, dependentMetadata)){
                 return false;
@@ -87,7 +92,8 @@
     /* (non-Javadoc)
      * @see org.eclipse.jst.j2ee.refactor.operations.IOptionalRefactorHandler#shouldRefactorDependentProjectOnRename(org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata, org.eclipse.jst.j2ee.refactor.operations.ProjectRefactorMetadata)
      */
-    public boolean shouldRefactorDependentProjectOnRename(final ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata) {
+    @Override
+	public boolean shouldRefactorDependentProjectOnRename(final ProjectRefactorMetadata renamedMetadata, ProjectRefactorMetadata dependentMetadata) {
         for(int i=0;i<handlers.length; i++){
             if(!handlers[i].shouldRefactorDependentProjectOnRename(renamedMetadata, dependentMetadata)){
                 return false;
@@ -121,10 +127,12 @@
 
 				SafeRunner.run(new ISafeRunnable() {
 
+					@Override
 					public void handleException(Throwable exception) {
 						J2EEPlugin.logError(0, exception.getMessage(), exception);
 					}
 
+					@Override
 					public void run() throws Exception {
 						handlerArray[0] = (IOptionalRefactorHandler) element.createExecutableExtension(ATT_CLASS);
 					}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
index 8ed45b0..e9fcdb5 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRefactorMetadata.java
@@ -44,7 +44,7 @@
 
 /**
  * IDataModel object property stored under the property name 
- * {@link ProjectRefactoringDataModelProvider#PROJECT_METADATA}.
+ * { @link ProjectRefactoringDataModelProvider#PROJECT_METADATA}.
  * 
  *  Note: this class is not multi-thread safe.
  */
@@ -272,67 +272,87 @@
 		public CachingVirtualComponent(final IVirtualComponent comp) {
 			_comp = comp;
 		}
+		@Override
 		public void addReferences(IVirtualReference[] references) {
 			_comp.addReferences(references);
 		}
+		@Override
 		public void create(int updateFlags, IProgressMonitor aMonitor) throws CoreException {
 			_comp.create(updateFlags, aMonitor);
 		}
+		@Override
 		public boolean exists() {
 			return _comp.exists();
 		}
+		@Override
 		public IVirtualComponent getComponent() {
 			if(_comp == null) return null;
 			return _comp.getComponent();
 		}
+		@Override
 		public Properties getMetaProperties() {
 			return _comp.getMetaProperties();
 		}
+		@Override
 		public IPath[] getMetaResources() {
 			return _comp.getMetaResources();
 		}
+		@Override
 		public String getName() {
 			return _comp.getName();
 		}
+		@Override
 		public String getDeployedName() {
 			return _comp.getDeployedName();
 		}
+		@Override
 		public IProject getProject() {
 			return _comp.getProject();
 		}
+		@Override
 		public IVirtualReference getReference(String aComponentName) {
 			return _comp.getReference(aComponentName);
 		}
+		@Override
 		public IVirtualReference[] getReferences() {
 			return _comp.getReferences();
 		}
+		@Override
 		public IVirtualReference[] getReferences(Map<String, Object> options) {
 			return _comp.getReferences(options);
 		}
 		public void setCaching(boolean caching) {
 			_caching = caching;
 		}
+		@Override
 		public IVirtualComponent[] getReferencingComponents() {
 			return _comp.getReferencingComponents();
 		}
+		@Override
 		public IVirtualFolder getRootFolder() {
 			return _comp.getRootFolder();
 		}
+		@Override
 		public boolean isBinary() {
 			return _comp.isBinary();
 		}
+		@Override
 		public void setMetaProperties(Properties properties) {
 			_comp.setMetaProperties(properties);
 		}
+		@Override
 		public void setMetaProperty(String name, String value) {
 			_comp.setMetaProperty(name, value);
 		}
+		@Override
 		public void setMetaResources(IPath[] theMetaResourcePaths) {
 			_comp.setMetaResources(theMetaResourcePaths);
 		}
+		@Override
 		public void setReferences(IVirtualReference[] theReferences) {
 			_comp.setReferences(theReferences);
 		}
+		@Override
 		public Object getAdapter(Class adapter) {
 			return _comp.getAdapter(adapter);
 		}
diff --git a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
index 7c7c29f..498666b 100644
--- a/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
+++ b/plugins/org.eclipse.jst.j2ee/refactor/org/eclipse/jst/j2ee/refactor/operations/ProjectRenameOperation.java
@@ -110,6 +110,7 @@
 		final IModelProvider model = ModelProviderManager.getModelProvider(refactoredProject);
 		if (model != null) {
 			model.modify(new Runnable() {
+				@Override
 				public void run() {
 					final Object modelObject = model.getModelObject();
 					if (modelObject instanceof CompatibilityDescriptionGroup) {
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
index ec04fd22..2e15adb 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/CreateDeploymentFilesActionDelegate.java
@@ -59,7 +59,7 @@
 		if (project == null){
 			Object firstElement = structuredSelection.getFirstElement();
 			if (IAdaptable.class.isInstance(firstElement)){
-				return (IProject) ((IAdaptable) firstElement).getAdapter(IProject.class);
+				return ((IAdaptable) firstElement).getAdapter(IProject.class);
 			}
 		}
 		return project;
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
index b49d460..d9d5b9d 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
@@ -80,7 +80,7 @@
 		if (obj instanceof IModuleArtifact)
 			resource = ((IModuleArtifact) obj).getModule().getProject();
 		else if (obj instanceof IAdaptable)
-			resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
+			resource = ((IAdaptable) obj).getAdapter(IResource.class);
 		else if (obj instanceof EObject) {
 			resource = ProjectUtilities.getProject((EObject) obj);
 			if (obj instanceof Servlet) {
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
index 0397c66..120dbbe 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ConnectorLabelProvider.java
@@ -21,11 +21,11 @@
 		} else if (element instanceof org.eclipse.jst.javaee.jca.License){

 			return Messages.ConnectorLabelProvider_LICENSE_ARTIFACT;

 		}  else if (element instanceof ConfigProperty){

-			return Messages.ConnectorLabelProvider_CONFIG_PROPERTY + ((ConfigProperty)element).getConfigPropertyName() != null ? ((ConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$

+			return Messages.ConnectorLabelProvider_CONFIG_PROPERTY != null && ((ConfigProperty)element).getConfigPropertyName() != null ? ((ConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$

 		}  else if (element instanceof RequiredConfigProperty){

-			return Messages.ConnectorLabelProvider_RequiredConfigProperty + ((RequiredConfigProperty)element).getConfigPropertyName() != null ? ((RequiredConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$

+			return Messages.ConnectorLabelProvider_RequiredConfigProperty != null && ((RequiredConfigProperty)element).getConfigPropertyName() != null ? ((RequiredConfigProperty)element).getConfigPropertyName() : ""; //$NON-NLS-1$

 		}  else if (element instanceof ConnectionDefinition){

-			return Messages.ConnectorLabelProvider_ConnectionDefinition + ((ConnectionDefinition)element).getManagedconnectionfactoryClass() != null ?((ConnectionDefinition)element).getManagedconnectionfactoryClass() : ""; //$NON-NLS-1$

+			return Messages.ConnectorLabelProvider_ConnectionDefinition != null && ((ConnectionDefinition)element).getManagedconnectionfactoryClass() != null ?((ConnectionDefinition)element).getManagedconnectionfactoryClass() : ""; //$NON-NLS-1$

 		}

 		

 		return super.getText(element);

diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
index 890922b..1678e77 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/dnd/AddProjectToEARDropAssistant.java
@@ -280,7 +280,7 @@
 	}
 	
 	private boolean isPhysicallyAdded(IVirtualComponent component) {
-		IFile f = (IFile)component.getAdapter(IFile.class);
+		IFile f = component.getAdapter(IFile.class);
 		return f == null ? false : true;
 	}	
 
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java
index 35e00be..19f7dde 100644
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java
+++ b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractAnnotationModelProvider.java
@@ -142,7 +142,7 @@
 
 	/**
 	 * Notifies the currently registered listeners with this model event. If the
-	 * {@link IModelProviderEvent#getChangedResources()} is empty or
+	 * { @link IModelProviderEvent#getChangedResources()} is empty or
 	 * <code>null</code> the method returns immediately.
 	 * 
 	 * @param event
@@ -359,7 +359,7 @@
 	 * roles defined in the bean. If this is the only bean in which the role is
 	 * defined, the role will also be deleted. Calling this method makes sense
 	 * only if the bean and the security role and the bean were connected with
-	 * {@link #connectWithRole(SecurityRole, SessionBean)}
+	 * { @link #connectWithRole(SecurityRole, SessionBean)}
 	 * 
 	 * <p>
 	 * If the bean is not of type org.eclipse.jst.javaee.ejb.SessionBean the
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java
index b79a6dc..c701def 100644
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java
+++ b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/AbstractMergedModelProvider.java
@@ -42,7 +42,7 @@
  * state of the provider. If the method {@link #getModelObject()} is called for
  * a model provider in a disposed state, the provider should try to move to a
  * non disposed state and return a correct model object.
- * {@link #getModelObject()} is loading the model. Specific implementations may
+ * { @link #getModelObject()} is loading the model. Specific implementations may
  * throw exceptions so calling {@link #getModelObject()} on a disposed provider
  * does not guarantee that calling {@link #isDisposed()} after that will return
  * <code>false</code>.
@@ -50,7 +50,7 @@
  * <p>
  * Subclasses may enable/disable notifications from internalProviders with the
  * methods {@link #enableInternalNotifications()} and
- * {@link #disableInternalNotifications()}.
+ * { @link #disableInternalNotifications()}.
  * </p>
  * 
  * <p>
@@ -167,8 +167,8 @@
 
 	/**
 	 * Called when the annotationModel has changed. See also
-	 * {@link #enableInternalNotifications()} and
-	 * {@link #disableInternalNotifications()}
+	 * { @link #enableInternalNotifications()} and
+	 * { @link #disableInternalNotifications()}
 	 * 
 	 * @param event
 	 */
@@ -176,8 +176,8 @@
 
 	/**
 	 * Called when the xmlModel has changed. See also
-	 * {@link #enableInternalNotifications()} and
-	 * {@link #disableInternalNotifications()}
+	 * { @link #enableInternalNotifications()} and
+	 * { @link #disableInternalNotifications()}
 	 * 
 	 * @param event
 	 */
@@ -303,8 +303,8 @@
 	/**
 	 * The method is used for enabling notifications from the internalProviders.
 	 * This will add the appropriate listener to the internalProviders so that
-	 * {@link #annotationModelChanged(IModelProviderEvent)} and
-	 * {@link #xmlModelChanged(IModelProviderEvent)} are called when needed.
+	 * { @link #annotationModelChanged(IModelProviderEvent)} and
+	 * { @link #xmlModelChanged(IModelProviderEvent)} are called when needed.
 	 */
 	protected final void enableInternalNotifications() {
 		xmlModelListener = new XmlModelListener();
@@ -315,7 +315,7 @@
 
 	/**
 	 * Disable notifications from internalProviders. See also
-	 * {@link #enableInternalNotifications()}
+	 * { @link #enableInternalNotifications()}
 	 */
 	protected final void disableInternalNotifications() {
 		ddProvider.removeListener(xmlModelListener);
diff --git a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java
index 67111da..411d376 100644
--- a/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java
+++ b/plugins/org.eclipse.jst.jee/common/org/eclipse/jst/jee/model/internal/common/ManyToOneRelation.java
@@ -92,7 +92,7 @@
 	 * Other sources will still point to the same target.
 	 * 
 	 * The target is removed if this was the only source pointing to it and
-	 * {@link #containsTarget(Object)} will return false.
+	 * { @link #containsTarget(Object)} will return false.
 	 * 
 	 * @param source
 	 */
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
index 4565ebe..63171f9 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java
@@ -160,9 +160,9 @@
 		try {
 			IJavaElement jelem = null;
 			IProject proj = null;
-			jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
+			jelem = project.getAdapter(IJavaElement.class);
 			if (jelem == null) {
-				IResource resource = (IResource) project.getAdapter(IResource.class);
+				IResource resource = project.getAdapter(IResource.class);
 				if (resource != null) {
 					proj = resource.getProject();
 					if (proj != null) {
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
index 4b84465..a82743c 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFilterFileSelectionDialog.java
@@ -152,9 +152,9 @@
 		try {
 			IJavaElement jelem = null;
 			IProject proj = null;
-			jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
+			jelem = project.getAdapter(IJavaElement.class);
 			if (jelem == null) {
-				IResource resource = (IResource) project.getAdapter(IResource.class);
+				IResource resource = project.getAdapter(IResource.class);
 				if (resource != null) {
 					proj = resource.getProject();
 					if (proj != null) {
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java
index bf152f2..aef93e1 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredListenerFileSelectionDialog.java
@@ -145,9 +145,9 @@
 		try {
 			IJavaElement jelem = null;
 			IProject proj = null;
-			jelem = (IJavaElement) project.getAdapter(IJavaElement.class);
+			jelem = project.getAdapter(IJavaElement.class);
 			if (jelem == null) {
-				IResource resource = (IResource) project.getAdapter(IResource.class);
+				IResource resource = project.getAdapter(IResource.class);
 				if (resource != null) {
 					proj = resource.getProject();
 					if (proj != null) {
diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
index 6b33585..6f30a45 100644
--- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
+++ b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java
@@ -384,7 +384,7 @@
 	 * <p>
 	 * Invoked after the user has clicked the "Finish" button of the wizard. The default
 	 * implementation will attempt to update the final perspective to the value specified by
-	 * {@link #getFinalPerspectiveID() }
+	 * { @link #getFinalPerspectiveID() }
 	 * </p>
 	 * 
 	 * @throws InvocationTargetException
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
index 251db89..afc69b6 100644
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/ComponentDeployable.java
@@ -368,12 +368,12 @@
 		final String archiveName2 = reference.getArchiveName();
 		final String archiveName = new Path(archiveName2).lastSegment();
 		final IVirtualComponent virtualComp = reference.getReferencedComponent();
-		IFile ifile = (IFile)virtualComp.getAdapter(IFile.class);
+		IFile ifile = virtualComp.getAdapter(IFile.class);
 		if (ifile != null) { //In Workspace
 			String name = null != archiveName ? archiveName : ifile.getName();
 			mf = new ModuleFile(ifile, name, runtimePath.makeRelative());
 		} else {
-			File extFile = (File)virtualComp.getAdapter(File.class);
+			File extFile = virtualComp.getAdapter(File.class);
 			String name = null != archiveName ? archiveName : extFile.getName();
 			mf = new ModuleFile(extFile, name, runtimePath.makeRelative());
 		}
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
index c29f196..5aaa05c 100644
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/FlatComponentDeployable.java
@@ -230,8 +230,8 @@
 	}
 
 	protected IModuleResource[] LEGACY_binaryMembers() {
-		IFile ifile = (IFile)component.getAdapter(IFile.class);
-		File file = (File)component.getAdapter(File.class);
+		IFile ifile = component.getAdapter(IFile.class);
+		File file = component.getAdapter(File.class);
 		ModuleFile mf = ifile != null ? new ModuleFile(ifile, ifile.getName(), new Path(""))  //$NON-NLS-1$
 		 		: new ModuleFile(file, file.getName(), new Path("")); //$NON-NLS-1$
 		return new IModuleResource[]{mf};
diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
index f179163..4049324 100644
--- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
+++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/deployables/StaticWebDeployableObjectAdapterUtil.java
@@ -39,7 +39,7 @@
 		if (obj instanceof IResource)
 			resource = (IResource) obj;
 		else if (obj instanceof IAdaptable)
-			resource = (IResource) ((IAdaptable) obj).getAdapter(IResource.class);
+			resource = ((IAdaptable) obj).getAdapter(IResource.class);
 		
 		if (resource == null)
 			return null;