* java/beans/PropertyChangeSupport.java (fireIndexedPropertyChange):generics-merge-20051127

	New methods.
	* java/beans/IndexedPropertyChangeEvent.java: New file.

3 files changed, 140 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 997eeb34d..06ac6d68e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-27  Tom Tromey  <tromey@redhat.com>
+
+	* java/beans/PropertyChangeSupport.java (fireIndexedPropertyChange):
+	New methods.
+	* java/beans/IndexedPropertyChangeEvent.java: New file.
+
 2005-11-26  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/StackTraceElement.java (StackTraceElement): New
diff --git a/java/beans/IndexedPropertyChangeEvent.java b/java/beans/IndexedPropertyChangeEvent.java
new file mode 100644
index 000000000..1a7306d14
--- /dev/null
+++ b/java/beans/IndexedPropertyChangeEvent.java
@@ -0,0 +1,81 @@
+/* Indexed property change event
+   Copyright (C) 2005 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.beans;
+
+/**
+ * This is like a PropertyChangeEvent, but also carries with it the
+ * index of the property which changed.
+ * @author Tom Tromey (tromey@redhat.com)
+ * @since 1.5
+ */
+public class IndexedPropertyChangeEvent extends PropertyChangeEvent
+{
+  private static final long serialVersionUID = -320227448495806870L;
+
+  /**
+   * Index of the item that was changed.
+   */
+  private int index;
+
+  /**
+   * Create a new IndexedPropertyChangeEvent.
+   * @param source the Bean containing the property
+   * @param name the property's name
+   * @param oldValue the old value of the property
+   * @param newValue the new value of the property
+   * @param index the index of the element in the property which changed
+   * @throws IllegalArgumentException if source is null
+   */
+  public IndexedPropertyChangeEvent(Object source, String name,
+                                    Object oldValue, Object newValue,
+                                    int index)
+  {
+    super(source, name, oldValue, newValue);
+    this.index = index;
+  }
+
+  /**
+   * Return the index of the changed property. 
+   * @return the index
+   */
+  public int getIndex()
+  {
+    return index;
+  }
+}
diff --git a/java/beans/PropertyChangeSupport.java b/java/beans/PropertyChangeSupport.java
index a0e64af4d..da30f994d 100644
--- a/java/beans/PropertyChangeSupport.java
+++ b/java/beans/PropertyChangeSupport.java
@@ -397,6 +397,59 @@ public class PropertyChangeSupport implements Serializable
   }
 
   /**
+   * Fire an indexed property change event.  This will only fire
+   * an event if the old and new values are not equal and not null. 
+   * @param name the name of the property which changed
+   * @param index the index of the property which changed
+   * @param oldValue the old value of the property
+   * @param newValue the new value of the property
+   * @since 1.5
+   */
+  public void fireIndexedPropertyChange(String name, int index,
+                                        Object oldValue, Object newValue)
+  {
+    // FIXME: should we use equals() here?
+    if (oldValue == newValue && oldValue != null)
+      firePropertyChange(new IndexedPropertyChangeEvent(source, name,
+                                                        oldValue, newValue,
+                                                        index));
+  }
+
+  /**
+   * Fire an indexed property change event.  This will only fire
+   * an event if the old and new values are not equal.
+   * @param name the name of the property which changed
+   * @param index the index of the property which changed
+   * @param oldValue the old value of the property
+   * @param newValue the new value of the property
+   * @since 1.5
+   */
+  public void fireIndexedPropertyChange(String name, int index,
+                                        int oldValue, int newValue)
+  {
+    if (oldValue != newValue)
+      fireIndexedPropertyChange(name, index, Integer.valueOf(oldValue),
+                                Integer.valueOf(newValue));
+  }
+
+  /**
+   * Fire an indexed property change event.  This will only fire
+   * an event if the old and new values are not equal.
+   * @param name the name of the property which changed
+   * @param index the index of the property which changed
+   * @param oldValue the old value of the property
+   * @param newValue the new value of the property
+   * @since 1.5
+   */
+  public void fireIndexedPropertyChange(String name, int index,
+                                        boolean oldValue, boolean newValue)
+  {
+    if (oldValue != newValue)
+      fireIndexedPropertyChange(name, index, Boolean.valueOf(oldValue),
+                                Boolean.valueOf(newValue));
+  }
+
+  /**
    * Tell whether the specified property is being listened on or not. This
    * will only return <code>true</code> if there are listeners on all
    * properties or if there is a listener specifically on this property.