This makes the HTML demo a better webbrowser by adding a back and reload
button with history. This also includes some improved testpages.

2006-12-06  Roman Kennke  <[EMAIL PROTECTED]>

        * examples/gnu/classpath/examples/icons/back.png,
        * examples/gnu/classpath/examples/icons/reload.png:
        New icons for the HTML browser.
        * examples/gnu/classpath/examples/swing/HtmlDemo.java
        (history): New field. Manages the browsing history.
        (HtmlDemo): Initialize history.
        (createContent): Set location and add history. Add toolbar.
        (createToolBar): New helper method.
        (main): Make default size bigger.
        * examples/gnu/classpath/examples/swing/frame1.html,
        * examples/gnu/classpath/examples/swing/frame2.html,
        * examples/gnu/classpath/examples/swing/frame3.html,
        * examples/gnu/classpath/examples/swing/frame4.html,
        * examples/gnu/classpath/examples/swing/frames.html,
        * examples/gnu/classpath/examples/swing/tables.html:
        New example pages.
        * examples/gnu/classpath/examples/swing/welcome.html
        Add a couple of links and new test pages.

/Roman

Index: examples/gnu/classpath/examples/swing/tables.html
===================================================================
RCS file: examples/gnu/classpath/examples/swing/tables.html
diff -N examples/gnu/classpath/examples/swing/tables.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/tables.html	6 Dec 2006 21:01:20 -0000
@@ -0,0 +1,66 @@
+<!-- tables.html -- Some HTML stuff to show Swing HTML
+    Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+
+<head>
+    <title>HTML text styles</title>
+  </head>
+  <body>
+<h1>Table examples</h1>
+<h2>Table with grid and mixed rowspan/colspan</h2>
+  <table border="1">
+    <tr>
+      <td width="30%" colspan="2">Spans two columns</td>
+      <td rowspan="3">Spans three rows</td>
+    </tr>
+    <tr>
+      <td rowspan="2">Spans two rows</td>
+      <td>This is the center</td>
+    </tr>
+    <tr>
+      <td>This should be in the middle of row number 3</td>
+    </tr>
+    <tr>
+      <td>A small one cell box</td>
+      <td colspan="2" rowspan="2">Spans two x two cells</td>
+    </tr>
+    <tr>
+      <td>Another small one cell box</td>
+    </tr>
+  </table>
+</body></html>
Index: examples/gnu/classpath/examples/swing/frames.html
===================================================================
RCS file: examples/gnu/classpath/examples/swing/frames.html
diff -N examples/gnu/classpath/examples/swing/frames.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/frames.html	6 Dec 2006 21:01:20 -0000
@@ -0,0 +1,44 @@
+<!-- frames.html -- Some HTML stuff to show Swing HTML
+    Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+<html>
+<frameset cols="40%,60%" rows="20%,80%">
+  <frame src="frame1.html">
+  <frame src="frame2.html">
+  <frame src="frame3.html">
+  <frame src="frame4.html">
+</frameset>
+</html>
\ No newline at end of file
Index: examples/gnu/classpath/examples/swing/frame4.html
===================================================================
RCS file: examples/gnu/classpath/examples/swing/frame4.html
diff -N examples/gnu/classpath/examples/swing/frame4.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/frame4.html	6 Dec 2006 21:01:20 -0000
@@ -0,0 +1,41 @@
+<!-- frame4.html -- Some HTML stuff to show Swing HTML
+    Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+<html>
+<body>
+<h1>Bottom Left Frame</h1>
+</body>
+</html>
Index: examples/gnu/classpath/examples/swing/frame3.html
===================================================================
RCS file: examples/gnu/classpath/examples/swing/frame3.html
diff -N examples/gnu/classpath/examples/swing/frame3.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/frame3.html	6 Dec 2006 21:01:20 -0000
@@ -0,0 +1,42 @@
+<!-- frame3.html -- Some HTML stuff to show Swing HTML
+    Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+<html>
+<body>
+<h1>Bottom Left Frame</h1>
+</body>
+</html>
+
Index: examples/gnu/classpath/examples/swing/frame2.html
===================================================================
RCS file: examples/gnu/classpath/examples/swing/frame2.html
diff -N examples/gnu/classpath/examples/swing/frame2.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/frame2.html	6 Dec 2006 21:01:20 -0000
@@ -0,0 +1,42 @@
+<!-- frame2.html -- Some HTML stuff to show Swing HTML
+    Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+<html>
+<body>
+<h1>Top Right
+ Frame</h1>
+</body>
+</html>
Index: examples/gnu/classpath/examples/swing/frame1.html
===================================================================
RCS file: examples/gnu/classpath/examples/swing/frame1.html
diff -N examples/gnu/classpath/examples/swing/frame1.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ examples/gnu/classpath/examples/swing/frame1.html	6 Dec 2006 21:01:20 -0000
@@ -0,0 +1,41 @@
+<!-- frame1.html -- Some HTML stuff to show Swing HTML
+    Copyright (C) 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+<html>
+<body>
+<h1>Top Left Frame</h1>
+</body>
+</html>
Index: examples/gnu/classpath/examples/swing/HtmlDemo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java,v
retrieving revision 1.7
diff -u -1 -5 -r1.7 HtmlDemo.java
--- examples/gnu/classpath/examples/swing/HtmlDemo.java	6 Nov 2006 20:32:42 -0000	1.7
+++ examples/gnu/classpath/examples/swing/HtmlDemo.java	6 Dec 2006 21:01:20 -0000
@@ -32,39 +32,42 @@
 module.  An independent module is a module which is not derived from
 or based on this library.  If you modify this library, you may extend
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
 
 package gnu.classpath.examples.swing;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.net.URL;
