From 95c15c998345fbe595d2c005535954d9d2565e23 Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <brunorex@gmail.com>
Date: Sun, 16 Jun 2013 00:47:42 -0300
Subject: [PATCH 1/2] Make sure the table component is updated. This was a
 problem under Windows.

---
 src/gui/Main.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gui/Main.java b/src/gui/Main.java
index 080a755..298ec71 100644
--- a/src/gui/Main.java
+++ b/src/gui/Main.java
@@ -624,6 +624,10 @@ public class Main implements ListSelectionListener, ActionListener,
 	{
 		frame.getRootPane().putClientProperty("Window.documentModified",
 				Boolean.valueOf(status));
+
+		// Make sure the table component is updated
+		table.repaint();
+		table.revalidate();
 	}
 
 	// we implement the LanguageModel interface because we want to intercept the

From 2bb10f9842650e5c0b616bc653bd44ec9268619a Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <brunorex@gmail.com>
Date: Sun, 16 Jun 2013 03:14:33 -0300
Subject: [PATCH 2/2] Switch to javax.swing.JFileChooser from
 java.awt.FileDialog to make file filters work (a generic class for file
 filters was also implemented). Store directory of the last opened file using
 the Java Preferences API to make JFileChooser act the same way as FileDialog
 in that regard, that is, the last directory is remembered between different
 executions.

---
 src/gui/GenericFileFilter.java |  37 +++++++++
 src/gui/Main.java              | 143 +++++++++++++++++++++------------
 src/gui/MobiFileFilter.java    |  32 --------
 3 files changed, 127 insertions(+), 85 deletions(-)
 create mode 100644 src/gui/GenericFileFilter.java
 delete mode 100644 src/gui/MobiFileFilter.java

diff --git a/src/gui/GenericFileFilter.java b/src/gui/GenericFileFilter.java
new file mode 100644
index 0000000..35d291c
--- /dev/null
+++ b/src/gui/GenericFileFilter.java
@@ -0,0 +1,37 @@
+package gui;
+
+import java.io.File;
+import java.io.FilenameFilter;
+
+import javax.swing.filechooser.FileFilter;
+
+class GenericFileFilter extends FileFilter implements FilenameFilter
+{
+    public String extension;
+
+    public String getExtension() {
+        return extension;
+    }
+
+    public GenericFileFilter(String extension) {
+        this.extension = extension.toLowerCase();
+    }
+
+	public String getDescription()
+	{
+		return extension;
+	}
+
+	public boolean accept(File f, String name)
+	{
+		return (accept(f));
+	}
+
+	public boolean accept(File f)
+    {
+        if (f.isDirectory()) return true;
+
+        return (f.getName().toLowerCase().endsWith(extension));
+    }
+
+}
diff --git a/src/gui/Main.java b/src/gui/Main.java
index 298ec71..6810422 100644
--- a/src/gui/Main.java
+++ b/src/gui/Main.java
@@ -2,6 +2,7 @@ package gui;
 
 import java.io.*;
 import java.util.HashSet;
+import java.util.prefs.Preferences;
 import java.awt.EventQueue;
 
 import javax.swing.JFrame;
@@ -10,7 +11,6 @@ import javax.swing.JOptionPane;
 import java.awt.GridBagLayout;
 import javax.swing.JLabel;
 
-import java.awt.FileDialog;
 import java.awt.GridBagConstraints;
 import java.awt.Insets;
 import java.awt.Rectangle;
@@ -27,6 +27,7 @@ import java.awt.Color;
 import javax.swing.JScrollPane;
 import java.awt.FlowLayout;
 import javax.swing.JButton;
+import javax.swing.JFileChooser;
 import javax.swing.JTable;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -34,6 +35,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.filechooser.FileFilter;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
