keiron 01/09/11 03:04:26
Modified: src/org/apache/fop/apps Fop.java StreamRenderer.java
src/org/apache/fop/datatypes ColorType.java Length.java
LengthRange.java
src/org/apache/fop/fo EnumProperty.java FOText.java
Property.java PropertyListBuilder.java
src/org/apache/fop/fo/flow Character.java Flow.java
Footnote.java Leader.java PageNumber.java
PageNumberCitation.java Table.java
src/org/apache/fop/fo/pagination
ConditionalPageMasterReference.java
PageMasterReference.java PageSequence.java
PageSequenceMaster.java SimplePageMaster.java
src/org/apache/fop/image SVGImage.java
src/org/apache/fop/image/analyser SVGReader.java
src/org/apache/fop/layout FontInfo.java
src/org/apache/fop/render/pcl PCLRenderer.java
src/org/apache/fop/tools TestConverter.java
Log:
improved debugging messages a bit
Revision Changes Path
1.7 +3 -3 xml-fop/src/org/apache/fop/apps/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Fop.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Fop.java 2001/07/30 20:29:18 1.6
+++ Fop.java 2001/09/11 10:04:24 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: Fop.java,v 1.6 2001/07/30 20:29:18 tore Exp $
+ * $Id: Fop.java,v 1.7 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -18,12 +18,12 @@
Starter starter = options.getStarter();
starter.run();
} catch (FOPException e) {
- MessageHandler.errorln("ERROR: " + e.getMessage());
+ MessageHandler.errorln("" + e.getMessage());
if (options != null && options.isDebugMode().booleanValue()) {
e.printStackTrace();
}
} catch (java.io.FileNotFoundException e) {
- MessageHandler.errorln("ERROR: " + e.getMessage());
+ MessageHandler.errorln("" + e.getMessage());
if (options != null && options.isDebugMode().booleanValue()) {
e.printStackTrace();
}
1.6 +8 -8 xml-fop/src/org/apache/fop/apps/StreamRenderer.java
Index: StreamRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/StreamRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- StreamRenderer.java 2001/08/21 08:26:11 1.5
+++ StreamRenderer.java 2001/09/11 10:04:24 1.6
@@ -146,20 +146,20 @@
long memoryNow = runtime.totalMemory() - runtime.freeMemory();
long memoryUsed = (memoryNow - initialMemory) / 1024L;
- log.info("Initial heap size: " + (initialMemory/1024L) + "Kb");
- log.info("Current heap size: " + (memoryNow/1024L) + "Kb");
- log.info("Total memory used: " + memoryUsed + "Kb");
+ log.debug("Initial heap size: " + (initialMemory/1024L) + "Kb");
+ log.debug("Current heap size: " + (memoryNow/1024L) + "Kb");
+ log.debug("Total memory used: " + memoryUsed + "Kb");
if (!MEM_PROFILE_WITH_GC) {
- log.info(" Memory use is indicative; no GC was performed");
- log.info(" These figures should not be used comparatively");
+ log.debug(" Memory use is indicative; no GC was performed");
+ log.debug(" These figures should not be used comparatively");
}
long timeUsed = System.currentTimeMillis() - startTime;
- log.info("Total time used: " + timeUsed + "ms");
- log.info("Pages rendererd: " + pageCount);
- log.info("Avg render time: " + (timeUsed / pageCount) + "ms/page");
+ log.debug("Total time used: " + timeUsed + "ms");
+ log.debug("Pages rendererd: " + pageCount);
+ log.debug("Avg render time: " + (timeUsed / pageCount) + "ms/page");
}
/**
1.16 +5 -5 xml-fop/src/org/apache/fop/datatypes/ColorType.java
Index: ColorType.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/ColorType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ColorType.java 2001/07/30 20:29:19 1.15
+++ ColorType.java 2001/09/11 10:04:24 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: ColorType.java,v 1.15 2001/07/30 20:29:19 tore Exp $
+ * $Id: ColorType.java,v 1.16 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -68,13 +68,13 @@
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("ERROR: unknown colour format. Must be
#RGB or #RRGGBB");
+ MessageHandler.errorln("unknown colour format. Must be #RGB or
#RRGGBB");
}
} catch (Exception e) {
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("ERROR: unknown colour format. Must be #RGB
or #RRGGBB");
+ MessageHandler.errorln("unknown colour format. Must be #RGB or
#RRGGBB");
}
} else if (value.startsWith("rgb(")) {
int poss = value.indexOf("(");
@@ -117,7 +117,7 @@
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("ERROR: unknown colour format. Must be
#RGB or #RRGGBB");
+ MessageHandler.errorln("unknown colour format. Must be #RGB or
#RRGGBB");
}
}
} else if (value.startsWith("url(")) {
@@ -143,7 +143,7 @@
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("ERROR: unknown colour name: "
+ MessageHandler.errorln("unknown colour name: "
+ value);
}
}
1.13 +2 -2 xml-fop/src/org/apache/fop/datatypes/Length.java
Index: Length.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/Length.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Length.java 2001/08/09 13:51:55 1.12
+++ Length.java 2001/09/11 10:04:24 1.13
@@ -1,5 +1,5 @@
/*
- * $Id: Length.java,v 1.12 2001/08/09 13:51:55 keiron Exp $
+ * $Id: Length.java,v 1.13 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -74,7 +74,7 @@
dvalue = dvalue * assumed_resolution;
else {
dvalue = 0;
- MessageHandler.errorln("ERROR: unknown length unit '" + unit
+ MessageHandler.errorln("unknown length unit '" + unit
+ "'");
}
this.millipoints = (int)(dvalue * 1000);
1.7 +4 -4 xml-fop/src/org/apache/fop/datatypes/LengthRange.java
Index: LengthRange.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/LengthRange.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LengthRange.java 2001/08/20 11:19:22 1.6
+++ LengthRange.java 2001/09/11 10:04:24 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: LengthRange.java,v 1.6 2001/08/20 11:19:22 keiron Exp $
+ * $Id: LengthRange.java,v 1.7 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -101,7 +101,7 @@
* // if minimum is explicit, force max to min
* if ((bfSet&MAXSET)!=0) {
* // Warning: min>max, resetting max to min
- * MessageHandler.errorln("WARNING: forcing max to min in LengthRange");
+ * MessageHandler.errorln("forcing max to min in LengthRange");
* }
* maximum = minimum ;
* }
@@ -114,7 +114,7 @@
* if ((bfSet&OPTSET)!=0) {
* if ((bfSet&MAXSET)!=0) {
* // Warning: opt > max, resetting opt to max
- * MessageHandler.errorln("WARNING: forcing opt to max in LengthRange");
+ * MessageHandler.errorln("forcing opt to max in LengthRange");
* optimum = maximum ;
* }
* else {
@@ -130,7 +130,7 @@
* if ((bfSet&MINSET)!=0) {
* // if minimum is explicit, force opt to min
* if ((bfSet&OPTSET)!=0) {
- * MessageHandler.errorln("WARNING: forcing opt to min in LengthRange");
+ * MessageHandler.errorln("forcing opt to min in LengthRange");
* }
* optimum = minimum ;
* }
1.5 +2 -2 xml-fop/src/org/apache/fop/fo/EnumProperty.java
Index: EnumProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/EnumProperty.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- EnumProperty.java 2001/07/30 20:29:20 1.4
+++ EnumProperty.java 2001/09/11 10:04:24 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: EnumProperty.java,v 1.4 2001/07/30 20:29:20 tore Exp $
+ * $Id: EnumProperty.java,v 1.5 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -23,7 +23,7 @@
* Called by subclass if no match found.
*/
public Property checkEnumValues(String value) {
- MessageHandler.errorln("WARNING: Unknown enumerated value for property
'"
+ MessageHandler.errorln("Unknown enumerated value for property '"
+ getPropName() + "': " + value);
return null;
}
1.24 +2 -2 xml-fop/src/org/apache/fop/fo/FOText.java
Index: FOText.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FOText.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FOText.java 2001/08/20 11:19:22 1.23
+++ FOText.java 2001/09/11 10:04:24 1.24
@@ -1,5 +1,5 @@
/*
- * $Id: FOText.java,v 1.23 2001/08/20 11:19:22 keiron Exp $
+ * $Id: FOText.java,v 1.24 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources."
@@ -105,7 +105,7 @@
// ML - remove refs to BufferManager
// char ca[] = this.bufferManager.readBuffer((Object)this);
if (!(area instanceof BlockArea)) {
- log.error("WARNING: text outside block area"
+ log.error("text outside block area"
+ new String(ca, start, length));
return new Status(Status.OK);
}
1.17 +2 -2 xml-fop/src/org/apache/fop/fo/Property.java
Index: Property.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Property.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Property.java 2001/08/20 11:19:22 1.16
+++ Property.java 2001/09/11 10:04:24 1.17
@@ -1,5 +1,5 @@
/*
- * $Id: Property.java,v 1.16 2001/08/20 11:19:22 keiron Exp $
+ * $Id: Property.java,v 1.17 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -132,7 +132,7 @@
return setSubprop(baseProp, partName, p);
}
} else {
- //MessageHandler.errorln("WARNING: compound property component "
+ //MessageHandler.errorln("compound property component "
// + partName + " unknown.");
}
return baseProp;
1.31 +8 -8 xml-fop/src/org/apache/fop/fo/PropertyListBuilder.java
Index: PropertyListBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/PropertyListBuilder.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PropertyListBuilder.java 2001/07/30 20:29:20 1.30
+++ PropertyListBuilder.java 2001/09/11 10:04:24 1.31
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyListBuilder.java,v 1.30 2001/07/30 20:29:20 tore Exp $
+ * $Id: PropertyListBuilder.java,v 1.31 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -51,13 +51,13 @@
try {
p = propertyMaker.compute(propertyList);
} catch (FOPException e) {
- MessageHandler.errorln("ERROR: exception occurred while computing"
+ MessageHandler.errorln("exception occurred while computing"
+ " value of property '"
+ propertyName + "': "
+ e.getMessage());
}
} else {
- MessageHandler.errorln("WARNING: property " + propertyName
+ MessageHandler.errorln("property " + propertyName
+ " ignored");
}
return p;
@@ -72,7 +72,7 @@
if (propertyMaker != null) {
b = propertyMaker.isInherited();
} else {
- // MessageHandler.errorln("WARNING: Unknown property " + propertyName);
+ // MessageHandler.errorln("Unknown property " + propertyName);
b = true;
}
return b;
@@ -171,7 +171,7 @@
}
} else {
if (!attributeName.startsWith("xmlns"))
- MessageHandler.errorln("WARNING: property '"
+ MessageHandler.errorln("property '"
+ attributeName + "' ignored");
}
}
@@ -198,7 +198,7 @@
if (propertyMaker != null) {
return propertyMaker.isCorrespondingForced(propertyList);
} else {
- MessageHandler.errorln("WARNING: no Maker for " + propertyName);
+ MessageHandler.errorln("no Maker for " + propertyName);
}
return false;
}
@@ -210,7 +210,7 @@
if (propertyMaker != null) {
return propertyMaker.getShorthand(propertyList);
} else {
- MessageHandler.errorln("WARNING: no Maker for " + propertyName);
+ MessageHandler.errorln("no Maker for " + propertyName);
return null;
}
}
@@ -227,7 +227,7 @@
if (propertyMaker != null) {
p = propertyMaker.make(propertyList);
} else {
- MessageHandler.errorln("WARNING: property " + propertyName
+ MessageHandler.errorln("property " + propertyName
+ " ignored");
}
return p;
1.12 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Character.java
Index: Character.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Character.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Character.java 2001/08/20 11:19:23 1.11
+++ Character.java 2001/09/11 10:04:24 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: Character.java,v 1.11 2001/08/20 11:19:23 keiron Exp $
+ * $Id: Character.java,v 1.12 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -59,7 +59,7 @@
public Status layout(Area area) throws FOPException {
BlockArea blockArea;
if (!(area instanceof BlockArea)) {
- log.error("WARNING: currently Character can only be in a BlockArea");
+ log.warn("currently Character can only be in a BlockArea");
return new Status(Status.OK);
}
blockArea = (BlockArea)area;
1.23 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Flow.java
Index: Flow.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Flow.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Flow.java 2001/08/20 11:19:23 1.22
+++ Flow.java 2001/09/11 10:04:24 1.23
@@ -1,5 +1,5 @@
/*
- * $Id: Flow.java,v 1.22 2001/08/20 11:19:23 keiron Exp $
+ * $Id: Flow.java,v 1.23 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -90,7 +90,7 @@
protected void setFlowName(String name) throws FOPException {
if (name == null || name.equals("")) {
- log.error("WARNING: A 'flow-name' is required for "
+ log.warn("A 'flow-name' is required for "
+ getElementName()
+ ". This constraint will be enforced in future
versions of FOP");
_flowName = "xsl-region-body";
1.6 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Footnote.java
Index: Footnote.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Footnote.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Footnote.java 2001/08/20 11:19:23 1.5
+++ Footnote.java 2001/09/11 10:04:24 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: Footnote.java,v 1.5 2001/08/20 11:19:23 keiron Exp $
+ * $Id: Footnote.java,v 1.6 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -65,7 +65,7 @@
}
}
if (fbody == null) {
- log.error("WARNING: no footnote-body in footnote");
+ log.error("no footnote-body in footnote");
}
if (area instanceof BlockArea) {}
return new Status(Status.OK);
1.12 +2 -2 xml-fop/src/org/apache/fop/fo/flow/Leader.java
Index: Leader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Leader.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Leader.java 2001/08/30 11:33:38 1.11
+++ Leader.java 2001/09/11 10:04:24 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: Leader.java,v 1.11 2001/08/30 11:33:38 keiron Exp $
+ * $Id: Leader.java,v 1.12 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -47,7 +47,7 @@
BlockArea blockArea;
// restriction in this version
if (!(area instanceof BlockArea)) {
- log.error("WARNING: in this version of Fop fo:leader must be a direct
child of fo:block ");
+ log.warn("in this version of Fop fo:leader must be a direct child of
fo:block ");
return new Status(Status.OK);
} else {
blockArea = (BlockArea)area;
1.21 +2 -2 xml-fop/src/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PageNumber.java 2001/08/20 11:19:23 1.20
+++ PageNumber.java 2001/09/11 10:04:24 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumber.java,v 1.20 2001/08/20 11:19:23 keiron Exp $
+ * $Id: PageNumber.java,v 1.21 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -46,7 +46,7 @@
public Status layout(Area area) throws FOPException {
if (!(area instanceof BlockArea)) {
- log.error("WARNING: page-number outside block area");
+ log.warn("page-number outside block area");
return new Status(Status.OK);
}
if (this.marker == START) {
1.19 +2 -2 xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java
Index: PageNumberCitation.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/PageNumberCitation.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- PageNumberCitation.java 2001/08/20 11:19:23 1.18
+++ PageNumberCitation.java 2001/09/11 10:04:24 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: PageNumberCitation.java,v 1.18 2001/08/20 11:19:23 keiron Exp $
+ * $Id: PageNumberCitation.java,v 1.19 2001/09/11 10:04:24 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -104,7 +104,7 @@
public Status layout(Area area) throws FOPException {
if (!(area instanceof BlockArea)) {
- log.error("WARNING: page-number-citation outside block area");
+ log.warn("page-number-citation outside block area");
return new Status(Status.OK);
}
1.35 +5 -5 xml-fop/src/org/apache/fop/fo/flow/Table.java
Index: Table.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Table.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Table.java 2001/08/20 11:19:23 1.34
+++ Table.java 2001/09/11 10:04:24 1.35
@@ -1,5 +1,5 @@
/*
- * -- $Id: Table.java,v 1.34 2001/08/20 11:19:23 keiron Exp $ --
+ * -- $Id: Table.java,v 1.35 2001/09/11 10:04:24 keiron Exp $ --
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -198,21 +198,21 @@
FONode fo = (FONode)children.elementAt(i);
if (fo instanceof TableHeader) {
if (columns.size() == 0) {
- log.error("WARNING: current implementation of tables requires a
table-column for each column, indicating column-width");
+ log.warn("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) {
- log.error("WARNING: current implementation of tables requires a
table-column for each column, indicating column-width");
+ log.warn("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) {
- log.error("WARNING: current implementation of tables requires a
table-column for each column, indicating column-width");
+ log.warn("current implementation of tables requires a
table-column for each column, indicating column-width");
return new Status(Status.OK);
}
Status status;
@@ -290,7 +290,7 @@
// 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.
- log.error("WARNING: footer could not fit on page, moving last body
row to next page");
+ log.warn("footer could not fit on page, moving last body row to
next page");
area.addChild(areaContainer);
area.increaseHeight(areaContainer.getHeight());
area.setAbsoluteHeight(areaContainer.getAbsoluteHeight());
1.5 +2 -2
xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java
Index: ConditionalPageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ConditionalPageMasterReference.java 2001/08/20 11:19:24 1.4
+++ ConditionalPageMasterReference.java 2001/09/11 10:04:25 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: ConditionalPageMasterReference.java,v 1.4 2001/08/20 11:19:24 keiron Exp $
+ * $Id: ConditionalPageMasterReference.java,v 1.5 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -147,7 +147,7 @@
(RepeatablePageMasterAlternatives)parent;
if (getMasterName() == null) {
- log.error("WARNING: single-page-master-reference"
+ log.warn("single-page-master-reference"
+ "does not have a master-name and so is
being ignored");
} else {
this.repeatablePageMasterAlternatives.addConditionalPageMasterReference(this);
1.5 +2 -2
xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java
Index: PageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageMasterReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PageMasterReference.java 2001/08/20 11:19:24 1.4
+++ PageMasterReference.java 2001/09/11 10:04:25 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: PageMasterReference.java,v 1.4 2001/08/20 11:19:24 keiron Exp $
+ * $Id: PageMasterReference.java,v 1.5 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -71,7 +71,7 @@
_pageSequenceMaster = (PageSequenceMaster)parent;
if (getMasterName() == null) {
- log.error("WARNING: " + getElementName()
+ log.warn("" + getElementName()
+ " does not have a master-name and so is
being ignored");
} else {
_pageSequenceMaster.addSubsequenceSpecifier(this);
1.39 +6 -6 xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java
Index: PageSequence.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequence.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- PageSequence.java 2001/08/20 11:19:24 1.38
+++ PageSequence.java 2001/09/11 10:04:25 1.39
@@ -1,5 +1,5 @@
/*
- * $Id: PageSequence.java,v 1.38 2001/08/20 11:19:24 keiron Exp $
+ * $Id: PageSequence.java,v 1.39 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -199,7 +199,7 @@
throw new FOPException("flow-names must be unique within an
fo:page-sequence");
}
if (!this.layoutMasterSet.regionNameExists(flow.getFlowName())) {
- log.error("WARNING: region-name '"
+ log.error("region-name '"
+ flow.getFlowName()
+ "' doesn't exist in the layout-master-set.");
}
@@ -272,7 +272,7 @@
currentPage.setFormattedNumber(formattedPageNumber);
this.root.setRunningPageNumberCounter(this.currentPageNumber);
- log.info(" [" + currentPageNumber);
+ log.info("[" + currentPageNumber + "]");
if ((status.getCode() == Status.FORCE_PAGE_BREAK_EVEN)
&& ((currentPageNumber % 2) == 1)) {}
@@ -301,7 +301,7 @@
currentPage.setPageSequence(this);
formatStaticContent(areaTree);
- log.info("]");
+ //log.info("]");
areaTree.addPage(currentPage);
this.pageCount++; // used for 'force-page-count' calculations
}
@@ -412,7 +412,7 @@
AreaContainer beforeArea = currentPage.getBefore();
((StaticContent)flow).layout(area, region);
} else {
- log.error("WARNING: " + region.getName()
+ log.error("" + region.getName()
+ " only supports static-content flows
currently. Cannot use flow named '"
+ flow.getFlowName() + "'");
}
@@ -476,7 +476,7 @@
SubSequenceSpecifier nextSubsequence =
getNextSubsequence(sequenceMaster);
if (nextSubsequence == null) {
- log.error("\nWARNING: Page subsequences exhausted. Using previous
subsequence.");
+ log.error("Page subsequences exhausted. Using previous
subsequence.");
thisIsFirstPage =
true; // this becomes the first page in the new (old really)
page master
currentSubsequence.reset();
1.6 +2 -2 xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java
Index: PageSequenceMaster.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/PageSequenceMaster.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PageSequenceMaster.java 2001/08/20 11:19:24 1.5
+++ PageSequenceMaster.java 2001/09/11 10:04:25 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: PageSequenceMaster.java,v 1.5 2001/08/20 11:19:24 keiron Exp $
+ * $Id: PageSequenceMaster.java,v 1.6 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -51,7 +51,7 @@
this.layoutMasterSet = (LayoutMasterSet)parent;
String pm = this.properties.get("master-name").getString();
if (pm == null) {
- log.error("WARNING: page-sequence-master does not have "
+ log.warn("page-sequence-master does not have "
+ "a page-master-name and so is being
ignored");
} else {
this.layoutMasterSet.addPageSequenceMaster(pm, this);
1.15 +3 -3 xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java
Index: SimplePageMaster.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/pagination/SimplePageMaster.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SimplePageMaster.java 2001/08/20 11:19:24 1.14
+++ SimplePageMaster.java 2001/09/11 10:04:25 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: SimplePageMaster.java,v 1.14 2001/08/20 11:19:24 keiron Exp $
+ * $Id: SimplePageMaster.java,v 1.15 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -57,7 +57,7 @@
this.layoutMasterSet = (LayoutMasterSet)parent;
masterName = this.properties.get("master-name").getString();
if (masterName == null) {
- log.error("WARNING: simple-page-master does not have "
+ log.warn("simple-page-master does not have "
+ "a master-name and so is being ignored");
} else {
this.layoutMasterSet.addSimplePageMaster(this);
@@ -98,7 +98,7 @@
contentRectangleHeight);
this.pageMaster.addBody(body);
} else {
- log.error("ERROR: simple-page-master must have a region of class "
+ log.error("simple-page-master must have a region of class "
+ RegionBody.REGION_CLASS);
}
1.7 +2 -2 xml-fop/src/org/apache/fop/image/SVGImage.java
Index: SVGImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/SVGImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGImage.java 2001/07/30 20:29:26 1.6
+++ SVGImage.java 2001/09/11 10:04:25 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: SVGImage.java,v 1.6 2001/07/30 20:29:26 tore Exp $
+ * $Id: SVGImage.java,v 1.7 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -56,7 +56,7 @@
new SAXSVGDocumentFactory(SVGImage.getParserName());
doc = factory.createDocument(this.m_href.toExternalForm());
} catch (Exception e) {
- MessageHandler.errorln("ERROR LOADING EXTERNAL SVG: "
+ MessageHandler.errorln("Could not load external SVG: "
+ e.getMessage());
}
}
1.9 +2 -2 xml-fop/src/org/apache/fop/image/analyser/SVGReader.java
Index: SVGReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/analyser/SVGReader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGReader.java 2001/07/30 20:29:27 1.8
+++ SVGReader.java 2001/09/11 10:04:25 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: SVGReader.java,v 1.8 2001/07/30 20:29:27 tore Exp $
+ * $Id: SVGReader.java,v 1.9 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -56,7 +56,7 @@
MessageHandler.errorln("Batik not in class path");
return false;
} catch (Exception e) {
- MessageHandler.errorln("ERROR LOADING EXTERNAL SVG: "
+ MessageHandler.errorln("Could not load external SVG: "
+ e.getMessage());
// assuming any exception means this document is not svg
// or could not be loaded for some reason
1.12 +3 -3 xml-fop/src/org/apache/fop/layout/FontInfo.java
Index: FontInfo.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/FontInfo.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FontInfo.java 2001/07/30 20:29:27 1.11
+++ FontInfo.java 2001/09/11 10:04:25 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: FontInfo.java,v 1.11 2001/07/30 20:29:27 tore Exp $
+ * $Id: FontInfo.java,v 1.12 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -58,9 +58,9 @@
if (f == null) {
throw new FOPException("no default font defined by
OutputConverter");
}
- MessageHandler.errorln("WARNING: defaulted font to
any,normal,normal");
+ MessageHandler.errorln("defaulted font to any,normal,normal");
}
- MessageHandler.errorln("WARNING: unknown font " + key
+ MessageHandler.errorln("unknown font " + key
+ " so defaulted font to any");
}
1.12 +5 -5 xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java
Index: PCLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PCLRenderer.java 2001/08/21 06:18:55 1.11
+++ PCLRenderer.java 2001/09/11 10:04:25 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: PCLRenderer.java,v 1.11 2001/08/21 06:18:55 keiron Exp $
+ * $Id: PCLRenderer.java,v 1.12 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -218,7 +218,7 @@
int xpos = xoffset + (x / 100);
if (xpos < 0) {
xpos = 0;
- log.error("PCLRenderer.addRect() WARNING: Horizontal position out of
bounds.");
+ log.warn("Horizontal position out of bounds.");
}
currentStream.add("\033*v1O\033&a" + xpos + "h"
@@ -229,7 +229,7 @@
xpos = xoffset + ((x + 240) / 100);
if (xpos < 0) {
xpos = 0;
- log.error("PCLRenderer.addRect() WARNING: Horizontal position out
of bounds.");
+ log.warn("Horizontal position out of bounds.");
}
currentStream.add("\033&a" + xpos + "h"
+ (pageHeight - ((y + 240)) / 100) + "V"
@@ -372,7 +372,7 @@
int xpos = xoffset + (x / 100);
if (xpos < 0) {
xpos = 0;
- log.error("PCLRenderer.renderImageArea() WARNING: Horizontal position
out of bounds.");
+ log.warn("Horizontal position out of bounds.");
}
currentStream.add("\033&a" + xpos + "h" + (pageHeight - (y / 100))
@@ -616,7 +616,7 @@
int xpos = xoffset + (rx / 100);
if (xpos < 0) {
xpos = 0;
- log.error("PCLRenderer.renderWordArea() WARNING: Horizontal position
out of bounds.");
+ log.warn("Horizontal position out of bounds.");
}
currentStream.add("\033&a" + xpos + "h" + (pageHeight - (bl / 100))
+ "V" + s);
1.14 +14 -2 xml-fop/src/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestConverter.java 2001/08/21 06:18:55 1.13
+++ TestConverter.java 2001/09/11 10:04:25 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: TestConverter.java,v 1.13 2001/08/21 06:18:55 keiron Exp $
+ * $Id: TestConverter.java,v 1.14 2001/09/11 10:04:25 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -11,6 +11,9 @@
import org.apache.fop.configuration.*;
import org.apache.log.*;
+import org.apache.log.format.*;
+import org.apache.log.output.io.*;
+import org.apache.log.output.*;
import java.io.*;
import java.util.*;
@@ -85,7 +88,16 @@
}
private void setupLogging() {
- log = Hierarchy.getDefaultHierarchy().getLoggerFor("test");
+ Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
+ PatternFormatter formatter = new PatternFormatter(
+ "[%{priority}]: %{message}\n%{throwable}" );
+
+ LogTarget target = null;
+ target = new StreamTarget(System.out, formatter);
+
+ hierarchy.setDefaultLogTarget(target);
+ log = hierarchy.getLoggerFor("test");
+ log.setPriority(Priority.ERROR);
}
public void setOutputPDF(boolean pdf) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
