From ebe6fc151f2ebf63cde3094d4d462d591d35b25d Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Fri, 4 Nov 2022 11:17:46 +0100 Subject: deduplicate doLayout and onDisplay, they do the same thing (more or less) --- .../composites/mobilebku/MobileBKUEnterNumberComposite.java | 11 +---------- .../gui/composites/mobilebku/MobileBKUEnterTANComposite.java | 3 +-- .../gui/composites/mobilebku/MobileBKUFido2Composite.java | 5 ++--- .../composites/mobilebku/MobileBKUFingerprintComposite.java | 10 ---------- .../gui/composites/mobilebku/MobileBKUQRComposite.java | 10 ---------- .../gui/composites/mobilebku/WaitingForAppComposite.java | 8 -------- 6 files changed, 4 insertions(+), 43 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku') 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 2a31ae80..7c02eda0 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 @@ -207,6 +207,7 @@ public class MobileBKUEnterNumberComposite extends StateComposite { } @Override public void onDisplay() { + getShell().setDefaultButton(this.btn_ok); if (this.txt_number.getText().isEmpty()) { this.txt_number.setFocus(); } else { @@ -221,16 +222,6 @@ public class MobileBKUEnterNumberComposite extends StateComposite { this.btn_ok.setEnabled(true); } - /** - * (non-Javadoc) - * - * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() - */ - @Override - public void doLayout() { - getShell().setDefaultButton(this.btn_ok); - } - /** * @return the mobileNumber */ 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 70fabcc8..a1e90f51 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 @@ -258,8 +258,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { SWTUtils.anchor(lblMessage).right(btn_fido2, -10).bottom(100, -20); } - @Override public void doLayout() { getShell().setDefaultButton(btn_ok); } - @Override public void onDisplay() { txt_tan.setFocus(); } + @Override public void onDisplay() { getShell().setDefaultButton(btn_ok); txt_tan.setFocus(); } /* * (non-Javadoc) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java index 48dec801..218416e2 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java @@ -74,8 +74,7 @@ public class MobileBKUFido2Composite extends StateComposite { this.getDisplay().wake(); } }).start(); - } - @Override public void onDisplay() { beginAuthentication(); } + } public MobileBKUFido2Composite(Composite parent, int style, State state) { super(parent, style, state); @@ -121,7 +120,7 @@ public class MobileBKUFido2Composite extends StateComposite { SWTUtils.addSelectionListener(lnk_sigData, (e) -> { SWTUtils.openURL(this.signatureDataURI); }); } - @Override public void doLayout() { getShell().setDefaultButton(this.btn_authenticate); } + @Override public void onDisplay() { getShell().setDefaultButton(this.btn_authenticate); beginAuthentication(); } @Override public void reloadResources() { diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFingerprintComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFingerprintComposite.java index 9d9e3064..0d6bdefc 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFingerprintComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUFingerprintComposite.java @@ -160,16 +160,6 @@ public class MobileBKUFingerprintComposite extends StateComposite { reloadResources(); } - /* - * (non-Javadoc) - * - * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() - */ - @Override - public void doLayout() { - // Nothing to do - } - /* * (non-Javadoc) * diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUQRComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUQRComposite.java index b121d420..135bb775 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUQRComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/MobileBKUQRComposite.java @@ -222,16 +222,6 @@ public class MobileBKUQRComposite extends StateComposite { reloadResources(); } - /* - * (non-Javadoc) - * - * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() - */ - @Override - public void doLayout() { - // Nothing to do - } - /* * (non-Javadoc) * diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/WaitingForAppComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/WaitingForAppComposite.java index 226c416d..24529452 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/WaitingForAppComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/mobilebku/WaitingForAppComposite.java @@ -93,14 +93,6 @@ public class WaitingForAppComposite extends StateComposite { } - /* (non-Javadoc) - * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() - */ - @Override - public void doLayout() { - // Nothing to do here - } - /* (non-Javadoc) * @see at.asit.pdfover.gui.composites.StateComposite#reloadResources() */ -- cgit v1.2.3