simply configuration loading

6 files changed, 29 insertions, 162 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
index 2dfe879b..2e120b1d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigProviderImpl.java
@@ -17,9 +17,9 @@ package at.asit.pdfover.gui.workflow.config;
 
 // Imports
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.regex.Matcher;
@@ -78,19 +78,17 @@ public class ConfigProviderImpl {
 		this.configurationOverlay = new ConfigurationContainer();
 	}
 
-	/* load from disk (file input stream) */
-	public void loadConfiguration(InputStream configSource) throws IOException {
+	/* load from disk */
+	public void loadConfiguration() throws IOException {
 
 		Properties config = new Properties();
 
-		config.load(configSource);
+		config.load(new FileInputStream(Constants.CONFIG_DIRECTORY + File.separator + getConfigurationFileName()));
 
 		setDefaultEmblem(config.getProperty(Constants.CFG_EMBLEM));
 
 		setDefaultMobileNumber(config.getProperty(Constants.CFG_MOBILE_NUMBER));
 
-		setSignatureNote(config.getProperty(Constants.CFG_SIGNATURE_NOTE));
-
 		setProxyHost(config.getProperty(Constants.CFG_PROXY_HOST));
 		setProxyUser(config.getProperty(Constants.CFG_PROXY_USER));
 		setProxyPass(config.getProperty(Constants.CFG_PROXY_PASS));
@@ -138,6 +136,11 @@ public class ConfigProviderImpl {
 			}
 		}
 
+		if (config.containsKey(Constants.CFG_SIGNATURE_NOTE))
+			setSignatureNote(config.getProperty(Constants.CFG_SIGNATURE_NOTE));
+		else
+			setSignatureNote(Profile.getProfile(getSignatureProfile()).getDefaultSignatureBlockNote(getSignatureLocale()));
+
 		String compat = config.getProperty(Constants.CFG_SIGNATURE_PDFA_COMPAT);
 		if (compat != null)
 			setSignaturePdfACompat(compat.equalsIgnoreCase(Constants.TRUE));
@@ -289,12 +292,14 @@ public class ConfigProviderImpl {
 		String updateCheck = config.getProperty(Constants.CFG_UPDATE_CHECK);
 		if (updateCheck != null)
 			setUpdateCheck(!updateCheck.equalsIgnoreCase(Constants.FALSE));
+		
+		log.info("Successfully loaded config from: " + getConfigurationFileName());
 	}
 
 	/* save to file */
 	public void saveCurrentConfiguration() throws IOException {
 		String filename = this.getConfigurationFileName();
-		File configFile = new File(this.getConfigurationDirectory() + File.separator + filename);
+		File configFile = new File(Constants.CONFIG_DIRECTORY + File.separator + filename);
 
 		Properties props = new Properties();
 		props.clear();
@@ -405,9 +410,6 @@ public class ConfigProviderImpl {
 		log.info("Configuration file saved to " + configFile.getAbsolutePath());
 	}
 
-
-	public String getConfigurationDirectory() { return Constants.CONFIG_DIRECTORY; }
-
 	// TODO review this
 	public void setConfigurationFileName(String configurationFile) { this.configurationFile = configurationFile; }
 	public String getConfigurationFileName() { return this.configurationFile; }
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
index 0a6db176..d47b0f84 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OutputState.java
@@ -25,6 +25,7 @@ import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.composites.OutputComposite;
 import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.gui.controls.Dialog.BUTTONS;
+import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
@@ -52,7 +53,7 @@ public class OutputState extends State {
 			ConfigProviderImpl config = getStateMachine().configProvider;
 			Status status = getStateMachine().status;
 
-			File tmpDir = new File(config.getConfigurationDirectory() + File.separator + "tmp");
+			File tmpDir = new File(Constants.CONFIG_DIRECTORY + File.separator + "tmp");
 
 			if(!tmpDir.exists()) {
 				tmpDir.mkdir();
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
index 3f4f9086..7b5cd98d 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
@@ -20,7 +20,6 @@ import java.awt.Desktop;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -64,10 +63,7 @@ import at.asit.pdfover.signator.Signator;
 public class PrepareConfigurationState extends State {
 
 	/** SLF4J Logger instance **/
-	static final Logger log = LoggerFactory
-			.getLogger(PrepareConfigurationState.class);
-
-	private static String FILE_SEPARATOR = File.separator;
+	static final Logger log = LoggerFactory.getLogger(PrepareConfigurationState.class);
 
 	private ArgumentHandler handler;
 
@@ -105,43 +101,15 @@ public class PrepareConfigurationState extends State {
 		this.configFileHandler.addCLIArgument(ConfigFileArgument.class);
 	}
 
-	private void initializeFromConfigurationFile()
-			throws InitializationException {
+	private void initializeFromConfigurationFile() throws InitializationException {
 		try {
-			String filename = getStateMachine().configProvider.getConfigurationFileName();
-			getStateMachine().configProvider.loadConfiguration(new FileInputStream(getStateMachine().configProvider.getConfigurationDirectory() + FILE_SEPARATOR + filename));
-
-			log.info("Loaded config from file : " + filename);
-
+			getStateMachine().configProvider.loadConfiguration();
 		} catch (IOException ex) {
-			throw new InitializationException(
-					"Failed to read configuration from config file", ex);
+			throw new InitializationException("Failed to read configuration from config file", ex);
 		}
 	}
 
-	/**
-	 * Update configuration values as necessary
-	 */
-	private void updateConfiguration() {
-		ConfigProviderImpl config = getStateMachine().configProvider;
-
-		//Update signature note if old default is used
-		String note = config.getSignatureNote();
-		Locale loc = config.getSignatureLocale();
-
-		String note_old = Messages.getString("simple_config.Note_Default_Old", loc);
-		if (note.equals(note_old))
-			resetSignatureNoteField(config);
-	}
-
-	private void resetSignatureNoteField(ConfigProviderImpl config){
-		getStateMachine().configProvider.setSignatureNote(
-			Profile.getProfile(config.getSignatureProfile()).getDefaultSignatureBlockNote(config.getLocale())
-		);
-	}
-
-	private void initializeFromArguments(String[] args, ArgumentHandler handler)
-			throws InitializationException {
+	private void initializeFromArguments(String[] args, ArgumentHandler handler) throws InitializationException {
 		handler.handleArguments(args);
 
 		if (handler.doesRequireExit()) {
@@ -149,98 +117,17 @@ public class PrepareConfigurationState extends State {
 		}
 	}
 
-	private void copyPdfOverConfig() throws InitializationException {
-		// 1Kb buffer
-		byte[] buffer = new byte[1024];
-		int byteCount = 0;
-
-		InputStream inputStream = null;
-		FileOutputStream pdfOverConfig = null;
+	private void ensurePdfOverConfigExists() throws InitializationException {
 		try {
-			inputStream = getClass().getResourceAsStream(
-					Constants.RES_PKG_PATH + Constants.DEFAULT_CONFIG_FILENAME);
-			pdfOverConfig = new FileOutputStream(
-					getStateMachine().configProvider.getConfigurationDirectory() +
-					FILE_SEPARATOR + Constants.DEFAULT_CONFIG_FILENAME);
-
-			while ((byteCount = inputStream.read(buffer)) >= 0) {
-				pdfOverConfig.write(buffer, 0, byteCount);
-			}
+			File pdfOverConfig = new File(Constants.CONFIG_DIRECTORY + File.separator + Constants.DEFAULT_CONFIG_FILENAME);
+			if (!pdfOverConfig.exists())
+				pdfOverConfig.createNewFile();
 		} catch (Exception e) {
-			log.error(
-					"Failed to write PDF Over config file to config directory", e);
-			throw new InitializationException(
-					"Failed to write PDF Over config file to config directory",
-					e);
-		} finally {
-			if (pdfOverConfig != null) {
-				try {
-					pdfOverConfig.close();
-				} catch (IOException e) {
-					log.warn(
-							"Failed to close File stream for PDFOver config", e);
-				}
-			}
-
-			if (inputStream != null) {
-				try {
-					inputStream.close();
-				} catch (IOException e) {
-					log.warn(
-							"Failed to close Resource stream for PDFOver config", e);
-				}
-			}
+			log.error("Failed to create PDF-Over config file", e);
+			throw new InitializationException("Failed to create PDF-Over config file", e);
 		}
 	}
 
-	private void copyLog4jConfig() throws InitializationException {
-		// TODO: figure out if we still need this
-		/*
-		// 1Kb buffer
-		byte[] buffer = new byte[1024];
-		int byteCount = 0;
-
-		InputStream inputStream = null;
-		FileOutputStream pdfOverConfig = null;
-		try {
-			inputStream = getClass().getResourceAsStream(
-					Constants.RES_PKG_PATH + Constants.DEFAULT_LOG4J_FILENAME);
-			String filename = getStateMachine().configProvider.getConfigurationDirectory()
-					+ FILE_SEPARATOR + Constants.DEFAULT_LOG4J_FILENAME;
-			pdfOverConfig = new FileOutputStream(filename);
-
-			while ((byteCount = inputStream.read(buffer)) >= 0) {
-				pdfOverConfig.write(buffer, 0, byteCount);
-			}
-
-			PropertyConfigurator.configureAndWatch(filename);
-		} catch (Exception e) {
-			log.error(
-					"Failed to write log4j config file to config directory", e);
-			throw new InitializationException(
-					"Failed to write log4j config file to config directory",
-					e);
-		} finally {
-			if (pdfOverConfig != null) {
-				try {
-					pdfOverConfig.close();
-				} catch (IOException e) {
-					log.warn(
-							"Failed to close File stream for log4j config", e);
-				}
-			}
-
-			if (inputStream != null) {
-				try {
-					inputStream.close();
-				} catch (IOException e) {
-					log.warn(
-							"Failed to close Resource stream for log4j config", e);
-				}
-			}
-		}*/
-	}
-
 	private void unzipPdfAsConfig(File configDir) throws InitializationException {
 		InputStream is = getClass().getResourceAsStream(Constants.RES_CFG_ZIP);
 
@@ -271,22 +158,6 @@ public class PrepareConfigurationState extends State {
 		}
 	}
 
-	private void initializeConfig() throws InitializationException {
-		initializeFromConfigurationFile();
-
-		resetSignatureNoteField(getStateMachine().configProvider);
-
-		try {
-			getStateMachine().configProvider.saveCurrentConfiguration();
-		} catch (IOException e) {
-			log.error(
-					"Failed to set local configuration signature note!", e);
-			throw new InitializationException(
-					"Failed to set local configuration signature note!",
-					e);
-		}
-	}
-
 	private void createConfiguration(File configDir) throws InitializationException {
 		boolean allOK = false;
 
@@ -296,11 +167,9 @@ public class PrepareConfigurationState extends State {
 		}
 
 		try {
-			copyPdfOverConfig();
-			copyLog4jConfig();
+			ensurePdfOverConfigExists();
 			unzipPdfAsConfig(configDir);
 			updateVersionFile(configDir);
-			initializeConfig();
 
 			allOK = true;
 		} finally {
@@ -353,7 +222,7 @@ public class PrepareConfigurationState extends State {
 		try {
 			File backup = File.createTempFile(Constants.PDF_AS_CONFIG_BACKUP_FILENAME, ".zip");
 			OutputStream os = new FileOutputStream(backup);
-			Zipper.zip(configDir + FILE_SEPARATOR + "cfg", os, true);
+			Zipper.zip(configDir + File.separator + "cfg", os, true);
 			os.close();
 			unzipPdfAsConfig(configDir);
 			File b = new File(configDir, Constants.PDF_AS_CONFIG_BACKUP_FILENAME + ".zip");
@@ -379,8 +248,7 @@ public class PrepareConfigurationState extends State {
 			StateMachine stateMachine = getStateMachine();
 			ConfigProviderImpl config = stateMachine.configProvider;
 			final GUIProvider gui = stateMachine;
-			String cDir = config.getConfigurationDirectory();
-			File configDir = new File(cDir);
+			File configDir = new File(Constants.CONFIG_DIRECTORY);
 			File configFile = new File(configDir, Constants.DEFAULT_CONFIG_FILENAME);
 			if (!configDir.exists() || !configFile.exists()) {
 				log.debug("Creating configuration file");
@@ -410,8 +278,7 @@ public class PrepareConfigurationState extends State {
 
 			// initialize from config file
 			initializeFromConfigurationFile();
-			updateConfiguration();
-
+			
 			// Read cli arguments
 			try {
 				initializeFromArguments(stateMachine.cmdLineArgs, this.handler);
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/PDF-Over.config b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/PDF-Over.config
deleted file mode 100644
index 6701d4f6..00000000
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/PDF-Over.config
+++ /dev/null
@@ -1 +0,0 @@
-// Default configuration...
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 f077e2e4..76e8b5fd 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
@@ -227,7 +227,6 @@ simple_config.Note=Text\:
 simple_config.Note_Default_Standard=This document is signed with a qualified electronic signature. According to Art. 25 para. 2 of the Regulation (EU) No 910/2014 of 23. July 2014 ("eIDAS-Regulation") it shall have the equivalent legal effect of a handwritten signature.
 simple_config.Note_Default_OfficialSignature=This document was signed/sealed with an official signature. According to  § 20 Austrian E-Government-Act a printout of this document is assumed to be authentic.
 simple_config.Note_Default_Empty=
-simple_config.Note_Default_Old=This document is signed with a qualified electronic signature. According to  § 4 art. 1 of the Signature Act it in principle is legally equivalent to a handwritten signature.
 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
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
index 3dc776fc..c7cdbc73 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
+++ b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages_de.properties
@@ -218,7 +218,6 @@ simple_config.Note=Text\:
 simple_config.Note_Default_Standard=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument hat gemäß Art. 25 Abs. 2 der Verordnung (EU) Nr. 910/2014 vom 23. Juli 2014 (\"eIDAS-VO\") die gleiche Rechtswirkung wie ein handschriftlich unterschriebenes Dokument.
 simple_config.Note_Default_OfficialSignature=Dieses Dokument wurde amtssigniert. Auch ein Ausdruck dieses Dokuments hat gemäß § 20 E-Government-Gesetz die Beweiskraft einer öffentlichen Urkunde.
 simple_config.Note_Default_Empty=
-simple_config.Note_Default_Old=Dieses mit einer qualifizierten elektronischen Signatur versehene Dokument ist gemäß § 4 Abs. 1 Signaturgesetz einem handschriftlich unterschriebenen Dokument grundsätzlich rechtlich gleichgestellt.
 simple_config.Note_SetDefault=Standard wiederherstellen
 simple_config.Note_Title=Signaturhi&nweis
 simple_config.Note_Tooltip=Ein optionaler Hinweis, der in Ihrer Signatur angezeigt wird