actually running, with lots of errors

benfry · benfry · commit c04074c1ba00 · 2015-01-20T17:57:56.000-05:00
diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
@@ -53,8 +53,8 @@ public class Base {
 //  static private boolean RELEASE = false;
 
   /** True if heavy debugging error/log messages are enabled */
-  static public boolean DEBUG = false;
-//  static public boolean DEBUG = true;
+//  static public boolean DEBUG = false;
+  static public boolean DEBUG = true;
 
   static HashMap<Integer, String> platformNames =
     new HashMap<Integer, String>();
@@ -168,7 +168,7 @@ static private void createAndShowGUI(String[] args) {
     // because the platform has to be inited properly first.
 
     // Make sure a full JDK is installed
-    initRequirements();
+    //initRequirements();
 
     // Load the languages
     Language.init();
@@ -249,6 +249,7 @@ static public void initPlatform() {
   }
 
 
+  /*
   public static void initRequirements() {
     try {
       Class.forName("com.sun.jdi.VirtualMachine"); //$NON-NLS-1$
@@ -271,6 +272,13 @@ public static void initRequirements() {
                      "More information can be found on the Wiki.", cnfe);
     }
   }
+  */
+
+
+  private String getDefaultModeIdentifier() {
+    return "processing.mode.java.pdex.ExperimentalMode";
+    //return "processing.mode.java.JavaMode";
+  }
 
 
   private void buildCoreModes() {
@@ -281,13 +289,15 @@ private void buildCoreModes() {
     // PDE X calls getModeList() while it's loading, so coreModes must be set
     coreModes = new Mode[] { javaMode };
 
+    /*
     Mode pdexMode =
       ModeContribution.load(this, getContentFile("modes/ExperimentalMode"), //$NON-NLS-1$
                             "processing.mode.experimental.ExperimentalMode").getMode(); //$NON-NLS-1$
 
     // Safe to remove the old Java mode here?
     //coreModes = new Mode[] { pdexMode };
     coreModes = new Mode[] { pdexMode, javaMode };
+    */
   }
 
 
@@ -620,11 +630,6 @@ private void saveModeSettings(final File sketchProps, final Mode mode) {
   }
 
 
-  private String getDefaultModeIdentifier() {
-    return "processing.mode.java.JavaMode";
-  }
-  
-
   public Mode getDefaultMode() {
     return coreModes[0];
   }
diff --git a/app/src/processing/app/contrib/ModeContribution.java b/app/src/processing/app/contrib/ModeContribution.java
@@ -77,6 +77,7 @@ private ModeContribution(Base base, File folder,
     className = initLoader(className);
     if (className != null) {
       Class<?> modeClass = loader.loadClass(className);
+      Base.log("Got mode class " + modeClass);
       Constructor con = modeClass.getConstructor(Base.class, File.class);
       mode = (Mode) con.newInstance(base, folder);
       mode.setClassLoader(loader);
diff --git a/build/build.xml b/build/build.xml
@@ -257,7 +257,7 @@
     <subant buildpath="../java/libraries/pdf" target="clean"/>
     <subant buildpath="../java/libraries/serial" target="clean"/>
     <subant buildpath="shared/tools/MovieMaker" target="clean"/>
-    <subant buildpath="../pdex" target="clean"/>
+    <subant buildpath="../java" target="clean"/>
 
     <!-- make sure this isn't around from an old build 140730 -->
     <delete dir="../java/examples" />
@@ -271,7 +271,7 @@
     <subant buildpath="../java/libraries/pdf" target="build"/>
     <subant buildpath="../java/libraries/serial" target="build"/>
     <subant buildpath="shared/tools/MovieMaker" target="build"/>
-    <subant buildpath="../pdex" target="package"/>
+    <subant buildpath="../java" target="build"/>
   </target>
   
 
@@ -317,9 +317,11 @@
     </unzip>
 
     <!-- copy PDE X mode folder-->
+    <!--
     <copy todir="${target.path}/modes/">
       <fileset dir="../pdex/dist" />
     </copy>
+    -->
 
   </target>
 
diff --git a/java/src/processing/mode/java/Commander.java b/java/src/processing/mode/java/Commander.java
@@ -73,7 +73,7 @@ static public void main(String[] args) {
     // init the platform so that prefs and other native code is ready to go
     Base.initPlatform();
     // make sure a full JDK is installed
-    Base.initRequirements();
+    //Base.initRequirements();
 
     // launch command line handler
     new Commander(args);
diff --git a/java/src/processing/mode/java/JavaMode.java b/java/src/processing/mode/java/JavaMode.java
@@ -62,8 +62,8 @@ public String getTitle() {
 
 //  public Editor createEditor(Base ibase, String path, int[] location) {
 //  }
-
-
+  
+  
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
diff --git a/java/src/processing/mode/java/pdex/ExperimentalMode.java b/java/src/processing/mode/java/pdex/ExperimentalMode.java
