2006-11-02 Roman Kennke <kennke@aicas.com>

	* javax/swing/text/html/ImageView.java
	(getImageURL): Fetch attribute from element. Consider the
	base URL for relative image locations.

2 files changed, 20 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 635c089e8..765c54829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-11-02  Roman Kennke  <kennke@aicas.com>
 
+	* javax/swing/text/html/ImageView.java
+	(getImageURL): Fetch attribute from element. Consider the
+	base URL for relative image locations.
+
+2006-11-02  Roman Kennke  <kennke@aicas.com>
+
 	* javax/swing/JEditorPane.java
 	(setContentType): Strip off attributes.
 	* javax/swing/text/html/HTMLEditorKit.java
diff --git a/javax/swing/text/html/ImageView.java b/javax/swing/text/html/ImageView.java
index 84b021070..ff0d3ea40 100644
--- a/javax/swing/text/html/ImageView.java
+++ b/javax/swing/text/html/ImageView.java
@@ -175,19 +175,22 @@ public class ImageView extends View
    */
   public URL getImageURL()
   {
-    Object url = getAttributes().getAttribute(Attribute.SRC);
-    if (url == null)
-      return null;
-
-    try
-      {
-        return new URL(url.toString());
-      }
-    catch (MalformedURLException e)
+    Element el = getElement();
+    String src = (String) el.getAttributes().getAttribute(Attribute.SRC);
+    URL url = null;
+    if (src != null)
       {
-        // The URL is malformed - no image.
-        return null;
+        URL base = ((HTMLDocument) getDocument()).getBase();
+        try
+          {
+            url = new URL(base, src);
+          }
+        catch (MalformedURLException ex)
+          {
+            // Return null.
+          }
       }
+    return url;
   }
 
   /**