classpath-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[cp-patches] Patch: FYI: minor SimpleDateFormat reformatting


From: Tom Tromey
Subject: [cp-patches] Patch: FYI: minor SimpleDateFormat reformatting
Date: 23 Aug 2005 11:05:44 -0600

I'm checking this in.
This reformats a method in SimpleDateFormat.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * java/text/SimpleDateFormat.java (compileFormat): Reformatted.

Index: java/text/SimpleDateFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/SimpleDateFormat.java,v
retrieving revision 1.49
diff -u -r1.49 SimpleDateFormat.java
--- java/text/SimpleDateFormat.java 23 Jul 2005 20:25:15 -0000 1.49
+++ java/text/SimpleDateFormat.java 23 Aug 2005 17:08:47 -0000
@@ -294,44 +294,56 @@
     int field;
     CompiledField current = null;
 
-    for (int i=0; i<pattern.length(); i++) {
-      thisChar = pattern.charAt(i);
-      field = standardChars.indexOf(thisChar);
-      if (field == -1) {
-       current = null;
-       if ((thisChar >= 'A' && thisChar <= 'Z')
-           || (thisChar >= 'a' && thisChar <= 'z')) {
-         // Not a valid letter
-         throw new IllegalArgumentException("Invalid letter " + thisChar +
-                                            "encountered at character " + i
-                                            + ".");
-       } else if (thisChar == '\'') {
-         // Quoted text section; skip to next single quote
-         pos = pattern.indexOf('\'',i+1);
-         if (pos == -1) {
-           throw new IllegalArgumentException("Quotes starting at character "
-                                              + i + " not closed.");
+    for (int i = 0; i < pattern.length(); i++)
+      {
+       thisChar = pattern.charAt(i);
+       field = standardChars.indexOf(thisChar);
+       if (field == -1)
+         {
+           current = null;
+           if ((thisChar >= 'A' && thisChar <= 'Z')
+               || (thisChar >= 'a' && thisChar <= 'z'))
+             {
+               // Not a valid letter
+               throw new IllegalArgumentException("Invalid letter "
+                                                  + thisChar +
+                                                  "encountered at character "
+                                                  + i + ".");
+             }
+           else if (thisChar == '\'')
+             {
+               // Quoted text section; skip to next single quote
+               pos = pattern.indexOf('\'', i + 1);
+               if (pos == -1)
+                 {
+                   throw new IllegalArgumentException("Quotes starting at 
character "
+                                                      + i + " not closed.");
+                 }
+               if ((pos + 1 < pattern.length())
+                   && (pattern.charAt(pos + 1) == '\''))
+                 tokens.add(pattern.substring(i + 1, pos + 1));
+               else
+                 tokens.add(pattern.substring(i + 1, pos));
+               i = pos;
+             }
+           else
+             {
+               // A special character
+               tokens.add(new Character(thisChar));
+             }
          }
-         if ((pos+1 < pattern.length()) && (pattern.charAt(pos+1) == '\'')) {
-           tokens.add(pattern.substring(i+1,pos+1));
-         } else {
-           tokens.add(pattern.substring(i+1,pos));
+       else
+         {
+           // A valid field
+           if ((current != null) && (field == current.field))
+             current.size++;
+           else
+             {
+               current = new CompiledField(field, 1, thisChar);
+               tokens.add(current);
+             }
          }
-         i = pos;
-       } else {
-         // A special character
-         tokens.add(new Character(thisChar));
-       }
-      } else {
-       // A valid field
-       if ((current != null) && (field == current.field)) {
-         current.size++;
-       } else {
-         current = new CompiledField(field,1,thisChar);
-         tokens.add(current);
-       }
       }
-    }
   }
 
   /**




reply via email to

[Prev in Thread] Current Thread [Next in Thread]