From b6e6b8c922694a86cebe9843bfe6873d312b2065 Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Fri, 14 Oct 2016 08:09:39 +0000 Subject: [PATCH] bug 60253: add helper functions to make the constructor formula1-overloading code simpler git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1764831 13f79535-47bb-0310-9956-ffa450edef68 --- .../XSSFDataValidationConstraint.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java index 29bcc04c75..d42641eb86 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataValidationConstraint.java @@ -82,6 +82,7 @@ public class XSSFDataValidationConstraint implements DataValidationConstraint { */ public XSSFDataValidationConstraint(int validationType, int operator, String formula1, String formula2) { super(); + //removes leading equals sign if present setFormula1(formula1); setFormula2(formula2); this.validationType = validationType; @@ -92,12 +93,10 @@ public class XSSFDataValidationConstraint implements DataValidationConstraint { //FIXME: Need to confirm if this is not a formula. // empirical testing shows Excel saves explicit lists surrounded by double quotes, // range formula expressions can't start with quotes (I think - anyone have a creative counter example?) - if( ValidationType.LIST==validationType - && formula1 != null - && formula1.startsWith(QUOTE) - && formula1.endsWith(QUOTE) ) { - final String formulaWithoutQuotes = formula1.substring(1, formula1.length()-1); - explicitListOfValues = LIST_SPLIT_REGEX.split(formulaWithoutQuotes); + if ( ValidationType.LIST == validationType + && this.formula1 != null + && isQuoted(this.formula1) ) { + explicitListOfValues = LIST_SPLIT_REGEX.split(unquote(this.formula1)); } } @@ -168,6 +167,19 @@ public class XSSFDataValidationConstraint implements DataValidationConstraint { protected static String removeLeadingEquals(String formula1) { return isFormulaEmpty(formula1) ? formula1 : formula1.charAt(0)=='=' ? formula1.substring(1) : formula1; } + private static boolean isQuoted(String s) { + return s.startsWith(QUOTE) && s.endsWith(QUOTE); + } + private static String unquote(String s) { + // removes leading and trailing quotes from a quoted string + if (isQuoted(s)) { + return s.substring(1, s.length()-1); + } + return s; + } + protected static boolean isFormulaEmpty(String formula1) { + return formula1 == null || formula1.trim().length()==0; + } /* (non-Javadoc) * @see org.apache.poi.ss.usermodel.DataValidationConstraint#setFormula2(java.lang.String) @@ -207,9 +219,6 @@ public class XSSFDataValidationConstraint implements DataValidationConstraint { } } - protected static boolean isFormulaEmpty(String formula1) { - return formula1 == null || formula1.trim().length()==0; - } public String prettyPrint() { StringBuilder builder = new StringBuilder(); -- 2.39.5