diff options
Diffstat (limited to 'smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui')
| -rw-r--r-- | smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java | 16 | ||||
| -rw-r--r-- | smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java | 20 |
2 files changed, 18 insertions, 18 deletions
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java index 26a24609..eadecc11 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINGUI.java @@ -20,14 +20,14 @@ import at.gv.egiz.bku.gui.BKUGUIFacade; import at.gv.egiz.bku.gui.PINManagementGUIFacade; import at.gv.egiz.bku.gui.PINManagementGUIFacade.DIALOG; 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.ModifyPINGUI; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ManagementPINGUI extends ManagementPINProvider implements ModifyPINGUI { - protected static final Log log = LogFactory.getLog(ManagementPINGUI.class); + protected static final Logger log = LoggerFactory.getLogger(ManagementPINGUI.class); private boolean retry = false; @@ -36,7 +36,7 @@ public class ManagementPINGUI extends ManagementPINProvider implements ModifyPIN } @Override - public void modifyPINDirect(PINSpec spec, int retries) + public void modifyPINDirect(PinInfo spec, int retries) throws CancelledException, InterruptedException { gui.showModifyPINDirect(type, spec, (retry) ? retries : -1); retry = true; @@ -48,19 +48,19 @@ public class ManagementPINGUI extends ManagementPINProvider implements ModifyPIN } @Override - public void enterCurrentPIN(PINSpec spec, int retries) { + public void enterCurrentPIN(PinInfo spec, int retries) { gui.showEnterCurrentPIN(type, spec, (retry) ? retries : -1); retry = true; } @Override - public void enterNewPIN(PINSpec spec) { + public void enterNewPIN(PinInfo spec) { gui.showEnterNewPIN(type, spec); retry = true; } @Override - public void confirmNewPIN(PINSpec spec) { + public void confirmNewPIN(PinInfo spec) { gui.showConfirmNewPIN(type, spec); retry = true; } diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java index 8d842d13..488ea754 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/pin/gui/ManagementPINProvider.java @@ -19,14 +19,14 @@ package at.gv.egiz.bku.pin.gui; import at.gv.egiz.bku.gui.BKUGUIFacade; import at.gv.egiz.bku.gui.PINManagementGUIFacade; 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.ModifyPINProvider; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ManagementPINProvider extends AbstractPINProvider implements ModifyPINProvider { - protected static final Log log = LogFactory.getLog(ManagementPINProvider.class); + private final Logger log = LoggerFactory.getLogger(ManagementPINProvider.class); protected PINManagementGUIFacade gui; protected PINManagementGUIFacade.DIALOG type; private boolean retry = false; @@ -37,16 +37,16 @@ public class ManagementPINProvider extends AbstractPINProvider implements Modify } @Override - public char[] provideCurrentPIN(PINSpec spec, int retries) + public char[] provideCurrentPIN(PinInfo spec, int retries) throws CancelledException, InterruptedException { gui.showPINDialog(type, spec, (retry) ? retries : -1, this, "change", 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); @@ -60,7 +60,7 @@ public class ManagementPINProvider extends AbstractPINProvider implements Modify } @Override - public char[] provideNewPIN(PINSpec spec) + public char[] provideNewPIN(PinInfo spec) throws CancelledException, InterruptedException { char[] pin = gui.getPin(); @@ -73,9 +73,9 @@ public class ManagementPINProvider extends AbstractPINProvider implements Modify this, "activate", 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); |