Cleaner code for checking and casting the Color objects

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

src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java

@@ -77,11 +77,7 @@ public final class HSSFFontFormatting implements org.apache.poi.ss.usermodel.Fon
     }
 
     public void setFontColor(Color color) {
-        if (color != null && !(color instanceof HSSFColor)) {
+        HSSFColor hcolor = HSSFColor.toHSSFColor(color);
-            throw new IllegalArgumentException("Only HSSFColor objects are supported");
-        }
-
-        HSSFColor hcolor = (HSSFColor)color;
         if (hcolor == null) {
             fontFormatting.setFontColorIndex((short)0);
         } else {

src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java

@@ -74,10 +74,7 @@ public class HSSFPatternFormatting implements org.apache.poi.ss.usermodel.Patter
     }
 
     public void setFillBackgroundColor(Color bg) {
-        if (bg != null && !(bg instanceof HSSFColor)) {
+        HSSFColor hcolor = HSSFColor.toHSSFColor(bg);
-            throw new IllegalArgumentException("Only HSSFColor objects are supported");
-        }
-        HSSFColor hcolor = (HSSFColor)bg;
         if (hcolor == null) {
             setFillBackgroundColor((short)0);
         } else {
@@ -86,10 +83,7 @@ public class HSSFPatternFormatting implements org.apache.poi.ss.usermodel.Patter
     }
 
     public void setFillForegroundColor(Color fg) {
-        if (fg != null && !(fg instanceof HSSFColor)) {
+        HSSFColor hcolor = HSSFColor.toHSSFColor(fg);
-            throw new IllegalArgumentException("Only HSSFColor objects are supported");
-        }
-        HSSFColor hcolor = (HSSFColor)fg;
         if (hcolor == null) {
             setFillForegroundColor((short)0);
         } else {

src/java/org/apache/poi/hssf/util/HSSFColor.java

@@ -205,6 +205,13 @@ public class HSSFColor implements Color {
         return BLACK.hexString;
     }
     
+    public static HSSFColor toHSSFColor(Color color) {
+        if (color != null && !(color instanceof HSSFColor)) {
+            throw new IllegalArgumentException("Only HSSFColor objects are supported");
+        }
+        return (HSSFColor)color;
+    }
+
     /**
      * Class BLACK
      *

src/java/org/apache/poi/ss/usermodel/BorderFormatting.java

@@ -20,8 +20,8 @@
 package org.apache.poi.ss.usermodel;
 
 /**
- * @author Dmitriy Kumshayev
+ * High level representation for Border Formatting component
- * @author Yegor Kozlov
+ * of Conditional Formatting settings
  */
 public interface BorderFormatting {
     /** No border */

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java

@@ -316,6 +316,13 @@ public class XSSFColor implements Color {
         return ctColor;
     }
 
+    public static XSSFColor toXSSFColor(Color color) {
+        if (color != null && !(color instanceof XSSFColor)) {
+            throw new IllegalArgumentException("Only XSSFColor objects are supported");
+        }
+        return (XSSFColor)color;
+    }
+    
     public int hashCode(){
         return ctColor.toString().hashCode();
     }

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java

@@ -97,11 +97,7 @@ public class XSSFFontFormatting implements FontFormatting {
     }
 
     public void setFontColor(Color color) {
-        if (color != null && !(color instanceof XSSFColor)) {
+        XSSFColor xcolor = XSSFColor.toXSSFColor(color);
-            throw new IllegalArgumentException("Only XSSFColor objects are supported");
-        }
-         
-        XSSFColor xcolor = (XSSFColor)color;
         if (xcolor == null) {
             _font.getColorList().clear();
         } else {

src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java

@@ -63,10 +63,7 @@ public class XSSFPatternFormatting implements PatternFormatting {
     }
 
     public void setFillBackgroundColor(Color bg) {
-        if (bg != null && !(bg instanceof XSSFColor)) {
+        XSSFColor xcolor = XSSFColor.toXSSFColor(bg);
-            throw new IllegalArgumentException("Only XSSFColor objects are supported");
-        }
-        XSSFColor xcolor = (XSSFColor)bg;
         setFillBackgroundColor(xcolor.getCTColor());
     }
     public void setFillBackgroundColor(short bg) {
@@ -80,10 +77,7 @@ public class XSSFPatternFormatting implements PatternFormatting {
     }
     
     public void setFillForegroundColor(Color fg) {
-        if (fg != null && !(fg instanceof XSSFColor)) {
+        XSSFColor xcolor = XSSFColor.toXSSFColor(fg);
-            throw new IllegalArgumentException("Only XSSFColor objects are supported");
-        }
-        XSSFColor xcolor = (XSSFColor)fg;
         setFillForegroundColor(xcolor.getCTColor());
     }
     public void setFillForegroundColor(short fg) {