summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-12-07 22:07:22 +0000
committerMark Wielaard <mark@klomp.org>2006-12-07 22:07:22 +0000
commit8c888b190b7a20752666635778ec36eadfc6785a (patch)
tree08ae00451a96614ea4a85da772ce419fdbc49601
parent987287b346229fcf0419bb93a13a52d6a1800d8e (diff)
downloadclasspath-8c888b190b7a20752666635778ec36eadfc6785a.tar.gz
* javax/swing/JEditorPane.java (createEditorKitForContentType):
Always load from system class loader.
-rw-r--r--ChangeLog5
-rw-r--r--javax/swing/JEditorPane.java5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f57e3ce5..a27dd47fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-12-07 Mark Wielaard <mark@klomp.org>
+ * javax/swing/JEditorPane.java (createEditorKitForContentType):
+ Always load from system class loader.
+
+2006-12-07 Mark Wielaard <mark@klomp.org>
+
* java/net/URL.java (URL(URL,String,URLStreamHandler,boolean)): New
private constructor.
(URL(URL,String,URLStreamHandler)): Call new constructor.
diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java
index 9e13b4418..ab683c7a5 100644
--- a/javax/swing/JEditorPane.java
+++ b/javax/swing/JEditorPane.java
@@ -711,7 +711,10 @@ public class JEditorPane extends JTextComponent
{
try
{
- e = (EditorKit) Class.forName(className).newInstance();
+ // XXX - This should actually depend on the classloader
+ // registered with the type. See registerEditorKitForContentType.
+ ClassLoader ldr = ClassLoader.getSystemClassLoader();
+ e = (EditorKit) Class.forName(className, true, ldr).newInstance();
}
catch (Exception e2)
{