Author: markt
Date: Sat Apr 23 21:53:00 2011
New Revision: 1096243

URL: http://svn.apache.org/viewvc?rev=1096243&view=rev
Log:
Misc code clean-up
 - Eclipse warnings
 - Remove unused code

Modified:
    tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
    tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
    tomcat/trunk/java/org/apache/catalina/tribes/ChannelListener.java
    
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
    tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
    tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java
    tomcat/trunk/java/org/apache/catalina/util/Base64.java
    tomcat/trunk/java/org/apache/coyote/ActionCode.java
    tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java
    tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
    tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
    
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Sat Apr 23 
21:53:00 2011
@@ -354,8 +354,7 @@ public final class CGIServlet extends Ht
      *
      */
     protected void printServletEnvironment(ServletOutputStream out,
-        HttpServletRequest req,
-        @SuppressWarnings("unused") HttpServletResponse res)
+        HttpServletRequest req, HttpServletResponse res)
     throws IOException {
 
         // Document the properties from ServletRequest

Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelInterceptor.java Sat 
Apr 23 21:53:00 2011
@@ -108,6 +108,7 @@ public interface ChannelInterceptor exte
      * to allow interceptors to clean up resources, time out object and 
      * perform actions that are unrelated to sending/receiving data.
      */
+    @Override
     public void heartbeat();
     
     /**

Modified: tomcat/trunk/java/org/apache/catalina/tribes/ChannelListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/ChannelListener.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/ChannelListener.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/ChannelListener.java Sat Apr 
23 21:53:00 2011
@@ -56,6 +56,7 @@ public interface ChannelListener {
      * @return boolean
      * @see Object#equals(Object)
      */
+    @Override
     public boolean equals(Object listener);
 
     /**
@@ -63,6 +64,7 @@ public interface ChannelListener {
      * @return int
      * @see Object#hashCode()
      */
+    @Override
     public int hashCode();
 
 }

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelInterceptorBase.java 
Sat Apr 23 21:53:00 2011
@@ -20,8 +20,6 @@ import org.apache.catalina.tribes.Channe
 import org.apache.catalina.tribes.ChannelInterceptor;
 import org.apache.catalina.tribes.ChannelMessage;
 import org.apache.catalina.tribes.Member;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
 
 /**
  * Abstract class for the interceptor base class.
@@ -31,8 +29,6 @@ import org.apache.juli.logging.LogFactor
 
 public abstract class ChannelInterceptorBase implements ChannelInterceptor {
 
-    private static final Log log = 
LogFactory.getLog(ChannelInterceptorBase.class);
-
     private ChannelInterceptor next;
     private ChannelInterceptor previous;
     //default value, always process
@@ -47,35 +43,43 @@ public abstract class ChannelInterceptor
         return ((optionFlag&messageFlags) == optionFlag);
     }
 
+    @Override
     public final void setNext(ChannelInterceptor next) {
         this.next = next;
     }
 
+    @Override
     public final ChannelInterceptor getNext() {
         return next;
     }
 
+    @Override
     public final void setPrevious(ChannelInterceptor previous) {
         this.previous = previous;
     }
 
+    @Override
     public void setOptionFlag(int optionFlag) {
         this.optionFlag = optionFlag;
     }
 
+    @Override
     public final ChannelInterceptor getPrevious() {
         return previous;
     }
 
+    @Override
     public int getOptionFlag() {
         return optionFlag;
     }
 
+    @Override
     public void sendMessage(Member[] destination, ChannelMessage msg, 
InterceptorPayload payload) throws
         ChannelException {
         if (getNext() != null) getNext().sendMessage(destination, msg, 
payload);
     }
 
+    @Override
     public void messageReceived(ChannelMessage msg) {
         if (getPrevious() != null) getPrevious().messageReceived(msg);
     }
@@ -84,16 +88,19 @@ public abstract class ChannelInterceptor
         return true;
     }
 
+    @Override
     public void memberAdded(Member member) {
         //notify upwards
         if (getPrevious() != null) getPrevious().memberAdded(member);
     }
 
+    @Override
     public void memberDisappeared(Member member) {
         //notify upwards
         if (getPrevious() != null) getPrevious().memberDisappeared(member);
     }
 
+    @Override
     public void heartbeat() {
         if (getNext() != null) getNext().heartbeat();
     }
@@ -101,6 +108,7 @@ public abstract class ChannelInterceptor
     /**
      * has members
      */
