CVS update: JGroups/src/org/jgroups/conf ProtocolParameter.java ProtocolData.java

  User: belaban 
  Date: 10/09/16 07:13:53

  Modified:    src/org/jgroups/conf ProtocolParameter.java
                        ProtocolData.java
  Log:
  ns
  
  Revision  Changes    Path
  1.7       +2 -15     JGroups/src/org/jgroups/conf/ProtocolParameter.java
  
  Index: ProtocolParameter.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/conf/ProtocolParameter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ProtocolParameter.java	3 Dec 2007 13:17:08 -0000	1.6
  +++ ProtocolParameter.java	16 Sep 2010 07:13:53 -0000	1.7
  @@ -6,11 +6,10 @@
    *
    * @author Filip Hanik (<a href="mailto:[email protected]">[email protected])
    * @author Bela Ban
  - * @version $Id: ProtocolParameter.java,v 1.6 2007/12/03 13:17:08 belaban Exp $
  + * @version $Id: ProtocolParameter.java,v 1.7 2010/09/16 07:13:53 belaban Exp $
    */
   
   public class ProtocolParameter {
  -
       private final String mParameterName;
       private String mParameterValue;
   
  @@ -42,19 +41,7 @@
           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 getParameterStringXml() {
  -        StringBuilder buf=new StringBuilder(mParameterName);
  -        if(mParameterValue != null)
  -            buf.append("=\"").append(mParameterValue).append('\"');
  -        return buf.toString();
  -    }
  + 
   
   
   }
  
  
  
  1.13      +39 -19    JGroups/src/org/jgroups/conf/ProtocolData.java
  
  Index: ProtocolData.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/conf/ProtocolData.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ProtocolData.java	15 Sep 2010 14:56:44 -0000	1.12
  +++ ProtocolData.java	16 Sep 2010 07:13:53 -0000	1.13
  @@ -5,7 +5,7 @@
    * Data holder for protocol
    * @author Filip Hanik (<a href="mailto:[email protected]">[email protected])
    * @author Bela Ban
  - * @version $Id: ProtocolData.java,v 1.12 2010/09/15 14:56:44 belaban Exp $
  + * @version $Id: ProtocolData.java,v 1.13 2010/09/16 07:13:53 belaban Exp $
    */
   
   import java.util.HashMap;
  @@ -14,9 +14,9 @@
   
   public class ProtocolData {
       /** Map<String,ProtocolParameter> of property keys and values */
  -    private final Map mParameters=new HashMap();
  -    private final String mProtocolName;
  -    private final String mClassName;
  +    private final Map<String,String>    mParameters=new HashMap<String,String>();
  +    private final String                mProtocolName;
  +    private final String                mClassName;
   
       /**
        *
  @@ -25,14 +25,12 @@
        * @param params
        * @deprecated Use {@link #ProtocolData(String, String, ProtocolParameter[])} instead
        */
  -
  -
       public ProtocolData(String protocolName, String className, ProtocolParameter[] params) {
           mProtocolName=protocolName;
           mClassName=className;
           if(params != null) {
               for(int i=0; i < params.length; i++) {
  -                mParameters.put(params[i].getName(), params[i]);
  +                mParameters.put(params[i].getName(), params[i].getValue());
               }
           }
       }
  @@ -58,33 +56,55 @@
       public String getProtocolString() {
           StringBuilder buf=new StringBuilder(mClassName);
           if(!mParameters.isEmpty()) {
  +            boolean first=true;
               buf.append('(');
  -            Iterator 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(';');
  +            for(Map.Entry<String,String> entry: mParameters.entrySet()) {
  +                String key=entry.getKey();
  +                String val=entry.getValue();
  +                if(first)
  +                    first=false;
  +                else
  +                    buf.append(';');
  +                buf.append(getParameterString(key, val));
               }
               buf.append(')');
           }
           return buf.toString();
       }
  +    
   
       public String getProtocolStringNewXml() {
           StringBuilder buf=new StringBuilder(mClassName + ' ');
           if(!mParameters.isEmpty()) {
  -            Iterator i=mParameters.keySet().iterator();
  -            while(i.hasNext()) {
  -                String key=(String)i.next();
  -                ProtocolParameter param=(ProtocolParameter)mParameters.get(key);
  -                buf.append(param.getParameterStringXml());
  -                if(i.hasNext()) buf.append(' ');
  +            boolean first=true;
  +            for(Map.Entry<String,String> entry: mParameters.entrySet()) {
  +                String key=entry.getKey();
  +                String val=entry.getValue();
  +                if(first)
  +                    first=false;
  +                else
  +                    buf.append(' ');
  +                buf.append(getParameterStringXml(key, val));
               }
           }
           return buf.toString();
       }
   
  +    protected static String getParameterString(String name, String value) {
  +        StringBuilder buf=new StringBuilder(name);
  +        if(value != null)
  +            buf.append('=').append(value);
  +        return buf.toString();
  +    }
  +
  +    protected static String getParameterStringXml(String name, String val) {
  +        StringBuilder buf=new StringBuilder(name);
  +        if(val != null)
  +            buf.append("=\"").append(val).append('\"');
  +        return buf.toString();
  +    }
  +
  +
       public int hashCode() {
           return mProtocolName.hashCode();
       }
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev