Compiler warning cleanup

12 files changed, 54 insertions, 56 deletions

diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java
index 59403aa85..2da373b56 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Configuration.java
@@ -87,9 +87,9 @@ public class Tomcat32Configuration extends TomcatConfiguration {
 	 */
 	public List getMimeMappings() {
 		if (webAppDocument == null)
-			return new ArrayList();
-		else
-			return webAppDocument.getMimeMappings();
+			return new ArrayList(0);
+		
+		return webAppDocument.getMimeMappings();
 	}
 
 	/**
@@ -144,7 +144,9 @@ public class Tomcat32Configuration extends TomcatConfiguration {
 					if ("port".equals(p.getName())) {
 						try {
 							port = Integer.parseInt(p.getValue());
-						} catch (Exception e) { }
+						} catch (Exception e) {
+							// ignore
+						}
 					} else if ("handler".equals(p.getName()))
 						handler = p.getValue();
 					else if ("socketFactory".equals(p.getName()))
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java
index e658bad2c..a2d63f861 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat32Handler.java
@@ -18,7 +18,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jst.server.j2ee.IWebModule;
-
 /**
  * 
  */
@@ -105,7 +104,7 @@ public class Tomcat32Handler implements ITomcatVersionHandler {
 	public IStatus canAddModule(IWebModule module) {
 		if ("1.2".equals(module.getJ2EESpecificationVersion()))
 			return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-		else
-			return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec32"), null);
+		
+		return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec32"), null);
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
index 7c0c4288c..b69a5b4aa 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat40Handler.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jst.server.j2ee.IWebModule;
-
 /**
  * 
  */
@@ -110,7 +109,7 @@ public class Tomcat40Handler implements ITomcatVersionHandler {
 	public IStatus canAddModule(IWebModule module) {
 		if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()))
 			return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-		else
-			return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec40"), null);
+		
+		return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec40"), null);
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
index 90e92d9c7..6efc9bff3 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat41Handler.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jst.server.j2ee.IWebModule;
-
 /**
  * 
  */
@@ -110,7 +109,7 @@ public class Tomcat41Handler implements ITomcatVersionHandler {
 	public IStatus canAddModule(IWebModule module) {
 		if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()))
 			return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-		else
-			return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec41"), null);
+		
+		return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec41"), null);
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
index 4502dab7f..9371e9aab 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat50Handler.java
@@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jst.server.j2ee.IWebModule;
-
 /**
  * 
  */
@@ -110,7 +109,7 @@ public class Tomcat50Handler implements ITomcatVersionHandler {
 	public IStatus canAddModule(IWebModule module) {
 		if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()) || "1.4".equals(module.getJ2EESpecificationVersion()))
 			return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-		else
-			return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec50"), null);
+		
+		return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec50"), null);
 	}
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java
index 9d876a33e..891f9762f 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/Tomcat55Handler.java
@@ -13,7 +13,6 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jst.server.j2ee.IWebModule;
-
 /**
  * 
  */
@@ -38,7 +37,7 @@ public class Tomcat55Handler extends Tomcat50Handler {
 	public IStatus canAddModule(IWebModule module) {
 		if ("1.2".equals(module.getJ2EESpecificationVersion()) || "1.3".equals(module.getJ2EESpecificationVersion()) || "1.4".equals(module.getJ2EESpecificationVersion()))
 			return new Status(IStatus.OK, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%canAddModule"), null);
-		else
-			return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec55"), null);
+		
+		return new Status(IStatus.ERROR, TomcatPlugin.PLUGIN_ID, 0, TomcatPlugin.getResource("%errorSpec55"), null);
 	}
 }
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java
index 8cd0a1074..4a18a1d9a 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfiguration.java
@@ -194,8 +194,8 @@ public abstract class TomcatConfiguration extends ServerConfigurationDelegate im
 		WebModule module = getWebModule(webModule);
 		if (module != null)
 			return module.getPath();
-		else
-			return webModule.getContextRoot();
+		
+		return webModule.getContextRoot();
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java
index acb1db695..d0b81ddfe 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatConfigurationUtil.java
@@ -1,4 +1,3 @@
-package org.eclipse.jst.server.tomcat.core.internal;
 /**********************************************************************
  * Copyright (c) 2003 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
@@ -9,6 +8,8 @@ package org.eclipse.jst.server.tomcat.core.internal;
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
+package org.eclipse.jst.server.tomcat.core.internal;
+
 import org.eclipse.jst.server.tomcat.core.internal.xml.server40.Server;
 /**
  * 
@@ -26,29 +27,28 @@ public class TomcatConfigurationUtil {
 	protected static boolean verifyConfiguration(TomcatConfiguration config, int version) {
 		if (version == CONFIGURATION_V32) {
 			return config instanceof Tomcat32Configuration;
-		} else {
-			Server server = null;
-			if (config instanceof Tomcat40Configuration) {
-				server = ((Tomcat40Configuration)config).server;
-			} else if (config instanceof Tomcat41Configuration) {
-				server = ((Tomcat41Configuration)config).server;
-			} else if (config instanceof Tomcat50Configuration) {
-				server = ((Tomcat50Configuration)config).server;
-			} else if (config instanceof Tomcat55Configuration) {
-				server = ((Tomcat55Configuration)config).server;
-			}
+		}
+		Server server = null;
+		if (config instanceof Tomcat40Configuration) {
+			server = ((Tomcat40Configuration)config).server;
+		} else if (config instanceof Tomcat41Configuration) {
+			server = ((Tomcat41Configuration)config).server;
+		} else if (config instanceof Tomcat50Configuration) {
+			server = ((Tomcat50Configuration)config).server;
+		} else if (config instanceof Tomcat55Configuration) {
+			server = ((Tomcat55Configuration)config).server;
+		}
 
-			/*if (Tomcat50Configuration.verifyConfiguration(server))
+		/*if (Tomcat50Configuration.verifyConfiguration(server))
 				return (version == CONFIGURATION_V50);
 */
-			if (Tomcat41Configuration.hasMDBListener(server))
-				return (version == CONFIGURATION_V41
-						|| version == CONFIGURATION_V50
-						|| version == CONFIGURATION_V55);
+		if (Tomcat41Configuration.hasMDBListener(server))
+			return (version == CONFIGURATION_V41
+					|| version == CONFIGURATION_V50
+					|| version == CONFIGURATION_V55);
 
-			if (version == CONFIGURATION_V40)
-				return true;
-		}
+		if (version == CONFIGURATION_V40)
+			return true;
 
 		return false;
 	}
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
index 04338dff5..93b6f452f 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServer.java
@@ -1,4 +1,3 @@
-package org.eclipse.jst.server.tomcat.core.internal;
 /**********************************************************************
  * Copyright (c) 2003 IBM Corporation and others.
  * All rights reserved.   This program and the accompanying materials
@@ -9,6 +8,8 @@ package org.eclipse.jst.server.tomcat.core.internal;
  * Contributors:
  *    IBM - Initial API and implementation
  **********************************************************************/
+package org.eclipse.jst.server.tomcat.core.internal;
+
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
@@ -65,8 +66,8 @@ public class TomcatServer implements ITomcatServer, IStartableServer, IMonitorab
 	public TomcatRuntime getTomcatRuntime() {
 		if (server.getRuntime() == null)
 			return null;
-		else
-			return (TomcatRuntime) server.getRuntime().getDelegate();
+		
+		return (TomcatRuntime) server.getRuntime().getDelegate();
 	}
 	
 	public ITomcatVersionHandler getTomcatVersionHandler() {
@@ -81,8 +82,8 @@ public class TomcatServer implements ITomcatServer, IStartableServer, IMonitorab
 		IServerConfiguration configuration = server.getServerConfiguration();
 		if (configuration == null)
 			return null;
-		else
-			return (TomcatConfiguration) configuration.getDelegate();
+		
+		return (TomcatConfiguration) configuration.getDelegate();
 	}
 
 	/**
@@ -95,8 +96,8 @@ public class TomcatServer implements ITomcatServer, IStartableServer, IMonitorab
 	public IPublisher getPublisher(List parents, IModule module) {
 		if (isTestEnvironment())
 			return null;
-		else
-			return new TomcatWebModulePublisher((IWebModule) module, server.getRuntime().getLocation());
+		
+		return new TomcatWebModulePublisher((IWebModule) module, server.getRuntime().getLocation());
 	}
 
 	/**
@@ -502,8 +503,8 @@ public class TomcatServer implements ITomcatServer, IStartableServer, IMonitorab
 			ArrayList l = new ArrayList();
 			l.add(webModule);
 			return l;
-		} else
-			return null;
+		}
+		return null;
 	}
 	
 	/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java
index 742a08671..5e0f98b35 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatServerUtil.java
@@ -72,8 +72,8 @@ public class TomcatServerUtil {
 			case IClasspathEntry.CPE_LIBRARY:
 				if (!path.isAbsolute())
 					return null;
-				else
-					return JavaCore.newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath);
+				
+				return JavaCore.newLibraryEntry(path, sourceAttachmentPath, sourceAttachmentRootPath);
 	
 			case IClasspathEntry.CPE_VARIABLE:
 				return JavaCore.newVariableEntry(path, sourceAttachmentPath, sourceAttachmentRootPath);
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java
index 88c4f10c9..705f24f4d 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/TomcatWebModulePublisher.java
@@ -151,8 +151,8 @@ public class TomcatWebModulePublisher implements IPublisher {
 		File rootFile = getRemoteRoot().append(module.getContextRoot()).toFile();
 		if (rootFile.exists()) {
 			return getRemoteResources(null, rootFile);
-		} else
-			return new IRemoteResource[0];
+		}
+		return new IRemoteResource[0];
 	}
 
 	/**
diff --git a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
index 400a5267c..2e9ee796e 100644
--- a/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
+++ b/plugins/org.eclipse.jst.server.tomcat.core/tomcatcore/org/eclipse/jst/server/tomcat/core/internal/xml/XMLElement.java
@@ -69,8 +69,8 @@ public class XMLElement implements Serializable {
 		Attr attr = xmlElement.getAttributeNode(s);
 		if (attr != null)
 			return attr.getValue();
-		else
-			return null;
+		
+		return null;
 	}
 	
 	public String getElementName() {