+    @Override
     public boolean hasMembers() {
         if ( getNext()!=null )return getNext().hasMembers();
         else return false;
@@ -110,6 +118,7 @@ public abstract class ChannelInterceptor
      * Get all current cluster members
      * @return all members or empty array
      */
+    @Override
     public Member[] getMembers() {
         if ( getNext()!=null ) return getNext().getMembers();
         else return null;
@@ -120,6 +129,7 @@ public abstract class ChannelInterceptor
      * @param mbr Member
      * @return Member
      */
+    @Override
     public Member getMember(Member mbr) {
         if ( getNext()!=null) return getNext().getMember(mbr);
         else return null;
@@ -130,6 +140,7 @@ public abstract class ChannelInterceptor
      *
      * @return Member
      */
+    @Override
     public Member getLocalMember(boolean incAlive) {
         if ( getNext()!=null ) return getNext().getLocalMember(incAlive);
         else return null;
@@ -146,6 +157,7 @@ public abstract class ChannelInterceptor
      * SND_RX_SEQ - starts the replication receiver<BR>
      * @throws ChannelException if a startup error occurs or the service is 
already started.
      */
+    @Override
     public void start(int svc) throws ChannelException {
         if ( getNext()!=null ) getNext().start(svc);
     }
@@ -161,10 +173,12 @@ public abstract class ChannelInterceptor
      * SND_RX_SEQ - stops the replication receiver<BR>
      * @throws ChannelException if a startup error occurs or the service is 
already started.
      */
+    @Override
     public void stop(int svc) throws ChannelException {
         if (getNext() != null) getNext().stop(svc);
     }
     
+    @Override
     public void fireInterceptorEvent(InterceptorEvent event) {
         //empty operation
     }

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool15Impl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool15Impl.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool15Impl.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/BufferPool15Impl.java Sat 
Apr 23 21:53:00 2011
@@ -29,11 +29,13 @@ class BufferPool15Impl implements Buffer
     protected AtomicInteger size = new AtomicInteger(0);
     protected ConcurrentLinkedQueue<XByteBuffer> queue = new 
ConcurrentLinkedQueue<XByteBuffer>();
 
+    @Override
     public void setMaxSize(int bytes) {
         this.maxSize = bytes;
     }
 
 
+    @Override
     public XByteBuffer getBuffer(int minSize, boolean discard) {
         XByteBuffer buffer = queue.poll();
         if ( buffer != null ) size.addAndGet(-buffer.getCapacity());
@@ -44,6 +46,7 @@ class BufferPool15Impl implements Buffer
         return buffer;
     }
 
+    @Override
     public void returnBuffer(XByteBuffer buffer) {
         if ( (size.get() + buffer.getCapacity()) <= maxSize ) {
             size.addAndGet(buffer.getCapacity());
@@ -51,6 +54,7 @@ class BufferPool15Impl implements Buffer
         }
     }
 
+    @Override
     public void clear() {
         queue.clear();
         size.set(0);

Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/ChannelData.java Sat Apr 23 
21:53:00 2011
@@ -95,30 +95,35 @@ public class ChannelData implements Chan
     /**
      * @return Returns the message byte buffer
      */
+    @Override
     public XByteBuffer getMessage() {
         return message;
     }
     /**
      * @param message The message to send.
      */
+    @Override
     public void setMessage(XByteBuffer message) {
         this.message = message;
     }
     /**
      * @return Returns the timestamp.
      */
+    @Override
     public long getTimestamp() {
         return timestamp;
     }
     /**
      * @param timestamp The timestamp to send
      */
+    @Override
     public void setTimestamp(long timestamp) {
         this.timestamp = timestamp;
     }
     /**
      * @return Returns the uniqueId.
      */
+    @Override
     public byte[] getUniqueId() {
         return uniqueId;
     }
@@ -133,6 +138,7 @@ public class ChannelData implements Chan
      * see 
org.apache.catalina.tribes.Channel#sendMessage(org.apache.catalina.tribes.Member[],
 java.io.Serializable, int)
      *                                                 
      */
+    @Override
     public int getOptions() {
         return options;
     }
@@ -141,6 +147,7 @@ public class ChannelData implements Chan
      * 
      * @param options the message options
      */
+    @Override
     public void setOptions(int options) {
         this.options = options;
     }
@@ -149,6 +156,7 @@ public class ChannelData implements Chan
      * Returns the source or reply-to address
      * @return Member
      */
+    @Override
     public Member getAddress() {
         return address;
     }
@@ -157,6 +165,7 @@ public class ChannelData implements Chan
      * Sets the source or reply-to address
      * @param address Member
      */
+    @Override
     public void setAddress(Member address) {
         this.address = address;
     }
@@ -312,6 +321,7 @@ public class ChannelData implements Chan
      * Complete clone
      * @return ClusterData
      */
+    @Override
     public Object deepclone() {
         byte[] d = this.getDataPackage();
         return ChannelData.getDataFromPackage(d);

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/AbstractSender.java 
Sat Apr 23 21:53:00 2011
@@ -101,6 +101,7 @@ public abstract class AbstractSender imp
      * @throws IOException
      * TODO Implement this org.apache.catalina.tribes.transport.DataSender 
method
      */
+    @Override
     public abstract void connect() throws IOException;
 
     /**
@@ -108,6 +109,7 @@ public abstract class AbstractSender imp
      *
      * TODO Implement this org.apache.catalina.tribes.transport.DataSender 
method
      */
+    @Override
     public abstract void disconnect();
 
     /**
@@ -116,6 +118,7 @@ public abstract class AbstractSender imp
      * @return boolean
      * TODO Implement this org.apache.catalina.tribes.transport.DataSender 
method
      */
+    @Override
     public boolean keepalive() {
         boolean disconnect = false;
         if (isUdpBased()) disconnect = true; //always disconnect UDP, TODO 
optimize the keepalive handling
@@ -129,10 +132,12 @@ public abstract class AbstractSender imp
         this.connected = connected;
     }
 
+    @Override
     public boolean isConnected() {
         return connected;
     }
 
+    @Override
     public long getConnectTime() {
         return connectTime;
     }
@@ -150,6 +155,7 @@ public abstract class AbstractSender imp
         return keepAliveTime;
     }
 
+    @Override
     public int getRequestCount() {
         return requestCount;
     }
@@ -230,10 +236,12 @@ public abstract class AbstractSender imp
         return throwOnFailedAck;
     }
 
+    @Override
     public void setKeepAliveCount(int keepAliveCount) {
         this.keepAliveCount = keepAliveCount;
     }
 
+    @Override
     public void setKeepAliveTime(long keepAliveTime) {
         this.keepAliveTime = keepAliveTime;
     }
@@ -242,14 +250,17 @@ public abstract class AbstractSender imp
         this.requestCount = requestCount;
     }
 
+    @Override
     public void setRxBufSize(int rxBufSize) {
         this.rxBufSize = rxBufSize;
     }
 
+    @Override
     public void setTimeout(long timeout) {
         this.timeout = timeout;
     }
 
+    @Override
     public void setTxBufSize(int txBufSize) {
         this.txBufSize = txBufSize;
     }

Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Sat Apr 23 21:53:00 
2011
@@ -80,34 +80,6 @@ public final class  Base64
         lookUpBase64Alphabet[63] = (byte) '/';
     }
 
-    public static boolean isBase64( String isValidString )
-    {
-        return isArrayByteBase64(isValidString.getBytes());
-    }
-
-    public static boolean isBase64( byte octect )
-    {
-        //shall we ignore white space? JEFF??
-        return (octect == PAD || base64Alphabet[octect] != -1);
-    }
-
-    public static boolean isArrayByteBase64( byte[] arrayOctect )
-    {
-        int length = arrayOctect.length;
-        if (length == 0)
-        {
-            // shouldn't a 0 length array be valid base64 data?
-            // return false;
-            return true;
-        }
-        for (int i=0; i < length; i++)
-        {
-            if ( !Base64.isBase64(arrayOctect[i]) )
-                return false;
-        }
-        return true;
-    }
-
     /**
      * Encodes hex octets into Base64.
      *

Modified: tomcat/trunk/java/org/apache/coyote/ActionCode.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ActionCode.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ActionCode.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ActionCode.java Sat Apr 23 21:53:00 2011
@@ -40,7 +40,6 @@ public enum ActionCode {
 
     CUSTOM,
     RESET,
-    WEBAPP,
 
     /**
      * Hook called after request, but before recycling. Can be used for 
logging,
@@ -72,12 +71,6 @@ public enum ActionCode {
     REQ_SSL_ATTRIBUTE,
 
     /**
-     * Chain for request creation. Called each time a new request is created
-     * (requests are recycled).
-     */
-    NEW_REQUEST,
-
-    /**
      * Callback for lazy evaluation - extract the SSL-certificate (including
      * forcing a re-handshake if necessary)
      */

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/ArrayStack.java Sat Apr 
23 21:53:00 2011
@@ -136,33 +136,4 @@ public class ArrayStack<E> extends Array
         add(item);
         return item;
     }
