Cleans up SP auth, parse resps, store for display, etc

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

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
index 9e04d6e..2524d47 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
@@ -9,6 +9,7 @@ import javax.inject.Named;
 \r
 import org.apache.log4j.Logger;\r
 \r
+import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommands;\r
 import com.indexdata.mkjsf.pazpar2.state.StateManager;\r
 import com.indexdata.mkjsf.utils.Utils;\r
 \r
@@ -17,7 +18,7 @@ public class Pazpar2Commands implements Serializable {
 \r
   private static final long serialVersionUID = -5172466320351302413L;\r
   private static Logger logger = Logger.getLogger(Pazpar2Commands.class);\r
-\r
+  \r
   public static final String INIT =     "init";\r
   public static final String PING =     "ping";\r
   public static final String SETTINGS = "settings";\r
@@ -27,8 +28,11 @@ public class Pazpar2Commands implements Serializable {
   public static final String RECORD =   "record";\r
   public static final String TERMLIST = "termlist";\r
   public static final String BYTARGET = "bytarget";\r
+  \r
+  private ServiceProxyCommands sp = null;\r
     \r
-  @Inject StateManager stateMgr; \r
+  @Inject\r
+  protected StateManager stateMgr; \r
   \r
   public Pazpar2Commands() {\r
     logger.info("Initializing Pazpar2Commands [" + Utils.objectId(this) + "]");\r
@@ -78,5 +82,12 @@ public class Pazpar2Commands implements Serializable {
   public Pazpar2Command getCommand(String name) {\r
     return stateMgr.getCommand(name);\r
   }\r
+  \r
+  public ServiceProxyCommands getSp() {\r
+    if (sp == null) {\r
+      sp = new ServiceProxyCommands(stateMgr);\r
+    }\r
+    return sp;\r
+  }\r
       \r
 }\r