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

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


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

diff --git a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
index 3f1f10087..4b51d50aa 100644
--- a/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
+++ b/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
@@ -31,7 +31,6 @@ import org.apache.catalina.Session;
 import org.apache.catalina.authenticator.SingleSignOn;
 import org.apache.catalina.ha.CatalinaCluster;
 import org.apache.catalina.ha.ClusterManager;
-import org.apache.catalina.util.LifecycleBase;
 import org.apache.tomcat.util.ExceptionUtils;
 
 
@@ -108,7 +107,7 @@ public class ClusterSingleSignOn
 
     /**
      * Start this component and implement the requirements
-     * of {@link LifecycleBase#startInternal()}.
+     * of {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
      *
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
@@ -161,7 +160,7 @@ public class ClusterSingleSignOn
 
     /**
      * Stop this component and implement the requirements
-     * of {@link LifecycleBase#stopInternal()}.
+     * of {@link org.apache.catalina.util.LifecycleBase#stopInternal()}.
      *
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
diff --git a/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java b/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
index 43847f2d5..2abfeb2fa 100644
--- a/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
+++ b/java/org/apache/catalina/ha/authenticator/SingleSignOnMessage.java
@@ -17,8 +17,6 @@
 
 package org.apache.catalina.ha.authenticator;
 
-import java.io.Serializable;
-
 import org.apache.catalina.ha.ClusterMessage;
 import org.apache.catalina.tribes.Member;
 
@@ -27,7 +25,9 @@ import org.apache.catalina.tribes.Member;
  * @author Fabien Carrion
  */
 
-public class SingleSignOnMessage implements ClusterMessage, Serializable {
+public class SingleSignOnMessage implements ClusterMessage {
+
+    private static final long serialVersionUID = 1L;
 
     public static final int ADD_SESSION = 1;
     public static final int DEREGISTER_SESSION = 2;
@@ -61,6 +61,7 @@ public class SingleSignOnMessage implements ClusterMessage, Serializable {
      * if the message was being relayed from a host other than the one
      * that originally sent it.
      */
+    @Override
     public Member getAddress() {
         return address;
     }
@@ -71,6 +72,7 @@ public class SingleSignOnMessage implements ClusterMessage, Serializable {
      *
      * @param member Member
      */
+    @Override
     public void setAddress(Member member) {
         this.address = member;
     }
@@ -80,6 +82,7 @@ public class SingleSignOnMessage implements ClusterMessage, Serializable {
      *
      * @return long
      */
+    @Override
     public long getTimestamp() {
         return timestamp;
     }
@@ -90,6 +93,7 @@ public class SingleSignOnMessage implements ClusterMessage, Serializable {
      *
      * @param timestamp The timestamp
      */
+    @Override
     public void setTimestamp(long timestamp) {
         this.timestamp = timestamp;
     }
@@ -100,6 +104,7 @@ public class SingleSignOnMessage implements ClusterMessage, Serializable {
      *
      * @return String
      */
+    @Override
     public String getUniqueId() {
         if (this.uniqueId != null)
             return this.uniqueId;
@@ -109,6 +114,7 @@ public class SingleSignOnMessage implements ClusterMessage, Serializable {
         return result.toString();
     }
 
+    @Override
     public void setUniqueId(String uniqueId) {
         this.uniqueId = uniqueId;
     }