fix for #3074, opening prefs from shortcut marks sketch as modified

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

@@ -152,7 +152,6 @@ public class JavaEditor extends Editor {
 
 
   protected JEditTextArea createTextArea() {
-    //return new JEditTextArea(new PdeTextAreaDefaults(mode), new JavaInputHandler(this));
     return new JavaTextArea(new PdeTextAreaDefaults(mode), this);
   }
 
@@ -204,7 +203,7 @@ public class JavaEditor extends Editor {
         }
       }
     });
-    
+
     JMenuItem presentItem = Toolkit.newJMenuItemShift(Language.text("toolbar.present"), 'R');
     presentItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -1557,8 +1556,8 @@ public class JavaEditor extends Editor {
 
     return debugMenu;
   }
-  
-  
+
+
   protected boolean isDebuggerEnabled() {
     return enableDebug.isSelected();
   }
@@ -1898,7 +1897,7 @@ public class JavaEditor extends Editor {
   /**
    * Returns a list of AvailableContributions of those libraries that the user
    * wants imported, but that are not installed.
-   * 
+   *
    * @param importHeaders
    */
   private ArrayList<AvailableContribution> getNotInstalledAvailableLibs(ArrayList<String> importHeadersList) {
@@ -2045,8 +2044,8 @@ public class JavaEditor extends Editor {
 //    toolbar.activate(JavaToolbar.RUN);
     toolbar.activateRun();
   }
-  
-  
+
+
   /**
    * Deactivate the Run button. This is called by Runner to notify that the
    * sketch has stopped running, usually in response to an error (or maybe
@@ -2099,14 +2098,14 @@ public class JavaEditor extends Editor {
     enableDebug.setSelected(!enableDebug.isSelected());
     updateDebugToggle();
   }
-  
-  
+
+
   public void updateDebugToggle() {
-    final boolean enabled = enableDebug.isSelected(); 
+    final boolean enabled = enableDebug.isSelected();
     if (enabled) {
       tray.setFocusableWindowState(false); // to not get focus when set visible
       tray.setVisible(true);
-      tray.setFocusableWindowState(true); // allow to get focus again      
+      tray.setFocusableWindowState(true); // allow to get focus again
     } else {
       tray.setVisible(false);
     }
@@ -2116,8 +2115,8 @@ public class JavaEditor extends Editor {
       }
     }
   }
-  
-  
+
+
 //  public void showVariableInspector() {
 //    tray.setVisible(true);
 //  }

java/src/processing/mode/java/JavaInputHandler.java

@@ -48,25 +48,8 @@ public class JavaInputHandler extends PdeInputHandler {
 
 
   public JavaInputHandler(Editor editor) {
-    this.editor = editor;    
+    this.editor = editor;
   }
-  
-  
-  public void keyPressed(KeyEvent event) {
-    if (!pressed(event)) {
-      super.keyPressed(event);
-    }
-  }
-
-  
-  public void keyTyped(KeyEvent event) {
-    if (!typed(event)) {
-      super.keyTyped(event);
-    }
-  }
-  
-  
-  // we don't need keyReleased(), so that's passed through automatically
 
 
   /**
@@ -77,7 +60,7 @@ public class JavaInputHandler extends PdeInputHandler {
    * keyTyped().
    * @return true if the event has been handled (to remove it from the queue)
    */
-  protected boolean pressed(KeyEvent event) {
+  public boolean handlePressed(KeyEvent event) {
     char c = event.getKeyChar();
     int code = event.getKeyCode();
 
@@ -91,6 +74,7 @@ public class JavaInputHandler extends PdeInputHandler {
 
     if ((code == KeyEvent.VK_BACK_SPACE) || (code == KeyEvent.VK_TAB) ||
         (code == KeyEvent.VK_ENTER) || ((c >= 32) && (c < 128))) {
+      System.out.println(event);
       sketch.setModified(true);
     }
 
@@ -332,7 +316,7 @@ public class JavaInputHandler extends PdeInputHandler {
   }
 
 
-  protected boolean typed(KeyEvent event) {
+  public boolean handleTyped(KeyEvent event) {
     char c = event.getKeyChar();
 
     if ((event.getModifiers() & InputEvent.CTRL_MASK) != 0) {