Certificate Download Server + Searching for Placeholder

1 files changed, 78 insertions, 0 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 99fd9747..8242cd03 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
@@ -112,6 +112,10 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 		// Set Output Folder
 		setDefaultOutputFolder(config
 				.getProperty(Constants.CFG_OUTPUT_FOLDER));
+		
+		// Set Default Certificate Download URL
+				setDefaultDownloadURL(config
+						.getProperty(Constants.CFG_DOWNLOAD_URL));
 
 		String localeString = config.getProperty(Constants.CFG_LOCALE);
 		
@@ -127,6 +131,10 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 			setSignatureLocale(signatureTargetLocale);
 		}
 
+		String useMarker = config.getProperty(Constants.CFG_USE_MARKER);
+		if(null != useMarker)
+			setUseMarker(useMarker.equalsIgnoreCase(Constants.TRUE));
+
 		String compat = config.getProperty(Constants.CFG_SIGNATURE_PDFA_COMPAT);
 		if (compat != null)
 			setSignaturePdfACompat(compat.equalsIgnoreCase(Constants.TRUE));
@@ -138,6 +146,14 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 			this.configuration.setMobileBKUURL(bkuUrl);
 		}
 
+  		String downloadURL = config
+				.getProperty(Constants.CFG_DOWNLOAD_URL);
+		
+		if (downloadURL != null && !downloadURL.isEmpty()) {
+			this.configuration.setDownloadURL(downloadURL);
+		}
+		
+
 		String bkuType = config
 				.getProperty(Constants.CFG_MOBILE_BKU_TYPE);
 
@@ -327,6 +343,7 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 			props.setProperty(Constants.CFG_PROXY_PASS, proxyPass);
 
 		props.setProperty(Constants.CFG_EMBLEM, getDefaultEmblemPersistent());
+		props.setProperty(Constants.CFG_DOWNLOAD_URL, getDownloadURL());
 		props.setProperty(Constants.CFG_SIGNATURE_NOTE, getSignatureNote());
 		props.setProperty(Constants.CFG_MOBILE_NUMBER, getDefaultMobileNumberPersistent());
 		props.setProperty(Constants.CFG_OUTPUT_FOLDER, getDefaultOutputFolderPersistent());
@@ -346,6 +363,9 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 			props.setProperty(Constants.CFG_SIGNATURE_LOCALE, LocaleSerializer.getParsableString(signatureLocale));
 		}
 
+		if (getUseMarker())
+			props.setProperty(Constants.CFG_USE_MARKER, Constants.TRUE);
+
 		if (getSignaturePdfACompat())
 			props.setProperty(Constants.CFG_SIGNATURE_PDFA_COMPAT, Constants.TRUE);
 
@@ -394,6 +414,7 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 
 		if (!getUpdateCheck())
 			props.setProperty(Constants.CFG_UPDATE_CHECK, Constants.FALSE);
+		
 
 		FileOutputStream outputstream = new FileOutputStream(configFile, false);
 
@@ -729,6 +750,24 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 			emblem = STRING_EMPTY;
 		return emblem;
 	}
+	
+	@Override
+	public String getDownloadURL() {
+		String downloadURL="";
+	try
+	{
+		downloadURL = this.configuration.getDownloadURL();
+		if (downloadURL.isEmpty()||downloadURL == null)
+			{downloadURL = Constants.CERTIFICATE_DOWNLOAD_XML_URL;
+			}
+		return downloadURL;
+	} catch (NullPointerException npe){
+		 String message = npe.getMessage();
+ 			downloadURL = Constants.CERTIFICATE_DOWNLOAD_XML_URL;
+		
+	}
+		return downloadURL;
+	}
 
 	/**
 	 * Sets the proxy host
@@ -945,6 +984,16 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 		}
 	}
 
+	
+	@Override
+	public void setDefaultDownloadURL(String downloadURL) {
+		if (downloadURL == null || downloadURL.trim().isEmpty()) {
+			this.configuration.setDownloadURL(Constants.CERTIFICATE_DOWNLOAD_XML_URL+Constants.CERTIFICATE_XML_FILE);
+		} else {
+			this.configuration.setDownloadURL(downloadURL);
+		}
+	}/*
+	
 	/* (non-Javadoc)
 	 * @see at.asit.pdfover.gui.workflow.ConfigOverlayManipulator#setDefaultOutputFolderOverlay(java.lang.String)
 	 */
@@ -1416,4 +1465,33 @@ public class ConfigProviderImpl implements ConfigProvider, ConfigManipulator,
 	public void setSkipFinishOverlay(boolean skipFinish) {
 		this.configurationOverlay.setSkipFinish(skipFinish);
 	}
+
+	/* (non-Javadoc)
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigManipulator#setDownloadURL(java.lang.String)
+	 */
+	@Override
+	public void setDownloadURL(String downloadURL) {
+		this.configuration.setDownloadURL(downloadURL);
+		
+	}
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigProvider#getUseMarker()
+	 */
+	@Override
+	public boolean getUseMarker() {
+		return this.configurationOverlay.getUseMarker();
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see at.asit.pdfover.gui.workflow.config.ConfigManipulator#setUseMarker(
+	 * boolean)
+	 */
+	@Override
+	public void setUseMarker(boolean useMarker) {
+		this.configurationOverlay.setUseMarker(useMarker);
+	}
 }