diff options
author | Roman Kennke <roman@kennke.org> | 2006-11-02 14:04:33 +0000 |
---|---|---|
committer | Roman Kennke <roman@kennke.org> | 2006-11-02 14:04:33 +0000 |
commit | da709d7831557ba0c64188074a34dc6e468cb399 (patch) | |
tree | 8af53c65225f2c239ea014b39d6fb67441662363 | |
parent | 94cabdb3cceb881100f56124e89016bbf9fffe67 (diff) | |
download | classpath-da709d7831557ba0c64188074a34dc6e468cb399.tar.gz |
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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | javax/swing/text/html/ImageView.java | 25 |
2 files changed, 20 insertions, 11 deletions
@@ -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; } /** |