commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bay...@apache.org
Subject cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang/text MappedMessageFormat.java
Date Sun, 05 Sep 2004 00:42:14 GMT
bayard      2004/09/04 17:42:14

  Modified:    lang/src/java/org/apache/commons/lang/text
                        MappedMessageFormat.java
  Log:
  reformatted to match other Lang code
  
  Revision  Changes    Path
  1.2       +13 -21    jakarta-commons/lang/src/java/org/apache/commons/lang/text/MappedMessageFormat.java
  
  Index: MappedMessageFormat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/text/MappedMessageFormat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MappedMessageFormat.java	5 Sep 2004 00:37:28 -0000	1.1
  +++ MappedMessageFormat.java	5 Sep 2004 00:42:14 -0000	1.2
  @@ -36,10 +36,12 @@
    * support any "format" operations applied to the objects before substitution 
    * into the target string.
    *
  + * Originally org.apache.commons.digester.substitution.MultiVariableExpander
  + *
    * @since 2.1
    */
  -
   public class MappedMessageFormat {
  +
       private int nEntries = 0;
       private ArrayList markers = new ArrayList(2);
       private ArrayList sources = new ArrayList(2);
  @@ -52,7 +54,7 @@
        * strings passed to the "format" methods.
        */
       public void addSource(String marker, Map source) {
  -        ++nEntries;
  +        nEntries++;
           markers.add(marker);
           sources.add(source);
       }
  @@ -65,11 +67,8 @@
        * a variable which is not known to the specified source.
        */
       public String format(String param) {
  -        for(int i=0; i<nEntries; ++i) {
  -            param = format(
  -                param, 
  -                (String) markers.get(i), 
  -                (Map) sources.get(i));
  +        for(int i=0; i<nEntries; i++) {
  +            param = format( param, (String) markers.get(i), (Map) sources.get(i));
           }
           return param;
       }
  @@ -94,33 +93,26 @@
           int markLen = startMark.length();
           
           int index = 0;
  -        for(;;)
  -        {
  +        while(true) {
               index = str.indexOf(startMark, index);
  -            if (index == -1)
  -            {
  +            if (index == -1) {
                   return str;
               }
               
               int startIndex = index + markLen;
  -            if (startIndex > str.length())
  -            {
  -                throw new IllegalArgumentException(
  -                    "var expression starts at end of string");
  +            if (startIndex > str.length()) {
  +                throw new IllegalArgumentException("var expression starts at end of string");
               }
               
               int endIndex = str.indexOf("}", index + markLen);
  -            if (endIndex == -1)
  -            {
  -                throw new IllegalArgumentException(
  -                    "var expression starts but does not end");
  +            if (endIndex == -1) {
  +                throw new IllegalArgumentException("var expression starts but does not
end");
               }
               
               String key = str.substring(index+markLen, endIndex);
               Object value =  source.get(key);
               if (value == null) {
  -                throw new IllegalArgumentException(
  -                    "parameter [" + key + "] is not defined.");
  +                throw new IllegalArgumentException("parameter [" + key + "] is not defined.");
               }
               String varValue = value.toString();
               
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message