Changeset 25550

Timestamp:

2012-05-09T13:50:37+12:00 (12 years ago)

Author:

sjm84

Message:

Changing the word action to operation so it is more clear

File:

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

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

@@ -430 +430 @@
      * "delete" or "reload" response will be put into the status element
      */
-    protected void systemRequest(String action_name, String coll_name, Element status, UserContext userContext)
+    protected void systemRequest(String operation, String coll_name, Element status, UserContext userContext)
     {
         // send the request to the MR
@@ -441 +441 @@
         command.setAttribute(GSXML.SYSTEM_MODULE_NAME_ATT, coll_name);
 
-        if (action_name.equals("delete"))
+        if (operation.equals("delete"))
         {
             command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_DEACTIVATE);
         }
-        else if (action_name.equals("reload"))
+        else if (operation.equals("reload"))
         {
             command.setAttribute(GSXML.TYPE_ATT, GSXML.SYSTEM_TYPE_ACTIVATE);
@@ -451 +451 @@
         else
         {
-            logger.error("invalid action name passed to systemRequest:" + action_name);
+            logger.error("invalid action name passed to systemRequest:" + operation);
             return;
         }
@@ -463 +463 @@
             if (response == null)
             {
-                t = this.doc.createTextNode(getTextString(action_name + ".configure_error", userContext.getLanguage(), args));
+                t = this.doc.createTextNode(getTextString(operation + ".configure_error", userContext.getLanguage(), args));
                 status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.ERROR));
                 status.appendChild(t);
@@ -470 +470 @@
 
             // if we got here, we have succeeded!
-            t = this.doc.createTextNode(getTextString(action_name + ".success", userContext.getLanguage(), args));
+            t = this.doc.createTextNode(getTextString(operation + ".success", userContext.getLanguage(), args));
             status.setAttribute(GSXML.STATUS_ERROR_CODE_ATT, Integer.toString(GSStatus.SUCCESS));
             status.appendChild(t);