diff options
| author | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-08-02 14:56:46 +0200 |
|---|---|---|
| committer | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-08-02 14:56:46 +0200 |
| commit | 832cf5d3353a5fef867d177b32681b1295497626 (patch) | |
| tree | 7fc89dddd2247933a9da569fa05df124ece46e76 /pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states | |
| parent | 9144df55ff7eac00f7633da6b8e4b58bab923d1f (diff) | |
| download | pdf-over-832cf5d3353a5fef867d177b32681b1295497626.tar.gz pdf-over-832cf5d3353a5fef867d177b32681b1295497626.tar.bz2 pdf-over-832cf5d3353a5fef867d177b32681b1295497626.zip | |
YAGNI: SigningState setters/getters
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states')
3 files changed, 7 insertions, 7 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java index ad0f1863..1d2074c7 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java @@ -180,7 +180,7 @@ public class KSState extends State { else if (config.getKeyStorePassStorageType() == KeyStorePassStorageType.MEMORY) config.setKeyStoreKeyPassOverlay(keyPass); - signingState.setKSSigner(file, alias, storePass, keyPass, type); + signingState.setKeystoreSigner(file, alias, storePass, keyPass, type); } catch (SignatureException e) { log.error("Error loading keystore", e); if (askShouldRetry("error.KeyStore")) diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java index 779d39c7..6e3922dc 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/LocalBKUState.java @@ -137,8 +137,8 @@ public class LocalBKUState extends State { log.debug("SL Response: " + response); SLResponse slResponse = new SLResponse(response, server, userAgent, signatureLayout); - this.signingState.setSignatureResponse(slResponse); - this.signingState.setUseBase64Request(LocalBKUState.this.useBase64Request); + this.signingState.signatureResponse = slResponse; + this.signingState.useBase64Request = LocalBKUState.this.useBase64Request; } } catch (Exception e) { log.error("SignLocalBKUThread: ", e); @@ -175,13 +175,13 @@ public class LocalBKUState extends State { PdfAs4SigningState signingState = status.signingState; - if (!signingState.hasSignatureResponse() + if ((signingState.signatureResponse == null) && this.threadException == null) { Thread t = new Thread(new SignLocalBKUThread(this, signingState)); t.start(); return; } - signingState.setBKUConnector(new LocalBKUConnector()); + signingState.bkuConnector = new LocalBKUConnector(); if (this.threadException != null) { ErrorDialog dialog = new ErrorDialog( diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java index e74ba969..bb1be5d0 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java @@ -557,9 +557,9 @@ public class MobileBKUState extends State { public void run() {
this.signingState = getStateMachine().status.signingState;
- this.signingState.setBKUConnector(new MobileBKUConnector(this));
+ this.signingState.bkuConnector = new MobileBKUConnector(this);
log.debug("Setting base64 request to " + this.handler.useBase64Request());
- this.signingState.setUseBase64Request(this.handler.useBase64Request());
+ this.signingState.useBase64Request = this.handler.useBase64Request();
if (this.threadException != null) {
displayError(this.threadException);
|