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

4 files changed, 28 insertions, 27 deletions

diff --git a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
index 37c2df4652c..899258c050b 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
@@ -122,7 +122,7 @@ public class AudioFileFormat
   private AudioFormat format;
   private Type type;
   private int frameLength;
-  private Map properties;
+  private Map<String, Object> properties;
 
   /**
    * Create a new AudioFileFormat given the type, the format, and the
@@ -138,7 +138,7 @@ public class AudioFileFormat
     this.format = fmt;
     this.type = type;
     this.frameLength = frameLen;
-    this.properties = Collections.EMPTY_MAP;
+    this.properties = Collections.<String, Object> emptyMap();
   }
 
   /**
@@ -159,7 +159,7 @@ public class AudioFileFormat
     this.format = fmt;
     this.type = type;
     this.frameLength = frameLen;
-    this.properties = Collections.unmodifiableMap(new HashMap(properties));
+    this.properties = Collections.unmodifiableMap(new HashMap<String, Object>(properties));
   }
 
   /**
@@ -177,7 +177,7 @@ public class AudioFileFormat
     this.format = fmt;
     this.type = type;
     this.frameLength = frameLen;
-    this.properties = Collections.EMPTY_MAP;
+    this.properties = Collections.<String, Object> emptyMap();
   }
 
   /**
diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java
index a474ff9a5c4..6296784426c 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java
@@ -133,7 +133,7 @@ public class AudioFormat
    */
   protected int sampleSizeInBits;
 
-  private Map properties;
+  private Map<String, Object> properties;
 
   /**
    * Create a new audio format, given various attributes of it.
@@ -158,7 +158,7 @@ public class AudioFormat
     this.frameSize = frameSize;
     this.frameRate = frameRate;
     this.bigEndian = bigEndian;
-    this.properties = Collections.EMPTY_MAP;
+    this.properties = Collections.<String, Object> emptyMap();
   }
 
   /**
@@ -186,7 +186,7 @@ public class AudioFormat
     this.frameSize = frameSize;
     this.frameRate = frameRate;
     this.bigEndian = bigEndian;
-    this.properties = Collections.unmodifiableMap(new HashMap(properties));
+    this.properties = Collections.unmodifiableMap(new HashMap<String, Object>(properties));
   }
 
   /**
@@ -218,7 +218,7 @@ public class AudioFormat
       this.frameSize = (sampleSizeInBits + 7) / 8 * channels;
     this.frameRate = sampleRate;
     this.bigEndian = bigEndian;
-    this.properties = Collections.EMPTY_MAP;
+    this.properties = Collections.<String, Object> emptyMap();
   }
 
   /**
diff --git a/libjava/classpath/javax/sound/sampled/AudioSystem.java b/libjava/classpath/javax/sound/sampled/AudioSystem.java
index 2f64f92c5c1..e858f176d6b 100644
--- a/libjava/classpath/javax/sound/sampled/AudioSystem.java
+++ b/libjava/classpath/javax/sound/sampled/AudioSystem.java
@@ -160,7 +160,8 @@ public class AudioSystem
    */
   public static AudioFileFormat.Type[] getAudioFileTypes()
   {
-    HashSet result = new HashSet();
+    HashSet<AudioFileFormat.Type> result
+      = new HashSet<AudioFileFormat.Type>();
     Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
     while (i.hasNext())
       {
@@ -169,7 +170,7 @@ public class AudioSystem
         for (int j = 0; j < types.length; ++j)
           result.add(types[j]);
       }
-    return (AudioFileFormat.Type[]) result.toArray(new AudioFileFormat.Type[result.size()]);
+    return result.toArray(new AudioFileFormat.Type[result.size()]);
   }
 
   /**
@@ -180,7 +181,8 @@ public class AudioSystem
    */
   public static AudioFileFormat.Type[] getAudioFileTypes(AudioInputStream ais)
   {
-    HashSet result = new HashSet();
+    HashSet<AudioFileFormat.Type> result
+      = new HashSet<AudioFileFormat.Type>();
     Iterator i = ServiceFactory.lookupProviders(AudioFileWriter.class);
     while (i.hasNext())
       {
@@ -189,7 +191,7 @@ public class AudioSystem
         for (int j = 0; j < types.length; ++j)
           result.add(types[j]);
       }
-    return (AudioFileFormat.Type[]) result.toArray(new AudioFileFormat.Type[result.size()]);
+    return result.toArray(new AudioFileFormat.Type[result.size()]);
   }
 
   /**
@@ -204,7 +206,6 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(AudioFormat.Encoding targ,
 						     AudioInputStream ais)
   {
-    HashSet result = new HashSet();
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -228,7 +229,6 @@ public class AudioSystem
   public static AudioInputStream getAudioInputStream(AudioFormat targ,
 						     AudioInputStream ais)
   {
-    HashSet result = new HashSet();
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -416,7 +416,7 @@ public class AudioSystem
    */
   public static Mixer.Info[] getMixerInfo()
   {
-    HashSet result = new HashSet();
+    HashSet<Mixer.Info> result = new HashSet<Mixer.Info>();
     Iterator i = ServiceFactory.lookupProviders(MixerProvider.class);
     while (i.hasNext())
       {
@@ -425,7 +425,7 @@ public class AudioSystem
         for (int j = 0; j < is.length; ++j)
           result.add(is[j]);
       }
-    return (Mixer.Info[]) result.toArray(new Mixer.Info[result.size()]);
+    return result.toArray(new Mixer.Info[result.size()]);
   }
 
   /**
@@ -474,7 +474,7 @@ public class AudioSystem
    */
   public static Line.Info[] getSourceLineInfo(Line.Info info)
   {
-    HashSet result = new HashSet();
+    HashSet<Line.Info> result = new HashSet<Line.Info>();
     Mixer.Info[] infos = getMixerInfo();
     for (int i = 0; i < infos.length; ++i)
       {
@@ -483,7 +483,7 @@ public class AudioSystem
         for (int j = 0; j < srcs.length; ++j)
           result.add(srcs[j]);
       }
-    return (Line.Info[]) result.toArray(new Line.Info[result.size()]);
+    return result.toArray(new Line.Info[result.size()]);
   }
 
   /**
@@ -534,7 +534,8 @@ public class AudioSystem
    */
   public static AudioFormat.Encoding[] getTargetEncodings(AudioFormat.Encoding source)
   {
-    HashSet result = new HashSet();
+    HashSet<AudioFormat.Encoding> result
+      = new HashSet<AudioFormat.Encoding>();
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -545,7 +546,7 @@ public class AudioSystem
         for (int j = 0; j < es.length; ++j)
           result.add(es[j]);
       }
