more cleanup refactors

2 files changed, 20 insertions, 30 deletions

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 43545150..e5637fbb 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
@@ -770,31 +770,21 @@ public class SimpleConfigurationComposite extends ConfigurationCompositeBase {
 	 */
 	@Override
 	public void reloadResources() {
-		this.grpHandySignatur.setText(Messages
-				.getString("simple_config.MobileBKU_Title")); //$NON-NLS-1$
-		this.lblMobileNumber.setText(Messages
-				.getString("simple_config.PhoneNumber")); //$NON-NLS-1$
-		this.txtMobileNumber.setToolTipText(Messages
-				.getString("simple_config.ExampleNumber_ToolTip")); //$NON-NLS-1$
-		this.txtMobileNumber.setMessage(Messages
-				.getString("simple_config.ExampleNumber")); //$NON-NLS-1$
-
-		this.grpLogo.setText(Messages
-				.getString("simple_config.Emblem_Title")); //$NON-NLS-1$
-		this.lblDropLogo.setText(Messages.getString("simple_config.EmblemEmpty")); //$NON-NLS-1$
-		this.btnClearImage.setText(Messages
-				.getString("simple_config.ClearEmblem")); //$NON-NLS-1$
-		this.btnBrowseLogo.setText(Messages.getString("common.browse")); //$NON-NLS-1$
-
-		this.grpSignatureNote.setText(Messages
-				.getString("simple_config.Note_Title")); //$NON-NLS-1$
-		this.lblSignatureNote.setText(Messages.getString("simple_config.Note")); //$NON-NLS-1$
-		this.txtSignatureNote.setToolTipText(Messages
-				.getString("simple_config.Note_Tooltip")); //$NON-NLS-1$
-		this.btnSignatureNoteDefault.setText(Messages
-				.getString("simple_config.Note_SetDefault")); //$NON-NLS-1$
-
-		this.grpSignatureLang.setText(Messages.getString("simple_config.SigBlockLang_Title")); //$NON-NLS-1$
-		this.cmbSignatureLang.setToolTipText(Messages.getString("simple_config.SigBlockLang_ToolTip")); //$NON-NLS-1$
+		this.grpHandySignatur.setText(Messages.getString("simple_config.MobileBKU_Title"));
+		this.lblMobileNumber.setText(Messages.getString("simple_config.PhoneNumber"));
+		this.txtMobileNumber.setToolTipText(Messages.getString("simple_config.ExampleNumber_ToolTip"));
+		this.txtMobileNumber.setMessage(Messages.getString("simple_config.ExampleNumber"));
+
+		this.grpLogo.setText(Messages.getString("simple_config.Emblem_Title"));
+		this.lblDropLogo.setText(Messages.getString("simple_config.EmblemEmpty"));
+		this.btnClearImage.setText(Messages.getString("simple_config.ClearEmblem"));
+		this.btnBrowseLogo.setText(Messages.getString("common.browse"));
+		this.grpSignatureNote.setText(Messages.getString("simple_config.Note_Title"));
+		this.lblSignatureNote.setText(Messages.getString("simple_config.Note"));
+		this.txtSignatureNote.setToolTipText(Messages.getString("simple_config.Note_Tooltip"));
+		this.btnSignatureNoteDefault.setText(Messages.getString("simple_config.Note_SetDefault"));
+
+		this.grpSignatureLang.setText(Messages.getString("simple_config.SigBlockLang_Title"));
+		this.cmbSignatureLang.setToolTipText(Messages.getString("simple_config.SigBlockLang_ToolTip"));
 	}
 }
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
index 2a60104b..52e0f956 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
@@ -216,14 +216,11 @@ positioning.placeholder=Please select the signature placeholder\nfrom the drop d
 positioning.removeNewPage=Undo &new Page
 positioning.sign=&Sign
 positioning.signature=Signature
-simple_config.AMTSSIGNATURBLOCK=Official Signature
-simple_config.BASE_LOGO=Logo Only
 simple_config.ClearEmblem=Clea&r
 simple_config.EmblemEmpty=Drag and Drop an image here\nor use the browse button \nto select a signature logo.
 simple_config.Emblem_Title=Signature &logo
 simple_config.ExampleNumber=+43676123456789
 simple_config.ExampleNumber_ToolTip=To use a default mobile phone number enter it here
-simple_config.INVISIBLE=Invisible Signature
 simple_config.MobileBKU_Title=&Mobile signature
 simple_config.Note=Text\:
 simple_config.Note_Default_Standard=This document is signed with a qualified electronic signature. According to Art.\u00A025 para.\u00A02 of the Regulation (EU) No 910/2014 of 23. July 2014 ("eIDAS-Regulation") it shall have the equivalent legal effect of a handwritten signature.
@@ -234,9 +231,12 @@ simple_config.Note_SetDefault=Restore default
 simple_config.Note_Title=Signature &Note
 simple_config.Note_Tooltip=Add an optional note to display on your Signature
 simple_config.PhoneNumber=Mobile number\:
-simple_config.SIGNATURBLOCK_SMALL=Standard Signature Block
 simple_config.SigBlockLang_Title=Signature block lan&guage\:
 simple_config.SigBlockLang_ToolTip=Select the language to be used in the signature block displayed on the signed document
+simple_config.SIGNATURBLOCK_SMALL=Standard Signature Block
+simple_config.AMTSSIGNATURBLOCK=Official Signature
+simple_config.BASE_LOGO=Logo Only
+simple_config.INVISIBLE=Invisible Signature
 tanEnter.FP=Please open the Handy-Signature app\nand confirm the signature. 
 tanEnter.QR=QR code\:
 tanEnter.ReferenceValue=Reference value\: