Skip to content

Commit 222f1bb

Browse files
committed
merge ExperimentalMode into JavaMode
1 parent 0aae294 commit 222f1bb

File tree

12 files changed

+386
-639
lines changed

12 files changed

+386
-639
lines changed

core/todo.txt

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,26 @@ _ setLocationRelativeTo(null) was removed, will it be missed?
7878
_ deal with applySettings() change (maybe not a problem?)
7979

8080

81-
python has to use launch() instead of open()
82-
map() is bad for Python (and JavaScript?)
81+
cross-language awkwardness
82+
_ python has to use launch() instead of open()
83+
_ map() is bad for Python and JavaScript
8384

8485

85-
under consideration
86-
_ break PUtil out from PApplet
87-
_ break more api with Processing 3?
88-
_ use enums for everything (fixes auto-completion)
89-
_ add chaining operations
90-
_ min() and max() to use varargs
86+
breaking api
87+
_ bring back chaining in JSON (and add to XML)
88+
_ add chaining operations to PVector
89+
_ https://github.com/processing/processing/issues/257
9190
_ move to enums instead of PConstants?
9291
_ helps textMode() only accept valid entries
9392
_ really nice for auto-complete
9493
_ prevents hundreds of entries from coming up w/ auto-complete
9594
_ downside: breaks compatibility big time
95+
_ min() and max() to use varargs
96+
_ https://github.com/processing/processing/issues/3027
97+
98+
99+
under consideration
100+
_ break PUtil out from PApplet
96101
_ fix the registered methods doc, stop/dispose working
97102
_ Casey needs to nudge people about libraries, so we need to fix this
98103
_ pause(), resume(), start(), stop() clarifications
@@ -129,9 +134,6 @@ _ save the constructor for the version that actually copies data
129134
_ the table pointer version will be speedy and allow chaining
130135

131136

132-
later
133-
_ bring back chaining in JSON (and add to XML)
134-
_ maybe once we make the PVector change
135137
_ bezierSegment() function to do equal-length segments
136138
_ https://github.com/processing/processing/issues/2919
137139

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,48 +33,12 @@ public class JavaEditor extends Editor {
3333
protected JavaEditor(Base base, String path, EditorState state, Mode mode) {
3434
super(base, path, state, mode);
3535

36-
// // hopefully these are no longer needed w/ swing
37-
// // (har har har.. that was wishful thinking)
38-
// listener = new PdeKeyListener(this, textarea);
39-
4036
jmode = (JavaMode) mode;
4137
}
4238

4339

4440
protected JEditTextArea createTextArea() {
4541
return new JEditTextArea(new PdeTextAreaDefaults(mode), new JavaInputHandler(this));
46-
/*
47-
return new JEditTextArea(new PdeTextAreaDefaults(mode), new PdeInputHandler()) {
48-
// Forwards key events directly to the input handler. This is slightly
49-
// faster than using a KeyListener because some Swing overhead is avoided.
50-
PdeKeyListener editorListener = new PdeKeyListener(JavaEditor.this, this);
51-
52-
// Moved out of JEditTextArea for 3.0a6 to remove dependency on Java Mode
53-
public void processKeyEvent(KeyEvent evt) {
54-
// this had to be added in Processing 007X, because the menu key
55-
// events weren't making it up to the frame.
56-
super.processKeyEvent(evt);
57-
58-
if (inputHandler != null) {
59-
switch (evt.getID()) {
60-
case KeyEvent.KEY_TYPED:
61-
if ((editorListener == null) || !editorListener.keyTyped(evt)) {
62-
inputHandler.keyTyped(evt);
63-
}
64-
break;
65-
case KeyEvent.KEY_PRESSED:
66-
if ((editorListener == null) || !editorListener.keyPressed(evt)) {
67-
inputHandler.keyPressed(evt);
68-
}
69-
break;
70-
case KeyEvent.KEY_RELEASED:
71-
inputHandler.keyReleased(evt);
72-
break;
73-
}
74-
}
75-
}
76-
};
77-
*/
7842
}
7943

8044

0 commit comments

Comments
 (0)