[110823] Clean up compilation and deprecation warnings

29 files changed, 112 insertions, 139 deletions

diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
index c3777bfd2..3441d0edd 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultOverridableResourceFactoryRegistry.java
@@ -47,7 +47,7 @@ public class DefaultOverridableResourceFactoryRegistry extends ResourceFactoryRe
 				if (resourceFactory == null) {
 					resourceFactory = delegatedGetFactory(uri);
 					if (resourceFactory == GLOBAL_FACTORY) {
-						resourceFactory = (Factory) extensionToFactoryMap.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
+						resourceFactory = extensionToFactoryMap.get(Resource.Factory.Registry.DEFAULT_EXTENSION);
 						if (resourceFactory == null)
 							resourceFactory = GLOBAL_FACTORY;
 					}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
index b6767ba24..44cd83e17 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleCoreValidator.java
@@ -35,13 +35,13 @@ public class ModuleCoreValidator implements IValidatorJob {
 			// First will try to load from .settings/org.eclipse.wst.common.component
 			// Second will try to load from the old location(s) .settings/.component or .component
 
-			URI uri = (URI) URI.createURI(StructureEdit.MODULE_META_FILE_NAME);
+			URI uri = URI.createURI(StructureEdit.MODULE_META_FILE_NAME);
 			WTPModulesResource res = (WTPModulesResource)WorkbenchResourceHelper.getOrCreateResource(uri, getResourceSet(project));
 			if (res == null || !res.isLoaded()) {
-				uri = (URI) URI.createURI(".settings/.component");
+				uri = URI.createURI(".settings/.component");
 				res = (WTPModulesResource)WorkbenchResourceHelper.getOrCreateResource(uri, getResourceSet(project));
 				if (res == null || !res.isLoaded()) {
-					uri = (URI) URI.createURI(".wtpmodules");
+					uri = URI.createURI(".wtpmodules");
 					res = (WTPModulesResource)WorkbenchResourceHelper.getOrCreateResource(uri, getResourceSet(project));
 					if (res == null || !res.isLoaded()) {
 						res = null;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
index 4306d7c56..89e642374 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ModuleStructuralModel.java
@@ -252,15 +252,15 @@ public class ModuleStructuralModel extends EditModel implements IAdaptable {
 		// First will try to load from .settings/org.eclipse.wst.common.component
 		// Second will try to load from the old location(s) .settings/.component or .component
 		
-		URI uri = (URI) URI.createURI(StructureEdit.MODULE_META_FILE_NAME);
+		URI uri = URI.createURI(StructureEdit.MODULE_META_FILE_NAME);
 		WTPModulesResource res = (WTPModulesResource)getResource(uri);
 		if (res == null || !res.isLoaded()) {
 			removeResource(res);
-			uri = (URI) URI.createURI(R1_MODULE_META_FILE_NAME);
+			uri = URI.createURI(R1_MODULE_META_FILE_NAME);
 			res = (WTPModulesResource)getResource(uri);
 			if (res == null || !res.isLoaded()) {
 				removeResource(res);
-				uri = (URI) URI.createURI(R0_7_MODULE_META_FILE_NAME);
+				uri = URI.createURI(R0_7_MODULE_META_FILE_NAME);
 				res = (WTPModulesResource)getResource(uri);
 				if (res == null || !res.isLoaded()) {
 					removeResource(res);
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
index f8582be66..8bedf7707 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
@@ -17,7 +17,6 @@ import java.util.List;
 
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IPath;
@@ -26,7 +25,6 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
 import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
 import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
 import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
@@ -41,7 +39,7 @@ import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 public class ComponentCoreURIConverter extends CompatibilityWorkbenchURIConverterImpl {
 	
 	private IProject containingProject;
-	private IFolder archiveRoot;
+//	private IFolder archiveRoot;
 	/**
 	 *  
 	 */
@@ -98,7 +96,7 @@ public class ComponentCoreURIConverter extends CompatibilityWorkbenchURIConverte
 	private URI newPlatformURI(URI aNewURI) {
 		
 		try {
-			String componentName = StructureEdit.getDeployedName(aNewURI);
+//			String componentName = StructureEdit.getDeployedName(aNewURI);
 			IVirtualComponent component = ComponentCore.createComponent(containingProject);
 
 			URI deployPathSegment = ModuleURIUtil.trimToDeployPathSegment(aNewURI);
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
index 9b95e51a6..9a9add849 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
@@ -57,7 +57,7 @@ public class PlatformURLModuleConnection extends PlatformURLConnection {
 	public static URI resolve(URI aModuleResourceRuntimePath) throws IOException {
 		try {
 			IProject componentProject = StructureEdit.getContainingProject(aModuleResourceRuntimePath);
-			String componentName = ModuleURIUtil.getDeployedName(aModuleResourceRuntimePath);
+			//String componentName = ModuleURIUtil.getDeployedName(aModuleResourceRuntimePath);
 			URI runtimeURI = ModuleURIUtil.trimToDeployPathSegment(aModuleResourceRuntimePath);
 			IPath runtimePath = new Path(runtimeURI.path());
 			IVirtualComponent component = ComponentCore.createComponent(componentProject);
@@ -71,11 +71,10 @@ public class PlatformURLModuleConnection extends PlatformURLConnection {
 		 
 	}
 
-	private static URI normalizeToWorkspaceRelative(IProject project, IPath sourcePath, URI moduleResourceDeployPath) throws UnresolveableURIException {
-		String projectName = project.getName();
-		return URI.createURI(projectName + '/' + sourcePath.toString());
-	
-	}
+//	private static URI normalizeToWorkspaceRelative(IProject project, IPath sourcePath, URI moduleResourceDeployPath) throws UnresolveableURIException {
+//		String projectName = project.getName();
+//		return URI.createURI(projectName + '/' + sourcePath.toString());
+//	}
 
 	/*
 	 * (non-Javadoc)
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
index 9f9740371..f17b3dcb0 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ReferencedComponentImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: ReferencedComponentImpl.java,v 1.3 2006/03/27 21:49:41 vbhadrir Exp $
+ * $Id: ReferencedComponentImpl.java,v 1.4 2007/02/14 16:00:52 jsholl Exp $
  */
 package org.eclipse.wst.common.componentcore.internal.impl;
 
@@ -217,7 +217,7 @@ public class ReferencedComponentImpl extends EObjectImpl implements ReferencedCo
 	public EObject getDependentObject() {
 		if (dependentObject != null && dependentObject.eIsProxy()) {
 			EObject oldDependentObject = dependentObject;
-			dependentObject = (EObject)eResolveProxy((InternalEObject)dependentObject);
+			dependentObject = eResolveProxy((InternalEObject)dependentObject);
 			if (dependentObject != oldDependentObject) {
 				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ComponentcorePackage.REFERENCED_COMPONENT__DEPENDENT_OBJECT, oldDependentObject, dependentObject));
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
index 407d30300..883ebb9b8 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/WorkbenchComponentImpl.java
@@ -2,15 +2,13 @@
  * <copyright>
  * </copyright>
  *
- * $Id: WorkbenchComponentImpl.java,v 1.13 2006/07/21 18:36:56 cbridgha Exp $
+ * $Id: WorkbenchComponentImpl.java,v 1.14 2007/02/14 16:00:52 jsholl Exp $
  */
 package org.eclipse.wst.common.componentcore.internal.impl;
 
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
@@ -187,14 +185,14 @@ public class WorkbenchComponentImpl extends EObjectImpl implements WorkbenchComp
 	 */
 	protected EList metadataResources = null;
 
-	private final Map resourceIndexByDeployPath = new HashMap();
-	private final Map resourceIndexBySourcePath = new HashMap();
+//	private final Map resourceIndexByDeployPath = new HashMap();
+//	private final Map resourceIndexBySourcePath = new HashMap();
 
-	private boolean isIndexedByDeployPath;
+//	private boolean isIndexedByDeployPath;
 
-	private boolean isIndexedBySourcePath;
+//	private boolean isIndexedBySourcePath;
 
-	private static final ComponentResource[] NO_MODULE_RESOURCES = new ComponentResource[0];
+//	private static final ComponentResource[] NO_MODULE_RESOURCES = new ComponentResource[0];
 
 	private URI handle;
 	
@@ -254,7 +252,7 @@ public class WorkbenchComponentImpl extends EObjectImpl implements WorkbenchComp
 		// TODO A more advanced adapter should be applied to keep the handle up to date.
 		if (eResource() != null) {
 			URI resourceURI = eResource().getURI();
-			String safeDeployedName = getName() != null ? getName() : ""; //$NON-NLS-1$
+//			String safeDeployedName = getName() != null ? getName() : ""; //$NON-NLS-1$
 			if (resourceURI != null && resourceURI.segmentCount() >= 2)
 				setHandle(computeHandle());
 		}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
index ea7575c85..39c33762f 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
@@ -114,7 +114,6 @@ public abstract class ArtifactEditProviderOperation extends AbstractDataModelOpe
 	 * Validate edit for resource state
 	 */
 	protected IStatus validateEdit() {
-		IStatus status = OK_STATUS;
 		IValidateEditContext validator = (IValidateEditContext) UIContextDetermination.createInstance(IValidateEditContext.CLASS_KEY);
 		return validator.validateState((EditModel)getArtifactEdit().getAdapter(ArtifactEditModel.ADAPTER_TYPE));
 		
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsDataModelProvider.java
index bf6e0c7e6..32cca6b45 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/CreateReferenceComponentsDataModelProvider.java
@@ -12,7 +12,6 @@ package org.eclipse.wst.common.componentcore.internal.operation;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -31,7 +30,6 @@ public class CreateReferenceComponentsDataModelProvider extends AbstractDataMode
 		propertyNames.add(SOURCE_COMPONENT);
 		propertyNames.add(TARGET_COMPONENT_LIST);
 		propertyNames.add(TARGET_COMPONENTS_DEPLOY_PATH);
-		propertyNames.add(TARGET_COMPONENT_ARCHIVE_NAME);
 		propertyNames.add(TARGET_COMPONENTS_TO_URI_MAP);
 		return propertyNames;
 	}
@@ -51,12 +49,6 @@ public class CreateReferenceComponentsDataModelProvider extends AbstractDataMode
 			return new ArrayList();
 		else if (propertyName.equals(TARGET_COMPONENTS_DEPLOY_PATH)){
 			return "/"; //$NON-NLS-1$
-		} else if (propertyName.equals(TARGET_COMPONENT_ARCHIVE_NAME)){
-			List components = (List) getProperty(TARGET_COMPONENT_LIST);
-			if(components.size() == 0){
-				Map map = (Map)getProperty(TARGET_COMPONENTS_TO_URI_MAP);
-				map.put(components.get(0), getProperty(propertyName));	
-			}
 		}
 		return super.getDefaultProperty(propertyName);
 	}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java
index 68e14fd0e..87c7fb9b8 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ProjectMigratorDataModelOperation.java
@@ -21,7 +21,6 @@ import org.eclipse.wst.common.componentcore.internal.IComponentProjectMigrator;
 import org.eclipse.wst.common.componentcore.internal.ProjectMigratorRegistry;
 import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
 
 public class ProjectMigratorDataModelOperation extends AbstractDataModelOperation {
 
@@ -30,7 +29,6 @@ public class ProjectMigratorDataModelOperation extends AbstractDataModelOperatio
 	}
 	
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		IFacetedProject facetProj;
 		try {
 			IProject proj = ProjectUtilities.getProject(model.getStringProperty(IProjectMigratorDataModelProperties.PROJECT_NAME));
 			IComponentProjectMigrator[] migrators = ProjectMigratorRegistry.getInstance().getProjectMigrators();
@@ -44,6 +42,4 @@ public class ProjectMigratorDataModelOperation extends AbstractDataModelOperatio
 		return OK_STATUS;
 	}
 
-	
-
 }
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
index 2ca339ef3..999f9ad4d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualArchiveComponent.java
@@ -16,7 +16,6 @@ import java.util.Properties;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IAdaptable;
@@ -39,16 +38,16 @@ public class VirtualArchiveComponent implements IVirtualComponent, IAdaptable {
 
 	private static final IVirtualReference[] NO_REFERENCES = new VirtualReference[0];
 	private static final IVirtualComponent[] NO_COMPONENTS = new VirtualComponent[0];
-	private static final IResource[] NO_RESOURCES = null;
+//	private static final IResource[] NO_RESOURCES = null;
 	private static final IVirtualResource[] NO_VIRTUAL_RESOURCES = null;
 	private static final Properties NO_PROPERTIES = new Properties();
 	private static final IPath[] NO_PATHS = new Path[0];
 
-	private IPath runtimePath;
+//	private IPath runtimePath;
 	private IProject componentProject;
-	private IVirtualFolder rootFolder;
+//	private IVirtualFolder rootFolder;
 	private int flag = 1;
-	private String archiveLocation;
+//	private String archiveLocation;
 
 
 	private IPath archivePath;
@@ -61,7 +60,7 @@ public class VirtualArchiveComponent implements IVirtualComponent, IAdaptable {
 			throw new NullPointerException();
 		}
 		componentProject = aComponentProject;
-		runtimePath = aRuntimePath;
+//		runtimePath = aRuntimePath;
 
 		String archivePathString = archiveLocation.substring(4, archiveLocation.length());
 		archiveType	= archiveLocation.substring(0, archiveLocation.length() - archivePathString.length() -1);
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java
index a37da7109..22f906757 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ArtifactEditAdapterFactory.java
@@ -25,8 +25,6 @@ import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
 import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
 import org.eclipse.wst.common.internal.emfworkbench.edit.EditModelRegistry;
 import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
 
 /**
  * <p>
@@ -61,7 +59,6 @@ public class ArtifactEditAdapterFactory implements IAdapterFactory {
 				Map params = new HashMap();
 				params.put(ArtifactEditModelFactory.PARAM_MODULE_URI, componentURI);
 				try {
-					IFacetedProject facetedProject = ProjectFacetsManager.create(aProject);
 					String[] editModelIDs = EditModelRegistry.getInstance().getRegisteredEditModelIDs();
 					for (int i=0; i<editModelIDs.length; i++) {
 						try {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java
index 01dd80a16..cb1d5f1cf 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ComponentImplManager.java
@@ -43,7 +43,7 @@ public class ComponentImplManager  {
 	private static final String ATT_CLASS = "class"; //$NON-NLS-1$
 
 	private static final ComponentImplManager instance = new ComponentImplManager();
-	private static final Object LOAD_FAILED = new Object();
+//	private static final Object LOAD_FAILED = new Object();
 
 	private final Map/* <String, ComponentImplDescriptor> */ descriptors = new Hashtable();
 
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ZipFileExporter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ZipFileExporter.java
index 7be0c3103..7cb24c7cf 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ZipFileExporter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ZipFileExporter.java
@@ -28,7 +28,6 @@ import org.eclipse.core.runtime.Path;
  */
 public class ZipFileExporter {
 	private ZipOutputStream outputStream;
-	private StringBuffer manifestContents;
 
 	private boolean useCompression = true;
 
diff --git a/plugins/org.eclipse.wst.validation.ui/.classpath b/plugins/org.eclipse.wst.validation.ui/.classpath
index 1c68a63f9..0d5d41e33 100644
--- a/plugins/org.eclipse.wst.validation.ui/.classpath
+++ b/plugins/org.eclipse.wst.validation.ui/.classpath
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="validateui/"/>
+	<classpathentry kind="src" path="validateui"/>
 	<classpathentry kind="src" path="property_files"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
index d9177197d..c0ce90078 100644
--- a/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.validation.ui/META-INF/MANIFEST.MF
@@ -18,4 +18,4 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.wst.validation;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jem.util;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.ui.forms;bundle-version="[3.2.0,4.0.0)"
-Eclipse-AutoStart: true
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.wst.validation.ui/plugin.xml b/plugins/org.eclipse.wst.validation.ui/plugin.xml
index bbabc9f38..5ce5d0881 100644
--- a/plugins/org.eclipse.wst.validation.ui/plugin.xml
+++ b/plugins/org.eclipse.wst.validation.ui/plugin.xml
@@ -43,8 +43,6 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            adaptable="true"
-            objectClass="org.eclipse.core.resources.IProject"
             name="%VBF_TITLE_PROPERTIES"
             class="org.eclipse.wst.validation.internal.ui.ValidationPropertiesPage"
             id="ValidationPropertiesPage">
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
index 860dfe7da..cbf14172b 100644
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationJob.java
@@ -9,7 +9,7 @@ import org.eclipse.core.runtime.jobs.Job;
 public class ValidationJob extends Job {
 
 
-	private Map projects = null;
+	private Map projects;
 	public ValidationJob(String name) {
 		super(name);
 	}
@@ -24,4 +24,8 @@ public class ValidationJob extends Job {
 
 		return null;
 	}
+	
+	protected Map getProjects() {
+		return projects;
+	}
 }
diff --git a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
index 0ba4c523c..0e62d5267 100644
--- a/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
+++ b/plugins/org.eclipse.wst.validation.ui/validateui/org/eclipse/wst/validation/internal/ui/ValidationPropertiesPage.java
@@ -19,8 +19,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 
-import javax.swing.event.HyperlinkEvent;
-
 import org.eclipse.core.resources.ICommand;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IProjectDescription;
@@ -74,7 +72,6 @@ import org.eclipse.ui.forms.events.IHyperlinkListener;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin;
 import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
 import org.eclipse.wst.validation.internal.ProjectConfiguration;
 import org.eclipse.wst.validation.internal.ValidatorMetaData;
 import org.eclipse.wst.validation.internal.operations.ValidatorManager;
@@ -265,7 +262,6 @@ public class ValidationPropertiesPage extends PropertyPage {
 		private Button disableAllButton = null;
 		Label emptyRowPlaceholder = null;
 		private Table validatorsTable;
-		private Label globalPrefLink = null;
 		ProjectConfiguration pagePreferences = null;
 		private boolean canOverride = false;
 		private Button addValidationBuilder = null;
@@ -439,7 +435,7 @@ public class ValidationPropertiesPage extends PropertyPage {
 
 		public ValidatorListPage(Composite parent) throws InvocationTargetException {
 			ConfigurationManager prefMgr = ConfigurationManager.getManager();
-			ValidatorManager vMgr = ValidatorManager.getManager();
+			// ValidatorManager vMgr = ValidatorManager.getManager();
 
 			pagePreferences = prefMgr.getProjectConfiguration(getProject()); // This
 			// represents the values on the page that haven't been persisted yet.
@@ -509,9 +505,6 @@ public class ValidationPropertiesPage extends PropertyPage {
 			link.addHyperlinkListener(new IHyperlinkListener() {
 				public static final String DATA_NO_LINK = "PropertyAndPreferencePage.nolink"; //$NON-NLS-1$
 
-				public void hyperlinkUpdate(HyperlinkEvent e) {
-				}
-
 				public void linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent e) {
 				}
 
@@ -1043,7 +1036,7 @@ public class ValidationPropertiesPage extends PropertyPage {
 				// Do NOT set the table's help back to what it was.
 				// Only if auto-validate is enabled should the page go back.
 				boolean doesProjectSupportBuildValidation = ValidatorManager.doesProjectSupportBuildValidation(getProject());
-				GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+				// GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
 				//boolean isPrefAuto = gp.isAutoValidate();
 				//boolean isPrefManual = gp.isBuildValidate();
 				if (doesProjectSupportBuildValidation) {
diff --git a/plugins/org.eclipse.wst.validation/.classpath b/plugins/org.eclipse.wst.validation/.classpath
index f8323da5e..a38762ae7 100644
--- a/plugins/org.eclipse.wst.validation/.classpath
+++ b/plugins/org.eclipse.wst.validation/.classpath
@@ -4,6 +4,10 @@
 	<classpathentry kind="src" path="validate_core"/>
 	<classpathentry kind="src" path="property_files"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
+		<accessrules>
+			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
+		</accessrules>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
index 3239cb09c..025ee18b6 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/GlobalConfiguration.java
@@ -126,7 +126,7 @@ public class GlobalConfiguration extends ValidationConfiguration {
 
 			IMarker rootMarker = marker[0]; // getMarker() has already checked that there's a marker
 			// in the array
-			ValidatorMetaData[] enabledValidators = null;
+//			ValidatorMetaData[] enabledValidators = null;
 //			String enabledValidatorsString = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_VALIDATORS);
 //			if (enabledValidatorsString == null) {
 //				enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
@@ -139,8 +139,8 @@ public class GlobalConfiguration extends ValidationConfiguration {
 			setEnabledManualValidators(getStringAsEnabledElementsArray(enabledManualValidators));
 			String enabledBuildValidators = (String) getValue(rootMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
 			setEnabledManualValidators(getStringAsEnabledElementsArray(enabledBuildValidators));
-			if (enabledManualValidators.equals(null) || enabledBuildValidators.equals(null)) 
-				enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
+//			if (enabledManualValidators.equals(null) || enabledBuildValidators.equals(null)) 
+//				enabledValidators = ConfigurationConstants.DEFAULT_ENABLED_VALIDATORS;
 			setCanProjectsOverride(getValue(rootMarker, ConfigurationConstants.PREF_PROJECTS_CAN_OVERRIDE, PREF_PROJECTS_CAN_OVERRIDE_DEFAULT));
 			root.getWorkspace().deleteMarkers(marker);
 		} catch (CoreException exc) {
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
index 105d838a8..752466bfb 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ProjectConfiguration.java
@@ -364,7 +364,7 @@ public class ProjectConfiguration extends ValidationConfiguration {
 
 			IMarker prjMarker = marker[0]; // getProjectMarker() has already checked that there's a
 			// marker in the array
-			GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
+//			GlobalConfiguration gp = ConfigurationManager.getManager().getGlobalConfiguration();
 
 //			String enabledValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_VALIDATORS);
 //			ValidatorMetaData[] enabledVal = null;
@@ -379,10 +379,11 @@ public class ProjectConfiguration extends ValidationConfiguration {
 			ValidatorMetaData[] enabledBuildVal = null;
 			String enabledManualValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_MANUAL_VALIDATORS);
 			String enabledBuildValStr = (String) getValue(prjMarker, ConfigurationConstants.ENABLED_BUILD_VALIDATORS);
-			ValidatorMetaData[] enabledVal = null;
-			if (enabledManualValStr.equals(null) || enabledBuildValStr.equals(null)) {
-				enabledVal = gp.getEnabledValidators();
-			} else {
+//			ValidatorMetaData[] enabledVal = null;
+//			if (enabledManualValStr.equals(null) || enabledBuildValStr.equals(null)) {
+//				enabledVal = gp.getEnabledValidators();
+//			} else {
+			if (!enabledManualValStr.equals(null) && !enabledBuildValStr.equals(null)) {
 				enabledManaualVal = getStringAsEnabledElementsArray(enabledManualValStr);
 				setEnabledManualValidators(enabledManaualVal);
 				enabledBuildVal = getStringAsEnabledElementsArray(enabledManualValStr);
@@ -402,7 +403,6 @@ public class ProjectConfiguration extends ValidationConfiguration {
 			} else {
 				setDoesProjectOverride(boolVal.booleanValue());
 			}
-			boolean override = doesProjectOverride();
 
 			getResource().getWorkspace().deleteMarkers(marker);
 		} catch (CoreException exc) {
@@ -625,7 +625,7 @@ public class ProjectConfiguration extends ValidationConfiguration {
   
   public void store() throws InvocationTargetException {
 		IProject project = (IProject) getResource();
-		IScopeContext projectContext = new ProjectScope((IProject) getResource());
+		IScopeContext projectContext = new ProjectScope(project);
 		final IEclipsePreferences pref = projectContext.getNode(ValidationPlugin.PLUGIN_ID);
 		if (pref != null) {
 			try {
@@ -645,7 +645,6 @@ public class ProjectConfiguration extends ValidationConfiguration {
 		IScopeContext projectContext = new ProjectScope(project);
 		final IEclipsePreferences prefs = projectContext.getNode(ValidationPlugin.PLUGIN_ID);
 		if (prefs != null) {
-			String projectName = project.getName();
 			String storedConfig = prefs.get(USER_PREFERENCE,"default_value");
 			deserialize(storedConfig);
 			String storedManualConfig = prefs.get(USER_MANUAL_PREFERENCE,"default_value");
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
index 4d332d162..4149732c5 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/ValidationRegistryReader.java
@@ -883,7 +883,6 @@ public final class ValidationRegistryReader implements RegistryConstants {
 			// or if this project nature has no validators configured
 			// on it, return the validators which are configured on all
 			// projects.
-			Set projVmds = null;
 			if ((projectNatures == null) || (projectNatures.length == 0)) {
 				executionMap |= 0x4;
 				
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
index e64f0e637..c2e0ba429 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/delegates/ValidatorDelegatesRegistryReader.java
@@ -83,9 +83,9 @@ class ValidatorDelegatesRegistryReader
 
     if (elementName.equals(DELEGATE_ELEMENT))
     {
-      String delegateID = (String) element.getAttribute(CLASS_ATTRIBUTE);
-      String delegateName = (String) element.getAttribute(NAME_ATTRIBUTE);
-      String targetValidatorID = (String) element.getAttribute(TARGET_ATTRIBUTE);
+      String delegateID = element.getAttribute(CLASS_ATTRIBUTE);
+      String delegateName = element.getAttribute(NAME_ATTRIBUTE);
+      String targetValidatorID = element.getAttribute(TARGET_ATTRIBUTE);
 
       ValidatorDelegateDescriptor descriptor = new ValidatorDelegateDescriptor(delegateID, element, delegateName, targetValidatorID);
 
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
index 01074b5f0..e88500efc 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationBuilder.java
@@ -162,8 +162,8 @@ public class ValidationBuilder extends IncrementalProjectBuilder {
 			ProjectConfiguration prjp = ConfigurationManager.getManager().getProjectConfiguration(project);
 			delta = getDelta(project);
 			boolean doFullBuild = (kind == FULL_BUILD);
-			boolean doAutoBuild = ((delta != null) && (kind == AUTO_BUILD));
-			boolean doIncrementalBuild = ((delta != null) && (kind == INCREMENTAL_BUILD));
+//			boolean doAutoBuild = ((delta != null) && (kind == AUTO_BUILD));
+//			boolean doIncrementalBuild = ((delta != null) && (kind == INCREMENTAL_BUILD));
 //			if ((doFullBuild || doIncrementalBuild) && !prjp.isBuildValidate()) {
 //				// Is a build validation about to be invoked? If so, does the
 //				// user want build validation to run?
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
index a7d5a2122..5056d1a34 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidationOperation.java
@@ -32,7 +32,6 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
@@ -811,7 +810,7 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle
 					while (it.hasNext()) {
 						ValidatorMetaData data = (ValidatorMetaData) it.next();
 						if (data.isApplicableTo(refFile)) {
-							IValidator validator = (IValidator)data.getValidator();
+							IValidator validator = data.getValidator();
 							validator.validate(data.getHelper(project),reporter);
 							validatedFiles.add(refFile);
 						}
@@ -846,7 +845,7 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle
 		IValidator validator = null;
 		ValidatorMetaData vmd = null;
 		Iterator iterator = null;
-		WorkbenchReporter nullReporter = new WorkbenchReporter(getProject(), new NullProgressMonitor());
+//		WorkbenchReporter nullReporter = new WorkbenchReporter(getProject(), new NullProgressMonitor());
 		final Logger logger = ValidationPlugin.getPlugin().getMsgLogger();
 		IFileDelta[] delta = null;
 		
@@ -998,7 +997,7 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle
 //				} else {
 //					internalValidate(reporter, validator, vmd, context, delta);
 //				}
-				internalValidate(reporter, (IValidator)validator, vmd, context, delta);
+				internalValidate(reporter, validator, vmd, context, delta);
 				}
 		} catch (OperationCanceledException exc) {
 			handleOperationCancelledValidateException(reporter, validator, vmd, iterator, logger, exc);
@@ -1513,12 +1512,12 @@ public abstract class ValidationOperation implements IWorkspaceRunnable, IHeadle
 		}
 	}
 
-	private Runnable wrapInRunnable(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd, final IWorkbenchContext helper, final IFileDelta[] delta, final Iterator iterator) {
-		// Need to create a new Runnable each time because several Runnable
-		// instances may exist at the same time.
-		Runnable runnable = new ProjectRunnable(reporter, validator, vmd, helper, delta, iterator);
-		return runnable;
-	}
+//	private Runnable wrapInRunnable(final WorkbenchReporter reporter, final IValidator validator, final ValidatorMetaData vmd, final IWorkbenchContext helper, final IFileDelta[] delta, final Iterator iterator) {
+//		// Need to create a new Runnable each time because several Runnable
+//		// instances may exist at the same time.
+//		Runnable runnable = new ProjectRunnable(reporter, validator, vmd, helper, delta, iterator);
+//		return runnable;
+//	}
 
 	/*
 	 * // For convenience, keep this method in the class but commented out. // When async needs to
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
index 473fea2f0..be22d84fa 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorJob.java
@@ -25,7 +25,6 @@ public class ValidatorJob extends Job {
 
 
 	private IProject			project;
-	private String				validatorUniqueName;
 	private IWorkbenchContext 	helper;
 	private IValidatorJob		validator;
 	
@@ -38,7 +37,6 @@ public class ValidatorJob extends Job {
 	   
 	public ValidatorJob( IValidatorJob validator, String displayName, String name, IProject project, IWorkbenchContext aHelper  ){
 		super(displayName);
-		validatorUniqueName = name;
 		this.project = project;
 		this.helper = aHelper;
 		this.validator = validator;
@@ -122,7 +120,7 @@ public class ValidatorJob extends Job {
 				entry.setTargetException(exc);
 				logger.write(Level.SEVERE, entry);
 				IStatus stat = new Status(IStatus.ERROR,
-			    		      ValidationPlugin.getPlugin().PLUGIN_ID, 0, "", exc );
+			    		      ValidationPlugin.PLUGIN_ID, 0, "", exc );
 					logger.write(Level.SEVERE, stat);
 				
 			}
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
index 68605e6de..4941019bc 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/ValidatorManager.java
@@ -40,7 +40,6 @@ import org.eclipse.wst.validation.internal.TaskListUtility;
 import org.eclipse.wst.validation.internal.ValidationRegistryReader;
 import org.eclipse.wst.validation.internal.ValidatorMetaData;
 import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
 import org.eclipse.wst.validation.internal.provisional.core.IValidator;
 import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
 
@@ -1012,45 +1011,45 @@ public final class ValidatorManager {
 		return null;
 	}
 
-	/**
-	 * Return true if the given IMarker is a "limit was exceeded" message, false otherwise.
-	 */
-	private boolean isLimitMessage(IMarker marker) {
-		if (marker == null) {
-			return false;
-		}
-
-		return TaskListUtility.isOwner(marker, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
-	}
-
-	/**
-	 * Return all of the IMarkers on the IProject excluding the "limit was exceeded" message. If
-	 * there are no markers, return null.
-	 */
-	private IMarker[] getValidationTasksWithoutLimitMessage(IProject project) {
-		IMarker[] allTasks = TaskListUtility.getValidationTasks(project, IMessage.ALL_MESSAGES);
-		if ((allTasks == null) || (allTasks.length == 0)) {
-			return null;
-		}
-
-		// Don't check if the limit message exists because
-		// any interaction with markers is costly. Since the
-		// interaction has to be done at least once, make that
-		// single occasion in the for loop below.
-		IMarker[] validatorMessages = new IMarker[allTasks.length];
-		int count = 0; // how many markers have been added to the result array?
-		for (int i = 0; i < allTasks.length; i++) {
-			IMarker marker = allTasks[i];
-			if (isLimitMessage(marker)) {
-				continue;
-			}
-			validatorMessages[count++] = marker;
-		}
-
-		IMarker[] result = new IMarker[count];
-		System.arraycopy(validatorMessages, 0, result, 0, count);
-		return result;
-	}
+//	/**
+//	 * Return true if the given IMarker is a "limit was exceeded" message, false otherwise.
+//	 */
+//	private boolean isLimitMessage(IMarker marker) {
+//		if (marker == null) {
+//			return false;
+//		}
+//
+//		return TaskListUtility.isOwner(marker, WorkbenchReporter.getUniqueId(getMessageLimitOwner()));
+//	}
+
+//	/**
+//	 * Return all of the IMarkers on the IProject excluding the "limit was exceeded" message. If
+//	 * there are no markers, return null.
+//	 */
+//	private IMarker[] getValidationTasksWithoutLimitMessage(IProject project) {
+//		IMarker[] allTasks = TaskListUtility.getValidationTasks(project, IMessage.ALL_MESSAGES);
+//		if ((allTasks == null) || (allTasks.length == 0)) {
+//			return null;
+//		}
+//
+//		// Don't check if the limit message exists because
+//		// any interaction with markers is costly. Since the
+//		// interaction has to be done at least once, make that
+//		// single occasion in the for loop below.
+//		IMarker[] validatorMessages = new IMarker[allTasks.length];
+//		int count = 0; // how many markers have been added to the result array?
+//		for (int i = 0; i < allTasks.length; i++) {
+//			IMarker marker = allTasks[i];
+//			if (isLimitMessage(marker)) {
+//				continue;
+//			}
+//			validatorMessages[count++] = marker;
+//		}
+//
+//		IMarker[] result = new IMarker[count];
+//		System.arraycopy(validatorMessages, 0, result, 0, count);
+//		return result;
+//	}
 
 	/**
 	 * This method should be called only by the validation framework. Return true if the message was
diff --git a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
index db6d2aad7..fc70b6c8f 100644
--- a/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
+++ b/plugins/org.eclipse.wst.validation/validate/org/eclipse/wst/validation/internal/operations/WorkbenchReporter.java
@@ -564,7 +564,6 @@ public final class WorkbenchReporter implements IReporter {
 			return;
 		}
 
-		ValidatorManager mgr = ValidatorManager.getManager();
 		if( validator instanceof IValidatorJob ){
 			cacheMessage( (IValidatorJob)validator, resource, validator.getClass(), message, getTargetObjectName(helper, message), getLocation(helper, message), getMarkerId(vmd, message) );
 		}else