+import java.util.LinkedList;
 
 import javax.swing.BoxLayout;
+import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.JTextPane;
+import javax.swing.JToolBar;
 import javax.swing.SwingUtilities;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 
 /**
  * Parses and displays HTML content.
  * 
  * @author Audrius Meskauskas ([EMAIL PROTECTED])
  */
 public class HtmlDemo extends JPanel
 { 
 
   private class LoadActionListener
     implements ActionListener
   {
@@ -86,115 +89,193 @@
 
   /**
    * Setting this to true causes the parsed element structure to be dumped.
    */
   private static final boolean DEBUG = true;
 
   /**
    * The URL entry field.
    */
   JTextField url = new JTextField(); 
 
   JTextPane html = new JTextPane();
   
   int n;
 
+  /**
+   * The browsing history.
+   *
+   * Package private to avoid accessor method.
+   */
+  LinkedList history;
+
   public HtmlDemo()
   {
     super();
-    html.setContentType("text/html"); // not now.
+    history = new LinkedList();
     createContent();
   }
 
   /**
    * Returns a panel with the demo content. The panel uses a BorderLayout(), and
    * the BorderLayout.SOUTH area is empty, to allow callers to add controls to
    * the bottom of the panel if they want to (a close button is added if this
    * demo is being run as a standalone demo).
    */
   private void createContent()
   {
     setLayout(new BorderLayout());
 
     html.setEditable(false);
     html.addHyperlinkListener(new HyperlinkListener()
     {
 
       public void hyperlinkUpdate(HyperlinkEvent event)
       {
         URL u = event.getURL();
         if (u != null)
           {
             url.setText(u.toString());
             try
               {
                 html.setPage(u);
+                url.setText(u.toString());
+                history.addLast(u);
               }
             catch (IOException ex)
               {
                 ex.printStackTrace();
               }
           }
       }
       
     });
 
     JScrollPane scroller = new JScrollPane(html);
     JPanel urlPanel = new JPanel();
     urlPanel.setLayout(new BoxLayout(urlPanel, BoxLayout.X_AXIS));
     url.setMaximumSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
     LoadActionListener action = new LoadActionListener();
     url.addActionListener(action);
     urlPanel.add(url);
     JButton loadButton = new JButton("go");
     urlPanel.add(loadButton);
     loadButton.addActionListener(action);
-    add(urlPanel, BorderLayout.NORTH);
-    add(scroller, BorderLayout.CENTER);
+
+    // Setup control panel.
+    JToolBar controlPanel = createToolBar();
+    JPanel browserPanel = new JPanel();
+    browserPanel.setLayout(new BorderLayout());
+    browserPanel.add(urlPanel, BorderLayout.NORTH);
+    browserPanel.add(scroller, BorderLayout.CENTER);
+    add(controlPanel, BorderLayout.NORTH);
+    add(browserPanel, BorderLayout.CENTER);
 
     // Load start page.
-    URL startpage = getClass().getResource("welcome.html");
     try
       {
+        URL startpage = getClass().getResource("welcome.html");
         html.setPage(startpage);
         url.setText(startpage.toString());
+        history.addLast(startpage);
       }
-    catch (IOException ex)
+    catch (Exception ex)
       {
-        System.err.println("couldn't load page: " + startpage);
+        System.err.println("couldn't load page: "/* + startpage*/);
+        ex.printStackTrace();
       }
-
-    setPreferredSize(new Dimension(600, 400));
+    setPreferredSize(new Dimension(800, 600));
   }
  
+
+  /**
+   * Creates the toolbar with the control buttons.
+   *
+   * @return the toolbar with the control buttons
+   */
+  JToolBar createToolBar()
+  {
+    JToolBar tb = new JToolBar();
+    Icon backIcon = Demo.getIcon("/gnu/classpath/examples/icons/back.png",
+                                 "back");
+    JButton back = new JButton(backIcon);
+    back.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent ev)
+      {
+        if (history.size() > 1)
+          {
+            URL last = (URL) history.removeLast();
+            last = (URL) history.getLast();
+            url.setText(last.toString());
+            try
+              {
+                html.setPage(last);
+              }
+            catch (IOException ex)
+              {
+                // Do something more useful.
+                ex.printStackTrace();
+              }
+          }
+      }
+    });
+    tb.add(back);
+    Icon reloadIcon = Demo.getIcon("/gnu/classpath/examples/icons/reload.png",
+                                   "reload");
+    JButton reload = new JButton(reloadIcon);
+    reload.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent ev)
+      {
+        if (history.size() > 0)
+          {
+            URL last = (URL) history.getLast();
+            url.setText(last.toString());
+            try
+              {
+                html.setPage(last);
+              }
+            catch (IOException ex)
+              {
+                // Do something more useful.
+                ex.printStackTrace();
+              }
+          }
+      }
+    });
+    tb.add(reload);
+    return tb;
+  }
+
   /**
    * The executable method to display the editable table.
    * 
    * @param args
    *          unused.
    */
   public static void main(String[] args)
   {
     SwingUtilities.invokeLater
     (new Runnable()
      {
        public void run()
        {
          HtmlDemo demo = new HtmlDemo();
          JFrame frame = new JFrame();
          frame.getContentPane().add(demo);
-         frame.setSize(new Dimension(700, 480));
+         frame.setSize(new Dimension(750, 480));
          frame.setVisible(true);
        }
      });
   }
 
   /**
    * Returns a DemoFactory that creates a HtmlDemo.
    *
    * @return a DemoFactory that creates a HtmlDemo
    */
   public static DemoFactory createDemoFactory()
   {
     return new DemoFactory()
     {
       public JComponent createDemo()
Index: examples/gnu/classpath/examples/icons/reload.png
===================================================================
RCS file: examples/gnu/classpath/examples/icons/reload.png
diff -N examples/gnu/classpath/examples/icons/reload.png
Binary files /dev/null and reload.png differ
Index: examples/gnu/classpath/examples/icons/back.png
===================================================================
RCS file: examples/gnu/classpath/examples/icons/back.png
diff -N examples/gnu/classpath/examples/icons/back.png
Binary files /dev/null and back.png differ

Reply via email to