diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/classpath/java/text/Collator.java | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/classpath/java/text/Collator.java')
| -rw-r--r-- | libjava/classpath/java/text/Collator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libjava/classpath/java/text/Collator.java b/libjava/classpath/java/text/Collator.java index 08739163a64..95236132440 100644 --- 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 |
