svn commit: r1161028 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXWidgetFactory.java

[dk...@apache.org]

Author: dkazimirchyk
Date: Wed Aug 24 09:30:20 2011
New Revision: 1161028

URL: http://svn.apache.org/viewvc?rev=1161028&view=rev
Log:
CAY-1591 CayenneModeler: keyboard shortcuts causing havoc in SQLTemplate SQL editor

fixed copy/cut shortcuts behaviour on Mac

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXWidgetFactory.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1161028&r1=1161027&r2=1161028&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Wed Aug 24 09:30:20 2011
@@ -44,6 +44,7 @@ CAY-1577 SQL queries for LIKE expression
 CAY-1581 Not-Escaping <> during serialization to *.map.xml
 CAY-1583 context.getObjectStore() returning null causing NullpointerException in DataMergeHandler
 CAY-1585 SelectQuery automatic cache key needs FetchOffset
+CAY-1591 CayenneModeler: keyboard shortcuts causing havoc in SQLTemplate SQL editor
 CAY-1596 setFetchOffset & setFetchLimit issue under SQL Server 2008 R2 64Bit
 CAY-1602 OSCache clustering should be shared per JVM - @CacheGroup annotation causes creation of too many cluster listeners
 

Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXWidgetFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXWidgetFactory.java?rev=1161028&r1=1161027&r2=1161028&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXWidgetFactory.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXWidgetFactory.java Wed Aug 24 09:30:20 2011
@@ -18,6 +18,8 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.osx;
 
+import java.awt.event.KeyEvent;
+
 import org.apache.cayenne.modeler.util.DefaultWidgetFactory;
 import org.syntax.jedit.DefaultInputHandler;
 import org.syntax.jedit.JEditTextArea;
@@ -87,5 +89,15 @@ public class OSXWidgetFactory extends De
             addKeyBinding("M+V", CLIP_PASTE); // command + v
             addKeyBinding("M+X", CLIP_CUT); // command + x
         }
+        
+        @Override
+        public void keyTyped(KeyEvent evt) {
+            
+            // keys pressed with command key shouldn't generate text
+            int modifiers = evt.getModifiers();
+            if ((modifiers & KeyEvent.META_MASK) == 0) {
+                super.keyTyped(evt);
+            }
+        }
     }
 }