Skip to content

Commit 34a1f97

Browse files
benfrybenfry
committed
clearing out unnecessary maze
1 parent 6497174 commit 34a1f97

File tree

5 files changed

+81
-40
lines changed

5 files changed

+81
-40
lines changed

‎build/shared/revisions.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ https://github.com/processing/processing/issues/new
1717
Meanwhile, Jakub Valtar is holed up at Fathom in Boston, fixing all of
1818
the bugs. See "your contributions are funding graphics fixes," below.
1919

20+
2021
[ bug fixes ]
2122

2223
+ Fix NullPointerException with some sketches that have no size() command
@@ -85,6 +86,10 @@ the bugs. See "your contributions are funding graphics fixes," below.
8586
https://github.com/processing/processing/issues/3603
8687
https://github.com/processing/processing/pull/3611
8788

89+
+ CM "Updates" badge appears even when there are no updates
90+
https://github.com/processing/processing/issues/3597
91+
https://github.com/processing/processing/pull/3625
92+
8893

8994
[ fixed earlier, spring cleaning ]
9095

‎core/todo.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ X filter(PShader) broken in HDPI mode
4242
X https://github.com/processing/processing/issues/3577
4343

4444

45+
known issues
46+
_ P2D and P3D windows behave strangely when larger than the screen size
47+
_ https://github.com/processing/processing/issues/3401
48+
49+
4550
docs
4651
_ note that full screen and present are now different
4752
_ on Export to Application, this has an impact

‎java/src/processing/mode/java/JavaEditor.java‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,12 @@ public void actionPerformed(ActionEvent e) {
325325
});
326326

327327
JMenuItem tweakItem = Toolkit.newJMenuItemShift(Language.text("menu.sketch.tweak"), 'T');
328-
tweakItem.setSelected(JavaMode.enableTweak);
328+
// tweakItem.setSelected(JavaMode.enableTweak);
329329
tweakItem.addActionListener(new ActionListener() {
330330
public void actionPerformed(ActionEvent e) {
331-
JavaMode.enableTweak = true;
332-
handleRun();
331+
// JavaMode.enableTweak = true;
332+
// handleRun();
333+
handleTweak();
333334
}
334335
});
335336

