moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

use POILogger instead of System.err in hslf records. If users want verbose output they should explicitly enable it through -Dorg.apache.poi.util.POILogger option. P.S. I think this should be done through the whole HSLF, i.e. no direct calls of System.out and Sysrtem.err

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@527820 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2007-04-12 07:40:15 +00:00
parent 97e991ec6e
commit 0d56d5df4a
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/scratchpad/src/org/apache/poi/hslf/record/Document.java
View File

@ -19,6 +19,8 @@
package org.apache.poi.hslf.record;
import org.apache.poi.util.POILogger;
import java.io.IOException;
import java.io.OutputStream;
@ -132,10 +134,10 @@ public class Document extends PositionDependentRecordContainer
// (normally it's 2, or 3 if you have notes)
// Complain if it's not
if(slwtcount == 0) {
System.err.println("No SlideListWithText's found - there should normally be at least one!");
logger.log(POILogger.WARN, "No SlideListWithText's found - there should normally be at least one!");
}
if(slwtcount > 3) {
System.err.println("Found " + slwtcount + " SlideListWithTexts - normally there should only be three!");
logger.log(POILogger.WARN, "Found " + slwtcount + " SlideListWithTexts - normally there should only be three!");
}
// Now grab all the SLWTs

4
src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
View File

@ -19,6 +19,8 @@
package org.apache.poi.hslf.record;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogger;
import java.io.*;
import java.util.*;
@ -47,7 +49,7 @@ public class FontCollection extends RecordContainer {
FontEntityAtom atom = (FontEntityAtom)_children[i];
fonts.add(atom.getFontName());
} else {
System.err.println("Warning: FontCollection child wasn't a FontEntityAtom, was " + _children[i]);
logger.log(POILogger.WARN, "Warning: FontCollection child wasn't a FontEntityAtom, was " + _children[i]);
}
}
}

3
src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
View File

@ -20,6 +20,7 @@
package org.apache.poi.hslf.record;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogger;
import org.apache.poi.ddf.*;
import org.apache.poi.hslf.model.ShapeTypes;
@ -128,7 +129,7 @@ public class PPDrawing extends RecordAtom
// Wind on
int size = r.getRecordSize();
if(size < 8) {
System.err.println("Hit short DDF record at " + startPos + " - " + size);
logger.log(POILogger.WARN, "Hit short DDF record at " + startPos + " - " + size);
}
startPos += size;
lenToGo -= size;

6
src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
View File

@ -20,6 +20,8 @@
package org.apache.poi.hslf.record;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogger;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Enumeration;
@ -193,8 +195,8 @@ public class PersistPtrHolder extends PositionDependentRecordAtom
Integer newPos = (Integer)oldToNewReferencesLookup.get(oldPos);
if(newPos == null) {
System.err.println("Couldn't find the new location of the \"slide\" with id " + id + " that used to be at " + oldPos);
System.err.println("Not updating the position of it, you probably won't be able to find it any more (if you ever could!)");
logger.log(POILogger.WARN, "Couldn't find the new location of the \"slide\" with id " + id + " that used to be at " + oldPos);
logger.log(POILogger.WARN, "Not updating the position of it, you probably won't be able to find it any more (if you ever could!)");
newPos = oldPos;
}

7
src/scratchpad/src/org/apache/poi/hslf/record/Record.java
View File

@ -24,6 +24,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Vector;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogger;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
@ -37,7 +39,10 @@ import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
public abstract class Record
{
/**
// For logging
protected POILogger logger = POILogFactory.getLogger(this.getClass());
/**
* Is this record type an Atom record (only has data),
* or is it a non-Atom record (has other records)?
*/

6
src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
View File

@ -25,6 +25,8 @@ import org.apache.poi.hslf.model.textproperties.CharFlagsTextProp;
import org.apache.poi.hslf.model.textproperties.TextProp;
import org.apache.poi.hslf.model.textproperties.TextPropCollection;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogger;
import java.io.IOException;
import java.io.OutputStream;
import java.io.ByteArrayOutputStream;
@ -265,7 +267,7 @@ public class StyleTextPropAtom extends RecordAtom
}
if (rawContents.length > 0 && textHandled != (size+1)){
System.err.println("Problem reading paragraph style runs: textHandled = " + textHandled + ", text.size+1 = " + (size+1));
logger.log(POILogger.WARN, "Problem reading paragraph style runs: textHandled = " + textHandled + ", text.size+1 = " + (size+1));
}
// Now do the character stylings
@ -300,7 +302,7 @@ public class StyleTextPropAtom extends RecordAtom
}
}
if (rawContents.length > 0 && textHandled != (size+1)){
System.err.println("Problem reading character style runs: textHandled = " + textHandled + ", text.size+1 = " + (size+1));
logger.log(POILogger.WARN, "Problem reading character style runs: textHandled = " + textHandled + ", text.size+1 = " + (size+1));
}
// Handle anything left over