markt 2005/02/14 13:21:41 Modified: catalina/src/share/org/apache/catalina/session DistributedManager.java FileStore.java ManagerBase.java PersistentManager.java PersistentManagerBase.java StandardManager.java StandardSession.java StandardSessionFacade.java Log: Clean up Eclipse warnings for o.a.c.session - remove unused imports - static access warnings Revision Changes Path 1.7 +3 -8 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java Index: DistributedManager.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/DistributedManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DistributedManager.java 26 Aug 2004 21:39:08 -0000 1.6 +++ DistributedManager.java 14 Feb 2005 21:21:41 -0000 1.7 @@ -16,17 +16,12 @@ package org.apache.catalina.session; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; import org.apache.catalina.Cluster; import org.apache.catalina.Container; import org.apache.catalina.LifecycleException; @@ -82,14 +77,14 @@ * <code><description>/<version></code>. */ public String getInfo() { - return (this.info); + return (info); } /** * Return the descriptive short name of this Manager implementation. */ public String getName() { - return (this.name); + return (name); } 1.13 +1 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java Index: FileStore.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/FileStore.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- FileStore.java 26 Aug 2004 21:39:08 -0000 1.12 +++ FileStore.java 14 Feb 2005 21:21:41 -0000 1.13 @@ -25,11 +25,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; -import java.io.Serializable; import java.util.ArrayList; import javax.servlet.ServletContext; import org.apache.catalina.Context; 1.21 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java Index: ManagerBase.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ManagerBase.java 26 Aug 2004 21:39:08 -0000 1.20 +++ ManagerBase.java 14 Feb 2005 21:21:41 -0000 1.21 @@ -374,7 +374,7 @@ */ public String getInfo() { - return (this.info); + return (info); } 1.12 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java Index: PersistentManager.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManager.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- PersistentManager.java 26 Aug 2004 21:39:08 -0000 1.11 +++ PersistentManager.java 14 Feb 2005 21:21:41 -0000 1.12 @@ -60,7 +60,7 @@ */ public String getInfo() { - return (this.info); + return (info); } 1.20 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java Index: PersistentManagerBase.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/PersistentManagerBase.java,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- PersistentManagerBase.java 26 Aug 2004 21:39:08 -0000 1.19 +++ PersistentManagerBase.java 14 Feb 2005 21:21:41 -0000 1.20 @@ -321,7 +321,7 @@ */ public String getInfo() { - return (this.info); + return (info); } 1.24 +2 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java Index: StandardManager.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardManager.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- StandardManager.java 26 Aug 2004 21:39:08 -0000 1.23 +++ StandardManager.java 14 Feb 2005 21:21:41 -0000 1.24 @@ -19,18 +19,15 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import java.io.ObjectStreamClass; import java.util.ArrayList; import java.util.Iterator; import javax.servlet.ServletContext; @@ -38,11 +35,9 @@ import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleException; import org.apache.catalina.LifecycleListener; import org.apache.catalina.Loader; -import org.apache.catalina.Manager; import org.apache.catalina.Session; import org.apache.catalina.util.CustomObjectInputStream; import org.apache.catalina.util.LifecycleSupport; @@ -199,7 +194,7 @@ */ public String getInfo() { - return (this.info); + return (info); } 1.42 +2 -2 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java Index: StandardSession.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSession.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- StandardSession.java 26 Aug 2004 21:39:08 -0000 1.41 +++ StandardSession.java 14 Feb 2005 21:21:41 -0000 1.42 @@ -378,7 +378,7 @@ */ public String getInfo() { - return (this.info); + return (info); } 1.3 +1 -17 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSessionFacade.java Index: StandardSessionFacade.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/session/StandardSessionFacade.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- StandardSessionFacade.java 26 Aug 2004 21:39:08 -0000 1.2 +++ StandardSessionFacade.java 14 Feb 2005 21:21:41 -0000 1.3 @@ -18,26 +18,10 @@ package org.apache.catalina.session; -import java.io.IOException; -import java.io.NotSerializableException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.security.Principal; -import java.util.ArrayList; import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; import javax.servlet.ServletContext; -import javax.servlet.ServletException; import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionActivationListener; -import javax.servlet.http.HttpSessionAttributeListener; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; import javax.servlet.http.HttpSessionContext; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; /**
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]