Author: nick
Date: Tue Jul 14 19:29:18 2015
New Revision: 1691064
URL: http://svn.apache.org/r1691064
Log:
Cleaner code for checking and casting the Color objects
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFontFormatting.java
Tue Jul 14 19:29:18 2015
@@ -77,11 +77,7 @@ public final class HSSFFontFormatting im
}
public void setFontColor(Color color) {
- if (color != null && !(color instanceof HSSFColor)) {
- throw new IllegalArgumentException("Only HSSFColor objects are
supported");
- }
-
- HSSFColor hcolor = (HSSFColor)color;
+ HSSFColor hcolor = HSSFColor.toHSSFColor(color);
if (hcolor == null) {
fontFormatting.setFontColorIndex((short)0);
} else {
Modified:
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
(original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFPatternFormatting.java
Tue Jul 14 19:29:18 2015
@@ -74,10 +74,7 @@ public class HSSFPatternFormatting imple
}
public void setFillBackgroundColor(Color bg) {
- if (bg != null && !(bg instanceof HSSFColor)) {
- throw new IllegalArgumentException("Only HSSFColor objects are
supported");
- }
- HSSFColor hcolor = (HSSFColor)bg;
+ HSSFColor hcolor = HSSFColor.toHSSFColor(bg);
if (hcolor == null) {
setFillBackgroundColor((short)0);
} else {
@@ -86,10 +83,7 @@ public class HSSFPatternFormatting imple
}
public void setFillForegroundColor(Color fg) {
- if (fg != null && !(fg instanceof HSSFColor)) {
- throw new IllegalArgumentException("Only HSSFColor objects are
supported");
- }
- HSSFColor hcolor = (HSSFColor)fg;
+ HSSFColor hcolor = HSSFColor.toHSSFColor(fg);
if (hcolor == null) {
setFillForegroundColor((short)0);
} else {
Modified: poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/util/HSSFColor.java Tue Jul 14
19:29:18 2015
@@ -204,6 +204,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
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/BorderFormatting.java Tue
Jul 14 19:29:18 2015
@@ -20,8 +20,8 @@
package org.apache.poi.ss.usermodel;
/**
- * @author Dmitriy Kumshayev
- * @author Yegor Kozlov
+ * High level representation for Border Formatting component
+ * of Conditional Formatting settings
*/
public interface BorderFormatting {
/** No border */
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFColor.java Tue
Jul 14 19:29:18 2015
@@ -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();
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFFontFormatting.java
Tue Jul 14 19:29:18 2015
@@ -97,11 +97,7 @@ public class XSSFFontFormatting implemen
}
public void setFontColor(Color color) {
- if (color != null && !(color instanceof XSSFColor)) {
- throw new IllegalArgumentException("Only XSSFColor objects are
supported");
- }
-
- XSSFColor xcolor = (XSSFColor)color;
+ XSSFColor xcolor = XSSFColor.toXSSFColor(color);
if (xcolor == null) {
_font.getColorList().clear();
} else {
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java?rev=1691064&r1=1691063&r2=1691064&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPatternFormatting.java
Tue Jul 14 19:29:18 2015
@@ -63,10 +63,7 @@ public class XSSFPatternFormatting imple
}
public void setFillBackgroundColor(Color bg) {
- if (bg != null && !(bg instanceof XSSFColor)) {
- throw new IllegalArgumentException("Only XSSFColor objects are
supported");
- }
- XSSFColor xcolor = (XSSFColor)bg;
+ XSSFColor xcolor = XSSFColor.toXSSFColor(bg);
setFillBackgroundColor(xcolor.getCTColor());
}
public void setFillBackgroundColor(short bg) {
@@ -80,10 +77,7 @@ public class XSSFPatternFormatting imple
}
public void setFillForegroundColor(Color fg) {
- if (fg != null && !(fg instanceof XSSFColor)) {
- throw new IllegalArgumentException("Only XSSFColor objects are
supported");
- }
- XSSFColor xcolor = (XSSFColor)fg;
+ XSSFColor xcolor = XSSFColor.toXSSFColor(fg);
setFillForegroundColor(xcolor.getCTColor());
}
public void setFillForegroundColor(short fg) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
