Author: fanningpj
Date: Sun Jul 10 14:32:49 2022
New Revision: 1902634
URL: http://svn.apache.org/viewvc?rev=1902634&view=rev
Log:
remove ignoreInvalidColors param
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java?rev=1902634&r1=1902633&r2=1902634&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
Sun Jul 10 14:32:49 2022
@@ -833,16 +833,14 @@ public class XSSFCellStyle implements Ce
* Set the background fill color represented as a {@link
org.apache.poi.ss.usermodel.Color} value.
* <br>
* @param color org.apache.poi.ss.usermodel.Color to set
- * @param ignoreInvalidColors when set to true, the method will ignore
issues like trying to set a
- * HSSFColor on a XSSFCellStyle
* @throws IllegalArgumentException if you provide a <code>Color</code>
instance that is not a {@link XSSFColor}
* @since POI 5.2.3
*/
@Override
- public void setFillBackgroundColor(org.apache.poi.ss.usermodel.Color
color, boolean ignoreInvalidColors) {
+ public void setFillBackgroundColor(org.apache.poi.ss.usermodel.Color
color) {
if (color == null || color instanceof XSSFColor) {
setFillBackgroundColor((XSSFColor)color);
- } else if (!ignoreInvalidColors) {
+ } else {
throw new IllegalArgumentException("XSSFCellStyle only accepts
XSSFColor instances");
}
}
@@ -905,16 +903,14 @@ public class XSSFCellStyle implements Ce
* Set the foreground fill color represented as a {@link
org.apache.poi.ss.usermodel.Color} value.
* <br>
* @param color the color to use
- * @param ignoreInvalidColors when set to true, the method will ignore
issues like trying to set a
- * HSSFColor on a XSSFCellStyle
* @throws IllegalArgumentException if you provide a <code>Color</code>
instance that is not a {@link XSSFColor}
* @since POI 5.2.3
*/
@Override
- public void setFillForegroundColor(org.apache.poi.ss.usermodel.Color
color, boolean ignoreInvalidColors) {
+ public void setFillForegroundColor(org.apache.poi.ss.usermodel.Color
color) {
if (color == null || color instanceof XSSFColor) {
setFillForegroundColor((XSSFColor)color);
- } else if (!ignoreInvalidColors) {
+ } else {
throw new IllegalArgumentException("XSSFCellStyle only accepts
XSSFColor instances");
}
}
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java?rev=1902634&r1=1902633&r2=1902634&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/hssf/usermodel/HSSFCellStyle.java
Sun Jul 10 14:32:49 2022
@@ -642,18 +642,16 @@ public final class HSSFCellStyle impleme
* Set the background fill color represented as a {@link
org.apache.poi.ss.usermodel.Color} value.
* <br>
* @param color the color to use
- * @param ignoreInvalidColors when set to true, the method will ignore
issues like trying to set a
- * XSSFColor on a HSSFCellStyle
* @throws IllegalArgumentException if you provide a <code>Color</code>
instance that is not a {@link HSSFColor}
* @since POI 5.2.3
*/
@Override
- public void setFillBackgroundColor(org.apache.poi.ss.usermodel.Color
color, boolean ignoreInvalidColors)
+ public void setFillBackgroundColor(org.apache.poi.ss.usermodel.Color color)
{
if (color instanceof HSSFColor) {
short index2 = ((HSSFColor)color).getIndex2();
if (index2 != -1) setFillBackgroundColor(index2);
- } else if (color != null && !ignoreInvalidColors) {
+ } else if (color != null) {
throw new IllegalArgumentException("HSSFCellStyle only accepts
HSSFColor instances");
}
}
@@ -703,18 +701,16 @@ public final class HSSFCellStyle impleme
* Set the foreground fill color represented as a {@link
org.apache.poi.ss.usermodel.Color} value.
* <br>
* @param color the color to use
- * @param ignoreInvalidColors when set to true, the method will ignore
issues like trying to set a
- * XSSFColor on a HSSFCellStyle
* @throws IllegalArgumentException if you provide a <code>Color</code>
instance that is not a {@link HSSFColor}
* @since POI 5.2.3
*/
@Override
- public void setFillForegroundColor(org.apache.poi.ss.usermodel.Color
color, boolean ignoreInvalidColors)
+ public void setFillForegroundColor(org.apache.poi.ss.usermodel.Color color)
{
if (color instanceof HSSFColor) {
short index2 = ((HSSFColor)color).getIndex2();
if (index2 != -1) setFillForegroundColor(index2);
- } else if (color != null && !ignoreInvalidColors) {
+ } else if (color != null) {
throw new IllegalArgumentException("HSSFCellStyle only accepts
HSSFColor instances");
}
}
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java?rev=1902634&r1=1902633&r2=1902634&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/usermodel/CellStyle.java Sun
Jul 10 14:32:49 2022
@@ -318,20 +318,7 @@ public interface CellStyle {
* @param color org.apache.poi.ss.usermodel.Color to set
* @since POI 5.2.3
*/
- default void setFillBackgroundColor(Color color) {
- setFillBackgroundColor(color, false);
- }
-
- /**
- * Set the background fill color.
- * Uses a {@link org.apache.poi.ss.usermodel.Color} instead of an indexed
color.
- *
- * @param color org.apache.poi.ss.usermodel.Color to set
- * @param ignoreInvalidColors when set to true, the method will ignore
issues like trying to set a
- * HSSFColor on a XSSFCellStyle
- * @since POI 5.2.3
- */
- void setFillBackgroundColor(Color color, boolean ignoreInvalidColors);
+ void setFillBackgroundColor(Color color);
/**
* get the background fill color, if the fill
@@ -363,20 +350,7 @@ public interface CellStyle {
* @param color org.apache.poi.ss.usermodel.Color to set
* @since POI 5.2.3
*/
- default void setFillForegroundColor(Color color) {
- setFillForegroundColor(color, false);
- }
-
- /**
- * Set the foreground fill color.
- * Uses a {@link org.apache.poi.ss.usermodel.Color} instead of an indexed
color.
- *
- * @param color org.apache.poi.ss.usermodel.Color to set
- * @param ignoreInvalidColors when set to true, the method will ignore
issues like trying to set a
- * HSSFColor on a XSSFCellStyle
- * @since POI 5.2.3
- */
- void setFillForegroundColor(Color color, boolean ignoreInvalidColors);
+ void setFillForegroundColor(Color color);
/**
* get the foreground fill color, if the fill
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
