From a748887d6ba61dba2df57c45de7f78d5476d8a45 Mon Sep 17 00:00:00 2001
From: Nick Burch
* Returns the formatted value of a cell as a String regardless
* of the cell type. If the Excel format pattern cannot be parsed then the
- * cell value will be formatted using a default format.
+ * cell value will be formatted using a default format.
* When passed a null or blank cell, this method will return an empty
* String (""). Formulas in formula type cells will not be evaluated.
*
* Returns the formatted value of a cell as a String regardless
* of the cell type. If the Excel format pattern cannot be parsed then the
- * cell value will be formatted using a default format.
+ * cell value will be formatted using a default format.
* When passed a null or blank cell, this method will return an empty
* String (""). Formula cells will be evaluated using the given
* {@link HSSFFormulaEvaluator} if the evaluator is non-null. If the
* evaluator is null, then the formula String will be returned. The caller
- * is responsible for setting the currentRow on the evaluator, otherwise an
- * IllegalArgumentException may be thrown.
+ * is responsible for setting the currentRow on the evaluator
*
* Sets a default number format to be used when the Excel format cannot be
@@ -552,7 +533,7 @@ public class HSSFDataFormatter {
* numeric cell. Therefore the code in the format method should expect a
*
@@ -575,7 +556,7 @@ public class HSSFDataFormatter {
* by
* HSSFDataFormatter.setDefaultNumberFormat(Format)
. Note: the
* default format will only be used when a Format cannot be created from the
- * cell's data format string.
- *
+ * cell's data format string.
+ *
* @author James May (james dot may at fmr dot com)
*
*/
-public class HSSFDataFormatter {
+public final class HSSFDataFormatter {
/** Pattern to find a number format: "0" or "#" */
- protected Pattern numPattern;
-
+ private static final Pattern numPattern = Pattern.compile("[0#]+");
+
/** Pattern to find days of week as text "ddd...." */
- protected Pattern daysAsText;
-
+ private static final Pattern daysAsText = Pattern.compile("([d]{3,})", Pattern.CASE_INSENSITIVE);
+
/** Pattern to find "AM/PM" marker */
- protected Pattern amPmPattern;
+ private static final Pattern amPmPattern = Pattern.compile("((A|P)[M/P]*)", Pattern.CASE_INSENSITIVE);
/** A regex to find patterns like [$$-1009] and [$�-452]. */
- protected Pattern specialPatternGroup;
-
+ private static final Pattern specialPatternGroup = Pattern.compile("(\\[\\$[^-\\]]*-[0-9A-Z]+\\])");
+
/** General format for whole numbers. */
- protected Format generalWholeNumFormat;
-
+ private static final Format generalWholeNumFormat = new DecimalFormat("#");
+
/** General format for decimal numbers. */
- protected Format generalDecimalNumFormat;
-
+ private static final Format generalDecimalNumFormat = new DecimalFormat("#.##########");
+
/** A default format to use when a number pattern cannot be parsed. */
- protected Format defaultNumFormat;
-
- /**
+ private Format defaultNumFormat;
+
+ /**
* A map to cache formats.
* Mapnull
if the any of the
@@ -149,15 +135,15 @@ public class HSSFDataFormatter {
* true
if d is a whole number
*/
private static boolean isWholeNumber(double d) {
return d == Math.floor(d);
}
-
+
/**
* Returns a default format for a cell.
* @param cell The cell
* @return a default format
*/
- protected Format getDefaultFormat(HSSFCell cell) {
+ public Format getDefaultFormat(HSSFCell cell) {
return getDefaultFormat(cell.getNumericCellValue());
}
private Format getDefaultFormat(double cellValue) {
// for numeric cells try user supplied default
if (defaultNumFormat != null) {
return defaultNumFormat;
-
- // otherwise use general format
- } else if (isWholeNumber(cellValue)){
+
+ // otherwise use general format
+ }
+ if (isWholeNumber(cellValue)){
return generalWholeNumFormat;
- } else {
- return generalDecimalNumFormat;
}
+ return generalDecimalNumFormat;
}
-
+
/**
* Returns the formatted value of an Excel date as a String based
* on the cell's DataFormat
. i.e. "Thursday, January 02, 2003"
* , "01/02/2003" , "02-Jan" , etc.
- *
+ *
* @param cell The cell
* @return a formatted date string
- */
- protected String getFormattedDateString(HSSFCell cell) {
- Format dateFormat = getFormat(cell);
- Date d = cell.getDateCellValue();
- if (dateFormat != null) {
- return dateFormat.format(d);
- } else {
- return d.toString();
- }
- }
-
+ */
+ private String getFormattedDateString(HSSFCell cell) {
+ Format dateFormat = getFormat(cell);
+ Date d = cell.getDateCellValue();
+ if (dateFormat != null) {
+ return dateFormat.format(d);
+ }
+ return d.toString();
+ }
+
/**
* Returns the formatted value of an Excel number as a String
* based on the cell's DataFormat
. Supported formats include
* currency, percents, decimals, phone number, SSN, etc.:
* "61.54%", "$100.00", "(800) 555-1234".
- *
+ *
* @param cell The cell
* @return a formatted number string
- */
- protected String getFormattedNumberString(HSSFCell cell) {
-
- Format numberFormat = getFormat(cell);
- double d = cell.getNumericCellValue();
- if (numberFormat != null) {
- return numberFormat.format(new Double(d));
- } else {
- return String.valueOf(d);
- }
- }
-
- /**
- * Formats the given raw cell value, based on the supplied
- * format index and string, according to excel style rules.
- * @see #formatCellValue(HSSFCell)
- */
- public String formatRawCellContents(double value, int formatIndex, String formatString) {
- // Is it a date?
- if(HSSFDateUtil.isADateFormat(formatIndex,formatString) &&
- HSSFDateUtil.isValidExcelDate(value)) {
-
- Format dateFormat = getFormat(value, formatIndex, formatString);
- Date d = HSSFDateUtil.getJavaDate(value);
- if (dateFormat != null) {
- return dateFormat.format(d);
- } else {
- return d.toString();
- }
- } else {
- // Number
- Format numberFormat = getFormat(value, formatIndex, formatString);
- if (numberFormat != null) {
- return numberFormat.format(new Double(value));
- } else {
- return String.valueOf(value);
- }
- }
- }
-
+ */
+ private String getFormattedNumberString(HSSFCell cell) {
+
+ Format numberFormat = getFormat(cell);
+ double d = cell.getNumericCellValue();
+ if (numberFormat == null) {
+ return String.valueOf(d);
+ }
+ return numberFormat.format(new Double(d));
+ }
+
+ /**
+ * Formats the given raw cell value, based on the supplied
+ * format index and string, according to excel style rules.
+ * @see #formatCellValue(HSSFCell)
+ */
+ public String formatRawCellContents(double value, int formatIndex, String formatString) {
+ // Is it a date?
+ if(HSSFDateUtil.isADateFormat(formatIndex,formatString) &&
+ HSSFDateUtil.isValidExcelDate(value)) {
+
+ Format dateFormat = getFormat(value, formatIndex, formatString);
+ Date d = HSSFDateUtil.getJavaDate(value);
+ if (dateFormat == null) {
+ return d.toString();
+ }
+ return dateFormat.format(d);
+ }
+ // else Number
+ Format numberFormat = getFormat(value, formatIndex, formatString);
+ if (numberFormat == null) {
+ return String.valueOf(value);
+ }
+ return numberFormat.format(new Double(value));
+ }
+
/**
*
- * HSSFCell.CELL_TYPE_FORMULA
and evaluator is not null
- * and the evlaluator's currentRow has not been set.
*/
- public String formatCellValue(HSSFCell cell,
+ public String formatCellValue(HSSFCell cell,
HSSFFormulaEvaluator evaluator) throws IllegalArgumentException {
- String value = "";
if (cell == null) {
- return value;
+ return "";
}
-
+
int cellType = cell.getCellType();
if (evaluator != null && cellType == HSSFCell.CELL_TYPE_FORMULA) {
try {
cellType = evaluator.evaluateFormulaCell(cell);
- } catch (Throwable t) {
- throw new IllegalArgumentException("Did you forget to set the current" +
- " row on the HSSFFormulaEvaluator?", t);
+ } catch (RuntimeException e) {
+ throw new RuntimeException("Did you forget to set the current" +
+ " row on the HSSFFormulaEvaluator?", e);
}
- }
+ }
switch (cellType)
- {
- case HSSFCell.CELL_TYPE_FORMULA :
- // should only occur if evaluator is null
- value = cell.getCellFormula();
- break;
-
- case HSSFCell.CELL_TYPE_NUMERIC :
-
- if (HSSFDateUtil.isCellDateFormatted(cell)) {
- value = getFormattedDateString(cell);
- } else {
- value = getFormattedNumberString(cell);
- }
- break;
-
- case HSSFCell.CELL_TYPE_STRING :
- value = cell.getRichStringCellValue().getString();
- break;
-
- case HSSFCell.CELL_TYPE_BOOLEAN :
- value = String.valueOf(cell.getBooleanCellValue());
- }
- return value;
+ {
+ case HSSFCell.CELL_TYPE_FORMULA :
+ // should only occur if evaluator is null
+ return cell.getCellFormula();
+
+ case HSSFCell.CELL_TYPE_NUMERIC :
+
+ if (HSSFDateUtil.isCellDateFormatted(cell)) {
+ return getFormattedDateString(cell);
+ }
+ return getFormattedNumberString(cell);
+
+ case HSSFCell.CELL_TYPE_STRING :
+ return cell.getRichStringCellValue().getString();
+
+ case HSSFCell.CELL_TYPE_BOOLEAN :
+ return String.valueOf(cell.getBooleanCellValue());
+ case HSSFCell.CELL_TYPE_BLANK :
+ return "";
+ }
+ throw new RuntimeException("Unexpected celltype (" + cellType + ")");
}
-
-
+
+
/**
* Number
value.
* java.text.Format#format
) will be a double value from a
* numeric cell. Therefore the code in the format method should expect a
* Number
value.
- *
true
+ */
+ /* package */ static DecimalFormat createIntegerOnlyFormat(String fmt) {
+ DecimalFormat result = new DecimalFormat(fmt);
+ result.setParseIntegerOnly(true);
+ return result;
+ }
/**
* Format class for Excel's SSN format. This class mimics Excel's built-in
* SSN formatting.
- *
+ *
* @author James May
*/
- static class SSNFormat extends Format {
- private DecimalFormat df;
-
- /** Constructor */
- public SSNFormat() {
- df = new DecimalFormat("000000000");
- df.setParseIntegerOnly(true);
- }
-
+ private static final class SSNFormat extends Format {
+ public static final Format instance = new SSNFormat();
+ private static final DecimalFormat df = createIntegerOnlyFormat("000000000");
+ private SSNFormat() {
+ // enforce singleton
+ }
+
/** Format a number as an SSN */
- public String format(Number num) {
+ public static String format(Number num) {
String result = df.format(num);
StringBuffer sb = new StringBuffer();
sb.append(result.substring(0, 3)).append('-');
@@ -609,66 +596,60 @@ public class HSSFDataFormatter {
sb.append(result.substring(5, 9));
return sb.toString();
}
-
- public StringBuffer format(Object obj, StringBuffer toAppendTo,
- FieldPosition pos) {
+
+ public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
return toAppendTo.append(format((Number)obj));
}
-
+
public Object parseObject(String source, ParsePosition pos) {
return df.parseObject(source, pos);
}
}
-
+
/**
* Format class for Excel Zip + 4 format. This class mimics Excel's
* built-in formatting for Zip + 4.
* @author James May
- */
- static class ZipPlusFourFormat extends Format {
- private DecimalFormat df;
-
- /** Constructor */
- public ZipPlusFourFormat() {
- df = new DecimalFormat("000000000");
- df.setParseIntegerOnly(true);
- }
-
+ */
+ private static final class ZipPlusFourFormat extends Format {
+ public static final Format instance = new ZipPlusFourFormat();
+ private static final DecimalFormat df = createIntegerOnlyFormat("000000000");
+ private ZipPlusFourFormat() {
+ // enforce singleton
+ }
+
/** Format a number as Zip + 4 */
- public String format(Number num) {
+ public static String format(Number num) {
String result = df.format(num);
StringBuffer sb = new StringBuffer();
sb.append(result.substring(0, 5)).append('-');
sb.append(result.substring(5, 9));
return sb.toString();
}
-
- public StringBuffer format(Object obj, StringBuffer toAppendTo,
- FieldPosition pos) {
+
+ public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
return toAppendTo.append(format((Number)obj));
}
-
+
public Object parseObject(String source, ParsePosition pos) {
return df.parseObject(source, pos);
}
- }
-
+ }
+
/**
* Format class for Excel phone number format. This class mimics Excel's
* built-in phone number formatting.
* @author James May
- */
- static class PhoneFormat extends Format {
- private DecimalFormat df;
-
- /** Constructor */
- public PhoneFormat() {
- df = new DecimalFormat("##########");
- df.setParseIntegerOnly(true);
+ */
+ private static final class PhoneFormat extends Format {
+ public static final Format instance = new PhoneFormat();
+ private static final DecimalFormat df = createIntegerOnlyFormat("##########");
+ private PhoneFormat() {
+ // enforce singleton
}
-
+
/** Format a number as a phone number */
- public String format(Number num) {
+ public static String format(Number num) {
String result = df.format(num);
StringBuffer sb = new StringBuffer();
String seg1, seg2, seg3;
@@ -676,28 +657,27 @@ public class HSSFDataFormatter {
if (len <= 4) {
return result;
}
-
+
seg3 = result.substring(len - 4, len);
- seg2 = result.substring(Math.max(0, len - 7), len - 4);
+ seg2 = result.substring(Math.max(0, len - 7), len - 4);
seg1 = result.substring(Math.max(0, len - 10), Math.max(0, len - 7));
-
+
if(seg1 != null && seg1.trim().length() > 0) {
sb.append('(').append(seg1).append(") ");
}
if(seg2 != null && seg2.trim().length() > 0) {
- sb.append(seg2).append('-');
+ sb.append(seg2).append('-');
}
sb.append(seg3);
return sb.toString();
}
-
- public StringBuffer format(Object obj, StringBuffer toAppendTo,
- FieldPosition pos) {
+
+ public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) {
return toAppendTo.append(format((Number)obj));
}
-
+
public Object parseObject(String source, ParsePosition pos) {
return df.parseObject(source, pos);
}
- }
+ }
}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java b/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
index 77f93a10f6..08eabd223b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/exceptions/EncryptedPowerPointFileException.java
@@ -1,4 +1,3 @@
-
/* ====================================================================
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,19 +14,15 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
-
-
package org.apache.poi.hslf.exceptions;
+import org.apache.poi.EncryptedDocumentException;
+
/**
* This exception is thrown when we try to open a PowerPoint file, and
* discover that it is encrypted
- *
- * @author Nick Burch
*/
-
-public class EncryptedPowerPointFileException extends IllegalStateException
+public class EncryptedPowerPointFileException extends EncryptedDocumentException
{
public EncryptedPowerPointFileException(String s) {
super(s);
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
index a43357f021..c97d6a8bf0 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
@@ -28,6 +28,7 @@ import java.io.ByteArrayInputStream;
import java.util.Iterator;
+import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.POIDocument;
import org.apache.poi.poifs.filesystem.DirectoryNode;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
@@ -174,9 +175,13 @@ public class HWPFDocument extends POIDocument
directory.createDocumentInputStream("WordDocument").read(_mainStream);
- // use the fib to determine the name of the table stream.
+ // Create our FIB, and check for the doc being encrypted
_fib = new FileInformationBlock(_mainStream);
+ if(_fib.isFEncrypted()) {
+ throw new EncryptedDocumentException("Cannot process encrypted word files!");
+ }
+ // use the fib to determine the name of the table stream.
String name = "0Table";
if (_fib.isFWhichTblStm())
{
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PasswordProtected.doc b/src/scratchpad/testcases/org/apache/poi/hwpf/data/PasswordProtected.doc
new file mode 100644
index 0000000000000000000000000000000000000000..0d6c1690636e91f877a889c0a62d82fd689354c8
GIT binary patch
literal 19968
zcmeI42{ct*|HrR+x~5AqWF|5XWlV^K5Z9D3bLQcaP?tRtz8iM8ZegcE;dJyMKoHzMxoy+Rc *in*b9`L!gv?_8EVU4lw87bm@Z9?-7^4YRd|`cu@bs(@YS6#1#_7eL+?=Zp z#p+^9PPah-e~F^-3z>{}D%;$PD5}u8+q+or&5ScB8pBWol0tI>()g_6lG8cwqi=Wx zgoS=Cg^P4dg!Vsv{nDyVe(wJEb#vh<{~W8qLtJBm`VrE|);+$Vj;|J$53b+nu2X+l zeF<;Jgtj?Cd0D(L`O!yvIBuG(`JF JIhD)5GOCPqycX;z+Yy7GBM62RG!BYaZpQ?d7H9`%Dut z(@EdK?hi{)u#)N745&*E;G8R4KSJR~MX+K?97}E%C|Oo2P=}ZPAwf^#!_d9!z06#v zgY{TeSc~6MkF&Bf1e_EIRexc+yCop@&eDs6QQuKte{b%L%a>7&HwNJm4gzi)PZ9@g zww)I&l2xjo8IOD>OiCdbv0e#8-C6953s#oZPd#@euTp8gh}*vW_Hpv6`7cfHrcYMq zP};BE8J{SVblMD@$xO@*%?<9`6pQxAn7Op7B`AAuZ)Ve=;OW&*uB5?^$DNwPn&b5* zvh-loqsW{TiB9$#`Eo6@Vtv;oHLRFrwqFH$2r%qOj2fT2*fN`Fb$Yr@?d0ZQCeYoXf%4^ZK1-ZEr`{^3r^yxqcODQ@M z&h+lmrlZfZ@y}Ghe$#?ayi3GX8y7MiXly9NMa3^y%llI1RsJAcf_`1Td)UxP+~ceV z&!<|;EpDbKrWE0BJBkdH6cS0~$i%|4gpow5FL17Kmz-bE*zAs8^Ge%N9t-j_e-#1` z&|1z6Wad3zC;Wc->Q1@!iOmP4AE@ta!DwnSA731@x}rK6w`h^4sMLH@{oH+KcJ;=d zx^$(E@QQbDw CLxzEEKnkwpqSppmroi zhP_mJ%*YGg4n3vd?sU1)!gT!z(Jr2e)9!Pv#L%Hb1WUSwLYp)#(mjvQ-0I#X6dIK+ zGfLtU`o<$lRUo5OL8vfZbZBf< KDaF_yPj(B#mNq$ouCEH4Z;tTENm)%sx&l`DD@fsB!rjW21<^UTv1vSWjIX z&5t-L#1t&88HP4I ^J6tw8^6*;j;deks`EDz0niPGegbt>_j0?aORUDk=x9OJ1hxh zefNSUkhi*miOfC=&h$=aPjH+(L1}T7;aj@TWa8_gak>TWIUN46MP<@l6N)y6xN^<# zTf5>cb-zjfF$@0%4qyR-cMGpaT2ZboqLH|BYR7BoDGzDc8{yeEvUCwT+F!a_G%Jg* zH5|5Yq1pH5sze }IV@GfP z!hiaoCjEi`_!}Js{AZwTzsDW$9}Pi7{E8Qv|HNCP`A;Axn*T&gqxsL$$XHb1ulNr< z3eA5yt eok3{nyDwR!%RKS0P%Fz5rDge!Y^hnYC=Nk>0 z|8y>(`HzYQR|`AfKX!TZ_GDJQo=W*Hoc)0RTtp3_9RGy>Txm!1pJM$#=Ra0vX#NwU zh~__M2hjWnmk`Z=xMY9Je+-Jy{6}C4&3`xrf6ISf S_ac&zC3&4L)nV|Vk$}XD! zxZ|Vwk5PDx{3_r-F4AcJ6PkhMKhqOv{^R3`=0DHGe#?IrU;ixsx$0WyQa{(Gu3IVp ztm~THI>dh>g4 i @J`rDAl zLxi{#nb<_ZxAw7RcirR-m*whA1xgP1&)R)E{5qy$InvadO#7;Mfd8D 4I%c#r84wJN705+(J6|2Pojk5>&2u*pc-clqQ@*`q27`vgKO0RM6O z75{k%_zymtbuslB;y2c0(M=Hl$<0|wXa)S|1;l^kApS$+nsEp4AF5+cUwp9u|G7j* z3-KR#)zkt1iLhl>afJBKX8i&GNq9}Oc|$k-D#U*-<_FPxhg*Gy_z#a4r<|p}-?Q)h zM`DJs@)_Vi%jeuIW_+Tm_kuQj5_HZ2{&VU+#D8$l;A77L{&T^q^??6m1O9_GG70$4 z7T`Z9z<(yc^B U;h zIHy09Rwsn`k3%X!Jj8#(bed%j_)mCQx}?L}^$V#A4-=njb171jm2*UqM)T>dm*E(* zhAZpd6_$=>EPN5DAcE#Ub)?Nw5dXodXW+&kjLjx?1^h?jgl^2F9T^SaKevwo{=*m+ zbbSwb @N%Wk9?jxf0MvM8vIg|*$FWoQ^0@7ZQ-|y0sq-6C2WNFPaed743yT9 zBs8O_`Pd4;f7X2YC)1ub`DsLmdNnD$P<0_y4E#0!iD5wVpHs7ss#>`(jfDgLGqouB zc*Lss4X@=#gp@jIHN<}!;_B 2*2~6!`Oj2K7jvR#PFYgg8wWI@iV F-+?_aa|aI#`wxMjc|GGd?tR%jZ%a{lix9@kRsKc@^l5?> ;hmB(Mx1JfIpN0-z2cFqH&007L{d4}<{v1_TG91#d cR^W!emNi*aku2P>8Dr+?NRDns15l74*S3# zs0|64Q}v@CG%*F^0LB4~0~iM|4qzO>IDl~g;{e71i~|@4Fb@3N9r&yKAA9h{;2i-5 ziuh!Z|MP7=g!2D2ASh>ta#~v;hy}O;LHRz!0ifJA7Kjq)Hqc?93?LGq2S8AsT>=E< z^AI1P0crt)^8cqm(0dO8{W{Nw_EB;6a5Q(eVma$%p$ry($)A7Z(NInJy?^=;$w545 zJ18zxeqS?zH-*Lk2?hrXP(TPIKm*XR^RRaOB?Rce6pRBH2QUs`9Kbk$aRB20#sQ22 z7zZ#8U>v|W@Sp7fl>b7hFO)w+&(oni9!i0s=k`!O4gIzUF{q*Z8OqI}JRN#Q59R$( zUJk8?p5;UNJT=fEASkDY@_y)fIkcW0)C@pJfEa ZwC zkT4hU=K;>e8JIJuQ7~w>#NRJ8VD`w5BZaOZd?M&-LNgsuDIF|)e;F5VtB2-9aDrw3 z?|s5B9hf=H0_F&_{@(L*6&VcsAU<^6LdWrU_J-!5eE*dbm_8Ui3T6dU1hpmXGRz4a z2js)wE%YEhbPxUT;P37S{cZ|W@L<{pQJsJbkoPJey3N5cK|LNYJJ5DUZ~CXN+#o*W zICSs+-SI 3$U-3#I@@=mZ$zd2kijLu-DjAi$^BkJx{A z{7?Y5pNjI=8~-!$|N0$&ZtcGkAG&ripSQnu@c&mE3!Hr%@C6Tz`uCsR(0BBo&UfQi zbaA-sWbNz$gZ?#8*M{c6DY{r5e5OEc0kCkeUO)o2CRz5sd9VH4oq^f -1); } @@ -184,70 +184,70 @@ public class TestHSSFDataFormatter extends TestCase { // test number formats row = wb.getSheetAt(0).getRow(1); it = row.cellIterator(); - System.out.println("\n==== VALID NUMBER FORMATS ===="); + log("\n==== VALID NUMBER FORMATS ===="); while (it.hasNext()) { HSSFCell cell = (HSSFCell) it.next(); - System.out.println(formatter.formatCellValue(cell)); - + log(formatter.formatCellValue(cell)); + // should not be equal to "1234567890.12345" assertTrue( ! "1234567890.12345".equals(formatter.formatCellValue(cell))); } - + // test bad number formats row = wb.getSheetAt(0).getRow(2); it = row.cellIterator(); - System.out.println("\n==== INVALID NUMBER FORMATS ===="); + log("\n==== INVALID NUMBER FORMATS ===="); while (it.hasNext()) { HSSFCell cell = (HSSFCell) it.next(); - System.out.println(formatter.formatCellValue(cell)); + log(formatter.formatCellValue(cell)); // should be equal to "1234567890.12345" assertEquals("1234567890.12345", formatter.formatCellValue(cell)); } - + // test Zip+4 format row = wb.getSheetAt(0).getRow(3); HSSFCell cell = row.getCell(0); - System.out.println("\n==== ZIP FORMAT ===="); - System.out.println(formatter.formatCellValue(cell)); + log("\n==== ZIP FORMAT ===="); + log(formatter.formatCellValue(cell)); assertEquals("12345-6789", formatter.formatCellValue(cell)); - + // test phone number format row = wb.getSheetAt(0).getRow(4); cell = row.getCell(0); - System.out.println("\n==== PHONE FORMAT ===="); - System.out.println(formatter.formatCellValue(cell)); + log("\n==== PHONE FORMAT ===="); + log(formatter.formatCellValue(cell)); assertEquals("(555) 123-4567", formatter.formatCellValue(cell)); - + // test SSN format row = wb.getSheetAt(0).getRow(5); cell = row.getCell(0); - System.out.println("\n==== SSN FORMAT ===="); - System.out.println(formatter.formatCellValue(cell)); - assertEquals("444-55-1234", formatter.formatCellValue(cell)); - + log("\n==== SSN FORMAT ===="); + log(formatter.formatCellValue(cell)); + assertEquals("444-55-1234", formatter.formatCellValue(cell)); + // null test-- null cell should result in empty String assertEquals(formatter.formatCellValue(null), ""); - + // null test-- null cell should result in empty String - assertEquals(formatter.formatCellValue(null), ""); - + assertEquals(formatter.formatCellValue(null), ""); + } public void testGetFormattedCellValueHSSFCellHSSFFormulaEvaluator() { // test formula format HSSFRow row = wb.getSheetAt(0).getRow(6); HSSFCell cell = row.getCell(0); - System.out.println("\n==== FORMULA CELL ===="); - + log("\n==== FORMULA CELL ===="); + // first without a formula evaluator - System.out.println(formatter.formatCellValue(cell) + "\t (without evaluator)"); - assertEquals("SUM(12.25,12.25)/100", formatter.formatCellValue(cell)); - - // now with a formula evaluator + log(formatter.formatCellValue(cell) + "\t (without evaluator)"); + assertEquals("SUM(12.25,12.25)/100", formatter.formatCellValue(cell)); + + // now with a formula evaluator HSSFFormulaEvaluator evaluator = new HSSFFormulaEvaluator(wb.getSheetAt(0), wb); //! must set current row ! evaluator.setCurrentRow(row); - System.out.println(formatter.formatCellValue(cell, evaluator) + "\t\t\t (with evaluator)"); + log(formatter.formatCellValue(cell, evaluator) + "\t\t\t (with evaluator)"); assertEquals("24.50%", formatter.formatCellValue(cell,evaluator)); } @@ -259,24 +259,23 @@ public class TestHSSFDataFormatter extends TestCase { */ public void testSetDefaultNumberFormat() { HSSFRow row = wb.getSheetAt(0).getRow(2); - Iterator it = row.cellIterator(); + Iterator it = row.cellIterator(); Format defaultFormat = new DecimalFormat("Balance $#,#00.00 USD;Balance -$#,#00.00 USD"); formatter.setDefaultNumberFormat(defaultFormat); double value = 10d; - System.out.println("\n==== DEFAULT NUMBER FORMAT ===="); + log("\n==== DEFAULT NUMBER FORMAT ===="); while (it.hasNext()) { - HSSFCell cell = (HSSFCell) it.next(); + HSSFCell cell = (HSSFCell) it.next(); cell.setCellValue(cell.getNumericCellValue() * Math.random() / 1000000 - 1000); - System.out.println(formatter.formatCellValue(cell)); + log(formatter.formatCellValue(cell)); assertTrue(formatter.formatCellValue(cell).startsWith("Balance ")); assertTrue(formatter.formatCellValue(cell).endsWith(" USD")); - } + } } - public static void main(String [] args) { - System.out - .println("Testing org.apache.poi.hssf.usermodel.TestHSSFDataFormatter"); - junit.textui.TestRunner.run(TestHSSFDataFormatter.class); - } - + private static void log(String msg) { + if (false) { // successful tests should be silent + System.out.println(msg); + } + } } -- 2.39.5