Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.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/build/GS2PerlConstructor.java (modified) (5 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -124 +124 @@
     {
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: new collection."));
-        Vector command = new Vector();
+        Vector<String> command = new Vector<String>();
         command.add("gs2_mkcol.pl");
         command.add("-site");
@@ -133 +133 @@
         command.add(this.collection_name);
         String[] command_str = {};
-        command_str = (String[]) command.toArray(command_str);
+        command_str = command.toArray(command_str);
         if (runPerlCommand(command_str))
         {
@@ -162 +162 @@
         command.add(this.collection_name);
         String[] command_str = {};
-        command_str = (String[]) command.toArray(command_str);
+        command_str = command.toArray(command_str);
 
         if (runPerlCommand(command_str))
@@ -186 +186 @@
 
         String[] command_str = {};
-        command_str = (String[]) command.toArray(command_str);
+        command_str = command.toArray(command_str);
 
         if (runPerlCommand(command_str))
@@ -231 +231 @@
 
     /** extracts all the args from the xml and returns them in a Vector */
-    protected Vector extractParameters(Element param_list)
-    {
-
-        Vector args = new Vector();
+    protected Vector<String> extractParameters(Element param_list)
+    {
+
+        Vector<String> args = new Vector<String>();
         if (param_list == null)
         {