From ebaab69e2aa50620931123427a610ca9aa5fc01b Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Sun, 12 Jan 2014 20:04:03 +0530 Subject: [PATCH] loading prev save and restore too? Decisions --- .../processing/mode/experimental/AutoSaveUtil.java | 6 +++--- .../processing/mode/experimental/DebugEditor.java | 13 +++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pdex/src/processing/mode/experimental/AutoSaveUtil.java b/pdex/src/processing/mode/experimental/AutoSaveUtil.java index 7120144f7..954097c6c 100644 --- a/pdex/src/processing/mode/experimental/AutoSaveUtil.java +++ b/pdex/src/processing/mode/experimental/AutoSaveUtil.java @@ -55,7 +55,7 @@ public class AutoSaveUtil { public void init(){ if(saveTime < 1000) return; - saveTime = 10 * 1000; + saveTime = 10 * 1000; //TODO: remove timer = new Timer(); timer.schedule(new SaveTask(), saveTime, saveTime); isSaving = false; @@ -64,7 +64,7 @@ public class AutoSaveUtil { public void stop(){ while(isSaving); // save operation mustn't be interrupted if(timer != null) timer.cancel(); - //Base.removeDir(autosaveDir); + Base.removeDir(autosaveDir); } private boolean saveSketch() throws IOException{ @@ -216,7 +216,7 @@ public class AutoSaveUtil { public void run() { try { saveSketch(); - ExperimentalMode.log("Saved " + editor.getSketch().getMainFilePath()); + ExperimentalMode.log("Backup Saved " + editor.getSketch().getMainFilePath()); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java index c4a16a586..8bdfb9249 100755 --- a/pdex/src/processing/mode/experimental/DebugEditor.java +++ b/pdex/src/processing/mode/experimental/DebugEditor.java @@ -245,8 +245,7 @@ public class DebugEditor extends JavaEditor implements ActionListener { ta.setECSandThemeforTextArea(errorCheckerService, dmode); addXQModeUI(); debugToolbarEnabled = new AtomicBoolean(false); - log("Sketch Path: " + path); - loadAutoSaver(); + log("Sketch Path: " + path); } private void addXQModeUI(){ @@ -735,6 +734,10 @@ public class DebugEditor extends JavaEditor implements ActionListener { clearBreakpointedLines(); // force clear breakpoint highlights variableInspector().reset(); // clear contents of variable inspector } + if(autosaver != null) + autosaver.stop(); + loadAutoSaver(); + //System.out.println("LOADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"); return didOpen; } @@ -884,9 +887,11 @@ public class DebugEditor extends JavaEditor implements ActionListener { if(response == JOptionPane.YES_OPTION){ handleOpenInternal(pastSave.getAbsolutePath()); //log(getSketch().getMainFilePath()); - autosaver = new AutoSaveUtil(this, 5); + return; + } + else{ + autosaver.init(); } - autosaver.init(); } /**