cvs commit: xml-fop/src/java/org/apache/fop/fonts/type1 PFMFile.java
jeremias2004/04/02 01:15:16
Modified:src/java/org/apache/fop/fonts/type1 PFMFile.java
Log:
Changed logging to use static loggers from Jakarta Commons Logging (via
LogFactory).
Revision ChangesPath
1.7 +9 -25 xml-fop/src/java/org/apache/fop/fonts/type1/PFMFile.java
Index: PFMFile.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/type1/PFMFile.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PFMFile.java 31 Mar 2004 10:55:06 - 1.6
+++ PFMFile.java 2 Apr 2004 09:15:16 - 1.7
@@ -25,6 +25,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
// FOP
@@ -65,24 +66,7 @@
/**
* logging instance
*/
-protected Log logger = null;
-
-
-/**
- * Sets the Commons-Logging instance for this class
- * @param logger The Commons-Logging instance
- */
-public void setLogger(Log logger) {
-this.logger = logger;
-}
-
-/**
- * Returns the Commons-Logging instance for this class
- * @return The Commons-Logging instance
- */
-protected Log getLogger() {
-return logger;
-}
+protected Log log = LogFactory.getLog(PFMFile.class);
/**
* Parses a PFM file
@@ -97,7 +81,7 @@
/*final int version =*/ in.readShort();
final long filesize = in.readInt();
if (filesize != buf.length) {
-logger.warn(Effective file size is not the same as indicated in the
header.);
+log.warn(Effective file size is not the same as indicated in the
header.);
}
bufin.reset();
@@ -142,7 +126,7 @@
private void loadExtension(PFMInputStream inStream) throws IOException {
final int size = inStream.readShort();
if (size != 30) {
-logger.warn(Size of extension block was expected to be
+log.warn(Size of extension block was expected to be
+ 30 bytes, but was + size + bytes.);
}
final long extMetricsOffset = inStream.readInt();
@@ -184,7 +168,7 @@
int i = inStream.readShort();
-logger.info(i + kerning pairs);
+log.info(i + kerning pairs);
while (i 0) {
int g1 = (int)inStream.readByte();
i--;
@@ -195,12 +179,12 @@
if (adj 0x8000) {
adj = -(0x1 - adj);
}
-logger.debug(Char no: ( + g1 + , + g2 + ) kern: + adj);
+log.debug(Char no: ( + g1 + , + g2 + ) kern: + adj);
-if (logger.isDebugEnabled()) {
+if (log.isDebugEnabled()) {
final String glyph1 = Glyphs.TEX8R_GLYPH_NAMES[g1];
final String glyph2 = Glyphs.TEX8R_GLYPH_NAMES[g2];
-logger.debug(glyphs: + glyph1 + , + glyph2);
+log.debug(glyphs: + glyph1 + , + glyph2);
}
Map adjTab = (Map)kerningTab.get(new Integer(g1));
@@ -220,7 +204,7 @@
private void loadExtMetrics(PFMInputStream inStream) throws IOException {
final int size = inStream.readShort();
if (size != 52) {
-logger.warn(Size of extension block was expected to be
+log.warn(Size of extension block was expected to be
+ 52 bytes, but was + size + bytes.);
}
inStream.skip(12); //Skip etmPointSize, etmOrientation, etmMasterHeight,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: xml-fop/src/java/org/apache/fop/fonts/type1 PFMFile.java
pbwest 2004/03/13 00:46:05
Modified:src/java/org/apache/fop/render Tag: FOP_0-20-0_Alt-Design
RendererContext.java AbstractRenderer.java
Renderer.java
src/java/org/apache/fop/render/awt Tag:
FOP_0-20-0_Alt-Design AWTRenderer.java
src/java/org/apache/fop/fonts/truetype Tag:
FOP_0-20-0_Alt-Design TTFFile.java
FontFileReader.java TTFSubSetFile.java
src/java/org/apache/fop/fonts/type1 Tag:
FOP_0-20-0_Alt-Design PFMFile.java
Log:
Tidied up to suppress Eclipse nagging
Revision ChangesPath
No revision
No revision
1.3.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/RendererContext.java
Index: RendererContext.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/RendererContext.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- RendererContext.java 10 Mar 2004 06:24:27 - 1.3.2.1
+++ RendererContext.java 13 Mar 2004 08:46:05 - 1.3.2.2
@@ -22,7 +22,7 @@
import java.util.Map;
//FOP
-import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.FOUserAgent;
/**
* The Render Context for external handlers. This provides a rendering context
1.24.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.2
diff -u -r1.24.2.1 -r1.24.2.2
--- AbstractRenderer.java 10 Mar 2004 06:24:27 - 1.24.2.1
+++ AbstractRenderer.java 13 Mar 2004 08:46:05 - 1.24.2.2
@@ -30,8 +30,8 @@
import org.apache.fop.area.CoordTransformer;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.RegionViewport;
-import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
+import org.apache.fop.configuration.FOUserAgent;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
1.8.2.2 +1 -1 xml-fop/src/java/org/apache/fop/render/Renderer.java
Index: Renderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/Renderer.java,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- Renderer.java 10 Mar 2004 06:24:27 - 1.8.2.1
+++ Renderer.java 13 Mar 2004 08:46:05 - 1.8.2.2
@@ -27,7 +27,7 @@
// FOP
import org.apache.fop.apps.FOPException;
import org.apache.fop.area.PageViewport;
-import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.configuration.FOUserAgent;
/**
* Interface implemented by all renderers. This interface is used to control
No revision
No revision
1.21.2.2 +0 -4 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- AWTRenderer.java 10 Mar 2004 06:24:28 - 1.21.2.1
+++ AWTRenderer.java 13 Mar 2004 08:46:05 - 1.21.2.2
@@ -29,13 +29,9 @@
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.awt.print.PageFormat;
import java.awt.print.Pageable;
No revision
No revision
1.5.2.2 +18 -18xml-fop/src/java/org/apache/fop/fonts/truetype/TTFFile.java
Index: TTFFile.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/truetype/TTFFile.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- TTFFile.java 10 Mar 2004 06:24:28 - 1.5.2.1
+++ TTFFile.java 13 Mar 2004 08:46:05 - 1.5.2.2
@@ -380,7 +380,7 @@
ansiIndex = new java.util.HashMap();
for (int i = 32; i Glyphs.WINANSI_ENCODING.length; i++) {
Integer ansi =
cvs commit: xml-fop/src/java/org/apache/fop/fonts/type1 PFMFile.java
jeremias2003/06/02 12:58:55
Modified:src/java/org/apache/fop/fonts/type1 PFMFile.java
Log:
Use Commons IO methods
Revision ChangesPath
1.2 +5 -4 xml-fop/src/java/org/apache/fop/fonts/type1/PFMFile.java
Index: PFMFile.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/type1/PFMFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PFMFile.java 11 Mar 2003 13:05:36 - 1.1
+++ PFMFile.java 2 Jun 2003 19:58:55 - 1.2
@@ -50,16 +50,17 @@
*/
package org.apache.fop.fonts.type1;
+// Java
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
-//Avalon
+// Apache libs
import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.commons.io.IOUtil;
-//FOP
+// FOP
import org.apache.fop.fonts.Glyphs;
-import org.apache.fop.util.StreamUtilities;
/**
* This class represents a PFM file (or parts of it) as a Java object.
@@ -100,7 +101,7 @@
* @throws IOException In case of an I/O problem
*/
public void load(InputStream inStream) throws IOException {
-final byte[] buf = StreamUtilities.toByteArray(inStream, 8000);
+final byte[] buf = IOUtil.toByteArray(inStream);
final InputStream bufin = new java.io.ByteArrayInputStream(buf);
PFMInputStream in = new PFMInputStream(bufin);
/*final int version =*/ in.readShort();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
