cvs commit: xml-fop/src/java/org/apache/fop/svg SVGUserAgent.java

2004-03-21 Thread gmazza 
gmazza  2004/03/21 04:38:56

  Modified:.build.xml
   src/java/org/apache/fop/image/analyser SVGReader.java
   src/java/org/apache/fop/render/pdf PDFXMLHandler.java
   src/java/org/apache/fop/render/ps PSXMLHandler.java
   src/java/org/apache/fop/svg SVGUserAgent.java
  Removed: src/codegen properties.xsl
  Log:
  1.) Removed xsl file for property generation (no longer used, due to
  Finn's work.)  Removed build.xml entry.
  
  2.) Disconnected the FOUserAgent from the SVGUserAgent.  This will make
  the SVGUserAgent more portable although at the cost of a more complex
  constructor.
  
  Revision  ChangesPath
  1.106 +0 -3  xml-fop/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/xml-fop/build.xml,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- build.xml 27 Feb 2004 19:36:38 -  1.105
  +++ build.xml 21 Mar 2004 12:38:56 -  1.106
  @@ -218,10 +218,7 @@
   property name=jai value=JAIImage.java/
   
   property name=xslt value=org.apache.xalan.xslt.Process/
  -property name=src.properties.xsl value=${src.codegen}/properties.xsl/
  -property name=src.propmaker.xsl value=${src.codegen}/propmaker.xsl/
   
  -property name=propinc.xsl value=${src.codegen}/propinc.xsl/
   property name=src.charlist.xsl 
