Import GNU Classpath (20121202).

2012-12-19  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (20121202).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * sources.am, gcj/javaprims.h: Regenerate.
        * gnu/java/nio/FileLockImpl.java (close): New override.

From-SVN: r194618

6 files changed, 33 insertions, 33 deletions

diff --git a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
index 605c6df..ca7b046 100644
--- a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
+++ b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSIMidiDeviceProvider.java
@@ -1,5 +1,5 @@
 /* DSSIMidiDeviceProvider.java -- DSSI Device Provider
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -69,13 +69,16 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
    */
   private static class DSSIInfo extends Info
   {
+    String copyright;
     String soname;
     long index;
 
-    public DSSIInfo(String name, String vendor, String description,
-                    String version, String soname, long index)
+    public DSSIInfo(String name, String vendor, String label,
+                    String copyright, String version,
+                    String soname, long index)
     {
-      super(name, vendor, description, version);
+      super(name, vendor, label, version);
+      this.copyright = copyright;
       this.soname = soname;
       this.index = index;
     }
@@ -89,9 +92,9 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
   static native String getDSSIVendor_(long handle);
   static native String getDSSILabel_(long handle);
 
-  private static List examineLibrary(String soname)
+  private static List<DSSIInfo> examineLibrary(String soname)
   {
-     List list = new ArrayList();
+     List<DSSIInfo> list = new ArrayList<DSSIInfo>();
      long index = 0;
      long handle;
 
@@ -107,7 +110,7 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
        String copyright = getDSSICopyright_(handle);
        String label = getDSSIName_(handle);
        String vendor = getDSSIVendor_(handle);
-       list.add(new DSSIInfo(name, vendor, label,
+       list.add(new DSSIInfo(name, vendor, label, copyright,
                              "DSSI-1", soname, index));
        index++;
      } while (true);
@@ -133,10 +136,10 @@ public class DSSIMidiDeviceProvider extends MidiDeviceProvider
                                         return n.endsWith(".so");
                                       }
                                     });
-    List ilist = new ArrayList();
+    List<DSSIInfo> ilist = new ArrayList<DSSIInfo>();
     for (int i = 0; i < sofiles.length; i++)
       ilist.addAll(examineLibrary(new File(dssidir, sofiles[i]).getAbsolutePath()));
-    infos = (DSSIInfo[]) ilist.toArray(new DSSIInfo[ilist.size()]);
+    infos = ilist.toArray(new DSSIInfo[ilist.size()]);
   }
 
   public DSSIMidiDeviceProvider()
