Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@xml.apache.org
Date: 8 Feb 2002 15:24:23 -0000
Message-ID: <20020208152423.35644.qmail@icarus.apache.org>
From: scheu@apache.org
To: xml-axis-cvs@apache.org
Subject: cvs commit: xml-axis/java/src/org/apache/axis/utils JavaUtils.java
 JavapUtils.java

scheu       02/02/08 07:24:23

  Modified:    java/src/org/apache/axis/deployment/wsdd
                        WSDDTypeMapping.java
               java/src/org/apache/axis/utils JavaUtils.java
                        JavapUtils.java
  Log:
  Minor fixes per axis-dev and Greg Truty requests.
  
  Revision  Changes    Path
  1.23      +14 -4     xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java
  
  Index: WSDDTypeMapping.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDTypeMapping.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- WSDDTypeMapping.java	7 Feb 2002 23:47:40 -0000	1.22
  +++ WSDDTypeMapping.java	8 Feb 2002 15:24:22 -0000	1.23
  @@ -234,13 +234,23 @@
       }
   
       /**
  -     *
  -     * @param lsType XXX
  +     * Set javaType (type= attribute or languageSpecificType= attribute)
  +     * @param javaType the class of the javaType
        */
  -    public void setLanguageSpecificType(Class lsType)
  +    public void setLanguageSpecificType(Class javaType)
       {
  -        String type = lsType.getName();
  +        String type = javaType.getName();
           typeQName = new QName(WSDDConstants.WSDD_JAVA, type);
  +    }
  +
  +    /**
  +     * Set javaType (type= attribute or languageSpecificType= attribute)
  +     * @param lsType is the name of the class.  (For arrays this
  +     * could be the form my.Foo[] or could be in the form [Lmy.Foo;
  +     */
  +    public void setLanguageSpecificType(String javaType)
  +    {
  +        typeQName = new QName(WSDDConstants.WSDD_JAVA, javaType);
       }
   
       /**
  
  
  
  1.26      +13 -6     xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
  
  Index: JavaUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JavaUtils.java	7 Feb 2002 23:23:11 -0000	1.25
  +++ JavaUtils.java	8 Feb 2002 15:24:22 -0000	1.26
  @@ -324,7 +324,12 @@
       }
   
       /**
  -     * Map an XML name to a valid Java identifier
  +     * Map an XML name to a Java identifier per
  +     * the mapping rules of JSR 101 (in 
  +     * version 0.7 this is
  +     * "Chapter 20: Appendix: Mapping of XML Names"
  +     * @param name is the xml name
  +     * @return the java name per JSR 101 specification
        */
       public static String xmlNameToJava(String name)
       {
  @@ -336,7 +341,8 @@
           int nameLen = name.length();
           StringBuffer result = new StringBuffer(nameLen);
           
  -        // First character, lower case
  +        // The mapping indicates to convert first
  +        // character.
           int i = 0;
           while (i < nameLen
                   && !Character.isLetter(nameArray[i])) {
  @@ -349,13 +355,14 @@
               result.append("_" + nameArray[0]);
           }
           
  -        // The rest of the string
  +        // The mapping indicates to skip over
  +        // all characters that are not letters or
  +        // digits.  The first letter/digit 
  +        // following a skipped character is 
  +        // upper-cased.
           boolean wordStart = false;
           for(int j = i + 1; j < nameLen; ++j) {
               char c = nameArray[j];
  -
  -            // if this is a bad char, skip it a remember to capitalize next
  -            // good character we encounter
               if( !Character.isLetterOrDigit(c)) {
                   wordStart = true;
                   continue;
  
  
  
  1.5       +3 -2      xml-axis/java/src/org/apache/axis/utils/JavapUtils.java
  
  Index: JavapUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavapUtils.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JavapUtils.java	6 Feb 2002 21:21:51 -0000	1.4
  +++ JavapUtils.java	8 Feb 2002 15:24:22 -0000	1.5
  @@ -64,7 +64,8 @@
   
   import java.util.StringTokenizer;
   import java.util.Vector;
  -import java.util.Hashtable;
  +import java.util.HashMap;
  +import java.util.Map;
   
   /**
    * This is a utility class that can be used to extract information 
  @@ -79,7 +80,7 @@
       static Category category =
               Category.getInstance(JavapUtils.class.getName());
   
  -    private static Hashtable cache = new Hashtable();
  +    private static Map cache = new HashMap();
   
       /**
        * Get the return/parameter names for the indicated method.