FileManager refactoring.

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

@@ -1,9 +1,6 @@
 package eu.tankernn.accounts;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.ObjectStreamException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -16,8 +13,6 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 import eu.tankernn.accounts.frame.PasswordDialog;
-import eu.tankernn.accounts.util.encryption.EncryptedComplex;
-import eu.tankernn.accounts.util.encryption.Encryption;
 import eu.tankernn.accounts.util.encryption.InvalidPasswordException;
 
 public class AccountManager {
@@ -25,11 +20,11 @@ public class AccountManager {
 	public static final Gson GSON = new Gson();
 
 	private static String lastJSONString = "[]";
-	private static char[] lastPassword;
 	private static boolean saveWithEncryption = true;
+	private static char[] lastPassword;
+
+	private static List<Account> accounts = new ArrayList<Account>();
 
-	private static List<Account> accounts;
-	
 	/**
 	 * Called when account list changes.
 	 */
@@ -44,67 +39,30 @@ public class AccountManager {
 	 */
 	public static void init(Runnable refresh, boolean openLast) {
 		AccountManager.refresh = refresh;
-		accounts = new ArrayList<Account>();
-		File f = null;
-		if (openLast) {
-			f = FileManager.getLastFileFromCache();
-			if (f != null)
-				openFile(f);
-			else
-				newFile();
-		}
-	}
-
-	public static void openFile() {
-		FileManager.FILE_CHOOSER.showOpenDialog(null);
-		openFile(FileManager.FILE_CHOOSER.getSelectedFile());
+		if (openLast)
+			openFile();
+		else
+			newFile();
 	}
 
 	/**
 	 * Loads the accounts in the file specified.
-	 * 
-	 * @param file
-	 *            The file to load
 	 */
-	public static void openFile(File file) {
-		Object data = null;
-		try {
+	public static void openFile() {
+		String jsonString;
+		lastPassword = null;
+		while (true)
 			try {
-				// Try to read the file as a byte[][]
-				data = FileManager.readObjectFromFile(file, byte[][].class);
-			} catch (ObjectStreamException | ClassNotFoundException e1) {
-				// Read the file as string
-				data = FileManager.readFileAsString(file);
+				jsonString = FileManager.openFile(lastPassword);
+				lastPassword = PasswordDialog
+						.showPasswordDialog("The data is encrypted, please enter the password to decrypt it.");
+				break;
+			} catch (InvalidPasswordException e) {
+				continue;
+			} catch (IOException e) {
+				newFile();
+				return;
 			}
-		} catch (FileNotFoundException e) {
-			return;
-		} catch (IOException e) {
-			e.printStackTrace();
-			return;
-		}
-		String jsonString = new String();
-		// If '[' is first, the JSON is *probably* valid
-		if (data instanceof String && ((String) data).startsWith("[")) {
-			lastPassword = null;
-			jsonString = new String((String) data);
-		} else {
-			// Try to decrypt the string or byte[][]
-			do {
-				try {
-					char[] password = PasswordDialog
-							.showPasswordDialog("The data is encrypted, please enter the password to decrypt it.");
-					jsonString = data instanceof String ? Encryption.decryptEncoded((String) data, password)
-							: Encryption.decrypt(new EncryptedComplex((byte[][]) data), password);
-					lastPassword = password;
-					break;
-				} catch (CancellationException ex) {
-					// Start the program without loading a file
-					return;
-				} catch (InvalidPasswordException e) {
-					continue;
-				}
-			} while (jsonString.toCharArray()[0] != '[');
-		}
 
 		accounts = parseJSON(jsonString);
 		lastJSONString = jsonString;
@@ -118,9 +76,9 @@ public class AccountManager {
 	public static void newFile() {
 		if (!closeFile())
 			return;
-		
+
 		FileManager.writeLastFileToCache(null);
-		
+
 		lastPassword = null;
 		accounts.clear();
 		lastJSONString = exportJSON();
@@ -135,26 +93,21 @@ public class AccountManager {
 	 *            new filename, or if the last filename should be used.
 	 */
 	public static void saveFile(boolean saveAs) {
-		try {
-			String newData = exportJSON();
-			String encryptedData = new String(newData);
-			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)");
-					} catch (CancellationException ex) {
-						return;
-					}
-
+		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)");
+				} catch (CancellationException ex) {
+					return;
 				}
-				encryptedData = Encryption.encryptEncoded(newData, lastPassword);
 			}
-			FileManager.writeStringToFile(saveAs, encryptedData);
-			lastJSONString = newData;
-		} catch (IOException e1) {
-			e1.printStackTrace();
+			FileManager.saveFile(data, saveAs, lastPassword);
+		} else {
+			FileManager.saveFile(data, saveAs);
 		}
+		lastJSONString = data;
 	}
 
 	/**
@@ -170,11 +123,7 @@ public class AccountManager {
 
 			switch (option) {
 			case JOptionPane.YES_OPTION:
-				try {
-					FileManager.writeStringToFile(false, AccountManager.exportJSON());
-				} catch (FileNotFoundException e) {
-					e.printStackTrace();
-				}
+				saveFile(false);
 				break;
 			case JOptionPane.NO_OPTION:
 				break;

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

@@ -8,8 +8,14 @@ import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamException;
 
 import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+
+import eu.tankernn.accounts.util.encryption.EncryptedComplex;
+import eu.tankernn.accounts.util.encryption.Encryption;
+import eu.tankernn.accounts.util.encryption.InvalidPasswordException;
 
 public class FileManager {
 	public static final JFileChooser FILE_CHOOSER = new JFileChooser("data/");
@@ -17,7 +23,61 @@ public class FileManager {
 	private static final File lastFilenameCache = new File(
 			System.getProperty("user.home") + File.separator + "accountmanager" + File.separator + "lastFile.txt");
 
-	public static File getLastFileFromCache() {
+	private static File selectFile(boolean saveAs) {
+		if (getLastFileFromCache() == null)
+			saveAs = true;
+		if (saveAs)
+			FILE_CHOOSER.showSaveDialog(null);
+		return saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache();
+	}
+
+	/**
+	 * Loads the accounts in the file specified.
+	 * 
+	 * @return A JSON-string containing the account information.
+	 * @throws InvalidPasswordException 
+	 */
+	public static String openFile(char[] password) throws IOException, InvalidPasswordException {
+		File file = getLastFileFromCache();
+		Object data = null;
+		try {
+			// Try to read the file as a byte[][]
+			data = readObjectFromFile(file, byte[][].class);
+		} catch (ObjectStreamException | ClassNotFoundException e1) {
+			// Read the file as string
+			data = readFileAsString(file);
+		}
+		String jsonString;
+		// If '[' is first, the JSON is *probably* valid
+		if (data instanceof String && ((String) data).startsWith("[")) {
+			jsonString = new String((String) data);
+		} else {
+			if (password == null)
+				throw new InvalidPasswordException();
+			// Try to decrypt the string or byte[][]
+			jsonString = data instanceof String ? Encryption.decryptEncoded((String) data, password)
+					: Encryption.decrypt(new EncryptedComplex((byte[][]) data), password);
+		}
+
+		return jsonString;
+	}
+
+	public static void saveFile(String data, boolean saveAs, char[] password) {
+		saveFile(Encryption.encryptEncoded(data, password), saveAs);
+	}
+
+	/**
+	 * 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.
+	 */
+	public static void saveFile(String data, boolean saveAs) {
+		writeStringToFile(selectFile(saveAs), data);
+	}
+
+	private static File getLastFileFromCache() {
 		// Open last file
 		try {
 			// Create file to cache last filename
@@ -26,7 +86,7 @@ public class FileManager {
 				lastFilenameCache.createNewFile();
 				return null;
 			}
-			String lastFilePath = FileManager.readFileAsString(lastFilenameCache);
+			String lastFilePath = readFileAsString(lastFilenameCache);
 			File f = new File(lastFilePath);
 			FILE_CHOOSER.setSelectedFile(f);
 			return f;
@@ -36,31 +96,18 @@ public class FileManager {
 		return null;
 	}
 
-	public static void writeLastFileToCache(File file) {
+	static void writeLastFileToCache(File file) {
 		if (file == null)
 			lastFilenameCache.delete();
 		// Remember this filename
 		if (!file.equals(lastFilenameCache)) { // Don't remember the cache file
-			try {
-				writeStringToFile(lastFilenameCache, file.getAbsolutePath());
-			} catch (FileNotFoundException e) {
-				e.printStackTrace();
-			}
+			writeStringToFile(lastFilenameCache, file.getAbsolutePath());
 			FILE_CHOOSER.setSelectedFile(file);
 		}
-		
-	}
 
-	public static String readFileAsString(File file) throws IOException {
-		if (file == null) {
-			if (FILE_CHOOSER.showOpenDialog(null) == JFileChooser.CANCEL_OPTION)
-				throw new FileNotFoundException();
-			else
-				file = FILE_CHOOSER.getSelectedFile();
-		}
-		
-		System.out.println("Opening file " + file.getAbsolutePath());
+	}
 
+	private static String readFileAsString(File file) throws IOException {
 		writeLastFileToCache(file);
 
 		BufferedReader reader = new BufferedReader(new FileReader(file));
@@ -74,40 +121,24 @@ public class FileManager {
 		return builder.toString();
 	}
 
-	public static void writeStringToFile(boolean saveAs, String contents) throws FileNotFoundException {
-		if (getLastFileFromCache() == null)
-			saveAs = true;
-		if (saveAs)
-			FILE_CHOOSER.showSaveDialog(null);
-		writeStringToFile(saveAs ? FILE_CHOOSER.getSelectedFile() : getLastFileFromCache(), contents);
-	}
-
-	public static void writeStringToFile(File file, String contents) throws FileNotFoundException {
+	private static void writeStringToFile(File file, String contents) {
 		writeBytesToFile(file, contents.getBytes());
 	}
 
-	public static void writeBytesToFile(File file, byte[] data) throws FileNotFoundException {
-		if (file == null) {
-			FILE_CHOOSER.showSaveDialog(null);
-			file = FILE_CHOOSER.getSelectedFile();
-		}
-
-		FileOutputStream writer = new FileOutputStream(file);
-
+	private static void writeBytesToFile(File file, byte[] data) {
 		try {
+			FileOutputStream writer = new FileOutputStream(file);
 			writer.write(data, 0, data.length);
 			writer.flush();
 			writer.close();
 		} catch (IOException e) {
+			JOptionPane.showOptionDialog(null, "Unable to create or write to file \'" + file.getAbsolutePath() + "\'.",
+					"Error writing file", JOptionPane.OK_OPTION, JOptionPane.ERROR_MESSAGE, null, null, null);
 			e.printStackTrace();
 		}
 
 	}
 
-	public static File latestFile() {
-		return FILE_CHOOSER.getSelectedFile();
-	}
-
 	public static <T> T readObjectFromFile(File file, Class<T> class1)
 			throws ClassNotFoundException, FileNotFoundException, IOException {
 		if (file == null) {

src/main/java/eu/tankernn/accounts/util/encryption/Encryption.java

@@ -116,21 +116,4 @@ public class Encryption {
 		SecretKey secret = new SecretKeySpec(tmp.getEncoded(), "AES");
 		return secret;
 	}
-
-	/**
-	 * Testing method for encryption functionality.
-	 * 
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		EncryptedComplex encrypted = encrypt("asd", "password".toCharArray());
-		System.out.println(encrypted);
-		String decrypted = "";
-		try {
-			decrypted = decrypt(encrypted, "password".toCharArray());
-		} catch (InvalidPasswordException e) {
-			System.out.println("Wrong password");
-		}
-		System.out.println(decrypted);
-	}
 }

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

@@ -28,5 +28,6 @@ public class AccountManagerTest {
 		Assert.assertEquals(aList, AccountManager.search(a.getAccountNumber()));
 		Assert.assertEquals(aList, AccountManager.search(a.getFirstName()));
 		Assert.assertEquals(aList, AccountManager.search(a.getLastName()));
+		Assert.assertEquals(a, AccountManager.getAccountByNumber(a.getAccountNumber()));
 	}
 }