Refactors commands and injection

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / errors / ErrorCentral.java

diff --git a/src/main/java/com/indexdata/mkjsf/errors/ErrorCentral.java b/src/main/java/com/indexdata/mkjsf/errors/ErrorCentral.java
index 499fad8..71bb9c5 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/errors/ErrorCentral.java
+++ b/src/main/java/com/indexdata/mkjsf/errors/ErrorCentral.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import javax.annotation.PostConstruct;\r
 import javax.enterprise.context.SessionScoped;\r
 import javax.inject.Inject;\r
 import javax.inject.Named;\r
@@ -12,28 +11,24 @@ import javax.inject.Named;
 import org.apache.log4j.Logger;\r
 \r
 import com.indexdata.mkjsf.config.ConfigurationReader;\r
-import com.indexdata.mkjsf.pazpar2.data.Responses;\r
+import com.indexdata.mkjsf.pazpar2.Pz2Bean;\r
 \r
-@Named("errors") @SessionScoped\r
+@SessionScoped @Named\r
 public class ErrorCentral implements Serializable {\r
 \r
   private static final long serialVersionUID = -1658192041068396628L;\r
   private static Logger logger = Logger.getLogger(ErrorCentral.class);  \r
   private ErrorHelper errorHelper = null;\r
-  \r
-  @Inject Responses pzresp;\r
-  @Inject ConfigurationReader configurator;\r
+    \r
+  @Inject ConfigurationReader configurator;  \r
   \r
   private List<ErrorInterface> configurationErrors = new ArrayList<ErrorInterface>();\r
 \r
-  public ErrorCentral() {}\r
-  \r
-  @PostConstruct \r
-  public void postConstruct() {\r
-    errorHelper = new ErrorHelper(configurator);\r
-    pzresp.setErrorHelper(errorHelper);    \r
+  public ErrorCentral() {\r
+    logger.info("Instantiating ErrorCentral "+this);\r
+    errorHelper = new ErrorHelper(configurator);       \r
   }\r
-    \r
+      \r
   public void addConfigurationError (ErrorInterface configError) {\r
     configError.setErrorHelper(errorHelper);\r
     configurationErrors.add(configError);\r
@@ -44,11 +39,11 @@ public class ErrorCentral implements Serializable {
   }\r
 \r
   public boolean hasCommandErrors () {\r
-    return pzresp.hasApplicationError();\r
+    return Pz2Bean.get().getPzresp().hasApplicationError();\r
   }\r
   \r
   public ErrorInterface getCommandError () {\r
-    return pzresp.getCommandError();\r
+    return Pz2Bean.get().getPzresp().getCommandError();\r
   }\r
 \r
   /**\r
@@ -62,6 +57,10 @@ public class ErrorCentral implements Serializable {
   public List<ErrorInterface> getConfigurationErrors() {    \r
     return configurationErrors;\r
   }\r
+  \r
+  public ErrorHelper getHelper () {\r
+    return errorHelper;\r
+  }\r
 \r
 \r
 }\r