out with the old

2 files changed, 10 insertions, 25 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterNumberComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterNumberComposite.java
index d5980229..b7d70167 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterNumberComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterNumberComposite.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import at.asit.pdfover.commons.Constants;
-import at.asit.pdfover.gui.bku.OLDmobile.MobileBKUHelper;
+import at.asit.pdfover.gui.bku.mobile.MobileBKUValidator;
 import at.asit.pdfover.gui.composites.StateComposite;
 import at.asit.pdfover.gui.exceptions.InvalidPasswordException;
 import at.asit.pdfover.gui.utils.SWTUtils;
@@ -65,7 +65,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite {
 
 				String password = MobileBKUEnterNumberComposite.this.txt_password.getText();
 
-				MobileBKUHelper.validatePassword(password);
+				MobileBKUValidator.validatePassword(password);
 
 				MobileBKUEnterNumberComposite.this.mobilePassword = password;
 				MobileBKUEnterNumberComposite.this.userAck = true;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterTANComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterTANComposite.java
index dfd9dc40..b326edfa 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterTANComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUEnterTANComposite.java
@@ -37,7 +37,6 @@ import com.beust.jcommander.internal.Nullable;
 
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.commons.Messages;
-import at.asit.pdfover.gui.bku.OLDmobile.ATrustStatus;
 import at.asit.pdfover.gui.composites.StateComposite;
 import at.asit.pdfover.gui.utils.SWTUtils;
 import at.asit.pdfover.gui.workflow.states.State;
@@ -101,7 +100,7 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 
 	private Link lnk_sig_data;
 
-	private Label lblTries;
+	private Label lblMessage;
 	private Label lblRefValLabel;
 	private Label lblTan;
 
@@ -117,28 +116,14 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	public void reset() { this.userAck = this.userCancel = this.userFido2 = false; }
 
 	/**
-	 * Set how many tries are left
-	 *
-	 * @param tries
-	 */
-	public void setTries(int tries) {
-		if ((tries > 0) && (tries < ATrustStatus.MOBILE_MAX_TAN_TRIES)) {
-			if (tries > 1)
-				SWTUtils.setLocalizedText(lblTries, "tanEnter.try");
-			else
-				SWTUtils.setLocalizedText(lblTries, "tanEnter.tries", tries);
-		}
-	}
-
-	/**
 	 * Set an error message
 	 * @param errorMessage the error message
 	 */
 	public void setErrorMessage(String errorMessage) {
 		if (errorMessage == null)
-			this.lblTries.setText("");
+			this.lblMessage.setText("");
 		else
-			this.lblTries.setText(
+			this.lblMessage.setText(
 					Messages.getString("error.Title") + ": " + errorMessage);
 	}
 
@@ -152,9 +137,9 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 	 * @param msg
 	 */
 	public void setMessage(String msg) {
-		this.lblTries.setText(msg);
-		this.lblTries.redraw();
-		this.lblTries.getParent().layout(true, true);
+		this.lblMessage.setText(msg);
+		this.lblMessage.redraw();
+		this.lblMessage.getParent().layout(true, true);
 	}
 
 	/**
@@ -280,8 +265,8 @@ public class MobileBKUEnterTANComposite extends StateComposite {
 		SWTUtils.anchor(btn_fido2).right(btn_cancel, -20).bottom(100, -20);
 		SWTUtils.addSelectionListener(btn_fido2, (e) -> { this.userFido2 = true; });
 
-		this.lblTries = new Label(containerComposite, SWT.WRAP | SWT.NATIVE);
-		SWTUtils.anchor(lblTries).right(btn_fido2, -10).bottom(100, -20);
+		this.lblMessage = new Label(containerComposite, SWT.WRAP | SWT.NATIVE);
+		SWTUtils.anchor(lblMessage).right(btn_fido2, -10).bottom(100, -20);
 	}
 
 	@Override