-    return (AudioFormat.Encoding[]) result.toArray(new AudioFormat.Encoding[result.size()]);
+    return result.toArray(new AudioFormat.Encoding[result.size()]);
   }
 
   /**
@@ -555,7 +556,8 @@ public class AudioSystem
    */
   public static AudioFormat.Encoding[] getTargetEncodings(AudioFormat source)
   {
-    HashSet result = new HashSet();
+    HashSet<AudioFormat.Encoding> result
+      = new HashSet<AudioFormat.Encoding>();
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -564,7 +566,7 @@ public class AudioSystem
         for (int j = 0; j < es.length; ++j)
           result.add(es[j]);
       }
-    return (AudioFormat.Encoding[]) result.toArray(new AudioFormat.Encoding[result.size()]);
+    return result.toArray(new AudioFormat.Encoding[result.size()]);
   }
 
   /**
@@ -576,7 +578,7 @@ public class AudioSystem
   public static AudioFormat[] getTargetFormats(AudioFormat.Encoding encoding,
 					       AudioFormat sourceFmt)
   {
-    HashSet result = new HashSet();
+    HashSet<AudioFormat> result = new HashSet<AudioFormat>();
     Iterator i = ServiceFactory.lookupProviders(FormatConversionProvider.class);
     while (i.hasNext())
       {
@@ -585,7 +587,7 @@ public class AudioSystem
         for (int j = 0; j < es.length; ++j)
           result.add(es[j]);
       }
-    return (AudioFormat[]) result.toArray(new AudioFormat[result.size()]);
+    return result.toArray(new AudioFormat[result.size()]);
   }
 
   /**
@@ -595,7 +597,7 @@ public class AudioSystem
    */
   public static Line.Info[] getTargetLineInfo(Line.Info info)
   {
-    HashSet result = new HashSet();
+    HashSet<Line.Info> result = new HashSet<Line.Info>();
     Mixer.Info[] infos = getMixerInfo();
     for (int i = 0; i < infos.length; ++i)
       {
@@ -604,7 +606,7 @@ public class AudioSystem
         for (int j = 0; j < targs.length; ++j)
           result.add(targs[j]);
       }
-    return (Line.Info[]) result.toArray(new Line.Info[result.size()]);
+    return result.toArray(new Line.Info[result.size()]);
   }
 
   /**
diff --git a/libjava/classpath/javax/sound/sampled/BooleanControl.java b/libjava/classpath/javax/sound/sampled/BooleanControl.java
index 147a7f8b02f..0a78e493fca 100644
--- a/libjava/classpath/javax/sound/sampled/BooleanControl.java
+++ b/libjava/classpath/javax/sound/sampled/BooleanControl.java
@@ -72,7 +72,6 @@ public abstract class BooleanControl extends Control
     }
   }
 
-  private Type type;
   private boolean value;
   private String trueLabel;
   private String falseLabel;