[Gridarta-commit] SF.net SVN: gridarta:[8671] trunk/textedit/src/app/net/sf/gridarta/textedit /textarea

[<aki...@us...>]

Revision: 8671
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8671&view=rev
Author:   akirschbaum
Date:     2010-10-06 19:17:06 +0000 (Wed, 06 Oct 2010)

Log Message:
-----------
Make field private.

Modified Paths:
--------------
    trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
    trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java

Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java	2010-10-06 19:11:18 UTC (rev 8670)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java	2010-10-06 19:17:06 UTC (rev 8671)
@@ -156,8 +156,7 @@
         }
 
         if ((modifiers & ~InputEvent.SHIFT_MASK) != 0 || e.isActionKey() || keyCode == KeyEvent.VK_BACK_SPACE || keyCode == KeyEvent.VK_DELETE || keyCode == KeyEvent.VK_ENTER || keyCode == KeyEvent.VK_TAB || keyCode == KeyEvent.VK_ESCAPE) {
-            if (grabAction != null) {
-                handleGrabAction(e);
+            if (handleGrabAction(e)) {
                 return;
             }
 
@@ -188,8 +187,7 @@
                     return;
                 }
 
-                if (grabAction != null) {
-                    handleGrabAction(e);
+                if (handleGrabAction(e)) {
                     return;
                 }
 

Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java	2010-10-06 19:11:18 UTC (rev 8670)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java	2010-10-06 19:17:06 UTC (rev 8671)
@@ -40,7 +40,7 @@
     private static final Category log = Logger.getLogger(InputHandler.class);
 
     @Nullable
-    protected ActionListener grabAction = null;
+    private ActionListener grabAction = null;
 
     private boolean repeat = false;
 
@@ -196,13 +196,19 @@
      * appropriate key event. It executes the grab action with the typed
      * character as the parameter.
      * @param evt The KeyEvent the key should be grabbed of
+     * @return whether a grab action was active
      */
-    protected void handleGrabAction(final KeyEvent evt) {
+    protected boolean handleGrabAction(final KeyEvent evt) {
+        if (grabAction == null) {
+            return false;
+        }
+
         // Clear it *before* it is executed so that executeAction()
         // resets the repeat count
         final ActionListener grabAction2 = grabAction;
         grabAction = null;
         executeAction(grabAction2, evt.getSource(), String.valueOf(evt.getKeyChar()));
+        return true;
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.