diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-03-04 09:50:24 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-03-04 09:50:24 +0000 |
| commit | 5e7631c5c120b00be0373d5550050d9ad1144df9 (patch) | |
| tree | 41a28495e18346fdb5ac45d8b3444b7a48b47b32 | |
| parent | c1e94ad315b2ea3464ab3037e1f7ae364e6a856b (diff) | |
| download | classpath-5e7631c5c120b00be0373d5550050d9ad1144df9.tar.gz | |
+ Fixes bug #26460 reported by Beat Wolf <asraniel@fryx.ch>.
+ * javax/swing/JEditorPane.java (setText): Check for empty String
+ with equals(), not equality (==).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | javax/swing/JEditorPane.java | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,11 @@ 2006-03-04 Mark Wielaard <mark@klomp.org> + Fixes bug #26460 reported by Beat Wolf <asraniel@fryx.ch>. + * javax/swing/JEditorPane.java (setText): Check for empty String + with equals(), not equality (==). + +2006-03-04 Mark Wielaard <mark@klomp.org> + * javax/swing/text/html/HTMLDocument.java: Qualify ElementSpec as DefaultStyledDocument.ElementSpec for gcj 4.0.x. diff --git a/javax/swing/JEditorPane.java b/javax/swing/JEditorPane.java index 9264c8dd8..73b775738 100644 --- a/javax/swing/JEditorPane.java +++ b/javax/swing/JEditorPane.java @@ -926,7 +926,7 @@ public class JEditorPane extends JTextComponent // Remove the current content. Document doc = getDocument(); doc.remove(0, doc.getLength()); - if (t == null || t == "") + if (t == null || t.equals("")) return; // Let the EditorKit read the text into the Document. |