diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-04 18:55:49 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-04 18:55:49 +0000 |
| commit | 237bdd93058f891ae4567cf4e051c5831bd4646b (patch) | |
| tree | 61bf13ecf1942efef4ef00642e2ff0f4318a9fb7 /javax/swing/JEditorPane.java | |
| parent | e36d2a50b5a1a677c7ecaf926e73a5dac386c1ef (diff) | |
| download | classpath-237bdd93058f891ae4567cf4e051c5831bd4646b.tar.gz | |
2006-11-04 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics-branch for 2006/10/29 to 2006/11/04.
Diffstat (limited to 'javax/swing/JEditorPane.java')
| -rw-r--r-- | javax/swing/JEditorPane.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java index 06844355a..a503bb6e8 100644 --- a/javax/swing/JEditorPane.java +++ b/javax/swing/JEditorPane.java @@ -869,6 +869,13 @@ public class JEditorPane extends JTextComponent public final void setContentType(String type) { + // Strip off content type parameters. + int paramIndex = type.indexOf(';'); + if (paramIndex > -1) + { + // TODO: Handle character encoding. + type = type.substring(0, paramIndex).trim(); + } if (editorKit != null && editorKit.getContentType().equals(type)) return; |