-
-
-    /**
-     * Returns the one-based position of the distance from the top that the
-     * specified object exists on this stack, where the top-most element is
-     * considered to be at distance <code>1</code>.  If the object is not
-     * present on the stack, return <code>-1</code> instead.  The
-     * <code>equals()</code> method is used to compare to the items
-     * in this stack.
-     *
-     * @param object  the object to be searched for
-     * @return the 1-based depth into the stack of the object, or -1 if not 
found
-     */
-    public int search(E object) {
-        int i = size() - 1;        // Current index
-        int n = 1;                 // Current distance
-        while (i >= 0) {
-            Object current = get(i);
-            if ((object == null && current == null) ||
-                (object != null && object.equals(current))) {
-                return n;
-            }
-            i--;
-            n++;
-        }
-        return -1;
-    }
-
-
 }

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java 
Sat Apr 23 21:53:00 2011
@@ -122,6 +122,7 @@ public class BaseAttributeFilter impleme
      *     includes the name of the attribute in this notification</li>
      * </ul>
      */
+    @Override
     public boolean isNotificationEnabled(Notification notification) {
 
         if (notification == null)

Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Sat 
Apr 23 21:53:00 2011
@@ -163,6 +163,7 @@ public class BaseModelMBean implements D
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
+    @Override
     public Object getAttribute(String name)
         throws AttributeNotFoundException, MBeanException,
             ReflectionException {
@@ -217,6 +218,7 @@ public class BaseModelMBean implements D
      *
      * @param names Names of the requested attributes
      */
+    @Override
     public AttributeList getAttributes(String names[]) {
 
         // Validate the input parameters
@@ -246,6 +248,7 @@ public class BaseModelMBean implements D
     /**
      * Return the <code>MBeanInfo</code> object for this MBean.
      */
+    @Override
     public MBeanInfo getMBeanInfo() {
         return managedBean.getMBeanInfo();
     }
@@ -270,6 +273,7 @@ public class BaseModelMBean implements D
      * @exception ReflectioNException if a Java reflection exception
      *  occurs when invoking a method
      */
+    @Override
     public Object invoke(String name, Object params[], String signature[])
         throws MBeanException, ReflectionException 
     {
@@ -370,6 +374,7 @@ public class BaseModelMBean implements D
      * @exception ReflectionException if a Java reflection exception
      *  occurs when invoking the getter
      */
+    @Override
     public void setAttribute(Attribute attribute)
         throws AttributeNotFoundException, MBeanException,
         ReflectionException
@@ -458,6 +463,7 @@ public class BaseModelMBean implements D
      *
      * @return The list of attributes that were set and their new values
      */
+    @Override
     public AttributeList setAttributes(AttributeList attributes) {
         AttributeList response = new AttributeList();
 
@@ -581,6 +587,7 @@ public class BaseModelMBean implements D
      *
      * @exception IllegalArgumentException if the listener parameter is null
      */
+    @Override
     public void addAttributeChangeNotificationListener
         (NotificationListener listener, String name, Object handback)
         throws IllegalArgumentException {
@@ -611,6 +618,7 @@ public class BaseModelMBean implements D
      * @exception ListenerNotFoundException if this listener is not
      *  registered in the MBean
      */
+    @Override
     public void removeAttributeChangeNotificationListener
         (NotificationListener listener, String name)
         throws ListenerNotFoundException {
@@ -660,6 +668,7 @@ public class BaseModelMBean implements D
      * @exception RuntimeOperationsException wraps IllegalArgumentException
      *  when the specified notification is <code>null</code> or invalid
      */
+    @Override
     public void sendAttributeChangeNotification
         (AttributeChangeNotification notification)
         throws MBeanException, RuntimeOperationsException {
@@ -689,6 +698,7 @@ public class BaseModelMBean implements D
      * @exception RuntimeOperationsException wraps IllegalArgumentException
      *  when the specified notification is <code>null</code> or invalid
      */
+    @Override
     public void sendAttributeChangeNotification
         (Attribute oldValue, Attribute newValue)
         throws MBeanException, RuntimeOperationsException {
@@ -724,6 +734,7 @@ public class BaseModelMBean implements D
      * @exception RuntimeOperationsException wraps IllegalArgumentException
      *  when the specified notification is <code>null</code> or invalid
      */
+    @Override
     public void sendNotification(Notification notification)
         throws MBeanException, RuntimeOperationsException {
 
@@ -749,6 +760,7 @@ public class BaseModelMBean implements D
      * @exception RuntimeOperationsException wraps IllegalArgumentException
      *  when the specified notification is <code>null</code> or invalid
      */
+    @Override
     public void sendNotification(String message)
         throws MBeanException, RuntimeOperationsException {
 
@@ -777,6 +789,7 @@ public class BaseModelMBean implements D
      *
      * @exception IllegalArgumentException if the listener parameter is null
      */
+    @Override
     public void addNotificationListener(NotificationListener listener,
                                         NotificationFilter filter,
                                         Object handback)
@@ -811,6 +824,7 @@ public class BaseModelMBean implements D
      * Return an <code>MBeanNotificationInfo</code> object describing the
      * notifications sent by this MBean.
      */
+    @Override
     public MBeanNotificationInfo[] getNotificationInfo() {
 
         // Acquire the set of application notifications
@@ -863,6 +877,7 @@ public class BaseModelMBean implements D
      * @exception ListenerNotFoundException if this listener is not
      *  registered in the MBean
      */
+    @Override
     public void removeNotificationListener(NotificationListener listener)
         throws ListenerNotFoundException {
 
@@ -1103,6 +1118,7 @@ public class BaseModelMBean implements D
     // XXX We can add some method patterns here- like setName() and
     // setDomain() for code that doesn't implement the Registration
 
+    @Override
     public ObjectName preRegister(MBeanServer server,
                                   ObjectName name)
             throws Exception
@@ -1116,18 +1132,21 @@ public class BaseModelMBean implements D
         return oname;
     }
 
+    @Override
     public void postRegister(Boolean registrationDone) {
         if( resource instanceof MBeanRegistration ) {
             ((MBeanRegistration)resource).postRegister(registrationDone);
         }
     }
 
+    @Override
     public void preDeregister() throws Exception {
         if( resource instanceof MBeanRegistration ) {
             ((MBeanRegistration)resource).preDeregister();
         }
     }
 
+    @Override
     public void postDeregister() {
         if( resource instanceof MBeanRegistration ) {
             ((MBeanRegistration)resource).postDeregister();

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java?rev=1096243&r1=1096242&r2=1096243&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
 (original)
+++ 
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
 Sat Apr 23 21:53:00 2011
@@ -71,6 +71,7 @@ public class BaseNotificationBroadcaster
      *
      * @exception IllegalArgumentException if the listener parameter is null
      */
+    @Override
     public void addNotificationListener(NotificationListener listener,
                                         NotificationFilter filter,
                                         Object handback)
@@ -118,6 +119,7 @@ public class BaseNotificationBroadcaster
      * Return an <code>MBeanNotificationInfo</code> object describing the
      * notifications sent by this MBean.
      */
+    @Override
     public MBeanNotificationInfo[] getNotificationInfo() {
 
         return (new MBeanNotificationInfo[0]);
@@ -134,6 +136,7 @@ public class BaseNotificationBroadcaster
      * @exception ListenerNotFoundException if this listener is not
      *  registered in the MBean
      */
+    @Override
     public void removeNotificationListener(NotificationListener listener)
         throws ListenerNotFoundException {
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to