Rename ATrustHelper, refVal

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

6 files changed, 25 insertions, 25 deletions

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java
index 219ac99b..cb2a1ee8 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/ConfigurationContainerImpl.java
@@ -32,7 +32,7 @@ import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
 import at.asit.pdfover.gui.exceptions.InvalidNumberException;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
 import at.asit.pdfover.gui.utils.Messages;
-import at.asit.pdfover.gui.workflow.states.mobilebku.ATrustHelper;
+import at.asit.pdfover.gui.workflow.states.mobilebku.MobileBKUHelper;
 import at.asit.pdfover.signator.BKUs;
 import at.asit.pdfover.signator.SignaturePosition;
 
@@ -148,7 +148,7 @@ public class ConfigurationContainerImpl implements ConfigurationContainer {
 			return;
 		}
 		try {
-			this.mobileNumber = ATrustHelper.normalizeMobileNumber(number);
+			this.mobileNumber = MobileBKUHelper.normalizeMobileNumber(number);
 		} catch (InvalidNumberException e) {
 			throw new InvalidNumberException(Messages.getString("error.InvalidPhoneNumber")); //$NON-NLS-1$
 		}
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index bc831766..71e68d36 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -251,7 +251,7 @@ public class MobileBKUState extends State {
 				postTanThread.start();
 
 			} else {
-				tan.setVergleichswert(mobileStatus.getVergleichswert());
+				tan.setRefVal(mobileStatus.getRefVal());
 
 				if (mobileStatus.getTanTries() < MobileBKUStatus.MOBILE_MAX_TAN_TRIES
 						&& mobileStatus.getTanTries() > 0) {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUHelper.java
index ee984e96..cbb234cb 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/ATrustHelper.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUHelper.java
@@ -30,12 +30,12 @@ import at.asit.pdfover.gui.exceptions.PasswordTooShortException;
 /**
  * 
  */
-public class ATrustHelper {
+public class MobileBKUHelper {
 	/**
 	 * SLF4J Logger instance
 	 **/
 	private static final Logger log = LoggerFactory
-			.getLogger(ATrustHelper.class);
+			.getLogger(MobileBKUHelper.class);
 
 	/**
 	 * Regular expression for mobile phone numbers: this allows the entrance of
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java
index fd8ded4e..78dad7a5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/MobileBKUStatus.java
@@ -58,7 +58,7 @@ public class MobileBKUStatus {
 
 	String baseURL;
 	
-	String vergleichswert;
+	String refVal;
 	
 	String errorMessage;
 	
@@ -109,17 +109,17 @@ public class MobileBKUStatus {
 	}
 
 	/**
-	 * @return the vergleichswert
+	 * @return the reference value
 	 */
-	public String getVergleichswert() {
-		return this.vergleichswert;
+	public String getRefVal() {
+		return this.refVal;
 	}
 
 	/**
-	 * @param vergleichswert the vergleichswert to set
+	 * @param refVal the reference value to set
 	 */
-	public void setVergleichswert(String vergleichswert) {
-		this.vergleichswert = vergleichswert;
+	public void setRefVal(String refVal) {
+		this.refVal = refVal;
 	}
 
 	/**
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java
index a2269d21..45656404 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostCredentialsThread.java
@@ -129,28 +129,28 @@ public class PostCredentialsThread implements Runnable {
 			String eventValidation = status.getEventvalidation();
 			String sessionID = status.getSessionID();
 			
-			String vergleichswert = null;
+			String refVal = null;
 			
-			status.setVergleichswert(null);
+			status.setRefVal(null);
 			status.setErrorMessage(null);
 			
 			if(responseData.contains("signature.aspx?sid=")) { //$NON-NLS-1$
 				// credentials ok! TAN eingabe
-				sessionID = ATrustHelper.extractTag(responseData, "signature.aspx?sid=", "\""); //$NON-NLS-1$ //$NON-NLS-2$
-				viewState = ATrustHelper.extractTag(responseData, "id=\"__VIEWSTATE\" value=\"", "\""); //$NON-NLS-1$  //$NON-NLS-2$
+				sessionID = MobileBKUHelper.extractTag(responseData, "signature.aspx?sid=", "\""); //$NON-NLS-1$ //$NON-NLS-2$
+				viewState = MobileBKUHelper.extractTag(responseData, "id=\"__VIEWSTATE\" value=\"", "\""); //$NON-NLS-1$  //$NON-NLS-2$
 				
-				eventValidation = ATrustHelper.extractTag(responseData, "id=\"__EVENTVALIDATION\" value=\"", "\""); //$NON-NLS-1$  //$NON-NLS-2$
+				eventValidation = MobileBKUHelper.extractTag(responseData, "id=\"__EVENTVALIDATION\" value=\"", "\""); //$NON-NLS-1$  //$NON-NLS-2$
 				
-				vergleichswert = ATrustHelper.extractTag(responseData, "id='vergleichswert'><b>Vergleichswert:</b>", "</div>");  //$NON-NLS-1$//$NON-NLS-2$
+				refVal = MobileBKUHelper.extractTag(responseData, "id='vergleichswert'><b>Vergleichswert:</b>", "</div>");  //$NON-NLS-1$//$NON-NLS-2$
 				
-				status.setVergleichswert(vergleichswert);
+				status.setRefVal(refVal);
 				
 				this.state.setCommunicationState(MobileBKUCommunicationState.POST_TAN);
 			} else {
 				// error seite
 				// extract error text!
 				
-				String errorMessage = ATrustHelper.extractTag(responseData, "<span id=\"Label1\" class=\"ErrorClass\">", "</span>"); //$NON-NLS-1$ //$NON-NLS-2$
+				String errorMessage = MobileBKUHelper.extractTag(responseData, "<span id=\"Label1\" class=\"ErrorClass\">", "</span>"); //$NON-NLS-1$ //$NON-NLS-2$
 				
 				this.state.getStatus().setErrorMessage(errorMessage);
 				
@@ -159,7 +159,7 @@ public class PostCredentialsThread implements Runnable {
 			}
 			
 			log.info("sessionID: " + sessionID); //$NON-NLS-1$
-			log.info("Vergleichswert: " + vergleichswert); //$NON-NLS-1$
+			log.info("Vergleichswert: " + refVal); //$NON-NLS-1$
 			log.info("viewState: " + viewState); //$NON-NLS-1$
 			log.info("eventValidation: " + eventValidation); //$NON-NLS-1$
 			
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java
index ecd1d98a..4de8f6fc 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/mobilebku/PostSLRequestThread.java
@@ -146,7 +146,7 @@ public class PostSLRequestThread implements Runnable {
 			String responseData = null;
 
 			this.state.getStatus().setBaseURL(
-					ATrustHelper.stripQueryString(url));
+					MobileBKUHelper.stripQueryString(url));
 
 			// Follow redirects
 			do {
@@ -188,13 +188,13 @@ public class PostSLRequestThread implements Runnable {
 
 			// Extract infos:
 
-			String sessionID = ATrustHelper.extractTag(responseData,
+			String sessionID = MobileBKUHelper.extractTag(responseData,
 					"identification.aspx?sid=", "\""); //$NON-NLS-1$ //$NON-NLS-2$
 
-			String viewState = ATrustHelper.extractTag(responseData,
+			String viewState = MobileBKUHelper.extractTag(responseData,
 					"id=\"__VIEWSTATE\" value=\"", "\""); //$NON-NLS-1$  //$NON-NLS-2$
 
-			String eventValidation = ATrustHelper.extractTag(responseData,
+			String eventValidation = MobileBKUHelper.extractTag(responseData,
 					"id=\"__EVENTVALIDATION\" value=\"", "\""); //$NON-NLS-1$  //$NON-NLS-2$
 
 			log.info("sessionID: " + sessionID); //$NON-NLS-1$