summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration
diff options
context:
space:
mode:
authorJakob Heher <jakob.heher@iaik.tugraz.at>2022-07-06 12:52:15 +0200
committerJakob Heher <jakob.heher@iaik.tugraz.at>2022-07-06 12:52:15 +0200
commit82c045d786ef4a0728c1e89fb365afda81aef303 (patch)
treeb6396536f273986777862c88ff15124f9d8a84ee /pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration
parentf4c665e207973856578c2ad75de4df39b7bca641 (diff)
downloadpdf-over-82c045d786ef4a0728c1e89fb365afda81aef303.tar.gz
pdf-over-82c045d786ef4a0728c1e89fb365afda81aef303.tar.bz2
pdf-over-82c045d786ef4a0728c1e89fb365afda81aef303.zip
remove leftover empty comments after e4767bccc7324d4b61a334bf6c0558d0080045e2
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration')
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java2
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java144
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java88
-rw-r--r--pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java40
4 files changed, 137 insertions, 137 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
index 2779727f..713fa3a8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AboutComposite.java
@@ -127,7 +127,7 @@ public class AboutComposite extends ConfigurationCompositeBase {
*/
@Override
public void reloadResources() {
- this.lnkAbout.setText(Messages.getString("config.AboutText")); //
+ this.lnkAbout.setText(Messages.getString("config.AboutText"));
this.lblDataProtection.setText(Messages.getString("config.DataProtection"));
this.lnkDataProtection.setText(Messages.getString("config.DataProtectionStatement"));
this.btnOpenLogDirectory.setText(Messages.getString("config.ShowLogDirectory"));
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
index 6f8561e3..6212c5ca 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
@@ -301,10 +301,10 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
dlg.setFilterPath(AdvancedConfigurationComposite.this.txtOutputFolder.getText());
// Change the title bar text
- dlg.setText(Messages.getString("advanced_config.OutputFolder.Dialog_Title")); //
+ dlg.setText(Messages.getString("advanced_config.OutputFolder.Dialog_Title"));
// Customizable message displayed in the dialog
- dlg.setMessage(Messages.getString("advanced_config.OutputFolder.Dialog")); //
+ dlg.setMessage(Messages.getString("advanced_config.OutputFolder.Dialog"));
// Calling open() will open and run the dialog.
// It will return the selected directory, or
@@ -398,7 +398,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
StateComposite.anchor(txtProxyHost).right(100,-42).top(0).left(0,5).set();
StateComposite.setFontHeight(txtProxyHost, Constants.TEXT_SIZE_NORMAL);
- this.proxyHostErrorMarker = new ErrorMarker(compProxyHostContainer, SWT.NONE, ""); //
+ this.proxyHostErrorMarker = new ErrorMarker(compProxyHostContainer, SWT.NONE, "");
StateComposite.anchor(proxyHostErrorMarker).left(100,-32).right(100).top(0).bottom(0,32).set();
this.proxyHostErrorMarker.setVisible(false);
@@ -433,7 +433,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
}
});
- this.txtProxyPortErrorMarker = new ErrorMarker(compProxyPortContainer, SWT.NONE, ""); //
+ this.txtProxyPortErrorMarker = new ErrorMarker(compProxyPortContainer, SWT.NONE, "");
StateComposite.anchor(txtProxyPortErrorMarker).left(100,-32).right(100).top(0).bottom(0,32).set();
this.txtProxyPortErrorMarker.setVisible(false);
@@ -449,7 +449,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
private void performPostFixChanged(String postfix) {
- log.debug("Save file postfix changed to : {}", postfix); //
+ log.debug("Save file postfix changed to : {}", postfix);
this.configurationContainer.setSaveFilePostFix(postfix);
AdvancedConfigurationComposite.this.txtSaveFilePostFix.setText(postfix);
}
@@ -466,25 +466,25 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
}
void performOutputFolderChanged(String foldername) {
- log.debug("Selected Output folder: {}", foldername); //
+ log.debug("Selected Output folder: {}", foldername);
this.configurationContainer.setOutputFolder(foldername);
AdvancedConfigurationComposite.this.txtOutputFolder.setText(foldername);
}
int getBKUElementIndex(BKUs bku) {
- String lookup = "BKU." + bku.toString(); //
+ String lookup = "BKU." + bku.toString();
String bkuName = Messages.getString(lookup);
int i = this.bkuStrings.indexOf(bkuName);
if (i == -1) {
- log.warn("NO BKU match for {}", bkuName); //
+ log.warn("NO BKU match for {}", bkuName);
return 0;
}
return i;
}
void performBKUSelectionChanged(BKUs selected) {
- log.debug("Selected BKU: {}", selected); //
+ log.debug("Selected BKU: {}", selected);
this.configurationContainer.setDefaultBKU(selected);
this.cmbBKUAuswahl.select(this.getBKUElementIndex(selected));
}
@@ -494,8 +494,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
BKUs bkuvalue = resolveBKU(selected);
this.performBKUSelectionChanged(bkuvalue);
} catch (Exception ex) {
- log.error("Failed to parse BKU value: {} {}", selected, ex); //
- ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), BUTTONS.OK); //
+ log.error("Failed to parse BKU value: {} {}", selected, ex);
+ ErrorDialog dialog = new ErrorDialog(getShell(), Messages.getString("error.InvalidBKU"), BUTTONS.OK);
dialog.open();
}
}
@@ -504,7 +504,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
int blen = BKUs.values().length;
for (int i = 0; i < blen; i++) {
- String lookup = "BKU." + BKUs.values()[i].toString(); //
+ String lookup = "BKU." + BKUs.values()[i].toString();
if (Messages.getString(lookup).equals(localizedBKU)) {
return BKUs.values()[i];
}
@@ -516,23 +516,23 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
int getLocaleElementIndex(Locale locale) {
for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; i++) {
if (Constants.SUPPORTED_LOCALES[i].equals(locale)) {
- log.debug("Locale: {} IDX: {}", locale, i); // //
+ log.debug("Locale: {} IDX: {}", locale, i);
return i;
}
}
- log.warn("NO Locale match for {}", locale); //
+ log.warn("NO Locale match for {}", locale);
return 0;
}
void performLocaleSelectionChanged(Locale selected) {
- log.debug("Selected Locale: {}", selected); //
+ log.debug("Selected Locale: {}", selected);
this.configurationContainer.setLocale(selected);
this.cmbLocaleAuswahl.select(this.getLocaleElementIndex(selected));
}
void performPositionSelection(boolean automatic) {
- log.debug("Selected Position: {}", automatic); //
+ log.debug("Selected Position: {}", automatic);
SignaturePosition pos = automatic ? new SignaturePosition() : null;
this.configurationContainer.setDefaultSignaturePosition(pos);
this.btnAutomatischePositionierung.setSelection(automatic);
@@ -596,7 +596,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
} catch (Exception ex) {
this.proxyHostErrorMarker.setVisible(true);
this.proxyHostErrorMarker.setToolTipText(ex.getMessage());
- log.error("processProxyHost: ", ex); //
+ log.error("processProxyHost: ", ex);
}
}
@@ -615,7 +615,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
} catch (Exception ex) {
this.txtProxyPortErrorMarker.setVisible(true);
this.txtProxyPortErrorMarker.setToolTipText(ex.getMessage());
- log.error("processProxyPort: ", ex); //
+ log.error("processProxyPort: ", ex);
}
}
@@ -677,7 +677,7 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
try {
this.configurationContainer.setProxyPort(provider.getProxyPortPersistent());
} catch (InvalidPortException e) {
- log.error("Failed to set proxy port!", e); //
+ log.error("Failed to set proxy port!", e);
}
this.configurationContainer.setProxyUser(provider.getProxyUserPersistent());
this.configurationContainer.setProxyPass(provider.getProxyPassPersistent());
@@ -779,8 +779,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
if (hostOld != null && !hostOld.isEmpty() && (hostNew == null || hostNew.isEmpty())) {
// Proxy has been removed, let's clear the system properties
// Otherwise, the proxy settings wouldn't get removed
- System.clearProperty("http.proxyHost"); //
- System.clearProperty("https.proxyHost"); //
+ System.clearProperty("http.proxyHost");
+ System.clearProperty("https.proxyHost");
}
store.setProxyHost(hostNew);
@@ -788,8 +788,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
int portNew = this.configurationContainer.getProxyPort();
if (portOld != -1 && portNew == -1) {
// cf. above
- System.clearProperty("http.proxyPort"); //
- System.clearProperty("https.proxyPort"); //
+ System.clearProperty("http.proxyPort");
+ System.clearProperty("https.proxyPort");
}
store.setProxyPort(portNew);
@@ -797,8 +797,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
String userNew = this.configurationContainer.getProxyUser();
if (userOld != null && !userOld.isEmpty() && (userNew == null || userNew.isEmpty())) {
// cf. above
- System.clearProperty("http.proxyUser"); //
- System.clearProperty("https.proxyUser"); //
+ System.clearProperty("http.proxyUser");
+ System.clearProperty("https.proxyUser");
}
store.setProxyUser(userNew);
@@ -806,8 +806,8 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
String passNew = this.configurationContainer.getProxyPass();
if (passOld != null && passNew == null) {
// cf. above
- System.clearProperty("http.proxyPassword"); //
- System.clearProperty("https.proxyPassword"); //
+ System.clearProperty("http.proxyPassword");
+ System.clearProperty("https.proxyPassword");
}
store.setProxyPass(passNew);
}
@@ -856,57 +856,57 @@ public class AdvancedConfigurationComposite extends ConfigurationCompositeBase {
*/
@Override
public void reloadResources() {
- this.grpSignatur.setText(Messages.getString("advanced_config.Signature_Title")); //
- this.btnAutomatischePositionierung.setText(Messages.getString("advanced_config.AutoPosition")); //
- this.btnAutomatischePositionierung.setToolTipText(Messages.getString("advanced_config.AutoPosition_ToolTip")); //
- this.grpPlaceholder.setText(Messages.getString("advanced_config.Placeholder_Title")); //
- this.btnPlatzhalterVerwenden.setText(Messages.getString("advanced_config.UseMarker")); //
- this.btnPlatzhalterVerwenden.setToolTipText(Messages.getString("advanced_config.UseMarker_ToolTip")); //
- this.btnSignatureFieldsUsage.setText(Messages.getString("advanced_config.UseSignatureFields")); //
- this.btnSignatureFieldsUsage.setToolTipText(Messages.getString("advanced_config.UseSignatureFields_ToolTip")); //
+ this.grpSignatur.setText(Messages.getString("advanced_config.Signature_Title"));
+ this.btnAutomatischePositionierung.setText(Messages.getString("advanced_config.AutoPosition"));
+ this.btnAutomatischePositionierung.setToolTipText(Messages.getString("advanced_config.AutoPosition_ToolTip"));
+ this.grpPlaceholder.setText(Messages.getString("advanced_config.Placeholder_Title"));
+ this.btnPlatzhalterVerwenden.setText(Messages.getString("advanced_config.UseMarker"));
+ this.btnPlatzhalterVerwenden.setToolTipText(Messages.getString("advanced_config.UseMarker_ToolTip"));
+ this.btnSignatureFieldsUsage.setText(Messages.getString("advanced_config.UseSignatureFields"));
+ this.btnSignatureFieldsUsage.setToolTipText(Messages.getString("advanced_config.UseSignatureFields_ToolTip"));
this.btnEnablePlaceholderUsage.setText(Messages.getString("advanced_config.Placeholder_Enabled"));
- this.btnPdfACompat.setText(Messages.getString("advanced_config.PdfACompat")); //
- this.btnPdfACompat.setToolTipText(Messages.getString("advanced_config.PdfACompat_ToolTip")); //
- this.lblTransparenz.setText(Messages.getString("advanced_config.SigPHTransparency")); //
- this.lblTransparenzLinks.setText(Messages.getString("advanced_config.SigPHTransparencyMin")); //
- this.lblTransparenzRechts.setText(Messages.getString("advanced_config.SigPHTransparencyMax")); //
- this.sclTransparenz.setToolTipText(Messages.getString("advanced_config.SigPHTransparencyTooltip")); //
-
- this.grpBkuAuswahl.setText(Messages.getString("advanced_config.BKUSelection_Title")); //
- this.cmbBKUAuswahl.setToolTipText(Messages.getString("advanced_config.BKUSelection_ToolTip")); //
- this.btnKeystoreEnabled.setText(Messages.getString("advanced_config.KeystoreEnabled")); //
- this.btnKeystoreEnabled.setToolTipText(Messages.getString("advanced_config.KeystoreEnabled_ToolTip")); //
-
- this.grpSpeicherort.setText(Messages.getString("advanced_config.OutputFolder_Title")); //
- this.lblDefaultOutputFolder.setText(Messages.getString("advanced_config.OutputFolder")); //
- this.txtOutputFolder.setToolTipText(Messages.getString("advanced_config.OutputFolder_ToolTip")); //
- this.btnBrowse.setText(Messages.getString("common.browse")); //
-
- this.grpLocaleAuswahl.setText(Messages.getString("advanced_config.LocaleSelection_Title")); //
- this.cmbLocaleAuswahl.setToolTipText(Messages.getString("advanced_config.LocaleSelection_ToolTip")); //
-
- this.grpUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck_Title")); //
- this.btnUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck")); //
- this.btnUpdateCheck.setToolTipText(Messages.getString("advanced_config.UpdateCheck_ToolTip")); //
-
- this.grpProxy.setText(Messages.getString("advanced_config.Proxy_Title")); //
- this.lblProxyHost.setText(Messages.getString("advanced_config.ProxyHost")); //
- this.txtProxyHost.setToolTipText(Messages.getString("advanced_config.ProxyHost_ToolTip")); //
- this.txtProxyHost.setMessage(Messages.getString("advanced_config.ProxyHost_Template")); //
- this.lblProxyPort.setText(Messages.getString("advanced_config.ProxyPort")); //
- this.txtProxyPort.setToolTipText(Messages.getString("advanced_config.ProxyPort_ToolTip")); //
- this.txtProxyPort.setMessage(Messages.getString("advanced_config.ProxyPort_Template")); //
+ this.btnPdfACompat.setText(Messages.getString("advanced_config.PdfACompat"));
+ this.btnPdfACompat.setToolTipText(Messages.getString("advanced_config.PdfACompat_ToolTip"));
+ this.lblTransparenz.setText(Messages.getString("advanced_config.SigPHTransparency"));
+ this.lblTransparenzLinks.setText(Messages.getString("advanced_config.SigPHTransparencyMin"));
+ this.lblTransparenzRechts.setText(Messages.getString("advanced_config.SigPHTransparencyMax"));
+ this.sclTransparenz.setToolTipText(Messages.getString("advanced_config.SigPHTransparencyTooltip"));
+
+ this.grpBkuAuswahl.setText(Messages.getString("advanced_config.BKUSelection_Title"));
+ this.cmbBKUAuswahl.setToolTipText(Messages.getString("advanced_config.BKUSelection_ToolTip"));
+ this.btnKeystoreEnabled.setText(Messages.getString("advanced_config.KeystoreEnabled"));
+ this.btnKeystoreEnabled.setToolTipText(Messages.getString("advanced_config.KeystoreEnabled_ToolTip"));
+
+ this.grpSpeicherort.setText(Messages.getString("advanced_config.OutputFolder_Title"));
+ this.lblDefaultOutputFolder.setText(Messages.getString("advanced_config.OutputFolder"));
+ this.txtOutputFolder.setToolTipText(Messages.getString("advanced_config.OutputFolder_ToolTip"));
+ this.btnBrowse.setText(Messages.getString("common.browse"));
+
+ this.grpLocaleAuswahl.setText(Messages.getString("advanced_config.LocaleSelection_Title"));
+ this.cmbLocaleAuswahl.setToolTipText(Messages.getString("advanced_config.LocaleSelection_ToolTip"));
+
+ this.grpUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck_Title"));
+ this.btnUpdateCheck.setText(Messages.getString("advanced_config.UpdateCheck"));
+ this.btnUpdateCheck.setToolTipText(Messages.getString("advanced_config.UpdateCheck_ToolTip"));
+
+ this.grpProxy.setText(Messages.getString("advanced_config.Proxy_Title"));
+ this.lblProxyHost.setText(Messages.getString("advanced_config.ProxyHost"));
+ this.txtProxyHost.setToolTipText(Messages.getString("advanced_config.ProxyHost_ToolTip"));
+ this.txtProxyHost.setMessage(Messages.getString("advanced_config.ProxyHost_Template"));
+ this.lblProxyPort.setText(Messages.getString("advanced_config.ProxyPort"));
+ this.txtProxyPort.setToolTipText(Messages.getString("advanced_config.ProxyPort_ToolTip"));
+ this.txtProxyPort.setMessage(Messages.getString("advanced_config.ProxyPort_Template"));
// this.lblProxyUser.setText(Messages.getString("advanced_config.ProxyUser"));
- // //
+
// this.txtProxyUser.setToolTipText(Messages
- // .getString("advanced_config.ProxyUser_ToolTip")); //
+ // .getString("advanced_config.ProxyUser_ToolTip"));
// this.txtProxyUser.setMessage(Messages
- // .getString("advanced_config.ProxyUser_Template")); //
+ // .getString("advanced_config.ProxyUser_Template"));
// this.lblProxyPass.setText(Messages.getString("advanced_config.ProxyPass"));
- // //
+
// this.txtProxyPass.setToolTipText(Messages
- // .getString("advanced_config.ProxyPass_ToolTip")); //
+ // .getString("advanced_config.ProxyPass_ToolTip"));
// this.txtProxyPass.setMessage(Messages
- // .getString("advanced_config.ProxyPass_Template")); //
+ // .getString("advanced_config.ProxyPass_Template"));
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java
index 2400ac7e..a2284ee3 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/KeystoreConfigurationComposite.java
@@ -174,12 +174,12 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
FileDialog dialog = new FileDialog(
KeystoreConfigurationComposite.this.getShell(), SWT.OPEN);
dialog.setFilterExtensions(new String[] {
- "*.p12;*.pkcs12;*.pfx;*.ks;*.jks", "*.p12;*.pkcs12;*.pfx;", "*.ks;*.jks*.", "*" }); // // // //
+ "*.p12;*.pkcs12;*.pfx;*.ks;*.jks", "*.p12;*.pkcs12;*.pfx;", "*.ks;*.jks*.", "*" });
dialog.setFilterNames(new String[] {
- Messages.getString("common.KeystoreExtension_Description"), //
- Messages.getString("common.PKCS12Extension_Description"), //
- Messages.getString("common.KSExtension_Description"), //
- Messages.getString("common.AllExtension_Description") }); //
+ Messages.getString("common.KeystoreExtension_Description"),
+ Messages.getString("common.PKCS12Extension_Description"),
+ Messages.getString("common.KSExtension_Description"),
+ Messages.getString("common.AllExtension_Description") });
String fileName = dialog.open();
File file = null;
if (fileName != null) {
@@ -217,24 +217,24 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
try {
loadKeystore();
} catch (KeyStoreException ex) {
- log.error("Error loading keystore", ex); //
- showErrorDialog(Messages.getString("error.KeyStore")); //
+ log.error("Error loading keystore", ex);
+ showErrorDialog(Messages.getString("error.KeyStore"));
} catch (FileNotFoundException ex) {
- log.error("Error loading keystore", ex); //
+ log.error("Error loading keystore", ex);
showErrorDialog(String.format(Messages.getString(
- "error.KeyStoreFileNotExist"), f.getName())); //
+ "error.KeyStoreFileNotExist"), f.getName()));
} catch (NoSuchAlgorithmException ex) {
- log.error("Error loading keystore", ex); //
- showErrorDialog(Messages.getString("error.KeyStore")); //
+ log.error("Error loading keystore", ex);
+ showErrorDialog(Messages.getString("error.KeyStore"));
} catch (CertificateException ex) {
- log.error("Error loading keystore", ex); //
- showErrorDialog(Messages.getString("error.KeyStore")); //
+ log.error("Error loading keystore", ex);
+ showErrorDialog(Messages.getString("error.KeyStore"));
} catch (IOException ex) {
- log.error("Error loading keystore", ex); //
- showErrorDialog(Messages.getString("error.KeyStore")); //
+ log.error("Error loading keystore", ex);
+ showErrorDialog(Messages.getString("error.KeyStore"));
} catch (NullPointerException ex) {
- log.error("Error loading keystore - NPE?", ex); //
- showErrorDialog(Messages.getString("error.KeyStore")); //
+ log.error("Error loading keystore - NPE?", ex);
+ showErrorDialog(Messages.getString("error.KeyStore"));
}
}
});
@@ -292,29 +292,29 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
private void initKeystoreTypes() {
this.keystoreTypes = new HashMap<String, String>();
- this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_PKCS12"), "PKCS12"); // //
- this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_JKS"), "JCEKS"); // //
+ this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_PKCS12"), "PKCS12");
+ this.keystoreTypes.put(Messages.getString("keystore_config.KeystoreType_JKS"), "JCEKS");
}
/**
* @param fileName
*/
protected void performKeystoreFileChanged(String fileName) {
- log.debug("Selected keystore file: " + fileName); //
+ log.debug("Selected keystore file: " + fileName);
this.configurationContainer.setKeyStoreFile(fileName);
KeystoreConfigurationComposite.this.txtKeystoreFile.setText(fileName);
int i = fileName.lastIndexOf('.');
if (i > 0) {
String ext = fileName.substring(i+1);
if (
- ext.equalsIgnoreCase("p12") || //
- ext.equalsIgnoreCase("pkcs12") || //
- ext.equalsIgnoreCase("pfx")) //
- performKeystoreTypeChanged("PKCS12"); //
+ ext.equalsIgnoreCase("p12") ||
+ ext.equalsIgnoreCase("pkcs12") ||
+ ext.equalsIgnoreCase("pfx"))
+ performKeystoreTypeChanged("PKCS12");
else if (
- ext.equalsIgnoreCase("ks") || //
- ext.equalsIgnoreCase("jks")) //
- performKeystoreTypeChanged("JCEKS"); //
+ ext.equalsIgnoreCase("ks") ||
+ ext.equalsIgnoreCase("jks"))
+ performKeystoreTypeChanged("JCEKS");
}
}
@@ -322,7 +322,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
* @param type
*/
protected void performKeystoreTypeChanged(String type) {
- log.debug("Selected keystore type: " + type); //
+ log.debug("Selected keystore type: " + type);
this.configurationContainer.setKeyStoreType(type);
for (int i = 0; i < this.cmbKeystoreType.getItemCount(); ++i) {
if (this.keystoreTypes.get(this.cmbKeystoreType.getItem(i)).equals(type)) {
@@ -336,7 +336,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
* @param storepass
*/
protected void performKeystoreStorePassChanged(String storepass) {
- log.debug("Changed keystore store password"); //
+ log.debug("Changed keystore store password");
this.configurationContainer.setKeyStoreStorePass(storepass);
this.txtKeystoreStorePass.setText(storepass);
}
@@ -345,7 +345,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
* @param alias
*/
protected void performKeystoreAliasChanged(String alias) {
- log.debug("Selected keystore alias: " + alias); //
+ log.debug("Selected keystore alias: " + alias);
this.configurationContainer.setKeyStoreAlias(alias);
this.cmbKeystoreAlias.setText(alias);
}
@@ -354,7 +354,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
* @param keypass
*/
protected void performKeystoreKeyPassChanged(String keypass) {
- log.debug("Changed keystore key password"); //
+ log.debug("Changed keystore key password");
this.configurationContainer.setKeyStoreKeyPass(keypass);
this.txtKeystoreKeyPass.setText(keypass);
}
@@ -412,7 +412,7 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
if (ksf.exists())
loadKeystore();
} catch (Exception e) {
- log.error("Error loading keystore", e); //
+ log.error("Error loading keystore", e);
}
performKeystoreAliasChanged(config.getKeyStoreAlias());
performKeystoreKeyPassChanged(config.getKeyStoreKeyPass());
@@ -483,19 +483,19 @@ public class KeystoreConfigurationComposite extends ConfigurationCompositeBase {
*/
@Override
public void reloadResources() {
- this.grpKeystore.setText(Messages.getString("keystore_config.Keystore_Title")); //
- this.lblKeystoreFile.setText(Messages.getString("keystore_config.KeystoreFile")); //
- this.btnBrowse.setText(Messages.getString("common.browse")); //
- this.txtKeystoreFile.setToolTipText(Messages.getString("keystore_config.KeystoreFile_ToolTip")); //
- this.lblKeystoreType.setText(Messages.getString("keystore_config.KeystoreType")); //
+ this.grpKeystore.setText(Messages.getString("keystore_config.Keystore_Title"));
+ this.lblKeystoreFile.setText(Messages.getString("keystore_config.KeystoreFile"));
+ this.btnBrowse.setText(Messages.getString("common.browse"));
+ this.txtKeystoreFile.setToolTipText(Messages.getString("keystore_config.KeystoreFile_ToolTip"));
+ this.lblKeystoreType.setText(Messages.getString("keystore_config.KeystoreType"));
initKeystoreTypes();
this.cmbKeystoreType.setItems(this.keystoreTypes.keySet().toArray(new String[0]));
- this.lblKeystoreStorePass.setText(Messages.getString("keystore_config.KeystoreStorePass")); //
- this.txtKeystoreStorePass.setToolTipText(Messages.getString("keystore_config.KeystoreStorePass_ToolTip")); //
- this.btnLoad.setText(Messages.getString("keystore_config.Load")); //
- this.btnLoad.setToolTipText(Messages.getString("keystore_config.Load_ToolTip")); //
- this.lblKeystoreAlias.setText(Messages.getString("keystore_config.KeystoreAlias")); //
- this.lblKeystoreKeyPass.setText(Messages.getString("keystore_config.KeystoreKeyPass")); //
- this.txtKeystoreKeyPass.setToolTipText(Messages.getString("keystore_config.KeystoreKeyPass_ToolTip")); //
+ this.lblKeystoreStorePass.setText(Messages.getString("keystore_config.KeystoreStorePass"));
+ this.txtKeystoreStorePass.setToolTipText(Messages.getString("keystore_config.KeystoreStorePass_ToolTip"));
+ this.btnLoad.setText(Messages.getString("keystore_config.Load"));
+ this.btnLoad.setToolTipText(Messages.getString("keystore_config.Load_ToolTip"));
+ this.lblKeystoreAlias.setText(Messages.getString("keystore_config.KeystoreAlias"));
+ this.lblKeystoreKeyPass.setText(Messages.getString("keystore_config.KeystoreKeyPass"));
+ this.txtKeystoreKeyPass.setToolTipText(Messages.getString("keystore_config.KeystoreKeyPass_ToolTip"));
}
}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
index edf7894f..bf74eaa8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
@@ -407,13 +407,13 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
FileDialog dialog = new FileDialog(
SimpleConfigurationComposite.this.getShell(), SWT.OPEN);
dialog.setFilterExtensions(new String[] {
- "*.jpg;*.png;*.gif", "*.jpg", "*.png", "*.gif", "*" }); // // // // //
+ "*.jpg;*.png;*.gif", "*.jpg", "*.png", "*.gif", "*" });
dialog.setFilterNames(new String[] {
- Messages.getString("common.ImageExtension_Description"), //
- Messages.getString("common.JPGExtension_Description"), //
- Messages.getString("common.PNGExtension_Description"), //
- Messages.getString("common.GIFExtension_Description"), //
- Messages.getString("common.AllExtension_Description") }); //
+ Messages.getString("common.ImageExtension_Description"),
+ Messages.getString("common.JPGExtension_Description"),
+ Messages.getString("common.PNGExtension_Description"),
+ Messages.getString("common.GIFExtension_Description"),
+ Messages.getString("common.AllExtension_Description") });
String fileName = dialog.open();
File file = null;
if (fileName != null) {
@@ -447,7 +447,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
if (this.signer != null) {
SignatureParameter param = this.signer.getPDFSigner().newParameter();
if(this.configurationContainer.getSignatureNote() != null && !this.configurationContainer.getSignatureNote().isEmpty()) {
- param.setProperty("SIG_NOTE", this.configurationContainer.getSignatureNote()); //
+ param.setProperty("SIG_NOTE", this.configurationContainer.getSignatureNote());
}
param.setSignatureLanguage(this.configurationContainer.getSignatureLocale().getLanguage());
@@ -477,7 +477,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
ImageConverter.convertToSWT(CachedFileNameEmblem.fixImage(
ImageIO.read(imgFile), imgFile)));
} catch (IOException e) {
- log.error("Error reading image", e); //
+ log.error("Error reading image", e);
}
} else {
this.logo = null;
@@ -491,10 +491,10 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
try {
setEmblemFileInternal(filename, false);
} catch (Exception ex) {
- log.error("processEmblemChanged: ", ex); //
+ log.error("processEmblemChanged: ", ex);
ErrorDialog dialog = new ErrorDialog(
getShell(),
- Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //
+ Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK);
dialog.open();
}
}
@@ -506,8 +506,8 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
} catch (Exception ex) {
this.txtMobileNumberErrorMarker.setVisible(true);
this.txtMobileNumberErrorMarker.setToolTipText(Messages
- .getString("error.InvalidPhoneNumber")); //
- log.error("processNumberChanged: ", ex); //
+ .getString("error.InvalidPhoneNumber"));
+ log.error("processNumberChanged: ", ex);
this.redraw();
this.doLayout();
}
@@ -516,17 +516,17 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
int getLocaleElementIndex(Locale locale) {
for (int i = 0; i < Constants.SUPPORTED_LOCALES.length; i++) {
if (Constants.SUPPORTED_LOCALES[i].equals(locale)) {
- log.debug("Locale: {} IDX: {}",locale, i); // //
+ log.debug("Locale: {} IDX: {}",locale, i);
return i;
}
}
- log.warn("NO Locale match for {}", locale); //
+ log.warn("NO Locale match for {}", locale);
return 0;
}
void performSignatureLangSelectionChanged(Locale selected, Locale previous) {
- log.debug("Selected Sign Locale: {}", selected); //
+ log.debug("Selected Sign Locale: {}", selected);
this.configurationContainer.setSignatureLocale(selected);
this.cmbSignatureLang.select(this.getLocaleElementIndex(selected));
@@ -537,7 +537,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
void preformProfileSelectionChanged(Profile newProfile) {
- log.debug("Signature Profile {} was selected", newProfile.name()); //
+ log.debug("Signature Profile {} was selected", newProfile.name());
Profile oldProfile = this.configurationContainer.getSignatureProfile();
this.configurationContainer.setSignatureProfile(newProfile);
this.cmbSignatureProfiles.select(newProfile.ordinal());
@@ -589,7 +589,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
this.configurationContainer.setMobileNumber(number);
number = this.configurationContainer.getMobileNumber();
if (number == null) {
- this.txtMobileNumber.setText(""); //
+ this.txtMobileNumber.setText("");
return;
}
this.txtMobileNumber.setText(number);
@@ -623,7 +623,7 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
this.configurationContainer.setEmblem(
provider.getDefaultEmblemPersistent());
} catch (InvalidEmblemFile e) {
- log.error("Failed to set emblem!", e); //
+ log.error("Failed to set emblem!", e);
}
this.configurationContainer.setSignatureLocale(
@@ -653,10 +653,10 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
setEmblemFileInternal(emblemFile, true);
this.btnClearImage.setSelection(true);
} catch (Exception e1) {
- log.error("Failed to load emblem: ", e1); //
+ log.error("Failed to load emblem: ", e1);
ErrorDialog dialog = new ErrorDialog(
getShell(),
- Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK); //
+ Messages.getString("error.FailedToLoadEmblem"), BUTTONS.OK);
dialog.open();
}
}