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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -32 +32 @@
 
 import java.io.*;
-import java.io.File;
-import java.io.RandomAccessFile;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -76 +74 @@
      * 
      */
-    protected HashMap service_map = null;
+    protected HashMap<String, ServiceRack> service_map = null;
     /**
      * maps pseudo service names to real service names - needed if we have two
      * services with the same name for one collection
      */
-    protected HashMap service_name_map = null;
+    protected HashMap<String, String> service_name_map = null;
 
     /** XML converter for String to DOM and vice versa */
@@ -113 +111 @@
     public void cleanUp()
     {
-        Iterator i = this.service_map.values().iterator();
+        Iterator<ServiceRack> i = this.service_map.values().iterator();
         while (i.hasNext())
         {
-            ServiceRack s = (ServiceRack) i.next();
+            ServiceRack s = i.next();
             s.cleanUp();
         }
@@ -134 +132 @@
     public ServiceCluster()
     {
-        this.service_map = new HashMap();
-        this.service_name_map = new HashMap();
+        this.service_map = new HashMap<String, ServiceRack>();
+        this.service_name_map = new HashMap<String, String>();
         this.converter = new XMLConverter();
         this.doc = this.converter.newDOM();
@@ -491 +489 @@
                 if (this.service_name_map.containsKey(service))
                 {
-                    real_service = (String) this.service_name_map.get(service);
+                    real_service = this.service_name_map.get(service);
                     // need to change the to att in the request - give the real service name
                     to = request.getAttribute(GSXML.TO_ATT);
@@ -501 +499 @@
                 Element single_message = mess_doc.createElement(GSXML.MESSAGE_ELEM);
                 single_message.appendChild(request);
-                Node response_message = ((ModuleInterface) this.service_map.get(service)).process(single_message);
+                Node response_message = this.service_map.get(service).process(single_message);
                 if (response_message != null)
                 {
@@ -884 +882 @@
     }
 
-    public HashMap getServiceMap()
+    public HashMap<String, ServiceRack> getServiceMap()
     {
         return service_map;