Author: markt Date: Sun Oct 24 12:18:47 2010 New Revision: 1026772 URL: http://svn.apache.org/viewvc?rev=1026772&view=rev Log: Allow Checkstyle's unused imports test to be used with the o.a.catalina package Fix Eclipse warnings
Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java tomcat/trunk/java/org/apache/catalina/Executor.java tomcat/trunk/java/org/apache/catalina/InstanceEvent.java tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java tomcat/trunk/java/org/apache/catalina/LifecycleException.java tomcat/trunk/java/org/apache/catalina/SessionEvent.java Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Sun Oct 24 12:18:47 2010 @@ -29,9 +29,9 @@ import java.util.EventObject; * @version $Id$ */ -public final class ContainerEvent - extends EventObject { +public final class ContainerEvent extends EventObject { + private static final long serialVersionUID = 1L; /** * The Container on which this event occurred. Modified: tomcat/trunk/java/org/apache/catalina/Executor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Executor.java?rev=1026772&r1=1026771&r2=1026772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/Executor.java (original) +++ tomcat/trunk/java/org/apache/catalina/Executor.java Sun Oct 24 12:18:47 2010 @@ -16,11 +16,9 @@ */ package org.apache.catalina; -import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; - public interface Executor extends java.util.concurrent.Executor, Lifecycle { public String getName(); @@ -33,8 +31,8 @@ public interface Executor extends java.u * time until it throws a RejectedExecutionException * * @param command the runnable task - * @throws RejectedExecutionException if this task cannot be - * accepted for execution - the queue is full + * @throws org.apache.catalina.util.RejectedExecutionException if this task + * cannot be accepted for execution - the queue is full * @throws NullPointerException if command or unit is null */ void execute(Runnable command, long timeout, TimeUnit unit); Modified: tomcat/trunk/java/org/apache/catalina/InstanceEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/InstanceEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/InstanceEvent.java Sun Oct 24 12:18:47 2010 @@ -36,11 +36,9 @@ import javax.servlet.ServletResponse; * @version $Id$ */ -public final class InstanceEvent - extends EventObject { +public final class InstanceEvent extends EventObject { - - // ----------------------------------------------------- Manifest Constants + private static final long serialVersionUID = 1L; /** Modified: tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/LifecycleEvent.java Sun Oct 24 12:18:47 2010 @@ -32,8 +32,9 @@ import java.util.EventObject; * @version $Id$ */ -public final class LifecycleEvent - extends EventObject { +public final class LifecycleEvent extends EventObject { + + private static final long serialVersionUID = 1L; // ----------------------------------------------------------- Constructors Modified: tomcat/trunk/java/org/apache/catalina/LifecycleException.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/LifecycleException.java?rev=1026772&r1=1026771&r2=1026772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/LifecycleException.java (original) +++ tomcat/trunk/java/org/apache/catalina/LifecycleException.java Sun Oct 24 12:18:47 2010 @@ -30,6 +30,7 @@ package org.apache.catalina; public final class LifecycleException extends Exception { + private static final long serialVersionUID = 1L; //------------------------------------------------------------ Constructors Modified: tomcat/trunk/java/org/apache/catalina/SessionEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionEvent.java?rev=1026772&r1=1026771&r2=1026772&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/SessionEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/SessionEvent.java Sun Oct 24 12:18:47 2010 @@ -29,8 +29,9 @@ import java.util.EventObject; * @version $Id$ */ -public final class SessionEvent - extends EventObject { +public final class SessionEvent extends EventObject { + + private static final long serialVersionUID = 1L; /** --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org