Index: PreviewDialog.java
===================================================================
RCS file: /home/cvspublic/xml-fop/src/org/apache/fop/viewer/PreviewDialog.java,v
retrieving revision 1.7.2.3
diff -u -w -r1.7.2.3 PreviewDialog.java
--- PreviewDialog.java	2 Aug 2002 20:28:59 -0000	1.7.2.3
+++ PreviewDialog.java	1 Nov 2002 12:10:40 -0000
@@ -62,11 +62,11 @@
 

     protected JLabel zoomLabel =

         new JLabel();    // {public float getAlignmentY() { return 0.0f; }};

+
     protected JComboBox scale = new JComboBox() {

         public float getAlignmentY() {

             return 0.5f;

         }

-

     };

 

     protected JScrollPane previewArea = new JScrollPane();

@@ -105,8 +105,8 @@
             public void doit() {

                 print();

             }

-

         };

+
         firstPageAction = new Command(res.getString("First page"),

                                       "firstpg") {

             public void doit() {

@@ -114,30 +114,30 @@
             }

 

         };

+
         previousPageAction = new Command(res.getString("Previous page"),

                                          "prevpg") {

             public void doit() {

                 goToPreviousPage(null);

             }

-

         };

+
         nextPageAction = new Command(res.getString("Next page"), "nextpg") {

             public void doit() {

                 goToNextPage(null);

             }

-

         };

+
         lastPageAction = new Command(res.getString("Last page"), "lastpg") {

             public void doit() {

                 goToLastPage(null);

             }

-

         };

+
         reloadAction = new Command(res.getString("Reload"), "reload") {

             public void doit() {

                 reload(null);

             }

-

         };

 

         setDefaultCloseOperation(DISPOSE_ON_CLOSE);

@@ -160,7 +160,6 @@
             public void actionPerformed(ActionEvent e) {

                 scale_actionPerformed(e);

             }

-

         });

 

         scale.setSelectedItem("100");

@@ -243,20 +242,17 @@
             public void doit() {

                 print();

             }

-

         });

         menu.add(new Command(res.getString("Reload")) {

             public void doit() {

                 reload(null);

             }

-

         });

         menu.addSeparator();

         menu.add(new Command(res.getString("Exit")) {

             public void doit() {

                 dispose();

             }

-

         });

         menuBar.add(menu);

         menu = new JMenu(res.getString("View"));

@@ -264,31 +260,26 @@
             public void doit() {

                 goToFirstPage(null);

             }

-

         });

         menu.add(new Command(res.getString("Previous page")) {

             public void doit() {

                 goToPreviousPage(null);

             }

-

         });

         menu.add(new Command(res.getString("Next page")) {

             public void doit() {

                 goToNextPage(null);

             }

-

         });

         menu.add(new Command(res.getString("Last page")) {

             public void doit() {

                 goToLastPage(null);

             }

-

         });

         menu.add(new Command(res.getString("Go to Page") + " ...") {

             public void doit() {

                 goToPage(null);

             }

-

         });

         menu.addSeparator();

         subMenu = new JMenu(res.getString("Zoom"));

@@ -296,37 +287,31 @@
             public void doit() {

                 setScale(25.0);

             }

-

         });

         subMenu.add(new Command("50%") {

             public void doit() {

                 setScale(50.0);

             }

-

         });

         subMenu.add(new Command("75%") {

             public void doit() {

                 setScale(75.0);

             }

-

         });

         subMenu.add(new Command("100%") {

             public void doit() {

                 setScale(100.0);

             }

-

         });

         subMenu.add(new Command("150%") {

             public void doit() {

                 setScale(150.0);

             }

-

         });

         subMenu.add(new Command("200%") {

             public void doit() {

                 setScale(200.0);

             }

-

         });

         menu.add(subMenu);

         menu.addSeparator();

@@ -334,7 +319,6 @@
             public void doit() {

                 setScale(100.0);

             }

-

         });

         menuBar.add(menu);

         menu = new JMenu(res.getString("Help"));

@@ -346,13 +330,12 @@
             public void doit() {

                 startHelpAbout(null);

             }

-

         });

         menuBar.add(menu);

         return menuBar;

     }

 

-    // Aktion Hilfe | Info durchgeführt

+    // Aktion Hilfe | Info durchgefhrt
 

     /**

      * Show the About box

@@ -391,7 +374,6 @@
         goToPage(currentPage);

     }

 

-

     /**

      * Shows the next page.

      */

@@ -406,11 +388,9 @@
      * Shows the last page.

      */

     private void goToLastPage(ActionEvent e) {

-

         if (currentPage == pageCount - 1)

             return;

         currentPage = pageCount - 1;

-

         goToPage(currentPage);

     }

 

@@ -447,10 +427,10 @@
      * Shows a page by number.

      */

     private void goToPage(ActionEvent e) {

-

         GoToPageDialog d = new GoToPageDialog(this,

                                               res.getString("Go to Page"),

-                                              true);

+                                              true,
+                                              res);
         d.setLocation((int)getLocation().getX() + 50,

                       (int)getLocation().getY() + 50);

         d.show();

@@ -476,7 +456,7 @@
 

     private void print() {

         PrinterJob pj = PrinterJob.getPrinterJob();

-        // Nicht nötig, Pageable get a Printable.

+        // Nicht ntig, Pageable get a Printable.
         // pj.setPrintable(renderer);

         pj.setPageable(renderer);

 

@@ -490,7 +470,6 @@
     }

 

     public void setScale(double scaleFactor) {

-

         if (scaleFactor == 25.0)

             scale.setSelectedIndex(0);

         else if (scaleFactor == 50.0)

@@ -520,7 +499,6 @@
         progress(new String(message + " " + percentage + "%"));

     }

 

-

     /**

      * Setting the text  of a JLabel is not thread save, it

      * needs to be done in  the EventThread. Here we make sure

@@ -530,13 +508,11 @@
         SwingUtilities.invokeLater(new showProgress(message, false));

     }

 

-

     /**

      * This class is used to show status and error messages in

      * a thread safe way.

      */

     class showProgress implements Runnable {

-

         /**

          * The message to display

          */

@@ -565,7 +541,6 @@
             } else

                 processStatus.setText(message.toString());

         }

-

     }

 

     public void showPage() {

@@ -577,7 +552,6 @@
             SwingUtilities.invokeLater(viewer);

     }

 

-

     /**

      * This class is used to update the page image

      * in a thread safe way.

@@ -587,6 +561,7 @@
         /**

          * The run method that does the actuall updating

          */

+
         public void run() {

             BufferedImage pageImage = null;

             Graphics graphics = null;

@@ -608,10 +583,8 @@
                                      + (currentPage + 1) + " "

                                      + res.getString("of") + " " + pageCount);

         }

-

     }

 

-

     /**

      * Called by MessageHandler if an error message or a

      * log message is received.

@@ -697,7 +670,3 @@
     }

 

 }    // class PreviewDialog

-

-

-

-