libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4

7 files changed, 22 insertions, 26 deletions

diff --git a/libjava/classpath/javax/swing/text/AbstractDocument.java b/libjava/classpath/javax/swing/text/AbstractDocument.java
index eead8de5261..72178f840f3 100644
--- a/libjava/classpath/javax/swing/text/AbstractDocument.java
+++ b/libjava/classpath/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.
 
@@ -2093,7 +2093,7 @@ public abstract class AbstractDocument implements Document, Serializable
     /**
      * The child elements of this BranchElement.
      */
-    private Element[] children;;
+    private Element[] children;
 
     /**
      * The number of children in the branch element.
@@ -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/libjava/classpath/javax/swing/text/AsyncBoxView.java b/libjava/classpath/javax/swing/text/AsyncBoxView.java
index 90447f86e6a..327c2b895d9 100644
--- a/libjava/classpath/javax/swing/text/AsyncBoxView.java
+++ b/libjava/classpath/javax/swing/text/AsyncBoxView.java
@@ -307,7 +307,7 @@ public class AsyncBoxView
     private int updateChildOffsets(float targetOffset)
     {
       int n = getViewCount();
-      int targetIndex = n - 1;;
+      int targetIndex = n - 1;
       int pos = lastValidOffset.getChildView().getStartOffset();
       int startIndex = getViewIndexAtPosition(pos, Position.Bias.Forward);
       float start = lastValidOffset.getMajorOffset();
diff --git a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
index 3156ca67f66..4ed8aa2d264 100644
--- a/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
+++ b/libjava/classpath/javax/swing/text/DefaultStyledDocument.java
@@ -1126,7 +1126,9 @@ public class DefaultStyledDocument extends AbstractDocument implements
           int p;
           for (p = 0;
                p < data.length && data[p].getType() == ElementSpec.EndTagType;
-               p++);
+               p++)
+            ;
+          
           Edit edit = insertPath[insertPath.length - p - 1];
           edit.index--;
           edit.removed.add(0, edit.e.getElement(edit.index));
diff --git a/libjava/classpath/javax/swing/text/FieldView.java b/libjava/classpath/javax/swing/text/FieldView.java
index 0a078e53dca..e357a1e056b 100644
--- a/libjava/classpath/javax/swing/text/FieldView.java
+++ b/libjava/classpath/javax/swing/text/FieldView.java
@@ -91,7 +91,7 @@ public class FieldView extends PlainView
         horizontalVisibility.addChangeListener(new ChangeListener(){
           public void stateChanged(ChangeEvent event) {
             getContainer().repaint();
-          };
+          }
         });
 
         // It turned out that the span calculated at this point is wrong
diff --git a/libjava/classpath/javax/swing/text/InternationalFormatter.java b/libjava/classpath/javax/swing/text/InternationalFormatter.java
index d6f2359e6f7..1de5ca27126 100644
--- a/libjava/classpath/javax/swing/text/InternationalFormatter.java
+++ b/libjava/classpath/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.
diff --git a/libjava/classpath/javax/swing/text/JTextComponent.java b/libjava/classpath/javax/swing/text/JTextComponent.java
index 68ba1f4284c..8e70fe2bb2b 100644
--- a/libjava/classpath/javax/swing/text/JTextComponent.java
+++ b/libjava/classpath/javax/swing/text/JTextComponent.java
@@ -1821,7 +1821,7 @@ public abstract class JTextComponent extends JComponent
 
   public boolean getScrollableTracksViewportWidth()
   {
-    boolean res = false;;
+    boolean res = false;
     Container c = getParent();
     if (c instanceof JViewport)
       res = ((JViewport) c).getExtentSize().width > getPreferredSize().width;
diff --git a/libjava/classpath/javax/swing/text/html/CSSParser.java b/libjava/classpath/javax/swing/text/html/CSSParser.java
index 0bf76eb809f..54a16bcc599 100644
--- a/libjava/classpath/javax/swing/text/html/CSSParser.java
+++ b/libjava/classpath/javax/swing/text/html/CSSParser.java
@@ -315,7 +315,8 @@ class CSSParser
     try
     {
       if (!parsingDeclaration)
-        while(getNextStatement());
+        while(getNextStatement())
+          ;
       else
         parseDeclarationBlock();
     }
@@ -565,4 +566,4 @@ class CSSParser
   }
 }
 
- 
\ No newline at end of file
+