X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fmkjsf%2Fpazpar2%2Fcommands%2FPazpar2Commands.java;h=67213e3cdd88cd93765fd65335e125148e75bc8e;hb=45780ca51a3f1a967acda7c4d7d71aebe7081a67;hp=3ceaa8d3c5293a97fd49997e72fed427655fa326;hpb=d400a082759c1a58cb79713f04ab2f3d62bca97c;p=mkjsf-moved-to-github.git

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 3ceaa8d..67213e3 100644
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/commands/Pazpar2Commands.java
@@ -2,18 +2,16 @@ package com.indexdata.mkjsf.pazpar2.commands;
 
 import java.io.Serializable;
 
-import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.log4j.Logger;
 
+import com.indexdata.mkjsf.pazpar2.Pz2Service;
 import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommands;
-import com.indexdata.mkjsf.pazpar2.state.StateManager;
 import com.indexdata.mkjsf.utils.Utils;
 
-@Named("pzreq") @SessionScoped
+@SessionScoped @Named
 public class Pazpar2Commands implements Serializable {
 
   private static final long serialVersionUID = -5172466320351302413L;
@@ -27,65 +25,61 @@ public class Pazpar2Commands implements Serializable {
   public static final String SHOW =     "show";
   public static final String RECORD =   "record";
   public static final String TERMLIST = "termlist";
-  public static final String BYTARGET = "bytarget";
-  
-  private ServiceProxyCommands sp = null;
-    
-  @Inject
-  protected StateManager stateMgr; 
+  public static final String BYTARGET = "bytarget";  
+  private ServiceProxyCommands sp = null;    
   
   public Pazpar2Commands() {
-    logger.info("Initializing Pazpar2Commands [" + Utils.objectId(this) + "]");
+    logger.info("Initializing Pazpar2Commands [" + Utils.objectId(this) + "]");   
   }
-  
-  @PostConstruct
-  public void postConstruct() {
-    logger.info("in post-construct stateMgr is " + stateMgr);
-  }
-    
+      
+  // public void setService(Pz2Service service) {
+  //   this.pz2 = service;
+  //  logger.info("Post construct Pazpar2Command: Service is " + pz2);    
+  // }
+      
   public InitCommand getInit() {
-    return (InitCommand) (stateMgr.getCommand(INIT));
+    return (InitCommand) (Pz2Service.get().getStateMgr().getCommand(INIT));    
   }
-  
+    
   public PingCommand getPing() {
-    return (PingCommand) (stateMgr.getCommand(PING));
+    return (PingCommand) (Pz2Service.get().getStateMgr().getCommand(PING));
   }
   
   public SettingsCommand getSettings() {
-    return (SettingsCommand) (stateMgr.getCommand(SETTINGS));
+    return (SettingsCommand) (Pz2Service.get().getStateMgr().getCommand(SETTINGS));
   }
 
   public SearchCommand getSearch() {
-    return (SearchCommand) (stateMgr.getCommand(SEARCH));
+    return (SearchCommand) (Pz2Service.get().getStateMgr().getCommand(SEARCH));
   }
   
   public StatCommand getStat() {
-    return (StatCommand) (stateMgr.getCommand(STAT));
+    return (StatCommand) (Pz2Service.get().getStateMgr().getCommand(STAT));
   }
   
   public ShowCommand getShow() {
-    return (ShowCommand) (stateMgr.getCommand(SHOW));
+    return (ShowCommand) (Pz2Service.get().getStateMgr().getCommand(SHOW));
   }
     
   public RecordCommand getRecord() {
-    return (RecordCommand) (stateMgr.getCommand(RECORD));
+    return (RecordCommand) (Pz2Service.get().getStateMgr().getCommand(RECORD));
   }
 
   public TermlistCommand getTermlist() {
-    return (TermlistCommand) (stateMgr.getCommand(TERMLIST));
+    return (TermlistCommand) (Pz2Service.get().getStateMgr().getCommand(TERMLIST));
   }
   
   public BytargetCommand getBytarget() {
-    return (BytargetCommand) (stateMgr.getCommand(BYTARGET));
+    return (BytargetCommand) (Pz2Service.get().getStateMgr().getCommand(BYTARGET));
   }
   
   public Pazpar2Command getCommand(String name) {    
-    return stateMgr.getCommand(name);
+    return Pz2Service.get().getStateMgr().getCommand(name);
   }
   
   public ServiceProxyCommands getSp() {
     if (sp == null) {
-      sp = new ServiceProxyCommands(stateMgr);
+      sp = new ServiceProxyCommands(Pz2Service.get().getStateMgr());
     }
     return sp;
   }