Trying merge.. gulp

pdex/.project

@@ -10,16 +10,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/processing-experimental build.xml [Builder] (1).launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>

pdex/mode/readme.txt

@@ -1,3 +1,5 @@
 Packages from Eclipse 4.2.1:
 http://download.eclipse.org/eclipse/downloads/
 
+The jdi.jar and jdimodel.jar files are unpacked 
+from the org.eclipse.jdt.debug JAR file.

pdex/src/processing/mode/experimental/DebugRunner.java

@@ -44,18 +44,18 @@ public class DebugRunner extends processing.mode.java.runner.Runner {
      * @return debuggee VM or null on failure
      */
     public VirtualMachine launch() {
-        String[] machineParamList = getMachineParams();
-        String[] sketchParamList = getSketchParams();
-        /*
-         * System.out.println("vm launch sketch params:"); for (int i=0;
-         * i<sketchParamList.length; i++) {
-         * System.out.println(sketchParamList[i]); } System.out.println("vm
-         * launch machine params:"); for (int i=0; i<machineParamList.length;
-         * i++) { System.out.println(machineParamList[i]); }
-         *
-         */
-        vm = launchVirtualMachine(machineParamList, sketchParamList); // will return null on failure
-        if (vm != null) {
+//        String[] machineParamList = getMachineParams();
+//        String[] sketchParamList = getSketchParams(false);
+//        /*
+//         * System.out.println("vm launch sketch params:"); for (int i=0;
+//         * i<sketchParamList.length; i++) {
+//         * System.out.println(sketchParamList[i]); } System.out.println("vm
+//         * launch machine params:"); for (int i=0; i<machineParamList.length;
+//         * i++) { System.out.println(machineParamList[i]); }
+//         *
+//         */
+//        vm = launchVirtualMachine(machineParamList, sketchParamList); // will return null on failure
+        if (launchVirtualMachine(false)) {  // will return null on failure
             redirectStreams(vm);
         }
         return vm;
@@ -67,9 +67,9 @@ public class DebugRunner extends processing.mode.java.runner.Runner {
      * @param vm the VM
      */
     protected void redirectStreams(VirtualMachine vm) {
-        MessageSiphon ms = new MessageSiphon(vm.process().getErrorStream(), this);
+        MessageSiphon ms = new MessageSiphon(process.getErrorStream(), this);
         errThread = ms.getThread();
-        outThread = new StreamRedirectThread("VM output reader", vm.process().getInputStream(), System.out);
+        outThread = new StreamRedirectThread("VM output reader", process.getInputStream(), System.out);
         errThread.start();
         outThread.start();
     }

pdex/src/processing/mode/experimental/ExperimentalMode.java

@@ -29,6 +29,7 @@ import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import processing.app.Base;
+import processing.app.Editor;
 import processing.app.EditorState;
 import processing.app.Mode;
 import processing.mode.java.JavaMode;
@@ -115,7 +116,7 @@ public class ExperimentalMode extends JavaMode {
    * Create a new editor associated with this mode.
    */
   @Override
-  public processing.app.Editor createEditor(Base base, String path, EditorState state) {
+  public Editor createEditor(Base base, String path, EditorState state) {
     return new DebugEditor(base, path, state, this);
   }
 
@@ -133,7 +134,7 @@ public class ExperimentalMode extends JavaMode {
     if (newString != null) {
       return newString;
     }
-    Logger.getLogger(ExperimentalMode.class.getName()).log(Level.WARNING, "Error loading String: {0}", attribute);
+    Logger.getLogger(getClass().getName()).log(Level.WARNING, "Error loading String: {0}", attribute);
     return defaultValue;
   }
     

pdex/theme/theme.txt

@@ -1,83 +1,3 @@
-# GUI - STATUS
-status.notice.fgcolor = #000000
-status.notice.bgcolor = #818b95
-status.error.fgcolor = #ffffff
-status.error.bgcolor = #662000
-status.edit.fgcolor = #000000
-status.edit.bgcolor = #cc9900
-status.font = SansSerif,plain,12
-#status.font.macosx = Helvetica,plain,12
-
-# GUI - TABS
-# settings for the tabs at the top
-# (tab images are stored in the lib/theme folder)
-header.bgcolor = #818b95
-header.text.selected.color = #1a1a00
-header.text.unselected.color = #ffffff
-header.text.font = SansSerif,plain,12
-#header.text.font.macosx = Helvetica,plain,12
-
-# GUI - CONSOLE
-# font is handled by preferences, since size/etc is modifiable
-console.color = #000000
-console.output.color = #cccccc
-console.error.color = #ff3000
-
-# GUI - BUTTONS
-buttons.bgcolor = #4a545e
-buttons.status.font = SansSerif,plain,12
-#buttons.status.font.macosx = Helvetica,plain,12
-buttons.status.color = #ffffff
-
-# GUI - MODE
-#mode.button.bgcolor = #9ca6b0
-mode.button.font = SansSerif,plain,9
-#mode.button.font.macosx = Helvetica,plain,9
-#mode.button.color = #4a545e
-mode.button.color = #9ca6b0
-
-# GUI - LINESTATUS
-linestatus.color = #ffffff
-linestatus.bgcolor = #29333d
-
-# EDITOR - DETAILS
-
-# foreground and background colors
-editor.fgcolor = #000000
-editor.bgcolor = #ffffff
-
-# highlight for the current line
-editor.linehighlight.color=#e2e2e2
-# highlight for the current line
-editor.linehighlight=true
-
-# caret blinking and caret color
-editor.caret.color = #333300
-
-# color to be used for background when 'external editor' enabled
-editor.external.bgcolor = #c8d2dc
-
-# selection color
-editor.selection.color = #ffcc00
-
-# area that's not in use by the text (replaced with tildes)
-editor.invalid.style = #7e7e7e,bold
-
-# little pooties at the end of lines that show where they finish
-editor.eolmarkers = false
-editor.eolmarkers.color = #999999
-
-# bracket/brace highlighting
-editor.brackethighlight = true
-editor.brackethighlight.color = #006699
-
-
-# LINE STATUS - editor line number status bar at the bottom of the screen
-linestatus.font = SansSerif,plain,10
-#linestatus.font.macosx = Helvetica,plain,10
-linestatus.height  = 20
-
-
 # DEBUGGER
 
 # breakpointed line background color