value=${src.codegen}/code-point-mapping.xsl/
   property name=encodings.xml value=${src.codegen}/encodings.xml/
   property name=charlist.xsl value=${src.codegen}/code-point-mapping.xsl/
  
  
  
  1.6   +8 -4  xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java
  
  Index: SVGReader.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SVGReader.java19 Mar 2004 00:53:37 -  1.5
  +++ SVGReader.java21 Mar 2004 12:38:56 -  1.6
  @@ -27,6 +27,9 @@
   import org.w3c.dom.Element;
   import org.w3c.dom.svg.SVGDocument;
   
  +// Avalon
  +import org.apache.avalon.framework.logger.Logger;
  +
   // Batik
   import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
   import org.apache.batik.dom.svg.SVGOMDocument;
  @@ -87,7 +90,8 @@
   if (batik) {
   try {
   Loader loader = new Loader();
  -return loader.getImage(uri, bis, ua);
  +return loader.getImage(uri, bis, ua.getLogger(), 
  +ua.getPixelUnitToMillimeter());
   } catch (NoClassDefFoundError e) {
   batik = false;
   //ua.getLogger().error(Batik not in class path, e);
  @@ -104,7 +108,7 @@
*/
   class Loader {
   private FopImage.ImageInfo getImage(String uri, InputStream fis,
  -FOUserAgent ua) {
  +Logger logger, float pixelUnitToMM) {
   // parse document and get the size attributes of the svg element
   
   try {
  @@ -174,8 +178,8 @@
   
   Element e = doc.getRootElement();
   String s;
  -SVGUserAgent userAg =
  -new SVGUserAgent(ua, new AffineTransform());
  +SVGUserAgent userAg = new SVGUserAgent(logger, pixelUnitToMM,
  +new AffineTransform());
   BridgeContext ctx = new BridgeContext(userAg);
   UnitProcessor.Context uctx =
   UnitProcessor.createContext(ctx, e);
  
  
  
  1.9   +3 -1  xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
  
  Index: PDFXMLHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- PDFXMLHandler.java19 Mar 2004 00:53:37 -  1.8
  +++ PDFXMLHandler.java21 Mar 2004 12:38:56 -  1.9
  @@ -220,7 +220,9 @@
   int yOffset = pdfInfo.currentYPosition;
   
   SVGUserAgent ua
  - = new SVGUserAgent(context.getUserAgent(), new AffineTransform());
  + = new SVGUserAgent(context.getUserAgent().getLogger(), 
  +context.getUserAgent().getPixelUnitToMillimeter(),
  +new AffineTransform());
   
   GVTBuilder builder = new GVTBuilder();
   BridgeContext ctx = new BridgeContext(ua);
  
  
  
  1.12  +3 -2  xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java
  
  Index: PSXMLHandler.java
  ===
  RCS file:

cvs commit: xml-fop/src/java/org/apache/fop/svg SVGUserAgent.java package.html

2004-03-18 Thread gmazza 
gmazza  2004/03/18 16:53:38

  Modified:src/java/org/apache/fop/image/analyser SVGReader.java
   src/java/org/apache/fop/render/pdf PDFXMLHandler.java
   src/java/org/apache/fop/render/ps PSXMLHandler.java
   src/java/org/apache/fop/svg package.html
  Added:   src/java/org/apache/fop/svg SVGUserAgent.java
  Removed: src/java/org/apache/fop/fo/extensions/svg SVGUserAgent.java
  Log:
  Moved SVGUserAgent back to SVG package (not being used by SVG FO extensions.)
  
  Revision  ChangesPath
  1.5   +1 -1  xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java
  
  Index: SVGReader.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/image/analyser/SVGReader.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGReader.java27 Feb 2004 17:47:30 -  1.4
  +++ SVGReader.java19 Mar 2004 00:53:37 -  1.5
  @@ -38,7 +38,7 @@
   import org.apache.fop.image.XMLImage;
   import org.apache.fop.image.FopImage;
   import org.apache.fop.apps.FOUserAgent;
  -import org.apache.fop.fo.extensions.svg.SVGUserAgent;
  +import org.apache.fop.svg.SVGUserAgent;
   
   /** 
* ImageReader object for SVG document image type.
  
  
  
  1.8   +1 -1  xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
  
  Index: PDFXMLHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PDFXMLHandler.java27 Feb 2004 17:52:34 -  1.7
  +++ PDFXMLHandler.java19 Mar 2004 00:53:37 -  1.8
  @@ -29,7 +29,7 @@
   import org.apache.fop.svg.PDFTextElementBridge;
   import org.apache.fop.svg.PDFAElementBridge;
   import org.apache.fop.svg.PDFGraphics2D;
  -import org.apache.fop.fo.extensions.svg.SVGUserAgent;
  +import org.apache.fop.svg.SVGUserAgent;
   import org.apache.fop.apps.Document;
   
   /* org.w3c.dom.Document is not imported to avoid conflict with
  
  
  
  1.11  +1 -1  xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java
  
  Index: PSXMLHandler.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- PSXMLHandler.java 27 Feb 2004 17:53:11 -  1.10
  +++ PSXMLHandler.java 19 Mar 2004 00:53:38 -  1.11
  @@ -36,7 +36,7 @@
   // FOP
   import org.apache.fop.render.XMLHandler;
   import org.apache.fop.render.RendererContext;
  -import org.apache.fop.fo.extensions.svg.SVGUserAgent;
  +import org.apache.fop.svg.SVGUserAgent;
   
   /**
* PostScript XML handler.
  
  
  
  1.2   +1 -1  xml-fop/src/java/org/apache/fop/svg/package.html
  
  Index: package.html
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html  11 Mar 2003 13:05:07 -  1.1
  +++ package.html  19 Mar 2004 00:53:38 -  1.2
  @@ -16,7 +16,7 @@
   from SVG to a single page PDF document.
   /P
   P
  -SVGElement, SVGElementMapping, SVGObj and SVGUserAgent are used by
  +SVGElement, SVGElementMapping and SVGObj are used by
   FOP for handling embedded SVG or external SVG graphics.
   /P
   P
  
  
  
  1.9   +16 -50xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java
  
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: xml-fop/src/java/org/apache/fop/svg SVGUserAgent.java

2003-03-27 Thread jeremias 
jeremias2003/03/27 03:23:06

  Modified:src/java/org/apache/fop/svg SVGUserAgent.java
  Log:
  Logging via Avalon Logger.
  
  Revision  ChangesPath
  1.2   +12 -6 xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java
  
  Index: SVGUserAgent.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/SVGUserAgent.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SVGUserAgent.java 11 Mar 2003 13:05:07 -  1.1
  +++ SVGUserAgent.java 27 Mar 2003 11:23:06 -  1.2
  @@ -68,7 +68,6 @@
*/
   public class SVGUserAgent extends UserAgentAdapter {
   private AffineTransform currentTransform = null;
  -private Logger log;
   private FOUserAgent userAgent;
   
   /**
  @@ -79,7 +78,14 @@
   public SVGUserAgent(FOUserAgent ua, AffineTransform at) {
   currentTransform = at;
   userAgent = ua;
  -log = userAgent.getLogger();
  +}
  +
  +/**
  + * Returns the logger associated with this user agent.
  + * @return Logger the logger
  + */
  +protected final Logger getLogger() {
  +return this.userAgent.getLogger();
   }
   
   /**
  @@ -87,7 +93,7 @@
* @param message the message to display
*/
   public void displayError(String message) {
  -log.error(message);
  +getLogger().error(message);
   }
   
   /**
  @@ -95,7 +101,7 @@
* @param ex the exception to display
*/
   public void displayError(Exception ex) {
  -log.error(SVG Error + ex.getMessage(), ex);
  +getLogger().error(SVG Error + ex.getMessage(), ex);
   }
   
   /**
  @@ -104,7 +110,7 @@
* @param message the message to display
*/
   public void displayMessage(String message) {
  -log.info(message);
  +getLogger().info(message);
   }
   
   /**
  @@ -112,7 +118,7 @@
* @param message the message to display
*/
   public void showAlert(String message) {
  -log.warn(message);
  +getLogger().warn(message);
   }
   
   /**
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]