eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 05:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

clearing out unnecessary maze

Browse Source
This commit is contained in:
Ben Fry
2015-08-15 14:41:49 -04:00
parent 80ba060676
commit 4d87cee32e
5 changed files with 81 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
java/src/processing/mode/java/JavaEditor.java
View File

@@ -325,11 +325,12 @@ public class JavaEditor extends Editor {
});
JMenuItem tweakItem = Toolkit.newJMenuItemShift(Language.text("menu.sketch.tweak"), 'T');
tweakItem.setSelected(JavaMode.enableTweak);
// tweakItem.setSelected(JavaMode.enableTweak);
tweakItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
JavaMode.enableTweak = true;
handleRun();
// JavaMode.enableTweak = true;
// handleRun();
handleTweak();
}
});
@@ -1157,7 +1158,8 @@ public class JavaEditor extends Editor {
prepareRun();
try {
toolbar.activateRun();
runtime = jmode.handleRun(sketch, JavaEditor.this);
//runtime = jmode.handleRun(sketch, JavaEditor.this);
runtime = jmode.handleLaunch(sketch, JavaEditor.this, false);
} catch (Exception e) {
statusError(e);
}
@@ -1168,13 +1170,29 @@ public class JavaEditor extends Editor {
public void handlePresent() {
new Thread(new Runnable() {
public void run() {
prepareRun();
try {
toolbar.activateRun();
//runtime = jmode.handlePresent(sketch, JavaEditor.this);
runtime = jmode.handleLaunch(sketch, JavaEditor.this, true);
} catch (Exception e) {
statusError(e);
}
}
}).start();
}
public void handleTweak() {
new Thread(new Runnable() {
public void run() {
prepareRun();
try {
// toolbar.activate(JavaToolbar.RUN);
toolbar.activateRun();
runtime = jmode.handlePresent(sketch, JavaEditor.this);
runtime = jmode.handleTweak(sketch, JavaEditor.this);
} catch (Exception e) {
statusError(e);
}
@@ -1965,6 +1983,7 @@ public class JavaEditor extends Editor {
autoSave();
super.prepareRun();
downloadImports();
errorCheckerService.quickErrorCheck();
}

53
java/src/processing/mode/java/JavaMode.java
View File

@@ -28,6 +28,8 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.logging.FileHandler;
import java.util.logging.Handler;
import java.util.logging.Level;
@@ -113,30 +115,32 @@ public class JavaMode extends Mode {
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
/*
public Runner handleRun(Sketch sketch,
RunnerListener listener) throws SketchException {
final JavaEditor editor = (JavaEditor)listener;
final JavaEditor editor = (JavaEditor) listener;
editor.errorCheckerService.quickErrorCheck();
if (enableTweak) {
enableTweak = false;
return handleTweak(sketch, listener, false);
} else {
return handleLaunch(sketch, listener, false);
}
// if (enableTweak) {
// enableTweak = false;
// return handleTweak(sketch, listener, false);
// } else {
return handleLaunch(sketch, listener, false);
// }
}
public Runner handlePresent(Sketch sketch,
RunnerListener listener) throws SketchException {
final JavaEditor editor = (JavaEditor)listener;
final JavaEditor editor = (JavaEditor) listener;
editor.errorCheckerService.quickErrorCheck();
if (enableTweak) {
enableTweak = false;
return handleTweak(sketch, listener, true);
} else {
return handleLaunch(sketch, listener, true);
}
// if (enableTweak) {
// enableTweak = false;
// return handleTweak(sketch, listener, true);
// } else {
return handleLaunch(sketch, listener, true);
// }
}
*/
/** Handles the standard Java "Run" or "Present" */
@@ -165,9 +169,10 @@ public class JavaMode extends Mode {
/** Start a sketch in tweak mode */
public Runner handleTweak(Sketch sketch,
RunnerListener listener,
final boolean present) throws SketchException {
final JavaEditor editor = (JavaEditor)listener;
RunnerListener listener) throws SketchException {
// final boolean present) throws SketchException {
final JavaEditor editor = (JavaEditor) listener;
// editor.errorCheckerService.quickErrorCheck(); // done in prepareRun()
if (isSketchModified(sketch)) {
editor.deactivateRun();
@@ -204,11 +209,11 @@ public class JavaMode extends Mode {
new Thread(new Runnable() {
public void run() {
// these block until finished
if (present) {
runtime.present(null);
} else {
runtime.launch(null);
}
// if (present) {
// runtime.present(null);
// } else {
runtime.launch(null);
// }
// next lines are executed when the sketch quits
if (launchInteractive) {
editor.initEditorCode(parser.allHandles, false);
@@ -338,13 +343,13 @@ public class JavaMode extends Mode {
static public final String prefImportSuggestEnabled = "pdex.importSuggestEnabled";
static public final String suggestionsFileName = "suggestions.txt";
static volatile public boolean enableTweak = false;
// static volatile public boolean enableTweak = false;
/**
* Stores the white list/black list of allowed/blacklisted imports. These are defined in
* suggestions.txt in java mode folder.
*/
static public final HashMap<String, HashSet<String>> suggestionsMap = new HashMap<>();
static public final Map<String, Set<String>> suggestionsMap = new HashMap<>();
public void loadPreferences() {
Messages.log("Load PDEX prefs");