Author: manaRH Date: 2010-11-16 05:29:14 -0500 (Tue, 16 Nov 2010) New Revision: 13909 Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/Model.java branches/community/Seam_2_2/src/main/org/jboss/seam/drools/RuleBase.java branches/community/Seam_2_2/src/main/org/jboss/seam/framework/HibernateEntityController.java branches/community/Seam_2_2/src/main/org/jboss/seam/init/Initialization.java branches/community/Seam_2_2/src/main/org/jboss/seam/init/NamespacePackageResolver.java branches/community/Seam_2_2/src/main/org/jboss/seam/international/Messages.java branches/community/Seam_2_2/src/main/org/jboss/seam/international/StatusMessages.java branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JMXInvocationHandler.java branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/MBeanProxy.java branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/SeamPhaseListener.java branches/community/Seam_2_2/src/main/org/jboss/seam/log/LogImpl.java branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java branches/community/Seam_2_2/src/main/org/jboss/seam/navigation/Pages.java branches/community/Seam_2_2/src/main/org/jboss/seam/security/SecurityInterceptor.java branches/community/Seam_2_2/src/main/org/jboss/seam/security/digest/DigestRequest.java branches/community/Seam_2_2/src/main/org/jboss/seam/util/ProxyFactory.java branches/community/Seam_2_2/src/main/org/jboss/seam/web/AbstractResource.java branches/community/Seam_2_2/src/main/org/jboss/seam/web/AuthenticationFilter.java branches/community/Seam_2_2/src/main/org/jboss/seam/web/WicketFilter.java Log: sorted out some compiler warnings Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/Model.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/Model.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/Model.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -26,6 +26,7 @@ return beanClass; } + @SuppressWarnings("deprecation") public static Model forClass(Class clazz) { if ( !Contexts.isApplicationContextActive() ) Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/drools/RuleBase.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/drools/RuleBase.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/drools/RuleBase.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -1,6 +1,5 @@ package org.jboss.seam.drools; -import java.io.ByteArrayInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; @@ -17,8 +16,8 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Unwrap; import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.core.ResourceLoader; import org.jboss.seam.core.Expressions.ValueExpression; +import org.jboss.seam.core.ResourceLoader; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/framework/HibernateEntityController.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/framework/HibernateEntityController.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/framework/HibernateEntityController.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -68,6 +68,7 @@ getSession().flush(); } + @SuppressWarnings("deprecation") protected <T> T get(Class<T> clazz, Serializable id, LockMode lockMode) throws HibernateException { return (T) getSession().get(clazz, id, lockMode); @@ -83,6 +84,7 @@ return getSession().getNamedQuery(name); } + @SuppressWarnings("deprecation") protected <T> T load(Class<T> clazz, Serializable id, LockMode lockMode) throws HibernateException { return (T) getSession().load(clazz, id, lockMode); @@ -93,6 +95,7 @@ return (T) getSession().load(clazz, id); } + @SuppressWarnings("deprecation") protected void lock(Object entity, LockMode lockMode) throws HibernateException { getSession().lock(entity, lockMode); @@ -108,6 +111,7 @@ getSession().persist(entity); } + @SuppressWarnings("deprecation") protected void refresh(Object entity, LockMode lockMode) throws HibernateException { getSession().refresh(entity, lockMode); Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/init/Initialization.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/init/Initialization.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/init/Initialization.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -23,8 +23,6 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeSet; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.ReentrantLock; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -61,7 +59,6 @@ import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.navigation.Pages; -import org.jboss.seam.servlet.ServletApplicationMap; import org.jboss.seam.util.Conversions; import org.jboss.seam.util.Naming; import org.jboss.seam.util.Reflections; Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/init/NamespacePackageResolver.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/init/NamespacePackageResolver.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -18,7 +18,8 @@ public class NamespacePackageResolver { private static final String JAVA_SCHEME = "java"; - private static final LogProvider log = + @SuppressWarnings("unused") + private static final LogProvider log = Logging.getLogProvider(NamespacePackageResolver.class); Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/international/Messages.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/international/Messages.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/international/Messages.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -18,7 +18,6 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.Interpolator; import org.jboss.seam.core.SeamResourceBundle; /** Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/international/StatusMessages.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/international/StatusMessages.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/international/StatusMessages.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -11,8 +11,6 @@ import org.hibernate.validator.InvalidValue; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.contexts.Contexts; import org.jboss.seam.international.StatusMessage.Severity; /** Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JBossClusterMonitor.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -3,7 +3,6 @@ import static org.jboss.seam.ScopeType.APPLICATION; import static org.jboss.seam.annotations.Install.BUILT_IN; -import java.util.Iterator; import java.util.Vector; import javax.management.MBeanServer; Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JMXInvocationHandler.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JMXInvocationHandler.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/JMXInvocationHandler.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -330,7 +330,7 @@ // Object overrides ---------------------------------------------- - + @Override public String toString() { return "MBeanProxy for " + objectName + " (Agent ID: " + AgentID.get(server) + ")"; Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/MBeanProxy.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/MBeanProxy.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/jmx/MBeanProxy.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -30,7 +30,7 @@ */ public static Object get(Class intrface, ObjectName name, String agentID) throws MBeanProxyCreationException { - return get(intrface, name, (MBeanServer)MBeanServerFactory.findMBeanServer(agentID).get(0)); + return get(intrface, name, MBeanServerFactory.findMBeanServer(agentID).get(0)); } /** @@ -78,7 +78,7 @@ */ public static Object create(Class instance, Class intrface, ObjectName name, String agentID) throws MBeanProxyCreationException { - return create(instance, intrface, name, (MBeanServer)MBeanServerFactory.findMBeanServer(agentID).get(0)); + return create(instance, intrface, name, MBeanServerFactory.findMBeanServer(agentID).get(0)); } /** Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/SeamPhaseListener.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -37,7 +37,6 @@ import org.jboss.seam.faces.FacesPage; import org.jboss.seam.faces.Switcher; import org.jboss.seam.faces.Validation; -import org.jboss.seam.international.StatusMessage; import org.jboss.seam.log.LogProvider; import org.jboss.seam.log.Logging; import org.jboss.seam.navigation.Pages; Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/log/LogImpl.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/log/LogImpl.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/log/LogImpl.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -136,6 +136,7 @@ } } + @SuppressWarnings("finally") private Object interpolate(Object object, Object... params) { if (object instanceof String) Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/mock/DelegatingServletInputStream.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -55,11 +55,13 @@ } + @Override public int read() throws IOException { return this.sourceStream.read(); } + @Override public void close() throws IOException { super.close(); Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/navigation/Pages.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/navigation/Pages.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/navigation/Pages.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -670,6 +670,7 @@ /** * Call the action requested by s:link or s:button. */ + @SuppressWarnings("deprecation") private static boolean callAction(FacesContext facesContext) { //TODO: refactor with Pages.instance().callAction()!! Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/security/SecurityInterceptor.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/security/SecurityInterceptor.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/security/SecurityInterceptor.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -244,7 +244,6 @@ Object target = valueMethod.invoke(annotation); if (!target.equals(void.class)) { - if (restriction == null) restriction = new Restriction(); restriction.addMethodRestriction(target, getPermissionAction(permissionCheck, annotation)); } Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/security/digest/DigestRequest.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/security/digest/DigestRequest.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/security/digest/DigestRequest.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -171,11 +171,7 @@ } - String nonceAsText = new String(Base64.decode(nonce)); - if (nonceAsText == null) - { - throw new DigestValidationException("Nonce is not Base64 encoded - nonce received: " + nonce); - } + String nonceAsText = new String(Base64.decode(nonce)); String[] nonceTokens = nonceAsText.split(":"); if (nonceTokens.length != 2) Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/util/ProxyFactory.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/util/ProxyFactory.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/util/ProxyFactory.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -199,9 +199,11 @@ proxyClass = null; } - public int hashCode() { return hash; } + @Override + public int hashCode() { return hash; } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (obj instanceof CacheKey) { CacheKey target = (CacheKey)obj; return target.filter == filter && target.handler == handler @@ -561,7 +563,7 @@ cf.addField(finfo3); HashMap allMethods = getMethods(superClass, interfaces); - int size = allMethods.size(); + //int size = allMethods.size(); makeConstructors(classname, cf, pool, classname); int s = overrideMethods(cf, pool, classname, allMethods); addMethodsHolder(cf, pool, classname, s); Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/web/AbstractResource.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/web/AbstractResource.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/web/AbstractResource.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -1,14 +1,15 @@ package org.jboss.seam.web; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.util.zip.GZIPOutputStream; + import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.OutputStream; -import java.io.ByteArrayOutputStream; -import java.util.zip.GZIPOutputStream; /** * Superclass of Seam components that serve up @@ -114,6 +115,7 @@ gzipStream = new GZIPOutputStream(byteStream); } + @Override public void close() throws IOException { if (closed) @@ -132,6 +134,7 @@ closed = true; } + @Override public void flush() throws IOException { if (closed) @@ -141,6 +144,7 @@ gzipStream.flush(); } + @Override public void write(int b) throws IOException { if (closed) @@ -150,11 +154,13 @@ gzipStream.write((byte) b); } + @Override public void write(byte b[]) throws IOException { write(b, 0, b.length); } + @Override public void write(byte b[], int off, int len) throws IOException { if (closed) @@ -164,11 +170,13 @@ gzipStream.write(b, off, len); } + @SuppressWarnings("unused") public boolean closed() { return (this.closed); } + @SuppressWarnings("unused") public void reset() { // noop Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/web/AuthenticationFilter.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/web/AuthenticationFilter.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/web/AuthenticationFilter.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -21,8 +21,6 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.annotations.web.Filter; -import org.jboss.seam.contexts.Context; -import org.jboss.seam.contexts.SessionContext; import org.jboss.seam.log.Log; import org.jboss.seam.security.Credentials; import org.jboss.seam.security.Identity; @@ -31,7 +29,6 @@ import org.jboss.seam.security.digest.DigestUtils; import org.jboss.seam.security.digest.DigestValidationException; import org.jboss.seam.servlet.ContextualHttpServletRequest; -import org.jboss.seam.servlet.ServletRequestSessionMap; import org.jboss.seam.util.Base64; /** Modified: branches/community/Seam_2_2/src/main/org/jboss/seam/web/WicketFilter.java =================================================================== --- branches/community/Seam_2_2/src/main/org/jboss/seam/web/WicketFilter.java 2010-11-16 10:26:15 UTC (rev 13908) +++ branches/community/Seam_2_2/src/main/org/jboss/seam/web/WicketFilter.java 2010-11-16 10:29:14 UTC (rev 13909) @@ -23,7 +23,6 @@ import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.contexts.ServletLifecycle; import org.jboss.seam.core.Init; import org.jboss.seam.deployment.HotDeploymentStrategy;