Various fixes, clean-up, logs, documentation

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / pazpar2 / commands / Pazpar2Command.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
index b4f67e9..7ef96bd 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Command.java
@@ -20,7 +20,7 @@ public class Pazpar2Command implements Serializable  {
   public Pazpar2Command (String name, StateManager stateMgr) {\r
     this.name = name;\r
     if (stateMgr == null) {\r
-      // Set one-off dummy state mgr\r
+      // Sets throw-away state\r
       this.stateMgr = new StateManager();\r
     } else {\r
       this.stateMgr = stateMgr;\r
@@ -40,30 +40,30 @@ public class Pazpar2Command implements Serializable  {
   }\r
     \r
   public void setParameter (CommandParameter parameter) {\r
-    Pazpar2Command thisCommand = this.copy();\r
-    logger.debug(name + " setting parameter " + parameter.getName() + "=" + parameter.getValueWithExpressions() + " to " + this.getName());\r
-    thisCommand.parameters.put(parameter.getName(),parameter);\r
-    stateMgr.checkIn(thisCommand);\r
+    Pazpar2Command copy = this.copy();\r
+    logger.debug(name + " command: setting parameter [" + parameter.getName() + "=" + parameter.getValueWithExpressions() + "]");\r
+    copy.parameters.put(parameter.getName(),parameter);\r
+    stateMgr.checkIn(copy);\r
   }\r
   \r
   public void setParameters (CommandParameter... params) {\r
-    Pazpar2Command thisCommand = this.copy();\r
+    Pazpar2Command copy = this.copy();\r
     for (CommandParameter param : params) {\r
-      logger.debug(name + " setting parameter " + param.getName() + "=" + param.getValueWithExpressions() + " to " + this.getName());\r
-      thisCommand.parameters.put(param.getName(),param);\r
+      logger.debug(name + " command: setting parameter [" + param.getName() + "=" + param.getValueWithExpressions() + "]");\r
+      copy.parameters.put(param.getName(),param);\r
     }\r
-    stateMgr.checkIn(thisCommand);\r
+    stateMgr.checkIn(copy);\r
   }\r
   \r
   public void setParametersInState (CommandParameter... params) {    \r
     for (CommandParameter param : params) {\r
-      logger.debug(name + " setting parameter " + param.getName() + "=" + param.getValueWithExpressions() + " to " + this.getName());\r
+      logger.debug(name + " command: setting parameter [" + param.getName() + "=" + param.getValueWithExpressions() + "] silently");\r
       parameters.put(param.getName(),param);\r
     }    \r
   }\r
     \r
   public void setParameterInState (CommandParameter parameter) {\r
-    logger.debug(name + " setting parameter silently " + parameter.getName() + "=" + parameter.getValueWithExpressions() + " to " + this.getName());\r
+    logger.debug(name + " command: setting parameter [" + parameter.getName() + "=" + parameter.getValueWithExpressions() + "] silently");\r
     parameters.put(parameter.getName(),parameter);    \r
   }\r
   \r
@@ -73,15 +73,15 @@ public class Pazpar2Command implements Serializable  {
   }\r
   \r
   public void removeParameter (String name) {\r
-    Pazpar2Command thisCommand = this.copy();\r
-    thisCommand.parameters.remove(name);\r
-    stateMgr.checkIn(thisCommand);\r
+    Pazpar2Command copy = this.copy();\r
+    copy.parameters.remove(name);\r
+    stateMgr.checkIn(copy);\r
   }\r
   \r
   public void removeParameters() {\r
-    Pazpar2Command thisCommand = this.copy();\r
-    thisCommand.parameters = new HashMap<String,CommandParameter>();\r
-    stateMgr.checkIn(thisCommand);\r
+    Pazpar2Command copy = this.copy();\r
+    copy.parameters = new HashMap<String,CommandParameter>();\r
+    stateMgr.checkIn(copy);\r
   }\r
   \r
   public void removeParametersInState() {\r