IFSFileEnumeration typesafety

Signed-off-by: NicolaIsotta <nicola.isotta@gmail.com>
IBM · May 26, 2023 · 2f99cca · 2f99cca
1 parent d07b521
commit 2f99cca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/java/com/ibm/as400/access/IFSFile.java b/src/main/java/com/ibm/as400/access/IFSFile.java
@@ -38,7 +38,6 @@
 import java.io.UnsupportedEncodingException; //@A6A
 import java.net.UnknownHostException;
 import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Vector;
 import java.util.StringTokenizer;            //@D4A
 
@@ -933,7 +932,7 @@ characters are wildcards (*) and question marks (?).
    @exception ServerStartupException If the host server cannot be started.
    @exception UnknownHostException If the system cannot be located.
    **/
-  public Enumeration enumerateFiles(IFSFileFilter filter, String pattern)
+  public Enumeration<IFSFile> enumerateFiles(IFSFileFilter filter, String pattern)
     throws IOException
   {
       // Validate arguments.  Note that we tolerate a null-valued 'filter'.
@@ -974,7 +973,7 @@ characters are wildcards (*) and question marks (?).
    @exception ServerStartupException If the host server cannot be started.
    @exception UnknownHostException If the system cannot be located.
    **/
-  public Enumeration enumerateFiles(String pattern)
+  public Enumeration<IFSFile> enumerateFiles(String pattern)
     throws IOException
   {
       // Validate arguments.  Note that we tolerate a null-valued 'filter'.
@@ -1015,7 +1014,7 @@ public Enumeration enumerateFiles(String pattern)
    @exception ServerStartupException If the host server cannot be started.
    @exception UnknownHostException If the system cannot be located.
    **/
-  public Enumeration enumerateFiles(IFSFileFilter filter)
+  public Enumeration<IFSFile> enumerateFiles(IFSFileFilter filter)
     throws IOException
   {
       try {
@@ -1049,7 +1048,7 @@ public Enumeration enumerateFiles(IFSFileFilter filter)
    @exception ServerStartupException If the host server cannot be started.
    @exception UnknownHostException If the system cannot be located.
    **/
-  public Enumeration enumerateFiles()
+  public Enumeration<IFSFile> enumerateFiles()
     throws IOException
   {
       try {

diff --git a/src/main/java/com/ibm/as400/access/IFSFileEnumeration.java b/src/main/java/com/ibm/as400/access/IFSFileEnumeration.java
@@ -24,7 +24,7 @@
 
 
 class IFSFileEnumeration
-implements Enumeration
+implements Enumeration<IFSFile>
 {
     // The block size is hardcoded based on the value chosen by OpNav.  
     // For now, it is not configurable.
@@ -80,7 +80,7 @@ class IFSFileEnumeration
         getNextBlock();
     }
 
-
+    @Override
     public boolean hasMoreElements()
     {
         return ((contents_ != null && index_ < contents_.length) ||
@@ -205,7 +205,8 @@ private static boolean isContainWildcard(String pattern){
       return false;
     }
 
-    public Object nextElement()
+    @Override
+    public IFSFile nextElement()
     {
         if (index_ < contents_.length)
             return contents_[index_++];