Increased warning levels. Fixed more serious issues.

31 files changed, 276 insertions, 83 deletions

diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs b/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs
index b657f3789..cd5b05445 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,14 +1,77 @@
-#Tue May 02 10:28:12 PDT 2006
+#Fri Apr 06 21:12:55 PDT 2007
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
 org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
 org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=error
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.4
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.ui.prefs b/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 000000000..82eb6c152
--- /dev/null
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Fri Apr 06 18:25:15 PDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFLibraryClasspathContainer.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFLibraryClasspathContainer.java
index ea6bad4b8..85ae0a834 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFLibraryClasspathContainer.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFLibraryClasspathContainer.java
@@ -16,7 +16,6 @@ public class JSFLibraryClasspathContainer implements IClasspathContainer {
 	
 	/**
 	 * @param lib 
-	 * @param JSFLibrary
 	 */
 	public JSFLibraryClasspathContainer(JSFLibrary lib) {
 		this.lib = lib;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryMigrationStartupHandler.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryMigrationStartupHandler.java
index c5657285b..1c37d071b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryMigrationStartupHandler.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/RegistryMigrationStartupHandler.java
@@ -138,11 +138,7 @@ public class RegistryMigrationStartupHandler implements IStartup
 		/**
 		 * @param parentShell
 		 * @param dialogTitle
-		 * @param dialogTitleImage
 		 * @param dialogMessage
-		 * @param dialogImageType
-		 * @param dialogButtonLabels
-		 * @param defaultIndex
 		 */
 		public ConfirmDialog(Shell parentShell, String dialogTitle,
 				String dialogMessage) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java
index 005d21d85..1a826ccbc 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryconfig/JSFLibraryConfigModel.java
@@ -44,7 +44,7 @@ public class JSFLibraryConfigModel {
 	 * This list is initialized from JSF library registry and updated with persistent configuration data.  
 	 * 
 	 * @return List
-	 * @see org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFImplementationLibraries()
+	 * see also org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFImplementationLibraries()
 	 */
 	public List getJSFImplementationLibraries() {
 		if (colJSFImplLib == null) {
@@ -75,7 +75,7 @@ public class JSFLibraryConfigModel {
 	 * configuration data.  
 	 * 
 	 * @return List
-	 * @see org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFComponentLibraries()
+	 * see also org.eclipse.jst.jsf.ui.properties.IJSFLibraryDecoratorProvider#getProjectJSFComponentLibraries()
 	 */	
 	public List getJSFComponentLibraries() {
 		if (colJSFCompLib == null) {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java
index d19df39ae..35c4b8be6 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryImpl.java
@@ -329,7 +329,6 @@ public class JSFLibraryImpl extends EObjectImpl implements JSFLibrary {
 
 	/**
 	 * <!-- begin-user-doc -->
-	 * @param fullPath 
 	 * @return the working copy 
 	 * <!-- end-user-doc -->
 	 * @generated NOT
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java
index 1bfff7441..81abe2a84 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryFactoryImpl.java
@@ -41,6 +41,7 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
+     * @return the initialized factory 
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -165,7 +166,10 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi
 
 	/**
 	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+     * @param eDataType 
+     * @param initialValue 
+     * @return the jsfVersion the dataType 
+     * <!-- end-user-doc -->
 	 * @generated
 	 */
 	public JSFVersion createJSFVersionFromString(EDataType eDataType, String initialValue) {
@@ -176,6 +180,9 @@ public class JSFLibraryRegistryFactoryImpl extends EFactoryImpl implements JSFLi
 
 	/**
 	 * <!-- begin-user-doc -->
+     * @param eDataType 
+     * @param instanceValue 
+     * @return the string version of the data type 
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java
index 585aff898..f7102e4fe 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/impl/JSFLibraryRegistryImpl.java
@@ -10,15 +10,9 @@
  *******************************************************************************/ 
 package org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.BasicEList;
@@ -29,13 +23,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsf.core.internal.JSFLibrariesContainerInitializer;
-import org.eclipse.jst.jsf.core.internal.JSFLibraryClasspathContainer;
 import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary;
 import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry;
 import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistryPackage;
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java
index 1aac400dc..c260ce4ba 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/jsflibraryregistry/util/JSFLibraryRegistryUpgradeUtil.java
@@ -84,7 +84,6 @@ public class JSFLibraryRegistryUpgradeUtil {
 	/**
 	 * Upgrades the JSF Library registry from oldest to newest
 	 * @param expectedVersion 
-	 * @param aJsfLibRegURI - URI of current version registry file
 	 */
 	public void upgradeRegistryIfNecessary(int expectedVersion) {
 		//when adding upgrades, the upgrades should progress from oldest to newest
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
index edd520e1a..ea56875eb 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java
@@ -104,9 +104,10 @@ public class JSFFacetInstallDataModelProvider extends
 			JSFLibrary lib = ! libs.isEmpty() ? (JSFLibrary)libs.get(0) : null; 
 			IStatus status = validateImpl(lib);
 			if (!OK_STATUS.equals(status))
+			{
 				return status;
-			else 
-				return validateClasspath();
+			}
+            return validateClasspath();
 		} else if (name.equals(CONFIG_PATH)) {
 			return validateConfigLocation(getStringProperty(CONFIG_PATH));
 		} else if (name.equals(SERVLET_NAME)) {			
@@ -220,6 +221,8 @@ public class JSFFacetInstallDataModelProvider extends
 //					}
 				}
 			} catch (JavaModelException e) {
+			    // FIXME: what should we do in this case?
+			    JSFCorePlugin.log(e, "Error searching class path");
 			}			
 		}
 		else {//as we do not have a javaProject yet, all we can do is validate that there is no duplicate jars (absolute path)
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java
index 31d89eaa7..1e578858a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDelegate.java
@@ -48,8 +48,8 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
  * 	 <li> updates web.xml for: servlet, servlet-mapping and context-param
  * 	 <li> adds implementation jars to WEB-INF/lib if user requests
  * 
- * @see com.eclispe.jst.jsf.core.internal.project.facet.JSFFacetInstallConfig
- * @see com.eclispe.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider
+ * @see org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDelegate
+ * @see org.eclipse.jst.jsf.core.internal.project.facet.JSFFacetInstallDataModelProvider
  * @author Gerry Kessler - Oracle
  * @since M1
  */
@@ -117,7 +117,7 @@ public class JSFFacetInstallDelegate implements IDelegate {
 
 		JSFLibraryReference[] compLibs = (JSFLibraryReference[])config.getProperty(IJSFFacetInstallDataModelProperties.COMPONENT_LIBRARIES);
 		for (int i=0;i<compLibs.length;i++){
-			libref = (JSFLibraryReference)compLibs[i];		
+			libref = compLibs[i];		
 			cp = new Path(JSFLibrariesContainerInitializer.JSF_LIBRARY_CP_CONTAINER_ID);		
 			path = cp.append(new Path(libref.getID()));
 			entry = getNewCPEntry(path, libref);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java
index 3b05dcb71..86e53fcd3 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java
@@ -62,7 +62,6 @@ public class JARFileJSFAppConfigProvider extends AbstractJSFAppConfigProvider {
 	 * Creates an instance, storing the passed IProject instance and file name
 	 * String to be used for subsequent processing.
 	 * 
-	 * @param project IProject instance who's classpath contains this JAR file.
 	 * @param filename Name of a JAR file that contains a
 	 * /META-INF/faces-config.xml entry.
 	 */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java
index 62b0b229a..43e8bbbb7 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/CMUtil.java
@@ -34,7 +34,7 @@ public final class CMUtil {
 	 * standard JSP tag, return null. If is not jsp tag, then return null
 	 * @param decl
      *  
-	 * @return
+	 * @return the tag uri as a string
 	 */
 	public static String getTagURI(CMElementDeclaration decl) {
 		if (decl instanceof CMNodeWrapper) {
@@ -54,7 +54,7 @@ public final class CMUtil {
 	 * Test whether this is the JSP core tag.
 	 * 
 	 * @param decl
-	 * @return
+	 * @return true if decl is a jsp element declaration
 	 */
 	public static boolean isJSP(CMElementDeclaration decl) {
 		if (!decl.supports(HTMLCMProperties.IS_JSP)) {
@@ -116,7 +116,7 @@ public final class CMUtil {
 	 * give an element, get its namespace URI.
 	 * 
 	 * @param element
-	 * @return
+	 * @return the namespace URI
 	 */
 	public static String getElementNamespaceURI(Element element) {
 		CMElementDeclaration decl = getElementDeclaration(element);
@@ -135,7 +135,7 @@ public final class CMUtil {
 
 	/**
 	 * @param element
-	 * @return
+	 * @return true if the element can have children
 	 */
 	public static boolean canHaveDirectTextChild(Element element) {
 		CMElementDeclaration decl = getElementDeclaration(element);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java
index 2b25ba079..daf4e7a82 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/LoadBundleUtil.java
@@ -11,6 +11,12 @@
  *******************************************************************************/
 package org.eclipse.jst.jsf.core.internal.tld;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IStorage;
@@ -41,8 +47,8 @@ public class LoadBundleUtil {
 	 * @return an IStorage pointing to the request bundle or null if not found
 	 * @throws CoreException if the search for the file encounters a problem
 	 */
-	public static IStorage getLoadBundleResource(IProject project,
-			String baseName) throws CoreException {
+	public static IStorage getLoadBundleResource(final IProject project,
+			final String baseName) throws CoreException {
 		if (project == null || baseName == null) {
 			return null;
 		}
@@ -139,4 +145,153 @@ public class LoadBundleUtil {
         return baseName.substring(index + 1).concat(".properties");//$NON-NLS-1$
 	}
 
+    /**
+     * Encapsulates the hiearchy of bundle data sources in the hierarchy
+     * for a ResourceBundle base name.  In practice this is often simply
+     * a single IFile for a 
+     * @author cbateman
+     *
+     */
+//    public static class BundleHierarchy
+//    {
+//        // list in order from most specific (first queried) to least,
+//        // front to back
+//        //private final List        _hierarchy; 
+//    
+//        /**
+//         * Takes the list *by reference*.  Does not take a copy.
+//         * @param hierarchy
+//         */
+//        public BundleHierarchy(List hierarchy)
+//        {
+//            _hierarchy = hierarchy;
+//        }
+//        
+//        public BundleHierarchy()
+//        {
+//            _hierarchy = new ArrayList();
+//        }
+//    }
+    
+    /**
+     * Used to describe the design time approximation of the locale lookup precendence
+     * that will be used by ResourceBundle to find a localized resource bundle.
+     * 
+     * See the official JavaDoc for java.util.ResourceBundle.getBundle for docs on search
+     * order.  
+     * 
+     * @author cbateman
+     *
+     */
+    public static class LocaleDescriptor
+    {
+        private Locale            _locale;
+        private List              _possibleSuffices;
+        
+        /**
+         * @param language -- must not be null
+         */
+        public LocaleDescriptor(String language)
+        {
+            _locale = new Locale(language);
+        }
+        
+        /**
+         * All arguments must be non-null.  To set a language only descriptor,
+         * see others.
+         * 
+         * @param language -- must not be null
+         * @param country -- must not be null
+         */
+        public LocaleDescriptor(String language,
+                String country)
+        {
+            _locale = new Locale(language, country);
+        }
+        
+        /**
+         * All arguments must be non-null. Null arguments will cause an exception.
+         * To create descriptor without variant and/or country set, see other constructors
+         * @param language -- must not be null
+         * @param country -- must not be null
+         * @param variant -- must not be null
+         */
+        public LocaleDescriptor(String language,
+                String country, String variant) 
+        {
+            _locale = new Locale(language, country, variant);
+        }
+        
+        /**
+         * @param baseName
+         * @return an iterator through all possible bundle names starting with the most
+         * specific and becoming more general for base name based on this locale.
+         * 
+         * i.e. if baseName is "bundle" and the local is en_US_1 then in order the 
+         * iterator will produce:
+         * 
+         * bundle_en_US_1
+         * bundle_en_US
+         * bundle_en
+         * bundle
+         * 
+         * per the ResourceBundle API
+         * 
+         */
+        public Iterator getBundleNameIterator(final String baseName)
+        {
+            
+            return new Iterator()
+            {
+                final Iterator  it = getPossibleBaseNameSuffices().iterator();
+                
+                public boolean hasNext() {
+                   return it.hasNext();
+                }
+
+                public Object next() {
+                    return baseName+it.next(); 
+                }
+
+                public void remove() {
+                    // delegate; should throw exception
+                    it.remove();
+                }
+            };
+        }
+
+        private synchronized List getPossibleBaseNameSuffices()
+        {
+            if (_possibleSuffices == null)
+            {
+                List possibleSuffices = new ArrayList(3);
+
+                final String language = _locale.getLanguage();
+                final String country = _locale.getCountry();
+                final String variant = _locale.getVariant();
+
+                possibleSuffices.add("");
+                possibleSuffices.add("_"+language);
+                if (country != null)
+                {
+                    possibleSuffices.add(0, "_"+language + "_" + country);
+                    if (variant != null)
+                    {
+                        possibleSuffices.add(0, "_"+language+"_"+country+"_"+variant);
+                    }
+                }
+                _possibleSuffices = Collections.unmodifiableList(possibleSuffices);
+            }
+
+            return _possibleSuffices;
+       }
+
+        /**
+         * @return the local information as a standard locale object
+         */
+        public Locale getLocale()
+        {
+            return _locale;
+        }
+    }
 }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java
index c25656a4c..7169c14e9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java
@@ -16,7 +16,7 @@ public final class TagIdentifierFactory
      * 
      * @param uri
      * @param tagName
-     * @return
+     * @return a new tag identifier for (uri, tagName)
      */
     public static TagIdentifier createJSPTagWrapper(final String uri, final String tagName)
     {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java
index 983b97c0f..62cb0c4b4 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java
@@ -96,7 +96,6 @@ public class JSPModelProcessor
     /**
      * Disposes of the JSPModelProcessor associated with model
      * @param file the file associated with the model processor to be disposed
-     * @param model
      */
     public static void dispose(IFile  file)
     {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractRootTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractRootTypeDescriptor.java
index 87c31b555..44bda4c23 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractRootTypeDescriptor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractRootTypeDescriptor.java
@@ -42,7 +42,7 @@ public abstract class AbstractRootTypeDescriptor extends AbstractMetaDataEnabled
 	 * @return List of <code>IMetaDataEnabledFeature</code>s that support the
 	 * specified featureType interface.  
 	 * 
-	 * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature#getFeatureAdapters(java.lang.Class)
+	 * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.ITypeDescriptor#getFeatureAdapters(java.lang.Class)
 	 */
 	public List getFeatureAdapters(Class processingFeature) {
 		Assert.isTrue(processingFeature.isInterface());
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataEnabledProcessingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataEnabledProcessingFactory.java
index 67e4550c3..d5e1e312c 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataEnabledProcessingFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataEnabledProcessingFactory.java
@@ -71,7 +71,7 @@ public final class MetaDataEnabledProcessingFactory {
 	 * @return	returns null - if the metadata was not found 
 	 * 			<br>returns empty list - if not a <code>IMetaDataEnabledFeature</code> proccessor or is not valid or does not support the specified feature
 	 * 
-	 * @see MetaDataEnabledProcessingFactory.ATTRIBUTE_VALUE_RUNTIME_TYPE_PROP_NAME
+	 * @see MetaDataEnabledProcessingFactory#ATTRIBUTE_VALUE_RUNTIME_TYPE_PROP_NAME
 	 */
 	public List getAttributeValueRuntimeTypeFeatureProcessors(Class featureType, IStructuredDocumentContext sdContext, String uri, String elementName, String attributeName){
 		List retList = new ArrayList(2);		
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDType.java
index dafb18e41..eaf5a9fbd 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDType.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDType.java
@@ -4,4 +4,5 @@ package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalue
  * Type representing a FacesConfig Converter attribute
  */
 public class FacesConfigConverterIDType extends FacesConfigIdentifierType {
+    // FIXME: why do we have an empty class?
 }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierFeatures.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierFeatures.java
index 51f3e0494..56e97f81a 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierFeatures.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierFeatures.java
@@ -50,7 +50,8 @@ public abstract class FacesConfigIdentifierFeatures extends AbstractMetaDataEnab
 	
 	/**
 	 * Meta-data property name to use for identifying the faces-config type
-	 * @see jsf_core.xml converterID and validatorID attributes
+	 * 
+	 * see jsf_core.xml converterID and validatorID attributes
 	 */
 	public static final String ID_TYPE_PROP_NAME = "config-type"; //$NON-NLS-1$
 
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierType.java
index 6e58e276a..dc1d33a12 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierType.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierType.java
@@ -16,6 +16,7 @@ package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalue
  * @author Gerry Kessler - Oracle
  */
 public abstract class FacesConfigIdentifierType extends IdentifierType	 {
+    // FIXME: why do we have an empty class?
 }
 	
 
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDType.java
index a86b8cdff..15edbc1f4 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDType.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDType.java
@@ -4,4 +4,5 @@ package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalue
  * Type representing a FacesConfig Validator attribute
  */
 public class FacesConfigValidatorIDType extends FacesConfigIdentifierType {
+    // FIXME: why do we have an empty class?
 }
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/JavaClassType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/JavaClassType.java
index 53110852b..deccdd233 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/JavaClassType.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/JavaClassType.java
@@ -280,7 +280,7 @@ public class JavaClassType extends ObjectType implements IPossibleValues, IValid
 	}
 
 	/**
-	 * @return String value of {@link POSSIBLE_VALUES_SUPERCLASS_PROP_NAME}
+	 * @return String value of {@link #POSSIBLE_VALUES_SUPERCLASS_PROP_NAME}
 	 */
 	protected String getSuperClassName(){
 		return getTraitValueAsString(POSSIBLE_VALUES_SUPERCLASS_PROP_NAME);
@@ -291,7 +291,7 @@ public class JavaClassType extends ObjectType implements IPossibleValues, IValid
 	}
 	
 	/**
-	 * @return List of values from {@link POSSIBLE_VALUES_INTERFACES_PROP_NAME}
+	 * @return List of values from {@link #POSSIBLE_VALUES_INTERFACES_PROP_NAME}
 	 */
 	protected List getInterfaceNames(){
 		return getTraitValueAsListOfStrings(POSSIBLE_VALUES_INTERFACES_PROP_NAME);
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java
index df8c98faf..7ade562b0 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java
@@ -78,7 +78,6 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor
     private static class LocaleConfigValidationVisitor extends EObjectValidationVisitor
     {
         /**
-         * @param structuralFeature
          * @param version
          */
         public LocaleConfigValidationVisitor(String version)
@@ -126,7 +125,6 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor
     {
         /**
          * @param version 
-         * @param structuralFeature
          */
         public ActionListenerValidationVisitor(final String version) {
             super(FacesConfigPackage.eINSTANCE.getApplicationType_ActionListener(),
@@ -138,7 +136,6 @@ public class ApplicationValidationVisitor extends EObjectValidationVisitor
     {
         /**
          * @param version 
-         * @param structuralFeature
          */
         public NavigationHandlerValidationVisitor(final String version) {
             super(FacesConfigPackage.eINSTANCE.getApplicationType_NavigationHandler(),
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java
index 026265af3..0f70d65d7 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConstraintsPackageImpl.java,v 1.1 2007/02/28 21:16:02 cbateman Exp $
+ * $Id: ConstraintsPackageImpl.java,v 1.2 2007/04/09 02:40:11 cbateman Exp $
  */
 package org.eclipse.jst.jsf.validation.internal.constraints.impl;
 
@@ -91,6 +91,7 @@ public class ConstraintsPackageImpl extends EPackageImpl implements ConstraintsP
      * <p>Invocation of this method will not affect any packages that have
      * already been initialized.
      * <!-- begin-user-doc -->
+     * @return the initialized package 
      * <!-- end-user-doc -->
      * @see #eNS_URI
      * @see #createPackageContents()
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java
index 98198c9c2..e0e7432ac 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ContainsTagConstraintImpl.java,v 1.1 2007/02/28 21:16:02 cbateman Exp $
+ * $Id: ContainsTagConstraintImpl.java,v 1.2 2007/04/09 02:40:11 cbateman Exp $
  */
 package org.eclipse.jst.jsf.validation.internal.constraints.impl;
 
@@ -92,6 +92,7 @@ public class ContainsTagConstraintImpl extends EObjectImpl implements ContainsTa
 
     /**
      * <!-- begin-user-doc -->
+     * @return the set generator
      * <!-- end-user-doc -->
      * @generated
      */
@@ -130,6 +131,7 @@ public class ContainsTagConstraintImpl extends EObjectImpl implements ContainsTa
 
     /**
      * <!-- begin-user-doc -->
+     * @return the tag set that must be satisfied 
      * <!-- end-user-doc -->
      * @generated
      */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/util/ConstraintsSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/util/ConstraintsSwitch.java
index b2cf5a1b0..9628616c4 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/util/ConstraintsSwitch.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/util/ConstraintsSwitch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ConstraintsSwitch.java,v 1.1 2007/02/28 21:16:02 cbateman Exp $
+ * $Id: ConstraintsSwitch.java,v 1.2 2007/04/09 02:40:07 cbateman Exp $
  */
 package org.eclipse.jst.jsf.validation.internal.constraints.util;
 
@@ -50,6 +50,7 @@ public class ConstraintsSwitch {
     /**
      * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
      * <!-- begin-user-doc -->
+     * @param theEObject 
      * <!-- end-user-doc -->
      * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
@@ -61,6 +62,8 @@ public class ConstraintsSwitch {
     /**
      * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
      * <!-- begin-user-doc -->
+     * @param theEClass 
+     * @param theEObject 
      * <!-- end-user-doc -->
      * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
@@ -69,18 +72,18 @@ public class ConstraintsSwitch {
         if (theEClass.eContainer() == modelPackage) {
             return doSwitch(theEClass.getClassifierID(), theEObject);
         }
-        else {
-            List eSuperTypes = theEClass.getESuperTypes();
-            return
-                eSuperTypes.isEmpty() ?
-                    defaultCase(theEObject) :
-                    doSwitch((EClass)eSuperTypes.get(0), theEObject);
-        }
+        List eSuperTypes = theEClass.getESuperTypes();
+        return
+            eSuperTypes.isEmpty() ?
+                defaultCase(theEObject) :
+                doSwitch((EClass)eSuperTypes.get(0), theEObject);
     }
 
     /**
      * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
      * <!-- begin-user-doc -->
+     * @param classifierID 
+     * @param theEObject 
      * <!-- end-user-doc -->
      * @return the first non-null result returned by a <code>caseXXX</code> call.
      * @generated
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java
index e831308b1..6ec01e9b8 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java
@@ -49,7 +49,6 @@ public class ELExpressionValidator
     
     /**
      * @param context
-     * @param contentLength
      * @param elText
      * @param file
      */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ValueExpressionTracker.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ValueExpressionTracker.java
index 8d810cef6..c5bf4bcc2 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ValueExpressionTracker.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ValueExpressionTracker.java
@@ -36,7 +36,6 @@ class ValueExpressionTracker
     }
     
     /**
-     * @param memberSymbol 
      * @param offset 
      * @param length 
      */
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/diagnostics/DiagnosticFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/diagnostics/DiagnosticFactory.java
index e2bba3f5a..6db6f5c40 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/diagnostics/DiagnosticFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/diagnostics/DiagnosticFactory.java
@@ -328,7 +328,6 @@ public final class DiagnosticFactory
     
     /**
      * @param operatorName
-     * @param type
      * @return a configured diagnostic
      */
     public static Diagnostic create_UNARY_OP_STRING_CONVERSION_NOT_GUARANTEED(final String operatorName)
@@ -381,9 +380,6 @@ public final class DiagnosticFactory
      * Method bindings cannot participate in expressions involving operators
      * Per JSP 1.1 spec section 5.2.1
      * 
-     * @param offset
-     * @param length
-     * @param targetFile
      * @return a configured message
      */
     public static Diagnostic create_CANNOT_APPLY_OPERATOR_TO_METHOD_BINDING()
@@ -394,9 +390,6 @@ public final class DiagnosticFactory
     }
 
     /**
-     * @param offset
-     * @param length
-     * @param targetFile
      * @param curMemberSymbol
      * @param owningMember
      * @return a configured message
@@ -410,9 +403,6 @@ public final class DiagnosticFactory
     }
 
     /**
-     * @param offset
-     * @param length
-     * @param targetFile
      * @param variableName
      * @return a configured message
      */
@@ -425,9 +415,6 @@ public final class DiagnosticFactory
     }
 
     /**
-     * @param offset
-     * @param length
-     * @param file
      * @return a configured message
      */
     public static Diagnostic create_MISSING_CLOSING_EXPR_BRACKET()
@@ -439,9 +426,6 @@ public final class DiagnosticFactory
     }
     
     /**
-     * @param offset
-     * @param length
-     * @param file
      * @return a configured message
      */
     public static Diagnostic create_GENERAL_SYNTAX_ERROR()
@@ -453,9 +437,6 @@ public final class DiagnosticFactory
     }
 
     /**
-     * @param offset
-     * @param length
-     * @param file
      * @return a configured message
      */
     public static Diagnostic create_EMPTY_EL_EXPRESSION()
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java
index 6e8f9dfc1..4b2fb58e9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/TernaryChoiceOperator.java
@@ -83,8 +83,6 @@ public class TernaryChoiceOperator
     
     /**
      * @param choiceArg
-     * @param whenTrueArg
-     * @param whenFalseArg
      * @return a diagnostic validating the choice expr with these arguments
      */
     public Diagnostic validate(ValueType choiceArg)