Merged gcj-eclipse branch to trunk.

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

5 files changed, 10 insertions, 10 deletions

diff --git a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
index 81bbe4ecf10..37c2df4652c 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFileFormat.java
@@ -153,7 +153,7 @@ public class AudioFileFormat
    * @param properties the properties
    */
   public AudioFileFormat(Type type, AudioFormat fmt, int frameLen,
-			 Map properties)
+			 Map<String, Object> properties)
   {
     this.byteLength = AudioSystem.NOT_SPECIFIED;
     this.format = fmt;
@@ -226,7 +226,7 @@ public class AudioFileFormat
    * Return the properties associated with this format, as a Map.
    * The returned Map is unmodifiable.
    */
-  public Map properties()
+  public Map<String, Object> properties()
   {
     return properties;
   }
diff --git a/libjava/classpath/javax/sound/sampled/AudioFormat.java b/libjava/classpath/javax/sound/sampled/AudioFormat.java
index 5199d71c3a3..a474ff9a5c4 100644
--- a/libjava/classpath/javax/sound/sampled/AudioFormat.java
+++ b/libjava/classpath/javax/sound/sampled/AudioFormat.java
@@ -177,7 +177,7 @@ public class AudioFormat
    */
   public AudioFormat(Encoding encoding, float sampleRate, int sampleSizeInBits,
 		     int channels, int frameSize, float frameRate,
-		     boolean bigEndian, Map properties)
+		     boolean bigEndian, Map<String, Object> properties)
   {
     this.encoding = encoding;
     this.sampleRate = sampleRate;
@@ -319,7 +319,7 @@ public class AudioFormat
    * Return a read-only Map holding the properties associated with 
    * this format.
    */
-  public Map properties()
+  public Map<String, Object> properties()
   {
     return properties;
   }
diff --git a/libjava/classpath/javax/sound/sampled/DataLine.java b/libjava/classpath/javax/sound/sampled/DataLine.java
index f755958fe87..aa99a046ce4 100644
--- a/libjava/classpath/javax/sound/sampled/DataLine.java
+++ b/libjava/classpath/javax/sound/sampled/DataLine.java
@@ -64,7 +64,7 @@ public interface DataLine extends Line
      * @param klass the class of the line
      * @param fmt the supported format
      */
-    public Info(Class klass, AudioFormat fmt)
+    public Info(Class<?> klass, AudioFormat fmt)
     {
       super(klass);
       this.minBufferSize = AudioSystem.NOT_SPECIFIED;
@@ -80,7 +80,7 @@ public interface DataLine extends Line
      * @param minSize the minimum buffer size
      * @param maxSize the maximum buffer size
      */
-    public Info(Class klass, AudioFormat[] fmts, int minSize, int maxSize)
+    public Info(Class<?> klass, AudioFormat[] fmts, int minSize, int maxSize)
     {
       super(klass);
       this.minBufferSize = minSize;
@@ -96,7 +96,7 @@ public interface DataLine extends Line
      * @param fmt the supported format
      * @param size the buffer size
      */
-    public Info(Class klass, AudioFormat fmt, int size)
+    public Info(Class<?> klass, AudioFormat fmt, int size)
     {
       super(klass);
       this.minBufferSize = size;
diff --git a/libjava/classpath/javax/sound/sampled/Line.java b/libjava/classpath/javax/sound/sampled/Line.java
index 69bb9084f10..536752a1cc1 100644
--- a/libjava/classpath/javax/sound/sampled/Line.java
+++ b/libjava/classpath/javax/sound/sampled/Line.java
@@ -57,7 +57,7 @@ public interface Line
      * for instance TargetDataLine.class.
      * @param klass the class of the line
      */
-    public Info(Class klass)
+    public Info(Class<?> klass)
     {
       this.klass = klass;
     }
@@ -65,7 +65,7 @@ public interface Line
     /**
      * Return the line's class.
      */
-    public Class getLineClass()
+    public Class<?> getLineClass()
     {
       return klass;
     }
diff --git a/libjava/classpath/javax/sound/sampled/Port.java b/libjava/classpath/javax/sound/sampled/Port.java
index fb39e6c07ee..fc0bf71d9da 100644
--- a/libjava/classpath/javax/sound/sampled/Port.java
+++ b/libjava/classpath/javax/sound/sampled/Port.java
@@ -89,7 +89,7 @@ public interface Port extends Line
      * @param name the name of the line
      * @param isSource true if this is an input source
      */
-    public Info(Class klass, String name, boolean isSource)
+    public Info(Class<?> klass, String name, boolean isSource)
     {
       super(klass);
       this.name = name;