From 1c71311ba1eb4be85ee2424e90b59c29136c81a0 Mon Sep 17 00:00:00 2001
From: Shots243 <fawwazandsyafiq@gmail.com>
Date: Wed, 28 Aug 2019 08:47:06 +0100
Subject: [PATCH] Cleaned up ProfileProperties.java slightly.

---
 .../nullpo/custom/libs/ProfileProperties.java | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/zeroxfc/nullpo/custom/libs/ProfileProperties.java b/src/zeroxfc/nullpo/custom/libs/ProfileProperties.java
index 9c988e8..d218ff8 100644
--- a/src/zeroxfc/nullpo/custom/libs/ProfileProperties.java
+++ b/src/zeroxfc/nullpo/custom/libs/ProfileProperties.java
@@ -153,9 +153,19 @@ private String getStorageName(String name) {
 	 * @param name Name to test
 	 * @return Available?
 	 */
-	private boolean testUsernameAvailability(String name, long number) {
+	private boolean testUsernameTaken(String name, long number) {
 		String nCap = getStorageName(name);
-		return !PROP_PROFILE.getProperty(PREFIX_NAME + nCap + "." + number, false);
+		return PROP_PROFILE.getProperty(PREFIX_NAME + nCap + "." + number, false);
+	}
+
+	/**
+	 * Tests to see if a name has not already been taken on the local machine.
+	 * @param name Name to test
+	 * @return Available?
+	 */
+	private boolean testUsernameAvailability(String name) {
+		String nCap = getStorageName(name);
+		return !PROP_PROFILE.getProperty(PREFIX_NAME + nCap + "." + 0, false);
 	}
 
 	/**
@@ -168,7 +178,7 @@ private boolean testPasswordCrash(String name, int[] buttonPresses) {
 		boolean crash = false;
 		long number = 0;
 
-		while (!testUsernameAvailability(name, number)) {
+		while (testUsernameTaken(name, number)) {
 			if (!PROP_PROFILE.getProperty(PREFIX_NAME + nCap + "." + number, false)) return false;
 			else {
 				crash = true;
@@ -187,16 +197,6 @@ private boolean testPasswordCrash(String name, int[] buttonPresses) {
 		return crash;
 	}
 
-	/**
-	 * Tests to see if a name has already been taken on the local machine.
-	 * @param name Name to test
-	 * @return Available?
-	 */
-	private boolean testUsernameAvailability(String name) {
-		String nCap = getStorageName(name);
-		return !PROP_PROFILE.getProperty(PREFIX_NAME + nCap + "." + 0, false);
-	}
-
 	/**
 	 * Attempt to log into an account with a name and password.
 	 * @param name Account name
@@ -214,7 +214,7 @@ private boolean attemptLogIn(String name, int[] buttonPresses) {
 		boolean login = false;
 
 		long number = 0;
-		while (!testUsernameAvailability(nCap, number)) {
+		while (testUsernameTaken(nCap, number)) {
 			int pass = PROP_PROFILE.getProperty(PREFIX_PASS + nCap + "." + number, 0);
 
 			for (int i = 0; i < buttonPresses.length; i++) {
@@ -256,7 +256,7 @@ private boolean createAccount(String name, int[] buttonPresses) {
 		String nCapDisplay = name.toUpperCase();
 
 		long number = 0;
-		while (!testUsernameAvailability(nCap, number)) {
+		while (testUsernameTaken(nCap, number)) {
 			log.warn("Creation of " + nCapDisplay + " " + number + " failed. Name and number taken.");
 			number++;
 		}
@@ -562,6 +562,7 @@ public boolean isLoggedIn() {
 	 * Screen to draw. Use it inside onCustom and renderLast.
 	 */
 	public static class LoginScreen {
+		/** Screen states */
 		private static final int CUSTOM_STATE_INITIAL_SCREEN = 0,
 		                         CUSTOM_STATE_NAME_INPUT = 1,
 		                         CUSTOM_STATE_PASSWORD_INPUT = 2,