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, 100 insertions, 102 deletions

diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java
index f520fe224b1..e41754641bb 100644
--- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java
+++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkClipboard.java
@@ -71,9 +71,9 @@ public class GtkClipboard extends Clipboard
   // cached by GtkSelection. True if
   // gdk_display_supports_selection_notification.
   static final boolean canCache = initNativeState(clipboard, selection,
-						  stringMimeType,
-						  imageMimeType,
-						  filesMimeType);
+                                                  stringMimeType,
+                                                  imageMimeType,
+                                                  filesMimeType);
 
   /**
    * Creates the clipboard and sets the initial contents to the
@@ -140,8 +140,8 @@ public class GtkClipboard extends Clipboard
 
     if (contents == null)
       {
-	advertiseContent(null, false, false, false);
-	return;
+        advertiseContent(null, false, false, false);
+        return;
       }
 
     // We don't need to do anything for a GtkSelection facade.
@@ -153,46 +153,45 @@ public class GtkClipboard extends Clipboard
     boolean files = false;
 
     if (contents instanceof StringSelection
-	|| contents.isDataFlavorSupported(DataFlavor.stringFlavor)
-	|| contents.isDataFlavorSupported(DataFlavor.plainTextFlavor)
-	|| contents.isDataFlavorSupported(DataFlavor
-					  .getTextPlainUnicodeFlavor()))
+        || contents.isDataFlavorSupported(DataFlavor.stringFlavor)
+        || contents.isDataFlavorSupported(DataFlavor.plainTextFlavor)
+        || contents.isDataFlavorSupported(DataFlavor.getTextPlainUnicodeFlavor()))
       text = true;
 
     DataFlavor[] flavors = contents.getTransferDataFlavors();
     String[] mimeTargets = new String[flavors.length];
     for (int i = 0; i < flavors.length; i++)
       {
-	DataFlavor flavor = flavors[i];
-	String mimeType = flavor.getMimeType();
-	mimeTargets[i] = mimeType;
-
-	if (! text)
-	  if ("text".equals(flavor.getPrimaryType())
-	      || flavor.isRepresentationClassReader())
-	    text = true;
-
-	if (! images && flavors[i].equals(DataFlavor.imageFlavor))
-	  {
-	    try
-	      {
-		Object o = contents.getTransferData(DataFlavor.imageFlavor);
-		if (o instanceof Image)
-		  images = true;
-	      }
-	    catch (UnsupportedFlavorException ufe)
-	      {
-	      }
-	    catch (IOException ioe)
-	      {
-	      }
-	    catch (ClassCastException cce)
-	      {
-	      }
-	  }
-
-	if (flavors[i].equals(DataFlavor.javaFileListFlavor))
-	  files = true;
+        DataFlavor flavor = flavors[i];
+        String mimeType = flavor.getMimeType();
+        mimeTargets[i] = mimeType;
+
+        if (! text)
+          if ("text".equals(flavor.getPrimaryType())
+              || flavor.isRepresentationClassReader())
+            text = true;
+
+        if (! images && flavors[i].equals(DataFlavor.imageFlavor))
+          {
+            try
+              {
+                Object o = contents.getTransferData(DataFlavor.imageFlavor);
+                if (o instanceof Image)
+                  images = true;
+              }
+            catch (UnsupportedFlavorException ufe)
+              {
+              }
+            catch (IOException ioe)
+              {
+              }
+            catch (ClassCastException cce)
+              {
+              }
+          }
+
+        if (flavors[i].equals(DataFlavor.javaFileListFlavor))
+          files = true;
       }
 
     advertiseContent(mimeTargets, text, images, files);
@@ -207,9 +206,9 @@ public class GtkClipboard extends Clipboard
    * selection has explicitly been erased.
    */
   private native void advertiseContent(String[] targets,
-				       boolean text,
-				       boolean images,
-				       boolean files);
+                                       boolean text,
+                                       boolean images,
+                                       boolean files);
   
   /**
    * Called by the gtk+ clipboard when an application has requested
@@ -228,7 +227,7 @@ public class GtkClipboard extends Clipboard
         try
           {
             return (String) contents.getTransferData(DataFlavor.stringFlavor);
-	  }
+          }
         catch (UnsupportedFlavorException ufe)
           {
           }
@@ -244,20 +243,20 @@ public class GtkClipboard extends Clipboard
     // turn the result into a string.
     try
       {
-	DataFlavor plainText = DataFlavor.getTextPlainUnicodeFlavor();
-	Reader r = plainText.getReaderForText(contents);
-	if (r != null)
-	  {
-	    StringBuffer sb = new StringBuffer();
-	    char[] cs = new char[1024];
-	    int l = r.read(cs);
-	    while (l != -1)
-	      {
-		sb.append(cs, 0, l);
-		l = r.read(cs);
-	      }
-	    return sb.toString();
-	  }
+        DataFlavor plainText = DataFlavor.getTextPlainUnicodeFlavor();
+        Reader r = plainText.getReaderForText(contents);
+        if (r != null)
+          {
+            StringBuffer sb = new StringBuffer();
+            char[] cs = new char[1024];
+            int l = r.read(cs);
+            while (l != -1)
+              {
+                sb.append(cs, 0, l);
+                l = r.read(cs);
+              }
+            return sb.toString();
+          }
       }
     catch (IllegalArgumentException iae)
       {
@@ -288,11 +287,11 @@ public class GtkClipboard extends Clipboard
 
     try
       {
-	Object o = contents.getTransferData(DataFlavor.imageFlavor);
-	if( o instanceof GtkImage )
-	  return (GtkImage) o;
-	else
-	  return new GtkImage(((Image)o).getSource());
+        Object o = contents.getTransferData(DataFlavor.imageFlavor);
+        if( o instanceof GtkImage )
+          return (GtkImage) o;
+        else
+          return new GtkImage(((Image)o).getSource());
       }
     catch (UnsupportedFlavorException ufe)
       {
@@ -321,14 +320,13 @@ public class GtkClipboard extends Clipboard
 
     try
       {
-	List list = (List) contents.getTransferData
-	  (DataFlavor.javaFileListFlavor);
-	String[] uris = new String[list.size()];
-	int u = 0;
-	Iterator it = list.iterator();
-	while (it.hasNext())
-	  uris[u++] = ((File) it.next()).toURI().toString();
-	return uris;
+        List list = (List) contents.getTransferData(DataFlavor.javaFileListFlavor);
+        String[] uris = new String[list.size()];
+        int u = 0;
+        Iterator it = list.iterator();
+        while (it.hasNext())
+          uris[u++] = ((File) it.next()).toURI().toString();
+        return uris;
       }
     catch (UnsupportedFlavorException ufe)
       {
@@ -365,34 +363,34 @@ public class GtkClipboard extends Clipboard
     // the other provideXXX() methods.
     try
       {
-	DataFlavor flavor = new DataFlavor(target);
-	Object o = contents.getTransferData(flavor);
-
-	if (o instanceof byte[])
-	  return (byte[]) o;
-
-	if (o instanceof InputStream)
-	  {
-	    InputStream is = (InputStream) o;
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    byte[] bs = new byte[1024];
-	    int l = is.read(bs);
-	    while (l != -1)
-	      {
-		baos.write(bs, 0, l);
-		l = is.read(bs);
-	      }
-	    return baos.toByteArray();
-	  }
-
-	if (o instanceof Serializable)
-	  {
-	    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	    ObjectOutputStream oos = new ObjectOutputStream(baos);
-	    oos.writeObject(o);
-	    oos.close();
-	    return baos.toByteArray();
-	  }
+        DataFlavor flavor = new DataFlavor(target);
+        Object o = contents.getTransferData(flavor);
+
+        if (o instanceof byte[])
+          return (byte[]) o;
+
+        if (o instanceof InputStream)
+          {
+            InputStream is = (InputStream) o;
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] bs = new byte[1024];
+            int l = is.read(bs);
+            while (l != -1)
+              {
+                baos.write(bs, 0, l);
+                l = is.read(bs);
+              }
+            return baos.toByteArray();
+          }
+
+        if (o instanceof Serializable)
+          {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(baos);
+            oos.writeObject(o);
+            oos.close();
+            return baos.toByteArray();
+          }
       }
     catch (ClassNotFoundException cnfe)
       {
@@ -416,8 +414,8 @@ public class GtkClipboard extends Clipboard
    * Clipboard can be cached (gdk_display_supports_selection_notification).
    */
   private static native boolean initNativeState(GtkClipboard clipboard,
-						GtkClipboard selection,
-						String stringTarget,
-						String imageTarget,
-						String filesTarget);
+                                                GtkClipboard selection,
+                                                String stringTarget,
+                                                String imageTarget,
+                                                String filesTarget);
 }