[patch] updates to use constants, add comments, and another unit test case

patch-dv-static-list.txt (text/plain), 2.48 KB, created by Greg Woolsey on 2016-06-19 21:24:10 UTC

(hide)

Description: updates to use constants, add comments, and another unit test case

Filename:

MIME Type:

Creator: Greg Woolsey

Created: 2016-06-19 21:24:10 UTC

Size: 2.48 KB

patch

obsolete

>Index: src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java >=================================================================== >--- src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java (revision 1749206) >+++ src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java (working copy) >@@ -69,6 +69,14 @@ > validate(); > } > >+ /** >+ * This is the constructor called using the OOXML raw data. Excel overloads formula1 to also encode explicit value lists, >+ * so this constructor has to check for and parse that syntax. >+ * @param validationType >+ * @param operator >+ * @param formula1 >+ * @param formula2 >+ */ > public XSSFDataValidationConstraint(int validationType, int operator,String formula1, String formula2) { > super(); > setFormula1(formula1); >@@ -130,8 +138,11 @@ > */ > public void setExplicitListValues(String[] explicitListValues) { > this.explicitListOfValues = explicitListValues; >+ >+ // for OOXML we need to set formula1 to the quoted csv list of values (doesn't appear documented, but that's where Excel puts its lists) >+ // further, Excel has no escaping for commas in explicit lists, so we don't need to worry about that. > if( explicitListOfValues!=null && explicitListOfValues.length > 0 ) { >- StringBuilder builder = new StringBuilder("\""); >+ StringBuilder builder = new StringBuilder(QUOTE); > for (int i = 0; i < explicitListValues.length; i++) { > String string = explicitListValues[i]; > if( builder.length() > 1) { >@@ -139,7 +150,7 @@ > } > builder.append(string); > } >- builder.append("\""); >+ builder.append(QUOTE); > setFormula1(builder.toString()); > } > } >Index: src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java >=================================================================== >--- src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java (revision 1749206) >+++ src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDataValidationConstraint.java (working copy) >@@ -43,6 +43,9 @@ > String namedRange = "MyNamedRange"; > constraint = new XSSFDataValidationConstraint(listType, ignoredType, namedRange, null); > assertNull(constraint.getExplicitListValues()); >+ >+ constraint = new XSSFDataValidationConstraint(expected); >+ assertEquals(literal.replace(" ", ""), constraint.getFormula1()); > } > > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]