Lines in program view added, and save/load of files

JBcoding · JBcoding · commit ce0589e76b38 · 2016-03-26T00:42:02.000+01:00
diff --git a/src/Document.java b/src/Document.java
@@ -5,6 +5,7 @@ public class Document implements Serializable {
     protected List<Peripheral> peripherals = new ArrayList<Peripheral>();
     protected Variables variables = new Variables();
     protected Node head = new Node();
+    protected String name;
 
     public Document() {
         reloadPeripherals();
@@ -39,4 +40,12 @@ public void setHead(Node head) {
     public Variables getVariables() {
         return variables;
     }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/src/UI/Flowduino.java b/src/UI/Flowduino.java
@@ -172,7 +172,9 @@ public void handle(WindowEvent ev) {
 
                     Optional<ButtonType> result = alert.showAndWait();
                     if (result.get() == buttonTypeOne){
-                        // ... user chose "One"
+                        if (!saveFile()) {
+                            ev.consume();
+                        }
                     } else if (result.get() == buttonTypeTwo) {
                         // ... user chose "Two"
                     } else {
@@ -485,26 +487,32 @@ public VBox createButtonBox() {
     }
 
 
-    public void saveFile() {
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle("Save Flowduino file");
-        File file = fileChooser.showSaveDialog(stage);
-        if (file != null) {
-            String fileName = file.getAbsoluteFile().toString();
-            if (!fileName.toLowerCase().endsWith(".fdi")) {
-                fileName += ".fdi";
-            }
-            try {
-                FileOutputStream fileOut = new FileOutputStream(fileName);
-                ObjectOutputStream out = new ObjectOutputStream(fileOut);
-                out.writeObject(d);
-                out.close();
-                fileOut.close();
-            } catch (Exception e) {
-                System.out.println("Save failed");
-                e.printStackTrace();
+    public boolean saveFile() {
+        if (d.getName() == null) {
+            FileChooser fileChooser = new FileChooser();
+            fileChooser.setTitle("Save Flowduino file");
+            File file = fileChooser.showSaveDialog(stage);
+            if (file != null) {
+                String fileName = file.getAbsoluteFile().toString();
+                if (!fileName.toLowerCase().endsWith(".fdi")) {
+                    fileName += ".fdi";
+                }
+                d.setName(fileName);
+            } else {
+                return false;
             }
         }
+        try {
+            FileOutputStream fileOut = new FileOutputStream(d.getName());
+            ObjectOutputStream out = new ObjectOutputStream(fileOut);
+            out.writeObject(d);
+            out.close();
+            fileOut.close();
+        } catch (Exception e) {
+            System.out.println("Save failed");
+            e.printStackTrace();
+        }
+        return true;
     }
 
     public void openFile() {
