Author: markt Date: Fri Dec 18 17:23:00 2009 New Revision: 892320 URL: http://svn.apache.org/viewvc?rev=892320&view=rev Log: Fix the redundant superinterface warnings. Just cleanup, No functional change.
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java tomcat/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java tomcat/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FileMessage.java Fri Dec 18 17:23:00 2009 @@ -17,9 +17,6 @@ package org.apache.catalina.ha.deploy; -import java.io.Serializable; - -import org.apache.catalina.ha.ClusterMessage; import org.apache.catalina.tribes.Member; import org.apache.catalina.ha.ClusterMessageBase; @@ -30,7 +27,7 @@ * @version 1.0 */ -public class FileMessage extends ClusterMessageBase implements ClusterMessage, Serializable { +public class FileMessage extends ClusterMessageBase { private int messageNumber; private byte[] data; private int dataLength; Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionIDMessage.java Fri Dec 18 17:23:00 2009 @@ -16,7 +16,6 @@ */ package org.apache.catalina.ha.session; -import org.apache.catalina.ha.ClusterMessage; import org.apache.catalina.ha.ClusterMessageBase; /** @@ -26,7 +25,7 @@ * * @version $Revision$ $Date$ */ -public class SessionIDMessage extends ClusterMessageBase implements ClusterMessage { +public class SessionIDMessage extends ClusterMessageBase { private int messageNumber; Modified: tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/SessionMessageImpl.java Fri Dec 18 17:23:00 2009 @@ -27,7 +27,7 @@ * * @version $Revision$ $Date$ */ -public class SessionMessageImpl extends ClusterMessageBase implements SessionMessage, java.io.Serializable { +public class SessionMessageImpl extends ClusterMessageBase implements SessionMessage { public SessionMessageImpl() { } Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Fri Dec 18 17:23:00 2009 @@ -20,10 +20,7 @@ import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.ChannelException; -import org.apache.catalina.tribes.ChannelListener; import org.apache.catalina.tribes.Member; -import org.apache.catalina.tribes.MembershipListener; -import org.apache.catalina.tribes.group.RpcCallback; import org.apache.catalina.tribes.util.Arrays; import org.apache.catalina.tribes.UniqueId; @@ -67,8 +64,7 @@ * @author Filip Hanik * @version 1.0 */ -public class LazyReplicatedMap extends AbstractReplicatedMap - implements RpcCallback, ChannelListener, MembershipListener { +public class LazyReplicatedMap extends AbstractReplicatedMap { private static final Log log = LogFactory.getLog(LazyReplicatedMap.class); Modified: tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Fri Dec 18 17:23:00 2009 @@ -20,12 +20,7 @@ import org.apache.catalina.tribes.Channel; import org.apache.catalina.tribes.ChannelException; -import org.apache.catalina.tribes.ChannelListener; import org.apache.catalina.tribes.Member; -import org.apache.catalina.tribes.MembershipListener; -import org.apache.catalina.tribes.group.RpcCallback; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; /** * All-to-all replication for a hash map implementation. Each node in the cluster will carry an identical @@ -51,9 +46,7 @@ * @todo memberDisappeared, should do nothing except change map membership * by default it relocates the primary objects */ -public class ReplicatedMap extends AbstractReplicatedMap implements RpcCallback, ChannelListener, MembershipListener { - - private static final Log log = LogFactory.getLog(ReplicatedMap.class); +public class ReplicatedMap extends AbstractReplicatedMap { //------------------------------------------------------------------------------ // CONSTRUCTORS / DESTRUCTORS Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioReceiver.java Fri Dec 18 17:23:00 2009 @@ -20,8 +20,6 @@ import java.net.ServerSocket; import java.net.Socket; -import org.apache.catalina.tribes.ChannelReceiver; -import org.apache.catalina.tribes.io.ListenCallback; import org.apache.catalina.tribes.io.ObjectReader; import org.apache.catalina.tribes.transport.ReceiverBase; import org.apache.catalina.tribes.transport.RxTaskPool; @@ -35,7 +33,7 @@ * @author Filip Hanik * @version $Revision$ $Date$ */ -public class BioReceiver extends ReceiverBase implements Runnable, ChannelReceiver, ListenCallback { +public class BioReceiver extends ReceiverBase implements Runnable { private static final Log log = LogFactory.getLog(BioReceiver.class); Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java Fri Dec 18 17:23:00 2009 @@ -41,7 +41,7 @@ * @version $Revision$ $Date$ * @since 5.5.16 */ -public class BioSender extends AbstractSender implements DataSender { +public class BioSender extends AbstractSender { private static final org.apache.juli.logging.Log log = org.apache.juli.logging.LogFactory.getLog(BioSender.class); Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java Fri Dec 18 17:23:00 2009 @@ -27,8 +27,6 @@ import java.nio.channels.SocketChannel; import java.util.Iterator; -import org.apache.catalina.tribes.ChannelReceiver; -import org.apache.catalina.tribes.io.ListenCallback; import org.apache.catalina.tribes.io.ObjectReader; import org.apache.catalina.tribes.transport.Constants; import org.apache.catalina.tribes.transport.ReceiverBase; @@ -47,7 +45,7 @@ * @author Filip Hanik * @version $Revision$ $Date$ */ -public class NioReceiver extends ReceiverBase implements Runnable, ChannelReceiver, ListenCallback { +public class NioReceiver extends ReceiverBase implements Runnable { private static final Log log = LogFactory.getLog(NioReceiver.class); Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java Fri Dec 18 17:23:00 2009 @@ -28,7 +28,6 @@ import org.apache.catalina.tribes.io.XByteBuffer; import org.apache.catalina.tribes.transport.AbstractSender; -import org.apache.catalina.tribes.transport.DataSender; import org.apache.catalina.tribes.RemoteProcessException; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -50,7 +49,7 @@ * @author Filip Hanik * @version 1.0 */ -public class NioSender extends AbstractSender implements DataSender{ +public class NioSender extends AbstractSender { private static final Log log = LogFactory.getLog(NioSender.class); Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java Fri Dec 18 17:23:00 2009 @@ -23,7 +23,6 @@ import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.transport.AbstractSender; import org.apache.catalina.tribes.transport.DataSender; -import org.apache.catalina.tribes.transport.MultiPointSender; import org.apache.catalina.tribes.transport.PooledSender; /** @@ -36,7 +35,7 @@ * @author not attributable * @version 1.0 */ -public class PooledParallelSender extends PooledSender implements MultiPointSender { +public class PooledParallelSender extends PooledSender { protected boolean connected = true; public PooledParallelSender() { super(); Modified: tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java Fri Dec 18 17:23:00 2009 @@ -33,7 +33,6 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpSession; -import org.apache.catalina.Lifecycle; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.ServerInfo; @@ -129,9 +128,7 @@ * @version $Revision$ $Date$ */ -public class ExtendedAccessLogValve - extends AccessLogValve - implements Lifecycle { +public class ExtendedAccessLogValve extends AccessLogValve { private static final Log log = LogFactory.getLog(ExtendedAccessLogValve.class); Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java Fri Dec 18 17:23:00 2009 @@ -15,12 +15,8 @@ * limitations under the License. */ - package org.apache.tomcat.util.modeler; - -import java.io.Serializable; - import javax.management.MBeanAttributeInfo; @@ -30,7 +26,7 @@ * * @author Craig R. McClanahan */ -public class AttributeInfo extends FeatureInfo implements Serializable { +public class AttributeInfo extends FeatureInfo { static final long serialVersionUID = -2511626862303972143L; // ----------------------------------------------------- Instance Variables Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ConstructorInfo.java Fri Dec 18 17:23:00 2009 @@ -15,12 +15,9 @@ * limitations under the License. */ - package org.apache.tomcat.util.modeler; -import java.io.Serializable; - import javax.management.MBeanConstructorInfo; @@ -30,7 +27,7 @@ * * @author Craig R. McClanahan */ -public class ConstructorInfo extends OperationInfo implements Serializable { +public class ConstructorInfo extends OperationInfo { static final long serialVersionUID = -5735336213417238238L; // ------------------------------------------------------------- Properties Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java Fri Dec 18 17:23:00 2009 @@ -19,8 +19,6 @@ package org.apache.tomcat.util.modeler; -import java.io.Serializable; - import javax.management.MBeanNotificationInfo; @@ -32,7 +30,7 @@ * @version $Revision$ $Date$ */ -public class NotificationInfo extends FeatureInfo implements Serializable { +public class NotificationInfo extends FeatureInfo { static final long serialVersionUID = -6319885418912650856L; // ----------------------------------------------------- Instance Variables Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/OperationInfo.java Fri Dec 18 17:23:00 2009 @@ -19,8 +19,6 @@ package org.apache.tomcat.util.modeler; -import java.io.Serializable; - import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; @@ -31,7 +29,7 @@ * * @author Craig R. McClanahan */ -public class OperationInfo extends FeatureInfo implements Serializable { +public class OperationInfo extends FeatureInfo { static final long serialVersionUID = 4418342922072614875L; // ----------------------------------------------------------- Constructors Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java?rev=892320&r1=892319&r2=892320&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ParameterInfo.java Fri Dec 18 17:23:00 2009 @@ -19,8 +19,6 @@ package org.apache.tomcat.util.modeler; -import java.io.Serializable; - import javax.management.MBeanParameterInfo; @@ -32,7 +30,7 @@ * @version $Revision$ $Date$ */ -public class ParameterInfo extends FeatureInfo implements Serializable { +public class ParameterInfo extends FeatureInfo { static final long serialVersionUID = 2222796006787664020L; // ----------------------------------------------------------- Constructors --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org