From fb2562f05c78e261acafaaa517ee059bf3ef3123 Mon Sep 17 00:00:00 2001 From: benfry Date: Sun, 29 Nov 2009 16:32:06 +0000 Subject: [PATCH] changing how 'sketch' variable is set on startup --- app/src/processing/app/Commander.java | 4 +- app/src/processing/app/Editor.java | 8 +-- app/src/processing/app/debug/Runner.java | 7 ++- .../processing/app/tools/android/Android.java | 2 +- .../app/tools/android/AndroidRunner.java | 52 ++++--------------- .../processing/app/tools/android/Reset.java | 7 ++- 6 files changed, 25 insertions(+), 55 deletions(-) diff --git a/app/src/processing/app/Commander.java b/app/src/processing/app/Commander.java index 1f11ff3a5..74401f487 100644 --- a/app/src/processing/app/Commander.java +++ b/app/src/processing/app/Commander.java @@ -203,8 +203,8 @@ public class Commander implements RunnerListener { String className = sketch.build(outputPath); if (className != null) { success = true; - Runner runner = new Runner(this); - runner.launch(sketch, className, mode == PRESENT); + Runner runner = new Runner(this, sketch); + runner.launch(className, mode == PRESENT); } else { success = false; diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 61791697f..8f25f1239 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -1633,8 +1633,8 @@ public class Editor extends JFrame implements RunnerListener { sketch.prepare(); String appletClassName = sketch.build(); if (appletClassName != null) { - runtime = new Runner(Editor.this); - runtime.launch(sketch, appletClassName, false); + runtime = new Runner(Editor.this, sketch); + runtime.launch(appletClassName, false); } } catch (Exception e) { statusError(e); @@ -1649,8 +1649,8 @@ public class Editor extends JFrame implements RunnerListener { sketch.prepare(); String appletClassName = sketch.build(); if (appletClassName != null) { - runtime = new Runner(Editor.this); - runtime.launch(sketch, appletClassName, true); + runtime = new Runner(Editor.this, sketch); + runtime.launch(appletClassName, true); } } catch (Exception e) { statusError(e); diff --git a/app/src/processing/app/debug/Runner.java b/app/src/processing/app/debug/Runner.java index a4b228dd4..f9c33ae40 100644 --- a/app/src/processing/app/debug/Runner.java +++ b/app/src/processing/app/debug/Runner.java @@ -81,8 +81,9 @@ public class Runner implements MessageConsumer { private String appletClassName; - public Runner(RunnerListener listener) { + public Runner(RunnerListener listener, Sketch sketch) { this.listener = listener; + this.sketch = sketch; if (listener instanceof Editor) { this.editor = (Editor) listener; @@ -92,9 +93,7 @@ public class Runner implements MessageConsumer { } - public void launch(Sketch sketch, String appletClassName, - boolean presenting) { - this.sketch = sketch; + public void launch(String appletClassName, boolean presenting) { this.appletClassName = appletClassName; this.presenting = presenting; diff --git a/app/src/processing/app/tools/android/Android.java b/app/src/processing/app/tools/android/Android.java index 52e56f7b7..f6b7643ed 100644 --- a/app/src/processing/app/tools/android/Android.java +++ b/app/src/processing/app/tools/android/Android.java @@ -729,7 +729,7 @@ public class Android implements Tool { System.out.println("creating runner"); //System.out.println("editor from Android is " + editor); - AndroidRunner ar = new AndroidRunner(editor); + AndroidRunner ar = new AndroidRunner(editor, editor.getSketch()); System.out.println("launching vm"); return ar.launch(ADB_SOCKET_PORT); //System.out.println("vm launched"); diff --git a/app/src/processing/app/tools/android/AndroidRunner.java b/app/src/processing/app/tools/android/AndroidRunner.java index a66550b8f..b8cf97f79 100644 --- a/app/src/processing/app/tools/android/AndroidRunner.java +++ b/app/src/processing/app/tools/android/AndroidRunner.java @@ -36,58 +36,21 @@ import com.sun.jdi.event.ExceptionEvent; public class AndroidRunner extends Runner { -// private boolean presenting; - - // Object that listens for error messages or exceptions. -// private RunnerListener listener; - - // Running remote VM -// private VirtualMachine vm; - - // Thread transferring remote error stream to our error stream -// private Thread errThread = null; - - // Thread transferring remote output stream to our output stream -// private Thread outThread = null; - - // Mode for tracing the Trace program (default= 0 off) -// private int debugTraceMode = 0; - - // Do we want to watch assignments to fields -// private boolean watchFields = false; - - // Class patterns for which we don't want events -// private String[] excludes = { -// "java.*", "javax.*", "sun.*", "com.sun.*", -// "apple.*", -// "processing.*" -// }; - -// private RunnerException exception; - -// private Editor editor; -// private Sketch sketch; -// private String appletClassName; - - - public AndroidRunner(RunnerListener listener) { - super(listener); - if (editor != null) { - sketch = editor.getSketch(); - } + public AndroidRunner(RunnerListener listener, Sketch sketch) { + super(listener, sketch); } public boolean launch(String port) { vm = launchVirtualMachine(port); - System.out.println("vm launched"); +// System.out.println("vm launched"); if (vm != null) { - System.out.println("starting trace"); +// System.out.println("starting trace"); generateTrace(null); - System.out.println("done starting trace"); +// System.out.println("done starting trace"); return true; } - System.out.println("no trace for you"); +// System.out.println("no trace for you"); return false; } @@ -271,7 +234,10 @@ public class AndroidRunner extends Runner { // PApplet.println("attaching now..."); //return connector.attach(arguments); + System.out.println("Attaching to the debugger. If this command hangs, "); + System.out.println("you may need to use Tools \u2192 " + Reset.MENU_TITLE + "."); VirtualMachine machine = connector.attach(arguments); + System.out.println("Debugger successfully attached, nevermind that last bit."); // PApplet.println("attached"); return machine; diff --git a/app/src/processing/app/tools/android/Reset.java b/app/src/processing/app/tools/android/Reset.java index e61525604..2269c371e 100644 --- a/app/src/processing/app/tools/android/Reset.java +++ b/app/src/processing/app/tools/android/Reset.java @@ -28,16 +28,21 @@ import processing.app.tools.Tool; public class Reset implements Tool { + static final String MENU_TITLE = "Reset Android"; + Editor editor; + public String getMenuTitle() { - return "Reset Android Tools"; + return MENU_TITLE; } + public void init(Editor editor) { this.editor = editor; } + public void run() { if (Android.sdkPath == null) { JOptionPane.showMessageDialog(editor,