File Manager fix

Fixed some bugs in the file manager.

src/eu/tankernn/accounts/AccountEvent.java

@@ -1,5 +1,10 @@
 package eu.tankernn.accounts;
 
+/**
+ * Describes an event in an account's history.
+ * @author frans
+ *
+ */
 public class AccountEvent {
 	
 	private final double balanceChange;

src/eu/tankernn/accounts/AccountManager.java

@@ -44,7 +44,9 @@ public class AccountManager {
 	public static void init(MainFrame window) {
 		AccountManager.window = window;
 		accounts = new ArrayList<Account>();
-		openFile(FileManager.getLastFileFromCache());
+		File f = FileManager.getLastFileFromCache();
+		if (f != null)
+			openFile(f);
 	}
 
 	public static void openFile() {
@@ -68,6 +70,8 @@ public class AccountManager {
 				// Read the file as string
 				data = FileManager.readFileAsString(file);
 			}
+		} catch (FileNotFoundException e) {
+			return;
 		} catch (IOException e) {
 			e.printStackTrace();
 			return;
@@ -110,7 +114,7 @@ public class AccountManager {
 			return;
 
 		try {
-			FileManager.newEmptyJSONFile();
+			FileManager.newFile();
 		} catch (IOException e) {
 			e.printStackTrace();
 			return;

src/eu/tankernn/accounts/FileManager.java

@@ -29,29 +29,37 @@ public class FileManager {
 				return null;
 			}
 			String lastFilePath = FileManager.readFileAsString(lastFilenameCache);
-			return new File(lastFilePath);
+			File f = new File(lastFilePath);
+			FILE_CHOOSER.setSelectedFile(f);
+			return f;
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		return null;
 	}
 
-	public static void writeLastFileToCache(File file) {
-		FILE_CHOOSER.setSelectedFile(file);
+	private static void writeLastFileToCache(File file) {
 		// Remember this filename
-		if (!file.equals(lastFilenameCache))
+		if (!file.equals(lastFilenameCache)) { // Don't remember the cache file
 			try {
-				FileManager.writeStringToFile(lastFilenameCache, file.getAbsolutePath());
+				writeStringToFile(lastFilenameCache, file.getAbsolutePath());
 			} catch (FileNotFoundException e) {
 				e.printStackTrace();
 			}
+			FILE_CHOOSER.setSelectedFile(file);
+		}
+		
 	}
 
 	public static String readFileAsString(File file) throws IOException {
 		if (file == null) {
-			FILE_CHOOSER.showOpenDialog(null);
-			file = FILE_CHOOSER.getSelectedFile();
+			if (FILE_CHOOSER.showOpenDialog(null) == JFileChooser.CANCEL_OPTION)
+				throw new FileNotFoundException();
+			else
+				file = FILE_CHOOSER.getSelectedFile();
 		}
+		
+		System.out.println("Opening file " + file.getAbsolutePath());
 
 		writeLastFileToCache(file);
 
@@ -67,12 +75,12 @@ public class FileManager {
 	}
 
 	/**
-	 * Creates a new file containing an empty JSON array.
+	 * Creates a new file.
 	 * 
 	 * @return The <code>File</code> object that represents the new file.
 	 * @throws IOException
 	 */
-	public static File newEmptyJSONFile() throws IOException {
+	public static File newFile() throws IOException {
 		int result = FILE_CHOOSER.showDialog(null, "Create file");
 		if (result != JFileChooser.APPROVE_OPTION)
 			return null;
@@ -87,7 +95,6 @@ public class FileManager {
 		newFile.createNewFile();
 
 		writeLastFileToCache(newFile);
-		writeStringToFile(newFile, "[]");
 
 		return newFile;
 	}

src/eu/tankernn/accounts/frame/MainFrame.java

@@ -42,6 +42,7 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 	 * Launch the application.
 	 */
 	public static void main(String[] args) {
+		// Weird hack to make the save dialog display on Cmd + q
 		System.setProperty("apple.eawt.quitStrategy", "CLOSE_ALL_WINDOWS");
 		
 		EventQueue.invokeLater(new Runnable() {
@@ -95,6 +96,7 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 		frame.setTitle("Account Management System");
 		frame.pack();
 		frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+		// Ask the user to save changes before quitting
 		frame.addWindowListener(new WindowAdapter() {
             public void windowClosing(WindowEvent ev) {
             	if (AccountManager.closeFile()) {
@@ -116,10 +118,12 @@ public class MainFrame implements ListSelectionListener, DocumentListener {
 	}
 	
 	private void search() {
-		String s = search.getText();
+		String s = search.getText().trim();
 		accounts.setModel(GUIUtils.listModelFromList(AccountManager.search(s)));
 	}
-
+	
+	// Update list on search field change
+	
 	@Override
 	public void insertUpdate(DocumentEvent e) {
 		search();