From 27dc79e288f1e80f546fd1216d0cb6bab4ea076a Mon Sep 17 00:00:00 2001 From: Manindra Moharana Date: Mon, 13 Jan 2014 20:43:48 +0530 Subject: [PATCH] fixes, tidying things up for auto save --- pdex/src/processing/mode/experimental/AutoSaveUtil.java | 7 ++++--- pdex/src/processing/mode/experimental/DebugEditor.java | 6 +++--- .../src/processing/mode/experimental/ExperimentalMode.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pdex/src/processing/mode/experimental/AutoSaveUtil.java b/pdex/src/processing/mode/experimental/AutoSaveUtil.java index 8811ed1d2..54e883c0e 100644 --- a/pdex/src/processing/mode/experimental/AutoSaveUtil.java +++ b/pdex/src/processing/mode/experimental/AutoSaveUtil.java @@ -61,7 +61,7 @@ public class AutoSaveUtil { } public void init(){ - if(saveTime < 1000) return; + if(saveTime < 10000) saveTime = 10 * 1000; //saveTime = 10 * 1000; //TODO: remove timer = new Timer(); timer.schedule(new SaveTask(), saveTime, saveTime); @@ -76,6 +76,7 @@ public class AutoSaveUtil { } private boolean saveSketch() throws IOException{ + if(!editor.getSketch().isModified()) return false; isSaving = true; Sketch sc = editor.getSketch(); @@ -224,8 +225,8 @@ public class AutoSaveUtil { @Override public void run() { try { - saveSketch(); - ExperimentalMode.log("Backup Saved " + editor.getSketch().getMainFilePath()); + if(saveSketch()) + 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 5bcafd126..9e9c3064a 100755 --- a/pdex/src/processing/mode/experimental/DebugEditor.java +++ b/pdex/src/processing/mode/experimental/DebugEditor.java @@ -245,7 +245,7 @@ public class DebugEditor extends JavaEditor implements ActionListener { ta.setECSandThemeforTextArea(errorCheckerService, dmode); addXQModeUI(); debugToolbarEnabled = new AtomicBoolean(false); - log("Sketch Path: " + path); + log("Sketch Path: " + path); } private void addXQModeUI(){ @@ -737,7 +737,6 @@ public class DebugEditor extends JavaEditor implements ActionListener { if(autosaver != null) autosaver.stop(); loadAutoSaver(); - //System.out.println("LOADDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"); return didOpen; } @@ -878,10 +877,11 @@ public class DebugEditor extends JavaEditor implements ActionListener { } public void loadAutoSaver(){ + log("Load Auto Saver()"); if(autosaver != null){ autosaver.stop(); } - autosaver = new AutoSaveUtil(this, dmode.autoSaveInterval); + autosaver = new AutoSaveUtil(this, ExperimentalMode.autoSaveInterval); if(!autosaver.checkForPastSave()) { autosaver.init(); return; diff --git a/pdex/src/processing/mode/experimental/ExperimentalMode.java b/pdex/src/processing/mode/experimental/ExperimentalMode.java index 464598459..87b190d21 100755 --- a/pdex/src/processing/mode/experimental/ExperimentalMode.java +++ b/pdex/src/processing/mode/experimental/ExperimentalMode.java @@ -119,9 +119,9 @@ public class ExperimentalMode extends JavaMode { volatile public static boolean errorCheckEnabled = true, warningsEnabled = true, codeCompletionsEnabled = true, debugOutputEnabled = false, errorLogsEnabled = false; - public int autoSaveInterval = 5; //in minutes + public static int autoSaveInterval = 5; //in minutes - public final String prefErrorCheck = "pdex.errorCheckEnabled", + public static final String prefErrorCheck = "pdex.errorCheckEnabled", prefWarnings = "pdex.warningsEnabled", prefCodeCompletionEnabled = "pdex.ccEnabled", prefDebugOP = "pdex.dbgOutput", prefErrorLogs = "pdex.writeErrorLogs", prefAutoSaveInterval = "pdex.autoSaveInterval";