diff --git a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
index 9472ee4..1ae1fe8 100644
--- a/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
+++ b/libjava/classpath/gnu/javax/sound/midi/dssi/DSSISynthesizer.java
@@ -1,5 +1,5 @@
 /* DSSISynthesizer.java -- DSSI Synthesizer Provider
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -97,8 +97,8 @@ public class DSSISynthesizer implements Synthesizer
   {
     private String name;
     private String description;
-    private List instruments = new ArrayList();
-    private List resources = new ArrayList();
+    private List<Instrument> instruments = new ArrayList<Instrument>();
+    private List<SoundbankResource> resources = new ArrayList<SoundbankResource>();
     private String vendor;
     private String version;
 
@@ -147,27 +147,25 @@ public class DSSISynthesizer implements Synthesizer
      */
     public SoundbankResource[] getResources()
     {
-      return (SoundbankResource[])
-        resources.toArray(new SoundbankResource[resources.size()]);
+      return resources.toArray(new SoundbankResource[resources.size()]);
     }
 
     /* @see javax.sound.midi.Soundbank#getInstruments()
      */
     public Instrument[] getInstruments()
     {
-      return (Instrument[])
-        instruments.toArray(new Instrument[instruments.size()]);
+      return instruments.toArray(new Instrument[instruments.size()]);
     }
 
     /* @see javax.sound.midi.Soundbank#getInstrument(javax.sound.midi.Patch)
      */
     public Instrument getInstrument(Patch patch)
     {
-      Iterator itr = instruments.iterator();
+      Iterator<Instrument> itr = instruments.iterator();
 
       while (itr.hasNext())
       {
-        Instrument i = (Instrument) itr.next();
+        Instrument i = itr.next();
         if (i.getPatch().equals(patch))
           return i;
       }
@@ -490,7 +488,7 @@ public class DSSISynthesizer implements Synthesizer
   MidiChannel channels[] = new MidiChannel[16];
 
   // The list of known soundbanks, and the default one.
-  List soundbanks = new ArrayList();
+  List<Soundbank> soundbanks = new ArrayList<Soundbank>();
   DSSISoundbank defaultSoundbank;
 
   /**
@@ -616,17 +614,16 @@ public class DSSISynthesizer implements Synthesizer
    */
   public Instrument[] getAvailableInstruments()
   {
-    List instruments = new ArrayList();
-    Iterator itr = soundbanks.iterator();
+    List<Instrument> instruments = new ArrayList<Instrument>();
+    Iterator<Soundbank> itr = soundbanks.iterator();
     while (itr.hasNext())
     {
-      Soundbank sb = (Soundbank) itr.next();
+      Soundbank sb = itr.next();
       Instrument ins[] = sb.getInstruments();
       for (int i = 0; i < ins.length; i++)
         instruments.add(ins[i]);
     }
-    return (Instrument[])
-      instruments.toArray(new Instrument[instruments.size()]);
+    return instruments.toArray(new Instrument[instruments.size()]);
   }
 
   /* (non-Javadoc)
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java
index fb2a472..06f29af 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileReader.java
@@ -1,5 +1,5 @@
 /* MidiFileReader.java -- Read MIDI files.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -198,7 +198,7 @@ public class MidiFileReader extends javax.sound.midi.spi.MidiFileReader
         int Mtrk = din.readInt();
         if (Mtrk != 0x4d54726b)
           throw new InvalidMidiDataException("Invalid MIDI track header.");
-        int length = din.readInt();
+        din.readInt(); // length
 
         int runningStatus = -1;
         int click = 0;
diff --git a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
index 5170fc1..f3194cb 100644
--- a/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
+++ b/libjava/classpath/gnu/javax/sound/midi/file/MidiFileWriter.java
@@ -1,5 +1,5 @@
 /* MidiFileWriter.java -- Write MIDI files.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -118,7 +118,7 @@ public class MidiFileWriter
    */
   private int computeTrackLength(Track track, MidiDataOutputStream dos)
   {
-    int count = 0, length = 0, i = 0, eventCount = track.size();
+    int length = 0, i = 0, eventCount = track.size();
     long ptick = 0;
     while (i < eventCount)
       {
diff --git a/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java b/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
index 5cd6efe..f03bc47 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/WAV/WAVReader.java
@@ -1,5 +1,5 @@
 /* WAVReader.java -- Read WAV files.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -128,7 +128,7 @@ public class WAVReader extends AudioFileReader
     boolean foundFmt = false;
     boolean foundData = false;
 
-    short compressionCode = 0, numberChannels = 0, blockAlign = 0, bitsPerSample = 0;
+    short compressionCode = 0, numberChannels = 0, bitsPerSample = 0;
     long sampleRate = 0, bytesPerSecond = 0;
     long chunkLength = 0;
 
@@ -144,7 +144,7 @@ public class WAVReader extends AudioFileReader
             numberChannels = readUnsignedShortLE(din);
             sampleRate = readUnsignedIntLE(din);
             bytesPerSecond = readUnsignedIntLE(din);
-            blockAlign = readUnsignedShortLE(din);
+            readUnsignedShortLE(din); // blockAlign
             bitsPerSample = readUnsignedShortLE(din);
             din.skip(chunkLength - 16);
             break;
diff --git a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
index 1910ea6..b2ca7cd 100644
--- a/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
+++ b/libjava/classpath/gnu/javax/sound/sampled/gstreamer/GStreamerMixer.java
@@ -1,5 +1,5 @@
 /* GStreamerMixer.java -- Mixer implementation.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,7 +92,7 @@ public class GStreamerMixer
     // and see if there is one matching the given line
     // if the format comes from the gstreamer backend
     // gstreamer will be able to deal with it
-    Class clazz = info.getLineClass();
+    Class<?> clazz = info.getLineClass();
     DataLine.Info _info = (DataLine.Info) info;
 
     if (clazz == SourceDataLine.class)