diff options
| author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2008-09-18 09:48:56 +0000 |
|---|---|---|
| committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2008-09-18 09:48:56 +0000 |
| commit | 12d4f22e52fba1f867571afbd539b532e2afe1b5 (patch) | |
| tree | a8e6ca425d07c51962f1efd402ad8f09a9cb1d5f | |
| parent | a20fb683943ce0893302b6dc25015c998cd9687f (diff) | |
| download | mocca-12d4f22e52fba1f867571afbd539b532e2afe1b5.tar.gz mocca-12d4f22e52fba1f867571afbd539b532e2afe1b5.tar.bz2 mocca-12d4f22e52fba1f867571afbd539b532e2afe1b5.zip | |
wait message bug
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@47 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
3 files changed, 24 insertions, 15 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java index be4aeded..449dfd61 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java @@ -835,7 +835,8 @@ public class BKUGUI implements BKUGUIFacade { .addComponent(errorMsgLabel) .addContainerGap()); //, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE)); mainPanelLayout.setVerticalGroup( - mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) + mainPanelLayout.createSequentialGroup() +// mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) .addComponent(errorMsgLabel)); contentPanel.validate(); @@ -859,7 +860,7 @@ public class BKUGUI implements BKUGUIFacade { if (waitMessage != null) { waitMsgLabel.setText("<html>" + waitMessage + "</html>"); } else { - waitMsgLabel.setText("<html>" + messages.getString(MESSAGE_WAIT) + "</html>"); + waitMsgLabel.setText(messages.getString(MESSAGE_WAIT)); } GroupLayout mainPanelLayout = new GroupLayout(mainPanel); @@ -873,8 +874,7 @@ public class BKUGUI implements BKUGUIFacade { mainPanelLayout.setVerticalGroup( mainPanelLayout.createSequentialGroup() // mainPanelLayout.createParallelGroup(GroupLayout.Alignment.LEADING) - .addComponent(waitMsgLabel) - .addContainerGap()); + .addComponent(waitMsgLabel)); contentPanel.validate(); } diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java index 5f1bc8b2..2ea0c5a2 100644 --- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java +++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java @@ -34,7 +34,7 @@ import org.junit.Test; */ public class BKUGUITest { - @Ignore + @Test public void testBKUGUI() { JFrame testFrame = new JFrame("BKUGUITest"); BKUGUI gui = new BKUGUI(); diff --git a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java index 6cbc2cd1..909da4ad 100644 --- a/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java +++ b/BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java @@ -43,7 +43,7 @@ public class BKUGUIWorker implements Runnable { @Override public void run() { -// try { + try { final PINSpec signPinSpec = new PINSpec(6, 10, "[0-9]", "Signatur-PIN"); @@ -185,9 +185,18 @@ public class BKUGUIWorker implements Runnable { // gui.showWelcomeDialog(); // // Thread.sleep(2000); + + gui.showWaitDialog(null); + + Thread.sleep(1000); + + gui.showWaitDialog("test"); + + Thread.sleep(1000); + // gui.showInsertCardDialog(cancelListener, "cancel"); - +// // Thread.sleep(2000); // // gui.showCardNotSupportedDialog(cancelListener, "cancel"); @@ -201,7 +210,7 @@ public class BKUGUIWorker implements Runnable { // Thread.sleep(2000); // - gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata"); +// gui.showSignaturePINDialog(signPinSpec, signListener, "sign", cancelListener, "cancel", hashdataListener, "hashdata"); // Thread.sleep(2000); @@ -209,18 +218,18 @@ public class BKUGUIWorker implements Runnable { // // Thread.sleep(2000); //// -// gui.showErrorDialog("Testfehler occured", null, null); -// -// Thread.sleep(2000); + gui.showErrorDialog("Testfehler occured", null, null); + + Thread.sleep(2000); // -// gui.showErrorDialog("Testfehler occured"); + gui.showErrorDialog("Testfehler occured"); // gui.showTextPlainHashDataInput("hallo,\n welt!", "12345", null, "cancel", null, "save"); // Thread.sleep(2000); -// } catch (InterruptedException ex) { -// ex.printStackTrace(); -// } + } catch (InterruptedException ex) { + ex.printStackTrace(); + } } } |