[cp-patches] FYI: HtmlDemo fixlets

[Roman Kennke]

This fixes a method access in the Demo class and converts URLs to
strings. For some reason (a problem in java.net) it does not work with
the URL object.

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

        * examples/gnu/classpath/examples/swing/Demo.java
        (getIcon): Made package private.
        * examples/gnu/classpath/examples/swing/HtmlDemo.java
        (hyperlinkUpdate): Convert URL to string.

/Roman

Index: examples/gnu/classpath/examples/swing/Demo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/gnu/classpath/examples/swing/Demo.java,v
retrieving revision 1.50
diff -u -1 -5 -r1.50 Demo.java
--- examples/gnu/classpath/examples/swing/Demo.java	25 Aug 2006 12:00:07 -0000	1.50
+++ examples/gnu/classpath/examples/swing/Demo.java	6 Dec 2006 21:59:21 -0000
@@ -54,31 +54,31 @@
    */
   JMenu themesMenu;
 
   static Color blueGray = new Color(0xdc, 0xda, 0xd5);
 
   private static Icon stockIcon(String s)
   {
     return getIcon("/gnu/classpath/examples/icons/stock-" + s + ".png", s);
   }
 
   static Icon bigStockIcon(String s)
   {
     return getIcon("/gnu/classpath/examples/icons/big-" + s + ".png", s);
   }
 
-  private static Icon getIcon(String location, String name)
+  static Icon getIcon(String location, String name)
   {
     URL url = Demo.class.getResource(location);
     if (url == null) System.err.println("WARNING " + location + " not found.");
     return new ImageIcon(url, name);
   }
 
   private JMenuBar mkMenuBar()
   {
     JMenuBar bar = new JMenuBar();
     
     JMenu file = new JMenu("File");
     JMenu edit = new JMenu("Edit");
     JMenu help = new JMenu("Help");
 
     file.setMnemonic(KeyEvent.VK_F);
Index: examples/gnu/classpath/examples/swing/HtmlDemo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/examples/gnu/classpath/examples/swing/HtmlDemo.java,v
retrieving revision 1.8
diff -u -1 -5 -r1.8 HtmlDemo.java
--- examples/gnu/classpath/examples/swing/HtmlDemo.java	6 Dec 2006 21:02:18 -0000	1.8
+++ examples/gnu/classpath/examples/swing/HtmlDemo.java	6 Dec 2006 21:59:21 -0000
@@ -122,35 +122,34 @@
    * 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());
+                html.setPage(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));