diff options
Diffstat (limited to 'BKUGuiExt/src')
7 files changed, 21 insertions, 35 deletions
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java index 5754f52a..a37d73b9 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/ActivationGUI.java @@ -63,9 +63,8 @@ public class ActivationGUI extends CardMgmtGUI implements ActivationGUIFacade { Style guiStyle, URL backgroundImgURL, FontProvider fontProvider, - HelpListener helpListener, - SwitchFocusListener switchFocusListener) { - super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener); + HelpListener helpListener) { + super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener); progressBar = new JProgressBar(); } diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java index 2b81a40e..5f3dabfe 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/CardMgmtGUI.java @@ -50,9 +50,8 @@ public class CardMgmtGUI extends BKUGUIImpl { Style guiStyle, URL backgroundImgURL, FontProvider fontProvider, - HelpListener helpListener, - SwitchFocusListener switchFocusListener) { - super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener, switchFocusListener); + HelpListener helpListener) { + super(contentPane, locale, guiStyle, backgroundImgURL, fontProvider, helpListener); } @Override diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java index c669094c..965ce27e 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java @@ -60,9 +60,9 @@ public class GetCertificateGUI extends CardMgmtGUI implements public GetCertificateGUI(Container contentPane, Locale locale, URL backgroundImgURL, FontProvider fontProvider, - HelpListener helpListener, SwitchFocusListener switchFocusListener) { + HelpListener helpListener) { super(contentPane, locale, Style.advanced, backgroundImgURL, fontProvider, - helpListener, switchFocusListener); + helpListener); } diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java index e6265a07..1aea3d83 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetHardwareInfoGUI.java @@ -64,9 +64,9 @@ public class GetHardwareInfoGUI extends CardMgmtGUI implements public GetHardwareInfoGUI(Container contentPane, Locale locale, URL backgroundImgURL, FontProvider fontProvider, - HelpListener helpListener, SwitchFocusListener switchFocusListener) { + HelpListener helpListener) { super(contentPane, locale, Style.advanced, backgroundImgURL, fontProvider, - helpListener, switchFocusListener); + helpListener); } diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java index aed3b5f1..84282ed7 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java @@ -65,9 +65,9 @@ public class IdentityLinkGUI extends CardMgmtGUI implements protected JButton activateButton; public IdentityLinkGUI(Container contentPane, Locale locale, URL backgroundImgURL, FontProvider fontProvider, - HelpListener helpListener, SwitchFocusListener switchFocusListener) { + HelpListener helpListener) { super(contentPane, locale, Style.advanced, backgroundImgURL, fontProvider, - helpListener, switchFocusListener); + helpListener); // TODO Auto-generated constructor stub this.activateButton = new JButton(); } @@ -181,10 +181,8 @@ public class IdentityLinkGUI extends CardMgmtGUI implements messageHorizontal.addPreferredGap( LayoutStyle.ComponentPlacement.UNRELATED, 0, - Short.MAX_VALUE).addComponent(switchFocusDummyLabel) - .addComponent(helpLabel); - messageVertical.addComponent(switchFocusDummyLabel).addComponent( - helpLabel); + Short.MAX_VALUE).addComponent(helpLabel); + messageVertical.addComponent(helpLabel); } mainPanelLayout.setHorizontalGroup( diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java index e3e0ec83..d09d348a 100644 --- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java +++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUI.java @@ -82,9 +82,9 @@ public class PINManagementGUI extends CardMgmtGUI implements public PINManagementGUI(Container contentPane, Locale locale, URL backgroundImgURL, FontProvider fontProvider, - HelpListener helpListener, SwitchFocusListener switchFocusListener) { + HelpListener helpListener) { super(contentPane, locale, Style.advanced, backgroundImgURL, fontProvider, - helpListener, switchFocusListener); + helpListener); cancelButton = new JButton(); this.pinStatusRenderer = new PINStatusRenderer(cardmgmtMessages); @@ -236,10 +236,8 @@ public class PINManagementGUI extends CardMgmtGUI implements // messageHorizontal // .addPreferredGap(LayoutStyle.ComponentPlacement.UNRELATED, 0, // Short.MAX_VALUE) - // .addComponent(switchFocusDummyLabel) // .addComponent(helpLabel); // messageVertical - // .addComponent(switchFocusDummyLabel) // .addComponent(helpLabel); // } // @@ -301,10 +299,8 @@ public class PINManagementGUI extends CardMgmtGUI implements if (!renderHeaderPanel) { messageHorizontal.addPreferredGap( LayoutStyle.ComponentPlacement.UNRELATED, 0, - Short.MAX_VALUE).addComponent(switchFocusDummyLabel) - .addComponent(helpLabel); - messageVertical.addComponent(switchFocusDummyLabel).addComponent( - helpLabel); + Short.MAX_VALUE).addComponent(helpLabel); + messageVertical.addComponent(helpLabel); } mainPanelLayout.setHorizontalGroup(mainPanelLayout.createParallelGroup( @@ -474,11 +470,8 @@ public class PINManagementGUI extends CardMgmtGUI implements if (!renderHeaderPanel) { infoHorizontal.addPreferredGap( LayoutStyle.ComponentPlacement.UNRELATED, 0, - Short.MAX_VALUE) - .addComponent(switchFocusDummyLabel).addComponent( - helpLabel); - infoVertical.addComponent(switchFocusDummyLabel) - .addComponent(helpLabel); + Short.MAX_VALUE).addComponent(helpLabel); + infoVertical.addComponent(helpLabel); } GroupLayout.ParallelGroup pinHorizontal; @@ -977,11 +970,8 @@ public class PINManagementGUI extends CardMgmtGUI implements if (!renderHeaderPanel) { infoHorizontal.addPreferredGap( LayoutStyle.ComponentPlacement.UNRELATED, 0, - Short.MAX_VALUE) - .addComponent(switchFocusDummyLabel).addComponent( - helpLabel); - infoVertical.addComponent(switchFocusDummyLabel) - .addComponent(helpLabel); + Short.MAX_VALUE).addComponent(helpLabel); + infoVertical.addComponent(helpLabel); } GroupLayout.ParallelGroup pinHorizontal; diff --git a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java index 768a7034..e5b052c8 100644 --- a/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java +++ b/BKUGuiExt/src/test/java/at/gv/egiz/bku/gui/ActivationGuiTest.java @@ -49,7 +49,7 @@ public class ActivationGuiTest { Container contentPane = testFrame.getContentPane(); contentPane.setPreferredSize(new Dimension(152, 145)); // contentPane.setPreferredSize(new Dimension(300, 190)); - ActivationGUIFacade gui = new ActivationGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, new DummyFontLoader(), null, null); + ActivationGUIFacade gui = new ActivationGUI(contentPane, null, BKUGUIFacade.Style.tiny, null, new DummyFontLoader(), null); BKUGUIWorker worker = new BKUGUIWorker(); worker.init(gui); testFrame.pack(); |