diff options
Diffstat (limited to 'src/java/org/apache')
13 files changed, 28 insertions, 23 deletions
diff --git a/src/java/org/apache/poi/POIDocument.java b/src/java/org/apache/poi/POIDocument.java index 55517ffe76..ecae9c2e0b 100644 --- a/src/java/org/apache/poi/POIDocument.java +++ b/src/java/org/apache/poi/POIDocument.java @@ -333,9 +333,9 @@ public abstract class POIDocument implements Closeable { // Create or Update the Property Set stream in the POIFS outFS.createOrUpdateDocument(bIn, name); - logger.log(POILogger.INFO, "Wrote property set " + name + " of size " + data.length); + logger.log(POILogger.INFO, "Wrote property set ", name, " of size ", data.length); } catch(WritingNotSupportedException ignored) { - logger.log( POILogger.ERROR, "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/CustomProperties.java b/src/java/org/apache/poi/hpsf/CustomProperties.java index 84373c589c..6e901832d8 100644 --- a/src/java/org/apache/poi/hpsf/CustomProperties.java +++ b/src/java/org/apache/poi/hpsf/CustomProperties.java @@ -393,7 +393,7 @@ public class CustomProperties implements Map<String,Object> { try { cps = CodePageUtil.codepageToEncoding(cp, false); } catch (UnsupportedEncodingException e) { - LOG.log(POILogger.ERROR, "Codepage '"+cp+"' can't be found."); + LOG.log(POILogger.ERROR, "Codepage '", cp, "' can't be found."); } if (!cps.isEmpty() && Charset.forName(cps).newEncoder().canEncode(value)) { return; diff --git a/src/java/org/apache/poi/hssf/dev/BiffViewer.java b/src/java/org/apache/poi/hssf/dev/BiffViewer.java index d7a6f45a15..49e06dd738 100644 --- a/src/java/org/apache/poi/hssf/dev/BiffViewer.java +++ b/src/java/org/apache/poi/hssf/dev/BiffViewer.java @@ -81,7 +81,7 @@ public final class BiffViewer { try { hasNext = recStream.hasNextRecord(); } catch (LeftoverDataException e) { - logger.log(POILogger.ERROR, "Discarding " + recStream.remaining() + " bytes and continuing", e); + logger.log(POILogger.ERROR, "Discarding ", recStream.remaining(), " bytes and continuing", e); recStream.readRemainder(); hasNext = recStream.hasNextRecord(); } diff --git a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java index ebeba4f21d..6cc4b2edd4 100644 --- a/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java +++ b/src/java/org/apache/poi/hssf/eventusermodel/FormatTrackingHSSFListener.java @@ -155,8 +155,8 @@ public class FormatTrackingHSSFListener implements HSSFListener { if (formatIndex >= HSSFDataFormat.getNumberOfBuiltinBuiltinFormats()) { FormatRecord tfr = _customFormatRecords.get(Integer.valueOf(formatIndex)); if (tfr == null) { - logger.log( POILogger.ERROR, "Requested format at index " + formatIndex - + ", but it wasn't found"); + logger.log( POILogger.ERROR, "Requested format at index ", formatIndex, + ", but it wasn't found"); } else { format = tfr.getFormatString(); } @@ -192,8 +192,8 @@ public class FormatTrackingHSSFListener implements HSSFListener { public int getFormatIndex(CellValueRecordInterface cell) { ExtendedFormatRecord xfr = _xfRecords.get(cell.getXFIndex()); if (xfr == null) { - logger.log( POILogger.ERROR, "Cell " + cell.getRow() + "," + cell.getColumn() - + " uses XF with index " + cell.getXFIndex() + ", but we don't have that"); + logger.log( POILogger.ERROR, "Cell ", cell.getRow(), ",", cell.getColumn(), + " uses XF with index ", cell.getXFIndex(), ", but we don't have that"); return -1; } return xfr.getFormatIndex(); diff --git a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java index 915e1771ee..94b62bacb9 100644 --- a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java +++ b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java @@ -157,7 +157,7 @@ public final class EmbeddedObjectRefSubRecord extends SubRecord { int nUnexpectedPadding = remaining - dataLenAfterFormula; if (nUnexpectedPadding > 0) { - logger.log( POILogger.ERROR, "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 e51cb32bc9..6ca4a941a4 100644 --- a/src/java/org/apache/poi/hssf/record/FeatRecord.java +++ b/src/java/org/apache/poi/hssf/record/FeatRecord.java @@ -108,7 +108,7 @@ public final class FeatRecord extends StandardRecord { sharedFeature = new FeatSmartTag(in); break; default: - logger.log( POILogger.ERROR, "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/SSTDeserializer.java b/src/java/org/apache/poi/hssf/record/SSTDeserializer.java index 181616185f..1fafa37566 100644 --- a/src/java/org/apache/poi/hssf/record/SSTDeserializer.java +++ b/src/java/org/apache/poi/hssf/record/SSTDeserializer.java @@ -50,18 +50,18 @@ class SSTDeserializer for (int i=0;i<stringCount;i++) { // Extract exactly the count of strings from the SST record. UnicodeString str; - if(in.available() == 0 && ! in.hasNextRecord()) { - 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); - } + if (in.available() == 0 && !in.hasNextRecord()) { + 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); + } addToStringTable( strings, str ); } } static public void addToStringTable( IntMapper<UnicodeString> strings, UnicodeString string ) { - strings.add(string); + strings.add(string); } } diff --git a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java b/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java index e00b1c2bac..d5ea57a655 100644 --- a/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java +++ b/src/java/org/apache/poi/poifs/crypt/ChunkedCipherOutputStream.java @@ -324,7 +324,7 @@ public abstract class ChunkedCipherOutputStream extends FilterOutputStream { } if (!fileOut.delete()) { - LOG.log(POILogger.ERROR, "Can't delete temporary encryption file: "+fileOut); + LOG.log(POILogger.ERROR, "Can't delete temporary encryption file: ", fileOut); } } catch (IOException e) { throw new EncryptedDocumentException(e); diff --git a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java b/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java index 2dfbc1f547..90d1dc0757 100644 --- a/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java +++ b/src/java/org/apache/poi/poifs/crypt/standard/StandardEncryptor.java @@ -193,7 +193,7 @@ public class StandardEncryptor extends Encryptor { IOUtils.copy(fis, leos); } if (!fileOut.delete()) { - logger.log(POILogger.ERROR, "Can't delete temporary encryption file: "+fileOut); + logger.log(POILogger.ERROR, "Can't delete temporary encryption file: ", fileOut); } leos.close(); diff --git a/src/java/org/apache/poi/ss/util/DateFormatConverter.java b/src/java/org/apache/poi/ss/util/DateFormatConverter.java index 6c044de6c7..f8c7f338cf 100644 --- a/src/java/org/apache/poi/ss/util/DateFormatConverter.java +++ b/src/java/org/apache/poi/ss/util/DateFormatConverter.java @@ -152,7 +152,7 @@ public final class DateFormatConverter { loc = LocaleID.lookupByLanguageTag(languageTag.substring(0, idx)); } if (loc == null) { - logger.log( POILogger.ERROR, "Unable to find prefix for Locale '" + languageTag + "' or its parent locales." ); + logger.log( POILogger.ERROR, "Unable to find prefix for Locale '", languageTag, "' or its parent locales." ); return ""; } } diff --git a/src/java/org/apache/poi/util/Configurator.java b/src/java/org/apache/poi/util/Configurator.java index b1ee1a77da..7831f0d320 100644 --- a/src/java/org/apache/poi/util/Configurator.java +++ b/src/java/org/apache/poi/util/Configurator.java @@ -29,7 +29,7 @@ public class Configurator { try { result = Integer.parseInt(property); } catch (Exception e) { - logger.log(POILogger.ERROR, "System property -D"+systemProperty +" do not contains a valid integer " + property); + logger.log(POILogger.ERROR, "System property -D", systemProperty, " does not contains a valid integer: ", property); } return result; } diff --git a/src/java/org/apache/poi/util/IOUtils.java b/src/java/org/apache/poi/util/IOUtils.java index fc75f4f652..1a53cdd0b0 100644 --- a/src/java/org/apache/poi/util/IOUtils.java +++ b/src/java/org/apache/poi/util/IOUtils.java @@ -394,7 +394,7 @@ public final class IOUtils { try { closeable.close(); } catch ( Exception exc ) { - logger.log( POILogger.ERROR, "Unable to close resource: " + exc, + logger.log( POILogger.ERROR, "Unable to close resource: ", exc, exc ); } } diff --git a/src/java/org/apache/poi/util/SystemOutLogger.java b/src/java/org/apache/poi/util/SystemOutLogger.java index 3567c40808..cc414f76a5 100644 --- a/src/java/org/apache/poi/util/SystemOutLogger.java +++ b/src/java/org/apache/poi/util/SystemOutLogger.java @@ -60,7 +60,12 @@ public class SystemOutLogger implements POILogger { if (!check(level)) { return; } - System.out.println("[" + _cat + "]" + LEVEL_STRINGS_SHORT.charAt(Math.min(LEVEL_STRINGS_SHORT.length()-1, level)) + " " + obj1); + System.out.print("["); + System.out.print(_cat); + System.out.print("]"); + System.out.print(LEVEL_STRINGS_SHORT.charAt(Math.min(LEVEL_STRINGS_SHORT.length()-1, level))); + System.out.print(" "); + System.out.println(obj1); if (exception != null) { exception.printStackTrace(System.out); } |