Changeset 32342 for main

Timestamp:

2018-08-16T10:03:48+12:00 (6 years ago)

Author:

kjdon

Message:

switch(string) is only java 7, and we are using java 6, so made this is/else instead

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -142 +142 @@
           String name = params.nextElement();
           String value = config.getInitParameter(name);
-          switch(name) {
-          case GSConstants.LIBRARY_NAME: library_name = value;
-            break;
-          case GSConstants.INTERFACE_NAME: interface_name = value;
-            break;
-          case GSConstants.USE_CLIENT_SIDE_XSLT: useXslt = value;
-            break;
-          case GSConstants.DEFAULT_LANG: this.default_lang = value;
-            break;
-          case GSXML.SESSION_EXPIRATION: sess_expire = value;
-            break;
-          case GSConstants.SITE_NAME: site_name = value;
-            break;
-          case GSConstants.REMOTE_SITE_NAME: remote_site_name = value;
-            break;
-          case GSConstants.REMOTE_SITE_TYPE: remote_site_type = value;
-            break;
-          case GSConstants.REMOTE_SITE_ADDRESS: remote_site_address = value;
-            break;
-          case GSConstants.RECEPTIONIST_CLASS: recept_name = value;
-            break;
-            // default - just add to config params
-          default: config_params.put(name, value);
-            break;
+          if (name.equals(GSConstants.LIBRARY_NAME)) {
+            library_name = value;
+          } else if (name.equals(GSConstants.INTERFACE_NAME)) {
+            interface_name = value;
+          } else if (name.equals(GSConstants.USE_CLIENT_SIDE_XSLT)) {
+            useXslt = value;
+          } else if (name.equals(GSConstants.DEFAULT_LANG)) {
+            this.default_lang = value;
+          } else if (name.equals(GSXML.SESSION_EXPIRATION)) {
+            sess_expire = value;
+          } else if (name.equals(GSConstants.SITE_NAME)) {
+            site_name = value;
+          } else if (name.equals(GSConstants.REMOTE_SITE_NAME)) {
+            remote_site_name = value;
+          } else if (name.equals(GSConstants.REMOTE_SITE_TYPE)) {
+            remote_site_type = value;
+          } else if (name.equals(GSConstants.REMOTE_SITE_ADDRESS)) {
+            remote_site_address = value;
+          } else if (name.equals(GSConstants.RECEPTIONIST_CLASS)) {
+            recept_name = value;
+          } else {
+            // If there is a param we are not expecting, just add to the list. That way users can add new servlet params which will go through to the XML source without modifying code.
+            config_params.put(name, value);
           }
         }
-
         if (library_name == null || interface_name == null) {