[power-architect commit] r2930 - trunk/src/ca/sqlpower/architect/swingui

[codesite-noreply]

Author: daceyw...@gmail.com
Date: Wed Jan 21 07:45:05 2009
New Revision: 2930
Modified:
   trunk/src/ca/sqlpower/architect/swingui/ContainerPane.java
   trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java

Log:
Now delete the ctrl mask of multi-select in ProfileRowComponent and  
ContainerPane since the meta mask is COMMAND Key in OSX and CTRL Key in  
Windows.

Modified: trunk/src/ca/sqlpower/architect/swingui/ContainerPane.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ContainerPane.java  (original)
+++ trunk/src/ca/sqlpower/architect/swingui/ContainerPane.java	Wed Jan 21  
07:45:05 2009
@@ -124,9 +124,7 @@
             int clickItem = pointToItemIndex(p);

             if (pp.getMouseMode() != MouseModeType.CREATING_TABLE) {
-                if ((evt.getModifiersEx() & (InputEvent.SHIFT_DOWN_MASK |
-                                             InputEvent.CTRL_DOWN_MASK |
-                                             InputEvent.META_DOWN_MASK))  
== 0) {
+                if ((evt.getModifiersEx() & (InputEvent.SHIFT_DOWN_MASK |  
InputEvent.META_DOWN_MASK)) == 0) {
                     if (!isSelected() || pp.getMouseMode() ==  
MouseModeType.IDLE) {
                         pp.setMouseMode(MouseModeType.SELECT_TABLE);
                         pp.selectNone();
@@ -144,9 +142,7 @@
                         clickItem < getItems().size()) {

                     if ((evt.getModifiersEx() &
-                            (InputEvent.SHIFT_DOWN_MASK |
-                             InputEvent.CTRL_DOWN_MASK |
-                             InputEvent.META_DOWN_MASK)) == 0) {
+                            (InputEvent.SHIFT_DOWN_MASK |  
InputEvent.META_DOWN_MASK)) == 0) {

                         if (!isItemSelected(clickItem) ){
                             deSelectEverythingElse(evt);

Modified: trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java
==============================================================================
--- trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java	 
(original)
+++ trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java	Wed  
Jan 21 07:45:05 2009
@@ -304,7 +304,7 @@
             if (evt.getButton() == MouseEvent.BUTTON1) {
                 if (evt.getClickCount() == 2) {
                     showProfile(obj);
-                } else if ((evt.getModifiers() & (InputEvent.CTRL_MASK |  
InputEvent.META_MASK)) != 0) {
+                } else if ((evt.getModifiers() & InputEvent.META_MASK) !=  
0) {
                     setSelected(!selected,  
SelectionEvent.CTRL_MULTISELECT);
                 } else if ((evt.getModifiers() & InputEvent.SHIFT_MASK) !=  
0){
                     setSelected(true, SelectionEvent.SHIFT_MULTISELECT);