Changeset 5098 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

Timestamp:

2003-08-06T12:02:10+12:00 (21 years ago)

Author:

kjdon

Message:

gadually standardising my Java code. have turned all class variables from like doc_ to this.doc.

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java (modified) (11 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/ServiceRack.java

@@ -59 +59 @@
 
     /** the absolute address of the site home */
-    protected String site_home_ =null;
+    protected String site_home =null;
     /** the http address of the site home */
-    protected String site_http_address_ =null;
+    protected String site_http_address =null;
 
     /** the name of the cluster (or collection) that this service 
     belongs to - if any */ 
-    protected String cluster_name_ = null;
+    protected String cluster_name = null;
 
     /** some services can talk back to the message router */
-    protected ModuleInterface router_ = null;
+    protected ModuleInterface router = null;
 
     /** a converter class to create Documents etc */
-    protected XMLConverter converter_ = null;
+    protected XMLConverter converter = null;
 
     /** the original config info - if need to store it */
-    protected Element config_info_ = null;
+    protected Element config_info = null;
 
     /** XML element for describe requests - the container doc */
-    protected Document doc_ = null;
+    protected Document doc = null;
 
     /** XML element for describe requests - list of supported services
     - this is static     */
-    protected Element short_service_info_ = null;
+    protected Element short_service_info = null;
 
     /** XML element for stylesheet requests - map of service name to format 
     elem */
-    protected HashMap format_info_map_ = null;
+    protected HashMap format_info_map = null;
 
     /** sets the cluster name */
     public void setClusterName(String cluster_name) {
-    cluster_name_ = cluster_name;
+    this.cluster_name = cluster_name;
     }
     /** sets the collect name */
@@ -98 +98 @@
     /** sets the site home */
     public void setSiteHome(String site_home) {
-    site_home_ = site_home;
+    this.site_home = site_home;
     }
     /** sets the site http address */
     public void setSiteAddress(String site_address) {
-    site_http_address_ = site_address;
+    this.site_http_address = site_address;
     }
 
     /** sets the message router */
     public void setMessageRouter(ModuleInterface m) {
-       router_ = m;
+       this.router = m;
     }
 
     /** the no-args constructor */
     public ServiceRack() {
-    converter_ = new XMLConverter();
-    doc_ = converter_.newDOM();
-    short_service_info_ = doc_.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
-    format_info_map_ = new HashMap();
+    this.converter = new XMLConverter();
+    this.doc = this.converter.newDOM();
+    this.short_service_info = this.doc.createElement(GSXML.SERVICE_ELEM+GSXML.LIST_MODIFIER);
+    this.format_info_map = new HashMap();
     }
     
@@ -143 +143 @@
     public String process(String xml_in) {
     
-    Document doc = converter_.getDOM(xml_in);
+    Document doc = this.converter.getDOM(xml_in);
     
     Element res = process(doc.getDocumentElement());
-    return converter_.getString(res);
+    return this.converter.getString(res);
     
     }
@@ -161 +161 @@
     NodeList requests = message.getElementsByTagName(GSXML.REQUEST_ELEM);
     Document mess_doc = message.getOwnerDocument();
-    Element mainResult = doc_.createElement(GSXML.MESSAGE_ELEM);
+    Element mainResult = this.doc.createElement(GSXML.MESSAGE_ELEM);
     if (requests.getLength()==0) {
         // no requests
@@ -174 +174 @@
         Element response = processDescribe(request);
         if (response !=null) {
-            mainResult.appendChild(doc_.importNode(response, true));
+            mainResult.appendChild(this.doc.importNode(response, true));
         }
         
         } else if (type.equals(GSXML.REQUEST_TYPE_FORMAT)) {
         Element response = processFormat(request);
-            mainResult.appendChild(doc_.importNode(response, true));
+            mainResult.appendChild(this.doc.importNode(response, true));
         
            
@@ -220 +220 @@
             }
             if (response !=null) {
-            mainResult.appendChild(doc_.importNode(response, true));
+            mainResult.appendChild(this.doc.importNode(response, true));
             }
             
@@ -240 +240 @@
     protected Element processDescribe(Element request) {
     
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_DESCRIBE);
     
@@ -264 +264 @@
      */
     protected Element processFormat(Element request) {
-    Element response = doc_.createElement(GSXML.RESPONSE_ELEM);
+    Element response = this.doc.createElement(GSXML.RESPONSE_ELEM);
     response.setAttribute(GSXML.TYPE_ATT, GSXML.REQUEST_TYPE_FORMAT);
     
@@ -275 +275 @@
     
     // describe a particular service    
-    if (format_info_map_.containsKey(to)) {
+    if (this.format_info_map.containsKey(to)) {
         response.appendChild(getServiceFormat(to));
         response.setAttribute(GSXML.FROM_ATT, to);
@@ -288 +288 @@
     protected Element getServiceList(String lang) {
     // for now, it is static and has no language stuff
-    return (Element) short_service_info_.cloneNode(true);
+    return (Element) this.short_service_info.cloneNode(true);
     }
     
@@ -295 +295 @@
 
     protected Element getServiceFormat(String service) {
-    Element format = (Element)((Element)format_info_map_.get(service)).cloneNode(true);
+    Element format = (Element)((Element)this.format_info_map.get(service)).cloneNode(true);
     return format;
     }