[jboss-cvs] JBossAS SVN: r109375 - projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 18 16:11:39 EST 2010
Author: pferraro
Date: 2010-11-18 16:11:39 -0500 (Thu, 18 Nov 2010)
New Revision: 109375
Modified:
projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolData.java
projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolParameter.java
Log:
Auto-format code
Modified: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolData.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolData.java 2010-11-18 20:48:17 UTC (rev 109374)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolData.java 2010-11-18 21:11:39 UTC (rev 109375)
@@ -21,7 +21,6 @@
*/
package org.jboss.ha.core.channelfactory;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -33,91 +32,106 @@
* @author Bela Ban
* @version $Id: ProtocolData.java,v 1.10 2009/05/13 05:35:45 belaban Exp $
*/
-public class ProtocolData {
- /** Map<String,ProtocolParameter> of property keys and values */
- private final Map<String, ProtocolParameter> mParameters=new HashMap<String, ProtocolParameter>();
- private final String mProtocolName;
- private final String mClassName;
+public class ProtocolData
+{
+ /** Map<String,ProtocolParameter> of property keys and values */
+ private final Map<String, ProtocolParameter> mParameters = new HashMap<String, ProtocolParameter>();
- public ProtocolData(String protocolName,
- String className,
- List<ProtocolParameter> params) {
- this(protocolName, className, params.toArray(new ProtocolParameter[params.size()]));
- }
+ private final String mProtocolName;
- public ProtocolData(String protocolName,
- String className,
- ProtocolParameter[] params) {
- mProtocolName=protocolName;
- mClassName=className;
- if(params != null) {
- for(ProtocolParameter param : params) {
- mParameters.put(param.getName(), param);
- }
- }
- }
+ private final String mClassName;
- public String getClassName() {
- return mClassName;
- }
+ public ProtocolData(String protocolName, String className, List<ProtocolParameter> params)
+ {
+ this(protocolName, className, params.toArray(new ProtocolParameter[params.size()]));
+ }
- public String getProtocolName() {
- return mProtocolName;
- }
+ public ProtocolData(String protocolName, String className, ProtocolParameter[] params)
+ {
+ mProtocolName = protocolName;
+ mClassName = className;
+ if (params != null)
+ {
+ this.override(params);
+ }
+ }
- @Deprecated
- public static String getDescription() {
- return "n/a";
- }
+ public String getClassName()
+ {
+ return mClassName;
+ }
- public Map<String, ProtocolParameter> getParameters() {
- return mParameters;
- }
+ public String getProtocolName()
+ {
+ return mProtocolName;
+ }
- @Deprecated
- public static boolean isOverride() {
- return false;
- }
+ @Deprecated
+ public static String getDescription()
+ {
+ return "n/a";
+ }
- public ProtocolParameter[] getParametersAsArray() {
- ProtocolParameter[] result=new ProtocolParameter[mParameters.size()];
- Iterator<String> it=mParameters.keySet().iterator();
- for(int i=0; i < result.length; i++) {
- String key=(String)it.next();
- result[i]=(ProtocolParameter)mParameters.get(key);
- }
- return result;
- }
+ public Map<String, ProtocolParameter> getParameters()
+ {
+ return mParameters;
+ }
+ @Deprecated
+ public static boolean isOverride()
+ {
+ return false;
+ }
- public void override(ProtocolParameter[] params) {
- for(int i=0; i < params.length; i++)
- mParameters.put(params[i].getName(), params[i]);
- }
+ public ProtocolParameter[] getParametersAsArray()
+ {
+ ProtocolParameter[] result = new ProtocolParameter[mParameters.size()];
+ Iterator<String> it = mParameters.keySet().iterator();
+ for (int i = 0; i < result.length; i++)
+ {
+ String key = it.next();
+ result[i] = mParameters.get(key);
+ }
+ return result;
+ }
- public String getProtocolString() {
- StringBuilder buf=new StringBuilder(mClassName);
- if(!mParameters.isEmpty()) {
- buf.append('(');
- Iterator<String> i=mParameters.keySet().iterator();
- while(i.hasNext()) {
- String key=(String)i.next();
- ProtocolParameter param=(ProtocolParameter)mParameters.get(key);
- buf.append(param.getParameterString());
- if(i.hasNext()) buf.append(';');
- }
- buf.append(')');
- }
- return buf.toString();
- }
+ public void override(ProtocolParameter[] params)
+ {
+ for (ProtocolParameter param: params)
+ {
+ mParameters.put(param.getName(), param);
+ }
+ }
- public int hashCode() {
- return mProtocolName.hashCode();
- }
+ public String getProtocolString()
+ {
+ StringBuilder buf = new StringBuilder(mClassName);
+ if (!mParameters.isEmpty())
+ {
+ buf.append('(');
+ Iterator<String> i = mParameters.keySet().iterator();
+ while (i.hasNext())
+ {
+ String key = i.next();
+ ProtocolParameter param = mParameters.get(key);
+ buf.append(param.getParameterString());
+ if (i.hasNext())
+ buf.append(';');
+ }
+ buf.append(')');
+ }
+ return buf.toString();
+ }
- public boolean equals(Object another) {
- return another instanceof ProtocolData && getProtocolName().equals(((ProtocolData)another).getProtocolName());
- }
+ @Override
+ public int hashCode()
+ {
+ return mProtocolName.hashCode();
+ }
-
+ @Override
+ public boolean equals(Object another)
+ {
+ return another instanceof ProtocolData && getProtocolName().equals(((ProtocolData) another).getProtocolName());
+ }
}
Modified: projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolParameter.java
===================================================================
--- projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolParameter.java 2010-11-18 20:48:17 UTC (rev 109374)
+++ projects/cluster/ha-server-core/trunk/src/main/java/org/jboss/ha/core/channelfactory/ProtocolParameter.java 2010-11-18 21:11:39 UTC (rev 109375)
@@ -28,52 +28,58 @@
* @author Bela Ban
* @version $Id: ProtocolParameter.java,v 1.6 2007/12/03 13:17:08 belaban Exp $
*/
-public class ProtocolParameter {
+public class ProtocolParameter
+{
+ private final String mParameterName;
- private final String mParameterName;
- private String mParameterValue;
+ private String mParameterValue;
- public ProtocolParameter(String parameterName, String parameterValue) {
- mParameterName=parameterName;
- mParameterValue=parameterValue;
- }
+ public ProtocolParameter(String parameterName, String parameterValue)
+ {
+ mParameterName = parameterName;
+ mParameterValue = parameterValue;
+ }
- public String getName() {
- return mParameterName;
- }
+ public String getName()
+ {
+ return mParameterName;
+ }
- public String getValue() {
- return mParameterValue;
- }
+ public String getValue()
+ {
+ return mParameterValue;
+ }
- public void setValue(String replacement) {
- mParameterValue=replacement;
- }
+ public void setValue(String replacement)
+ {
+ mParameterValue = replacement;
+ }
- public int hashCode() {
- if(mParameterName != null)
- return mParameterName.hashCode();
- else
- return -1;
- }
+ @Override
+ public int hashCode()
+ {
+ return (mParameterName != null) ? mParameterName.hashCode() : -1;
+ }
- public boolean equals(Object another) {
- return another instanceof ProtocolParameter && getName().equals(((ProtocolParameter)another).getName());
- }
+ @Override
+ public boolean equals(Object another)
+ {
+ return another instanceof ProtocolParameter && getName().equals(((ProtocolParameter) another).getName());
+ }
- public String getParameterString() {
- StringBuilder buf=new StringBuilder(mParameterName);
- if(mParameterValue != null)
- buf.append('=').append(mParameterValue);
- return buf.toString();
- }
+ public String getParameterString()
+ {
+ StringBuilder buf = new StringBuilder(mParameterName);
+ if (mParameterValue != null)
+ buf.append('=').append(mParameterValue);
+ return buf.toString();
+ }
- public String getParameterStringXml() {
- StringBuilder buf=new StringBuilder(mParameterName);
- if(mParameterValue != null)
- buf.append("=\"").append(mParameterValue).append('\"');
- return buf.toString();
- }
-
-
+ public String getParameterStringXml()
+ {
+ StringBuilder buf = new StringBuilder(mParameterName);
+ if (mParameterValue != null)
+ buf.append("=\"").append(mParameterValue).append('\"');
+ return buf.toString();
+ }
}
More information about the jboss-cvs-commits
mailing list