trying to simplify processing#4599

benfry · benfry · commit f4ce14a98b3b · 2016-08-04T11:06:10.000-04:00
diff --git a/app/src/processing/app/syntax/InputHandler.java b/app/src/processing/app/syntax/InputHandler.java
@@ -1177,8 +1177,7 @@ public static int findWordEnd(String line, int pos, String noWordSep) {
 
   /**
    * Called when input method support committed a character.
-   * @param c The input character
    */
-  public void onCommittedFromInputMethodSupport(char c) {
+  public void handleInputMethodCommit() {
   }
 }
diff --git a/app/src/processing/app/syntax/JEditTextArea.java b/app/src/processing/app/syntax/JEditTextArea.java
@@ -192,13 +192,15 @@ protected TextAreaPainter createPainter(final TextAreaDefaults defaults) {
   public InputMethodRequests getInputMethodRequests() {
     if (Preferences.getBoolean("editor.input_method_support")) {
       if (inputMethodSupport == null) {
-        inputMethodSupport = new InputMethodSupport(this);
+        inputMethodSupport = new InputMethodSupport(this, inputHandler);
+        /*
         inputMethodSupport.setCallback(new InputMethodSupport.Callback() {
           @Override
           public void onCommitted(char c) {
-            inputHandler.onCommittedFromInputMethodSupport(c);
+            inputHandler.onInputMethodCommit(c);
           }
         });
+        */
       }
       return inputMethodSupport;
     }
@@ -1379,14 +1381,14 @@ public void setSelectedText(String selectedText) {
   /**
    * Replaces the selection with the specified text.
    * @param selectedText The replacement text for the selection
-   * @param recordCompoundEdit Whether the replacement should be 
+   * @param recordCompoundEdit Whether the replacement should be
    * recorded as a compound edit
    */
   public void setSelectedText(String selectedText, boolean recordCompoundEdit) {
     if (!editable) {
       throw new InternalError("Text component read only");
     }
-    
+
     if (recordCompoundEdit) {
       document.beginCompoundEdit();
     }
@@ -1477,7 +1479,7 @@ public void overwriteSetSelectedText(String str)
     // Don't overstrike if there is a selection
     if(!overwrite || selectionStart != selectionEnd)
     {
-      // record the whole operation as a compound edit if 
+      // record the whole operation as a compound edit if
       // selected text is being replaced
       boolean isSelectAndReplaceOp = (selectionStart != selectionEnd);
       setSelectedText(str, isSelectAndReplaceOp);
diff --git a/app/src/processing/app/syntax/im/InputMethodSupport.java b/app/src/processing/app/syntax/im/InputMethodSupport.java
@@ -21,6 +21,7 @@
 import processing.app.Base;
 import processing.app.Messages;
 import processing.app.Preferences;
+import processing.app.syntax.InputHandler;
 import processing.app.syntax.JEditTextArea;
 import processing.app.syntax.TextAreaPainter;
 
@@ -38,29 +39,38 @@
  */
 public class InputMethodSupport implements InputMethodRequests, InputMethodListener {
 
+  /*
   public interface Callback {
     public void onCommitted(char c);
   }
 
+  private Callback callback;
+  */
+
   static private final Attribute[] CUSTOM_IM_ATTRIBUTES = {
     TextAttribute.INPUT_METHOD_HIGHLIGHT,
   };
 
-  private int committedCount = 0;
   private JEditTextArea textArea;
+  private InputHandler inputHandler;
+
+  private int committedCount = 0;
   private AttributedString composedTextString;
-  private Callback callback;
 
-  public InputMethodSupport(JEditTextArea textArea) {
+  public InputMethodSupport(JEditTextArea textArea, InputHandler inputHandler) {
     this.textArea = textArea;
-    this.textArea.enableInputMethods(true);
-    this.textArea.addInputMethodListener(this);
+    this.inputHandler = inputHandler;
+
+    textArea.enableInputMethods(true);
+    textArea.addInputMethodListener(this);
   }
 
 
+  /*
   public void setCallback(Callback callback) {
     this.callback = callback;
   }
+  */
 
 
   /////////////////////////////////////////////////////////////////////////////
@@ -182,9 +192,7 @@ public void inputMethodTextChanged(InputMethodEvent event) {
       }
       // Insert this as a compound edit
       textArea.setSelectedText(new String(insertion), true);
-      if (callback != null) {
-        callback.onCommitted(c);
-      }
+      inputHandler.handleInputMethodCommit();
 
       CompositionTextPainter compositionPainter = textArea.getPainter().getCompositionTextpainter();
       if (Base.DEBUG) {
diff --git a/java/src/processing/mode/java/JavaInputHandler.java b/java/src/processing/mode/java/JavaInputHandler.java
@@ -335,9 +335,8 @@ public boolean handleTyped(KeyEvent event) {
 
 
   @Override
-  public void onCommittedFromInputMethodSupport(char c) {
-    Sketch sketch = editor.getSketch();
-    sketch.setModified(true);
+  public void handleInputMethodCommit() {
+    editor.getSketch().setModified(true);
   }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1177,8 +1177,7 @@ public static int findWordEnd(String line, int pos, String noWordSep) {`
`1177`	`1177`
`1178`	`1178`	`/**`
`1179`	`1179`	`* Called when input method support committed a character.`
`1180`		`- * @param c The input character`
`1181`	`1180`	`*/`
`1182`		`- public void onCommittedFromInputMethodSupport(char c) {`
	`1181`	`+ public void handleInputMethodCommit() {`
`1183`	`1182`	`}`
`1184`	`1183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -335,9 +335,8 @@ public boolean handleTyped(KeyEvent event) {`
`335`	`335`
`336`	`336`
`337`	`337`	`@Override`
`338`		`- public void onCommittedFromInputMethodSupport(char c) {`
`339`		`- Sketch sketch = editor.getSketch();`
`340`		`- sketch.setModified(true);`
	`338`	`+ public void handleInputMethodCommit() {`
	`339`	`+ editor.getSketch().setModified(true);`
`341`	`340`	`}`
`342`	`341`
`343`	`342`