You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ke...@apache.org on 2001/11/22 08:11:41 UTC
cvs commit: xml-fop/src/org/apache/fop/viewer Command.java GoToPageDialog.java LoadableProperties.java PreviewDialog.java SecureResourceBundle.java UserMessage.java
keiron 01/11/21 23:11:41
Modified: src/org/apache/fop/apps AWTStarter.java Fop.java
InputHandler.java Options.java PrintStarter.java
src/org/apache/fop/configuration Configuration.java
ConfigurationParser.java ConfigurationReader.java
src/org/apache/fop/datatypes AutoLength.java ColorType.java
FixedLength.java Length.java LengthBase.java
LengthRange.java
src/org/apache/fop/fo ColorProfile.java EnumProperty.java
Property.java PropertyList.java
PropertyListBuilder.java XMLObj.java
src/org/apache/fop/fo/flow Character.java Flow.java
Footnote.java FootnoteBody.java
InstreamForeignObject.java ListItem.java
ListItemBody.java ListItemLabel.java
MultiProperties.java MultiPropertySet.java
MultiSwitch.java MultiToggle.java
RetrieveMarker.java StaticContent.java Table.java
TableBody.java TableCell.java TableColumn.java
TableFooter.java TableHeader.java
src/org/apache/fop/fonts TTFSubSetFile.java
src/org/apache/fop/image EPSImage.java FopImageConsumer.java
SVGImage.java
src/org/apache/fop/image/analyser SVGReader.java
src/org/apache/fop/layout BlockArea.java FontInfo.java
LineArea.java
src/org/apache/fop/layout/hyphenation Hyphenator.java
src/org/apache/fop/mif MIFDocument.java
src/org/apache/fop/pdf FlateFilter.java PDFPages.java
PDFStream.java PDFXObject.java
src/org/apache/fop/render/awt FontMetricsMapper.java
FontSetup.java
src/org/apache/fop/render/mif FontSetup.java
src/org/apache/fop/render/pdf FontSetup.java
src/org/apache/fop/render/pdf/fonts LazyFont.java
MultiByteFont.java
src/org/apache/fop/viewer Command.java GoToPageDialog.java
LoadableProperties.java PreviewDialog.java
SecureResourceBundle.java UserMessage.java
Removed: src/org/apache/fop/messaging DefaultMessageListener.java
MessageEvent.java MessageHandler.java
MessageListener.java
Log:
removed message handler
Revision Changes Path
1.11 +1 -4 xml-fop/src/org/apache/fop/apps/AWTStarter.java
Index: AWTStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/AWTStarter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AWTStarter.java 2001/10/22 09:30:30 1.10
+++ AWTStarter.java 2001/11/22 07:11:38 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: AWTStarter.java,v 1.10 2001/10/22 09:30:30 keiron Exp $
+ * $Id: AWTStarter.java,v 1.11 2001/11/22 07:11:38 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.
@@ -41,7 +41,6 @@
import java.util.*;
-
/**
* initialize AWT previewer
*/
@@ -161,6 +160,4 @@
}
}
-
-
1.8 +3 -5 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Fop.java 2001/09/11 10:04:24 1.7
+++ Fop.java 2001/11/22 07:11:38 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: Fop.java,v 1.7 2001/09/11 10:04:24 keiron Exp $
+ * $Id: Fop.java,v 1.8 2001/11/22 07:11:38 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.
@@ -7,8 +7,6 @@
package org.apache.fop.apps;
-import org.apache.fop.messaging.MessageHandler;
-
public class Fop {
public static void main(String[] args) {
CommandLineOptions options = null;
@@ -18,12 +16,12 @@
Starter starter = options.getStarter();
starter.run();
} catch (FOPException e) {
- MessageHandler.errorln("" + e.getMessage());
+ System.err.println("" + e.getMessage());
if (options != null && options.isDebugMode().booleanValue()) {
e.printStackTrace();
}
} catch (java.io.FileNotFoundException e) {
- MessageHandler.errorln("" + e.getMessage());
+ System.err.println("" + e.getMessage());
if (options != null && options.isDebugMode().booleanValue()) {
e.printStackTrace();
}
1.6 +2 -3 xml-fop/src/org/apache/fop/apps/InputHandler.java
Index: InputHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/InputHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InputHandler.java 2001/08/14 08:50:47 1.5
+++ InputHandler.java 2001/11/22 07:11:38 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: InputHandler.java,v 1.5 2001/08/14 08:50:47 keiron Exp $
+ * $Id: InputHandler.java,v 1.6 2001/11/22 07:11:38 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.
@@ -16,7 +16,6 @@
import java.io.File;
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.configuration.Configuration;
@@ -60,7 +59,7 @@
*/
protected static XMLReader createParser() throws FOPException {
String parserClassName = Driver.getParserClassName();
- MessageHandler.logln("using SAX parser " + parserClassName);
+ //log.debug("using SAX parser " + parserClassName);
try {
return (XMLReader)Class.forName(parserClassName).newInstance();
1.11 +10 -11 xml-fop/src/org/apache/fop/apps/Options.java
Index: Options.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Options.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Options.java 2001/11/09 11:32:36 1.10
+++ Options.java 2001/11/22 07:11:38 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: Options.java,v 1.10 2001/11/09 11:32:36 keiron Exp $
+ * $Id: Options.java,v 1.11 2001/11/22 07:11:38 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.
@@ -15,7 +15,6 @@
import java.io.InputStream;
// fop
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.configuration.ConfigurationReader;
@@ -44,7 +43,7 @@
// initializing option settings
void initOptions() {
if (Configuration.getBooleanValue("quiet").booleanValue()) {
- MessageHandler.setQuiet(true);
+ //MessageHandler.setQuiet(true);
}
if (Configuration.getBooleanValue("debugMode").booleanValue()) {
errorDump = true;
@@ -84,7 +83,7 @@
// quiet mode
if (clOptions.isQuiet() != null) {
- MessageHandler.setQuiet(clOptions.isQuiet().booleanValue());
+ //MessageHandler.setQuiet(clOptions.isQuiet().booleanValue());
}
// set base directory
@@ -97,7 +96,7 @@
} catch (Exception e) {}
}
if (errorDump) {
- MessageHandler.logln("base directory: " + baseDir);
+ //log.debug("base directory: " + baseDir);
}
}
@@ -130,7 +129,7 @@
throw new FOPException("can't find default configuration file");
}
if (errorDump) {
- MessageHandler.logln("reading default configuration file");
+ //log.error("reading default configuration file");
}
ConfigurationReader reader =
new ConfigurationReader(new InputSource(configfile));
@@ -148,7 +147,7 @@
public void loadUserconfiguration(File userConfigFile) {
// read user configuration file
if (userConfigFile != null) {
- MessageHandler.logln("reading user configuration file");
+ //log.debug("reading user configuration file");
ConfigurationReader reader =
new ConfigurationReader(InputHandler.fileInputSource(userConfigFile));
if (errorDump) {
@@ -157,10 +156,10 @@
try {
reader.start();
} catch (org.apache.fop.apps.FOPException error) {
- MessageHandler.errorln("Could not load user configuration file "
- + userConfigFile + " - error: "
- + error.getMessage());
- MessageHandler.errorln("using default values");
+ //log.error("Could not load user configuration file "
+ // + userConfigFile + " - error: "
+ // + error.getMessage());
+ //log.error("using default values");
if (errorDump) {
reader.dumpError(error);
}
1.9 +2 -4 xml-fop/src/org/apache/fop/apps/PrintStarter.java
Index: PrintStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/PrintStarter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PrintStarter.java 2001/10/22 09:30:30 1.8
+++ PrintStarter.java 2001/11/22 07:11:38 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: PrintStarter.java,v 1.8 2001/10/22 09:30:30 keiron Exp $
+ * $Id: PrintStarter.java,v 1.9 2001/11/22 07:11:38 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.
@@ -33,9 +33,7 @@
import org.apache.fop.render.awt.AWTRenderer;
import org.apache.fop.layout.AreaTree;
import org.apache.fop.layout.Page;
-import org.apache.fop.messaging.MessageHandler;
-
/**
* This class prints a xsl-fo dokument without interaction.
* At the moment java has not the possibility to configure the printer and it's
@@ -60,7 +58,7 @@
}
String version = Version.getVersion();
- MessageHandler.errorln(version);
+ //log.debug(version);
XMLReader parser = inputHandler.getParser();
1.8 +12 -15 xml-fop/src/org/apache/fop/configuration/Configuration.java
Index: Configuration.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/Configuration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Configuration.java 2001/11/02 11:06:07 1.7
+++ Configuration.java 2001/11/22 07:11:38 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: Configuration.java,v 1.7 2001/11/02 11:06:07 keiron Exp $
+ * $Id: Configuration.java,v 1.8 2001/11/22 07:11:38 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.
@@ -10,7 +10,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.fop.messaging.MessageHandler;
/**
* a configuration class for all general configuration aspects except those
@@ -254,7 +253,7 @@
awtConfiguration = config;
break;
default:
- MessageHandler.errorln("Can't setup configuration. Unknown configuration role/target");
+ //log.error("Can't setup configuration. Unknown configuration role/target");
}
}
@@ -278,9 +277,9 @@
break;
default:
standardConfiguration.put(key, value);
- MessageHandler.errorln("Unknown role for new configuration entry. "
- + "Putting key:" + key + " - value:"
- + value + " into standard configuration.");
+ //log.error("Unknown role for new configuration entry. "
+ // + "Putting key:" + key + " - value:"
+ // + value + " into standard configuration.");
}
}
@@ -312,31 +311,29 @@
standardConfiguration, pdfConfiguration, awtConfiguration
};
for (int i = 0; i < configs.length; i++) {
- MessageHandler.logln("----------------------");
+ //log.debug("----------------------");
configuration = configs[i];
Iterator iterator = configuration.keySet().iterator();
while (iterator.hasNext()) {
key = (String)iterator.next();
- MessageHandler.logln("key: " + key);
+ //log.debug("key: " + key);
value = configuration.get(key);
if (value instanceof String) {
- MessageHandler.logln(" value: " + value);
+ //log.debug(" value: " + value);
} else if (value instanceof ArrayList) {
list = (ArrayList)value;
- MessageHandler.log(" values: ");
+ //log.debug(" values: ");
for (int count = 0; count < list.size(); count++) {
- MessageHandler.log(list.get(count) + " - ");
+ //log.debug(list.get(count) + " - ");
}
- MessageHandler.logln("");
} else if (value instanceof HashMap) {
map = (HashMap)value;
Iterator iter = map.keySet().iterator();
- MessageHandler.log(" values: ");
+ //log.debug(" values: ");
while (iter.hasNext()) {
tmp = (String)iter.next();
- MessageHandler.log(" " + tmp + ":" + map.get(tmp));
+ //log.debug(" " + tmp + ":" + map.get(tmp));
}
- MessageHandler.logln("");
}
}
}
1.11 +7 -10 xml-fop/src/org/apache/fop/configuration/ConfigurationParser.java
Index: ConfigurationParser.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/ConfigurationParser.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ConfigurationParser.java 2001/11/02 11:06:07 1.10
+++ ConfigurationParser.java 2001/11/22 07:11:38 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: ConfigurationParser.java,v 1.10 2001/11/02 11:06:07 keiron Exp $
+ * $Id: ConfigurationParser.java,v 1.11 2001/11/22 07:11:38 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.
@@ -17,9 +17,6 @@
import java.util.HashMap;
import java.util.ArrayList;
-// fop
-import org.apache.fop.messaging.MessageHandler;
-
/**
* SAX2 Handler which retrieves the configuration information and stores them in Configuration.
* Normally this class doesn't need to be accessed directly.
@@ -144,8 +141,8 @@
fontTriplets.add(fontTriplet);
} else {
// to make sure that user knows about false tag
- MessageHandler.errorln("Unknown tag in configuration file: "
- + localName);
+ //log.error("Unknown tag in configuration file: "
+ // + localName);
}
} // end startElement
@@ -251,10 +248,10 @@
if (activeConfiguration != null) {
activeConfiguration.put(key, value);
} else {
- MessageHandler.errorln("Unknown role >" + role
- + "< for new configuration entry. \n"
- + "Putting configuration with key:" + key
- + " into standard configuration.");
+ //log.error("Unknown role >" + role
+ // + "< for new configuration entry. \n"
+ // + "Putting configuration with key:" + key
+ // + " into standard configuration.");
}
}
1.9 +3 -4 xml-fop/src/org/apache/fop/configuration/ConfigurationReader.java
Index: ConfigurationReader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/configuration/ConfigurationReader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ConfigurationReader.java 2001/07/30 20:29:18 1.8
+++ ConfigurationReader.java 2001/11/22 07:11:38 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: ConfigurationReader.java,v 1.8 2001/07/30 20:29:18 tore Exp $
+ * $Id: ConfigurationReader.java,v 1.9 2001/11/22 07:11:38 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.
@@ -16,7 +16,6 @@
// fop
import org.apache.fop.apps.Driver;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.apps.FOPException;
import org.apache.fop.configuration.Configuration;
@@ -94,8 +93,8 @@
public static XMLReader createParser() throws FOPException {
String parserClassName = Driver.getParserClassName();
if (errorDump) {
- MessageHandler.logln("configuration reader using SAX parser "
- + parserClassName);
+ //log.debug("configuration reader using SAX parser "
+ // + parserClassName);
}
try {
1.2 +1 -2 xml-fop/src/org/apache/fop/datatypes/AutoLength.java
Index: AutoLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/AutoLength.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AutoLength.java 2001/10/14 20:33:36 1.1
+++ AutoLength.java 2001/11/22 07:11:38 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: AutoLength.java,v 1.1 2001/10/14 20:33:36 klease Exp $
+ * $Id: AutoLength.java,v 1.2 2001/11/22 07:11:38 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.
@@ -8,7 +8,6 @@
package org.apache.fop.datatypes;
import org.apache.fop.fo.Property;
-import org.apache.fop.messaging.MessageHandler;
/**
* a length quantity in XSL which is specified as "auto"
1.17 +6 -7 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ColorType.java 2001/09/11 10:04:24 1.16
+++ ColorType.java 2001/11/22 07:11:38 1.17
@@ -1,5 +1,5 @@
/*
- * $Id: ColorType.java,v 1.16 2001/09/11 10:04:24 keiron Exp $
+ * $Id: ColorType.java,v 1.17 2001/11/22 07:11:38 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.
@@ -8,7 +8,6 @@
package org.apache.fop.datatypes;
import java.util.*;
-import org.apache.fop.messaging.MessageHandler;
/**
* a colour quantity in XSL
@@ -68,13 +67,13 @@
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("unknown colour format. Must be #RGB or #RRGGBB");
+ //log.error("unknown colour format. Must be #RGB or #RRGGBB");
}
} catch (Exception e) {
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("unknown colour format. Must be #RGB or #RRGGBB");
+ //log.error("unknown colour format. Must be #RGB or #RRGGBB");
}
} else if (value.startsWith("rgb(")) {
int poss = value.indexOf("(");
@@ -117,7 +116,7 @@
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("unknown colour format. Must be #RGB or #RRGGBB");
+ //log.error("unknown colour format. Must be #RGB or #RRGGBB");
}
}
} else if (value.startsWith("url(")) {
@@ -143,8 +142,8 @@
this.red = 0;
this.green = 0;
this.blue = 0;
- MessageHandler.errorln("unknown colour name: "
- + value);
+ //log.error("unknown colour name: "
+ // + value);
}
}
}
1.2 +3 -4 xml-fop/src/org/apache/fop/datatypes/FixedLength.java
Index: FixedLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/FixedLength.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FixedLength.java 2001/10/14 20:33:36 1.1
+++ FixedLength.java 2001/11/22 07:11:38 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: FixedLength.java,v 1.1 2001/10/14 20:33:36 klease Exp $
+ * $Id: FixedLength.java,v 1.2 2001/11/22 07:11:38 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.
@@ -9,7 +9,6 @@
import org.apache.fop.fo.Property;
import org.apache.fop.fo.expr.Numeric;
-import org.apache.fop.messaging.MessageHandler;
/**
* a length quantity in XSL
@@ -64,8 +63,8 @@
dvalue = dvalue * assumed_resolution;
else {
dvalue = 0;
- MessageHandler.errorln("unknown length unit '" + unit
- + "'");
+ //log.error("unknown length unit '" + unit
+ // + "'");
}
setComputedValue((int)(dvalue * 1000));
}
1.15 +1 -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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Length.java 2001/10/14 20:33:36 1.14
+++ Length.java 2001/11/22 07:11:38 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: Length.java,v 1.14 2001/10/14 20:33:36 klease Exp $
+ * $Id: Length.java,v 1.15 2001/11/22 07:11:38 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.
@@ -9,7 +9,6 @@
import org.apache.fop.fo.expr.Numeric;
import org.apache.fop.fo.Property;
-import org.apache.fop.messaging.MessageHandler;
/**
* a length quantity in XSL
1.7 +3 -4 xml-fop/src/org/apache/fop/datatypes/LengthBase.java
Index: LengthBase.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/datatypes/LengthBase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LengthBase.java 2001/11/09 11:32:36 1.6
+++ LengthBase.java 2001/11/22 07:11:38 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: LengthBase.java,v 1.6 2001/11/09 11:32:36 keiron Exp $
+ * $Id: LengthBase.java,v 1.7 2001/11/22 07:11:38 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.
@@ -10,7 +10,6 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropertyList;
-import org.apache.fop.messaging.MessageHandler;
public class LengthBase implements PercentBase {
// Standard kinds of percent-based length
@@ -83,10 +82,10 @@
return 0;
}
case CUSTOM_BASE:
- MessageHandler.errorln("!!! LengthBase.getBaseLength() called on CUSTOM_BASE type !!!");
+ //log.debug("!!! LengthBase.getBaseLength() called on CUSTOM_BASE type !!!");
return 0;
default:
- MessageHandler.errorln("Unknown base type for LengthBase.");
+ //log.error("Unknown base type for LengthBase.");
return 0;
}
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LengthRange.java 2001/09/11 10:04:24 1.7
+++ LengthRange.java 2001/11/22 07:11:38 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: LengthRange.java,v 1.7 2001/09/11 10:04:24 keiron Exp $
+ * $Id: LengthRange.java,v 1.8 2001/11/22 07:11:38 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("forcing max to min in LengthRange");
+ * log.error("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("forcing opt to max in LengthRange");
+ * log.error("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("forcing opt to min in LengthRange");
+ * log.error("forcing opt to min in LengthRange");
* }
* optimum = minimum ;
* }
1.8 +20 -2 xml-fop/src/org/apache/fop/fo/ColorProfile.java
Index: ColorProfile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/ColorProfile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ColorProfile.java 2001/11/15 10:25:26 1.7
+++ ColorProfile.java 2001/11/22 07:11:39 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: ColorProfile.java,v 1.7 2001/11/15 10:25:26 keiron Exp $
+ * $Id: ColorProfile.java,v 1.8 2001/11/22 07:11:39 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.
@@ -10,6 +10,12 @@
// FOP
import org.apache.fop.datatypes.ColorType;
+import java.awt.color.ICC_Profile;
+import java.awt.color.ICC_ColorSpace;
+import java.net.URL;
+import java.io.IOException;
+import java.io.InputStream;
+
/**
* The fo:color-profile formatting object.
* This loads the color profile when needed and resolves a requested color.
@@ -18,6 +24,7 @@
int intent;
String src;
String profileName;
+ ICC_ColorSpace colorSpace = null;
protected ColorProfile(FONode parent) {
super(parent);
@@ -43,6 +50,8 @@
* or the value is not found.
*/
public ColorType getColor(int[] colorVals, int defR, int defG, int defB) {
+ // float[] rgbvals = colorSpace.toRGB(colorVals);
+ // return new ColorType(rgbvals);
return null;
}
@@ -50,6 +59,15 @@
* Load the color profile.
*/
private void load() {
-
+ try {
+ URL url = new URL(src);
+ InputStream is = url.openStream();
+ ICC_Profile iccProfile = ICC_Profile.getInstance(is);
+ colorSpace = new ICC_ColorSpace(iccProfile);
+ } catch(IOException ioe) {
+ log.error("Could not read Color Profile src", ioe);
+ } catch(IllegalArgumentException iae) {
+ log.error("Color Profile src not an ICC Profile", iae);
+ }
}
}
1.6 +3 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EnumProperty.java 2001/09/11 10:04:24 1.5
+++ EnumProperty.java 2001/11/22 07:11:39 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: EnumProperty.java,v 1.5 2001/09/11 10:04:24 keiron Exp $
+ * $Id: EnumProperty.java,v 1.6 2001/11/22 07:11:39 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.
@@ -8,7 +8,6 @@
package org.apache.fop.fo;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.messaging.MessageHandler;
public class EnumProperty extends Property {
@@ -23,8 +22,8 @@
* Called by subclass if no match found.
*/
public Property checkEnumValues(String value) {
- MessageHandler.errorln("Unknown enumerated value for property '"
- + getPropName() + "': " + value);
+ //log.error("Unknown enumerated value for property '"
+ // + getPropName() + "': " + value);
return null;
}
1.19 +5 -5 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Property.java 2001/10/14 20:37:10 1.18
+++ Property.java 2001/11/22 07:11:39 1.19
@@ -1,5 +1,5 @@
/*
- * $Id: Property.java,v 1.18 2001/10/14 20:37:10 klease Exp $
+ * $Id: Property.java,v 1.19 2001/11/22 07:11:39 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("compound property component "
+ //log.error("compound property component "
// + partName + " unknown.");
}
return baseProp;
@@ -223,10 +223,10 @@
}
} catch (FOPException e) {
- //MessageHandler.errorln("convertShorthandProperty caught FOPException "
+ //log.error("convertShorthandProperty caught FOPException "
// + e);
} catch (org.apache.fop.fo.expr.PropertyException propEx) {
- //MessageHandler.errorln("convertShorthandProperty caught PropertyException "
+ //log.error("convertShorthandProperty caught PropertyException "
// + propEx);
}
if (pret != null) {
@@ -332,7 +332,7 @@
return make(propertyList, specVal,
propertyList.getParentFObj());
} catch (FOPException e) {
- //MessageHandler.errorln("Error computing property value for "
+ //log.error("Error computing property value for "
// + propName + " from "
// + specVal);
return null;
1.16 +10 -11 xml-fop/src/org/apache/fop/fo/PropertyList.java
Index: PropertyList.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/PropertyList.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PropertyList.java 2001/11/14 13:45:44 1.15
+++ PropertyList.java 2001/11/22 07:11:39 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyList.java,v 1.15 2001/11/14 13:45:44 keiron Exp $
+ * $Id: PropertyList.java,v 1.16 2001/11/22 07:11:39 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.
@@ -8,7 +8,6 @@
package org.apache.fop.fo;
import java.util.HashMap;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.fo.properties.WritingMode;
import org.apache.fop.apps.FOPException;
@@ -160,8 +159,8 @@
return builder.makeProperty(this, namespace, element,
propertyName);
} catch (org.apache.fop.apps.FOPException e) {
- MessageHandler.errorln("Exception in getInherited(): property="
- + propertyName + " : " + e);
+ //log.error("Exception in getInherited(): property="
+ // + propertyName + " : " + e);
}
}
}
@@ -233,9 +232,9 @@
private Property get(String propertyName, boolean bTryInherit,
boolean bTryDefault) {
- if (builder == null)
- MessageHandler.errorln("OH OH, builder has not been set");
-
+ if (builder == null) {
+ //log.error("OH OH, builder has not been set");
+ }
/* Handle request for one part of a compound property */
int sepchar = propertyName.indexOf('.');
String subpropName = null;
@@ -301,8 +300,8 @@
p = this.builder.makeProperty(this, namespace, element,
propertyName);
} catch (FOPException e) {
- MessageHandler.errorln("Exception in getNearestSpecified(): property="
- + propertyName + " : " + e);
+ //log.error("Exception in getNearestSpecified(): property="
+ // + propertyName + " : " + e);
}
}
return p;
@@ -324,8 +323,8 @@
return builder.makeProperty(this, namespace, element,
propertyName);
} catch (org.apache.fop.apps.FOPException e) {
- MessageHandler.errorln("Exception in getFromParent(): property="
- + propertyName + " : " + e);
+ //log.error("Exception in getFromParent(): property="
+ // + propertyName + " : " + e);
}
}
return null; // No builder or exception in makeProperty!
1.34 +17 -17 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- PropertyListBuilder.java 2001/10/14 20:37:10 1.33
+++ PropertyListBuilder.java 2001/11/22 07:11:39 1.34
@@ -1,5 +1,5 @@
/*
- * $Id: PropertyListBuilder.java,v 1.33 2001/10/14 20:37:10 klease Exp $
+ * $Id: PropertyListBuilder.java,v 1.34 2001/11/22 07:11:39 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.
@@ -8,7 +8,6 @@
package org.apache.fop.fo;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.svg.*;
import org.apache.fop.datatypes.*;
@@ -51,14 +50,14 @@
try {
p = propertyMaker.compute(propertyList);
} catch (FOPException e) {
- MessageHandler.errorln("exception occurred while computing"
- + " value of property '"
- + propertyName + "': "
- + e.getMessage());
+ //log.error("exception occurred while computing"
+ // + " value of property '"
+ // + propertyName + "': "
+ // + e.getMessage());
}
} else {
- MessageHandler.errorln("property " + propertyName
- + " ignored");
+ //log.error("property " + propertyName
+ // + " ignored");
}
return p;
}
@@ -72,7 +71,7 @@
if (propertyMaker != null) {
b = propertyMaker.isInherited();
} else {
- // MessageHandler.errorln("Unknown property " + propertyName);
+ // log.error("Unknown property " + propertyName);
b = true;
}
return b;
@@ -166,12 +165,13 @@
p.put(propName, propVal);
}
} catch (FOPException e) { /* Do other props. */
- MessageHandler.errorln(e.getMessage());
+ //log.error(e.getMessage());
}
} else {
- if (!attributeName.startsWith("xmlns"))
- MessageHandler.errorln("property '"
- + attributeName + "' ignored");
+ if (!attributeName.startsWith("xmlns")) {
+ //log.error("property '"
+ // + attributeName + "' ignored");
+ }
}
}
@@ -197,7 +197,7 @@
if (propertyMaker != null) {
return propertyMaker.isCorrespondingForced(propertyList);
} else {
- MessageHandler.errorln("no Maker for " + propertyName);
+ //log.error("no Maker for " + propertyName);
}
return false;
}
@@ -209,7 +209,7 @@
if (propertyMaker != null) {
return propertyMaker.getShorthand(propertyList);
} else {
- MessageHandler.errorln("no Maker for " + propertyName);
+ //log.error("no Maker for " + propertyName);
return null;
}
}
@@ -226,8 +226,8 @@
if (propertyMaker != null) {
p = propertyMaker.make(propertyList);
} else {
- MessageHandler.errorln("property " + propertyName
- + " ignored");
+ //log.error("property " + propertyName
+ // + " ignored");
}
return p;
}
1.7 +6 -1 xml-fop/src/org/apache/fop/fo/XMLObj.java
Index: XMLObj.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/XMLObj.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLObj.java 2001/11/15 08:12:33 1.6
+++ XMLObj.java 2001/11/22 07:11:39 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: XMLObj.java,v 1.6 2001/11/15 08:12:33 keiron Exp $
+ * $Id: XMLObj.java,v 1.7 2001/11/22 07:11:39 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.
@@ -50,6 +50,11 @@
public void handleAttrs(Attributes attlist) throws FOPException {
attr = attlist;
}
+
+ public Document getDocument() {
+ return doc;
+ }
+
public abstract String getNameSpace();
protected static HashMap ns = new HashMap();
1.16 +1 -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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Character.java 2001/11/21 22:13:36 1.15
+++ Character.java 2001/11/22 07:11:39 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: Character.java,v 1.15 2001/11/21 22:13:36 klease Exp $
+ * $Id: Character.java,v 1.16 2001/11/22 07:11:39 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.
@@ -41,7 +41,6 @@
public Character(FONode parent) {
super(parent);
- this.name = "fo:character";
}
public Status layout(Area area) throws FOPException {
1.29 +2 -8 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Flow.java 2001/11/14 13:45:44 1.28
+++ Flow.java 2001/11/22 07:11:39 1.29
@@ -1,5 +1,5 @@
/*
- * $Id: Flow.java,v 1.28 2001/11/14 13:45:44 keiron Exp $
+ * $Id: Flow.java,v 1.29 2001/11/22 07:11:39 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.
@@ -54,7 +54,6 @@
public Flow(FONode parent) {
super(parent);
- this.name = getElementName();
}
public void handleAttrs(Attributes attlist) throws FOPException {
@@ -89,7 +88,7 @@
protected void setFlowName(String name) throws FOPException {
if (name == null || name.equals("")) {
log.warn("A 'flow-name' is required for "
- + getElementName()
+ + getName()
+ ". This constraint will be enforced in future versions of FOP");
_flowName = "xsl-region-body";
} else {
@@ -211,14 +210,9 @@
return this.contentWidth;
}
- protected String getElementName() {
- return "fo:flow";
- }
-
public Status getStatus() {
return _status;
}
-
public boolean generatesReferenceAreas() {
return true;
1.10 +1 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Footnote.java 2001/11/14 13:45:44 1.9
+++ Footnote.java 2001/11/22 07:11:39 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: Footnote.java,v 1.9 2001/11/14 13:45:44 keiron Exp $
+ * $Id: Footnote.java,v 1.10 2001/11/22 07:11:39 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.
@@ -21,7 +21,6 @@
public Footnote(FONode parent) {
super(parent);
- this.name = "fo:footnote";
}
public Status layout(Area area) throws FOPException {
1.10 +1 -2 xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java
Index: FootnoteBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/FootnoteBody.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FootnoteBody.java 2001/11/14 13:45:44 1.9
+++ FootnoteBody.java 2001/11/22 07:11:39 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: FootnoteBody.java,v 1.9 2001/11/14 13:45:44 keiron Exp $
+ * $Id: FootnoteBody.java,v 1.10 2001/11/22 07:11:39 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.
@@ -29,7 +29,6 @@
public FootnoteBody(FONode parent) {
super(parent);
- this.name = "fo:footnote-body";
}
public Status layout(Area area) throws FOPException {
1.18 +83 -20 xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java
Index: InstreamForeignObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/InstreamForeignObject.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- InstreamForeignObject.java 2001/11/14 13:45:44 1.17
+++ InstreamForeignObject.java 2001/11/22 07:11:39 1.18
@@ -1,5 +1,5 @@
/*
- * $Id: InstreamForeignObject.java,v 1.17 2001/11/14 13:45:44 keiron Exp $
+ * $Id: InstreamForeignObject.java,v 1.18 2001/11/22 07:11:39 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.
@@ -10,14 +10,19 @@
// FOP
import org.apache.fop.fo.*;
import org.apache.fop.fo.properties.*;
-import org.apache.fop.layout.*;
-import org.apache.fop.layout.inline.*;
-import org.apache.fop.layout.BlockArea;
+import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.area.inline.Viewport;
+import org.apache.fop.area.inline.ForeignObject;
import org.apache.fop.layout.FontState;
+import org.apache.fop.layout.AccessibilityProps;
+import org.apache.fop.layout.AuralProps;
+import org.apache.fop.layout.BorderAndPadding;
+import org.apache.fop.layout.BackgroundProps;
+import org.apache.fop.layout.MarginInlineProps;
+import org.apache.fop.layout.RelativePositionProps;
import org.apache.fop.apps.FOPException;
-// Java
-import java.util.Enumeration;
+import org.w3c.dom.Document;
public class InstreamForeignObject extends FObj {
@@ -37,7 +42,7 @@
int startIndent;
int endIndent;
- ForeignObjectArea areaCurrent;
+ Viewport areaCurrent;
/**
* constructs an instream-foreign-object object (called by Maker).
@@ -50,12 +55,70 @@
}
/**
+ * Get the inline area created by this element.
+ */
+ protected InlineArea getInlineArea() {
+ if (children == null) {
+ return areaCurrent;
+ }
+
+ if (this.children.size() != 1) {
+ // error
+ }
+ FONode fo = (FONode)children.get(0);
+ if(!(fo instanceof XMLObj)) {
+ // error
+ }
+ XMLObj child = (XMLObj)fo;
+
+ // Common Accessibility Properties
+ AccessibilityProps mAccProps = propMgr.getAccessibilityProps();
+
+ // Common Aural Properties
+ AuralProps mAurProps = propMgr.getAuralProps();
+
+ // Common Border, Padding, and Background Properties
+ BorderAndPadding bap = propMgr.getBorderAndPadding();
+ BackgroundProps bProps = propMgr.getBackgroundProps();
+
+ // Common Margin Properties-Inline
+ MarginInlineProps mProps = propMgr.getMarginInlineProps();
+
+ // Common Relative Position Properties
+ RelativePositionProps mRelProps = propMgr.getRelativePositionProps();
+
+ // viewport size is determined by block-progression-dimension
+ // and inline-progression-dimension
+
+ // if replaced then use height then ignore block-progression-dimension
+ //int h = this.properties.get("height").getLength().mvalue();
+
+ // use line-height then ignore dimension in height direction
+ int lh = this.properties.get("line-height").getLength().mvalue();
+
+ int bpd = this.properties.get("block-progression-dimension").getLength().mvalue();
+ int ipd = this.properties.get("inline-progression-dimension").getLength().mvalue();
+
+ // if auto then use the intrinsic size of the content scaled
+ // to the content-height and content-width
+
+ Document doc = child.getDocument();
+ String ns = child.getNameSpace();
+
+ children = null;
+ ForeignObject foreign = new ForeignObject(doc, ns);
+
+ areaCurrent = new Viewport(foreign);
+ return areaCurrent;
+ }
+
+ /**
* layout this formatting object.
*
* @param area the area to layout the object into
*
* @return the status of the layout
- */
+ *
public Status layout(Area area) throws FOPException {
if (this.marker == BREAK_AFTER) {
@@ -102,7 +165,7 @@
// this.properties.get("text-align");
// this.properties.get("width");
- /* retrieve properties */
+ /* retrieve properties *
String id = this.properties.get("id").getString();
int align = this.properties.get("text-align").getEnum();
int valign = this.properties.get("vertical-align").getEnum();
@@ -159,7 +222,7 @@
if (numChildren > 1) {
throw new FOPException("Only one child element is allowed in an instream-foreign-object");
}
- /* layout foreign object */
+ /* layout foreign object *
if (this.children.size() > 0) {
FONode fo = (FONode)children.get(0);
Status status;
@@ -168,7 +231,7 @@
return status;
}
- /* finish off the foreign object area */
+ /* finish off the foreign object area *
this.areaCurrent.end();
}
}
@@ -218,29 +281,29 @@
/*
* endIndent = areaCurrent.getEffectiveWidth() - forcedWidth -
* forcedStartOffset;
- */
+ *
}
areaCurrent.setStartIndent(startIndent);
// areaCurrent.setEndIndent(endIndent);
- /* if there is a space-before */
+ /* if there is a space-before *
if (spaceBefore != 0) {
- /* add a display space */
+ /* add a display space *
// area.addDisplaySpace(spaceBefore);
}
- /* add the SVG area to the containing area */
+ /* add the SVG area to the containing area *
// area.addChild(areaCurrent);
areaCurrent.setPage(area.getPage());
- /* increase the height of the containing area accordingly */
+ /* increase the height of the containing area accordingly *
// area.increaseHeight(areaCurrent.getEffectiveHeight());
- /* if there is a space-after */
+ /* if there is a space-after *
if (spaceAfter != 0) {
- /* add a display space */
+ /* add a display space *
// area.addDisplaySpace(spaceAfter);
}
@@ -261,8 +324,8 @@
}
areaCurrent = null;
- /* return status */
+ /* return status *
return new Status(Status.OK);
}
-
+*/
}
1.21 +1 -2 xml-fop/src/org/apache/fop/fo/flow/ListItem.java
Index: ListItem.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItem.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ListItem.java 2001/11/14 13:45:44 1.20
+++ ListItem.java 2001/11/22 07:11:39 1.21
@@ -1,5 +1,5 @@
/*
- * $Id: ListItem.java,v 1.20 2001/11/14 13:45:44 keiron Exp $
+ * $Id: ListItem.java,v 1.21 2001/11/22 07:11:39 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.
@@ -34,7 +34,6 @@
public ListItem(FONode parent) {
super(parent);
- this.name = "fo:list-item";
}
public Status layout(Area area) throws FOPException {
1.15 +1 -2 xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java
Index: ListItemBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemBody.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ListItemBody.java 2001/11/14 13:45:44 1.14
+++ ListItemBody.java 2001/11/22 07:11:39 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: ListItemBody.java,v 1.14 2001/11/14 13:45:44 keiron Exp $
+ * $Id: ListItemBody.java,v 1.15 2001/11/22 07:11:39 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.
@@ -21,7 +21,6 @@
public ListItemBody(FONode parent) {
super(parent);
- this.name = "fo:list-item-body";
}
public Status layout(Area area) throws FOPException {
1.15 +1 -2 xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java
Index: ListItemLabel.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/ListItemLabel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ListItemLabel.java 2001/11/14 13:45:44 1.14
+++ ListItemLabel.java 2001/11/22 07:11:39 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: ListItemLabel.java,v 1.14 2001/11/14 13:45:44 keiron Exp $
+ * $Id: ListItemLabel.java,v 1.15 2001/11/22 07:11:39 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.
@@ -21,7 +21,6 @@
public ListItemLabel(FONode parent) {
super(parent);
- this.name = "fo:list-item-label";
}
public Status layout(Area area) throws FOPException {
1.7 +1 -2 xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java
Index: MultiProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiProperties.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiProperties.java 2001/11/09 11:32:38 1.6
+++ MultiProperties.java 2001/11/22 07:11:39 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: MultiProperties.java,v 1.6 2001/11/09 11:32:38 keiron Exp $
+ * $Id: MultiProperties.java,v 1.7 2001/11/22 07:11:39 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.
@@ -20,7 +20,6 @@
public MultiProperties(FONode parent) {
super(parent);
- this.name = "fo:multi-properties";
}
public Status layout(Area area) throws FOPException {
1.7 +1 -2 xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java
Index: MultiPropertySet.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiPropertySet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiPropertySet.java 2001/11/09 11:32:38 1.6
+++ MultiPropertySet.java 2001/11/22 07:11:39 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: MultiPropertySet.java,v 1.6 2001/11/09 11:32:38 keiron Exp $
+ * $Id: MultiPropertySet.java,v 1.7 2001/11/22 07:11:39 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.
@@ -20,7 +20,6 @@
public MultiPropertySet(FONode parent) {
super(parent);
- this.name = "fo:multi-property-set";
}
public Status layout(Area area) throws FOPException {
1.7 +1 -2 xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java
Index: MultiSwitch.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiSwitch.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiSwitch.java 2001/11/09 11:32:38 1.6
+++ MultiSwitch.java 2001/11/22 07:11:39 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: MultiSwitch.java,v 1.6 2001/11/09 11:32:38 keiron Exp $
+ * $Id: MultiSwitch.java,v 1.7 2001/11/22 07:11:39 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.
@@ -20,7 +20,6 @@
public MultiSwitch(FONode parent) {
super(parent);
- this.name = "fo:multi-switch";
}
public Status layout(Area area) throws FOPException {
1.7 +1 -2 xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java
Index: MultiToggle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/MultiToggle.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiToggle.java 2001/11/09 11:32:38 1.6
+++ MultiToggle.java 2001/11/22 07:11:39 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: MultiToggle.java,v 1.6 2001/11/09 11:32:38 keiron Exp $
+ * $Id: MultiToggle.java,v 1.7 2001/11/22 07:11:39 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.
@@ -20,7 +20,6 @@
public MultiToggle(FONode parent) {
super(parent);
- this.name = "fo:multi-toggle";
}
public Status layout(Area area) throws FOPException {
1.9 +1 -2 xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java
Index: RetrieveMarker.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/RetrieveMarker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RetrieveMarker.java 2001/11/09 11:32:38 1.8
+++ RetrieveMarker.java 2001/11/22 07:11:39 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: RetrieveMarker.java,v 1.8 2001/11/09 11:32:38 keiron Exp $
+ * $Id: RetrieveMarker.java,v 1.9 2001/11/22 07:11:39 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.
@@ -27,7 +27,6 @@
public RetrieveMarker(FONode parent) {
super(parent);
- this.name = "fo:retrieve-marker";
}
public void handleAttrs(Attributes attlist) throws FOPException {
1.22 +2 -9 xml-fop/src/org/apache/fop/fo/flow/StaticContent.java
Index: StaticContent.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/StaticContent.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StaticContent.java 2001/11/09 22:11:14 1.21
+++ StaticContent.java 2001/11/22 07:11:39 1.22
@@ -1,5 +1,5 @@
/*
- * $Id: StaticContent.java,v 1.21 2001/11/09 22:11:14 klease Exp $
+ * $Id: StaticContent.java,v 1.22 2001/11/22 07:11:39 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.
@@ -14,9 +14,6 @@
import org.apache.fop.layout.Area;
import org.apache.fop.apps.FOPException;
-// Java
-import java.util.Enumeration;
-
public class StaticContent extends Flow {
public StaticContent(FONode parent) {
@@ -77,15 +74,11 @@
return new Status(Status.OK);
}
- protected String getElementName() {
- return "fo:static-content";
- }
-
// flowname checking is more stringient for static content currently
protected void setFlowName(String name) throws FOPException {
if (name == null || name.equals("")) {
throw new FOPException("A 'flow-name' is required for "
- + getElementName() + ".");
+ + getName() + ".");
} else {
super.setFlowName(name);
}
1.44 +1 -2 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Table.java 2001/11/14 13:45:44 1.43
+++ Table.java 2001/11/22 07:11:39 1.44
@@ -1,5 +1,5 @@
/*
- * -- $Id: Table.java,v 1.43 2001/11/14 13:45:44 keiron Exp $ --
+ * -- $Id: Table.java,v 1.44 2001/11/22 07:11:39 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.
@@ -49,7 +49,6 @@
public Table(FONode parent) {
super(parent);
- this.name = "fo:table";
}
public Status layout(Area area) throws FOPException {
1.42 +1 -2 xml-fop/src/org/apache/fop/fo/flow/TableBody.java
Index: TableBody.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableBody.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- TableBody.java 2001/11/14 13:45:44 1.41
+++ TableBody.java 2001/11/22 07:11:39 1.42
@@ -1,5 +1,5 @@
/*
- * $Id: TableBody.java,v 1.41 2001/11/14 13:45:44 keiron Exp $
+ * $Id: TableBody.java,v 1.42 2001/11/22 07:11:39 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.
@@ -32,7 +32,6 @@
public TableBody(FONode parent) {
super(parent);
- this.name = "fo:table-body";
}
public void setColumns(ArrayList columns) {
1.43 +1 -2 xml-fop/src/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TableCell.java 2001/11/14 13:45:44 1.42
+++ TableCell.java 2001/11/22 07:11:39 1.43
@@ -1,5 +1,5 @@
/*
- * -- $Id: TableCell.java,v 1.42 2001/11/14 13:45:44 keiron Exp $ --
+ * -- $Id: TableCell.java,v 1.43 2001/11/22 07:11:39 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.
@@ -88,7 +88,6 @@
public TableCell(FONode parent) {
super(parent);
- this.name = "fo:table-cell";
}
public void handleAttrs(Attributes attlist) throws FOPException {
1.23 +1 -2 xml-fop/src/org/apache/fop/fo/flow/TableColumn.java
Index: TableColumn.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableColumn.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- TableColumn.java 2001/11/09 11:32:38 1.22
+++ TableColumn.java 2001/11/22 07:11:39 1.23
@@ -1,5 +1,5 @@
/*
- * $Id: TableColumn.java,v 1.22 2001/11/09 11:32:38 keiron Exp $
+ * $Id: TableColumn.java,v 1.23 2001/11/22 07:11:39 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.
@@ -30,7 +30,6 @@
public TableColumn(FONode parent) {
super(parent);
- this.name = "fo:table-column";
}
public Length getColumnWidthAsLength() {
1.6 +1 -2 xml-fop/src/org/apache/fop/fo/flow/TableFooter.java
Index: TableFooter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableFooter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TableFooter.java 2001/11/09 11:32:38 1.5
+++ TableFooter.java 2001/11/22 07:11:39 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: TableFooter.java,v 1.5 2001/11/09 11:32:38 keiron Exp $
+ * $Id: TableFooter.java,v 1.6 2001/11/22 07:11:39 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.
@@ -26,7 +26,6 @@
public TableFooter(FONode parent) {
super(parent);
- this.name = "fo:table-footer";
}
}
1.5 +1 -2 xml-fop/src/org/apache/fop/fo/flow/TableHeader.java
Index: TableHeader.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/TableHeader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TableHeader.java 2001/11/09 11:32:38 1.4
+++ TableHeader.java 2001/11/22 07:11:39 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: TableHeader.java,v 1.4 2001/11/09 11:32:38 keiron Exp $
+ * $Id: TableHeader.java,v 1.5 2001/11/22 07:11:39 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,7 +18,6 @@
public TableHeader(FONode parent) {
super(parent);
- this.name = "fo:table-header";
}
}
1.7 +10 -11 xml-fop/src/org/apache/fop/fonts/TTFSubSetFile.java
Index: TTFSubSetFile.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fonts/TTFSubSetFile.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TTFSubSetFile.java 2001/11/09 11:32:41 1.6
+++ TTFSubSetFile.java 2001/11/22 07:11:40 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: TTFSubSetFile.java,v 1.6 2001/11/09 11:32:41 keiron Exp $
+ * $Id: TTFSubSetFile.java,v 1.7 2001/11/22 07:11:40 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.
@@ -10,7 +10,6 @@
import java.util.Iterator;
import java.util.HashMap;
import java.util.ArrayList;
-import org.apache.fop.messaging.MessageHandler;
/**
* Reads a TrueType file and generates a subset
@@ -462,10 +461,10 @@
if (newIdx == null) {
// This errormessage would look much better
// if the fontname was printed to
- MessageHandler.error("An embedded font "
- + "contains bad glyph data. "
- + "Characters might not display "
- + "correctly.");
+ //log.error("An embedded font "
+ // + "contains bad glyph data. "
+ // + "Characters might not display "
+ // + "correctly.");
moreComposites = false;
continue;
}
@@ -603,35 +602,35 @@
createCvt(in); // copy the cvt table
} catch (IOException ex) {
// Cvt is optional (only required for OpenType (MS) fonts)
- MessageHandler.errorln("TrueType warning: " + ex.getMessage());
+ //log.error("TrueType warning: " + ex.getMessage());
}
try {
createFpgm(in); // copy fpgm table
} catch (IOException ex) {
// Fpgm is optional (only required for OpenType (MS) fonts)
- MessageHandler.errorln("TrueType warning: " + ex.getMessage());
+ //log.error("TrueType warning: " + ex.getMessage());
}
try {
createPrep(in); // copy prep table
} catch (IOException ex) {
// Prep is optional (only required for OpenType (MS) fonts)
- MessageHandler.errorln("TrueType warning: " + ex.getMessage());
+ //log.error("TrueType warning: " + ex.getMessage());
}
try {
createLoca(glyphs.size()); // create empty loca table
} catch (IOException ex) {
// Loca is optional (only required for OpenType (MS) fonts)
- MessageHandler.errorln("TrueType warning: " + ex.getMessage());
+ //log.error("TrueType warning: " + ex.getMessage());
}
try {
createGlyf(in, glyphs);
} catch (IOException ex) {
// Glyf is optional (only required for OpenType (MS) fonts)
- MessageHandler.errorln("TrueType warning: " + ex.getMessage());
+ //log.error("TrueType warning: " + ex.getMessage());
}
pad4();
1.2 +4 -3 xml-fop/src/org/apache/fop/image/EPSImage.java
Index: EPSImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/EPSImage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EPSImage.java 2001/11/16 19:36:40 1.1
+++ EPSImage.java 2001/11/22 07:11:40 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: EPSImage.java,v 1.1 2001/11/16 19:36:40 tore Exp $
+ * $Id: EPSImage.java,v 1.2 2001/11/22 07:11:40 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.
@@ -86,8 +86,9 @@
}
public byte[] getEPSImage() throws FopImageException {
- if (epsImage == null)
- MessageHandler.errorln("ERROR LOADING EXTERNAL EPS");
+ if (epsImage == null) {
+ //log.error("ERROR LOADING EXTERNAL EPS");
+ }
return epsImage;
}
1.4 +15 -16 xml-fop/src/org/apache/fop/image/FopImageConsumer.java
Index: FopImageConsumer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/FopImageConsumer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FopImageConsumer.java 2001/07/30 20:29:26 1.3
+++ FopImageConsumer.java 2001/11/22 07:11:40 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: FopImageConsumer.java,v 1.3 2001/07/30 20:29:26 tore Exp $
+ * $Id: FopImageConsumer.java,v 1.4 2001/11/22 07:11:40 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.
@@ -12,7 +12,6 @@
// Java
import java.util.Hashtable;
-import org.apache.fop.messaging.MessageHandler;
import java.awt.image.*;
import java.awt.*;
@@ -34,25 +33,25 @@
public void imageComplete(int status) {
/*
- * MessageHandler.error("Status ");
+ * log.error("Status ");
* if (status == ImageConsumer.COMPLETESCANLINES) {
- * MessageHandler.errorln("CompleteScanLines");
+ * log.error("CompleteScanLines");
* } else if (status == ImageConsumer.IMAGEABORTED) {
- * MessageHandler.errorln("ImageAborted");
+ * log.error("ImageAborted");
* } else if (status == ImageConsumer.IMAGEERROR) {
- * MessageHandler.errorln("ImageError");
+ * log.error("ImageError");
* } else if (status == ImageConsumer.RANDOMPIXELORDER) {
- * MessageHandler.errorln("RandomPixelOrder");
+ * log.error("RandomPixelOrder");
* } else if (status == ImageConsumer.SINGLEFRAME) {
- * MessageHandler.errorln("SingleFrame");
+ * log.error("SingleFrame");
* } else if (status == ImageConsumer.SINGLEFRAMEDONE) {
- * MessageHandler.errorln("SingleFrameDone");
+ * log.error("SingleFrameDone");
* } else if (status == ImageConsumer.SINGLEPASS) {
- * MessageHandler.errorln("SinglePass");
+ * log.error("SinglePass");
* } else if (status == ImageConsumer.STATICIMAGEDONE) {
- * MessageHandler.errorln("StaticImageDone");
+ * log.error("StaticImageDone");
* } else if (status == ImageConsumer.TOPDOWNLEFTRIGHT) {
- * MessageHandler.errorln("TopDownLeftRight");
+ * log.error("TopDownLeftRight");
* }
*/
synchronized (this.imageStatus) {
@@ -63,23 +62,23 @@
}
public void setColorModel(ColorModel model) {
- // MessageHandler.errorln("setColorModel: " + model);
+ // log.error("setColorModel: " + model);
this.cm = model;
}
public void setDimensions(int width, int height) {
- // MessageHandler.errorln("setDimension: w=" + width + " h=" + height);
+ // log.error("setDimension: w=" + width + " h=" + height);
this.width = width;
this.height = height;
}
public void setHints(int hintflags) {
- // MessageHandler.errorln("setHints: " + hintflags);
+ // log.error("setHints: " + hintflags);
this.hints = hintflags;
}
public void setProperties(Hashtable props) {
- // MessageHandler.errorln("setProperties: " + props);
+ // log.error("setProperties: " + props);
this.properties = props;
}
1.8 +3 -4 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGImage.java 2001/09/11 10:04:25 1.7
+++ SVGImage.java 2001/11/22 07:11:40 1.8
@@ -1,5 +1,5 @@
/*
- * $Id: SVGImage.java,v 1.7 2001/09/11 10:04:25 keiron Exp $
+ * $Id: SVGImage.java,v 1.8 2001/11/22 07:11:40 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.
@@ -13,7 +13,6 @@
// FOP
import org.apache.fop.apps.Driver;
-import org.apache.fop.messaging.*;
import org.apache.fop.datatypes.ColorSpace;
import org.apache.fop.pdf.PDFColor;
import org.apache.fop.image.analyser.ImageReader;
@@ -56,8 +55,8 @@
new SAXSVGDocumentFactory(SVGImage.getParserName());
doc = factory.createDocument(this.m_href.toExternalForm());
} catch (Exception e) {
- MessageHandler.errorln("Could not load external SVG: "
- + e.getMessage());
+ //log.error("Could not load external SVG: "
+ // + e.getMessage());
}
}
1.15 +4 -4 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SVGReader.java 2001/11/15 08:12:34 1.14
+++ SVGReader.java 2001/11/22 07:11:40 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: SVGReader.java,v 1.14 2001/11/15 08:12:34 keiron Exp $
+ * $Id: SVGReader.java,v 1.15 2001/11/22 07:11:40 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.
@@ -96,12 +96,12 @@
return true;
} catch (NoClassDefFoundError ncdfe) {
- MessageHandler.errorln("Batik not in class path");
+ //log.error("Batik not in class path");
return false;
}
catch (Exception e) {
- MessageHandler.errorln("Could not load external SVG: " +
- e.getMessage());
+ //log.error("Could not load external SVG: " +
+ // e.getMessage());
// assuming any exception means this document is not svg
// or could not be loaded for some reason
return false;
1.33 +1 -2 xml-fop/src/org/apache/fop/layout/BlockArea.java
Index: BlockArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/BlockArea.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- BlockArea.java 2001/10/22 09:30:31 1.32
+++ BlockArea.java 2001/11/22 07:11:40 1.33
@@ -1,5 +1,5 @@
/*
- * $Id: BlockArea.java,v 1.32 2001/10/22 09:30:31 keiron Exp $
+ * $Id: BlockArea.java,v 1.33 2001/11/22 07:11:40 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.
@@ -17,7 +17,6 @@
// Java
import java.util.Vector;
import java.util.Enumeration;
-import org.apache.fop.messaging.MessageHandler;
/**
* This class represents a Block Area.
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- FontInfo.java 2001/11/15 08:12:35 1.14
+++ FontInfo.java 2001/11/22 07:11:40 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: FontInfo.java,v 1.14 2001/11/15 08:12:35 keiron Exp $
+ * $Id: FontInfo.java,v 1.15 2001/11/22 07:11:40 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,9 +57,9 @@
if (f == null) {
throw new FOPException("no default font defined by OutputConverter");
}
- //MessageHandler.errorln("defaulted font to any,normal,normal");
+ //log.error("defaulted font to any,normal,normal");
}
- //MessageHandler.errorln("unknown font " + key
+ //log.error("unknown font " + key
// + " so defaulted font to any");
}
1.55 +13 -12 xml-fop/src/org/apache/fop/layout/LineArea.java
Index: LineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/LineArea.java,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- LineArea.java 2001/10/22 09:30:31 1.54
+++ LineArea.java 2001/11/22 07:11:40 1.55
@@ -1,5 +1,5 @@
/*
- * $Id: LineArea.java,v 1.54 2001/10/22 09:30:31 keiron Exp $
+ * $Id: LineArea.java,v 1.55 2001/11/22 07:11:40 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.
@@ -9,7 +9,6 @@
// fop
import org.apache.fop.render.Renderer;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.layout.inline.*;
import org.apache.fop.datatypes.IDNode;
import org.apache.fop.fo.properties.WrapOption;
@@ -391,8 +390,9 @@
wordWidth = charWidth;
if ((finalWidth + spaceWidth + wordWidth)
> this.getContentWidth()) {
- if (overrun)
- MessageHandler.log("area contents overflows area");
+ if (overrun) {
+ //log.debug("area contents overflows area");
+ }
if (this.wrapOption == WrapOption.WRAP) {
return i;
}
@@ -443,7 +443,7 @@
(wordStart == start) &&
(finalWidth == 0)) {
- MessageHandler.log("area contents overflows area");
+ //log.debug("area contents overflows area");
addSpacedWord(new String(data, wordStart, wordLength - 1),
ls,
finalWidth + spaceWidth
@@ -501,8 +501,9 @@
wordWidth = 0;
}
- if (overrun)
- MessageHandler.log("area contents overflows area");
+ if (overrun) {
+ //log.debug("area contents overflows area");
+ }
return -1;
}
@@ -619,8 +620,8 @@
break;
// leader pattern use-content not implemented.
case LeaderPattern.USECONTENT:
- MessageHandler.errorln("leader-pattern=\"use-content\" not "
- + "supported by this version of Fop");
+ //log.error("leader-pattern=\"use-content\" not "
+ // + "supported by this version of Fop");
return;
}
// adds leader length to length of pending inline areas
@@ -821,8 +822,8 @@
private InlineArea buildSimpleLeader(char c, int leaderLength) {
int width = this.currentFontState.width(currentFontState.mapChar(c));
if (width == 0) {
- MessageHandler.errorln("char " + c
- + " has width 0. Using width 100 instead.");
+ //log.error("char " + c
+ // + " has width 0. Using width 100 instead.");
width = 100;
}
int factor = (int)Math.floor(leaderLength / width);
@@ -896,7 +897,7 @@
int remainingWidth) {
// check whether the language property has been set
if (this.hyphProps.language.equalsIgnoreCase("none")) {
- MessageHandler.errorln("if property 'hyphenate' is used, a language must be specified");
+ //log.error("if property 'hyphenate' is used, a language must be specified");
return wordStart;
}
1.6 +28 -29 xml-fop/src/org/apache/fop/layout/hyphenation/Hyphenator.java
Index: Hyphenator.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layout/hyphenation/Hyphenator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Hyphenator.java 2001/07/30 20:29:28 1.5
+++ Hyphenator.java 2001/11/22 07:11:40 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: Hyphenator.java,v 1.5 2001/07/30 20:29:28 tore Exp $
+ * $Id: Hyphenator.java,v 1.6 2001/11/22 07:11:40 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.
@@ -10,7 +10,6 @@
import java.io.*;
import java.util.Hashtable;
import org.apache.fop.configuration.*;
-import org.apache.fop.messaging.MessageHandler;
/**
* This class is the main entry point to the hyphenation package.
@@ -57,8 +56,8 @@
if (hTree != null) {
hyphenTrees.put(key, hTree);
} else {
- MessageHandler.errorln("Couldn't find hyphenation pattern "
- + key);
+ //log.error("Couldn't find hyphenation pattern "
+ // + key);
}
return hTree;
}
@@ -96,24 +95,24 @@
if (key.length() == 5) {
is = getResourceStream(key.substring(0, 2));
if (is != null) {
- MessageHandler.errorln("Couldn't find hyphenation pattern "
- + key
- + "\nusing general language pattern "
- + key.substring(0, 2)
- + " instead.");
+ //log.error("Couldn't find hyphenation pattern "
+ // + key
+ // + "\nusing general language pattern "
+ // + key.substring(0, 2)
+ // + " instead.");
} else {
if (errorDump) {
- MessageHandler.errorln("Couldn't find precompiled "
- + "fop hyphenation pattern "
- + key + ".hyp");
+ //log.error("Couldn't find precompiled "
+ // + "fop hyphenation pattern "
+ // + key + ".hyp");
}
return null;
}
} else {
if (errorDump) {
- MessageHandler.errorln("Couldn't find precompiled "
- + "fop hyphenation pattern "
- + key + ".hyp");
+ //log.error("Couldn't find precompiled "
+ // + "fop hyphenation pattern "
+ // + key + ".hyp");
}
return null;
}
@@ -128,7 +127,7 @@
try {
ois.close();
} catch (IOException e) {
- MessageHandler.errorln("can't close hyphenation object stream");
+ //log.error("can't close hyphenation object stream");
}
}
}
@@ -172,8 +171,8 @@
if (hyphenFile.exists()) {
hTree = new HyphenationTree();
if (errorDump) {
- MessageHandler.errorln("reading " + hyphenDir + key
- + ".xml");
+ //log.error("reading " + hyphenDir + key
+ // + ".xml");
}
try {
hTree.loadPatterns(hyphenFile.getPath());
@@ -184,18 +183,18 @@
return hTree;
} catch (HyphenationException ex) {
if (errorDump) {
- MessageHandler.errorln("Can't load user patterns "
- + "from xml file " + hyphenDir
- + key + ".xml");
+ //log.error("Can't load user patterns "
+ // + "from xml file " + hyphenDir
+ // + key + ".xml");
}
return null;
}
} else {
if (errorDump) {
- MessageHandler.errorln("Tried to load "
- + hyphenFile.toString()
- + "\nCannot find compiled nor xml file for "
- + "hyphenation pattern" + key);
+ //log.error("Tried to load "
+ // + hyphenFile.toString()
+ // + "\nCannot find compiled nor xml file for "
+ // + "hyphenation pattern" + key);
}
return null;
}
@@ -207,8 +206,8 @@
int rightMin) {
HyphenationTree hTree = getHyphenationTree(lang, country);
if (hTree == null) {
- MessageHandler.errorln("Error building hyphenation tree for language "
- + lang);
+ //log.error("Error building hyphenation tree for language "
+ // + lang);
return null;
}
return hTree.hyphenate(word, leftMin, rightMin);
@@ -219,8 +218,8 @@
int leftMin, int rightMin) {
HyphenationTree hTree = getHyphenationTree(lang, country);
if (hTree == null) {
- MessageHandler.errorln("Error building hyphenation tree for language "
- + lang);
+ //log.error("Error building hyphenation tree for language "
+ // + lang);
return null;
}
return hTree.hyphenate(word, offset, len, leftMin, rightMin);
1.4 +2 -3 xml-fop/src/org/apache/fop/mif/MIFDocument.java
Index: MIFDocument.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/mif/MIFDocument.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MIFDocument.java 2001/07/30 20:29:29 1.3
+++ MIFDocument.java 2001/11/22 07:11:40 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: MIFDocument.java,v 1.3 2001/07/30 20:29:29 tore Exp $
+ * $Id: MIFDocument.java,v 1.4 2001/11/22 07:11:40 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.
@@ -13,7 +13,6 @@
// referenced and I'd rather not do it
import org.apache.fop.image.FopImage;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.layout.LinkSet;
import org.apache.fop.datatypes.ColorSpace;
@@ -993,7 +992,7 @@
} else if (bookComponent.document.height != height
|| bookComponent.document.width != width) {
- MessageHandler.logln("Warning : FrameMaker doesnt support different page-sizes in a document");
+ //log.warn("FrameMaker doesnt support different page-sizes in a document");
}
}
1.3 +3 -4 xml-fop/src/org/apache/fop/pdf/FlateFilter.java
Index: FlateFilter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/FlateFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FlateFilter.java 2001/07/30 20:29:29 1.2
+++ FlateFilter.java 2001/11/22 07:11:40 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: FlateFilter.java,v 1.2 2001/07/30 20:29:29 tore Exp $
+ * $Id: FlateFilter.java,v 1.3 2001/11/22 07:11:40 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.
@@ -76,9 +76,8 @@
compressedStream.flush();
compressedStream.close();
} catch (IOException e) {
- org.apache.fop.messaging.MessageHandler.error("Fatal error: "
- + e.getMessage());
- e.printStackTrace();
+ //log.error("Fatal error: "
+ // + e.getMessage(), e);
}
return outArrayStream.toByteArray();
1.14 +2 -3 xml-fop/src/org/apache/fop/pdf/PDFPages.java
Index: PDFPages.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFPages.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PDFPages.java 2001/11/09 11:32:41 1.13
+++ PDFPages.java 2001/11/22 07:11:40 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: PDFPages.java,v 1.13 2001/11/09 11:32:41 keiron Exp $
+ * $Id: PDFPages.java,v 1.14 2001/11/22 07:11:40 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.
@@ -9,7 +9,6 @@
// Java
import java.io.PrintWriter;
-import org.apache.fop.messaging.MessageHandler;
import java.util.ArrayList;
/**
@@ -72,7 +71,7 @@
*/
public void incrementCount() {
this.count++;
- // MessageHandler.logln("Incrementing count to " + this.getCount());
+ // log.debug("Incrementing count to " + this.getCount());
}
/**
1.12 +3 -4 xml-fop/src/org/apache/fop/pdf/PDFStream.java
Index: PDFStream.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFStream.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PDFStream.java 2001/11/02 11:06:07 1.11
+++ PDFStream.java 2001/11/22 07:11:40 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: PDFStream.java,v 1.11 2001/11/02 11:06:07 keiron Exp $
+ * $Id: PDFStream.java,v 1.12 2001/11/22 07:11:40 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.
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import java.util.Enumeration;
import org.apache.fop.configuration.Configuration;
-import org.apache.fop.messaging.MessageHandler;
/**
* class representing a PDF stream.
@@ -87,8 +86,8 @@
} else if (filterType.equals("")) {
return;
} else {
- MessageHandler.errorln("Unsupported filter type in stream-filter-list: "
- + filterType);
+ //log.error("Unsupported filter type in stream-filter-list: "
+ // + filterType);
}
}
1.17 +7 -8 xml-fop/src/org/apache/fop/pdf/PDFXObject.java
Index: PDFXObject.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/pdf/PDFXObject.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PDFXObject.java 2001/11/16 19:36:40 1.16
+++ PDFXObject.java 2001/11/22 07:11:40 1.17
@@ -1,5 +1,5 @@
/*
- * $Id: PDFXObject.java,v 1.16 2001/11/16 19:36:40 tore Exp $
+ * $Id: PDFXObject.java,v 1.17 2001/11/22 07:11:40 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.
@@ -12,7 +12,6 @@
// Java
import java.io.IOException;
-import org.apache.fop.messaging.MessageHandler;
import java.io.OutputStream;
// FOP
@@ -52,7 +51,7 @@
isPS = false;
this.Xnum = Xnumber;
if (img == null)
- MessageHandler.errorln("FISH");
+ //log.error("FISH");
fopimage = img;
this.pdfDoc = pdfdoc;
pdfICCStream = null;
@@ -71,9 +70,9 @@
}
}
} catch (Exception e) {
- MessageHandler.errorln("Error while reading image " +
- fopimage.getURL() +
- ": " + e.getMessage());
+ //log.error("Error while reading image " +
+ // fopimage.getURL() +
+ // ": " + e.getMessage());
}
}
@@ -224,8 +223,8 @@
length += pdfBytes.length;
}
} catch (FopImageException imgex) {
- MessageHandler.errorln("Error in XObject : "
- + imgex.getMessage());
+ //log.error("Error in XObject : "
+ // + imgex.getMessage());
}
return length;
1.4 +1 -2 xml-fop/src/org/apache/fop/render/awt/FontMetricsMapper.java
Index: FontMetricsMapper.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/FontMetricsMapper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FontMetricsMapper.java 2001/07/30 20:29:32 1.3
+++ FontMetricsMapper.java 2001/11/22 07:11:41 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: FontMetricsMapper.java,v 1.3 2001/07/30 20:29:32 tore Exp $
+ * $Id: FontMetricsMapper.java,v 1.4 2001/11/22 07:11:41 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.
@@ -8,7 +8,6 @@
package org.apache.fop.render.awt;
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.layout.FontInfo;
import org.apache.fop.layout.FontDescriptor;
import org.apache.fop.layout.FontState;
1.4 +1 -4 xml-fop/src/org/apache/fop/render/awt/FontSetup.java
Index: FontSetup.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/FontSetup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FontSetup.java 2001/07/30 20:29:32 1.3
+++ FontSetup.java 2001/11/22 07:11:41 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: FontSetup.java,v 1.3 2001/07/30 20:29:32 tore Exp $
+ * $Id: FontSetup.java,v 1.4 2001/11/22 07:11:41 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.
@@ -8,7 +8,6 @@
package org.apache.fop.render.awt;
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.layout.FontInfo;
import org.apache.fop.layout.FontDescriptor;
@@ -40,8 +39,6 @@
public static void setup(FontInfo fontInfo, Graphics2D graphics) {
FontMetricsMapper metric;
int normal, bold, bolditalic, italic;
-
- MessageHandler.logln("setting up fonts");
/*
* available java fonts are:
1.5 +1 -3 xml-fop/src/org/apache/fop/render/mif/FontSetup.java
Index: FontSetup.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/mif/FontSetup.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FontSetup.java 2001/11/02 11:06:08 1.4
+++ FontSetup.java 2001/11/22 07:11:41 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: FontSetup.java,v 1.4 2001/11/02 11:06:08 keiron Exp $
+ * $Id: FontSetup.java,v 1.5 2001/11/22 07:11:41 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.
@@ -9,7 +9,6 @@
// FOP
import org.apache.fop.render.mif.fonts.*;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.layout.FontInfo;
import org.apache.fop.layout.FontDescriptor;
import org.apache.fop.mif.MIFDocument;
@@ -36,7 +35,6 @@
* @param fontInfo the font info object to set up
*/
public static void setup(FontInfo fontInfo) {
- MessageHandler.logln("setting up fonts");
fontInfo.addMetrics("F1", new Helvetica());
fontInfo.addMetrics("F2", new HelveticaOblique());
1.16 +2 -2 xml-fop/src/org/apache/fop/render/pdf/FontSetup.java
Index: FontSetup.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/FontSetup.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FontSetup.java 2001/11/09 11:32:41 1.15
+++ FontSetup.java 2001/11/22 07:11:41 1.16
@@ -1,5 +1,5 @@
/*
- * $Id: FontSetup.java,v 1.15 2001/11/09 11:32:41 keiron Exp $
+ * $Id: FontSetup.java,v 1.16 2001/11/22 07:11:41 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.
@@ -176,7 +176,7 @@
}
}
} catch (Exception ex) {
- //MessageHandler.error("Failed to read font metrics file "
+ //log.error("Failed to read font metrics file "
// + configFontInfo.getMetricsFile()
// + " : " + ex.getMessage());
}
1.4 +4 -5 xml-fop/src/org/apache/fop/render/pdf/fonts/LazyFont.java
Index: LazyFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/fonts/LazyFont.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LazyFont.java 2001/11/09 11:32:42 1.3
+++ LazyFont.java 2001/11/22 07:11:41 1.4
@@ -1,5 +1,5 @@
/*
- * $Id: LazyFont.java,v 1.3 2001/11/09 11:32:42 keiron Exp $
+ * $Id: LazyFont.java,v 1.4 2001/11/22 07:11:41 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.
@@ -10,7 +10,6 @@
import org.apache.fop.render.pdf.Font;
import org.apache.fop.layout.FontDescriptor;
import org.apache.fop.pdf.PDFStream;
-import org.apache.fop.messaging.MessageHandler;
import java.util.HashMap;
import org.apache.fop.render.pdf.FontReader;
@@ -44,9 +43,9 @@
}
// System.out.println("Metrics " + metricsFileName + " loaded.");
} catch (Exception ex) {
- MessageHandler.error("Failed to read font metrics file "
- + metricsFileName
- + " : " + ex.getMessage());
+ //log.error("Failed to read font metrics file "
+ // + metricsFileName
+ // + " : " + ex.getMessage());
}
}
}
1.6 +3 -4 xml-fop/src/org/apache/fop/render/pdf/fonts/MultiByteFont.java
Index: MultiByteFont.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/fonts/MultiByteFont.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MultiByteFont.java 2001/11/09 11:32:42 1.5
+++ MultiByteFont.java 2001/11/22 07:11:41 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: MultiByteFont.java,v 1.5 2001/11/09 11:32:42 keiron Exp $
+ * $Id: MultiByteFont.java,v 1.6 2001/11/22 07:11:41 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,7 +18,6 @@
import org.apache.fop.render.pdf.CIDFont;
import org.apache.fop.render.pdf.CMap;
import org.apache.fop.pdf.PDFTTFStream;
-import org.apache.fop.messaging.MessageHandler;
import java.io.InputStream;
import java.io.IOException;
import java.io.FileInputStream;
@@ -205,8 +204,8 @@
embeddedFont.addFilter("ascii-85");
embeddedFont.setData(subsetFont, subsetFont.length);
} catch (IOException ioe) {
- MessageHandler.errorln("Failed to embed font [" + i + "] "
- + fontName + ": " + ioe.getMessage());
+ //log.error("Failed to embed font [" + i + "] "
+ // + fontName + ": " + ioe.getMessage());
return (PDFStream)null;
}
1.7 +4 -5 xml-fop/src/org/apache/fop/viewer/Command.java
Index: Command.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/Command.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Command.java 2001/07/30 20:29:35 1.6
+++ Command.java 2001/11/22 07:11:41 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: Command.java,v 1.6 2001/07/30 20:29:35 tore Exp $
+ * $Id: Command.java,v 1.7 2001/11/22 07:11:41 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.
@@ -13,7 +13,6 @@
*/
import java.awt.event.ActionEvent;
-import org.apache.fop.messaging.MessageHandler;
import javax.swing.AbstractAction;
import javax.swing.ImageIcon;
import java.net.*;
@@ -46,7 +45,7 @@
String path = IMAGE_DIR + iconName + ".gif";
URL url = getClass().getResource(path);
if (url == null) {
- MessageHandler.errorln("Icon not found: " + path);
+ //log.error("Icon not found: " + path);
} else
putValue(SMALL_ICON, new ImageIcon(url));
}
@@ -56,11 +55,11 @@
}
public void doit() {
- MessageHandler.errorln("Not implemented.");
+ //log.error("Not implemented.");
}
public void undoit() {
- MessageHandler.errorln("Not implemented.");
+ //log.error("Not implemented.");
}
}
1.3 +3 -5 xml-fop/src/org/apache/fop/viewer/GoToPageDialog.java
Index: GoToPageDialog.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/GoToPageDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GoToPageDialog.java 2001/07/30 20:29:35 1.2
+++ GoToPageDialog.java 2001/11/22 07:11:41 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: GoToPageDialog.java,v 1.2 2001/07/30 20:29:35 tore Exp $
+ * $Id: GoToPageDialog.java,v 1.3 2001/11/22 07:11:41 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,8 +18,6 @@
import javax.swing.*;
import java.awt.event.*;
-import org.apache.fop.messaging.MessageHandler;
-
public class GoToPageDialog extends JDialog {
JPanel panel1 = new JPanel();
GridBagLayout gridBagLayout1 = new GridBagLayout();
@@ -36,8 +34,8 @@
jbInit();
pack();
} catch (Exception ex) {
- MessageHandler.errorln("GoToPageDialog: Konstruktor: "
- + ex.getMessage());
+ //log.error("GoToPageDialog: Konstruktor: "
+ // + ex.getMessage(), ex);
}
}
1.5 +4 -5 xml-fop/src/org/apache/fop/viewer/LoadableProperties.java
Index: LoadableProperties.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/LoadableProperties.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LoadableProperties.java 2001/07/30 20:29:35 1.4
+++ LoadableProperties.java 2001/11/22 07:11:41 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: LoadableProperties.java,v 1.4 2001/07/30 20:29:35 tore Exp $
+ * $Id: LoadableProperties.java,v 1.5 2001/11/22 07:11:41 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.
@@ -8,7 +8,6 @@
package org.apache.fop.viewer;
import java.io.*;
-import org.apache.fop.messaging.MessageHandler;
import java.util.*;
/**
@@ -67,9 +66,9 @@
if (index > 0 && str.length() > index) {
return true;
} else {
- MessageHandler.logln(getClass().getName()
- + ": load(): invalid line " + str + "."
- + " Character '=' missed.");
+ //log.debug(getClass().getName()
+ // + ": load(): invalid line " + str + "."
+ // + " Character '=' missed.");
return false;
}
}
1.10 +6 -12 xml-fop/src/org/apache/fop/viewer/PreviewDialog.java
Index: PreviewDialog.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/PreviewDialog.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PreviewDialog.java 2001/11/02 11:06:09 1.9
+++ PreviewDialog.java 2001/11/22 07:11:41 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: PreviewDialog.java,v 1.9 2001/11/02 11:06:09 keiron Exp $
+ * $Id: PreviewDialog.java,v 1.10 2001/11/22 07:11:41 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.
@@ -32,13 +32,11 @@
import org.apache.fop.layout.*;
import org.apache.fop.render.awt.*;
-import org.apache.fop.messaging.*;
/**
* Frame and User Interface for Preview
*/
-public class PreviewDialog extends JFrame implements ProgressListener,
- MessageListener {
+public class PreviewDialog extends JFrame implements ProgressListener {
protected Translator res;
@@ -554,11 +552,11 @@
/**
- * Called by MessageHandler if an error message or a
+ * Called by logger if an error message or a
* log message is received.
*/
- public void processMessage(MessageEvent event) {
- String error = event.getMessage();
+ public void processMessage() {
+/* String error = event.getMessage();
String text = processStatus.getText();
FontMetrics fmt =
processStatus.getFontMetrics(processStatus.getFont());
@@ -623,16 +621,12 @@
progress(event.getMessage());
}
}
- }
+ }*/
}
-
public void dispose() {
System.exit(0);
}
} // class PreviewDialog
-
-
-
1.5 +4 -5 xml-fop/src/org/apache/fop/viewer/SecureResourceBundle.java
Index: SecureResourceBundle.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/SecureResourceBundle.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SecureResourceBundle.java 2001/07/30 20:29:35 1.4
+++ SecureResourceBundle.java 2001/11/22 07:11:41 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: SecureResourceBundle.java,v 1.4 2001/07/30 20:29:35 tore Exp $
+ * $Id: SecureResourceBundle.java,v 1.5 2001/11/22 07:11:41 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.
@@ -8,7 +8,6 @@
package org.apache.fop.viewer;
import java.util.*;
-import org.apache.fop.messaging.MessageHandler;
import java.io.*;
@@ -44,7 +43,7 @@
try {
lookup.load(in);
} catch (Exception ex) {
- MessageHandler.logln("Abgefangene Exception: " + ex.getMessage());
+ //log.error("Abgefangene Exception: " + ex.getMessage());
isSourceFound = false;
}
}
@@ -79,8 +78,8 @@
return obj;
else {
if (isMissingEmphasized) {
- MessageHandler.logln(getClass().getName() + ": missing key: "
- + key);
+ //log.debug(getClass().getName() + ": missing key: "
+ // + key);
return getMissedRepresentation(key.toString());
} else
return key.toString();
1.7 +23 -23 xml-fop/src/org/apache/fop/viewer/UserMessage.java
Index: UserMessage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/viewer/UserMessage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UserMessage.java 2001/07/30 20:29:35 1.6
+++ UserMessage.java 2001/11/22 07:11:41 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: UserMessage.java,v 1.6 2001/07/30 20:29:35 tore Exp $
+ * $Id: UserMessage.java,v 1.7 2001/11/22 07:11:41 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.
@@ -8,7 +8,6 @@
package org.apache.fop.viewer;
import java.awt.*;
-import org.apache.fop.messaging.MessageHandler;
import java.io.*;
import java.awt.event.*;
import java.util.*;
@@ -44,7 +43,7 @@
public static void setTranslator(Translator aRes) {
res = aRes;
if (res == null) {
- MessageHandler.logln("UserMessage: setTranslator(null) !");
+ //log.debug("UserMessage: setTranslator(null) !");
res = new SecureResourceBundle(null);
}
@@ -150,22 +149,23 @@
* Ersetzt die eventuellen Platzhalter durch die �bergebenen Parameter
*/
static String prepareMessage(String rawText, String[] par) {
- MessageHandler.logln("prepareMessage(): " + rawText + ", parameter: "
- + par);
+ //log.debug("prepareMessage(): " + rawText + ", parameter: "
+ // + par);
int index = rawText.indexOf(PARAMETER_TAG);
String composedMess = "";
if ((index == -1) && (par == null))
return rawText;
if ((index != -1) && (par == null)) {
- MessageHandler.logln("Message " + actMessId
- + " erwartet Parameter. Aufgerufen ohne Parameter");
+ //log.debug("Message " + actMessId
+ // + " erwartet Parameter. Aufgerufen ohne Parameter");
return rawText;
}
if ((index == -1) && (par != null)) {
- MessageHandler.logln("Message " + actMessId
- + " erwartet keine Parameter. Aufgerufen mit folgenden Parametern:");
- for (int i = 0; i < par.length; ++i)
- MessageHandler.logln(par[i].toString());
+ //log.debug("Message " + actMessId
+ // + " erwartet keine Parameter. Aufgerufen mit folgenden Parametern:");
+ for (int i = 0; i < par.length; ++i) {
+ //log.debug(par[i].toString());
+ }
return rawText;
}
int tagCount = 0;
@@ -174,19 +174,19 @@
try {
composedMess += rawText.substring(0, index) + par[tagCount];
} catch (ArrayIndexOutOfBoundsException ex) {
- MessageHandler.logln("Anzahl der �bergebenen Parameter zu der Meldung "
- + actMessId
- + " ist weniger als erwartet.");
- ex.printStackTrace();
+ //log.error("Anzahl der �bergebenen Parameter zu der Meldung "
+ // + actMessId
+ // + " ist weniger als erwartet.", ex);
return composedMess + rawText;
}
rawText = rawText.substring(index + PARAMETER_TAG.length());
tagCount++;
}
composedMess += rawText;
- if (tagCount != par.length)
- MessageHandler.logln("Die zu der Meldung " + actMessId
- + " �bergebenen Parameter sind mehr als die Meldung vorsieht.");
+ if (tagCount != par.length) {
+ //log.debug("Die zu der Meldung " + actMessId
+ // + " �bergebenen Parameter sind mehr als die Meldung vorsieht.");
+ }
return composedMess;
}
@@ -291,12 +291,12 @@
translatedMes.substring(translatedMes.indexOf(':') + 1);
} catch (Exception ex) {
- MessageHandler.logln("FALSCHES FORMAT: MESSAGE: " + textID);
+ //log.debug("FALSCHES FORMAT: MESSAGE: " + textID);
}
} else { // Message not found
- MessageHandler.logln("UserMessage: textID '" + textID
- + "' not found. Return "
- + "value 'CANCEL' = " + CANCEL);
+ //log.debug("UserMessage: textID '" + textID
+ // + "' not found. Return "
+ // + "value 'CANCEL' = " + CANCEL);
// return CANCEL;
@@ -334,7 +334,7 @@
} else {
if (optionTypeIndex == STYLE_NOBUTTON) {
// Wird nicht mehr unterst�tzt
- MessageHandler.logln("UserMessage: STYLE_NOBUTTON wird nicht unterst�tzt");
+ //log.debug("UserMessage: STYLE_NOBUTTON wird nicht unterst�tzt");
return result;
} else {
result = MessagesDialog.showConfirmDialog(null, preparedMes,
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org