From a3a190f41b5b509f2af1c1565ad9599169cf7f82 Mon Sep 17 00:00:00 2001 From: Jakob Heher Date: Tue, 2 Aug 2022 16:04:49 +0200 Subject: YAGNI: Emblem interface --- .../asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java | 2 +- .../at/asit/pdfover/gui/workflow/config/ConfigurationManager.java | 6 +++--- .../java/at/asit/pdfover/gui/workflow/states/PositioningState.java | 3 +-- .../at/asit/pdfover/gui/workflow/states/PrepareSigningState.java | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java index 7fb08602..39d557c5 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java @@ -47,7 +47,7 @@ public class ConfigurationDataInMemory { /** the emblem File */ protected String emblemFile = null; - public String getEmblem() { return this.emblemFile; } + public String getEmblemPath() { return this.emblemFile; } public void setEmblem(String emblemFile) throws InvalidEmblemFile { if (emblemFile == null || emblemFile.trim().isEmpty()) { // Ok to set no file ... diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java index d467178a..df059e68 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java @@ -521,15 +521,15 @@ public class ConfigurationManager { } } - public String getDefaultEmblem() { - String emblem = this.configurationOverlay.getEmblem(); + public String getDefaultEmblemPath() { + String emblem = this.configurationOverlay.getEmblemPath(); if (emblem == null) emblem = getDefaultEmblemPersistent(); return emblem; } public String getDefaultEmblemPersistent() { - String emblem = this.configuration.getEmblem(); + String emblem = this.configuration.getEmblemPath(); if (emblem == null) emblem = STRING_EMPTY; return emblem; diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java index 5ed63e0b..a09a7a6b 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java @@ -35,7 +35,6 @@ import at.asit.pdfover.gui.utils.SignaturePlaceholderCache; import at.asit.pdfover.gui.workflow.StateMachine; import at.asit.pdfover.gui.workflow.Status; import at.asit.pdfover.gui.workflow.config.ConfigurationManager; -import at.asit.pdfover.signator.CachedFileNameEmblem; import at.asit.pdfover.signator.Emblem; import at.asit.pdfover.signator.SignaturePosition; import at.asit.pdfover.signer.pdfas.PdfAs4SignatureParameter; @@ -108,7 +107,7 @@ public class PositioningState extends State { // Update possibly changed values ConfigurationManager config = stateMachine.configProvider; PdfAs4SignatureParameter param = new PdfAs4SignatureParameter(); - Emblem emblem = new CachedFileNameEmblem(config.getDefaultEmblem()); + Emblem emblem = new Emblem(config.getDefaultEmblemPath()); param.emblem = emblem; if(config.getSignatureNote() != null && !config.getSignatureNote().isEmpty()) { param.setProperty("SIG_NOTE", config.getSignatureNote()); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java index 786ed920..bb3190ef 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java @@ -32,7 +32,7 @@ import at.asit.pdfover.commons.Messages; import at.asit.pdfover.gui.workflow.StateMachine; import at.asit.pdfover.gui.workflow.Status; import at.asit.pdfover.gui.workflow.config.ConfigurationManager; -import at.asit.pdfover.signator.CachedFileNameEmblem; +import at.asit.pdfover.signator.Emblem; import at.asit.pdfover.signator.PDFFileDocumentSource; import at.asit.pdfover.signer.pdfas.PdfAs4SignatureParameter; import at.asit.pdfover.signer.pdfas.PdfAs4Signer; @@ -134,8 +134,8 @@ public class PrepareSigningState extends State { this.state.signatureParameter.signaturePosition = status.signaturePosition; } - if (configuration.getDefaultEmblem() != null && !configuration.getDefaultEmblem().isEmpty()) { - this.state.signatureParameter.emblem = new CachedFileNameEmblem(configuration.getDefaultEmblem()); + if (configuration.getDefaultEmblemPath() != null && !configuration.getDefaultEmblemPath().isEmpty()) { + this.state.signatureParameter.emblem = new Emblem(configuration.getDefaultEmblemPath()); } if (configuration.getSignatureNote() != null -- cgit v1.2.3