cvs commit: xml-fop/src/java/org/apache/fop/viewer PreviewDialog.java

[gmazza]

gmazza  2003/08/10 08:43:13

  Modified:src/java/org/apache/fop/apps AWTStarter.java
   src/java/org/apache/fop/render/awt AWTPrintRenderer.java
AWTRenderer.java
   src/java/org/apache/fop/viewer PreviewDialog.java
  Log:
  Moved the Translator (resource bundle) creation from AWTStarter to AWTRenderer.
  Gave the AWTRenderer access to the PrintViewer frame that displays the document.
  Moved rendering status messages from AWTStarter to AWTRenderer and PrintDialog.
  
  Revision  ChangesPath
  1.8   +5 -13 xml-fop/src/java/org/apache/fop/apps/AWTStarter.java
  
  Index: AWTStarter.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/AWTStarter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AWTStarter.java   8 Aug 2003 22:56:15 -   1.7
  +++ AWTStarter.java   10 Aug 2003 15:43:13 -  1.8
  @@ -53,14 +53,12 @@
   //FOP
   import org.apache.fop.render.awt.AWTRenderer;
   import org.apache.fop.viewer.PreviewDialog;
  -import org.apache.fop.viewer.Translator;
   
   //Java
   import java.awt.Dimension;
   import java.awt.Toolkit;
   import java.awt.event.WindowAdapter;
   import java.awt.event.WindowEvent;
  -import java.util.Locale;
   
   /**
* AWT Viewer starter.
  @@ -72,7 +70,6 @@
*/
   public class AWTStarter extends CommandLineStarter {
   private PreviewDialog frame;
  -private Translator translator;
   private Driver driver;
   
   /**
  @@ -87,10 +84,9 @@
   }
   
   private void init() throws FOPException {
  -translator = new Translator();
  -AWTRenderer renderer = new AWTRenderer(translator);
  -frame = createPreviewDialog(renderer, translator);
  -renderer.setComponent(frame);
  +AWTRenderer renderer = new AWTRenderer();
  +frame = createPreviewDialog(renderer);
  +renderer.setPreviewDialog(frame);
   renderer.setOptions(commandLineOptions.getRendererOptions());
   driver = new Driver();
   driver.setRenderer(renderer);
  @@ -103,18 +99,14 @@
   public void run() throws FOPException {
   driver.reset();
   try {
  -frame.setStatus(translator.getString(Status.Build.FO.tree));
   driver.render(inputHandler);
  -frame.setStatus(translator.getString(Status.Show));
  -frame.showPage();
   } catch (Exception e) {
   frame.reportException(e);
   }
   }
   
  -private PreviewDialog createPreviewDialog(AWTRenderer renderer,
  -Translator res) {
  -PreviewDialog frame = new PreviewDialog(this, renderer, res);
  +private PreviewDialog createPreviewDialog(AWTRenderer renderer) {
  +PreviewDialog frame = new PreviewDialog(this, renderer);
   frame.addWindowListener(new WindowAdapter() {
   public void windowClosed(WindowEvent we) {
   System.exit(0);
  
  
  
  1.4   +2 -2  xml-fop/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java
  
  Index: AWTPrintRenderer.java
  ===
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTPrintRenderer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AWTPrintRenderer.java 2 Aug 2003 21:26:53 -   1.3
  +++ AWTPrintRenderer.java 10 Aug 2003 15:43:13 -  1.4
  @@ -68,7 +68,7 @@
   private PrinterJob printerJob;
   
   public AWTPrintRenderer() {
  -super(null);
  +super();
   initialize();
   }
   
  
  
  
  1.3   +25 -15xml-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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AWTRenderer.java  8 Aug 2003 20:43:25 -   1.2
  +++ AWTRenderer.java  10 Aug 2003 15:43:13 -  1.3
  @@ -72,6 +72,7 @@
   
   import org.apache.fop.layout.FontInfo;
   import org.apache.fop.render.AbstractRenderer;
  +import org.apache.fop.viewer.PreviewDialog;
   import org.apache.fop.viewer.Translator;
   
   /**
  @@ -85,7 +86,11 @@
   protected int pageNumber = 0;
   protected List pageList = new java.util.Vector();
   //protected ProgressListener progressListener = null;
  -protected Translator res = null;
  +
  +/**
  + * The resource bundle used for AWT messages.
  + */
  +protected Translator translator = null;
   
   protected Map fontNames = new java.util.Hashtable();
   protected Map fontStyles = new java.util.Hashtable();
  @@ -100,7 +105,7 @@
   
   /**
* The current (internal) font name
  -  

cvs commit: xml-fop/src/java/org/apache/fop/apps Driver.java

[vmote]

vmote   2003/08/11 11:08:06

  Modified:src/java/org/apache/fop/apps Driver.java
  Log:
  set up render(XMLReader, InputSource) as the main render() method, and normalize 
render(Document document) to this form.
  
  Revision  ChangesPath
  1.20  +9 -21 xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Driver.java   11 Aug 2003 17:51:25 -  1.19
  +++ Driver.java   11 Aug 2003 18:08:06 -  1.20
  @@ -560,7 +560,9 @@
   }
   
   /**
  - * Render the FO document read by a SAX Parser from an InputSource.
  + * This is the main render() method. The other render() methods are for
  + * convenience, and normalize to this form, then run this.
  + * Renders the FO document read by a SAX Parser from an InputSource.
* @param parser the SAX parser.
* @param source the input source the parser reads from.
* @throws FOPException if anything goes wrong.
  @@ -586,31 +588,17 @@
   }
   
   /**
  - * Render the FO ducument represented by a DOM Document.
  + * This method overloads the main render() method, adding the convenience
  + * of using a DOM Document as input.
  + * @see render(XMLReader, InputSource)
* @param document the DOM document to read from
* @throws FOPException if anything goes wrong.
*/
   public synchronized void render(Document document)
   throws FOPException {
  -if (!isInitialized()) {
  -initialize();
  -}
  -try {
  -DocumentInputSource source = new DocumentInputSource(document);
  -DocumentReader reader = new DocumentReader();
  -reader.setContentHandler(getContentHandler());
  -reader.parse(source);
  -} catch (SAXException e) {
  -if (e.getException() instanceof FOPException) {
  -// Undo exception tunneling.
  -throw (FOPException)e.getException();
  -} else {
  -throw new FOPException(e);
  -}
  -} catch (IOException e) {
  -throw new FOPException(e);
  -}
  -
  +DocumentInputSource source = new DocumentInputSource(document);
  +DocumentReader reader = new DocumentReader();
  +render(reader, source);
   }
   
   /**
  
  
  

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

DO NOT REPLY [Bug 1180] - Problem with monospaced font

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1180.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://nagoya.apache.org/bugzilla/show_bug.cgi?id=1180

Problem with monospaced font





--- Additional Comments From [EMAIL PROTECTED]  2003-08-12 14:51 ---
Why has this bug been languishing for so long?  It's got an easy fix.  If the
fix is rejected becuase it messes up non monospaced fonts then perhaps we should
trigger the fix only for fixed width fonts.  I've attached a patch against 20.5
release that removes the space widening in the AWTFontMetrics, but only for
monospaced fonts.  And I define monospaced fonts as fonts where the advance of
'm' and 'l' are identical.  (the widest and narrowest letters in the latin
alphabet respectivly).

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