Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647832 via svnmerge from

https://svn.apache.org:443/repos/asf/poi/trunk

........
  r647824 | yegor | 2008-04-14 15:58:18 +0100 (Mon, 14 Apr 2008) | 1 line
  
  make sure all hslf classes use POI loggers
........


git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@647834 13f79535-47bb-0310-9956-ffa450edef68

17 files changed, 77 insertions, 66 deletions

diff --git a/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
index 00fc374fcc..29f01b3154 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java
@@ -52,8 +52,7 @@ import org.apache.poi.poifs.filesystem.DocumentInputStream;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.POILogFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.poi.util.POILogger;
 
 /**
  * This class contains the main functionality for the Powerpoint file 
@@ -65,7 +64,7 @@ import org.apache.commons.logging.LogFactory;
 public class HSLFSlideShow extends POIDocument
 {
     // For logging
-    private static final Log logger = LogFactory.getLog(HSLFSlideShow.class);
+    private POILogger logger = POILogFactory.getLogger(this.getClass());
 
 	private InputStream istream;
 
@@ -291,7 +290,7 @@ public class HSLFSlideShow extends POIDocument
 		try {
 			currentUser = new CurrentUserAtom(directory);
 		} catch(IOException ie) {
-			logger.error("Error finding Current User Atom:\n" + ie);
+			logger.log(POILogger.ERROR, "Error finding Current User Atom:\n" + ie);
 			currentUser = new CurrentUserAtom();
 		}
 	}
@@ -346,8 +345,8 @@ public class HSLFSlideShow extends POIDocument
 
 			// If they type (including the bonus 0xF018) is 0, skip it
 			if(type == 0) {
-				logger.error("Problem reading picture: Invalid image type 0, on picture with length " + imgsize + ".\nYou document will probably become corrupted if you save it!");
-				logger.error("" + pos);
+				logger.log(POILogger.ERROR, "Problem reading picture: Invalid image type 0, on picture with length " + imgsize + ".\nYou document will probably become corrupted if you save it!");
+				logger.log(POILogger.ERROR, "" + pos);
 			} else {
 	            // Copy the data, ready to pass to PictureData
 	            byte[] imgdata = new byte[imgsize];
@@ -362,7 +361,7 @@ public class HSLFSlideShow extends POIDocument
 					pict.setOffset(offset);
 					p.add(pict);
 				} catch(IllegalArgumentException e) {
-					logger.error("Problem reading picture: " + e + "\nYou document will probably become corrupted if you save it!");
+					logger.log(POILogger.ERROR, "Problem reading picture: " + e + "\nYou document will probably become corrupted if you save it!");
 				}
 			}
             
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java b/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
index 436b5188f3..c4df7b6779 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java
@@ -23,8 +23,8 @@ import org.apache.poi.hslf.record.*;
 import org.apache.poi.hslf.usermodel.PictureData;
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.poi.util.POILogger;
+import org.apache.poi.util.POILogFactory;
 
 import java.awt.*;
 import java.util.*;
@@ -36,7 +36,7 @@ import java.util.*;
  */
 public class Fill {
     // For logging
-    protected Log log = LogFactory.getLog(this.getClass());
+    protected POILogger logger = POILogFactory.getLogger(this.getClass());
 
     /**
      *  Fill with a solid color
@@ -213,7 +213,7 @@ public class Fill {
         java.util.List lst = bstore.getChildRecords();
         int idx = p.getPropertyValue();
         if (idx == 0){
-            log.error("no reference to picture data found ");
+            logger.log(POILogger.WARN, "no reference to picture data found ");
         } else {
             EscherBSERecord bse = (EscherBSERecord)lst.get(idx - 1);
             for ( int i = 0; i < pict.length; i++ ) {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java b/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
index 5023633463..e34d651b3d 100755
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/Freeform.java
@@ -18,6 +18,7 @@ package org.apache.poi.hslf.model;
 

 import org.apache.poi.ddf.*;

 import org.apache.poi.util.LittleEndian;

+import org.apache.poi.util.POILogger;

 

 import java.awt.geom.*;

 import java.util.ArrayList;

@@ -96,7 +97,7 @@ public class Freeform extends AutoShape {
                     segInfo.add(new byte[]{0x01, 0x20 });

                     break;

                 case PathIterator.SEG_QUADTO:

-                    System.err.println("SEG_QUADTO is not supported");

+                    logger.log(POILogger.WARN, "SEG_QUADTO is not supported");

                     break;

                 case PathIterator.SEG_CLOSE:

                     pntInfo.add(pntInfo.get(0));

diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
index cb001ccf9c..23088f056b 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/PPGraphics2D.java
@@ -30,8 +30,8 @@ import java.util.Map;
 import java.util.ArrayList;
 import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.exceptions.HSLFException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.poi.util.POILogger;
+import org.apache.poi.util.POILogFactory;
 
 /**
  * Translates Graphics2D calls into PowerPoint.
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class PPGraphics2D extends Graphics2D implements Cloneable {
 
-    private static final Log log = LogFactory.getLog(PPGraphics2D.class);
+    protected POILogger log = POILogFactory.getLogger(this.getClass());
 
     //The ppt object to write into.
     private ShapeGroup group;
@@ -356,7 +356,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      *          this method clears the current <code>Clip</code>.
      */
     public void clip(Shape s){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -376,7 +376,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @since       JDK1.1
      */
     public Shape getClip(){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return null;
     }
 
@@ -644,7 +644,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
     public boolean drawImage(Image img, int x, int y,
                              Color bgcolor,
                              ImageObserver observer){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
 
         return false;
     }
@@ -691,7 +691,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
                              int width, int height,
                              Color bgcolor,
                              ImageObserver observer){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
 
         return false;
     }
@@ -748,7 +748,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
                              int dx1, int dy1, int dx2, int dy2,
                              int sx1, int sy1, int sx2, int sy2,
                              ImageObserver observer){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return false;
     }
 
