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/text/Collator.java
+++ b/libjava/classpath/java/text/Collator.java
@ -70,7 +70,7 @@ import java.util.ResourceBundle;
 * @author Aaron M. Renn (arenn@urbanophile.com)
 * @date March 18, 1999
 */
-public abstract class Collator implements Comparator, Cloneable
+public abstract class Collator implements Comparator<Object>, Cloneable
 {
  /**
   * This constant is a strength value which indicates that only primary