@@ -49,23 +51,24 @@ import javax.swing.JMenuItem;
 public class Main implements ListSelectionListener, ActionListener,
 		TableModelListener, LanguageModel
 {
-	private FileDialog	openFileChooser	= null;
-	private FileDialog	saveFileChooser	= null;
-	private JFrame		frame;
-	private JTextArea	lblInputFilename;
-	private JTextArea	lblOutputFilename;
-	private JTextField	tfFullName;
-	private JTable		table;
-	private JButton		buttonRemove;
-	private JButton		buttonAdd;
-	private JButton		buttonSave;
-	private	JButton		btnLanguage;
-	private	JButton		btnHeaderInfo;
-	private GuiModel	model;
-	private File		outputFile;
-	private	boolean		packHeader	= false;
-	private JMenuItem mntmOpen;
-	private JMenuItem mntmSave;
+	private JFileChooser openFileChooser   = null;
+	private JFileChooser saveFileChooser   = null;
+	private Preferences  prefs             = null;
+	private JFrame       frame;
+	private JTextArea    lblInputFilename;
+	private JTextArea    lblOutputFilename;
+	private JTextField   tfFullName;
+	private JTable       table;
+	private JButton      buttonRemove;
+	private JButton      buttonAdd;
+	private JButton      buttonSave;
+	private	JButton      btnLanguage;
+	private	JButton      btnHeaderInfo;
+	private GuiModel     model;
+	private File         outputFile;
+	private	boolean      packHeader        = false;
+	private JMenuItem    mntmOpen;
+	private JMenuItem    mntmSave;
 
 	/**
 	 * Launch the application.
@@ -75,7 +78,7 @@ public class Main implements ListSelectionListener, ActionListener,
 		System.setProperty("apple.laf.useScreenMenuBar", "true");
 		System.setProperty("com.apple.mrj.application.apple.menu.about.name",
 				"Mobi Meta Editor");
-		
+
 		HashSet<String> optionsSet = new HashSet<String>();
 		File inputFile = null;
 		for (int i=0; i<args.length; i++)
@@ -95,7 +98,7 @@ public class Main implements ListSelectionListener, ActionListener,
 					+ " does not exist or is not a file.");
 			System.exit(1);
 		}
-		
+
 		if (optionsSet.contains("-h") || optionsSet.contains("--help"))
 			printUsage();
 
@@ -160,26 +163,50 @@ public class Main implements ListSelectionListener, ActionListener,
 		if (!MobiCommon.safeMode)
 			buttonRemove.setEnabled(table.getSelectedRow() != -1);
 	}
-	
+
 	public void pickSaveTarget()
 	{
 		if (saveFileChooser == null)
 		{
-			saveFileChooser = new FileDialog(frame, "Select mobi file", FileDialog.SAVE);
-			saveFileChooser.setFilenameFilter(new MobiFileFilter());
+			saveFileChooser = new JFileChooser();
+			saveFileChooser.setDialogTitle("Select mobi file");
+			saveFileChooser.setAcceptAllFileFilterUsed(false);
+			saveFileChooser.addChoosableFileFilter(new GenericFileFilter(".azw"));
+			saveFileChooser.addChoosableFileFilter(new GenericFileFilter(".mobi"));
+		}
+
+		// Use the same file filter as the open dialog
+		GenericFileFilter tmpFilter = (GenericFileFilter) openFileChooser.getFileFilter();
+
+		for (FileFilter f : saveFileChooser.getChoosableFileFilters())
+		{
+		    GenericFileFilter f2 = (GenericFileFilter) f;
+		    if (f2.getExtension().equals(tmpFilter.getExtension()))
+		    {
+		        saveFileChooser.setFileFilter(f2);
+		        break;
+		    }
 		}
-		
+
 		if (outputFile != null)
 		{
-			saveFileChooser.setDirectory(outputFile.getParent());
-			saveFileChooser.setFile(outputFile.getName());
+		    saveFileChooser.setCurrentDirectory(outputFile.getParentFile());
+		    saveFileChooser.setSelectedFile(outputFile);
 		}
 
-		saveFileChooser.setVisible(true);
-		
-		if (saveFileChooser.getFile() != null)
+		int ret = saveFileChooser.showSaveDialog(frame);
+
+		if (saveFileChooser.getSelectedFile() != null && ret == JFileChooser.APPROVE_OPTION)
 		{
-			outputFile = new File(saveFileChooser.getDirectory(), saveFileChooser.getFile());
+		    outputFile = saveFileChooser.getSelectedFile();
+
+		    // Get selected file filter
+		    GenericFileFilter filter = (GenericFileFilter) saveFileChooser.getFileFilter();
+
+		    // Add extension to file name based on the selected filter
+		    if (!filter.accept(outputFile))
+		        outputFile = new File(outputFile.getAbsolutePath()+filter.getExtension());
+
 			lblOutputFilename.setText(outputFile.getAbsolutePath());
 		}
 	}
@@ -209,7 +236,7 @@ public class Main implements ListSelectionListener, ActionListener,
 					tmpOutput = File.createTempFile("mobimeta", ".mobi");
 				else
 					tmpOutput = outputFile;
-				
+
 				model.save(tmpOutput, packHeader);
 				if (!tmpOutput.equals(outputFile))
 				{
@@ -219,7 +246,7 @@ public class Main implements ListSelectionListener, ActionListener,
 						return;
 					}
 				}
-				
+
 				setWindowChangedStatus(false);
 				showAlert("File saved.");
 			}
@@ -402,7 +429,7 @@ public class Main implements ListSelectionListener, ActionListener,
 		gbc_tfFullName.gridx = 2;
 		gbc_tfFullName.gridy = 3;
 		panel.add(tfFullName, gbc_tfFullName);
-		
+
 		JPanel panel_3 = new JPanel();
 		GridBagConstraints gbc_panel_3 = new GridBagConstraints();
 		gbc_panel_3.insets = new Insets(0, 0, 5, 5);
@@ -410,7 +437,7 @@ public class Main implements ListSelectionListener, ActionListener,
 		gbc_panel_3.gridx = 2;
 		gbc_panel_3.gridy = 4;
 		panel.add(panel_3, gbc_panel_3);
-		
+
 		btnLanguage = new JButton("Language...");
 		btnLanguage.addActionListener(this);
 		btnHeaderInfo = new JButton("Header Info...");
@@ -440,7 +467,7 @@ public class Main implements ListSelectionListener, ActionListener,
 		table.getColumnModel().getColumn(0).setPreferredWidth(100);
 		table.getSelectionModel().addListSelectionListener(this);
 		scrollPane.setViewportView(table);
-		
+
 		JPanel panel_1 = new JPanel();
 		GridBagConstraints gbc_panel_1 = new GridBagConstraints();
 		gbc_panel_1.insets = new Insets(0, 0, 5, 5);
@@ -458,7 +485,7 @@ public class Main implements ListSelectionListener, ActionListener,
 		buttonRemove.addActionListener(this);
 		buttonRemove.setEnabled(false);
 		panel_1.add(buttonRemove);
-		
+
 		if (MobiCommon.safeMode)
 		{
 			buttonAdd.setEnabled(false);
@@ -497,17 +524,17 @@ public class Main implements ListSelectionListener, ActionListener,
 		buttonSave = new JButton("Save");
 		buttonSave.addActionListener(this);
 		panel_2.add(buttonSave);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		frame.setJMenuBar(menuBar);
-		
+
 		JMenu mnFile = new JMenu("File");
 		menuBar.add(mnFile);
-		
+
 		mntmOpen = new JMenuItem("Open...");
 		mntmOpen.addActionListener(this);
 		mnFile.add(mntmOpen);
-		
+
 		mntmSave = new JMenuItem("Save");
 		mntmSave.addActionListener(this);
 		mnFile.add(mntmSave);
@@ -517,23 +544,33 @@ public class Main implements ListSelectionListener, ActionListener,
 	{
 		if (openFileChooser == null)
 		{
-			openFileChooser = new FileDialog(frame, "Select mobi file", FileDialog.LOAD);
-			openFileChooser.setFilenameFilter(new MobiFileFilter());
+			openFileChooser = new JFileChooser();
+			openFileChooser.setDialogTitle("Select mobi file");
+			openFileChooser.setAcceptAllFileFilterUsed(false);
+			openFileChooser.addChoosableFileFilter(new GenericFileFilter(".azw"));
+			openFileChooser.addChoosableFileFilter(new GenericFileFilter(".mobi"));
+			openFileChooser.setFileFilter(openFileChooser.getChoosableFileFilters()[1]);
+		}
+
+		// Remember last opened directory between sessions
+		if (prefs == null)
+		{
+		    String key = frame.getTitle()+"."+this.getClass().getName();
+		    prefs = Preferences.userRoot().node(key);
+		    String lastDir = prefs.get("lastDirectory", "");
+		    openFileChooser.setCurrentDirectory(new File(lastDir));
 		}
 
-		openFileChooser.setVisible(true);
-		
-		File source = null;
-		String dir	= openFileChooser.getDirectory();
-		String file	= openFileChooser.getFile();
-		if ((dir != null) && (file != null))
-			source = new File(dir, file);
+		int ret = openFileChooser.showOpenDialog(frame);
 
-		if (source != null)
+		File source = openFileChooser.getSelectedFile();
+
+		if (source != null && ret == JFileChooser.APPROVE_OPTION)
 		{
 			try
 			{
-				model.setModel(source);
+				prefs.put("lastDirectory", source.getParentFile().getAbsolutePath());
+			    model.setModel(source);
 			}
 			catch (GuiException e)
 			{
@@ -552,7 +589,7 @@ public class Main implements ListSelectionListener, ActionListener,
 			setWindowChangedStatus(false);
 			packHeader = false;
 		}
-		
+
 		return source;
 	}
 
@@ -619,7 +656,7 @@ public class Main implements ListSelectionListener, ActionListener,
 			setWindowChangedStatus(true);
 		}
 	}
-	
+
 	protected void setWindowChangedStatus(boolean status)
 	{
 		frame.getRootPane().putClientProperty("Window.documentModified",
diff --git a/src/gui/MobiFileFilter.java b/src/gui/MobiFileFilter.java
deleted file mode 100644
index b29784a..0000000
--- a/src/gui/MobiFileFilter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gui;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import javax.swing.filechooser.FileFilter;
-
-class MobiFileFilter extends FileFilter implements FilenameFilter
-{
-
-	// to make it work with JFileChooser
-	//
-	public boolean accept(File f)
-	{
-		if (f.isDirectory()) return true;
-		
-		return (f.getName().toLowerCase().endsWith(".azw") || f.getName().toLowerCase().endsWith(".mobi"));
-	}
-
-	public String getDescription()
-	{
-		return "*.azw,*.mobi";
-	}
-
-	// to make it work with java.awt.FileDialog
-	//
-	public boolean accept(File f, String name)
-	{
-		return (name.toLowerCase().endsWith(".azw") || name.toLowerCase().endsWith(".mobi"));
-	}
-
-}