projects
/
mkjsf-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renames Pz2Bean to Pz2Service
[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
3ceaa8d
..
67213e3
100644
(file)
--- 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;
\r
import java.io.Serializable;
\r
\r
\r
import java.io.Serializable;
\r
\r
-import javax.annotation.PostConstruct;
\r
import javax.enterprise.context.SessionScoped;
\r
import javax.enterprise.context.SessionScoped;
\r
-import javax.inject.Inject;
\r
import javax.inject.Named;
\r
\r
import org.apache.log4j.Logger;
\r
\r
import javax.inject.Named;
\r
\r
import org.apache.log4j.Logger;
\r
\r
+import com.indexdata.mkjsf.pazpar2.Pz2Service;
\r
import com.indexdata.mkjsf.pazpar2.commands.sp.ServiceProxyCommands;
\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
import com.indexdata.mkjsf.utils.Utils;
\r
\r
-@Named("pzreq") @SessionScoped
\r
+@SessionScoped @Named
\r
public class Pazpar2Commands implements Serializable {
\r
\r
private static final long serialVersionUID = -5172466320351302413L;
\r
public class Pazpar2Commands implements Serializable {
\r
\r
private static final long serialVersionUID = -5172466320351302413L;
\r
@@
-27,65
+25,61
@@
public class Pazpar2Commands implements Serializable {
public static final String SHOW = "show";
\r
public static final String RECORD = "record";
\r
public static final String TERMLIST = "termlist";
\r
public static final String SHOW = "show";
\r
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
\r
- protected StateManager stateMgr;
\r
+ public static final String BYTARGET = "bytarget";
\r
+ private ServiceProxyCommands sp = null;
\r
\r
public Pazpar2Commands() {
\r
\r
public Pazpar2Commands() {
\r
- logger.info("Initializing Pazpar2Commands [" + Utils.objectId(this) + "]");
\r
+ logger.info("Initializing Pazpar2Commands [" + Utils.objectId(this) + "]");
\r
}
\r
}
\r
-
\r
- @PostConstruct
\r
- public void postConstruct() {
\r
- logger.info("in post-construct stateMgr is " + stateMgr);
\r
- }
\r
-
\r
+
\r
+ // public void setService(Pz2Service service) {
\r
+ // this.pz2 = service;
\r
+ // logger.info("Post construct Pazpar2Command: Service is " + pz2);
\r
+ // }
\r
+
\r
public InitCommand getInit() {
\r
public InitCommand getInit() {
\r
- return (InitCommand) (stateMgr.getCommand(INIT));
\r
+ return (InitCommand) (Pz2Service.get().getStateMgr().getCommand(INIT));
\r
}
\r
}
\r
-
\r
+
\r
public PingCommand getPing() {
\r
public PingCommand getPing() {
\r
- return (PingCommand) (stateMgr.getCommand(PING));
\r
+ return (PingCommand) (Pz2Service.get().getStateMgr().getCommand(PING));
\r
}
\r
\r
public SettingsCommand getSettings() {
\r
}
\r
\r
public SettingsCommand getSettings() {
\r
- return (SettingsCommand) (stateMgr.getCommand(SETTINGS));
\r
+ return (SettingsCommand) (Pz2Service.get().getStateMgr().getCommand(SETTINGS));
\r
}
\r
\r
public SearchCommand getSearch() {
\r
}
\r
\r
public SearchCommand getSearch() {
\r
- return (SearchCommand) (stateMgr.getCommand(SEARCH));
\r
+ return (SearchCommand) (Pz2Service.get().getStateMgr().getCommand(SEARCH));
\r
}
\r
\r
public StatCommand getStat() {
\r
}
\r
\r
public StatCommand getStat() {
\r
- return (StatCommand) (stateMgr.getCommand(STAT));
\r
+ return (StatCommand) (Pz2Service.get().getStateMgr().getCommand(STAT));
\r
}
\r
\r
public ShowCommand getShow() {
\r
}
\r
\r
public ShowCommand getShow() {
\r
- return (ShowCommand) (stateMgr.getCommand(SHOW));
\r
+ return (ShowCommand) (Pz2Service.get().getStateMgr().getCommand(SHOW));
\r
}
\r
\r
public RecordCommand getRecord() {
\r
}
\r
\r
public RecordCommand getRecord() {
\r
- return (RecordCommand) (stateMgr.getCommand(RECORD));
\r
+ return (RecordCommand) (Pz2Service.get().getStateMgr().getCommand(RECORD));
\r
}
\r
\r
public TermlistCommand getTermlist() {
\r
}
\r
\r
public TermlistCommand getTermlist() {
\r
- return (TermlistCommand) (stateMgr.getCommand(TERMLIST));
\r
+ return (TermlistCommand) (Pz2Service.get().getStateMgr().getCommand(TERMLIST));
\r
}
\r
\r
public BytargetCommand getBytarget() {
\r
}
\r
\r
public BytargetCommand getBytarget() {
\r
- return (BytargetCommand) (stateMgr.getCommand(BYTARGET));
\r
+ return (BytargetCommand) (Pz2Service.get().getStateMgr().getCommand(BYTARGET));
\r
}
\r
\r
public Pazpar2Command getCommand(String name) {
\r
}
\r
\r
public Pazpar2Command getCommand(String name) {
\r
- return stateMgr.getCommand(name);
\r
+ return Pz2Service.get().getStateMgr().getCommand(name);
\r
}
\r
\r
public ServiceProxyCommands getSp() {
\r
if (sp == null) {
\r
}
\r
\r
public ServiceProxyCommands getSp() {
\r
if (sp == null) {
\r
- sp = new ServiceProxyCommands(stateMgr);
\r
+ sp = new ServiceProxyCommands(Pz2Service.get().getStateMgr());
\r
}
\r
return sp;
\r
}
\r
}
\r
return sp;
\r
}
\r