From: Nick Burch <nick@apache.org>
Date: Fri, 4 Jul 2008 09:58:21 +0000 (+0000)
Subject: Fix bug #45336 - Fix HSSFColor.getTripletHash()
X-Git-Tag: REL_3_2_FINAL~267
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ffbb1ee03d62420a0e687c71e55ee3088aa2d659;p=poi.git

Fix bug #45336 - Fix HSSFColor.getTripletHash()

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@673987 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/documentation/content/xdocs/changes.xml b/src/documentation/content/xdocs/changes.xml
index 104082dedd..f9f29be397 100644
--- a/src/documentation/content/xdocs/changes.xml
+++ b/src/documentation/content/xdocs/changes.xml
@@ -37,6 +37,7 @@
 
 		<!-- Don't forget to update status.xml too! -->
         <release version="3.1.1-alpha1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">45336 - Fix HSSFColor.getTripletHash()</action>
            <action dev="POI-DEVELOPERS" type="fix">45334 - Fixed formula parser to handle dots in identifiers</action>
            <action dev="POI-DEVELOPERS" type="fix">45252 - Improvement for HWPF Range.replaceText()</action>
            <action dev="POI-DEVELOPERS" type="fix">45001 - Further fix for HWPF Range.delete() and unicode characters</action>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 6a890e9934..d2c0907a8b 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -34,6 +34,7 @@
 	<!-- Don't forget to update changes.xml too! -->
     <changes>
         <release version="3.1.1-alpha1" date="2008-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">45336 - Fix HSSFColor.getTripletHash()</action>
            <action dev="POI-DEVELOPERS" type="fix">45334 - Fixed formula parser to handle dots in identifiers</action>
            <action dev="POI-DEVELOPERS" type="fix">45252 - Improvement for HWPF Range.replaceText()</action>
            <action dev="POI-DEVELOPERS" type="fix">45001 - Further fix for HWPF Range.delete() and unicode characters</action>
diff --git a/src/java/org/apache/poi/hssf/util/HSSFColor.java b/src/java/org/apache/poi/hssf/util/HSSFColor.java
index 4ecc6545fd..289b01ef2b 100644
--- a/src/java/org/apache/poi/hssf/util/HSSFColor.java
+++ b/src/java/org/apache/poi/hssf/util/HSSFColor.java
@@ -152,8 +152,12 @@ public class HSSFColor {
 
             String hexString = color.getHexString();
             if (result.containsKey(hexString)) {
-                throw new RuntimeException("Dup color hexString (" + hexString
-                        + ") for color (" + color.getClass().getName() + ")");
+            	HSSFColor other = (HSSFColor)result.get(hexString);
+                throw new RuntimeException(
+                		"Dup color hexString (" + hexString
+                        + ") for color (" + color.getClass().getName() + ") - "
+                        + " already taken by (" + other.getClass().getName() + ")"
+                );
             }
             result.put(hexString, color);
         }
@@ -1508,9 +1512,9 @@ public class HSSFColor {
         public final static short   index     = 0x19;
         public final static short[] triplet   =
         {
-            153, 51, 102
+            127, 0, 0
         };
-        public final static String  hexString = "9999:3333:6666";
+        public final static String  hexString = "8000:0:0";
 
         public short getIndex()
         {