[jboss-svn-commits] JBoss Common SVN: r3227 - jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/formatters.

[jboss-svn-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-06-05 10:24:42 -0400 (Fri, 05 Jun 2009)
New Revision: 3227

Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/formatters/FormatStringParser.java
Log:
Fix a mixup in the regex

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/formatters/FormatStringParser.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/formatters/FormatStringParser.java	2009-06-05 14:24:22 UTC (rev 3226)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/formatters/FormatStringParser.java	2009-06-05 14:24:42 UTC (rev 3227)
@@ -36,11 +36,11 @@
      */
     private static final Pattern pattern = Pattern.compile(
                 // greedily match all non-format characters
-                "([^%]+)" +
+                "([^%]++)" +
                 // match a format string...
                 "|(?:%" +
                     // optional minimum width plus justify flag
-                    "((-)?\\d+)?" +
+                    "(?:(-)?(\\d+))?" +
                     // optional maximum width
                     "(?:\\.(\\d+))?" +
                     // the actual format character
@@ -69,8 +69,8 @@
             if (otherText != null) {
                 stepList.add(Formatters.textFormatStep(otherText));
             } else {
-                final String minWidthString = matcher.group(2);
-                final String hypen = matcher.group(3);
+                final String hypen = matcher.group(2);
+                final String minWidthString = matcher.group(3);
                 final String maxWidthString = matcher.group(4);
                 final String formatCharString = matcher.group(5);
                 final String argument = matcher.group(6);