From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 5 May 2010 15:29:01 +0000
Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../bku/slcommands/impl/GetStatusCommandImpl.java  | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java')

diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
index 0c2b96f9..d58141a1 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/slcommands/impl/GetStatusCommandImpl.java
@@ -19,6 +19,7 @@ package at.gv.egiz.bku.slcommands.impl;
 
 import at.buergerkarte.namespaces.securitylayer._1.GetStatusRequestType;
 import at.gv.egiz.bku.slcommands.GetStatusCommand;
+import at.gv.egiz.bku.slcommands.SLCommandContext;
 import at.gv.egiz.bku.slcommands.SLResult;
 import at.gv.egiz.bku.slexceptions.SLCommandException;
 import at.gv.egiz.stal.ErrorResponse;
@@ -28,8 +29,8 @@ import at.gv.egiz.stal.StatusRequest;
 import at.gv.egiz.stal.StatusResponse;
 import java.util.Collections;
 import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -37,7 +38,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class GetStatusCommandImpl extends SLCommandImpl<GetStatusRequestType> implements GetStatusCommand {
 
-  protected static Log log = LogFactory.getLog(GetStatusCommandImpl.class);
+  protected final Logger log = LoggerFactory.getLogger(GetStatusCommandImpl.class);
 
   @Override
   public String getName() {
@@ -45,16 +46,15 @@ public class GetStatusCommandImpl extends SLCommandImpl<GetStatusRequestType> im
   }
 
   @Override
-  public SLResult execute() {
+  public SLResult execute(SLCommandContext commandContext) {
 
     //ignore maxDelay and TokenStatus
-//    GetStatusRequestType req = getRequestValue();
 
-    log.debug("execute GetStatusRequest");
+    log.debug("Execute GetStatusRequest.");
 
     StatusRequest stalRequest = new StatusRequest();
 
-    STAL stal = cmdCtx.getSTAL();
+    STAL stal = commandContext.getSTAL();
 
     List<STALResponse> responses = stal.handleRequest(Collections.singletonList(stalRequest));
     
@@ -62,16 +62,16 @@ public class GetStatusCommandImpl extends SLCommandImpl<GetStatusRequestType> im
       STALResponse stalResponse = responses.get(0);
       if (stalResponse instanceof StatusResponse) {
         boolean ready = ((StatusResponse) stalResponse).isCardReady();
-        log.trace("received status response cardReady: " + ready);
+        log.trace("Received status response cardReady: {}.", ready);
         return new GetStatusResultImpl(ready);
       } else if (stalResponse instanceof ErrorResponse) {
-        log.debug("received error response");
+        log.debug("Received error response.");
         SLCommandException ex = new SLCommandException(((ErrorResponse) stalResponse).getErrorCode());
-        return new ErrorResultImpl(ex, cmdCtx.getLocale());
+        return new ErrorResultImpl(ex, commandContext.getLocale());
       }
     }
-    log.error("received unexpected responses");
-    return new ErrorResultImpl(new SLCommandException(4000), cmdCtx.getLocale());
+    log.error("Received unexpected responses.");
+    return new ErrorResultImpl(new SLCommandException(4000), commandContext.getLocale());
 
   }
 }
-- 
cgit v1.2.3