Merge pull request #334 from adamretter/hotfix/ui-save-file

Correct Save Dialog in UI

Author: adamretter

csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala

@@ -10,10 +10,11 @@ package uk.gov.nationalarchives.csv.validator.ui
 
 import scala.swing._
 import resource._
+
 import javax.swing._
 import net.java.dev.designgridlayout._
-import java.io.{File, FileInputStream, FileOutputStream, PrintWriter}
 
+import java.io.{File, FileInputStream, FileOutputStream, IOException}
 import table.DefaultTableModel
 import uk.gov.nationalarchives.csv.validator.cmd.CsvValidatorCmdApp
 
@@ -22,25 +23,20 @@ import uk.gov.nationalarchives.csv.validator.ui.DesignGridImplicits._
 
 import scala.swing.PopupMenuImplicits._
 import ScalaSwingHelpers._
-import java.awt.{Cursor, Font}
-import java.util.Properties
 
+import java.awt.Cursor
+import java.util.Properties
 import scalax.file.Path
 import uk.gov.nationalarchives.csv.validator.ProgressCallback
-import java.nio.charset.Charset
 
+import java.nio.charset.Charset
 import uk.gov.nationalarchives.csv.validator.api.TextFile
+
 import java.util.jar.{Attributes, Manifest}
 import java.net.URL
 import java.nio.charset.StandardCharsets.UTF_8
 import java.nio.file.{Files, StandardOpenOption}
 
-import scala.swing.Dialog.Message
-import scala.swing.event.ButtonClicked
-import javax.swing
-
-import scala.swing
-
 /**
  * Simple GUI for the CSV Validator
  *
@@ -153,9 +149,14 @@ object CsvValidatorUi extends SimpleSwingApplication {
    * @param s
    * @param f
    */
-  private def saveToFile(s: String, f: File) {
+  private def saveToFile(s: String, f: File) : Option[IOException] = {
     val data : Array[Byte] =  s.getBytes(UTF_8)
-    Files.write(f.toPath, data, StandardOpenOption.WRITE)
+    try {
+      Files.write(f.toPath, data, StandardOpenOption.WRITE, StandardOpenOption.CREATE_NEW)
+      None
+    } catch {
+      case ioe: IOException => Some(ioe)
+    }
   }
 
   case class Settings(lastCsvPath: File, lastCsvSchemaPath: File, lastReportPath: File)

csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/ScalaSwingHelpers.scala

@@ -9,12 +9,12 @@
 package uk.gov.nationalarchives.csv.validator.ui
 
 import swing._
-import scala.swing.event.{MouseClicked, KeyPressed, Key, ButtonClicked}
-import java.io.File
+import scala.swing.event.{ButtonClicked, Key, KeyPressed, MouseClicked}
+import java.io.{File, IOException}
 import swing.FileChooser.Result
 import swing.GridBagPanel.Anchor
-import java.awt.event.{MouseEvent, MouseListener, ActionListener, ActionEvent}
 import java.beans.{PropertyChangeEvent, PropertyChangeListener}
+import scala.swing.Dialog.Message
 
 /**
  * Some simple helpers to ease
@@ -30,7 +30,7 @@ object ScalaSwingHelpers {
    * @param locateOver A component over which the FileChooser dialog should be located
    */
   def chooseFile(fileChooser: FileChooser, output: TextComponent, locateOver: Component) {
-    chooseFile(fileChooser, f => output.text = f.getAbsolutePath, locateOver)
+    chooseFile(fileChooser, {f => output.text = f.getAbsolutePath; None}, locateOver)
   }
 
   /**
@@ -40,10 +40,15 @@ object ScalaSwingHelpers {
    * @param result A function which takes the chosen file
    * @param locateOver A component over which the FileChooser dialog should be located
    */
-  def chooseFile(fileChooser: FileChooser, result: File => Unit, locateOver: Component) {
-    fileChooser.showOpenDialog(locateOver) match {
+  def chooseFile(fileChooser: FileChooser, result: File => Option[IOException], locateOver: Component) {
+    fileChooser.showSaveDialog(locateOver) match {
       case Result.Approve =>
-        result(fileChooser.selectedFile)
+        result(fileChooser.selectedFile) match {
+          case Some(ioe) =>
+            ioe.printStackTrace()
+            Dialog.showMessage(fileChooser, s"${ioe.getClass.getName}: ${ioe.getMessage}", "Unable to Save file", Message.Error)
+          case None =>
+        }
       case Result.Cancel =>
     }
   }