diff --git a/processing/app/PdeEditor.java b/processing/app/PdeEditor.java index 37196963c..1b922dc0e 100644 --- a/processing/app/PdeEditor.java +++ b/processing/app/PdeEditor.java @@ -122,7 +122,7 @@ public class PdeEditor extends JFrame // - //PdeHistory history; + //PdeHistory history; // TODO re-enable history PdeSketchbook sketchbook; PdePreferences preferences; PdeEditorFind find; @@ -160,7 +160,8 @@ public class PdeEditor extends JFrame }); PdeKeywords keywords = new PdeKeywords(); - history = new PdeHistory(this); + // TODO re-enable history + //history = new PdeHistory(this); sketchbook = new PdeSketchbook(this); JMenuBar menubar = new JMenuBar(); @@ -654,7 +655,8 @@ public class PdeEditor extends JFrame menu.add(item); } - history.attachMenu(menu); + // TODO re-enable history + //history.attachMenu(menu); return menu; } @@ -1340,9 +1342,12 @@ public class PdeEditor extends JFrame sketch.directory = isketchDir; setSketchModified(false); + /* + // TODO re-enable history history.setPath(sketchFile.getParent(), readOnlySketch()); history.rebuildMenu(); history.lastRecorded = program; + */ header.reset(); @@ -1393,10 +1398,11 @@ public class PdeEditor extends JFrame return; // user cancelled } } - //makeHistory(s, SAVE); - history.record(s, PdeHistory.SAVE); - File file = new File(directory, filename); + // TODO re-enable history + //history.record(s, PdeHistory.SAVE); + + File file = new File(directory, filename); try { //System.out.println("handleSave: results of getText"); //System.out.print(s); @@ -1624,8 +1630,9 @@ public class PdeEditor extends JFrame public void doBeautify() { String prog = textarea.getText(); - //makeHistory(prog, BEAUTIFY); - history.record(prog, PdeHistory.BEAUTIFY); + + // TODO re-enable history + //history.record(prog, PdeHistory.BEAUTIFY); char program[] = prog.toCharArray(); StringBuffer buffer = new StringBuffer(); diff --git a/processing/app/PdeHistory.java b/processing/app/PdeHistory.java index 07670dc51..87b6b4c3a 100644 --- a/processing/app/PdeHistory.java +++ b/processing/app/PdeHistory.java @@ -23,8 +23,7 @@ */ -#ifdef BEN_COULD_EVER_FINISH_SIXTY_EIGHT - +#ifdef THINGS_WERENT_SO_BUSY import java.awt.*; import java.awt.event.*; @@ -59,9 +58,11 @@ public class PdeHistory { ActionListener menuListener; - public PdeHistory(Sketch sketch) { - //this.editor = editor; + //public PdeHistory(PdeEditor editor) { + //this.editor = editor; + //} + public PdeHistory(Sketch sketch) { menu = new JMenu("History"); menuListener = new ActionListener() {