From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 24 Oct 2010 12:18:47 +0000 (+0000)
Subject: Allow Checkstyle's unused imports test to be used with the o.a.catalina package
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=431e9bb10b8af080008aa8edd85b48e9c2ceadf3;p=tomcat7.0

Allow Checkstyle's unused imports test to be used with the o.a.catalina package
Fix Eclipse warnings


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1026772 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/ContainerEvent.java b/java/org/apache/catalina/ContainerEvent.java
index f859732e8..f1f64bbaf 100644
--- a/java/org/apache/catalina/ContainerEvent.java
+++ b/java/org/apache/catalina/ContainerEvent.java
@@ -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.
diff --git a/java/org/apache/catalina/Executor.java b/java/org/apache/catalina/Executor.java
index 0bf065be0..6ce8755cc 100644
--- a/java/org/apache/catalina/Executor.java
+++ b/java/org/apache/catalina/Executor.java
@@ -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.util.concurrent.Executor, Lifecycle {
      * 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);
diff --git a/java/org/apache/catalina/InstanceEvent.java b/java/org/apache/catalina/InstanceEvent.java
index ecd650265..2c2fb5b1f 100644
--- a/java/org/apache/catalina/InstanceEvent.java
+++ b/java/org/apache/catalina/InstanceEvent.java
@@ -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;
 
 
     /**
diff --git a/java/org/apache/catalina/LifecycleEvent.java b/java/org/apache/catalina/LifecycleEvent.java
index 55e6e4b92..d94653741 100644
--- a/java/org/apache/catalina/LifecycleEvent.java
+++ b/java/org/apache/catalina/LifecycleEvent.java
@@ -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
diff --git a/java/org/apache/catalina/LifecycleException.java b/java/org/apache/catalina/LifecycleException.java
index 1bbb8aed3..ee94ef171 100644
--- a/java/org/apache/catalina/LifecycleException.java
+++ b/java/org/apache/catalina/LifecycleException.java
@@ -30,6 +30,7 @@ package org.apache.catalina;
 
 public final class LifecycleException extends Exception {
 
+    private static final long serialVersionUID = 1L;
 
     //------------------------------------------------------------ Constructors
 
diff --git a/java/org/apache/catalina/SessionEvent.java b/java/org/apache/catalina/SessionEvent.java
index 3c0efc5b3..3d718ff0c 100644
--- a/java/org/apache/catalina/SessionEvent.java
+++ b/java/org/apache/catalina/SessionEvent.java
@@ -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;
 
 
     /**