summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-12-06 22:02:26 +0000
committerRoman Kennke <roman@kennke.org>2006-12-06 22:02:26 +0000
commitbfe33aa5c92f11d84706cdeef14c7aea7a1533b0 (patch)
tree5c5fcb9e5b06e5d0f1f1e50ba13e7eba5e660523
parent2f96fde3dd60a85cb00325dc760c42c84cf30c5c (diff)
downloadclasspath-bfe33aa5c92f11d84706cdeef14c7aea7a1533b0.tar.gz
2006-12-06 Roman Kennke <kennke@aicas.com>
* examples/gnu/classpath/examples/swing/Demo.java (getIcon): Made package private. * examples/gnu/classpath/examples/swing/HtmlDemo.java (hyperlinkUpdate): Convert URL to string.
-rw-r--r--ChangeLog7
-rw-r--r--examples/gnu/classpath/examples/swing/Demo.java2
-rw-r--r--examples/gnu/classpath/examples/swing/HtmlDemo.java3
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f4cbb013..992a00c83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-06 Roman Kennke <kennke@aicas.com>
+
+ * examples/gnu/classpath/examples/swing/Demo.java
+ (getIcon): Made package private.
+ * examples/gnu/classpath/examples/swing/HtmlDemo.java
+ (hyperlinkUpdate): Convert URL to string.
+
2006-12-06 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/AsyncImage.java (addObserver): Never notify
diff --git a/examples/gnu/classpath/examples/swing/Demo.java b/examples/gnu/classpath/examples/swing/Demo.java
index 6570cdbad..3c7f0b887 100644
--- a/examples/gnu/classpath/examples/swing/Demo.java
+++ b/examples/gnu/classpath/examples/swing/Demo.java
@@ -66,7 +66,7 @@ public class Demo
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.");
diff --git a/examples/gnu/classpath/examples/swing/HtmlDemo.java b/examples/gnu/classpath/examples/swing/HtmlDemo.java
index 527670fee..2bd2da959 100644
--- a/examples/gnu/classpath/examples/swing/HtmlDemo.java
+++ b/examples/gnu/classpath/examples/swing/HtmlDemo.java
@@ -134,11 +134,10 @@ public class HtmlDemo extends JPanel
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)