@@ -1157,7 +1158,8 @@ public void run() {
11571158
prepareRun();
11581159
try {
11591160
toolbar.activateRun();
1160-
runtime = jmode.handleRun(sketch, JavaEditor.this);
1161+
//runtime = jmode.handleRun(sketch, JavaEditor.this);
1162+
runtime = jmode.handleLaunch(sketch, JavaEditor.this, false);
11611163
} catch (Exception e) {
11621164
statusError(e);
11631165
}
@@ -1168,13 +1170,29 @@ public void run() {
11681170

11691171

11701172
public void handlePresent() {
1173+
new Thread(new Runnable() {
1174+
public void run() {
1175+
prepareRun();
1176+
try {
1177+
toolbar.activateRun();
1178+
//runtime = jmode.handlePresent(sketch, JavaEditor.this);
1179+
runtime = jmode.handleLaunch(sketch, JavaEditor.this, true);
1180+
} catch (Exception e) {
1181+
statusError(e);
1182+
}
1183+
}
1184+
}).start();
1185+
}
1186+
1187+
1188+
public void handleTweak() {
11711189
new Thread(new Runnable() {
11721190
public void run() {
11731191
prepareRun();
11741192
try {
11751193
// toolbar.activate(JavaToolbar.RUN);
11761194
toolbar.activateRun();
1177-
runtime = jmode.handlePresent(sketch, JavaEditor.this);
1195+
runtime = jmode.handleTweak(sketch, JavaEditor.this);
11781196
} catch (Exception e) {
11791197
statusError(e);
11801198
}
@@ -1965,6 +1983,7 @@ public void prepareRun() {
19651983
autoSave();
19661984
super.prepareRun();
19671985
downloadImports();
1986+
errorCheckerService.quickErrorCheck();
19681987
}
19691988

19701989

‎java/src/processing/mode/java/JavaMode.java‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import java.io.IOException;
2929
import java.util.HashMap;
3030
import java.util.HashSet;
31+
import java.util.Map;
32+
import java.util.Set;
3133
import java.util.logging.FileHandler;
3234
import java.util.logging.Handler;
3335
import java.util.logging.Level;
@@ -113,30 +115,32 @@ public Library getCoreLibrary() {
113115
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
114116

115117

118+
/*
116119
public Runner handleRun(Sketch sketch,
117120
RunnerListener listener) throws SketchException {
118-
final JavaEditor editor = (JavaEditor)listener;
121+
final JavaEditor editor = (JavaEditor) listener;
119122
editor.errorCheckerService.quickErrorCheck();
120-
if (enableTweak) {
121-
enableTweak = false;
122-
return handleTweak(sketch, listener, false);
123-
} else {
124-
return handleLaunch(sketch, listener, false);
125-
}
123+
// if (enableTweak) {
124+
// enableTweak = false;
125+
// return handleTweak(sketch, listener, false);
126+
// } else {
127+
return handleLaunch(sketch, listener, false);
128+
// }
126129
}
127130
128131
129132
public Runner handlePresent(Sketch sketch,
130133
RunnerListener listener) throws SketchException {
131-
final JavaEditor editor = (JavaEditor)listener;
134+
final JavaEditor editor = (JavaEditor) listener;
132135
editor.errorCheckerService.quickErrorCheck();
133-
if (enableTweak) {
134-
enableTweak = false;
135-
return handleTweak(sketch, listener, true);
136-
} else {
137-
return handleLaunch(sketch, listener, true);
138-
}
136+
// if (enableTweak) {
137+
// enableTweak = false;
138+
// return handleTweak(sketch, listener, true);
139+
// } else {
140+
return handleLaunch(sketch, listener, true);
141+
// }
139142
}
143+
*/
140144

141145

142146
/** Handles the standard Java "Run" or "Present" */
@@ -165,9 +169,10 @@ public void run() {
165169

166170
/** Start a sketch in tweak mode */
167171
public Runner handleTweak(Sketch sketch,
168-
RunnerListener listener,
169-
final boolean present) throws SketchException {
170-
final JavaEditor editor = (JavaEditor)listener;
172+
RunnerListener listener) throws SketchException {
173+
// final boolean present) throws SketchException {
174+
final JavaEditor editor = (JavaEditor) listener;
175+
// editor.errorCheckerService.quickErrorCheck(); // done in prepareRun()
171176

172177
if (isSketchModified(sketch)) {
173178
editor.deactivateRun();
@@ -204,11 +209,11 @@ public Runner handleTweak(Sketch sketch,
204209
new Thread(new Runnable() {
205210
public void run() {
206211
// these block until finished
207-
if (present) {
208-
runtime.present(null);
209-
} else {
210-
runtime.launch(null);
211-
}
212+
// if (present) {
213+
// runtime.present(null);
214+
// } else {
215+
runtime.launch(null);
216+
// }
212217
// next lines are executed when the sketch quits
213218
if (launchInteractive) {
214219
editor.initEditorCode(parser.allHandles, false);
@@ -338,13 +343,13 @@ void initLogger() {
338343
static public final String prefImportSuggestEnabled = "pdex.importSuggestEnabled";
339344
static public final String suggestionsFileName = "suggestions.txt";
340345

341-
static volatile public boolean enableTweak = false;
346+
// static volatile public boolean enableTweak = false;
342347

343348
/**
344349
* Stores the white list/black list of allowed/blacklisted imports. These are defined in
345350
* suggestions.txt in java mode folder.
346351
*/
347-
static public final HashMap<String, HashSet<String>> suggestionsMap = new HashMap<>();
352+
static public final Map<String, Set<String>> suggestionsMap = new HashMap<>();
348353

349354
public void loadPreferences() {
350355
Messages.log("Load PDEX prefs");

‎todo.txt‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,10 @@ X move Platform into its own class, also Messages and others
1111
X https://github.com/processing/processing/issues/2765
1212
X Pass command line arguments to sketches
1313
X https://github.com/processing/processing/issues/2552
14-
_ JNA errors on startup when run from an account w/ non-ASCII characters
15-
_ set jna.tmpdir (or java.io.tmpdir) to another location
16-
_ https://github.com/twall/jna/issues/124
17-
_ https://github.com/twall/jna/issues/238
1814
_ 'handleTweak' variable implemented strangely
19-
_ ctrl+r not restarting sketch when debug is enabled
20-
_ hitting Run while a sketch is running should restart the sketch
21-
_ https://github.com/processing/processing/issues/3623
15+
X ctrl+r not restarting sketch when debug is enabled
16+
X hitting Run while a sketch is running should restart the sketch
17+
X https://github.com/processing/processing/issues/3623
2218

2319
api changes
2420
X Make fields and functions in PdeKeywords protected
@@ -45,6 +41,9 @@ X https://github.com/processing/processing/pull/3607
4541
X Deactivate install button when incompatible
4642
X https://github.com/processing/processing/issues/3603
4743
X https://github.com/processing/processing/pull/3611
44+
X CM "Updates" badge appears even when there are no updates
45+
X https://github.com/processing/processing/issues/3597
46+
X https://github.com/processing/processing/pull/3625
4847

4948
earlier
5049
X closing the color selector makes things freeze (only Linux and Windows?)
@@ -70,9 +69,19 @@ _ but anything else reports "font sadness" b/c it's using the system JRE
7069
_ https://github.com/processing/processing/issues/3543
7170
_ move to javapackager or another option?
7271
_ http://www.excelsiorjet.com/kb/35/howto-create-a-single-exe-from-your-java-application
73-
_ P2D and P3D windows behave strangely when larger than the screen size
74-
_ https://github.com/processing/processing/issues/3401
7572
_ mouse events (i.e. toggle breakpoint) seem to be firing twice
73+
_ JNA errors on startup when run from an account w/ non-ASCII characters
74+
_ set jna.tmpdir (or java.io.tmpdir) to another location
75+
_ https://github.com/twall/jna/issues/124
76+
_ https://github.com/twall/jna/issues/238
77+
_ Sun says they won't fix: user locale and system locale probably different:
78+
_ https://bugs.openjdk.java.net/browse/JDK-8017274
79+
_ https://bugs.openjdk.java.net/browse/JDK-4958170
80+
_ https://github.com/twall/jna/blob/master/test/com/sun/jna/JNALoadTest.java
81+
_ http://happygiraffe.net/blog/2009/09/24/java-platform-encoding/
82+
_ fix: get sun.jnu.encoding and make sure the user name is supported in it?
83+
_ and if not, put up a warning for the user?
84+
_ http://www.oracle.com/us/technologies/java/locale-140624.html
7685

7786

7887
3.0 final
@@ -139,8 +148,6 @@ _ https://github.com/processing/processing/issues/3619
139148

140149

141150
pde/build
142-
_ ctrl+r not restarting sketch when debug is enabled
143-
_ https://github.com/processing/processing/issues/3623
144151
_ ignore-tools in build.xml not being called for some reason
145152
_ can't install processing-java into /usr/bin with El Capitan
146153
_ https://github.com/processing/processing/issues/3497

0 commit comments

Comments
 (0)