@@ -810,7 +810,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
                              int sx1, int sy1, int sx2, int sy2,
                              Color bgcolor,
                              ImageObserver observer){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return false;
     }
 
@@ -848,7 +848,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      */
     public boolean drawImage(Image img, int x, int y,
                              ImageObserver observer) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return false;
     }
 
@@ -1033,7 +1033,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @since       JDK1.1
      */
     public void setClip(Shape clip) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -1331,7 +1331,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @see java.awt.AlphaComposite
      */
     public void setComposite(Composite comp){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -1342,7 +1342,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @see #setComposite
      */
     public Composite getComposite(){
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return null;
     }
 
@@ -1483,7 +1483,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @see #setClip
      */
     public void drawString(AttributedCharacterIterator iterator, float x, float y) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -1586,7 +1586,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @see #setClip(Shape)
      */
      public boolean drawImage(Image img, AffineTransform xform, ImageObserver obs) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return false;
     }
 
@@ -1629,7 +1629,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
     public boolean drawImage(Image img, int x, int y,
                              int width, int height,
                              ImageObserver observer) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
         return false;
     }
 
@@ -1675,7 +1675,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @param     c1 the XOR alternation color
      */
     public void setXORMode(Color c1) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -1686,7 +1686,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * overwrite the destination with the current color.
      */
     public void setPaintMode() {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -1721,7 +1721,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @see #drawRenderedImage
      */
      public void drawRenderedImage(RenderedImage img, AffineTransform xform) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     /**
@@ -1746,7 +1746,7 @@ public class PPGraphics2D extends Graphics2D implements Cloneable {
      * @see #setClip
      */
     public void drawRenderableImage(RenderableImage img, AffineTransform xform) {
-        log.warn("Not implemented");
+        log.log(POILogger.WARN, "Not implemented");
     }
 
     protected void applyStroke(SimpleShape shape) {
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java b/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
index 4866779b92..90efd5f3ee 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/Picture.java
@@ -21,6 +21,7 @@ import org.apache.poi.hslf.usermodel.PictureData;
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hslf.record.Document;
 import org.apache.poi.hslf.blip.Bitmap;
+import org.apache.poi.util.POILogger;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -178,7 +179,7 @@ public class Picture extends SimpleShape {
         List lst = bstore.getChildRecords();
         int idx = getPictureIndex();
         if (idx == 0){
-            log.error("no reference to picture data found ");
+            logger.log(POILogger.ERROR, "no reference to picture data found ");
         } else {
             EscherBSERecord bse = (EscherBSERecord)lst.get(idx-1);
             for ( int i = 0; i < pict.length; i++ ) {
@@ -186,7 +187,7 @@ public class Picture extends SimpleShape {
                     return pict[i];
                 }
             }
-            log.error("no picture found for our BSE offset " + bse.getOffset());
+            logger.log(POILogger.ERROR, "no picture found for our BSE offset " + bse.getOffset());
         }
         return null;
     }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java b/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
index 220a512dc5..f93392a9a9 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/Shape.java
@@ -19,8 +19,8 @@ package org.apache.poi.hslf.model;
 import org.apache.poi.ddf.*;
 import org.apache.poi.hslf.model.ShapeTypes;
 import org.apache.poi.hslf.record.ColorSchemeAtom;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.poi.util.POILogger;
+import org.apache.poi.util.POILogFactory;
 
 import java.util.Iterator;
 import java.awt.*;
@@ -45,7 +45,7 @@ import java.awt.geom.Rectangle2D;
 public abstract class Shape {
 
     // For logging
-    protected Log log = LogFactory.getLog(this.getClass());
+    protected POILogger logger = POILogFactory.getLogger(this.getClass());
 
     /**
      * In Escher absolute distances are specified in
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java b/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
index 7b79ebad97..dbcc8069c2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/ShapeGroup.java
@@ -18,6 +18,7 @@ package org.apache.poi.hslf.model;
 
 import org.apache.poi.ddf.*;
 import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.POILogger;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,7 +71,7 @@ public class ShapeGroup extends Shape{
         	} else {
         		// Should we do anything special with these non
         		//  Container records?
-        		log.error("Shape contained non container escher record, was " + r.getClass().getName());
+        		logger.log(POILogger.ERROR, "Shape contained non container escher record, was " + r.getClass().getName());
         	}
         }
         
diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java b/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
index 8a54e079c6..1f9a489a78 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/model/TextBox.java
@@ -22,6 +22,7 @@ import org.apache.poi.ddf.*;
 import org.apache.poi.hslf.record.*;
 import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.exceptions.HSLFException;
+import org.apache.poi.util.POILogger;
 
 import java.awt.*;
 import java.awt.font.FontRenderContext;
@@ -479,7 +480,7 @@ public class TextBox extends SimpleShape {
                 }
             }
             if(_txtrun == null) {
-                log.warn("text run not found for OutlineTextRefAtom.TextIndex=" + idx);
+                logger.log(POILogger.WARN, "text run not found for OutlineTextRefAtom.TextIndex=" + idx);
             }
         } else {
             int shapeId = _escherContainer.getChildById(EscherSpRecord.RECORD_ID).getShapeId();
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Document.java b/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
index c5b217b367..f6252840cc 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/Document.java
@@ -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) {
-			logger.warn("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) {
-			logger.warn("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
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
index 57c79afe11..9e58e8ae18 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExEmbed.java
@@ -21,6 +21,7 @@ import java.io.OutputStream;
 import java.io.IOException;
 
 import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.POILogger;
 
 /**
  * This data represents an embedded object in the document.
@@ -93,14 +94,14 @@ public class ExEmbed extends RecordContainer {
         if(_children[0] instanceof ExEmbedAtom) {
             embedAtom = (ExEmbedAtom)_children[0];
         } else {
-            logger.error("First child record wasn't a ExEmbedAtom, was of type " + _children[0].getRecordType());
+            logger.log(POILogger.ERROR, "First child record wasn't a ExEmbedAtom, was of type " + _children[0].getRecordType());
         }
 
         // Second child should be the ExOleObjAtom
         if (_children[1] instanceof ExOleObjAtom) {
             oleObjAtom = (ExOleObjAtom)_children[1];
         } else {
-            logger.error("Second child record wasn't a ExOleObjAtom, was of type " + _children[1].getRecordType());
+            logger.log(POILogger.ERROR, "Second child record wasn't a ExOleObjAtom, was of type " + _children[1].getRecordType());
         }
 
         for (int i = 2; i < _children.length; i++) {
@@ -109,7 +110,7 @@ public class ExEmbed extends RecordContainer {
                 else if (progId == null) progId = (CString)_children[i];
                 else if (clipboardName == null) clipboardName = (CString)_children[i];
             } else {
-                logger.error("Record after atoms wasn't a CString, was of type " + _children[i].getRecordType());
+                logger.log(POILogger.ERROR, "Record after atoms wasn't a CString, was of type " + _children[i].getRecordType());
             }
         }
     }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
index 1832e09019..8ba58cdb61 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExHyperlink.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import org.apache.poi.util.LittleEndian;
+import org.apache.poi.util.POILogger;
 
 /**
  * This class represents the data of a link in the document. 
@@ -107,7 +108,7 @@ public class ExHyperlink extends RecordContainer {
 		if(_children[0] instanceof ExHyperlinkAtom) {
 			linkAtom = (ExHyperlinkAtom)_children[0];
 		} else {
-			logger.error("First child record wasn't a ExHyperlinkAtom, was of type " + _children[0].getRecordType());
+			logger.log(POILogger.ERROR, "First child record wasn't a ExHyperlinkAtom, was of type " + _children[0].getRecordType());
 		}
 
         for (int i = 1; i < _children.length; i++) {
@@ -115,7 +116,7 @@ public class ExHyperlink extends RecordContainer {
                 if ( linkDetailsA == null) linkDetailsA = (CString)_children[i];
                 else linkDetailsB = (CString)_children[i];
             } else {
-                logger.error("Record after ExHyperlinkAtom wasn't a CString, was of type " + _children[1].getRecordType());
+                logger.log(POILogger.ERROR, "Record after ExHyperlinkAtom wasn't a CString, was of type " + _children[1].getRecordType());
             }
 
         }
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java b/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
index 17ab338414..521e8468b3 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java
@@ -18,6 +18,8 @@
 
 package org.apache.poi.hslf.record;
 
+import org.apache.poi.util.POILogger;
+
 import java.io.*;
 import java.util.*;
 
@@ -46,7 +48,7 @@ public class FontCollection extends RecordContainer {
 	            FontEntityAtom atom = (FontEntityAtom)_children[i];
 	            fonts.add(atom.getFontName());
 			} else {
-				logger.warn("Warning: FontCollection child wasn't a FontEntityAtom, was " + _children[i]);
+				logger.log(POILogger.WARN, "Warning: FontCollection child wasn't a FontEntityAtom, was " + _children[i]);
 			}
 		}
 	}
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
index b0602bc460..e42b358b89 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java
@@ -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;
@@ -131,7 +132,7 @@ public class PPDrawing extends RecordAtom
 		// Wind on
 		int size = r.getRecordSize();
 		if(size < 8) {
-			logger.warn("Hit short DDF record at " + startPos + " - " + size);
+			logger.log(POILogger.WARN, "Hit short DDF record at " + startPos + " - " + size);
 		}
 
         /**
@@ -141,7 +142,7 @@ public class PPDrawing extends RecordAtom
          * Sometimes it is not so, see an example in bug #44770. Most likely reason is that one of ddf records calculates wrong size. 
          */
         if(size != escherBytes){
-            logger.warn("Record length=" + escherBytes + " but getRecordSize() returned " + r.getRecordSize() + "; record: " + r.getClass());
+            logger.log(POILogger.WARN, "Record length=" + escherBytes + " but getRecordSize() returned " + r.getRecordSize() + "; record: " + r.getClass());
             size = escherBytes;
         }
 		startPos += size;
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
index 7f9d646802..68b8b7cafe 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java
@@ -20,6 +20,7 @@
 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;
@@ -194,8 +195,8 @@ public class PersistPtrHolder extends PositionDependentRecordAtom
 			Integer newPos = (Integer)oldToNewReferencesLookup.get(oldPos);
 
 			if(newPos == null) {
-				logger.warn("Couldn't find the new location of the \"slide\" with id " + id + " that used to be at " + oldPos);
-				logger.warn("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;
 			}
 
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
index 44cde7595b..46cb7479e2 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/Record.java
@@ -24,10 +24,9 @@ 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;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 
 /**
  * This abstract class represents a record in the PowerPoint document.
@@ -40,7 +39,7 @@ import org.apache.commons.logging.LogFactory;
 public abstract class Record
 {
     // For logging
-    protected Log logger = LogFactory.getLog(this.getClass());
+    protected POILogger logger = POILogFactory.getLogger(this.getClass());
 
 	/**
 	 * Is this record type an Atom record (only has data),
diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
index 72e17722ce..fdaa9eec2c 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/record/StyleTextPropAtom.java
@@ -31,6 +31,7 @@ import org.apache.poi.hslf.model.textproperties.ParagraphFlagsTextProp;
 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;
 
 /**
  * A StyleTextPropAtom (type 4001). Holds basic character properties 
@@ -292,7 +293,7 @@ public class StyleTextPropAtom extends RecordAtom
 
 		}
         if (rawContents.length > 0 && textHandled != (size+1)){
-            logger.warn("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
@@ -327,7 +328,7 @@ public class StyleTextPropAtom extends RecordAtom
 			}
 		}
         if (rawContents.length > 0 && textHandled != (size+1)){
-            logger.warn("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
diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
index 105bca5d43..9ce9a12c9d 100644
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java
@@ -37,8 +37,8 @@ import org.apache.poi.hslf.record.*;
 import org.apache.poi.hslf.exceptions.CorruptPowerPointFileException;
 import org.apache.poi.hslf.exceptions.HSLFException;
 import org.apache.poi.util.ArrayUtil;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.poi.util.POILogFactory;
+import org.apache.poi.util.POILogger;
 
 /**
  * This class is a friendly wrapper on top of the more scary HSLFSlideShow.
@@ -80,7 +80,7 @@ public class SlideShow
   private FontCollection _fonts;
 
   // For logging
-  private static final Log logger = LogFactory.getLog(SlideShow.class);
+    private POILogger logger = POILogFactory.getLogger(this.getClass());
 
   
   /* ===============================================================
@@ -275,7 +275,7 @@ public class SlideShow
 			Record r = _mostRecentCoreRecords[coreRecordId.intValue()];
 			return r;
 		} else {
-			logger.error("We tried to look up a reference to a core record, but there was no core ID for reference ID " + refID);
+			logger.log(POILogger.ERROR, "We tried to look up a reference to a core record, but there was no core ID for reference ID " + refID);
 			return null;
 		}
 	}
@@ -378,7 +378,7 @@ public class SlideShow
                 Integer slideId = new Integer(spa.getSlideIdentifier());
                 slideIdToNotes.put(slideId, new Integer(i));
 			} else {
-				logger.error("A Notes SlideAtomSet at " + i + " said its record was at refID " + notesSets[i].getSlidePersistAtom().getRefID() + ", but that was actually a " + r);
+				logger.log(POILogger.ERROR, "A Notes SlideAtomSet at " + i + " said its record was at refID " + notesSets[i].getSlidePersistAtom().getRefID() + ", but that was actually a " + r);
 			}
 		}
 		notesRecords = new org.apache.poi.hslf.record.Notes[notesRecordsL.size()];
@@ -404,7 +404,7 @@ public class SlideShow
 			if(r instanceof org.apache.poi.hslf.record.Slide) {
 				slidesRecords[i] = (org.apache.poi.hslf.record.Slide)r;
 			} else {
-				logger.error("A Slide SlideAtomSet at " + i + " said its record was at refID " + slidesSets[i].getSlidePersistAtom().getRefID() + ", but that was actually a " + r);
+				logger.log(POILogger.ERROR, "A Slide SlideAtomSet at " + i + " said its record was at refID " + slidesSets[i].getSlidePersistAtom().getRefID() + ", but that was actually a " + r);
 			}
 		}
 	}
@@ -429,7 +429,7 @@ public class SlideShow
         if (noteId != 0){
             Integer notesPos = (Integer)slideIdToNotes.get(new Integer(noteId));
             if (notesPos != null) notes = _notes[notesPos.intValue()];
-            else logger.error("Notes not found for noteId=" + noteId);
+            else logger.log(POILogger.ERROR, "Notes not found for noteId=" + noteId);
         }
 
 		// Now, build our slide
@@ -622,7 +622,7 @@ public class SlideShow
   		System.arraycopy(_slides, 0, s, 0, _slides.length);
   		s[_slides.length] = slide;
   		_slides = s;
-  		logger.info("Added slide " + _slides.length + " with ref " + sp.getRefID() + " and identifier " + sp.getSlideIdentifier());
+  		logger.log(POILogger.INFO, "Added slide " + _slides.length + " with ref " + sp.getRefID() + " and identifier " + sp.getSlideIdentifier());
   		
   		// Add the core records for this new Slide to the record tree
   		org.apache.poi.hslf.record.Slide slideRecord = slide.getSlideRecord();
@@ -658,7 +658,7 @@ public class SlideShow
   		// (Also need to tell it where it is)
 		slideRecord.setLastOnDiskOffset(slideOffset);
 		ptr.addSlideLookup(sp.getRefID(), slideOffset);
-		logger.info("New slide ended up at " + slideOffset);
+		logger.log(POILogger.INFO, "New slide ended up at " + slideOffset);
 
 		// Last view is now of the slide
   		usr.setLastViewType((short)UserEditAtom.LAST_VIEW_SLIDE_VIEW);