updates AWT viewer to new SVG support, implements a goto function for the user

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193608 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 179 insertions, 25 deletions

diff --git a/src/org/apache/fop/viewer/GoToPageDialog.java b/src/org/apache/fop/viewer/GoToPageDialog.java
new file mode 100644
index 000000000..c5b1f4198
--- /dev/null
+++ b/src/org/apache/fop/viewer/GoToPageDialog.java
@@ -0,0 +1,88 @@
+/*
+  originally contributed by
+  Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
+  Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
+  Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
+ */
+
+package org.apache.fop.viewer;
+
+import java.awt.*;
+import javax.swing.*;
+import java.awt.event.*;
+
+import org.apache.fop.messaging.MessageHandler;
+
+public class GoToPageDialog extends JDialog {
+  JPanel panel1 = new JPanel();
+  GridBagLayout gridBagLayout1 = new GridBagLayout();
+  JLabel pgNbLabel = new JLabel();
+  JTextField pgNbField = new JTextField();
+  JButton okButton = new JButton();
+  JButton cancelButton = new JButton();
+
+  int pageNumber = -1;
+
+  public GoToPageDialog(Frame frame, String title, boolean modal) {
+    super(frame, title, modal);
+    try {
+      jbInit();
+      pack();
+    }
+    catch(Exception ex) {
+      MessageHandler.errorln("GoToPageDialog: Konstruktor: " + ex.getMessage());
+    }
+  }
+
+  public GoToPageDialog() {
+    this(null, "", false);
+  }
+
+  void jbInit() throws Exception {
+    panel1.setLayout(gridBagLayout1);
+    pgNbLabel.setText("Page number");
+    okButton.setText("Ok");
+    okButton.addActionListener(new java.awt.event.ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        okButton_actionPerformed(e);
+      }
+    });
+    cancelButton.setText("Cancel");
+    cancelButton.addActionListener(new java.awt.event.ActionListener() {
+
+      public void actionPerformed(ActionEvent e) {
+        cancelButton_actionPerformed(e);
+      }
+    });
+    panel1.setMinimumSize(new Dimension(250, 78));
+    getContentPane().add(panel1);
+    panel1.add(pgNbLabel, new GridBagConstraints(0, 0, 1, 1, 0.0, 0.0
+            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 10, 10, 5), 0, 0));
+    panel1.add(pgNbField, new GridBagConstraints(1, 0, 1, 1, 1.0, 0.0
+            ,GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(10, 5, 10, 10), 0, 0));
+    panel1.add(okButton, new GridBagConstraints(0, 1, 1, 1, 0.0, 0.0
+            ,GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 10, 5), 0, 0));
+    panel1.add(cancelButton, new GridBagConstraints(1, 1, 1, 1, 0.0, 0.0
+            ,GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 10, 10, 10), 0, 0));
+  }
+
+  void okButton_actionPerformed(ActionEvent e) {
+    try {
+      pageNumber = Integer.parseInt(pgNbField.getText());
+      dispose();
+    } catch (Exception ex) {
+      pgNbField.setText("???");
+    }
+
+  }
+
+  void cancelButton_actionPerformed(ActionEvent e) {
+    pageNumber = -1;
+    dispose();
+  }
+
+  public int getPageNumber() {
+    return pageNumber;
+  }
+}
\ No newline at end of file
diff --git a/src/org/apache/fop/viewer/IconToolBar.java b/src/org/apache/fop/viewer/IconToolBar.java
index 7b5a09e11..8704aec91 100644
--- a/src/org/apache/fop/viewer/IconToolBar.java
+++ b/src/org/apache/fop/viewer/IconToolBar.java
@@ -2,9 +2,9 @@ package org.apache.fop.viewer;
 
 /*
   originally contributed by
-  Juergen Verwohlt: Juergen.Verwohlt@af-software.de,
-  Rainer Steinkuhle: Rainer.Steinkuhle@af-software.de,
-  Stanislav Gorkhover: Stanislav.Gorkhover@af-software.de
+  Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
+  Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
+  Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
  */
 
 
