You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by se...@apache.org on 2003/01/28 02:32:40 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util ValueParser.java

seade       2003/01/27 17:32:40

  Modified:    src/java/org/apache/turbine/util/parser Tag:
                        TURBINE_2_2_BRANCH BaseValueParser.java
               xdocs    Tag: TURBINE_2_2_BRANCH changes.xml
               src/java/org/apache/turbine/util Tag: TURBINE_2_2_BRANCH
                        ValueParser.java
  Log:
  getInteger(name) now returns null when the key name is not found.
  PR: TRQS122
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.1   +7 -3      jakarta-turbine-2/src/java/org/apache/turbine/util/parser/BaseValueParser.java
  
  Index: BaseValueParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/BaseValueParser.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- BaseValueParser.java	11 Jul 2002 07:16:43 -0000	1.5
  +++ BaseValueParser.java	28 Jan 2003 01:32:40 -0000	1.5.2.1
  @@ -670,14 +670,18 @@
   
       /**
        * Return an Integer for the given name.  If the name does not
  -     * exist, return 0.
  +     * exist, return <code>null</code>.
        *
        * @param name A String with the name.
        * @return An Integer.
        */
       public Integer getInteger(String name)
       {
  -        return new Integer(getInt(name, 0));
  +        if (containsKey(name))
  +        {
  +            return new Integer(getInt(name));
  +        }
  +        return null;
       }
   
       /**
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.2  +3 -0      jakarta-turbine-2/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- changes.xml	19 Dec 2002 16:21:25 -0000	1.12.2.1
  +++ changes.xml	28 Jan 2003 01:32:40 -0000	1.12.2.2
  @@ -7,6 +7,7 @@
     <author email="jvanzyl@apache.org">Jason van Zyl</author>
     <author email="jmcnally@apache.org">John D. McNally</author>
     <author email="mpoeschl@marmot.at">Martin Poeschl</author>
  +  <author email="seade@backstagetech.com.au">Scott Eade</author>
   </properties>
   
   <body>
  @@ -63,6 +64,8 @@
   <p>
     <ul>
       <li>
  +       TTWS38: BaseValueParser.getInteger(String name) now returns null if the 
  +       key name is not found - the old behaviour was to return new Integer(0).
       </li>
     </ul>
   </p>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      jakarta-turbine-2/src/java/org/apache/turbine/util/ValueParser.java
  
  Index: ValueParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/ValueParser.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ValueParser.java	11 Jul 2002 07:16:43 -0000	1.2
  +++ ValueParser.java	28 Jan 2003 01:32:40 -0000	1.2.2.1
  @@ -382,7 +382,7 @@
   
       /**
        * Return an array of ints for the given name.  If the name does
  -     * not exist, return null.
  +     * not exist, return <code>null</code>.
        *
        * @param name A String with the name.
        * @return An int[].
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>