Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/selfContained/FilesDocumentStream.java

Timestamp:

2012-05-22T13:01:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/selfContained/FilesDocumentStream.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/selfContained/FilesDocumentStream.java

@@ -54 +54 @@
   implements DocumentStream {
   /** the files we've found so far */
-  Vector files = new Vector();
+  Vector<String> files = new Vector<String>();
   /** the directories we've found so far */
-  Vector directories = new Vector();
+  Vector<String> directories = new Vector<String>();
 
   /**
@@ -111 +111 @@
   protected void expandIfNecessary() {
     while (directories.size() > 0) {
-      String dirname = (String) directories.elementAt(0);
+      String dirname = directories.elementAt(0);
       directories.removeElement(dirname);
       File dir = new File(dirname);
@@ -144 +144 @@
     if (!hasNextDocument()) throw new Error("Doesn't have another Document");
 
-    String filename = (String) files.elementAt(files.size() - 1);
+    String filename = files.elementAt(files.size() - 1);
     files.removeElementAt(files.size() - 1);
     File file = new File(filename);