Simplifies state handling further

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

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java
index bac6787..a0397a9 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/commands/Pazpar2Commands.java
@@ -40,88 +40,43 @@ public class Pazpar2Commands implements Serializable {
   }\r
     \r
   public InitCommand getInit() {\r
-    return (InitCommand) (stateMgr.checkOut(INIT));\r
+    return (InitCommand) (stateMgr.getCommand(INIT));\r
   }\r
   \r
   public PingCommand getPing() {\r
-    return (PingCommand) (stateMgr.checkOut(PING));\r
+    return (PingCommand) (stateMgr.getCommand(PING));\r
   }\r
   \r
   public SettingsCommand getSettings() {\r
-    return (SettingsCommand) (stateMgr.checkOut(SETTINGS));\r
+    return (SettingsCommand) (stateMgr.getCommand(SETTINGS));\r
   }\r
 \r
   public SearchCommand getSearch() {\r
-    return (SearchCommand) (stateMgr.checkOut(SEARCH));\r
+    return (SearchCommand) (stateMgr.getCommand(SEARCH));\r
   }\r
   \r
-  /**\r
-   * Gets a mutable SearchCommand from current state (no checkout)\r
-   * Can be used for updating Search parameters without spawning new state.\r
-   * @return\r
-   */\r
-  public SearchCommand getSearchInState() {\r
-    return (SearchCommand) (stateMgr.getCurrentState().getCommand(SEARCH));\r
-  }\r
-\r
   public StatCommand getStat() {\r
-    return (StatCommand) (stateMgr.checkOut(STAT));\r
+    return (StatCommand) (stateMgr.getCommand(STAT));\r
   }\r
   \r
   public ShowCommand getShow() {\r
-    return (ShowCommand) (stateMgr.checkOut(SHOW));\r
-  }\r
-  \r
-  /**\r
-   * Gets a mutable ShowCommand from current state (no checkout)\r
-   * Can be used for updating show parameters without spawning new state.\r
-   * @return\r
-   */\r
-  public ShowCommand getShowInState () {\r
-    return (ShowCommand) (stateMgr.getCurrentState().getCommand(SHOW));\r
+    return (ShowCommand) (stateMgr.getCommand(SHOW));\r
   }\r
-  \r
-  /**\r
-   * Gets a detached (copied) record command from the current state\r
-   * \r
-   * @return\r
-   */\r
+    \r
   public RecordCommand getRecord() {\r
-    return (RecordCommand) (stateMgr.checkOut(RECORD));\r
+    return (RecordCommand) (stateMgr.getCommand(RECORD));\r
   }\r
 \r
-  /**\r
-   * Gets a mutable RecordCommand from current state (no checkout)\r
-   * Can be used for updating record parameters without spawning new state.\r
-   * @return\r
-   */  \r
-  public RecordCommand getRecordInState() {\r
-    return (RecordCommand)stateMgr.getCurrentState().getCommand(RECORD);\r
-  }\r
-  \r
-  /**\r
-   * Gets a detached (copied) termlist command from the current state\r
-   * \r
-   * @return Mutable termlist command\r
-   */\r
   public TermlistCommand getTermlist() {\r
-    return (TermlistCommand) (stateMgr.checkOut(TERMLIST));\r
+    return (TermlistCommand) (stateMgr.getCommand(TERMLIST));\r
   }\r
   \r
-  /**\r
-   * \r
-   * @return\r
-   */\r
   public BytargetCommand getBytarget() {\r
-    return (BytargetCommand) (stateMgr.checkOut(BYTARGET));\r
+    return (BytargetCommand) (stateMgr.getCommand(BYTARGET));\r
   }\r
   \r
   public Pazpar2Command getCommand(String name) {\r
-    return stateMgr.checkOut(name);\r
-  }\r
-  \r
-  public CommandReadOnly getCommandReadOnly(String name) {\r
     return stateMgr.getCommand(name);\r
   }\r
-    \r
+      \r
 }\r