Author: fanningpj
Date: Wed Apr 29 20:26:09 2020
New Revision: 1877175
URL: http://svn.apache.org/viewvc?rev=1877175&view=rev
Log:
[github-176] Remove limit on number of rules in XSSFSheetConditionalFormatting.
This closes #176
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java?rev=1877175&r1=1877174&r2=1877175&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheetConditionalFormatting.java
Wed Apr 29 20:26:09 2020
@@ -132,17 +132,17 @@ public class XSSFSheetConditionalFormatt
*/
public XSSFConditionalFormattingRule
createConditionalFormattingRule(XSSFColor color) {
XSSFConditionalFormattingRule rule = new
XSSFConditionalFormattingRule(_sheet);
-
+
// Have it setup, with suitable defaults
rule.createDataBarFormatting(color);
-
+
// All done!
return rule;
}
public XSSFConditionalFormattingRule
createConditionalFormattingRule(ExtendedColor color) {
return createConditionalFormattingRule((XSSFColor)color);
}
-
+
/**
* A factory method allowing the creation of conditional formatting
* rules using an Icon Set / Multi-State formatting.
@@ -154,10 +154,10 @@ public class XSSFSheetConditionalFormatt
*/
public XSSFConditionalFormattingRule
createConditionalFormattingRule(IconSet iconSet) {
XSSFConditionalFormattingRule rule = new
XSSFConditionalFormattingRule(_sheet);
-
+
// Have it setup, with suitable defaults
rule.createMultiStateFormatting(iconSet);
-
+
// All done!
return rule;
}
@@ -174,14 +174,14 @@ public class XSSFSheetConditionalFormatt
*/
public XSSFConditionalFormattingRule
createConditionalFormattingColorScaleRule() {
XSSFConditionalFormattingRule rule = new
XSSFConditionalFormattingRule(_sheet);
-
+
// Have it setup, with suitable defaults
rule.createColorScaleFormatting();
-
+
// All done!
return rule;
}
-
+
public int addConditionalFormatting(CellRangeAddress[] regions,
ConditionalFormattingRule[] cfRules) {
if (regions == null) {
throw new IllegalArgumentException("regions must not be null");
@@ -194,9 +194,6 @@ public class XSSFSheetConditionalFormatt
if (cfRules.length == 0) {
throw new IllegalArgumentException("cfRules must not be empty");
}
- if (cfRules.length > 3) {
- throw new IllegalArgumentException("Number of rules must not
exceed 3");
- }
CellRangeAddress[] mergeCellRanges =
CellRangeUtil.mergeCellRanges(regions);
CTConditionalFormatting cf =
_sheet.getCTWorksheet().addNewConditionalFormatting();
@@ -218,22 +215,22 @@ public class XSSFSheetConditionalFormatt
}
public int addConditionalFormatting(CellRangeAddress[] regions,
- ConditionalFormattingRule rule1)
+ ConditionalFormattingRule rule1)
{
return addConditionalFormatting(regions,
rule1 == null ? null : new XSSFConditionalFormattingRule[] {
- (XSSFConditionalFormattingRule)rule1
- });
+ (XSSFConditionalFormattingRule)rule1
+ });
}
public int addConditionalFormatting(CellRangeAddress[] regions,
- ConditionalFormattingRule rule1, ConditionalFormattingRule rule2)
+ ConditionalFormattingRule rule1,
ConditionalFormattingRule rule2)
{
return addConditionalFormatting(regions,
rule1 == null ? null : new XSSFConditionalFormattingRule[] {
- (XSSFConditionalFormattingRule)rule1,
- (XSSFConditionalFormattingRule)rule2
- });
+ (XSSFConditionalFormattingRule)rule1,
+ (XSSFConditionalFormattingRule)rule2
+ });
}
/**
@@ -256,12 +253,12 @@ public class XSSFSheetConditionalFormatt
}
/**
- * gets Conditional Formatting object at a particular index
- *
- * @param index
- * of the Conditional Formatting object to fetch
- * @return Conditional Formatting object
- */
+ * gets Conditional Formatting object at a particular index
+ *
+ * @param index
+ * of the Conditional Formatting object to fetch
+ * @return Conditional Formatting object
+ */
public XSSFConditionalFormatting getConditionalFormattingAt(int index) {
checkIndex(index);
CTConditionalFormatting cf =
_sheet.getCTWorksheet().getConditionalFormattingArray(index);
@@ -269,16 +266,16 @@ public class XSSFSheetConditionalFormatt
}
/**
- * @return number of Conditional Formatting objects of the sheet
- */
+ * @return number of Conditional Formatting objects of the sheet
+ */
public int getNumConditionalFormattings() {
return _sheet.getCTWorksheet().sizeOfConditionalFormattingArray();
}
/**
- * removes a Conditional Formatting object by index
- * @param index of a Conditional Formatting object to remove
- */
+ * removes a Conditional Formatting object by index
+ * @param index of a Conditional Formatting object to remove
+ */
public void removeConditionalFormatting(int index) {
checkIndex(index);
_sheet.getCTWorksheet().removeConditionalFormatting(index);
@@ -292,4 +289,4 @@ public class XSSFSheetConditionalFormatt
}
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
