TRUNK-6645: Fix passwordsEntered field visibility to private

Author: solomonfortune

web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java

@@ -279,7 +279,7 @@ protected void doGet(HttpServletRequest httpRequest, HttpServletResponse httpRes
 			// the background install thread reads them, causing "using password: NO".
 			if (!wizardModel.isPasswordsEntered()) {
 				clearPasswords();
-    }
+			}
 
 			renderTemplate(DEFAULT_PAGE, referenceMap, httpResponse);
 		} else if (INSTALL_METHOD.equals(page)) {
@@ -414,13 +414,13 @@ protected void initializeWizardFromResolvedPropertiesIfPresent() {
 	}
 
 	private void clearPasswords() {
-        wizardModel.databaseRootPassword = "";
-        wizardModel.createDatabasePassword = "";
-        wizardModel.createUserPassword = "";
-        wizardModel.currentDatabasePassword = "";
-        wizardModel.remotePassword = "";
-        wizardModel.setPasswordsEntered(false);
-    }
+		wizardModel.databaseRootPassword = "";
+		wizardModel.createDatabasePassword = "";
+		wizardModel.createUserPassword = "";
+		wizardModel.currentDatabasePassword = "";
+		wizardModel.remotePassword = "";
+		wizardModel.setPasswordsEntered(false);
+	}
 
 	/**
 	 * Called by {@link #doFilter(ServletRequest, ServletResponse, FilterChain)} on POST requests
@@ -875,12 +875,12 @@ else if (IMPLEMENTATION_ID_SETUP.equals(page)) {
 	}
 
 	private void startInstallation() {
-                if (!isInstallationStarted()) {
-                        initJob = new InitializationCompletion();
-                        setInstallationStarted(true);
-                        initJob.start();
-                }
-        }
+		if (!isInstallationStarted()) {
+			initJob = new InitializationCompletion();
+			setInstallationStarted(true);
+			initJob.start();
+		}
+	}
 
 	private void createTablesTask() {
 		if (wizardModel.createTables) {

web/src/main/java/org/openmrs/web/filter/initialization/InitializationWizardModel.java

@@ -255,19 +255,18 @@ public class InitializationWizardModel {
 
 	public Properties additionalPropertiesFromInstallationScript = new Properties();
 
-		/**
-         * True once the user has submitted credentials in the wizard.
-         * Prevents clearPasswords() from wiping the shared singleton mid-flow
-         * (e.g. on a parameterless GET caused by a favicon request or redirect)
-         * before the background install thread has read them.
-         */
-        private boolean passwordsEntered = false;
-
-		public boolean isPasswordsEntered() {
-            return passwordsEntered;
-        }
-
-        public void setPasswordsEntered(boolean passwordsEntered) {
-            this.passwordsEntered = passwordsEntered;
-        }
+	/**
+	 * True once the user has submitted credentials in the wizard. Prevents clearPasswords() from wiping
+	 * the shared singleton mid-flow (e.g. on a parameterless GET caused by a favicon request or
+	 * redirect) before the background install thread has read them.
+	 */
+	private boolean passwordsEntered = false;
+
+	public boolean isPasswordsEntered() {
+		return passwordsEntered;
+	}
+
+	public void setPasswordsEntered(boolean passwordsEntered) {
+		this.passwordsEntered = passwordsEntered;
+	}
 }