Formatter fix after Java8 regex upgrade

BobHanson · BobHanson · commit a069530b7b9a · 2020-06-30T07:19:53.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Formatter.java b/sources/net.sf.j2s.java.core/src/java/util/Formatter.java
@@ -2262,9 +2262,10 @@ private FormatString[] parse(String s) {
                 }
 
                 // Expect 6 groups in regular expression
-                // %[argument_index$][flags][width][.precision][t]conversion
-                //      0               1      2          3     4      5
-                int n = m.groupCount() - 1;
+                //  (expr) %[argument_index$][flags][width][.precision][t]conversion
+                //    $0             $1        $2     $3        $4     $5    $6
+                //     sa[]           0         1      2         3      4     5
+                int n = m.groupCount();
                 String[] sa = new String[n];
                 for (int j = 0; j < n; j++) {
                     sa[j] = m.group(j + 1);
@@ -3898,7 +3899,7 @@ public Flags remove(Flags f) {
 
 		public static Flags parse(String s) {
 			Flags f = new Flags(0);
-			if (s == null)
+			if (s == null || s.length() == 0)
 				return f;
 			char[] ca = s.toCharArray();
 			for (int i = 0; i < ca.length; i++) {
