From 454aac546141b390b790f330eb4d0813dfc2c2d8 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sun, 20 Jun 2004 23:52:56 +0000
Subject: [PATCH] fixing some issues with saving files

---
 app/PdeCode.java         |  6 +++---
 app/PdeEditor.java       |  5 ++++-
 app/PdeEditorHeader.java |  2 +-
 app/PdeSketch.java       |  2 +-
 todo.txt                 | 12 ++++++++++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/app/PdeCode.java b/app/PdeCode.java
index 96aa0e404..c8c3d2014 100644
--- a/app/PdeCode.java
+++ b/app/PdeCode.java
@@ -73,9 +73,9 @@ public class PdeCode {
     //history.record(s, PdeHistory.SAVE);
 
     try {
-      System.out.println("saving to " + file);
-      System.out.println("stuff to save: " + program);
-      System.out.println("-------");
+      //System.out.println("saving to " + file);
+      //System.out.println("stuff to save: " + program);
+      //System.out.println("-------");
       PdeBase.saveFile(program, file);
 
     } catch (Exception e) {
diff --git a/app/PdeEditor.java b/app/PdeEditor.java
index e9b068b0d..eb60dcc83 100644
--- a/app/PdeEditor.java
+++ b/app/PdeEditor.java
@@ -1126,7 +1126,10 @@ public class PdeEditor extends JFrame
 
     //if (!sketch.isModified()) {
     //if (sketch.modified) checkModified2();
-    if (!sketch.modified) checkModified2();
+    if (!sketch.modified) {
+      checkModified2();
+      return;
+    }
 
     String prompt = "Save changes to " + sketch.name + "?  ";
 
diff --git a/app/PdeEditorHeader.java b/app/PdeEditorHeader.java
index 8284b7f1d..70db2988b 100644
--- a/app/PdeEditorHeader.java
+++ b/app/PdeEditorHeader.java
@@ -276,7 +276,7 @@ public class PdeEditorHeader extends JComponent /*implements MouseListener*/ {
    * Called when a new sketch is opened.
    */
   public void rebuild() {
-    System.out.println("rebuilding editor header");
+    //System.out.println("rebuilding editor header");
     rebuildMenu(); 
     repaint();
   }
diff --git a/app/PdeSketch.java b/app/PdeSketch.java
index c5288e3f0..8c524c067 100644
--- a/app/PdeSketch.java
+++ b/app/PdeSketch.java
@@ -227,7 +227,7 @@ public class PdeSketch {
   //public void setCurrentModified(boolean what) {
   //public void setModified(boolean what) {
   public void setModified() {
-    System.out.println("setting modified for " + current.program);
+    //System.out.println("setting modified for " + current.program);
     //modified = true;
     current.modified = true;
     //editor.header.repaint();
diff --git a/todo.txt b/todo.txt
index f182329a5..f7e34a487 100644
--- a/todo.txt
+++ b/todo.txt
@@ -9,6 +9,18 @@ o   test by rewriting with java.awt.Menu
 X beautify is ignoring the setting for number of spaces on tabs
 X   http://processing.org/discourse/yabb/YaBB.cgi?board=Proce55ing_software_bugs;action=display;num=1083708360;start=0
 X clean up PdeTokenMarker, probably just alphabetize
+X saving issues (all the same bug, as it turns out)
+X   save changes to null
+X   sketch is changing before the "save changes?" is complete
+X     as a result, 'cancel' does nothing
+X   always ask save changes, even if nothing changed
+
+
+mangling and mess
+_ remove the 'sketchbook.prompt' mess
+_ re-implement history
+_ write sketchbook.clean()
+_ write 'new text file'
 
 
 _ NullPointerException when alt is pressed