summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUI.java8
-rw-r--r--BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUITest.java2
-rw-r--r--BKUCommonGUI/src/test/java/at/gv/egiz/bku/gui/BKUGUIWorker.java29
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();
+ }
}
}