diff options
Diffstat (limited to 'BKULocal/src/main/java/at')
| -rw-r--r-- | BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java | 106 | ||||
| -rw-r--r-- | BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java | 4 |
2 files changed, 62 insertions, 48 deletions
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java index 1714017e..5a0ba84a 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java @@ -40,27 +40,27 @@ public class BKUGuiProxy implements BKUGUIFacade { return delegate.getLocale();
}
+// @Override
+// public void showCardNotSupportedDialog(ActionListener cancelListener,
+// String actionCommand) {
+// showDialog();
+// delegate.showCardNotSupportedDialog(cancelListener, actionCommand);
+// }
+//
+// @Override
+// public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener,
+// String okCommand, ActionListener cancelListener, String cancelCommand) {
+// showDialog();
+// delegate.showCardPINDialog(pinSpec, okListener, okCommand, cancelListener,
+// cancelCommand);
+// }
+//
@Override
- public void showCardNotSupportedDialog(ActionListener cancelListener,
- String actionCommand) {
- showDialog();
- delegate.showCardNotSupportedDialog(cancelListener, actionCommand);
- }
-
- @Override
- public void showCardPINDialog(PINSpec pinSpec, ActionListener okListener,
- String okCommand, ActionListener cancelListener, String cancelCommand) {
- showDialog();
- delegate.showCardPINDialog(pinSpec, okListener, okCommand, cancelListener,
- cancelCommand);
- }
-
- @Override
- public void showCardPINRetryDialog(PINSpec pinSpec, int numRetries,
+ public void showCardPINDialog(PINSpec pinSpec, int numRetries,
ActionListener okListener, String okCommand,
ActionListener cancelListener, String cancelCommand) {
showDialog();
- delegate.showCardPINRetryDialog(pinSpec, numRetries, okListener, okCommand,
+ delegate.showCardPINDialog(pinSpec, numRetries, okListener, okCommand,
cancelListener, cancelCommand);
}
@@ -77,57 +77,71 @@ public class BKUGuiProxy implements BKUGUIFacade { delegate.showErrorDialog(errorMsgKey, errorMsgParams);
}
+// @Override
+// public void showInsertCardDialog(ActionListener cancelListener,
+// String actionCommand) {
+// showDialog();
+// delegate.showInsertCardDialog(cancelListener, actionCommand);
+// }
+//
+// @Override
+// public void showSignaturePINDialog(PINSpec pinSpec,
+// ActionListener signListener, String signCommand,
+// ActionListener cancelListener, String cancelCommand,
+// ActionListener hashdataListener, String hashdataCommand) {
+// showDialog();
+// delegate.showSignaturePINDialog(pinSpec, signListener, signCommand,
+// cancelListener, cancelCommand, hashdataListener, hashdataCommand);
+// }
+//
@Override
- public void showInsertCardDialog(ActionListener cancelListener,
- String actionCommand) {
- showDialog();
- delegate.showInsertCardDialog(cancelListener, actionCommand);
- }
-
- @Override
- public void showSignaturePINDialog(PINSpec pinSpec,
- ActionListener signListener, String signCommand,
- ActionListener cancelListener, String cancelCommand,
- ActionListener hashdataListener, String hashdataCommand) {
- showDialog();
- delegate.showSignaturePINDialog(pinSpec, signListener, signCommand,
- cancelListener, cancelCommand, hashdataListener, hashdataCommand);
- }
-
- @Override
- public void showSignaturePINRetryDialog(PINSpec pinSpec, int numRetries,
+ public void showSignaturePINDialog(PINSpec pinSpec, int numRetries,
ActionListener okListener, String okCommand,
ActionListener cancelListener, String cancelCommand,
ActionListener hashdataListener, String hashdataCommand) {
showDialog();
- delegate.showSignaturePINRetryDialog(pinSpec, numRetries, okListener,
+ delegate.showSignaturePINDialog(pinSpec, numRetries, okListener,
okCommand, cancelListener, cancelCommand, hashdataListener,
hashdataCommand);
}
+//
+// @Override
+// public void showWaitDialog(String waitMessage) {
+// showDialog();
+// delegate.showWaitDialog(waitMessage);
+// }
+//
+// @Override
+// public void showWelcomeDialog() {
+// showDialog();
+// delegate.showWelcomeDialog();
+// }
@Override
- public void showWaitDialog(String waitMessage) {
+ public void showSecureViewer(List<HashDataInput> signedReferences,
+ ActionListener okListener,
+ String okCommand) {
showDialog();
- delegate.showWaitDialog(waitMessage);
+ delegate.showSecureViewer(signedReferences, okListener, okCommand);
}
@Override
- public void showWelcomeDialog() {
+ public void showMessageDialog(String titleKey,
+ String msgKey, Object[] msgParams,
+ String buttonKey, ActionListener okListener, String okCommand) {
showDialog();
- delegate.showWelcomeDialog();
+ delegate.showMessageDialog(titleKey, msgKey, msgParams, buttonKey, okListener, okCommand);
}
@Override
- public void showHashDataInputDialog(List<HashDataInput> signedReferences,
- ActionListener okListener,
- String okCommand) {
+ public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams) {
showDialog();
- delegate.showHashDataInputDialog(signedReferences, okListener, okCommand);
+ delegate.showMessageDialog(titleKey, msgKey, msgParams);
}
@Override
- public void showMessageDialog(String titleKey, String msgKey, Object[] msgParams, ActionListener okListener, String okCommand) {
+ public void showMessageDialog(String titleKey, String msgKey) {
showDialog();
- delegate.showMessageDialog(titleKey, msgKey, msgParams, okListener, okCommand);
+ delegate.showMessageDialog(titleKey, msgKey);
}
}
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java index 46f915a9..531e6591 100644 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java +++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java @@ -67,7 +67,7 @@ public class LocalSignRequestHandler extends SignRequestHandler { * @throws java.lang.Exception */ @Override - public void displayHashDataInputs(List<ReferenceType> dsigReferences) throws Exception { + public void displayDataToBeSigned(List<ReferenceType> dsigReferences) throws Exception { if (dsigReferences == null || dsigReferences.size() < 1) { log.error("No hashdata input selected to be displayed: null"); throw new Exception("No HashData Input selected to be displayed"); @@ -109,7 +109,7 @@ public class LocalSignRequestHandler extends SignRequestHandler { log.error("dsig:SignedInfo does not contain a data reference"); throw new Exception("dsig:SignedInfo does not contain a data reference"); } - gui.showHashDataInputDialog(selectedHashDataInputs, this, "hashDataDone"); + gui.showSecureViewer(selectedHashDataInputs, this, "hashDataDone"); } private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException { |