* java/security/BasicPermission.java: Remove gcj workaround.

	* java/security/cert/X509Certificate.java: Remove gcj workaround.
	* java/net/ServerSocket.java (ServerSocket): Remove gcj
	workaround.
	(getImpl): Likewise.
	* java/util/TreeMap.java (TreeIterator): Remove gcj workaround.
	* java/text/AttributedStringIterator.java (getRunLimit): Remove
	qualifications.
	(getRunStart): Likewise.
	* java/awt/AWTKeyStroke.java (removeEldestEntry): Remove gcj
	workaround.
	* java/awt/AlphaComposite.java (removeEldestEntry): Remove gcj
	workaround.
	* java/awt/geom/GeneralPath.java (WIND_EVEN_ODD, WIND_NON_ZERO,
	BIG_VALUE): Don't fully qualify.
	* gnu/javax/sound/midi/alsa/AlsaMidiSequencerDevice.java: Removed
	imports.
	* gnu/javax/sound/midi/alsa/AlsaPortDevice.java: Removed import.
	* gnu/javax/sound/midi/dssi/DSSISynthesizer.java: Removed import.
	* javax/swing/JComponent.java (firePropertyChange): Removed.
	* javax/swing/text/InternationalFormatter.java (clone):
	Uncomment.
	* javax/swing/text/AbstractDocument.java (addEdit): Remove gcj
	workaround.
	(getChange): Likewise.

3 files changed, 12 insertions, 34 deletions

diff --git a/javax/swing/JComponent.java b/javax/swing/JComponent.java
index 5ec507922..3120c1bac 100644
--- a/javax/swing/JComponent.java
+++ b/javax/swing/JComponent.java
@@ -1022,21 +1022,6 @@ public abstract class JComponent extends Container implements Serializable
   }
 
   /**
-   * Fires a property change for a primitive character property.
-   *
-   * @param property the name of the property
-   * @param oldValue the old value of the property
-   * @param newValue the new value of the property
-   */
-  public void firePropertyChange(String property, char oldValue,
-                                 char newValue)
-  {
-    //  FIXME - This method is already public in awt Component, but
-    //  is included here to work around a compilation bug in gcj 4.1.
-    super.firePropertyChange(property, oldValue, newValue);
-  }
-
-  /**
    * Get the value of the accessibleContext property for this component.
    *
    * @return the current value of the property
diff --git a/javax/swing/text/AbstractDocument.java b/javax/swing/text/AbstractDocument.java
index eead8de52..966316995 100644
--- a/javax/swing/text/AbstractDocument.java
+++ b/javax/swing/text/AbstractDocument.java
@@ -1,5 +1,5 @@
 /* AbstractDocument.java --
-   Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -2450,8 +2450,6 @@ public abstract class AbstractDocument implements Document, Serializable
      */
     public boolean addEdit(UndoableEdit edit)
     {
-      // XXX - Fully qualify ElementChange to work around gcj bug #2499.
-
       // Start using Hashtable when we pass a certain threshold. This
       // gives a good memory/performance compromise.
       if (changes == null && edits.size() > THRESHOLD)
@@ -2461,19 +2459,17 @@ public abstract class AbstractDocument implements Document, Serializable
           for (int i = 0; i < count; i++)
             {
               Object o = edits.elementAt(i);
-              if (o instanceof DocumentEvent.ElementChange)
+              if (o instanceof ElementChange)
                 {
-                  DocumentEvent.ElementChange ec =
-                    (DocumentEvent.ElementChange) o;
+                  ElementChange ec = (ElementChange) o;
                   changes.put(ec.getElement(), ec);
                 }
             }
         }
 
-      if (changes != null && edit instanceof DocumentEvent.ElementChange)
+      if (changes != null && edit instanceof ElementChange)
         {
-          DocumentEvent.ElementChange elEdit =
-            (DocumentEvent.ElementChange) edit;
+          ElementChange elEdit = (ElementChange) edit;
           changes.put(elEdit.getElement(), elEdit);
         }
       return super.addEdit(edit);
@@ -2527,13 +2523,12 @@ public abstract class AbstractDocument implements Document, Serializable
      * @return the changes for <code>elem</code> or <code>null</code> if
      *         <code>elem</code> has not been changed
      */
-    public DocumentEvent.ElementChange getChange(Element elem)
+    public ElementChange getChange(Element elem)
     {
-      // XXX - Fully qualify ElementChange to work around gcj bug #2499.
-      DocumentEvent.ElementChange change = null;
+      ElementChange change = null;
       if (changes != null)
         {
-          change = (DocumentEvent.ElementChange) changes.get(elem);
+          change = (ElementChange) changes.get(elem);
         }
       else
         {
@@ -2541,10 +2536,9 @@ public abstract class AbstractDocument implements Document, Serializable
           for (int i = 0; i < count && change == null; i++)
             {
               Object o = edits.get(i);
-              if (o instanceof DocumentEvent.ElementChange)
+              if (o instanceof ElementChange)
                 {
-                  DocumentEvent.ElementChange ec =
-                    (DocumentEvent.ElementChange) o;
+                  ElementChange ec = (ElementChange) o;
                   if (elem.equals(ec.getElement()))
                     change = ec;
                 }
diff --git a/javax/swing/text/InternationalFormatter.java b/javax/swing/text/InternationalFormatter.java
index d6f2359e6..1de5ca271 100644
--- a/javax/swing/text/InternationalFormatter.java
+++ b/javax/swing/text/InternationalFormatter.java
@@ -1,5 +1,5 @@
 /* InternationalFormatter.java --
-Copyright (C) 2005  Free Software Foundation, Inc.
+Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -329,7 +329,7 @@ public class InternationalFormatter
    *
    * @throws CloneNotSupportedException not thrown here, since cloning is
    *     supported
-   * XXX - FIXME - Whole method disabled as workaround for gcj bug #22060.
+   */
   public Object clone()
     throws CloneNotSupportedException
   {
@@ -338,7 +338,6 @@ public class InternationalFormatter
     Object clone = super.clone();
     return clone;
   }
-   */
 
   /**
    * Returns the Actions that are supported by this Formatter.