Move resource strings to Constants

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@389 174cde9d-5d70-4d2a-aa98-46368bc2aaf7

2 files changed, 9 insertions, 12 deletions

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 a05ded9e..93e5844c 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
@@ -58,8 +58,6 @@ public class PrepareConfigurationState extends State {
 	private static final Logger log = LoggerFactory
 			.getLogger(PrepareConfigurationState.class);
 
-	private static String RES_PATH = "/at/asit/pdfover/gui/"; //$NON-NLS-1$
-
 	private static String FILE_SEPARATOR = File.separator;
 
 	private ArgumentHandler handler;
@@ -105,7 +103,7 @@ public class PrepareConfigurationState extends State {
 					// default value!
 					try {
 						InputStream is = this.getClass().getResourceAsStream(
-								RES_PATH + filename);
+								Constants.RES_PKG_PATH + filename);
 						this.stateMachine.getConfigProvider()
 								.loadConfiguration(is);
 
@@ -151,8 +149,8 @@ public class PrepareConfigurationState extends State {
 			InputStream inputStream = null;
 			FileOutputStream pdfOverConfig = null;
 			try {
-				inputStream = this.getClass().getResourceAsStream(RES_PATH +
-						Constants.DEFAULT_CONFIG_FILENAME);
+				inputStream = this.getClass().getResourceAsStream(
+						Constants.RES_PKG_PATH + Constants.DEFAULT_CONFIG_FILENAME);
 				pdfOverConfig = new FileOutputStream(
 						this.stateMachine.getConfigProvider().getConfigurationDirectory() +
 						FILE_SEPARATOR + Constants.DEFAULT_CONFIG_FILENAME);
@@ -190,7 +188,7 @@ public class PrepareConfigurationState extends State {
 			pdfOverConfig = null;
 			try {
 				inputStream = this.getClass().getResourceAsStream(
-						RES_PATH + Constants.DEFAULT_LOG4J_FILENAME);
+						Constants.RES_PKG_PATH + Constants.DEFAULT_LOG4J_FILENAME);
 				String filename = this.stateMachine.getConfigProvider().getConfigurationDirectory()
 						+ FILE_SEPARATOR + Constants.DEFAULT_LOG4J_FILENAME;
 				pdfOverConfig = new FileOutputStream(filename);
@@ -227,7 +225,7 @@ public class PrepareConfigurationState extends State {
 			}
 			
 			InputStream is = this.getClass().getResourceAsStream(
-					"/cfg/PDFASConfig.zip"); //$NON-NLS-1$
+					Constants.RES_CFG_ZIP);
 
 			try {
 				Unzipper.unzip(is, configDir.getAbsolutePath());
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/SimpleXMLTrustManager.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/SimpleXMLTrustManager.java
index d08dcfe5..6d72e856 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/SimpleXMLTrustManager.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/SimpleXMLTrustManager.java
@@ -33,6 +33,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import at.asit.pdfover.gui.Constants;
+
 /**
  * 
  */
@@ -43,9 +45,6 @@ public class SimpleXMLTrustManager implements X509TrustManager {
 	private static final Logger log = LoggerFactory
 			.getLogger(SimpleXMLTrustManager.class);
 
-	private static final String certificateList = "/certificates/certificates.xml"; //$NON-NLS-1$
-
-
 	/*
 	 * The default X509TrustManager returned by SunX509. We'll delegate
 	 * decisions to it, and fall back to the logic in this class if the default
@@ -93,7 +92,7 @@ public class SimpleXMLTrustManager implements X509TrustManager {
 
 		Document doc = DocumentBuilderFactory.newInstance()
 				.newDocumentBuilder()
-				.parse(this.getClass().getResourceAsStream(certificateList));
+				.parse(this.getClass().getResourceAsStream(Constants.RES_CERT_LIST));
 
 		Node certificates = doc.getFirstChild();
 
@@ -118,7 +117,7 @@ public class SimpleXMLTrustManager implements X509TrustManager {
 					continue;
 				}
 
-				String certResource = "/certificates/" + certificateNode.getTextContent(); //$NON-NLS-1$
+				String certResource = Constants.RES_CERT_PATH + certificateNode.getTextContent();
 
 				X509Certificate cert = (X509Certificate) CertificateFactory
 						.getInstance("X509"). //$NON-NLS-1$