svn commit: r832671 - /ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java

Author: jleroux
Date: Wed Nov  4 07:04:17 2009
New Revision: 832671

URL: http://svn.apache.org/viewvc?rev=832671&view=rev
Log:
A patch from Bob Morley "Resolve java warnings exposed in Eclipse : framework - jetty" (https://issues.apache.org/jira/browse/OFBIZ-3114) - OFBIZ-3114


Modified:
    ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java

Modified: ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java?rev=832671&r1=832670&r2=832671&view=diff
==============================================================================
--- ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java (original)
+++ ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java Wed Nov  4 07:04:17 2009
@@ -22,14 +22,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.io.File;
-
-import org.ofbiz.base.component.ComponentConfig;
-import org.ofbiz.base.container.Container;
-import org.ofbiz.base.container.ContainerConfig;
-import org.ofbiz.base.container.ContainerException;
-import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.SSLUtil;
 
 import org.mortbay.jetty.AbstractConnector;
 import org.mortbay.jetty.NCSARequestLog;
@@ -44,6 +36,12 @@
 import org.mortbay.jetty.servlet.SessionHandler;
 import org.mortbay.jetty.webapp.WebAppContext;
 import org.mortbay.thread.BoundedThreadPool;
+import org.ofbiz.base.component.ComponentConfig;
+import org.ofbiz.base.container.Container;
+import org.ofbiz.base.container.ContainerConfig;
+import org.ofbiz.base.container.ContainerException;
+import org.ofbiz.base.util.Debug;
+import org.ofbiz.base.util.SSLUtil;
 
 
 /**
@@ -78,7 +76,7 @@
         }
 
         // load the applications
-        Collection componentConfigs = ComponentConfig.getAllComponents();
+        Collection<ComponentConfig> componentConfigs = ComponentConfig.getAllComponents();
         if (componentConfigs != null) {
 
             for (Object componentConfig : componentConfigs) {
@@ -87,8 +85,8 @@
 
                 for (ComponentConfig.WebappInfo webappInfo : component.getWebappInfos()) {
 
-                    List virtualHosts = webappInfo.getVirtualHosts();
-                    Map initParameters = webappInfo.getInitParameters();
+                    List<String> virtualHosts = webappInfo.getVirtualHosts();
+                    Map<String, String> initParameters = webappInfo.getInitParameters();
 
                     Server server = servers.get(webappInfo.server);