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
---
 .../at/gv/egiz/bku/pin/gui/VerifyPINProvider.java   | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java')

diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java
index fda1e402..f9300932 100644
--- a/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java
+++ b/smccSTAL/src/main/java/at/gv/egiz/bku/pin/gui/VerifyPINProvider.java
@@ -18,10 +18,10 @@ package at.gv.egiz.bku.pin.gui;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.smcc.CancelledException;
-import at.gv.egiz.smcc.PINSpec;
+import at.gv.egiz.smcc.PinInfo;
 import at.gv.egiz.smcc.pin.gui.PINProvider;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The number of retries is not fixed and there is no way (?) to obtain this value.
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class VerifyPINProvider extends AbstractPINProvider implements PINProvider {
 
-  protected static final Log log = LogFactory.getLog(VerifyPINProvider.class);
+  private final Logger log = LoggerFactory.getLogger(VerifyPINProvider.class);
 
   protected BKUGUIFacade gui;
   private boolean retry = false;
@@ -46,26 +46,25 @@ public class VerifyPINProvider extends AbstractPINProvider implements PINProvide
   }
 
   @Override
-  public char[] providePIN(PINSpec spec, int retries)
+  public char[] providePIN(PinInfo spec, int retries)
           throws CancelledException, InterruptedException {
 
     gui.showVerifyPINDialog(spec, (retry) ? retries : -1,
             this, "verify",
             this, "cancel");
 
-    log.trace("[" + Thread.currentThread().getName() + "] wait for action");
+    log.trace("[{}] wait for action.", Thread.currentThread().getName());
     waitForAction();
-    log.trace("[" + Thread.currentThread().getName() + "] received action " + action);
+    log.trace("[{}] received action {}.", Thread.currentThread().getName(), action);
+
+    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
+            BKUGUIFacade.MESSAGE_WAIT);
 
     if ("cancel".equals(action)) {
-      gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-              BKUGUIFacade.MESSAGE_WAIT);
       throw new CancelledException(spec.getLocalizedName() +
               " entry cancelled");
     }
     
-    gui.showMessageDialog(BKUGUIFacade.TITLE_WAIT,
-            BKUGUIFacade.MESSAGE_WAIT);
     retry = true;
     return gui.getPin();
   }
-- 
cgit v1.2.3