Cleaned up setters to more consistent names with the rest of the code base

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

diff --git a/java/org/apache/catalina/tribes/membership/McastService.java b/java/org/apache/catalina/tribes/membership/McastService.java
index fa42b89..7548217 100644 (file)
--- a/java/org/apache/catalina/tribes/membership/McastService.java
+++ b/java/org/apache/catalina/tribes/membership/McastService.java
@@ -162,45 +162,114 @@ public class McastService implements MembershipService,MembershipListener {
         }
     }
     
-    public void setMcastAddr(String addr) {
+    public void setAddress(String addr) {
         properties.setProperty("mcastAddress", addr);
     }
-
-    public String getMcastAddr() {
+    
+    /**
+     * @deprecated use setAddress
+     * @param addr String
+     */
+    public void setMcastAddr(String addr) {
+        setAddress(addr);
+    }
+    
+    public String getAddress() {
         return properties.getProperty("mcastAddress");
     }
+    
+    /**
+     * @deprecated use getAddress
+     * @return String
+     */
+    public String getMcastAddr() {
+        return getAddress();
+    }
 
     public void setMcastBindAddress(String bindaddr) {
+        setBind(bindaddr);
+    }
+    
+    public void setBind(String bindaddr) {
         properties.setProperty("mcastBindAddress", bindaddr);
     }
-
+    /**
+     * @deprecated use getBind
+     * @return String
+     */
     public String getMcastBindAddress() {
+        return getBind();
+    }
+
+    public String getBind() {
         return properties.getProperty("mcastBindAddress");
     }
 
+    /**
+     * @deprecated use setPort
+     * @param port int
+     */
     public void setMcastPort(int port) {
+        setPort(port);
+    }
+
+    public void setPort(int port) {
         properties.setProperty("mcastPort", String.valueOf(port));
     }
 
+    /**
+     * @deprecated use getPort()
+     * @return int
+     */
     public int getMcastPort() {
+        return getPort();
+    }
+    public int getPort() {
         String p = properties.getProperty("mcastPort");
         return new Integer(p).intValue();
     }
     
+    /**
+     * @deprecated use setFrequency
+     * @param time long
+     */
     public void setMcastFrequency(long time) {
+        setFrequency(time);
+    }
+    
+    public void setFrequency(long time) {
         properties.setProperty("mcastFrequency", String.valueOf(time));
     }
 
+    /**
+     * @deprecated use getFrequency
+     * @return long
+     */
     public long getMcastFrequency() {
+        return getFrequency();
+    }
+
+    public long getFrequency() {
         String p = properties.getProperty("mcastFrequency");
         return new Long(p).longValue();
     }
 
     public void setMcastDropTime(long time) {
+        setDropTime(time);
+    }
+    public void setDropTime(long time) {
         properties.setProperty("memberDropTime", String.valueOf(time));
     }
-
+    
+    /**
+     * @deprecated use getDropTime
+     * @return long
+     */
     public long getMcastDropTime() {
+        return getDropTime();
+    }
+
+    public long getDropTime() {
         String p = properties.getProperty("memberDropTime");
         return new Long(p).longValue();
     }
@@ -373,14 +442,40 @@ public class McastService implements MembershipService,MembershipListener {
         if ( listener!=null ) listener.memberDisappeared(member);
     }
 
+    /**
+     * @deprecated use getSoTimeout
+     * @return int
+     */
     public int getMcastSoTimeout() {
+        return getSoTimeout();
+    }
+    
+    public int getSoTimeout() {
         return mcastSoTimeout;
     }
+    
+    /**
+     * @deprecated use setSoTimeout
+     * @param mcastSoTimeout int
+     */
     public void setMcastSoTimeout(int mcastSoTimeout) {
+        setSoTimeout(mcastSoTimeout);
+    }
+    
+    public void setSoTimeout(int mcastSoTimeout) {
         this.mcastSoTimeout = mcastSoTimeout;
         properties.setProperty("mcastSoTimeout", String.valueOf(mcastSoTimeout));
     }
+    
+    /**
+     * @deprecated use getTtl
+     * @return int
+     */
     public int getMcastTTL() {
+        return getTtl();
+    }
+    
+    public int getTtl() {
         return mcastTTL;
     }
 
@@ -391,8 +486,16 @@ public class McastService implements MembershipService,MembershipListener {
     public byte[] getDomain() {
         return domain;
     }
-
+    
+    /**
+     * @deprecated use setTtl
+     * @param mcastTTL int
+     */
     public void setMcastTTL(int mcastTTL) {
+        setTtl(mcastTTL);
+    }
+
+    public void setTtl(int mcastTTL) {
         this.mcastTTL = mcastTTL;
         properties.setProperty("mcastTTL", String.valueOf(mcastTTL));
     }

diff --git a/java/org/apache/catalina/tribes/transport/ReceiverBase.java b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
index 1d6872f..9703bf0 100644 (file)
--- a/java/org/apache/catalina/tribes/transport/ReceiverBase.java
+++ b/java/org/apache/catalina/tribes/transport/ReceiverBase.java
@@ -106,7 +106,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
      * @return int
      */
     public int getTcpThreadCount() {
-        return getMinThreads();
+        return getMaxThreads();
     }
 
     /**
@@ -119,12 +119,20 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
         this.listener = listener;
     }
 
+    /**
+     * @deprecated use setPort
+     * @param tcpListenPort int
+     */
     public void setTcpListenPort(int tcpListenPort) {
-        this.port = tcpListenPort;
+        setPort(tcpListenPort);
     }
 
+    /**
+     * @deprecated use setAddress
+     * @param tcpListenHost String
+     */
     public void setTcpListenAddress(String tcpListenHost) {
-        this.host = tcpListenHost;
+        setAddress(tcpListenHost);
     }
 
     public void setRxBufSize(int rxBufSize) {
@@ -135,7 +143,12 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
         this.txBufSize = txBufSize;
     }
 
+    /**
+     * @deprecated use setMaxThreads/setMinThreads
+     * @param tcpThreadCount int
+     */
     public void setTcpThreadCount(int tcpThreadCount) {
+        setMaxThreads(tcpThreadCount);
         setMinThreads(tcpThreadCount);
     }
 
@@ -172,7 +185,7 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
             try {
                 addr = new InetSocketAddress(getBind(), portstart);
                 socket.bind(addr);
-                setTcpListenPort(portstart);
+                setPort(portstart);
                 log.info("Receiver Server Socket bound to:"+addr);
                 return 0;
             }catch ( IOException x) {
@@ -209,11 +222,15 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
         this.bind = bind;
     }
 
-
+    /**
+     * @deprecated use getPort
+     * @return int
+     */
     public int getTcpListenPort() {
-        return this.port;
+        return getPort();
     }
 
+    
     public boolean getDirect() {
         return direct;
     }
@@ -225,15 +242,25 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
     }
 
 
-
-    public String getHost() {
+    public String getAddress() {
         getBind();
         return this.host;
     }
+    
+    public String getHost() {
+        return getAddress();
+    }
 
-    public long getTcpSelectorTimeout() {
+    public long getSelectorTimeout() {
         return tcpSelectorTimeout;
     }
+    /**
+     * @deprecated use getSelectorTimeout
+     * @return long
+     */
+    public long getTcpSelectorTimeout() {
+        return getSelectorTimeout();
+    }
 
     public boolean doListen() {
         return listen;
@@ -246,9 +273,13 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
     public ThreadPool getPool() {
         return pool;
     }
-
+    
+    /**
+     * @deprecated use getAddress
+     * @return String
+     */
     public String getTcpListenAddress() {
-        return getHost();
+        return getAddress();
     }
 
     public int getAutoBind() {
@@ -304,7 +335,15 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
         return securePort;
     }
 
+    /**
+     * @deprecated use setSelectorTimeout
+     * @param selTimeout long
+     */
     public void setTcpSelectorTimeout(long selTimeout) {
+        setSelectorTimeout(selTimeout);
+    }
+    
+    public void setSelectorTimeout(long selTimeout) {
         tcpSelectorTimeout = selTimeout;
     }
 
@@ -312,9 +351,13 @@ public abstract class ReceiverBase implements ChannelReceiver, ListenCallback, T
         this.listen = doListen;
     }
 
-    public void setHost(String host) {
+    
+    public void setAddress(String host) {
         this.host = host;
     }
+    public void setHost(String host) {
+        setAddress(host);
+    }
 
     public void setListener(MessageListener listener) {
         this.listener = listener;