cvs commit: xml-rpc/src/java/org/apache/xmlrpc XmlRpc.java

[dlr]

dlr         02/02/15 18:36:49

  Modified:    src/java/org/apache/xmlrpc XmlRpc.java
  Log:
  More clean up:
  
  o Formatting in writeObject().
  
  o Removed early return from characters().
  
  o Formatting in endElement().
  
  Revision  Changes    Path
  1.13      +14 -11    xml-rpc/src/java/org/apache/xmlrpc/XmlRpc.java
  
  Index: XmlRpc.java
  ===================================================================
  RCS file: /home/cvs/xml-rpc/src/java/org/apache/xmlrpc/XmlRpc.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -u -r1.12 -r1.13
  --- XmlRpc.java       16 Feb 2002 01:54:57 -0000      1.12
  +++ XmlRpc.java       16 Feb 2002 02:36:48 -0000      1.13
  @@ -381,8 +381,10 @@
               writer.endElement ("struct");
           }
           else
  +        {
               throw new RuntimeException ("unsupported Java type: " +
                       what.getClass ());
  +        }
           writer.endElement ("value");
       }
   
  @@ -399,12 +401,13 @@
       /**
        * Method called by SAX driver.
        */
  -    public void characters (char ch[], int start,
  -            int length) throws SAXException
  +    public void characters (char ch[], int start, int length)
  +        throws SAXException
       {
  -        if (!readCdata)
  -            return;
  -        cdata.append (ch, start, length);
  +        if (readCdata)
  +        {
  +            cdata.append (ch, start, length);
  +        }
       }
   
       /**
  @@ -426,11 +429,11 @@
   
           if ("value".equals (name))
           {
  +            // Only handle top level objects or objects contained in
  +            // arrays here.  For objects contained in structs, wait
  +            // for </member> (see code below).
               int depth = values.size ();
  -            // Only handle top level objects or objects contained in arrays here.
  -            // For objects contained in structs, wait for </member> (see code 
below).
  -            if (depth < 2 ||
  -                    values.elementAt (depth - 2).hashCode () != STRUCT)
  +            if (depth < 2 || values.elementAt(depth - 2).hashCode() != STRUCT)
               {
                   Value v = currentValue;
                   values.pop ();
  @@ -442,7 +445,8 @@
                   }
                   else
                   {
  -                    // add object to sub-array; if current container is a struct, 
add later (at </member>)
  +                    // Add object to sub-array; if current container
  +                    // is a struct, add later (at </member>).
                       currentValue = (Value) values.peek ();
                       currentValue.endElement (v);
                   }
  @@ -637,7 +641,6 @@
                       }
                       catch (ParseException p)
                       {
  -                        // System.err.println ("Exception while parsing date: "+p);
                           throw new RuntimeException (p.getMessage ());
                       }
                       break;