Merge pull request #25 from UCSDOalads/XYGBranch

Modify the file save and file open actions by using JFileChooser

Author: x1gong

src/actions/FileOpen.java

@@ -11,6 +11,9 @@
 import file.PanelIO;
 import ui.PaintPanel;
 
+import javax.swing.JFileChooser;
+import java.io.File;
+
 public class FileOpen extends PaintAction {
 
 	public FileOpen(PaintPanel panel) {
@@ -24,7 +27,18 @@ public boolean canPerformAction() {
 
 	@Override
 	public void performAction() {
-		String filePath = JOptionPane.showInputDialog("Please input file path");
+		JFileChooser fileChooser = new JFileChooser();
+		fileChooser.setDialogTitle("Select the file to open");
+		int userSelection = fileChooser.showOpenDialog(panel);
+		
+		String filePath;
+		if (userSelection == JFileChooser.APPROVE_OPTION) {
+		    File fileToSave = fileChooser.getSelectedFile();
+		    filePath = fileToSave.getAbsolutePath();
+		} else {
+			return;
+		}
+		
 		PanelIO io = new PanelIO();
 		try {
 			io.constructPanelFromDocument(panel, filePath, true);

src/actions/FileSaveAs.java

@@ -15,6 +15,9 @@
 import file.PanelIO;
 import ui.PaintPanel;
 
+import javax.swing.JFileChooser;
+import java.io.File;
+
 public class FileSaveAs extends PaintAction {
 
 	public FileSaveAs(PaintPanel panel) {
@@ -25,10 +28,25 @@ public FileSaveAs(PaintPanel panel) {
 	public boolean canPerformAction() {
 		return true;
 	}
-
+	
+	/**
+	 * Use a JFileChooser to save the file
+	 * @author xy gong
+	 */
 	@Override
 	public void performAction() {
-		String filePath = JOptionPane.showInputDialog("Please input file path");
+		JFileChooser fileChooser = new JFileChooser();
+		fileChooser.setDialogTitle("Specify a file to save");
+		int userSelection = fileChooser.showSaveDialog(panel);
+		
+		String filePath;
+		if (userSelection == JFileChooser.APPROVE_OPTION) {
+		    File fileToSave = fileChooser.getSelectedFile();
+		    filePath = fileToSave.getAbsolutePath();
+		} else {
+			return;
+		}
+		
 		PanelIO io = new PanelIO();
 		try {
 			io.constructDocumentFromPanel(panel, filePath);

src/ui/MainFrame.java

@@ -24,9 +24,6 @@ public MainFrame(){
 		ActionsMenuBar menuBar = new ActionsMenuBar(paintPanel);
 		toolBar.getSelectTool().addSelectionToolListener(menuBar);
 
-
-
-
 		//set background
 		paintPanel.setBackground(Color.WHITE);