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

1 files changed, 35 insertions, 35 deletions

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java
index b1ef09d6e1b..a7ae8e17f2b 100644
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java
@@ -109,7 +109,7 @@ public class GtkComponentPeer extends GtkGenericPeer
   native void gtkWidgetGetLocationOnScreen (int[] point);
   native void gtkWidgetSetCursor (int type, GtkImage image, int x, int y);
   native void gtkWidgetSetCursorUnlocked (int type, GtkImage image,
-					  int x, int y);
+                                          int x, int y);
   native void gtkWidgetSetBackground (int red, int green, int blue);
   native void gtkWidgetSetForeground (int red, int green, int blue);
   native void gtkWidgetSetSensitive (boolean sensitive);
@@ -206,7 +206,7 @@ public class GtkComponentPeer extends GtkGenericPeer
   }
 
   public int checkImage (Image image, int width, int height, 
-			 ImageObserver observer) 
+                         ImageObserver observer) 
   {
     return getToolkit().checkImage(image, width, height, observer);
   }
@@ -402,7 +402,7 @@ public class GtkComponentPeer extends GtkGenericPeer
   }
 
   public boolean prepareImage (Image image, int width, int height,
-			       ImageObserver observer) 
+                               ImageObserver observer) 
   {
     return getToolkit().prepareImage(image, width, height, observer);
   }
@@ -539,17 +539,17 @@ public class GtkComponentPeer extends GtkGenericPeer
     int type = cursor.getType();
     if (cursor instanceof GtkCursor)
       {
-	GtkCursor gtkCursor = (GtkCursor) cursor;
-	image = gtkCursor.getGtkImage();
-	Point hotspot = gtkCursor.getHotspot();
-	x = hotspot.x;
-	y = hotspot.y;
+        GtkCursor gtkCursor = (GtkCursor) cursor;
+        image = gtkCursor.getGtkImage();
+        Point hotspot = gtkCursor.getHotspot();
+        x = hotspot.x;
+        y = hotspot.y;
       }
     else
       {
-	image = null;
-	x = 0;
-	y = 0;
+        image = null;
+        x = 0;
+        y = 0;
       }
 
     if (Thread.currentThread() == GtkMainThread.mainThread)
@@ -597,7 +597,7 @@ public class GtkComponentPeer extends GtkGenericPeer
     if (b && ! (awtComponent instanceof Window))
       {
         Rectangle bounds = awtComponent.getBounds();
-	b = (bounds.width > 0) && (bounds.height > 0);
+        b = (bounds.width > 0) && (bounds.height > 0);
       }
 
     if (Thread.currentThread() == GtkMainThread.mainThread)
@@ -617,23 +617,23 @@ public class GtkComponentPeer extends GtkGenericPeer
   }
 
   protected void postMouseEvent(int id, long when, int mods, int x, int y, 
-				int clickCount, boolean popupTrigger) 
+                                int clickCount, boolean popupTrigger) 
   {
     q().postEvent(new MouseEvent(awtComponent, id, when, mods, x, y, 
-			       clickCount, popupTrigger));
+                                 clickCount, popupTrigger));
   }
 
   /**
    * Callback for component_scroll_cb.
    */
   protected void postMouseWheelEvent(int id, long when, int mods,
-				     int x, int y, int clickCount,
-				     boolean popupTrigger,
-				     int type, int amount, int rotation) 
+                                     int x, int y, int clickCount,
+                                     boolean popupTrigger,
+                                     int type, int amount, int rotation) 
   {
     q().postEvent(new MouseWheelEvent(awtComponent, id, when, mods,
-				      x, y, clickCount, popupTrigger,
-				      type, amount, rotation));
+                                      x, y, clickCount, popupTrigger,
+                                      type, amount, rotation));
   }
 
   protected void postExposeEvent (int x, int y, int width, int height)
@@ -659,12 +659,12 @@ public class GtkComponentPeer extends GtkGenericPeer
             && keyCode != KeyEvent.VK_ALT))
       {
         synchronized(q)
-	  {
-	    q.postEvent(keyEvent);
-	    keyEvent = new KeyEvent(awtComponent, KeyEvent.KEY_TYPED, when,
-				    mods, KeyEvent.VK_UNDEFINED, keyChar,
-				    keyLocation);
-	    q.postEvent(keyEvent);
+          {
+            q.postEvent(keyEvent);
+            keyEvent = new KeyEvent(awtComponent, KeyEvent.KEY_TYPED, when,
+                                    mods, KeyEvent.VK_UNDEFINED, keyChar,
+                                    keyLocation);
+            q.postEvent(keyEvent);
           }
       }
     else
@@ -685,8 +685,8 @@ public class GtkComponentPeer extends GtkGenericPeer
   protected void postItemEvent (Object item, int stateChange)
   {
     q().postEvent (new ItemEvent ((ItemSelectable)awtComponent, 
-				ItemEvent.ITEM_STATE_CHANGED,
-				item, stateChange));
+                                  ItemEvent.ITEM_STATE_CHANGED,
+                                  item, stateChange));
   }
 
   protected void postTextEvent ()
@@ -828,8 +828,8 @@ public class GtkComponentPeer extends GtkGenericPeer
     // buffer and one front buffer.
     if (numBuffers == 2)
       backBuffer = new GtkVolatileImage(this, awtComponent.getWidth(),
-					awtComponent.getHeight(),
-					caps.getBackBufferCapabilities());
+                                        awtComponent.getHeight(),
+                                        caps.getBackBufferCapabilities());
     else
       throw new AWTException("GtkComponentPeer.createBuffers:"
 			     + " multi-buffering not supported");
@@ -846,18 +846,18 @@ public class GtkComponentPeer extends GtkGenericPeer
   public void flip (BufferCapabilities.FlipContents contents)
   {
     getGraphics().drawImage(backBuffer,
-			    awtComponent.getWidth(),
-			    awtComponent.getHeight(),
-			    null);
+                            awtComponent.getWidth(),
+                            awtComponent.getHeight(),
+                            null);
 
     // create new back buffer and clear it to the background color.
     if (contents == BufferCapabilities.FlipContents.BACKGROUND)
 	{
 	  backBuffer = createVolatileImage(awtComponent.getWidth(),
-					   awtComponent.getHeight());
+	                                   awtComponent.getHeight());
 	  backBuffer.getGraphics().clearRect(0, 0,
-					     awtComponent.getWidth(),
-					     awtComponent.getHeight());
+	                                     awtComponent.getWidth(),
+	                                     awtComponent.getHeight());
 	}
     // FIXME: support BufferCapabilities.FlipContents.PRIOR
   }