Merged gcj-eclipse branch to trunk.

From-SVN: r120621
2007-01-09 19:58:05 +00:00 · 2007-01-09 19:58:05 +00:00 · 97b8365caf
commit 97b8365caf
parent c648dedbde
17478 changed files with 606493 additions and 100744 deletions
--- a/libjava/classpath/java/awt/image/ImageConsumer.java
+++ b/libjava/classpath/java/awt/image/ImageConsumer.java
@ -136,7 +136,7 @@ public interface ImageConsumer
     *
     * @param props the list of properties associated with this image 
     */
-    void setProperties(Hashtable props);
+    void setProperties(Hashtable<?,?> props);

    /**
     * This <code>ColorModel</code> should indicate the model used by