[jboss-cvs] JBossCache/src/org/jboss/cache/buddyreplication ...
Brian Stansberry
brian.stansberry at jboss.com
Sat Nov 4 17:03:24 EST 2006
User: bstansberry
Date: 06/11/04 17:03:24
Modified: src/org/jboss/cache/buddyreplication
NextMemberBuddyLocator.java
Added: src/org/jboss/cache/buddyreplication
NextMemberBuddyLocatorConfig.java
Log:
Make NextMemberBuddyLocator.Config a top level class
Revision Changes Path
1.7 +5 -114 JBossCache/src/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NextMemberBuddyLocator.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NextMemberBuddyLocator.java 23 Oct 2006 05:46:39 -0000 1.6
+++ NextMemberBuddyLocator.java 4 Nov 2006 22:03:24 -0000 1.7
@@ -8,8 +8,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.cache.config.BuddyReplicationConfig;
-import org.jboss.cache.config.Dynamic;
import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
import org.jgroups.stack.IpAddress;
@@ -20,7 +18,6 @@
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
/**
* This buddy locator uses a next-in-line algorithm to select buddies for a buddy group.
@@ -40,7 +37,7 @@
{
private Log log = LogFactory.getLog(NextMemberBuddyLocator.class);
- private Config config = new Config();
+ private NextMemberBuddyLocatorConfig config = new NextMemberBuddyLocatorConfig();
public BuddyLocatorConfig getConfig()
{
@@ -49,18 +46,18 @@
public void init(BuddyLocatorConfig buddyLocatorConfig)
{
- if (buddyLocatorConfig instanceof Config)
+ if (buddyLocatorConfig instanceof NextMemberBuddyLocatorConfig)
{
- this.config = (Config) buddyLocatorConfig;
+ this.config = (NextMemberBuddyLocatorConfig) buddyLocatorConfig;
}
else if (buddyLocatorConfig != null)
{
- this.config = new Config(buddyLocatorConfig);
+ this.config = new NextMemberBuddyLocatorConfig(buddyLocatorConfig);
}
else
{
// We were passed null; just use a default config
- this.config = new Config();
+ this.config = new NextMemberBuddyLocatorConfig();
}
}
@@ -171,110 +168,4 @@
return false;
}
-
- /**
- * Type-specific configuration object for NextMemberBuddyLocator.
- *
- */
- public static class Config extends BuddyLocatorConfig
- {
- private static final long serialVersionUID = 2443438867383733851L;
-
- @Dynamic
- private int numBuddies = 1;
- @Dynamic
- private boolean ignoreColocatedBuddies = true;
-
- /**
- * Default constructor.
- */
- public Config()
- {
- setBuddyLocatorClass(NextMemberBuddyLocator.class.getName());
- }
-
- /**
- * Constructor for use by {@link NextMemberBuddyLocator#init(BuddyLocatorConfig)}.
- *
- * @param base the config passed in to <code>init()</code>.
- */
- private Config(BuddyReplicationConfig.BuddyLocatorConfig base)
- {
- this();
- setBuddyLocatorProperties(base.getBuddyLocatorProperties());
- }
-
- public String getBuddyLocatorClass()
- {
- return NextMemberBuddyLocator.class.getName();
- }
-
- public void setBuddyLocatorClass(String buddyLocatorClass)
- {
- // ignore it
- }
-
- public boolean isIgnoreColocatedBuddies()
- {
- return ignoreColocatedBuddies;
- }
-
- public void setIgnoreColocatedBuddies(boolean ignoreColocatedBuddies)
- {
- testImmutability("ignoreColocatedBuddies");
- this.ignoreColocatedBuddies = ignoreColocatedBuddies;
- }
-
- public int getNumBuddies()
- {
- return numBuddies;
- }
-
- public void setNumBuddies(int numBuddies)
- {
- testImmutability("numBuddies");
- this.numBuddies = numBuddies;
- }
-
- public void setBuddyLocatorProperties(Properties props)
- {
- super.setBuddyLocatorProperties(props);
- if (props != null)
- {
- String numBuddiesStr = props.getProperty("numBuddies");
- String ignoreColocatedBuddiesStr = props.getProperty("ignoreColocatedBuddies");
- if (numBuddiesStr != null) numBuddies = Integer.parseInt(numBuddiesStr);
- if (ignoreColocatedBuddiesStr != null)
- {
- ignoreColocatedBuddies = Boolean.valueOf(ignoreColocatedBuddiesStr);
- }
- }
- }
-
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
-
- if (obj instanceof Config)
- {
- Config other = (Config) obj;
- return (other.ignoreColocatedBuddies == this.ignoreColocatedBuddies)
- && (other.numBuddies == this.numBuddies);
- }
- return false;
- }
-
- public int hashCode()
- {
- int result = 13;
- result = 23 * result + (ignoreColocatedBuddies ? 0 : 1);
- result = 23 * result + numBuddies;
- return result;
- }
-
-
-
-
- }
}
\ No newline at end of file
1.1 date: 2006/11/04 22:03:24; author: bstansberry; state: Exp;JBossCache/src/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorConfig.java
Index: NextMemberBuddyLocatorConfig.java
===================================================================
package org.jboss.cache.buddyreplication;
import java.util.Properties;
import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.Dynamic;
import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
/**
* Type-specific configuration object for NextMemberBuddyLocator.
*
*/
public class NextMemberBuddyLocatorConfig extends BuddyLocatorConfig
{
private static final long serialVersionUID = 2443438867383733851L;
@Dynamic
private int numBuddies = 1;
@Dynamic
private boolean ignoreColocatedBuddies = true;
/**
* Default constructor.
*/
public NextMemberBuddyLocatorConfig()
{
setBuddyLocatorClass(NextMemberBuddyLocator.class.getName());
}
/**
* Constructor for use by {@link NextMemberBuddyLocator#init(BuddyLocatorConfig)}.
*
* @param base the config passed in to <code>init()</code>.
*/
NextMemberBuddyLocatorConfig(BuddyReplicationConfig.BuddyLocatorConfig base)
{
this();
setBuddyLocatorProperties(base.getBuddyLocatorProperties());
}
public String getBuddyLocatorClass()
{
return NextMemberBuddyLocator.class.getName();
}
public void setBuddyLocatorClass(String buddyLocatorClass)
{
// ignore it
}
public boolean isIgnoreColocatedBuddies()
{
return ignoreColocatedBuddies;
}
public void setIgnoreColocatedBuddies(boolean ignoreColocatedBuddies)
{
testImmutability("ignoreColocatedBuddies");
this.ignoreColocatedBuddies = ignoreColocatedBuddies;
}
public int getNumBuddies()
{
return numBuddies;
}
public void setNumBuddies(int numBuddies)
{
testImmutability("numBuddies");
this.numBuddies = numBuddies;
}
public void setBuddyLocatorProperties(Properties props)
{
super.setBuddyLocatorProperties(props);
if (props != null)
{
String numBuddiesStr = props.getProperty("numBuddies");
String ignoreColocatedBuddiesStr = props.getProperty("ignoreColocatedBuddies");
if (numBuddiesStr != null) numBuddies = Integer.parseInt(numBuddiesStr);
if (ignoreColocatedBuddiesStr != null)
{
ignoreColocatedBuddies = Boolean.valueOf(ignoreColocatedBuddiesStr);
}
}
}
public boolean equals(Object obj)
{
if (this == obj)
return true;
if (obj instanceof NextMemberBuddyLocatorConfig)
{
NextMemberBuddyLocatorConfig other = (NextMemberBuddyLocatorConfig) obj;
return (other.ignoreColocatedBuddies == this.ignoreColocatedBuddies)
&& (other.numBuddies == this.numBuddies);
}
return false;
}
public int hashCode()
{
int result = 13;
result = 23 * result + (ignoreColocatedBuddies ? 0 : 1);
result = 23 * result + numBuddies;
return result;
}
}
More information about the jboss-cvs-commits
mailing list