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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/MapRetrieve.java

@@ -10 +10 @@
 
 // General Java classes
-import java.io.File;
 import java.io.*;
 import java.util.StringTokenizer;
@@ -36 +35 @@
     protected static final int DOCUMENT=1;
 
-    protected ArrayList index_name_list = null;
-    protected ArrayList index_display_list = null;
+    protected ArrayList<String> index_name_list = null;
+    protected ArrayList<String> index_display_list = null;
     protected String files_home_dir = null; 
     protected String temp_files_dir = null;
@@ -45 +44 @@
     protected String http_image_dir = null;
     protected String http_temp_image_dir = null;
-    private LinkedList namesInList = new LinkedList();
+    private LinkedList<String> namesInList = new LinkedList<String>();
 
     private DefaultMutableTreeNode tree;
@@ -91 +90 @@
     this.http_temp_image_dir = this.site_http_address + "/collect/"+this.cluster_name+"/temp/";
 
-    this.index_name_list = new ArrayList();
-    this.index_display_list = new ArrayList();
+    this.index_name_list = new ArrayList<String>();
+    this.index_display_list = new ArrayList<String>();
     Element index_list = (Element)GSXML.getChildByTagName(this.config_info, GSXML.INDEX_ELEM+GSXML.LIST_MODIFIER);
     Element display_index_list = (Element)GSXML.getChildByTagName(extra_info, "search");
@@ -200 +199 @@
 
     // The metadata information required
-    Vector metadata_list = new Vector();
+    Vector<String> metadata_list = new Vector<String>();
     boolean all_metadata = false;
     // Process the request parameters
@@ -292 +291 @@
         // create the navigation thumbnails.  This doesn't seem to work most of the time ???????
         for (int m = 0; m < metadata_list.size(); m++) {
-            String metadata = (String) metadata_list.get(m);
+            String metadata = metadata_list.get(m);
             thumb = "";
             String value = "";
@@ -448 +447 @@
             //put the names in an array
             for(int ri=0; namesInList.size()>0; ri++){
-            returnNames[ri]=(String)namesInList.getFirst();
+            returnNames[ri]=namesInList.getFirst();
             returnNames[ri] = returnNames[ri].substring(0,returnNames[ri].indexOf('`'));
             namesInList.removeFirst();
@@ -825 +824 @@
 
     for (int i=0; i<this.index_name_list.size(); i++) {
-        String name = (String)this.index_name_list.get(i);
+        String name = this.index_name_list.get(i);
         dropDownBox.append("<option value=\"");
         dropDownBox.append(name);
         dropDownBox.append("\">");
-        String display = (String)this.index_display_list.get(i);
+        String display = this.index_display_list.get(i);
         dropDownBox.append(display);
         dropDownBox.append("\n");