Bugfixes

- Account number search
- Account nubmer generation
- Some file loading stuff

src/main/java/eu/tankernn/accounts/Account.java

@@ -13,7 +13,10 @@ public class Account {
 
 	public Account(String firstName, String lastName) {
 		// Generate a random, unique account id
-		accountNumber = Stream.generate(() -> new BigInteger(20, new SecureRandom()).toString()).limit(AccountManager.getAccounts().size() + 1).filter(num -> AccountManager.getAccountByNumber(num).isPresent()).findFirst().orElseThrow(() -> new ArrayIndexOutOfBoundsException());
+		accountNumber = Stream.generate(() -> new BigInteger(20, new SecureRandom()).toString())
+				.limit(AccountManager.getAccounts().size() + 1)
+				.filter(num -> !AccountManager.getAccountByNumber(num).isPresent()).findFirst()
+				.orElseThrow(() -> new ArrayIndexOutOfBoundsException());
 		this.firstName = firstName;
 		this.lastName = lastName;
 		this.history = new ArrayList<AccountEvent>();

src/main/java/eu/tankernn/accounts/AccountManager.java

@@ -1,5 +1,6 @@
 package eu.tankernn.accounts;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +35,8 @@ public class AccountManager {
 	 * Initializes the account list using the last file opened, if available.
 	 * Otherwise creates an empty list.
 	 * 
-	 * @param refresh A runnable that gets called when the account list changes.
+	 * @param refresh
+	 *            A runnable that gets called when the account list changes.
 	 */
 	public static void init(Runnable refresh, boolean openLast) {
 		AccountManager.refresh = refresh;
@@ -50,14 +52,17 @@ public class AccountManager {
 	public static void openFile() {
 		String jsonString;
 		lastPassword = null;
+		File f = CachedFileChooser.selectFile(false);
 		while (true)
 			try {
-				jsonString = FileManager.openFile(CachedFileChooser.selectFile(false), lastPassword);
-				lastPassword = PasswordDialog.showPasswordDialog("The data is encrypted, please enter the password to decrypt it.");
+				jsonString = FileManager.openFile(f, lastPassword);
 				break;
 			} catch (InvalidPasswordException e) {
+				lastPassword = PasswordDialog
+						.showPasswordDialog("The data is encrypted, please enter the password to decrypt it.");
 				continue;
-			} catch (IOException e) {
+			} catch (CancellationException | IOException e) {
+				e.printStackTrace();
 				newFile();
 				return;
 			}
@@ -86,15 +91,17 @@ public class AccountManager {
 	/**
 	 * Saves the current list of accounts to a file.
 	 * 
-	 * @param saveAs Determines whether the user should be prompted to specify a
-	 *        new filename, or if the last filename should be used.
+	 * @param saveAs
+	 *            Determines whether the user should be prompted to specify a
+	 *            new filename, or if the last filename should be used.
 	 */
 	public static void saveFile(boolean saveAs) {
 		String data = exportJSON();
 		if (saveWithEncryption) {
 			while (lastPassword == null || lastPassword.length < 5) {
 				try {
-					lastPassword = PasswordDialog.showPasswordDialog("Select a password to encrypt the account file with. (At least 5 characters, preferrably longer)");
+					lastPassword = PasswordDialog.showPasswordDialog(
+							"Select a password to encrypt the account file with. (At least 5 characters, preferrably longer)");
 				} catch (CancellationException ex) {
 					return;
 				}
@@ -114,16 +121,17 @@ public class AccountManager {
 	 */
 	public static boolean closeFile() {
 		if (AccountManager.hasUnsavedChanges()) {
-			int option = JOptionPane.showOptionDialog(null, "Would you like to save changes before exit?", "Save changes", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, 0);
+			int option = JOptionPane.showOptionDialog(null, "Would you like to save changes before exit?",
+					"Save changes", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null, null, 0);
 
 			switch (option) {
-				case JOptionPane.YES_OPTION:
-					saveFile(false);
-					break;
-				case JOptionPane.NO_OPTION:
-					break;
-				default:
-					return false;
+			case JOptionPane.YES_OPTION:
+				saveFile(false);
+				break;
+			case JOptionPane.NO_OPTION:
+				break;
+			default:
+				return false;
 			}
 		}
 		accounts.clear();
@@ -153,7 +161,8 @@ public class AccountManager {
 	/**
 	 * Adds the specified account to the list and refreshes the window instance.
 	 * 
-	 * @param account The <code>Account</code> to be added to the list
+	 * @param account
+	 *            The <code>Account</code> to be added to the list
 	 */
 	public static void addAccount(Account account) {
 		accounts.add(account);
@@ -164,11 +173,13 @@ public class AccountManager {
 	 * Searches the list of accounts for ones matching the search string by name
 	 * or account number.
 	 * 
-	 * @param s The search string
+	 * @param s
+	 *            The search string
 	 * @return The list of matching accounts
 	 */
 	public static List<Account> search(String s) {
-		return accounts.stream().filter(a -> a.accountNumber.toLowerCase().contains(s.toLowerCase()) || a.toString().toLowerCase().contains(s.toLowerCase())).collect(Collectors.toList());
+		return accounts.stream().filter(a -> a.accountNumber.toLowerCase().contains(s.toLowerCase())
+				|| a.toString().toLowerCase().contains(s.toLowerCase())).collect(Collectors.toList());
 
 	}
 
@@ -183,7 +194,7 @@ public class AccountManager {
 	 * @return The account, if it was found
 	 */
 	public static Optional<Account> getAccountByNumber(String accountNumber) {
-		return accounts.stream().filter(accountNumber::equals).findFirst();
+		return accounts.stream().filter(a -> a.accountNumber.equals(accountNumber)).findFirst();
 	}
 
 	public static boolean isSavingWithEncryption() {

src/main/java/eu/tankernn/accounts/CachedFileChooser.java

@@ -14,8 +14,10 @@ public class CachedFileChooser {
 		if (getLastFileFromCache() == null)
 			saveAs = true;
 		if (saveAs)
-			FILE_CHOOSER.showSaveDialog(null);
-		return saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache();
+			FILE_CHOOSER.showDialog(null, "Open/Save");
+		File f = saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache();
+		writeLastFileToCache(f);
+		return f;
 	}
 
 	private static File getLastFileFromCache() {
@@ -23,8 +25,6 @@ public class CachedFileChooser {
 		try {
 			// Create file to cache last filename
 			if (!lastFilenameCache.exists()) {
-				lastFilenameCache.getParentFile().mkdirs();
-				lastFilenameCache.createNewFile();
 				return null;
 			}
 			String lastFilePath = FileManager.readFileAsString(lastFilenameCache);
@@ -38,10 +38,13 @@ public class CachedFileChooser {
 	}
 
 	static void writeLastFileToCache(File file) {
-		if (file == null)
+		if (file == null) {
 			lastFilenameCache.delete();
+			return;
+		}
 		// Remember this filename
-		if (!file.equals(lastFilenameCache)) { // Don't remember the cache file
+		if (!lastFilenameCache.equals(file)) { // Don't remember the cache file
+			lastFilenameCache.getParentFile().mkdirs();
 			FileManager.saveFile(lastFilenameCache, file.getAbsolutePath());
 			FILE_CHOOSER.setSelectedFile(file);
 		}

src/main/java/eu/tankernn/accounts/FileManager.java

@@ -20,12 +20,14 @@ public class FileManager {
 	
 
 	/**
-	 * Loads the accounts in the file specified.
+	 * Reads and decrypts the JSON-string in the file specified.
 	 * 
 	 * @return A JSON-string containing the account information.
 	 * @throws InvalidPasswordException 
 	 */
 	public static String openFile(File file, char[] password) throws IOException, InvalidPasswordException {
+		if (file == null)
+			throw new FileNotFoundException();
 		Object data = null;
 		try {
 			// Try to read the file as a byte[][]

src/test/java/eu/tankernn/accounts/test/AccountManagerTest.java

@@ -1,8 +1,5 @@
 package eu.tankernn.accounts.test;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -23,11 +20,9 @@ public class AccountManagerTest {
 
 	@Test
 	public void testSearch() {
-		List<Account> aList = new ArrayList<>();
-		aList.add(a);
-		Assert.assertEquals(aList, AccountManager.search(a.accountNumber));
-		Assert.assertEquals(aList, AccountManager.search(a.firstName));
-		Assert.assertEquals(aList, AccountManager.search(a.lastName));
-		Assert.assertEquals(a, AccountManager.getAccountByNumber(a.accountNumber));
+		Assert.assertTrue(AccountManager.search(a.accountNumber).contains(a));
+		Assert.assertTrue(AccountManager.search(a.firstName).contains(a));
+		Assert.assertTrue(AccountManager.search(a.lastName).contains(a));
+		Assert.assertEquals(a, AccountManager.getAccountByNumber(a.accountNumber).get());
 	}
 }

src/test/java/eu/tankernn/accounts/test/FileManagerTest.java

@@ -3,6 +3,7 @@ package eu.tankernn.accounts.test;
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -10,8 +11,8 @@ import eu.tankernn.accounts.FileManager;
 import eu.tankernn.accounts.util.encryption.InvalidPasswordException;
 
 public class FileManagerTest {
-	String testData = "[VeryNice2123..----__...'+<<><";
-	File testFile = new File("test.txt");
+	static String testData = "[VeryNice2123..----__...'+<<><";
+	static File testFile = new File("test.txt");
 	
 	@Test
 	public void testPlainReadWrite() {
@@ -37,4 +38,9 @@ public class FileManagerTest {
 			Assert.fail(e.getMessage());
 		}
 	}
+	
+	@AfterClass
+	public static void tearDownClass() {
+		testFile.delete();
+	}
 }