move input method callback since it's broadly applicable

benfry · benfry · commit 35151e318434 · 2016-08-05T10:50:19.000-04:00
diff --git a/app/src/processing/app/syntax/PdeInputHandler.java b/app/src/processing/app/syntax/PdeInputHandler.java
@@ -30,6 +30,7 @@
 
 import processing.app.Platform;
 import processing.app.Preferences;
+import processing.app.ui.Editor;
 
 
 /**
@@ -39,7 +40,17 @@
  */
 public class PdeInputHandler extends DefaultInputHandler {
 
-  public PdeInputHandler() {
+  /**
+   * Need the Editor object for Input Method changes, plus most subclasses
+   * will want a local copy anyway. Changed after Processing 3.1.2, need to
+   * see if this breaks any other Modes before releasing.
+   */
+  protected Editor editor;
+
+
+  public PdeInputHandler(Editor editor) {
+    this.editor = editor;
+
     // Use option on mac for text edit controls that are ctrl on Windows/Linux.
     // (i.e. ctrl-left/right is option-left/right on OS X)
     String mod = Platform.isMacOS() ? "A" : "C";
@@ -253,4 +264,9 @@ public boolean handlePressed(KeyEvent event) {
   public boolean handleTyped(KeyEvent event) {
     return false;
   }
+
+
+  public void handleInputMethodCommit() {
+    editor.getSketch().setModified(true);
+  }
 }
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -389,7 +389,7 @@ public void removeToolContrib(ToolContribution tc) {
 
   protected JEditTextArea createTextArea() {
     return new JEditTextArea(new PdeTextAreaDefaults(mode),
-                             new PdeInputHandler());
+                             new PdeInputHandler(this));
   }
 
 
@@ -1770,7 +1770,7 @@ public void beginCompoundEdit() {
             startCompoundEdit();
           super.beginCompoundEdit();
         }
-        
+
         @Override
         public void endCompoundEdit() {
           stopCompoundEdit();
@@ -1805,7 +1805,7 @@ public void insertUpdate(DocumentEvent e) {
           if (!isInserting && !textarea.isOverwriteEnabled() && isDirectEdit()) {
             endTextEditHistory();
           }
-          
+
           if (!textarea.isOverwriteEnabled()) {
             isInserting = true;
           }
diff --git a/java/src/processing/mode/java/JavaInputHandler.java b/java/src/processing/mode/java/JavaInputHandler.java
@@ -40,15 +40,14 @@
  * continuing to hack this class.
  */
 public class JavaInputHandler extends PdeInputHandler {
-  private Editor editor;
 
   /** ctrl-alt on windows and linux, cmd-alt on mac os x */
   static final int CTRL_ALT = ActionEvent.ALT_MASK |
     Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 
 
   public JavaInputHandler(Editor editor) {
-    this.editor = editor;
+    super(editor);
   }
 
 
@@ -334,12 +333,6 @@ public boolean handleTyped(KeyEvent event) {
   }
 
 
-  @Override
-  public void handleInputMethodCommit() {
-    editor.getSketch().setModified(true);
-  }
-
-
   /**
    * Return the index for the first character on this line.
    */
diff --git a/todo.txt b/todo.txt
@@ -1,4 +1,6 @@
 0252 (3.1.3?)
+X change PdeInputHandler constructor
+_   check whether this breaks other Modes before releasing
 _ modify line number color when no lines extend that far?
 _   https://github.com/processing/processing/pull/4560
 _ text gutter doesn't seem to be hidpi 

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ public void removeToolContrib(ToolContribution tc) {`
`389`	`389`
`390`	`390`	`protected JEditTextArea createTextArea() {`
`391`	`391`	`return new JEditTextArea(new PdeTextAreaDefaults(mode),`
`392`		`- new PdeInputHandler());`
	`392`	`+ new PdeInputHandler(this));`
`393`	`393`	`}`
`394`	`394`
`395`	`395`
`@@ -1770,7 +1770,7 @@ public void beginCompoundEdit() {`
`1770`	`1770`	`startCompoundEdit();`
`1771`	`1771`	`super.beginCompoundEdit();`
`1772`	`1772`	`}`
`1773`		`-`
	`1773`	`+`
`1774`	`1774`	`@Override`
`1775`	`1775`	`public void endCompoundEdit() {`
`1776`	`1776`	`stopCompoundEdit();`
`@@ -1805,7 +1805,7 @@ public void insertUpdate(DocumentEvent e) {`
`1805`	`1805`	`if (!isInserting && !textarea.isOverwriteEnabled() && isDirectEdit()) {`
`1806`	`1806`	`endTextEditHistory();`
`1807`	`1807`	`}`
`1808`		`-`
	`1808`	`+`
`1809`	`1809`	`if (!textarea.isOverwriteEnabled()) {`
`1810`	`1810`	`isInserting = true;`
`1811`	`1811`	`}`