summaryrefslogtreecommitdiff
path: root/javax/swing/JComponent.java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-11-29 22:43:35 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-11-29 22:43:35 +0000
commit3be294e0e9f07e379e1499b9868db9855eb8726f (patch)
treea1f67d3f1469ecc142b11c30b1e3c2e1a624794d /javax/swing/JComponent.java
parentf40b961c6c82ebc9ae9863635e5fe19c0b07c116 (diff)
downloadclasspath-3be294e0e9f07e379e1499b9868db9855eb8726f.tar.gz
2006-11-29 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics for 2006/11/12-2006/11/29.
Diffstat (limited to 'javax/swing/JComponent.java')
-rw-r--r--javax/swing/JComponent.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 3b8f1f68c..5ec507922 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -847,7 +847,12 @@ public abstract class JComponent extends Container implements Serializable
t.put(key, value);
else
t.remove(key);
- firePropertyChange(key.toString(), old, value);
+
+ // When both old and new value are null, no event is fired. This is
+ // different from what firePropertyChange() normally does, so we add this
+ // check here.
+ if (old != null || value != null)
+ firePropertyChange(key.toString(), old, value);
}
/**