changeset in /hg/icedtea: Remove component patch.
gnu_andrew at member.fsf.org
gnu_andrew at member.fsf.org
Sun Jun 22 12:35:02 PDT 2008
changeset 837aa402fd1c in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=837aa402fd1c
description:
Remove component patch.
diffstat:
2 files changed, 5 insertions(+), 159 deletions(-)
ChangeLog | 5 +
patches/icedtea-component.patch | 159 ---------------------------------------
diffs (175 lines):
diff -r 0c781f5b6de5 -r 837aa402fd1c ChangeLog
--- a/ChangeLog Sun Jun 22 20:30:20 2008 +0100
+++ b/ChangeLog Sun Jun 22 20:31:08 2008 +0100
@@ -1,3 +1,8 @@ 2008-06-22 Andrew John Hughes <gnu_and
+2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * patches/icedtea-component.patch:
+ Removed.
+
2008-06-22 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r 0c781f5b6de5 -r 837aa402fd1c patches/icedtea-component.patch
--- a/patches/icedtea-component.patch Sun Jun 22 20:30:20 2008 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +0,0 @@
---- openjdk.old/jdk/src/share/classes/java/awt/Component.java Fri Mar 14 20:40:09 2008 +0300
-+++ openjdk/jdk/src/share/classes/java/awt/Component.java Tue Mar 18 12:04:20 2008 +0300
-@@ -634,6 +634,11 @@ public abstract class Component implemen
- */
- private PropertyChangeSupport changeSupport;
-
-+ private transient final Object changeSupportLock = new Object();
-+ private Object getChangeSupportLock() {
-+ return changeSupportLock;
-+ }
-+
- boolean isPacked = false;
-
- /**
-@@ -7839,15 +7844,17 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners
- * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
- */
-- public synchronized void addPropertyChangeListener(
-+ public void addPropertyChangeListener(
- PropertyChangeListener listener) {
-- if (listener == null) {
-- return;
-- }
-- if (changeSupport == null) {
-- changeSupport = new PropertyChangeSupport(this);
-- }
-- changeSupport.addPropertyChangeListener(listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null) {
-+ return;
-+ }
-+ if (changeSupport == null) {
-+ changeSupport = new PropertyChangeSupport(this);
-+ }
-+ changeSupport.addPropertyChangeListener(listener);
-+ }
- }
-
- /**
-@@ -7863,12 +7870,14 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners
- * @see #removePropertyChangeListener(java.lang.String,java.beans.PropertyChangeListener)
- */
-- public synchronized void removePropertyChangeListener(
-+ public void removePropertyChangeListener(
- PropertyChangeListener listener) {
-- if (listener == null || changeSupport == null) {
-- return;
-- }
-- changeSupport.removePropertyChangeListener(listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null || changeSupport == null) {
-+ return;
-+ }
-+ changeSupport.removePropertyChangeListener(listener);
-+ }
- }
-
- /**
-@@ -7885,11 +7894,13 @@ public abstract class Component implemen
- * @see java.beans.PropertyChangeSupport#getPropertyChangeListeners
- * @since 1.4
- */
-- public synchronized PropertyChangeListener[] getPropertyChangeListeners() {
-- if (changeSupport == null) {
-- return new PropertyChangeListener[0];
-- }
-- return changeSupport.getPropertyChangeListeners();
-+ public PropertyChangeListener[] getPropertyChangeListeners() {
-+ synchronized (getChangeSupportLock()) {
-+ if (changeSupport == null) {
-+ return new PropertyChangeListener[0];
-+ }
-+ return changeSupport.getPropertyChangeListeners();
-+ }
- }
-
- /**
-@@ -7923,16 +7934,18 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners(java.lang.String)
- * @see #addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener)
- */
-- public synchronized void addPropertyChangeListener(
-+ public void addPropertyChangeListener(
- String propertyName,
- PropertyChangeListener listener) {
-- if (listener == null) {
-- return;
-- }
-- if (changeSupport == null) {
-- changeSupport = new PropertyChangeSupport(this);
-- }
-- changeSupport.addPropertyChangeListener(propertyName, listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null) {
-+ return;
-+ }
-+ if (changeSupport == null) {
-+ changeSupport = new PropertyChangeSupport(this);
-+ }
-+ changeSupport.addPropertyChangeListener(propertyName, listener);
-+ }
- }
-
- /**
-@@ -7951,13 +7964,15 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners(java.lang.String)
- * @see #removePropertyChangeListener(java.beans.PropertyChangeListener)
- */
-- public synchronized void removePropertyChangeListener(
-+ public void removePropertyChangeListener(
- String propertyName,
- PropertyChangeListener listener) {
-- if (listener == null || changeSupport == null) {
-- return;
-- }
-- changeSupport.removePropertyChangeListener(propertyName, listener);
-+ synchronized (getChangeSupportLock()) {
-+ if (listener == null || changeSupport == null) {
-+ return;
-+ }
-+ changeSupport.removePropertyChangeListener(propertyName, listener);
-+ }
- }
-
- /**
-@@ -7974,12 +7989,14 @@ public abstract class Component implemen
- * @see #getPropertyChangeListeners
- * @since 1.4
- */
-- public synchronized PropertyChangeListener[] getPropertyChangeListeners(
-+ public PropertyChangeListener[] getPropertyChangeListeners(
- String propertyName) {
-- if (changeSupport == null) {
-- return new PropertyChangeListener[0];
-- }
-- return changeSupport.getPropertyChangeListeners(propertyName);
-+ synchronized (getChangeSupportLock()) {
-+ if (changeSupport == null) {
-+ return new PropertyChangeListener[0];
-+ }
-+ return changeSupport.getPropertyChangeListeners(propertyName);
-+ }
- }
-
- /**
-@@ -7994,7 +8011,10 @@ public abstract class Component implemen
- */
- protected void firePropertyChange(String propertyName,
- Object oldValue, Object newValue) {
-- PropertyChangeSupport changeSupport = this.changeSupport;
-+ PropertyChangeSupport changeSupport;
-+ synchronized (getChangeSupportLock()) {
-+ changeSupport = this.changeSupport;
-+ }
- if (changeSupport == null ||
- (oldValue != null && newValue != null && oldValue.equals(newValue))) {
- return;
More information about the distro-pkg-dev
mailing list