Merged gcj-eclipse branch to trunk.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java b/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
index ed916cb5f1a..de82bd47bb6 100644
--- a/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
+++ b/libjava/classpath/javax/swing/plaf/basic/BasicDirectoryModel.java
@@ -381,7 +381,7 @@ public class BasicDirectoryModel extends AbstractListModel
    *
    * @return a Vector
    */
-  public Vector getDirectories()
+  public Vector<File> getDirectories()
   {
     // Synchronize this with the UpdateSwingRequest for the case when
     // contents is modified.
@@ -418,7 +418,7 @@ public class BasicDirectoryModel extends AbstractListModel
    *
    * @return a Vector
    */
-  public Vector getFiles()
+  public Vector<File>  getFiles()
   {
     synchronized (contents)
       {
@@ -562,7 +562,7 @@ public class BasicDirectoryModel extends AbstractListModel
    *
    * @param v The Vector to sort.
    */
-  protected void sort(Vector v)
+  protected void sort(Vector<? extends File> v)
   {
     Collections.sort(v, comparator);
   }