From 5c3415e09c014a5335042dd744190d15d822d6ab Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Mon, 14 Jun 2010 11:45:09 +0000
Subject: [PATCH] When formatting numbers with DataFormatter, handle brackets
 following colours

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@954416 13f79535-47bb-0310-9956-ffa450edef68
---
 src/documentation/content/xdocs/status.xml    |  1 +
 .../poi/ss/usermodel/DataFormatter.java       |  4 +-
 .../poi/ss/usermodel/TestDataFormatter.java   | 38 +++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 16ca0807f..71f083915 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 
     <changes>
         <release version="3.7-beta2" date="2010-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">When formatting numbers with DataFormatter, handle brackets following colours</action>
         </release>
         <release version="3.7-beta1" date="2010-06-16">
            <action dev="POI-DEVELOPERS" type="add">48574 - further XWPF support for tables, paragraphs, including enhanced support for adding new ones</action>
diff --git a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java b/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
index 36ba5a1b6..de586db66 100644
--- a/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
+++ b/src/java/org/apache/poi/ss/usermodel/DataFormatter.java
@@ -233,14 +233,14 @@ public class DataFormatter {
            int at = formatStr.indexOf(colour);
            if(at == -1) break;
            String nFormatStr = formatStr.substring(0,at) +
-              formatStr.substring(at+colour.length()+1);
+              formatStr.substring(at+colour.length());
            if(nFormatStr.equals(formatStr)) break;
 
            // Try again in case there's multiple
            formatStr = nFormatStr;
            colourM = colorPattern.matcher(formatStr);
         }
-        
+
         // try to extract special characters like currency
         Matcher m = specialPatternGroup.matcher(formatStr);
         while(m.find()) {
diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java b/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
index 35be8c4ff..06abd6c50 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java
@@ -77,6 +77,44 @@ public class TestDataFormatter extends TestCase {
        assertEquals("[ab]12.34[x]", dfUS.formatRawCellContents(12.343, -1, "[ab]##.##[x]"));
     }
     
+    public void testColoursAndBrackets() {
+       DataFormatter dfUS = new DataFormatter(Locale.US);
+       
+       // Without currency symbols
+       String[] formats = new String[] {
+             "#,##0.00;[Blue](#,##0.00)",
+       };
+       for(String format : formats) {
+          assertEquals(
+                "Wrong format for: " + format,
+                "12.34",
+                dfUS.formatRawCellContents(12.343, -1, format)
+          );
+          assertEquals(
+                "Wrong format for: " + format,
+                "(12.34)",
+                dfUS.formatRawCellContents(-12.343, -1, format)
+          );
+       }
+       
+       // With
+       formats = new String[] {
+             "$#,##0.00;[Red]($#,##0.00)"
+       };
+       for(String format : formats) {
+          assertEquals(
+                "Wrong format for: " + format,
+                "$12.34",
+                dfUS.formatRawCellContents(12.343, -1, format)
+          );
+          assertEquals(
+                "Wrong format for: " + format,
+                "($12.34)",
+                dfUS.formatRawCellContents(-12.343, -1, format)
+          );
+       }
+    }
+    
     /**
      * Test how we handle negative and zeros.
      * Note - some tests are disabled as DecimalFormat