Changeset 33768

Timestamp:

2019-12-09T11:26:23+13:00 (4 years ago)

Author:

kjdon

Message:

removed some code that was commented out, and some methods that were identical to the base class methods

File:

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

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

@@ -1 +1 @@
 /*
- *    ServiceRack.java
+ *    FedoraServiceProxy.java
  *    Copyright (C) 2002 New Zealand Digital Library, http://www.nzdl.org
  *
@@ -742 +742 @@
     }
 
-    /* //process method for stylesheet requests    
-    protected Element processFormat(Element request) {} */
-    
-    /* returns the service list for the subclass */
-    /* protected Element getServiceList(String lang) {
-    // for now, it is static and has no language stuff
-    return (Element) this.short_service_info.cloneNode(true);
-    }*/
 
     /** returns a specific service description */
@@ -766 +758 @@
     }
 
-    /** overloaded version for no args case */
-    protected String getTextString(String key, String lang) {
-    return getTextString(key, lang, null, null);
-    }
-
-    protected String getTextString(String key, String lang, String dictionary) {
-    return getTextString(key, lang, dictionary, null);
-    }
-    protected String getTextString(String key, String lang, String [] args) {
-    return getTextString(key, lang, null, args);
-    }
-    
-    /** getTextString - retrieves a language specific text string for the given
-key and locale, from the specified resource_bundle (dictionary)
-    */
-    protected String getTextString(String key, String lang, String dictionary, String[] args) {
-
-    // we want to use the collection class loader in case there are coll specific files
-    if (dictionary != null) {
-        // just try the one specified dictionary
-        Dictionary dict = new Dictionary(dictionary, lang, this.class_loader);
-        String result = dict.get(key, args);
-        if (result == null) { // not found
-        return "_"+key+"_";
-        }
-        return result;
-    }
-
-    // now we try class names for dictionary names
-    String class_name = this.getClass().getName();
-    class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-    Dictionary dict = new Dictionary(class_name, lang, this.class_loader);
-    String result = dict.get(key, args);
-    if (result != null) {
-        return result;
-    }
-
-    // we have to try super classes
-    Class c = this.getClass().getSuperclass();
-    while (result == null && c != null) {
-        class_name = c.getName();
-        class_name = class_name.substring(class_name.lastIndexOf('.')+1);
-        if (class_name.equals("ServiceRack")) {
-        // this is as far as we go
-        break;
-        }
-        dict = new Dictionary(class_name, lang, this.class_loader);
-        result = dict.get(key, args);
-        c = c.getSuperclass();
-    }
-    if (result == null) {
-        return "_"+key+"_";
-    }
-    return result;
-    
-    }
-
-    protected String getMetadataNameText(String key, String lang) {
-
-    String properties_name = "metadata_names";
-    Dictionary dict = new Dictionary(properties_name, lang);
-    
-    String result = dict.get(key);
-    if (result == null) { // not found
-        return null;
-    } 
-    return result;
-    }
+    
 
     public static class BasicTextMacroResolver extends MacroResolver {