libjava/

2007-08-04  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20070727).

	* Regenerate class and header files.
	* Regenerate auto* files.

	* include/jvm.h:
	* jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type.
	* jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise.
	* jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA,
	_Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA,
	_Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA,
	_Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify
	jvalue parameter.
	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise.

	* java/lang/VMFloat.java (toString, parseFloat): New.

	* gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported,
	isModalExclusionTypeSupported): New (stub only).
	* gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise.
	* gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages,
	updateFocusableWindowState, setModalBlocked, getBoundsPrivate,
	setAlwaysOnTop): Likewise.
	* gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature.

	* scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer,
	ignore javax.sound.sampled.spi.MixerProvider, ignore .in files.

	* HACKING: Mention --enable-gstreamer-peer, removal of generated files.


libjava/classpath/

2007-08-04  Matthias Klose  <doko@ubuntu.com>

	* java/util/EnumMap.java (clone): Add cast.


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

3 files changed, 61 insertions, 38 deletions

diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java
index 6296784426c..7b6ebc4b03b 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java
@@ -330,16 +330,35 @@ public class AudioFormat
   public String toString()
   {
     StringBuffer result = new StringBuffer();
+    
+    // usually at least encoding should be somewhat specified
     result.append(encoding);
-    result.append(" ");
-    result.append(sampleRate);
-    result.append(" Hz ");
-    result.append(sampleSizeInBits);
-    result.append(" bits ");
-    result.append(channels);
-    result.append(" channels");
+    
+    if (sampleRate != AudioSystem.NOT_SPECIFIED)
+      {
+        result.append(" ");
+        result.append(sampleRate);
+        result.append(" Hz");
+      }
+    
+    if (sampleSizeInBits != AudioSystem.NOT_SPECIFIED)
+      {
+        result.append(" ");
+        result.append(sampleSizeInBits);
+        result.append(" bits");
+      }
+    
+    if (channels != AudioSystem.NOT_SPECIFIED)
+      {
+        result.append(" ");
+        result.append(channels);
+        result.append(" channel");
+        if (channels > 1) result.append("s");
+      }
+    
     if (sampleSizeInBits > 8)
       result.append(bigEndian ? " big endian" : " little endian");
+    
     return result.toString();
   }
 }
diff --git a/libjava/classpath/javax/sound/sampled/DataLine.java b/libjava/classpath/javax/sound/sampled/DataLine.java
index aa99a046ce4..b7cb70e4931 100644
--- a/libjava/classpath/javax/sound/sampled/DataLine.java
+++ b/libjava/classpath/javax/sound/sampled/DataLine.java
@@ -1,5 +1,5 @@
 /* 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,7 +35,6 @@ 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 javax.sound.sampled;
 
 /**
@@ -138,10 +137,10 @@ public interface DataLine extends Line
     public boolean isFormatSupported(AudioFormat fmt)
     {
       for (int i = 0; i < formats.length; ++i)
-	{
-	  if (fmt.matches(formats[i]))
-	    return true;
-	}
+        {
+          if (fmt.matches(formats[i]))
+            return true;
+        }
       return false;
     }
 
@@ -151,25 +150,28 @@ public interface DataLine extends Line
     public boolean matches(Line.Info o)
     {
       if (! super.matches(o) || ! (o instanceof Info))
-	return false;
+        return false;
+
       Info other = (Info) o;
-      if (minBufferSize < other.minBufferSize
-	  || maxBufferSize > other.maxBufferSize)
-	return false;
+      if (minBufferSize < other.minBufferSize ||
+          maxBufferSize > other.maxBufferSize)
+        return false;
+      
       for (int i = 0; i < formats.length; ++i)
-	{
-	  boolean ok = false;
-	  for (int j = 0; j < other.formats.length; ++j)
-	    {
-	      if (formats[i].matches(other.formats[j]))
-		{
-		  ok = true;
-		  break;
-		}
-	    }
-	  if (! ok)
-	    return false;
-	}
+        {
+          boolean ok = false;
+          for (int j = 0; j < other.formats.length; ++j)
+            {
+              if (formats[i].matches(other.formats[j]))
+                {
+                  ok = true;
+                  break;
+                }
+            }
+          if (! ok)
+            return false;
+        }
+      
       return true;
     }
 
@@ -181,18 +183,20 @@ public interface DataLine extends Line
       StringBuffer result = new StringBuffer();
       result.append("formats: [");
       for (int i = 0; i < formats.length; ++i)
-	{
-	  if (i > 0)
-	    result.append(", ");
-	  result.append(formats[i].toString());
-	}
+        {
+          if (i > 0)
+            result.append(", ");
+          result.append(formats[i].toString());
+        }
+      
       result.append("]; minBufferSize: ");
       result.append(minBufferSize);
       result.append("; maxBufferSize: ");
       result.append(maxBufferSize);
       return result.toString();
     }
-  }
+    
+  } // end class: Info
 
   /**
    * Return the number of bytes currently available on this DataLine.
diff --git a/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java b/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java
index 1ae7b3bb7d8..72b972497e1 100644
--- a/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java
+++ b/libjava/classpath/javax/sound/sampled/spi/MixerProvider.java
@@ -78,8 +78,8 @@ public abstract class MixerProvider
     Mixer.Info[] infos = getMixerInfo();
     for (int i = 0; i < infos.length; ++i)
       {
-	if (info.equals(infos[i]))
-	  return true;
+        if (info.equals(infos[i]))
+          return true;
       }
     return false;
   }