diff options
author | Yegor Kozlov <yegor@apache.org> | 2012-11-16 12:21:49 +0000 |
---|---|---|
committer | Yegor Kozlov <yegor@apache.org> | 2012-11-16 12:21:49 +0000 |
commit | e0b6a9975c574bde00acd26eaa172cce023301a0 (patch) | |
tree | e65dc9d4919e5232337afa3456d57f9a4fb3f141 /src/java/org/apache | |
parent | 1ee9f0d29fcb25688f06915497cd9d02ab784c75 (diff) | |
download | poi-e0b6a9975c574bde00acd26eaa172cce023301a0.tar.gz poi-e0b6a9975c574bde00acd26eaa172cce023301a0.zip |
Bug 52628 - Replace System.err info messages with a POILogger
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1410318 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache')
15 files changed, 93 insertions, 66 deletions
diff --git a/src/java/org/apache/poi/POIDocument.java b/src/java/org/apache/poi/POIDocument.java index 169e9241bc..8f177fec94 100644 --- a/src/java/org/apache/poi/POIDocument.java +++ b/src/java/org/apache/poi/POIDocument.java @@ -221,7 +221,7 @@ public abstract class POIDocument { logger.log(POILogger.INFO, "Wrote property set " + name + " of size " + data.length); } catch(org.apache.poi.hpsf.WritingNotSupportedException wnse) { - System.err.println("Couldn't write property set with name " + name + " as not supported by HPSF yet"); + logger.log( POILogger.ERROR, "Couldn't write property set with name " + name + " as not supported by HPSF yet"); } } diff --git a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java b/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java index 79825ebf82..203498f13c 100644 --- a/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java +++ b/src/java/org/apache/poi/hpsf/HPSFRuntimeException.java @@ -17,8 +17,6 @@ package org.apache.poi.hpsf; -import java.io.PrintStream; -import java.io.PrintWriter; /** * <p>This exception is the superclass of all other unchecked @@ -30,8 +28,8 @@ import java.io.PrintWriter; */ public class HPSFRuntimeException extends RuntimeException { - - /** <p>The underlying reason for this exception - may be + private static final long serialVersionUID = -7804271670232727159L; + /** <p>The underlying reason for this exception - may be * <code>null</code>.</p> */ private Throwable reason; @@ -105,44 +103,44 @@ public class HPSFRuntimeException extends RuntimeException - /** - * @see Throwable#printStackTrace() - */ - public void printStackTrace() - { - printStackTrace(System.err); - } - - - - /** - * @see Throwable#printStackTrace(java.io.PrintStream) - */ - public void printStackTrace(final PrintStream p) - { - final Throwable reason = getReason(); - super.printStackTrace(p); - if (reason != null) - { - p.println("Caused by:"); - reason.printStackTrace(p); - } - } - - - - /** - * @see Throwable#printStackTrace(java.io.PrintWriter) - */ - public void printStackTrace(final PrintWriter p) - { - final Throwable reason = getReason(); - super.printStackTrace(p); - if (reason != null) - { - p.println("Caused by:"); - reason.printStackTrace(p); - } - } +// /** +// * @see Throwable#printStackTrace() +// */ +// public void printStackTrace() +// { +// printStackTrace(System.err); +// } + + + +// /** +// * @see Throwable#printStackTrace(java.io.PrintStream) +// */ +// public void printStackTrace(final PrintStream p) +// { +// final Throwable reason = getReason(); +// super.printStackTrace(p); +// if (reason != null) +// { +// p.println("Caused by:"); +// reason.printStackTrace(p); +// } +// } + + + +// /** +// * @see Throwable#printStackTrace(java.io.PrintWriter) +// */ +// public void printStackTrace(final PrintWriter p) +// { +// final Throwable reason = getReason(); +// super.printStackTrace(p); +// if (reason != null) +// { +// p.println("Caused by:"); +// reason.printStackTrace(p); +// } +// } } diff --git a/src/java/org/apache/poi/hpsf/VariantSupport.java b/src/java/org/apache/poi/hpsf/VariantSupport.java index 8b13fc0e3c..f24c2a9187 100644 --- a/src/java/org/apache/poi/hpsf/VariantSupport.java +++ b/src/java/org/apache/poi/hpsf/VariantSupport.java @@ -24,6 +24,9 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; + /** * <p>Supports reading and writing of variant data.</p> * @@ -45,7 +48,7 @@ import java.util.List; */ public class VariantSupport extends Variant { - + private static POILogger logger = POILogFactory.getLogger(VariantSupport.class); private static boolean logUnsupportedTypes = false; /** @@ -78,7 +81,7 @@ public class VariantSupport extends Variant * <p>Keeps a list of the variant types an "unsupported" message has already * been issued for.</p> */ - protected static List unsupportedMessage; + protected static List<Long> unsupportedMessage; /** * <p>Writes a warning to <code>System.err</code> that a variant type is @@ -93,11 +96,11 @@ public class VariantSupport extends Variant if (isLogUnsupportedTypes()) { if (unsupportedMessage == null) - unsupportedMessage = new LinkedList(); + unsupportedMessage = new LinkedList<Long>(); Long vt = Long.valueOf(ex.getVariantType()); if (!unsupportedMessage.contains(vt)) { - System.err.println(ex.getMessage()); + logger.log( POILogger.ERROR, ex.getMessage()); unsupportedMessage.add(vt); } } diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java index 60c11d3521..1ca3db366f 100644 --- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java +++ b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java @@ -31,6 +31,8 @@ import org.apache.poi.hssf.record.NumberRecord; import org.apache.poi.hssf.record.Record; import org.apache.poi.hssf.usermodel.HSSFDataFormat; import org.apache.poi.hssf.usermodel.HSSFDataFormatter; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; /** * A proxy HSSFListener that keeps track of the document formatting records, and @@ -38,6 +40,7 @@ import org.apache.poi.hssf.usermodel.HSSFDataFormatter; * ids. */ public class FormatTrackingHSSFListener implements HSSFListener { + private static POILogger logger = POILogFactory.getLogger(FormatTrackingHSSFListener.class); private final HSSFListener _childListener; private final HSSFDataFormatter _formatter; private final NumberFormat _defaultFormat; @@ -137,7 +140,7 @@ public class FormatTrackingHSSFListener implements HSSFListener { if (formatIndex >= HSSFDataFormat.getNumberOfBuiltinBuiltinFormats()) { FormatRecord tfr = _customFormatRecords.get(Integer.valueOf(formatIndex)); if (tfr == null) { - System.err.println("Requested format at index " + formatIndex + logger.log( POILogger.ERROR, "Requested format at index " + formatIndex + ", but it wasn't found"); } else { format = tfr.getFormatString(); @@ -167,7 +170,7 @@ public class FormatTrackingHSSFListener implements HSSFListener { public int getFormatIndex(CellValueRecordInterface cell) { ExtendedFormatRecord xfr = _xfRecords.get(cell.getXFIndex()); if (xfr == null) { - System.err.println("Cell " + cell.getRow() + "," + cell.getColumn() + logger.log( POILogger.ERROR, "Cell " + cell.getRow() + "," + cell.getColumn() + " uses XF with index " + cell.getXFIndex() + ", but we don't have that"); return -1; } diff --git a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java index 6e74173d4c..77e9fd86d6 100644 --- a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java +++ b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java @@ -29,6 +29,8 @@ import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianInput; import org.apache.poi.util.LittleEndianInputStream; import org.apache.poi.util.LittleEndianOutput; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; import org.apache.poi.util.StringUtil; /** @@ -39,6 +41,7 @@ import org.apache.poi.util.StringUtil; * @author Daniel Noll */ public final class EmbeddedObjectRefSubRecord extends SubRecord { + private static POILogger logger = POILogFactory.getLogger(EmbeddedObjectRefSubRecord.class); public static final short sid = 0x0009; private static final byte[] EMPTY_BYTE_ARRAY = { }; @@ -137,7 +140,7 @@ public final class EmbeddedObjectRefSubRecord extends SubRecord { int nUnexpectedPadding = remaining - dataLenAfterFormula; if (nUnexpectedPadding > 0) { - System.err.println("Discarding " + nUnexpectedPadding + " unexpected padding bytes "); + logger.log( POILogger.ERROR, "Discarding " + nUnexpectedPadding + " unexpected padding bytes "); readRawData(in, nUnexpectedPadding); remaining-=nUnexpectedPadding; } diff --git a/src/java/org/apache/poi/hssf/record/FeatRecord.java b/src/java/org/apache/poi/hssf/record/FeatRecord.java index 267eced88e..572d6959d9 100644 --- a/src/java/org/apache/poi/hssf/record/FeatRecord.java +++ b/src/java/org/apache/poi/hssf/record/FeatRecord.java @@ -24,6 +24,8 @@ import org.apache.poi.hssf.record.common.FtrHeader; import org.apache.poi.hssf.record.common.SharedFeature; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.util.LittleEndianOutput; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; /** * Title: Feat (Feature) Record @@ -32,6 +34,7 @@ import org.apache.poi.util.LittleEndianOutput; * up with a {@link FeatHdrRecord}. */ public final class FeatRecord extends StandardRecord { + private static POILogger logger = POILogFactory.getLogger(FeatRecord.class); public final static short sid = 0x0868; private FtrHeader futureHeader; @@ -90,7 +93,7 @@ public final class FeatRecord extends StandardRecord { sharedFeature = new FeatSmartTag(in); break; default: - System.err.println("Unknown Shared Feature " + isf_sharedFeatureType + " found!"); + logger.log( POILogger.ERROR, "Unknown Shared Feature " + isf_sharedFeatureType + " found!"); } } diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java index 3d6b237cf8..f13d7f0eb4 100644 --- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java +++ b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java @@ -41,7 +41,7 @@ import org.apache.poi.util.StringUtil; */ public final class HyperlinkRecord extends StandardRecord { public final static short sid = 0x01B8; - private POILogger logger = POILogFactory.getLogger(getClass()); + private static POILogger logger = POILogFactory.getLogger(HyperlinkRecord.class); static final class GUID { /* @@ -641,7 +641,7 @@ public final class HyperlinkRecord extends StandardRecord { if (false) { // Quite a few examples in the unit tests which don't have the exact expected tail for (int i = 0; i < expectedTail.length; i++) { if (expectedTail[i] != result[i]) { - System.err.println("Mismatch in tail byte [" + i + "]" + logger.log( POILogger.ERROR, "Mismatch in tail byte [" + i + "]" + "expected " + (expectedTail[i] & 0xFF) + " but got " + (result[i] & 0xFF)); } } diff --git a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java b/src/java/org/apache/poi/hssf/record/SSTDeserializer.java index 280bc26c9f..181616185f 100644 --- a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java +++ b/src/java/org/apache/poi/hssf/record/SSTDeserializer.java @@ -21,6 +21,8 @@ package org.apache.poi.hssf.record; import org.apache.poi.hssf.record.common.UnicodeString; import org.apache.poi.util.IntMapper; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; /** * Handles the task of deserializing a SST string. The two main entry points are @@ -30,7 +32,7 @@ import org.apache.poi.util.IntMapper; */ class SSTDeserializer { - + private static POILogger logger = POILogFactory.getLogger(SSTDeserializer.class); private IntMapper<UnicodeString> strings; public SSTDeserializer( IntMapper<UnicodeString> strings ) @@ -49,7 +51,7 @@ class SSTDeserializer // Extract exactly the count of strings from the SST record. UnicodeString str; if(in.available() == 0 && ! in.hasNextRecord()) { - System.err.println("Ran out of data before creating all the strings! String at index " + i + ""); + logger.log( POILogger.ERROR, "Ran out of data before creating all the strings! String at index " + i + ""); str = new UnicodeString(""); } else { str = new UnicodeString(in); diff --git a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java index 3ee5e4e66c..9e9ca03925 100644 --- a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java +++ b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java @@ -179,7 +179,7 @@ public class UnicodeString implements Comparable<UnicodeString> { // TODO - make int extraDataLength = runData - (numRuns*6); if(extraDataLength < 0) { - System.err.println("Warning - ExtRst overran by " + (0-extraDataLength) + " bytes"); + _logger.log( POILogger.WARN, "Warning - ExtRst overran by " + (0-extraDataLength) + " bytes"); extraDataLength = 0; } extraData = new byte[extraDataLength]; diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java b/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java index 0d130452ba..7e350e88f5 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFEvaluationWorkbook.java @@ -34,6 +34,8 @@ import org.apache.poi.ss.formula.FormulaParsingWorkbook; import org.apache.poi.ss.formula.FormulaRenderingWorkbook; import org.apache.poi.ss.formula.FormulaType; import org.apache.poi.ss.formula.udf.UDFFinder; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; /** * Internal POI use only @@ -41,7 +43,7 @@ import org.apache.poi.ss.formula.udf.UDFFinder; * @author Josh Micich */ public final class HSSFEvaluationWorkbook implements FormulaRenderingWorkbook, EvaluationWorkbook, FormulaParsingWorkbook { - + private static POILogger logger = POILogFactory.getLogger(HSSFEvaluationWorkbook.class); private final HSSFWorkbook _uBook; private final InternalWorkbook _iBook; @@ -139,7 +141,7 @@ public final class HSSFEvaluationWorkbook implements FormulaRenderingWorkbook, E // Note - as of Bugzilla 48036 (svn r828244, r828247) POI is capable of evaluating // IntesectionPtg. However it is still not capable of parsing it. // So FormulaEvalTestData.xls now contains a few formulas that produce errors here. - System.err.println(e.getMessage()); + logger.log( POILogger.ERROR, e.getMessage()); } } FormulaRecordAggregate fra = (FormulaRecordAggregate) cell.getCellValueRecord(); diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java index 1f20d9f0fa..56b2f699e1 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPicture.java @@ -27,6 +27,8 @@ import org.apache.poi.hssf.record.EscherAggregate; import org.apache.poi.hssf.record.ObjRecord; import org.apache.poi.ss.usermodel.Picture; import org.apache.poi.ss.util.ImageUtils; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; import org.apache.poi.hssf.model.InternalWorkbook; /** @@ -36,6 +38,8 @@ import org.apache.poi.hssf.model.InternalWorkbook; * @author Yegor Kozlov (yegor at apache.org) */ public class HSSFPicture extends HSSFSimpleShape implements Picture { + private static POILogger logger = POILogFactory.getLogger(HSSFPicture.class); + public static final int PICTURE_TYPE_EMF = HSSFWorkbook.PICTURE_TYPE_EMF; // Windows Enhanced Metafile public static final int PICTURE_TYPE_WMF = HSSFWorkbook.PICTURE_TYPE_WMF; // Windows Metafile public static final int PICTURE_TYPE_PICT = HSSFWorkbook.PICTURE_TYPE_PICT; // Macintosh PICT @@ -283,7 +287,7 @@ public class HSSFPicture extends HSSFSimpleShape implements Picture { EscherComplexProperty prop = new EscherComplexProperty(EscherProperties.BLIP__BLIPFILENAME, true, data.getBytes("UTF-16LE")); setPropertyValue(prop); } catch (UnsupportedEncodingException e) { - System.out.println("Unsupported encoding: UTF-16LE"); + logger.log( POILogger.ERROR, "Unsupported encoding: UTF-16LE"); } } diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java index 98936f90cb..07209ae3e7 100644 --- a/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java +++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPolygon.java @@ -20,12 +20,14 @@ package org.apache.poi.hssf.usermodel; import org.apache.poi.ddf.*; import org.apache.poi.hssf.record.*; import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; /** * @author Glen Stampoultzis (glens at superlinksoftware.com) */ public class HSSFPolygon extends HSSFSimpleShape { - + private static POILogger logger = POILogFactory.getLogger(HSSFPolygon.class); public final static short OBJECT_TYPE_MICROSOFT_OFFICE_DRAWING = 0x1E; public HSSFPolygon(EscherContainerRecord spContainer, ObjRecord objRecord, TextObjectRecord _textObjectRecord) { @@ -157,11 +159,11 @@ public class HSSFPolygon extends HSSFSimpleShape { */ public void setPoints(int[] xPoints, int[] yPoints) { if (xPoints.length != yPoints.length){ - System.out.println("xPoint.length must be equal to yPoints.length"); + logger.log( POILogger.ERROR, "xPoint.length must be equal to yPoints.length"); return; } if (xPoints.length == 0){ - System.out.println("HSSFPolygon must have at least one point"); + logger.log( POILogger.ERROR, "HSSFPolygon must have at least one point"); } EscherArrayProperty verticesProp = new EscherArrayProperty(EscherProperties.GEOMETRY__VERTICES, false, new byte[0] ); verticesProp.setNumberOfElementsInArray(xPoints.length+1); diff --git a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java index 3233dfa260..60f2b8d38c 100644 --- a/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java +++ b/src/java/org/apache/poi/poifs/filesystem/EntryUtils.java @@ -36,7 +36,7 @@ public class EntryUtils public static void copyNodeRecursively( Entry entry, DirectoryEntry target ) throws IOException { - // System.err.println("copyNodeRecursively called with "+entry.getName()+ + // logger.log( POILogger.ERROR, "copyNodeRecursively called with "+entry.getName()+ // ","+target.getName()); DirectoryEntry newTarget = null; if ( entry.isDirectoryEntry() ) diff --git a/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java b/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java index 5a58db9278..b3c7ee7207 100644 --- a/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java +++ b/src/java/org/apache/poi/ss/formula/constant/ErrorConstant.java @@ -18,6 +18,8 @@ package org.apache.poi.ss.formula.constant; import org.apache.poi.ss.usermodel.ErrorConstants; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; /** * Represents a constant error code value as encoded in a constant values array. <p/> * @@ -27,6 +29,7 @@ import org.apache.poi.ss.usermodel.ErrorConstants; * @author Josh Micich */ public class ErrorConstant { + private static POILogger logger = POILogFactory.getLogger(ErrorConstant.class); // convenient access to name space private static final ErrorConstants EC = null; @@ -64,7 +67,7 @@ public class ErrorConstant { case ErrorConstants.ERROR_NUM: return NUM; case ErrorConstants.ERROR_NA: return NA; } - System.err.println("Warning - unexpected error code (" + errorCode + ")"); + logger.log( POILogger.WARN, "Warning - unexpected error code (" + errorCode + ")"); return new ErrorConstant(errorCode); } public String toString() { diff --git a/src/java/org/apache/poi/ss/util/DateFormatConverter.java b/src/java/org/apache/poi/ss/util/DateFormatConverter.java index b11f7a58d5..316d1ed7b6 100644 --- a/src/java/org/apache/poi/ss/util/DateFormatConverter.java +++ b/src/java/org/apache/poi/ss/util/DateFormatConverter.java @@ -24,6 +24,9 @@ import java.util.List; import java.util.Locale;
import java.util.Map;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
+
/**
* Convert java DateFormat patterns into Excel custom number formats.
* For example, to format a date in excel using the "dd MMMM, yyyy" pattern and Japanese
@@ -45,6 +48,7 @@ import java.util.Map; *
*/
public class DateFormatConverter {
+ private static POILogger logger = POILogFactory.getLogger(DateFormatConverter.class);
public static class DateFormatTokenizer {
String format;
@@ -329,7 +333,7 @@ public class DateFormatConverter { result = localePrefixes.get( localeString.substring( 0, 2 ) );
if( result == null ) {
Locale parentLocale = new Locale(localeString.substring( 0, 2 ));
- System.out.println( "Unable to find prefix for " + locale + "(" + locale.getDisplayName() + ") or "
+ logger.log( POILogger.ERROR, "Unable to find prefix for " + locale + "(" + locale.getDisplayName() + ") or "
+ localeString.substring( 0, 2 ) + "(" + parentLocale.getDisplayName() + ")" );
return "";
}
|