changed to logkit for logging only half done

fixed getContentHandler in driver


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194430 13f79535-47bb-0310-9956-ffa450edef68

25 files changed, 18 insertions, 42 deletions

diff --git a/src/org/apache/fop/fo/flow/BidiOverride.java b/src/org/apache/fop/fo/flow/BidiOverride.java
index ea1566cc7..5133369bf 100644
--- a/src/org/apache/fop/fo/flow/BidiOverride.java
+++ b/src/org/apache/fop/fo/flow/BidiOverride.java
@@ -10,7 +10,6 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.*;
 import org.apache.fop.layout.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.AreaTree;
diff --git a/src/org/apache/fop/fo/flow/Block.java b/src/org/apache/fop/fo/flow/Block.java
index 7ba0bed04..1b6c812fa 100644
--- a/src/org/apache/fop/fo/flow/Block.java
+++ b/src/org/apache/fop/fo/flow/Block.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
@@ -76,7 +75,7 @@ public class Block extends FObjMixed {
     public Status layout(Area area) throws FOPException {
         BlockArea blockArea;
 
-        // MessageHandler.error(" b:LAY[" + marker + "] ");
+        // log.error(" b:LAY[" + marker + "] ");
 
 
         if (this.marker == BREAK_AFTER) {
@@ -337,7 +336,7 @@ public class Block extends FObjMixed {
             return new Status(Status.KEEP_WITH_NEXT);
         }
 
-        // MessageHandler.error(" b:OK" + marker + " ");
+        // log.error(" b:OK" + marker + " ");
         blockArea.isLast(true);
         blockArea = null; // Faster GC - BlockArea is big
         return new Status(Status.OK);
diff --git a/src/org/apache/fop/fo/flow/Character.java b/src/org/apache/fop/fo/flow/Character.java
index eea3c77d2..79727d441 100644
--- a/src/org/apache/fop/fo/flow/Character.java
+++ b/src/org/apache/fop/fo/flow/Character.java
@@ -18,7 +18,6 @@ import org.apache.fop.fo.FObj;
 import org.apache.fop.layout.FontState;
 import org.apache.fop.layout.LineArea;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.messaging.MessageHandler;
 
 
 /**
@@ -60,7 +59,7 @@ public class Character extends FObj {
     public Status layout(Area area) throws FOPException {
         BlockArea blockArea;
         if (!(area instanceof BlockArea)) {
-            MessageHandler.errorln("WARNING: currently Character can only be in a BlockArea");
+            log.error("WARNING: currently Character can only be in a BlockArea");
             return new Status(Status.OK);
         }
         blockArea = (BlockArea)area;
diff --git a/src/org/apache/fop/fo/flow/ExternalGraphic.java b/src/org/apache/fop/fo/flow/ExternalGraphic.java
index 4647ce846..ff175c124 100644
--- a/src/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.apps.FOPException;
@@ -236,11 +235,11 @@ public class ExternalGraphic extends FObj {
 
         } catch (MalformedURLException urlex) {
             // bad URL
-            MessageHandler.errorln("Error while creating area : "
+            log.error("Error while creating area : "
                                    + urlex.getMessage());
         } catch (FopImageException imgex) {
             // image error
-            MessageHandler.errorln("Error while creating area : "
+            log.error("Error while creating area : "
                                    + imgex.getMessage());
         }
 
diff --git a/src/org/apache/fop/fo/flow/Float.java b/src/org/apache/fop/fo/flow/Float.java
index c5eb15188..b88e7873c 100644
--- a/src/org/apache/fop/fo/flow/Float.java
+++ b/src/org/apache/fop/fo/flow/Float.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/Flow.java b/src/org/apache/fop/fo/flow/Flow.java
index 9f90dca51..cf08e9a1e 100644
--- a/src/org/apache/fop/fo/flow/Flow.java
+++ b/src/org/apache/fop/fo/flow/Flow.java
@@ -14,7 +14,6 @@ import org.apache.fop.fo.pagination.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.layout.BodyAreaContainer;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.messaging.MessageHandler;
 
 // Java
 import java.util.Hashtable;
@@ -91,7 +90,7 @@ public class Flow extends FObj {
 
     protected void setFlowName(String name) throws FOPException {
         if (name == null || name.equals("")) {
-            MessageHandler.errorln("WARNING: A 'flow-name' is required for "
+            log.error("WARNING: A 'flow-name' is required for "
                                    + getElementName()
                                    + ". This constraint will be enforced in future versions of FOP");
             _flowName = "xsl-region-body";
diff --git a/src/org/apache/fop/fo/flow/Footnote.java b/src/org/apache/fop/fo/flow/Footnote.java
index 3f72d49fb..d4a239f49 100644
--- a/src/org/apache/fop/fo/flow/Footnote.java
+++ b/src/org/apache/fop/fo/flow/Footnote.java
@@ -65,7 +65,7 @@ public class Footnote extends FObj {
             }
         }
         if (fbody == null) {
-            MessageHandler.errorln("WARNING: no footnote-body in footnote");
+            log.error("WARNING: no footnote-body in footnote");
         }
         if (area instanceof BlockArea) {}
         return new Status(Status.OK);
diff --git a/src/org/apache/fop/fo/flow/InitialPropertySet.java b/src/org/apache/fop/fo/flow/InitialPropertySet.java
index 7406146d2..aa53341a3 100644
--- a/src/org/apache/fop/fo/flow/InitialPropertySet.java
+++ b/src/org/apache/fop/fo/flow/InitialPropertySet.java
@@ -10,7 +10,6 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.*;
 import org.apache.fop.layout.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.AreaTree;
diff --git a/src/org/apache/fop/fo/flow/InlineContainer.java b/src/org/apache/fop/fo/flow/InlineContainer.java
index 5332a2dc6..61aba7695 100644
--- a/src/org/apache/fop/fo/flow/InlineContainer.java
+++ b/src/org/apache/fop/fo/flow/InlineContainer.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/Leader.java b/src/org/apache/fop/fo/flow/Leader.java
index 97d1e00c8..989b863fb 100644
--- a/src/org/apache/fop/fo/flow/Leader.java
+++ b/src/org/apache/fop/fo/flow/Leader.java
@@ -17,7 +17,6 @@ import org.apache.fop.layout.inline.LeaderArea;
 import org.apache.fop.layout.LineArea;
 import org.apache.fop.layout.FontState;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.messaging.MessageHandler;
 
 /**
  * Implements fo:leader; main property of leader leader-pattern.
@@ -48,7 +47,7 @@ public class Leader extends FObjMixed {
         BlockArea blockArea;
         // restriction in this version
         if (!(area instanceof BlockArea)) {
-            MessageHandler.errorln("WARNING: in this version of Fop fo:leader must be a direct child of fo:block ");
+            log.error("WARNING: in this version of Fop fo:leader must be a direct child of fo:block ");
             return new Status(Status.OK);
         } else {
             blockArea = (BlockArea)area;
@@ -198,7 +197,7 @@ public class Leader extends FObjMixed {
                              ruleStyle, ruleThickness, leaderPatternWidth,
                              leaderAlignment);
             } else {
-                MessageHandler.errorln("Leader doesn't fit into line, it will be clipped to fit.");
+                log.error("Leader doesn't fit into line, it will be clipped to fit.");
                 la.addLeader(leaderPattern, la.getRemainingWidth(),
                              leaderLengthOptimum, leaderLengthMaximum,
                              ruleStyle, ruleThickness, leaderPatternWidth,
diff --git a/src/org/apache/fop/fo/flow/ListBlock.java b/src/org/apache/fop/fo/flow/ListBlock.java
index 3b93659d3..935ba9ccb 100644
--- a/src/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/org/apache/fop/fo/flow/ListBlock.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.layout.*;
@@ -143,7 +142,7 @@ public class ListBlock extends FObj {
         int numChildren = this.children.size();
         for (int i = this.marker; i < numChildren; i++) {
             if (!(children.elementAt(i) instanceof ListItem)) {
-                MessageHandler.errorln("children of list-blocks must be list-items");
+                log.error("children of list-blocks must be list-items");
                 return new Status(Status.OK);
             }
             ListItem listItem = (ListItem)children.elementAt(i);
diff --git a/src/org/apache/fop/fo/flow/Marker.java b/src/org/apache/fop/fo/flow/Marker.java
index aba8b54a9..762ed8327 100644
--- a/src/org/apache/fop/fo/flow/Marker.java
+++ b/src/org/apache/fop/fo/flow/Marker.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
@@ -46,7 +45,7 @@ public class Marker extends FObjMixed {
         try {
             parent.addMarker(this);
         } catch (FOPException fopex) {
-            MessageHandler.error("marker cannot be added to '" + parent
+            log.error("marker cannot be added to '" + parent
                                  + "'");
         }
     }
diff --git a/src/org/apache/fop/fo/flow/MultiCase.java b/src/org/apache/fop/fo/flow/MultiCase.java
index 9cd7a1073..d3c0884c2 100644
--- a/src/org/apache/fop/fo/flow/MultiCase.java
+++ b/src/org/apache/fop/fo/flow/MultiCase.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/MultiProperties.java b/src/org/apache/fop/fo/flow/MultiProperties.java
index 03a42b289..19cd50019 100644
--- a/src/org/apache/fop/fo/flow/MultiProperties.java
+++ b/src/org/apache/fop/fo/flow/MultiProperties.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/MultiPropertySet.java b/src/org/apache/fop/fo/flow/MultiPropertySet.java
index 7263f702d..f9c9fb96e 100644
--- a/src/org/apache/fop/fo/flow/MultiPropertySet.java
+++ b/src/org/apache/fop/fo/flow/MultiPropertySet.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/MultiSwitch.java b/src/org/apache/fop/fo/flow/MultiSwitch.java
index 42e6e185a..eabd80535 100644
--- a/src/org/apache/fop/fo/flow/MultiSwitch.java
+++ b/src/org/apache/fop/fo/flow/MultiSwitch.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/MultiToggle.java b/src/org/apache/fop/fo/flow/MultiToggle.java
index 8fce89f14..f49fcd170 100644
--- a/src/org/apache/fop/fo/flow/MultiToggle.java
+++ b/src/org/apache/fop/fo/flow/MultiToggle.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/PageNumber.java b/src/org/apache/fop/fo/flow/PageNumber.java
index ddfb60473..65925e54e 100644
--- a/src/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/org/apache/fop/fo/flow/PageNumber.java
@@ -10,7 +10,6 @@ package org.apache.fop.fo.flow;
 // FOP
 import org.apache.fop.fo.*;
 import org.apache.fop.layout.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
@@ -47,7 +46,7 @@ public class PageNumber extends FObj {
 
     public Status layout(Area area) throws FOPException {
         if (!(area instanceof BlockArea)) {
-            MessageHandler.errorln("WARNING: page-number outside block area");
+            log.error("WARNING: page-number outside block area");
             return new Status(Status.OK);
         }
         if (this.marker == START) {
diff --git a/src/org/apache/fop/fo/flow/PageNumberCitation.java b/src/org/apache/fop/fo/flow/PageNumberCitation.java
index 95d93b627..034be267e 100644
--- a/src/org/apache/fop/fo/flow/PageNumberCitation.java
+++ b/src/org/apache/fop/fo/flow/PageNumberCitation.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.pagination.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.fo.properties.*;
@@ -105,7 +104,7 @@ public class PageNumberCitation extends FObj {
 
     public Status layout(Area area) throws FOPException {
         if (!(area instanceof BlockArea)) {
-            MessageHandler.errorln("WARNING: page-number-citation outside block area");
+            log.error("WARNING: page-number-citation outside block area");
             return new Status(Status.OK);
         }
 
diff --git a/src/org/apache/fop/fo/flow/RetrieveMarker.java b/src/org/apache/fop/fo/flow/RetrieveMarker.java
index 55376ac65..67e9f5047 100644
--- a/src/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
diff --git a/src/org/apache/fop/fo/flow/StaticContent.java b/src/org/apache/fop/fo/flow/StaticContent.java
index e433ef83e..f6a919fc7 100644
--- a/src/org/apache/fop/fo/flow/StaticContent.java
+++ b/src/org/apache/fop/fo/flow/StaticContent.java
@@ -13,7 +13,6 @@ import org.apache.fop.fo.properties.*;
 import org.apache.fop.fo.pagination.*;
 import org.apache.fop.layout.Area;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.messaging.MessageHandler;
 
 // Java
 import java.util.Enumeration;
@@ -78,7 +77,7 @@ public class StaticContent extends Flow {
             Status status;
             if ((status = fo.layout(area)).isIncomplete()) {
                 // in fact all should be laid out and clip, error etc depending on 'overflow'
-                MessageHandler.logln("Warning: Some static content could not fit in the area.");
+                log.debug("Warning: Some static content could not fit in the area.");
                 this.marker = i;
                 if ((i != 0) && (status.getCode() == Status.AREA_FULL_NONE)) {
                     status = new Status(Status.AREA_FULL_SOME);
diff --git a/src/org/apache/fop/fo/flow/Table.java b/src/org/apache/fop/fo/flow/Table.java
index 4f67da52b..b6c828b2c 100644
--- a/src/org/apache/fop/fo/flow/Table.java
+++ b/src/org/apache/fop/fo/flow/Table.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.datatypes.*;
@@ -199,21 +198,21 @@ public class Table extends FObj {
             FONode fo = (FONode)children.elementAt(i);
             if (fo instanceof TableHeader) {
                 if (columns.size() == 0) {
-                    MessageHandler.errorln("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
+                    log.error("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
                     return new Status(Status.OK);
                 }
                 tableHeader = (TableHeader)fo;
                 tableHeader.setColumns(columns);
             } else if (fo instanceof TableFooter) {
                 if (columns.size() == 0) {
-                    MessageHandler.errorln("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
+                    log.error("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
                     return new Status(Status.OK);
                 }
                 tableFooter = (TableFooter)fo;
                 tableFooter.setColumns(columns);
             } else if (fo instanceof TableBody) {
                 if (columns.size() == 0) {
-                    MessageHandler.errorln("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
+                    log.error("WARNING: current implementation of tables requires a table-column for each column, indicating column-width");
                     return new Status(Status.OK);
                 }
                 Status status;
@@ -291,7 +290,7 @@ public class Table extends FObj {
                 // from the last table body and place it on the
                 // next page so that it can have a footer at
                 // the end of the table.
-                MessageHandler.errorln("WARNING: footer could not fit on page, moving last body row to next page");
+                log.error("WARNING: footer could not fit on page, moving last body row to next page");
                 area.addChild(areaContainer);
                 area.increaseHeight(areaContainer.getHeight());
                 area.setAbsoluteHeight(areaContainer.getAbsoluteHeight());
diff --git a/src/org/apache/fop/fo/flow/TableAndCaption.java b/src/org/apache/fop/fo/flow/TableAndCaption.java
index b9243aeea..d7cbebf20 100644
--- a/src/org/apache/fop/fo/flow/TableAndCaption.java
+++ b/src/org/apache/fop/fo/flow/TableAndCaption.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/TableCaption.java b/src/org/apache/fop/fo/flow/TableCaption.java
index 93712f309..396f08863 100644
--- a/src/org/apache/fop/fo/flow/TableCaption.java
+++ b/src/org/apache/fop/fo/flow/TableCaption.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.flow.*;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.layout.*;
diff --git a/src/org/apache/fop/fo/flow/TableRow.java b/src/org/apache/fop/fo/flow/TableRow.java
index d2d879c97..d06e04784 100644
--- a/src/org/apache/fop/fo/flow/TableRow.java
+++ b/src/org/apache/fop/fo/flow/TableRow.java
@@ -9,7 +9,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.*;
-import org.apache.fop.messaging.MessageHandler;
 import org.apache.fop.fo.properties.*;
 import org.apache.fop.datatypes.*;
 import org.apache.fop.layout.*;