Renames variable

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / state / Pazpar2State.java

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java b/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
index e983d5c..0ac555e 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/state/Pazpar2State.java
@@ -14,6 +14,9 @@ import com.indexdata.mkjsf.pazpar2.commands.SettingsCommand;
 import com.indexdata.mkjsf.pazpar2.commands.ShowCommand;\r
 import com.indexdata.mkjsf.pazpar2.commands.StatCommand;\r
 import com.indexdata.mkjsf.pazpar2.commands.TermlistCommand;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.AuthCommand;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.CategoriesCommand;\r
+import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommands;\r
 \r
 /**\r
  * Holds a 'pazpar2 state', understood as a full set of pazpar2 commands and \r
@@ -27,17 +30,20 @@ public class Pazpar2State {
   String key = null;\r
   Map<String,Pazpar2Command> commands = new HashMap<String,Pazpar2Command>();;\r
 \r
-  public Pazpar2State (StateManager mgr) {\r
-    commands.put(Pazpar2Commands.INIT,     new InitCommand(mgr));\r
-    commands.put(Pazpar2Commands.PING,     new PingCommand(mgr));\r
-    commands.put(Pazpar2Commands.SETTINGS, new SettingsCommand(mgr));\r
-    commands.put(Pazpar2Commands.SEARCH,   new SearchCommand(mgr));\r
-    commands.put(Pazpar2Commands.STAT,     new StatCommand(mgr));\r
-    commands.put(Pazpar2Commands.SHOW,     new ShowCommand(mgr));\r
-    commands.put(Pazpar2Commands.RECORD,   new RecordCommand(mgr));\r
-    commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand(mgr));\r
-    commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand(mgr));    \r
-    key = "#1";\r
+  public Pazpar2State (StateManager stateManager) {\r
+    commands.put(Pazpar2Commands.INIT,     new InitCommand(stateManager));\r
+    commands.put(Pazpar2Commands.PING,     new PingCommand(stateManager));\r
+    commands.put(Pazpar2Commands.SETTINGS, new SettingsCommand(stateManager));\r
+    commands.put(Pazpar2Commands.SEARCH,   new SearchCommand(stateManager));\r
+    commands.put(Pazpar2Commands.STAT,     new StatCommand(stateManager));\r
+    commands.put(Pazpar2Commands.SHOW,     new ShowCommand(stateManager));\r
+    commands.put(Pazpar2Commands.RECORD,   new RecordCommand(stateManager));\r
+    commands.put(Pazpar2Commands.TERMLIST, new TermlistCommand(stateManager));\r
+    commands.put(Pazpar2Commands.BYTARGET, new BytargetCommand(stateManager));  \r
+\r
+    commands.put(ServiceProxyCommands.AUTH, new AuthCommand(stateManager));\r
+    commands.put(ServiceProxyCommands.CATEGORIES, new CategoriesCommand(stateManager));\r
+    // key = "#1";\r
   }\r
     \r
   /**\r
@@ -51,7 +57,7 @@ public class Pazpar2State {
     for (String commandName : previousState.commands.keySet()) {\r
       this.commands.put(commandName, previousState.commands.get(commandName).copy());\r
     }\r
-    this.commands.put(newCommand.getName(),newCommand);\r
+    this.commands.put(newCommand.getCommandName(),newCommand);\r
     this.key = getKey();           \r
   }\r
     \r
@@ -59,18 +65,21 @@ public class Pazpar2State {
    * Generates a state key that can be used by the browser to pick\r
    * up this state again at a later point in time.\r
    * \r
+   * @see  {@link com.indexdata.mkjsf.pazpar2.state.StateManager#setCurrentStateKey}\r
    * @return\r
    */\r
   public String getKey() {\r
     if (key == null) {\r
       StringBuilder querystatebuilder = new StringBuilder("");\r
       for (Pazpar2Command command : commands.values()) {\r
-        if (command.hasParameters()) {\r
-          querystatebuilder.append("||"+command.getName()+"::");\r
-          querystatebuilder.append(command.getValueWithExpressions());\r
-        }      \r
+        if (! (command instanceof AuthCommand )) {\r
+          if (command.hasParameters()) {\r
+            querystatebuilder.append("||"+command.getCommandName()+"::");\r
+            querystatebuilder.append(command.getValueWithExpressions());\r
+          }\r
+        }\r
       }            \r
-      key = "#"+querystatebuilder.toString().hashCode();\r
+      key = "#"+querystatebuilder.toString();\r
       return key;\r
     } else {      \r
       return key;\r
@@ -86,9 +95,9 @@ public class Pazpar2State {
   public boolean stateMutating (Pazpar2Command command) {\r
     if (command == null) {\r
       return true;\r
-    } else if (commands.get(command.getName()) == null) {\r
+    } else if (commands.get(command.getCommandName()) == null) {\r
       return true;\r
-    } else if ((command.equals(commands.get(command.getName())))) {\r
+    } else if ((command.equals(commands.get(command.getCommandName())))) {\r
       return false;      \r
     } else {\r
       return true;\r