cleaned up code for servlet: committed for JL

25 files changed, 33 insertions, 236 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebAppDeployableModuleBuilderOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebAppDeployableModuleBuilderOperation.java
index 872800f90..51ba15bbe 100644
--- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebAppDeployableModuleBuilderOperation.java
+++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebAppDeployableModuleBuilderOperation.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.common.util.URI;
 import org.eclipse.wst.common.modulecore.ModuleStructuralModel;
 import org.eclipse.wst.common.modulecore.WorkbenchModule;
 import org.eclipse.wst.common.modulecore.WorkbenchModuleResource;
+import org.eclipse.wst.common.modulecore.builder.DeployableModuleBuilderDataModel;
 import org.eclipse.wst.common.modulecore.builder.DeployableModuleBuilderOperation;
 
 /**
@@ -39,17 +40,17 @@ public class WebAppDeployableModuleBuilderOperation extends DeployableModuleBuil
 	 */
 	protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
 		WebAppDeployableModuleBuilderDataModel dataModel = (WebAppDeployableModuleBuilderDataModel) operationDataModel;
-		ModuleStructuralModel moduleModel = (ModuleStructuralModel)dataModel.getProperty(WebAppDeployableModuleBuilderDataModel.MODULE_STRUCTURAL_MODEL);
-		WorkbenchModule workbenchModule = (WorkbenchModule)dataModel.getProperty(WebAppDeployableModuleBuilderDataModel.WORKBENCH_MODULE);
+		ModuleStructuralModel moduleModel = (ModuleStructuralModel)dataModel.getProperty(DeployableModuleBuilderDataModel.MODULE_STRUCTURAL_MODEL);
+		WorkbenchModule workbenchModule = (WorkbenchModule)dataModel.getProperty(DeployableModuleBuilderDataModel.WORKBENCH_MODULE);
 		String deployedName = workbenchModule.getDeployedName();
 
 		// create output container folder if it does not exist
-		Path absoluteOCP = (Path)dataModel.getProperty(WebAppDeployableModuleBuilderDataModel.OUTPUT_CONTAINER);
-		IFolder outputContainerFolder = createFolder(absoluteOCP);
+		Path absoluteOCP = (Path)dataModel.getProperty(DeployableModuleBuilderDataModel.OUTPUT_CONTAINER);
+		createFolder(absoluteOCP);
 
 		// create deployed module folder
 		IPath absoluteDMP = absoluteOCP.append(deployedName);
