pbwest      2004/04/15 01:04:24

  Modified:    src/java/org/apache/fop/render/awt/viewer Tag:
                        FOP_0-20-0_Alt-Design PreviewDialog.java
  Log:
  Removed InputHandler references to maintain compatibility with AWTRenderer
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.3   +5 -14     
xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java
  
  Index: PreviewDialog.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- PreviewDialog.java        14 Mar 2004 11:21:27 -0000      1.2.2.2
  +++ PreviewDialog.java        15 Apr 2004 08:04:24 -0000      1.2.2.3
  @@ -49,7 +49,6 @@
   
   //FOP
   import org.apache.fop.apps.Fop;
  -import org.apache.fop.apps.InputHandler;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.render.awt.AWTRenderer;
   
  @@ -66,8 +65,6 @@
       protected Translator translator;
       /** The AWT renderer */
       protected AWTRenderer renderer;
  -    /** The InputHandler associated with this window */
  -    protected InputHandler inputHandler;
       /** The Fop used for refreshing/reloading the view */
       protected Fop fop;
   
  @@ -83,9 +80,8 @@
        * Creates a new PreviewDialog that uses the given renderer.
        * @param aRenderer the to use renderer
        */
  -    public PreviewDialog(AWTRenderer aRenderer, InputHandler handler) {
  +    public PreviewDialog(AWTRenderer aRenderer) {
           renderer = aRenderer;
  -        inputHandler = handler;
           translator = renderer.getTranslator();
   
           //Commands aka Actions
  @@ -219,14 +215,13 @@
               }
           });
           // inputHandler must be set to allow reloading
  -        if (inputHandler != null) {
               menu.add(new Command(translator.getString("Menu.Reload")) {
                   public void doit() {
                       reload();
                   }
               });
  -        }
  -        menu.addSeparator();
  +
  +            menu.addSeparator();
           menu.add(new Command(translator.getString("Menu.Exit")) {
               public void doit() {
                   dispose();
  @@ -394,13 +389,9 @@
               infoStatus.setText("");
               currentPage = 0;
   
  -            try {
  +                // TODO work out how to reload
                   setStatus(translator.getString("Status.Build.FO.tree"));
  -                fop.render(inputHandler);
                   setStatus(translator.getString("Status.Show"));
  -            } catch (FOPException e) {
  -                reportException(e);
  -            }
           }
       }
   
  
  
  

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

Reply via email to