[seam-commits] Seam SVN: r13911 - in branches/community/Seam_2_2/src: wicket/org/jboss/seam/wicket/ioc and 1 other directory.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2010-11-16 05:36:44 -0500 (Tue, 16 Nov 2010)
New Revision: 13911

Modified:
   branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java
   branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java
   branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java
   branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/WicketInstrumentationTask.java
Log:
sorted out some compiler warnings

Modified: branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java
===================================================================
--- branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java	2010-11-16 10:31:03 UTC (rev 13910)
+++ branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyBootstrap.java	2010-11-16 10:36:44 UTC (rev 13911)
@@ -21,6 +21,16 @@
  */
 package org.jboss.seam.resteasy;
 
+import static org.jboss.seam.annotations.Install.BUILT_IN;
+
+import java.lang.annotation.Annotation;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ws.rs.ext.Providers;
+
 import org.jboss.resteasy.core.Dispatcher;
 import org.jboss.resteasy.core.SynchronousDispatcher;
 import org.jboss.resteasy.core.ThreadLocalResteasyProviderFactory;
@@ -28,7 +38,6 @@
 import org.jboss.resteasy.plugins.server.resourcefactory.POJOResourceFactory;
 import org.jboss.resteasy.spi.Registry;
 import org.jboss.resteasy.spi.ResourceFactory;
-import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.jboss.resteasy.spi.StringConverter;
 import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
@@ -50,16 +59,7 @@
 import org.jboss.seam.log.Log;
 import org.jboss.seam.util.EJB;
 import org.jboss.seam.util.Reflections;
-import static org.jboss.seam.annotations.Install.BUILT_IN;
 
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.ext.Providers;
-
 /**
  * Detects (through scanning and configuration) JAX-RS resources and providers, then
  * registers them with RESTEasy.

Modified: branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java
===================================================================
--- branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java	2010-11-16 10:31:03 UTC (rev 13910)
+++ branches/community/Seam_2_2/src/resteasy/org/jboss/seam/resteasy/ResteasyResourceAdapter.java	2010-11-16 10:36:44 UTC (rev 13911)
@@ -21,44 +21,38 @@
  */
 package org.jboss.seam.resteasy;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.SecurityContext;
+
+import org.jboss.resteasy.core.Dispatcher;
+import org.jboss.resteasy.core.SynchronousDispatcher;
+import org.jboss.resteasy.core.ThreadLocalResteasyProviderFactory;
+import org.jboss.resteasy.plugins.server.servlet.HttpServletInputMessage;
+import org.jboss.resteasy.plugins.server.servlet.HttpServletResponseWrapper;
+import org.jboss.resteasy.plugins.server.servlet.ServletSecurityContext;
+import org.jboss.resteasy.plugins.server.servlet.ServletUtil;
+import org.jboss.resteasy.specimpl.UriInfoImpl;
+import org.jboss.resteasy.spi.HttpRequest;
+import org.jboss.resteasy.spi.HttpResponse;
 import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Create;
 import org.jboss.seam.annotations.intercept.BypassInterceptors;
 import org.jboss.seam.log.Log;
 import org.jboss.seam.servlet.ContextualHttpServletRequest;
 import org.jboss.seam.web.AbstractResource;
 import org.jboss.seam.web.Session;
-import org.jboss.resteasy.core.SynchronousDispatcher;
-import org.jboss.resteasy.core.ThreadLocalResteasyProviderFactory;
-import org.jboss.resteasy.core.Dispatcher;
-import org.jboss.resteasy.plugins.server.servlet.HttpServletInputMessage;
-import org.jboss.resteasy.plugins.server.servlet.HttpServletResponseWrapper;
-import org.jboss.resteasy.plugins.server.servlet.ServletSecurityContext;
-import org.jboss.resteasy.plugins.server.servlet.ServletUtil;
-import org.jboss.resteasy.specimpl.PathSegmentImpl;
-import org.jboss.resteasy.specimpl.UriBuilderImpl;
-import org.jboss.resteasy.specimpl.UriInfoImpl;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.jboss.resteasy.spi.HttpResponse;
-import org.jboss.resteasy.util.PathHelper;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.PathSegment;
-import javax.ws.rs.core.SecurityContext;
-import javax.ws.rs.core.UriBuilder;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
 /**
  * Accepts incoming HTTP requests through the <tt>SeamResourceServlet</tt> and
  * dispatches the call to RESTEasy. Wraps the call in Seam contexts.

Modified: branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java
===================================================================
--- branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java	2010-11-16 10:31:03 UTC (rev 13910)
+++ branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java	2010-11-16 10:36:44 UTC (rev 13911)
@@ -403,7 +403,7 @@
     * interface
     * </ul>
     * @param clazz The class to check
-    * @return
+    * @return boolean value if the class can be instrumented or not
     */
    public boolean isInstrumentable(CtClass clazz)
    {

Modified: branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/WicketInstrumentationTask.java
===================================================================
--- branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/WicketInstrumentationTask.java	2010-11-16 10:31:03 UTC (rev 13910)
+++ branches/community/Seam_2_2/src/wicket/org/jboss/seam/wicket/ioc/WicketInstrumentationTask.java	2010-11-16 10:36:44 UTC (rev 13911)
@@ -1,13 +1,10 @@
 package org.jboss.seam.wicket.ioc;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import javassist.ClassPool;
-import javassist.CtClass;
 import javassist.LoaderClassPath;
 
 import org.apache.tools.ant.Task;
@@ -73,7 +70,7 @@
          ClassPool classPool = new ClassPool();
          classPool.insertClassPath(new LoaderClassPath(getProject().createClassLoader(buildPath)));
          
-         List<CtClass> instrumentedClasses = new ArrayList<CtClass>();
+         //List<CtClass> instrumentedClasses = new ArrayList<CtClass>();
 
          JavassistInstrumentor instrumentor = new JavassistInstrumentor(classPool,useAnnotations);