trying to get things building again

app/PdeCompilerJavac.java

@@ -22,6 +22,10 @@
   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+
+#ifdef WE_ARE_OUT_OF_IRAQ
+
+
 import java.io.*;
 
 
@@ -119,3 +123,6 @@ public class PdeCompilerJavac extends PdeCompiler {
     }
   }
 }
+
+
+#endif

app/PdeEditor.java

@@ -590,7 +590,8 @@ public class PdeEditor extends JFrame
       item = new JMenuItem("Show sketch folder");
       item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
-          PdeBase.openFolder(sketchDir);
+          //PdeBase.openFolder(sketchDir);
+          PdeBase.openFolder(sketch.sketchFolder);
         }
       });
       menu.add(item);
@@ -937,7 +938,9 @@ public class PdeEditor extends JFrame
     for (int i = 0; i < 10; i++) System.out.println();
 
     // clear the console on each run, unless the user doesn't want to 
-    if (PdeBase.getBoolean("console.auto_clear", true)) {
+    //if (PdeBase.getBoolean("console.auto_clear", true)) {
+    //if (PdePreferences.getBoolean("console.auto_clear", true)) {
+    if (PdePreferences.getBoolean("console.auto_clear")) {
       console.clear();
     }
 
@@ -1145,8 +1148,7 @@ public class PdeEditor extends JFrame
   public void checkModified2() {
     switch (checking) {
       case HANDLE_NEW:  handleNew2(false); break;
-        //case HANDLE_OPEN: skOpen2(openingPath, openingName); break;
-      case HANDLE_OPEN: handleOpen2(openingPath); break;
+      case HANDLE_OPEN: handleOpen2(); break;
       case HANDLE_QUIT: handleQuit2(); break;
     }
     checking = 0;
@@ -1170,8 +1172,8 @@ public class PdeEditor extends JFrame
    */
   protected void handleNew2(boolean startup) {
     try {
-      PdeSketch newSketch = sketchbook.handleNew(startup);
-      if (newSketch != null) handleOpen2(newSketch);
+      String pdePath = sketchbook.handleNew(startup);
+      if (pdePath != null) handleOpen2(pdePath);
 
     } catch (IOException e) {
       // not sure why this would happen, but since there's no way to
@@ -1204,6 +1206,25 @@ public class PdeEditor extends JFrame
   }
 
 
+  protected void handleOpen2(String path) {
+    try {
+      sketch = new PdeSketch(path);
+    } catch (Exception e) {
+      error(e);
+    }
+  }
+
+
+  protected void handleOpen2() {
+    try {
+      sketch = new PdeSketch(handleOpenPath);
+      // i guess this just sets everything up properly?
+    } catch (Exception e) {
+      error(e);
+    }
+  }
+
+
   /*
   public void skOpen(String path, String name) {
     doStop();
@@ -1243,12 +1264,6 @@ public class PdeEditor extends JFrame
   */
 
 
-  protected void handleOpen2() {
-    sketch = new PdeSketch(handleOpenPath);
-    // i guess this just sets everything up properly?
-  }
-
-
   /*
   protected void handleOpen2(String isketchName, 
                            File isketchFile, File isketchDir) {
@@ -1423,16 +1438,21 @@ public class PdeEditor extends JFrame
 
     } else if (newSketchName.equalsIgnoreCase(sketch.name)) {
       // NEED TO GET THE ACTUAL SKETCH NAME FROM CODE[0] HERE
+      
+      // TODO UNFINISHED
 
+      /*
       boolean problem = (sketchDir.renameTo(newSketchDir) || 
                          sketchFile.renameTo(newSketchFile));
       if (problem) {
         status.error("Error while trying to re-save the sketch.");
       }      
+      */
 
     } else {
       // setup new sketch object with new name
     }
+  }
 
     /*
     File newSketchDir = new File(sketchDir.getParent() +
@@ -1497,7 +1517,6 @@ public class PdeEditor extends JFrame
     textarea.setCaretPosition(textareaPosition);
     doSave();
     */
-  }
 
 
   /*
@@ -1720,7 +1739,8 @@ public class PdeEditor extends JFrame
     // at least in the neighborhood
     textarea.select(selectionEnd, selectionEnd);
 
-    setSketchModified(true);
+    //setSketchModified(true);
+    sketch.setCurrentModified(true);
     buttons.clear();
   }
 

app/PdeEditorFind.java

@@ -226,7 +226,8 @@ public class PdeEditorFind extends JFrame implements ActionListener {
     }
 
     editor.textarea.setSelectedText(replaceField.getText());
-    editor.setSketchModified(true);
+    //editor.setSketchModified(true);
+    editor.sketch.setCurrentModified(true);
 
     // don't allow a double replace
     replaceButton.setEnabled(false);

app/PdePreprocessor.java

@@ -235,8 +235,8 @@ public class PdePreprocessor {
     String jdkVersionStr = PdePreferences.get("compiler.jdk_version");
 
     int jdkVersion = JDK11;  // default
-    if (jdkVersionStr.equals("1.3")) { jdkVersion = JDK13 };
-    if (jdkVersionStr.equals("1.4")) { jdkVersion = JDK14 };
+    if (jdkVersionStr.equals("1.3")) { jdkVersion = JDK13; };
+    if (jdkVersionStr.equals("1.4")) { jdkVersion = JDK14; };
 
     for (int i = 0; i < jdkVersion; i++) {
       for (int j = 0; j < defaultImports[i].length; j++) {

app/PdeRuntime.java

@@ -62,8 +62,7 @@ public class PdeRuntime implements PdeMessageConsumer {
   }
 
 
-  public void start(Point windowLocation, 
-                    PrintStream leechErr) throws PdeException {
+  public void start(Point windowLocation) throws PdeException {
 
     this.leechErr = new PrintStream(new PdeMessageStream(this));
 

app/PdeSketch.java

@@ -5,7 +5,7 @@
   Part of the Processing project - http://processing.org
 
   Except where noted, code is written by Ben Fry
-  Copyright (c) 2001-03 Massachusetts Institute of Technology
+  Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -276,7 +276,7 @@ public class PdeSketch {
   /**
    * Return true if any of the items are modified.
    */
-  public void isModified() {
+  public boolean isModified() {
     for (int i = 0; i < codeCount; i++) {
       if (code[i].modified) return true;
     }
@@ -1065,4 +1065,3 @@ public class PdeSketch {
     return code[0].file.getAbsolutePath();
   }
 }
-

build/windows/make.sh

@@ -200,6 +200,7 @@ cd ..
 CLASSPATH="..\\build\\windows\\work\\classes;..\\build\\windows\\work\\lib\\kjc.jar;..\\build\\windows\\work\\lib\antlr.jar;..\\build\\windows\\work\\lib\\oro.jar;..\\build\\windows\\work\\java\\lib\\rt.jar;..\\build\\windows\\work\\lib\\comm.jar;${QT_JAVA_PATH}"
 
 perl ../bagel/buzz.pl "../build/windows/work/jikes +D -classpath \"$CLASSPATH\" -d \"..\\build\\windows\\work/classes\"" -dJDK13 -dJDK14 *.java jeditsyntax/*.java preprocessor/*.java
+#perl ../bagel/buzz.pl "javac -classpath \"$CLASSPATH\" -d \"..\\build\\windows\\work/classes\"" -dJDK13 -dJDK14 *.java jeditsyntax/*.java preprocessor/*.java
 
 cd ../build/windows/work/classes
 rm -f ../lib/pde.jar