From 8705b6239bca1e83341a613ce9aba700efa98dcf Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Apr 2013 19:27:40 +0000 Subject: Rework ConfigurationProvider to store config in a ConfigurationContainer git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@334 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- .../pdfover/gui/composites/AdvancedConfigurationComposite.java | 6 +++--- .../at/asit/pdfover/gui/composites/ConfigurationComposite.java | 8 ++++---- .../main/java/at/asit/pdfover/gui/composites/SignaturePanel.java | 2 +- .../asit/pdfover/gui/composites/SimpleConfigurationComposite.java | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java index 7e846d13..8f8db82a 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/AdvancedConfigurationComposite.java @@ -228,7 +228,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { @Override public void widgetSelected(SelectionEvent e) { int selectionIndex = getBKUElementIndex(AdvancedConfigurationComposite.this.configurationContainer - .getBKUSelection()); + .getDefaultBKU()); if (AdvancedConfigurationComposite.this.cmbBKUAuswahl .getSelectionIndex() != selectionIndex) { selectionIndex = AdvancedConfigurationComposite.this.cmbBKUAuswahl @@ -416,7 +416,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { void performBKUSelectionChanged(BKUs selected) { log.debug("Selected BKU: " + selected.toString()); //$NON-NLS-1$ - this.configurationContainer.setBKUSelection(selected); + this.configurationContainer.setDefaultBKU(selected); this.cmbBKUAuswahl.select(this.getBKUElementIndex(selected)); } @@ -494,7 +494,7 @@ public class AdvancedConfigurationComposite extends BaseConfigurationComposite { public void loadConfiguration() { // load advanced settings this.performBKUSelectionChanged(this.configurationContainer - .getBKUSelection()); + .getDefaultBKU()); String outputFolder = this.configurationContainer.getOutputFolder(); if (outputFolder != null) { this.performOutputFolderChanged(outputFolder); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java index 63372f63..706ac1f6 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/ConfigurationComposite.java @@ -294,7 +294,7 @@ public class ConfigurationComposite extends StateComposite { this.configurationContainer.setSignLocale(this.configProvider.getSignLocale()); - this.configurationContainer.setBKUSelection(this.configProvider + this.configurationContainer.setDefaultBKU(this.configProvider .getDefaultBKU()); try { this.configurationContainer.setEmblem(this.configProvider @@ -303,7 +303,7 @@ public class ConfigurationComposite extends StateComposite { log.error("Failed to set emblem!", e); //$NON-NLS-1$ } try { - this.configurationContainer.setNumber(this.configProvider + this.configurationContainer.setMobileNumber(this.configProvider .getDefaultMobileNumber()); } catch (InvalidNumberException e) { log.error("Failed to set mobile phone number!", e); //$NON-NLS-1$ @@ -397,9 +397,9 @@ public class ConfigurationComposite extends StateComposite { // Write current Configuration this.configManipulator.setDefaultBKU(this.configurationContainer - .getBKUSelection()); + .getDefaultBKU()); this.configManipulator - .setDefaultMobileNumber(this.configurationContainer.getNumber()); + .setDefaultMobileNumber(this.configurationContainer.getMobileNumber()); if (this.configurationContainer.getAutomaticPosition()) { this.configManipulator .setDefaultSignaturePosition(new SignaturePosition()); diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java index 416a3a85..7daafb19 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SignaturePanel.java @@ -76,7 +76,7 @@ public class SignaturePanel extends JPanel { /** Current scaled signature placeholder image */ BufferedImage sigPlaceholderScaled = null; /** Transparency of the signature placeholder (0-255) */ - private int sigPlaceholderTransparency = 170; + private int sigPlaceholderTransparency = Constants.DEFAULT_SIGNATURE_PLACEHOLDER_TRANSPARENCY; /** Previous Transparency of the signature placeholder */ private int prevSigPlaceholderTransparency = 0; /** Width of the signature placeholder in page space */ diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java index 403d5ffc..dfe97470 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/SimpleConfigurationComposite.java @@ -908,8 +908,8 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { */ private void plainMobileNumberSetter() throws InvalidNumberException { String number = this.txtMobileNumber.getText(); - this.configurationContainer.setNumber(number); - number = this.configurationContainer.getNumber(); + this.configurationContainer.setMobileNumber(number); + number = this.configurationContainer.getMobileNumber(); if (number == null) { this.txtMobileNumber.setText(""); //$NON-NLS-1$ return; @@ -1006,7 +1006,7 @@ public class SimpleConfigurationComposite extends BaseConfigurationComposite { @Override public void loadConfiguration() { // Initialize form fields from configuration Container - String number = this.configurationContainer.getNumber(); + String number = this.configurationContainer.getMobileNumber(); if (number != null) { this.txtMobileNumber.setText(number); } -- cgit v1.2.3