-		IFolder deployedModuleFolder = createFolder(absoluteDMP);
+		createFolder(absoluteDMP);
 
 		// copy resources
 		IPath projectPath = moduleModel.getProject().getFullPath();
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
index 07ec57496..6e5cc19a4 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterCCombo.java
@@ -94,9 +94,11 @@ public class AdapterCCombo extends AdapterImpl implements SelectionListener {
 	}
 
 	public void widgetDefaultSelected(SelectionEvent e) {
+		//Do nothing
 	}
 
 	public void widgetSelected(SelectionEvent e) {
+		//Do nothing
 	}
 
 	public void adapt(EObject eObject) {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
index 9e6e384e4..f690d10c9 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterHandlerClassText.java
@@ -93,7 +93,6 @@ public class AdapterHandlerClassText extends AdapterImpl implements ModifyListen
 	protected boolean syncTextAndModel() {
 		if (eObject_ != null) {
 			String modelValue = eObject_.getHandlerClass().getQualifiedNameForReflection();
-			;
 			String textValue = text_.getText();
 			if (modelValue == null || modelValue.length() <= 0)
 				return !(textValue == null || textValue.length() <= 0);
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
index aad0c5610..496070c2f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/adapter/AdapterServiceInterfaceText.java
@@ -93,7 +93,7 @@ public class AdapterServiceInterfaceText extends AdapterImpl implements ModifyLi
 		if (eObject_ != null) {
 			String modelValue = null;
 			if (eObject_.getServiceInterface() != null)
-				modelValue = eObject_.getServiceInterface().getQualifiedNameForReflection();;
+				modelValue = eObject_.getServiceInterface().getQualifiedNameForReflection();
 			String textValue = text_.getText();
 			if (modelValue == null || modelValue.length() <= 0)
 				return !(textValue == null || textValue.length() <= 0);
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
index fc5172fcb..ff69fe2e6 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java
@@ -147,6 +147,7 @@ public class CommandAddClientHandler extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
index b339c80b3..d38eec3a1 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java
@@ -161,6 +161,7 @@ public class CommandAddElement extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
index 4b414df47..76bf9dedd 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java
@@ -147,6 +147,7 @@ public class CommandAddPortComponentRef extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
index 7f42c1ce8..cf8ce0f5d 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddServiceRef.java
@@ -139,6 +139,7 @@ public class CommandAddServiceRef extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
index 1c7cbf01c..b93556cc1 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java
@@ -140,6 +140,7 @@ public class CommandModifyElement extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
index 7f754f2bd..96ce31b4e 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java
@@ -141,6 +141,7 @@ public class CommandModifyHandlerClassText extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
index 1246aec64..566374fa5 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyNSURI.java
@@ -141,6 +141,7 @@ public class CommandModifyNSURI extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
index f82e99860..5c2957fb4 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java
@@ -149,6 +149,7 @@ public class CommandModifySEI extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
index b357c40f6..51c3c3b96 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java
@@ -142,6 +142,7 @@ public class CommandModifyServiceInterfaceText extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
index 78063437b..4d7bb779b 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java
@@ -139,6 +139,7 @@ public class CommandModifyText extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
index d388b2536..d7d169a27 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandMoveServiceRefs.java
@@ -249,6 +249,7 @@ public class CommandMoveServiceRefs extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
index b8ba0f0ce..177388b9c 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandRemoveElement.java
@@ -158,6 +158,7 @@ public class CommandRemoveElement extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
index 72fcb1809..55d309dc6 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandSetElement.java
@@ -156,6 +156,7 @@ public class CommandSetElement extends AbstractCommand {
 	 * this one has undefined results.
 	 */
 	public void dispose() {
+		//Do nothing
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java
index 5d2f1d859..1049d981d 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java
@@ -13,7 +13,6 @@ import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
@@ -21,11 +20,11 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.jst.j2ee.common.impl.J2EEResourceFactoryRegistry;
 import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper;
 
 import com.ibm.wtp.emf.workbench.EMFWorkbenchContextBase;
 import com.ibm.wtp.emf.workbench.IEMFContextContributor;
 import com.ibm.wtp.emf.workbench.ProjectResourceSet;
+import com.ibm.wtp.emf.workbench.WorkbenchResourceHelperBase;
 
 public abstract class AbstractEditModelOwner implements IEMFContextContributor {
 	protected IFile fInputFile;
@@ -52,17 +51,13 @@ public abstract class AbstractEditModelOwner implements IEMFContextContributor {
 
 	protected EMFWorkbenchContext getEmfNature() {
 		if (fEmfNature == null) {
-			try {
-				createEmfNature();
-			} catch (CoreException ex) {
-				// Log anything...?
-			}
+			createEmfNature();
 		}
 		return fEmfNature;
 	}
 
-	protected void createEmfNature() throws CoreException {
-		WorkbenchResourceHelper.createEMFContext(getProject(), this);
+	protected void createEmfNature() {
+		WorkbenchResourceHelperBase.createEMFContext(getProject(), this);
 	}
 
 	public void primaryContributeToContext(EMFWorkbenchContextBase aNature) {
@@ -75,7 +70,7 @@ public abstract class AbstractEditModelOwner implements IEMFContextContributor {
 	}
 
 	public void secondaryContributeToContext(EMFWorkbenchContextBase aNature) {
-
+		//Do nothing
 	}
 
 
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/CompositeEditModel.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/CompositeEditModel.java
index e2fe4119b..9da0e70bd 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/CompositeEditModel.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/CompositeEditModel.java
@@ -255,6 +255,7 @@ public abstract class CompositeEditModel extends EditModel implements CommandSta
 					resource.save(Collections.EMPTY_MAP);
 					resource.setModified(false);
 				} catch (Exception e) {
+					//Ignore
 				}
 			}
 		}
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/EditModelFactory.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/EditModelFactory.java
index 3142fb29c..9fa97391d 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/EditModelFactory.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/EditModelFactory.java
@@ -20,6 +20,7 @@ public class EditModelFactory {
 	private Hashtable fWebServicesClientEditModels = new Hashtable();
 
 	private EditModelFactory() {
+		//Default constructor
 	}
 
 	public static EditModelFactory getEditModelFactory() {
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/WsddEditModel.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/WsddEditModel.java
index e706c121c..7168933bf 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/WsddEditModel.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/WsddEditModel.java
@@ -120,6 +120,7 @@ public class WsddEditModel extends EditModel {
 			else if (getProject().hasNature(IWebNatureConstants.J2EE_NATURE_ID))
 				result = WEB_PROJECT_WEBSERVICE;
 		} catch (Exception e) {
+			//Ignore
 		}
 
 		return result;
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/WebServiceMessages.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/WebServiceMessages.java
index c022b2047..4df279e0e 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/WebServiceMessages.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/WebServiceMessages.java
@@ -63,6 +63,7 @@ public class WebServiceMessages extends Messages {
 		try {
 			resourceBundle = ResourceBundle.getBundle("webservice"); //$NON-NLS-1$
 		} catch (MissingResourceException x) {
+			//Ignore
 		}
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
index 6f0e07244..9fe446e8f 100644
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
+++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/plugin/WebServicePlugin.java
@@ -135,6 +135,7 @@ public class WebServicePlugin extends WTPPlugin implements ResourceLocator {
 				sb.append("plugin.properties"); //$NON-NLS-1$
 				return new URL(sb.toString());
 			} catch (MalformedURLException e) {
+				//Ignore
 			}
 		}
 		return null;
diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/webservice/plugin/WebServicePlugin.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/webservice/plugin/WebServicePlugin.java
deleted file mode 100644
index 4e4afe6fb..000000000
--- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/webservice/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Jan 28, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.webservice.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.common.frameworks.internal.WTPPlugin;
-
-
-/**
- * @author jlanuti
- * 
- * To change the template for this generated type comment go to Window - Preferences - Java - Code
- * Generation - Code and Comments
- */
-public class WebServicePlugin extends WTPPlugin implements ResourceLocator {
-
-	public static final String PLUGIN_ID = "org.eclipse.jst.j2ee.webservice"; //$NON-NLS-1$
-
-	/**
-	 * The reference to the singleton instance of this plugin.
-	 */
-	private static WebServicePlugin singleton;
-
-	/**
-	 * @param descriptor
-	 */
-	public WebServicePlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		if (singleton == null)
-			singleton = this;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.framework.WTPPlugin#getPluginID()
-	 */
-	public String getPluginID() {
-		return PLUGIN_ID;
-	}
-
-	/**
-	 * Returns an image descriptor for the named resource as relative to the plugin install
-	 * location.
-	 * 
-	 * @return An image descriptor, possibly null.
-	 */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = singleton.getDescriptor().getInstallURL();
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the singleton instance of this plugin. Equivalent to calling
-	 * (ATKUIPlugin)Platform.getPlugin("com.ibm.etools.webservice.atk.ui");
-	 * 
-	 * @return The ATKUIPlugin singleton.
-	 */
-	static public WebServicePlugin getInstance() {
-		return singleton;
-	}
-
-	/**
-	 * Returns the message string identified by the given key from the plugin.properties file for
-	 * the appropriate locale.
-	 * 
-	 * @param key
-	 *            The message key string prefixed by a "%" symbol. That is, the string passed in
-	 *            must be of the form "%KEY" where the plugin.properties file contains a line of the
-	 *            form: "KEY = value".
-	 * @return The locale-specific message.
-	 */
-	public static String getMessage(String key) {
-		return singleton.getDescriptor().getResourceString(key);
-	}
-
-	/**
-	 * Returns the message string identified by the given key from the plugin.properties file for
-	 * the appropriate locale. Substitution sequences in the message string are replaced by the
-	 * given array of substitution objects (which are most frequently strings). See
-	 * java.text.MessageFormat for further details on substitution.
-	 * 
-	 * @param key
-	 *            The message key string prefixed by a "%" symbol. That is, the string passed in
-	 *            must be of the form "%KEY" where the plugin.properties file contains a line of the
-	 *            form: "KEY = value".
-	 * @param args
-	 *            The substitution values for the message as required by the message in
-	 *            plugin.properties and by the rules of class java.text.MessageFormat.
-	 * @return The locale-specific message.
-	 */
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
-	}
-
-
-	/**
-	 * Returns the URL from which all resources are based.
-	 * 
-	 * @return the URL from which all resources are based.
-	 */
-	public URL getBaseURL() {
-		String installURL = getPluginInstallLocation();
-		if (installURL != null) {
-			try {
-				StringBuffer sb = new StringBuffer(installURL);
-				sb.append("plugin.properties"); //$NON-NLS-1$
-				return new URL(sb.toString());
-			} catch (MalformedURLException e) {
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the description that can be used to create the image resource associated with the
-	 * key. The description will typically be in the form of a URL to the image data. Creation of an
-	 * actual image depends on the GUI environment; within Eclipse,
-	 * org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry can be used.
-	 * 
-	 * @param key
-	 *            the key of the image resource.
-	 * @return the description on the image resource.
-	 */
-	public Object getImage(String key) {
-		ImageDescriptor imageDescriptor = getImageDescriptor(key);
-		if (imageDescriptor != null)
-			return imageDescriptor.createImage();
-		return null;
-	}
-
-	public String getPluginStateLocation() {
-		return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
-	}
-
-	public String getPluginInstallLocation() {
-		try {
-			return Platform.resolve(getDescriptor().getInstallURL()).getFile();
-		} catch (Throwable t) {
-			return null;
-		}
-	}
-
-	/**
-	 * Returns the string resource associated with the key.
-	 * 
-	 * @param key
-	 *            the key of the string resource.
-	 * @return the string resource associated with the key.
-	 */
-	public String getString(String key) {
-		return getMessage(key);
-	}
-
-	/**
-	 * Returns a string resource associated with the key, and peforms substitutions.
-	 * 
-	 * @param key
-	 *            the key of the string.
-	 * @param substitutions
-	 *            the message substitutions.
-	 * @return a string resource associated with the key.
-	 * @see #getString(String)
-	 * @see MessageFormat#format(String, Object[])
-	 */
-	public String getString(String key, Object[] substitutions) {
-		return getMessage(key, substitutions);
-	}
-
-	/**
-	 * Called once by the platform when this plugin is first loaded.
-	 * 
-	 * @throws CoreException
-	 *             If this plugin fails to start.
-	 */
-	public void startup() throws CoreException {
-		super.startup();
-	}
-
-	/**
-	 * Called once by the platform when this plugin is unloaded.
-	 * 
-	 * @throws CoreException
-	 *             If this plugin fails to shutdown.
-	 */
-	public void shutdown() throws CoreException {
-		super.shutdown();
-	}
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WEBProjectCreationPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WEBProjectCreationPage.java
index 2500f8f9e..e4d50fce3 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WEBProjectCreationPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WEBProjectCreationPage.java
@@ -50,7 +50,6 @@ public class WEBProjectCreationPage extends J2EEModuleCreationPage {
 
 	private static final int SIZING_TEXT_FIELD_WIDTH = 250;
 	private AnnotationsStandaloneGroup annotationsGroup;
-	private FlexibleModuleStandaloneGroup flexibleGroup;
 	
 	/**
 	 * @param model
@@ -102,7 +101,7 @@ public class WEBProjectCreationPage extends J2EEModuleCreationPage {
 	}
 	
 	private void createFlexibleProjectGroup(Composite parent) {
-	    flexibleGroup = new FlexibleModuleStandaloneGroup(parent, getJ2EEModuleCreationDataModel());
+	    new FlexibleModuleStandaloneGroup(parent, getJ2EEModuleCreationDataModel());
 	}
 	
 	WebModuleCreationDataModel getWebProjectCreationDataModel() {