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/security/KeyStoreSpi.java
+++ b/libjava/classpath/java/security/KeyStoreSpi.java
@ -187,7 +187,7 @@ public abstract class KeyStoreSpi
   *
   * @return an Enumeration of the aliases
   */
-  public abstract Enumeration engineAliases();
+  public abstract Enumeration<String> engineAliases();

  /**
   * Determines if the keystore contains the specified alias.