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

[codesite-noreply]

Author: daceywang
Date: Thu Jan 29 14:20:56 2009
New Revision: 2934
Modified:
   trunk/src/ca/sqlpower/architect/swingui/ContainerPane.java
   trunk/src/ca/sqlpower/architect/swingui/ProfileRowComponent.java

Log:
Moved MULTISELECT_MASK to sqlpower_library, class SPSUtils. If the OS is  
Mac, then the MULTISELECT_MASK is assigned to META_DOWN_MASK,  
CTRL_DOWN_MASK otherwise ( Windows and Linux).

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	Thu Jan 29  
14:20:56 2009
@@ -52,6 +52,7 @@
 import ca.sqlpower.architect.swingui.event.ItemSelectionEvent;
 import ca.sqlpower.architect.swingui.event.ItemSelectionListener;
 import ca.sqlpower.architect.swingui.event.SelectionEvent;
+import ca.sqlpower.swingui.SPSUtils;

 /**
  * A playpen component that represents a model with a list of individually  
selectable items.
@@ -124,7 +125,7 @@
             int clickItem = pointToItemIndex(p);

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

                     if ((evt.getModifiersEx() &
-                            (InputEvent.SHIFT_DOWN_MASK |  
InputEvent.META_DOWN_MASK)) == 0) {
+                            (InputEvent.SHIFT_DOWN_MASK |  
SPSUtils.MULTISELECT_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	Thu  
Jan 29 14:20:56 2009
@@ -304,9 +304,9 @@
             if (evt.getButton() == MouseEvent.BUTTON1) {
                 if (evt.getClickCount() == 2) {
                     showProfile(obj);
-                } else if ((evt.getModifiers() & InputEvent.META_MASK) !=  
0) {
+                } else if ((evt.getModifiersEx() &  
SPSUtils.MULTISELECT_MASK) != 0) {
                     setSelected(!selected,  
SelectionEvent.CTRL_MULTISELECT);
-                } else if ((evt.getModifiers() & InputEvent.SHIFT_MASK) !=  
0){
+                } else if ((evt.getModifiersEx() &  
InputEvent.SHIFT_DOWN_MASK) != 0){
                     setSelected(true, SelectionEvent.SHIFT_MULTISELECT);
                 }  else {
                     setSelected(true, SelectionEvent.SINGLE_SELECT);