From da0513c70d6599e2432d6a9fb24eada781856b0c Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Thu, 3 Nov 2022 14:22:34 +0100 Subject: move checksubclass boilerplate up to statecomposite --- .../java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java | 5 ----- .../at/asit/pdfover/gui/composites/ConfigurationComposite.java | 5 ----- .../at/asit/pdfover/gui/composites/DataSourceSelectComposite.java | 5 ----- .../main/java/at/asit/pdfover/gui/composites/OutputComposite.java | 5 ----- .../java/at/asit/pdfover/gui/composites/PositioningComposite.java | 5 ----- .../main/java/at/asit/pdfover/gui/composites/StateComposite.java | 3 +++ .../main/java/at/asit/pdfover/gui/composites/WaitingComposite.java | 5 ----- .../gui/composites/mobilebku/MobileBKUEnterNumberComposite.java | 5 ----- .../gui/composites/mobilebku/MobileBKUEnterTANComposite.java | 7 +------ .../pdfover/gui/composites/mobilebku/MobileBKUFido2Composite.java | 1 - .../gui/composites/mobilebku/MobileBKUFingerprintComposite.java | 5 ----- .../pdfover/gui/composites/mobilebku/MobileBKUQRComposite.java | 5 ----- .../pdfover/gui/composites/mobilebku/WaitingForAppComposite.java | 5 ----- 13 files changed, 4 insertions(+), 57 deletions(-) (limited to 'pdf-over-gui') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java index 2ac967cb..e1a843a8 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java @@ -118,11 +118,6 @@ public class BKUSelectionComposite extends StateComposite { reloadResources(); } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* (non-Javadoc) * @see at.asit.pdfover.gui.components.StateComposite#doLayout() */ diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java index 3baafab1..c6ff31cc 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java @@ -353,11 +353,6 @@ public class ConfigurationComposite extends StateComposite { return this.userDone; } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* * (non-Javadoc) * diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java index 78d7a45a..2c544366 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java @@ -270,11 +270,6 @@ public class DataSourceSelectComposite extends StateComposite { private Button btn_open; - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* * (non-Javadoc) * diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java index 12fe2cb9..e3533271 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java @@ -420,11 +420,6 @@ public class OutputComposite extends StateComposite { } } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* * (non-Javadoc) * diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java index 9f90cbbc..b93c262f 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java @@ -313,11 +313,6 @@ public class PositioningComposite extends StateComposite { }); } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* * (non-Javadoc) * diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java index 2a340fa8..93a7477b 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/StateComposite.java @@ -57,4 +57,7 @@ public abstract class StateComposite extends Composite { * Called when the control is .display()ed */ public void onDisplay() {} + + // allow subclassing of SWT components + @Override protected final void checkSubclass() {} } diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java index d3a3952f..69b0f2ef 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/WaitingComposite.java @@ -61,11 +61,6 @@ public class WaitingComposite extends StateComposite { progressBar.setLayoutData(fd_progressBar); } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* (non-Javadoc) * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ 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 38335c83..2a31ae80 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 @@ -214,11 +214,6 @@ public class MobileBKUEnterNumberComposite extends StateComposite { } } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /** * enables submit button */ 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 b09d5b57..3a3030de 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 @@ -255,12 +255,7 @@ public class MobileBKUEnterTANComposite extends StateComposite { this.lblMessage = new Label(containerComposite, SWT.WRAP | SWT.NATIVE); SWTUtils.anchor(lblMessage).right(btn_fido2, -10).bottom(100, -20); } - - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - + @Override public void doLayout() { getShell().setDefaultButton(btn_ok); } @Override public void onDisplay() { txt_tan.setFocus(); } 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 89dc431d..764eb8bf 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 @@ -100,7 +100,6 @@ public class MobileBKUFido2Composite extends StateComposite { SWTUtils.addSelectionListener(btn_authenticate, this::beginAuthentication); } - @Override protected void checkSubclass() {} @Override public void doLayout() { getShell().setDefaultButton(this.btn_authenticate); } @Override 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 d37b4402..05b91e87 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 @@ -158,11 +158,6 @@ public class MobileBKUFingerprintComposite extends StateComposite { reloadResources(); } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* * (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 f17d0057..f736f65a 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 @@ -221,11 +221,6 @@ public class MobileBKUQRComposite extends StateComposite { reloadResources(); } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* * (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 b1e676f0..cbe6e822 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 @@ -90,11 +90,6 @@ public class WaitingForAppComposite extends StateComposite { } - @Override - protected void checkSubclass() { - // Disable the check that prevents subclassing of SWT components - } - /* (non-Javadoc) * @see at.asit.pdfover.gui.composites.StateComposite#doLayout() */ -- cgit v1.2.3