diff --git a/src/org/apache/fop/viewer/LoadableProperties.java b/src/org/apache/fop/viewer/LoadableProperties.java
index 9de062037..95010f25b 100644
--- a/src/org/apache/fop/viewer/LoadableProperties.java
+++ b/src/org/apache/fop/viewer/LoadableProperties.java
@@ -13,7 +13,7 @@ import java.util.*;
  * Schlüsselwerte mit Leerzeichen zu.
  *
  * @version 02.12.99
- * @author Stanislav.Gorkhover@af-software.de
+ * @author Stanislav.Gorkhover@jCatalog.com
  *
  */
 public class LoadableProperties extends Hashtable {
diff --git a/src/org/apache/fop/viewer/MessageException.java b/src/org/apache/fop/viewer/MessageException.java
index 6dd531fff..53da10fc3 100644
--- a/src/org/apache/fop/viewer/MessageException.java
+++ b/src/org/apache/fop/viewer/MessageException.java
@@ -9,7 +9,7 @@ import java.lang.Exception;
  * Aufrufer hochgereicht werden, bis schliesslich ein Aufrufer die
  * Meldung zur Anzeige bringt.
  *
- * @author Juergen.Verwohlt@af-software.de
+ * @author Juergen.Verwohlt@jCatalog.com
  * @version 1.0 28.05.99
  *
  */
diff --git a/src/org/apache/fop/viewer/MessagesDialog.java b/src/org/apache/fop/viewer/MessagesDialog.java
index c8c518dab..33b763b0c 100644
--- a/src/org/apache/fop/viewer/MessagesDialog.java
+++ b/src/org/apache/fop/viewer/MessagesDialog.java
@@ -18,7 +18,7 @@ import org.apache.fop.apps.*;
  * eine Detailanzeige einzublenden, in der z.B. bei Fehlern der StackTrace ausgegeben
  * werden kann.
  *
- * @author Juergen.Verwohlt@af-software.de
+ * @author Juergen.Verwohlt@jCatalog.com
  * @version 1.0 09.06.99
  */
 public class MessagesDialog extends JOptionPane {
diff --git a/src/org/apache/fop/viewer/PreviewDialog.java b/src/org/apache/fop/viewer/PreviewDialog.java
index 178083b9c..8aeb7325c 100644
--- a/src/org/apache/fop/viewer/PreviewDialog.java
+++ b/src/org/apache/fop/viewer/PreviewDialog.java
@@ -2,12 +2,11 @@ package org.apache.fop.viewer;
 
 /*
   originally contributed by
-  Juergen Verwohlt: Juergen.Verwohlt@af-software.de,
-  Rainer Steinkuhle: Rainer.Steinkuhle@af-software.de,
-  Stanislav Gorkhover: Stanislav.Gorkhover@af-software.de
+  Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
+  Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
+  Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
  */
 
-
 import java.awt.*;
 import java.awt.print.*;
 import java.awt.event.*;
@@ -61,7 +60,7 @@ public class PreviewDialog extends JFrame implements ProgressListener {
     public PreviewDialog(AWTRenderer aRenderer, Translator aRes) {
 	res = aRes;
 	renderer = aRenderer;
-	
+
 	printAction = new Command(res.getString("Print"), "Print") {
 		public void doit() {print();}};
 	firstPageAction =
@@ -187,6 +186,8 @@ public class PreviewDialog extends JFrame implements ProgressListener {
 		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"));
 	subMenu.add(new Command("25%") {
@@ -279,6 +280,24 @@ public class PreviewDialog extends JFrame implements ProgressListener {
     }
 
     /**
+     * Shows a page by number.
+     */
+    private void goToPage(ActionEvent e) {
+
+    GoToPageDialog d = new GoToPageDialog(this, res.getString("Go to Page"), true);
+    d.setLocation((int) getLocation().getX() + 50, (int) getLocation().getY() + 50);
+    d.show();
+    currentPage = d.getPageNumber();
+
+	if (currentPage < 1 || currentPage > pageCount)
+      return;
+
+    currentPage--;
+
+	goToPage(currentPage);
+    }
+
+    /**
      * Shows the first page.
      */
     private void goToFirstPage(ActionEvent e) {
@@ -342,8 +361,11 @@ public class PreviewDialog extends JFrame implements ProgressListener {
 	BufferedImage pageImage = null;
 	Graphics graphics = null;
 
+
 	renderer.render(currentPage);
 	pageImage = renderer.getLastRenderedPage();
+        if (pageImage == null)
+          return;
 	graphics = pageImage.getGraphics();
 	graphics.setColor(Color.black);
 	graphics.drawRect(0, 0, pageImage.getWidth() - 1,
@@ -352,11 +374,15 @@ public class PreviewDialog extends JFrame implements ProgressListener {
 	previewImageLabel.setIcon(new ImageIcon(pageImage));
 
 	pageCount = renderer.getPageCount();
-	
+
 	statisticsStatus.setText(res.getString("Page") + " " +
 				 (currentPage + 1) + " " +
 				 res.getString("of") + " " +
 				 pageCount);
     }
+
+    public void dispose() {
+      System.exit(0);
+    }
 }  // class PreviewDialog
 
diff --git a/src/org/apache/fop/viewer/PreviewDialogAboutBox.java b/src/org/apache/fop/viewer/PreviewDialogAboutBox.java
index 2d272203d..9aea565d6 100644
--- a/src/org/apache/fop/viewer/PreviewDialogAboutBox.java
+++ b/src/org/apache/fop/viewer/PreviewDialogAboutBox.java
@@ -3,13 +3,12 @@ package org.apache.fop.viewer;
 
 /*
   originally contributed by
-  Juergen Verwohlt: Juergen.Verwohlt@af-software.de,
-  Rainer Steinkuhle: Rainer.Steinkuhle@af-software.de,
-  Stanislav Gorkhover: Stanislav.Gorkhover@af-software.de
+  Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
+  Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
+  Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
  */
 
 
-
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
diff --git a/src/org/apache/fop/viewer/ProgressListener.java b/src/org/apache/fop/viewer/ProgressListener.java
index 6f2c9ed9b..751838917 100644
--- a/src/org/apache/fop/viewer/ProgressListener.java
+++ b/src/org/apache/fop/viewer/ProgressListener.java
@@ -2,13 +2,12 @@ package org.apache.fop.viewer;
 
 /*
   originally contributed by
-  Juergen Verwohlt: Juergen.Verwohlt@af-software.de,
-  Rainer Steinkuhle: Rainer.Steinkuhle@af-software.de,
-  Stanislav Gorkhover: Stanislav.Gorkhover@af-software.de
+  Juergen Verwohlt: Juergen.Verwohlt@jCatalog.com,
+  Rainer Steinkuhle: Rainer.Steinkuhle@jCatalog.com,
+  Stanislav Gorkhover: Stanislav.Gorkhover@jCatalog.com
  */
 
 
-
 public interface ProgressListener {
   public void progress(int percentage);
   public void progress(String message);
diff --git a/src/org/apache/fop/viewer/SecureResourceBundle.java b/src/org/apache/fop/viewer/SecureResourceBundle.java
index 41c997183..3f68d6c16 100644
--- a/src/org/apache/fop/viewer/SecureResourceBundle.java
+++ b/src/org/apache/fop/viewer/SecureResourceBundle.java
@@ -11,7 +11,7 @@ import java.io.*;
  * <strong>Key <i>key</i> not found</strong> zurückgibt.
  * @see PropertyResourceBundle
  *
- * @author Stanislav.Gorkhover@af-software.de
+ * @author Stanislav.Gorkhover@jCatalog.com
  * @version 1.0 18.03.1999
  */
 public class SecureResourceBundle extends ResourceBundle implements Translator {
diff --git a/src/org/apache/fop/viewer/Translator.java b/src/org/apache/fop/viewer/Translator.java
index e19e1f429..6c4da08f8 100644
--- a/src/org/apache/fop/viewer/Translator.java
+++ b/src/org/apache/fop/viewer/Translator.java
@@ -5,7 +5,7 @@ package org.apache.fop.viewer;
  * Definition für die Übersetzer-Klassen.
  *
  * @version 03.12.99
- * @author Stanislav.Gorkhover@af-software.de
+ * @author Stanislav.Gorkhover@jCatalog.com
  *
  */
 public interface Translator {
diff --git a/src/org/apache/fop/viewer/UserMessage.java b/src/org/apache/fop/viewer/UserMessage.java
index 1cdda30d8..360cbb236 100644
--- a/src/org/apache/fop/viewer/UserMessage.java
+++ b/src/org/apache/fop/viewer/UserMessage.java
@@ -18,13 +18,13 @@ import javax.swing.JComponent.*;
  * @author S. Gorkhover
  * @version 18.03.1999
  *
- * @changed 23.04.99 Juergen.Verwohlt@af-software.de
+ * @changed 23.04.99 Juergen.Verwohlt@jCatalog.com
  * @subject Weitere Ausgabemethoden: show(String, String) und show(String,String,Frame)
  *
- * @changed 28.05.99 Juergen.Verwohlt@af-software.de
+ * @changed 28.05.99 Juergen.Verwohlt@jCatalog.com
  * @subject MessageException unterstützen
  *
- * @changed 09.06.99 Juergen.Verwohlt@af-software.de
+ * @changed 09.06.99 Juergen.Verwohlt@jCatalog.com
  * @subject Neue Klasse MessagesException zur Anzeige verwenden
  */
 public class UserMessage {
diff --git a/src/org/apache/fop/viewer/resources/resources.de b/src/org/apache/fop/viewer/resources/resources.de
index 0a513ff8f..400a326ba 100644
--- a/src/org/apache/fop/viewer/resources/resources.de
+++ b/src/org/apache/fop/viewer/resources/resources.de
@@ -1,23 +1,45 @@
 File=Datei
+
 Exit=Beenden
+
 View=Anzeige
+
 Previous page=Vorherige Seite
+
 Next page=Nächste Seite
+
 Last page=Letzte Seite
+
 Help=Hilfe
+
 Default zoom=Standardzoom
+
 Introduction=Einleitung
+
 About=Über
+
 Show=Anzeigen
+
 Preview=Vorschau
+
 First page=Erste Seite
+
 Print=Drucken
+
 Page=Seite
+
 of=von
+
 Init parser=Initializiere Parser
+
 Init mappings=Initializiere Abbildung 
+
 Build FO tree=Baue FO-Baum
+
 Layout FO tree=Formatiere FO-Baum
+
 Render=Gebe aus
+
 Close=Schließen
 
+Go to Page=Gehe zur Seite
diff --git a/src/org/apache/fop/viewer/resources/resources.ru b/src/org/apache/fop/viewer/resources/resources.ru
index e443d4621..84309253e 100644
--- a/src/org/apache/fop/viewer/resources/resources.ru
+++ b/src/org/apache/fop/viewer/resources/resources.ru
@@ -1,18 +1,38 @@
 File=Ôàéë
+
 Exit=Çàêîí÷èòü
+
 View=Âèä
+
 First page=Ïåðâàÿ ñòðàíèöà
+
 Previous page=Ïðåäûäóùàÿ ñòðàíèöà
+
 Next page=Ñëåäóþùàÿ ñòðàíèöà
+
 Last page=Ïîñëåäíÿÿ ñòðàíèöà
+
+Go to Page=Èäòè ê ñòðàíèöå
+
 Help=Ïîìîùü
+
 Default zoom=Ñòàíäàðòíûé ìàñøòàá
+
 Introduction=Ââåäåíèå
+
 About=Î ïðîãðàììå
+
 Show=Ïîêàç
+
 Preview=Ïðîñìîòð
+
 Print=Ïå÷àòàòü
+
 Page=Ñòðàíèöà
+
 of=èç
+
 Zoom=Ìàñøòàá
+
 Close=Çàêðûòü
+