svn commit: r15954 - trunk/src/argouml-app/src/org/argouml/uml/ui: . behavior/state_machines

Author: mvw
Date: 2008-11-02 02:27:35-0700
New Revision: 15954

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java

Log:
Fix for showing the crosshair mouse cursor for issue 5443 and issue 5462.

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java?view=diff&rev=15954&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java&r1=15953&r2=15954
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java	2008-11-02 02:27:35-0700
@@ -24,6 +24,7 @@
 
 package org.argouml.uml.ui;
 
+import java.awt.Cursor;
 import java.awt.Point;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -98,12 +99,18 @@
      * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent)
      */
     public void mouseEntered(MouseEvent e) {
+        if (hasPopup()) {
+            setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
+        }
     }
     
     /*
      * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent)
      */
     public void mouseExited(MouseEvent e) {
+        if (hasPopup()) {
+            setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+        }
     }
     
     /*
@@ -135,4 +142,11 @@
             }
         }
     }
+    
+    protected boolean hasPopup() {
+        if (getModel() instanceof UMLModelElementListModel2) {
+            return ((UMLModelElementListModel2) getModel()).hasPopup();
+        }
+        return false;
+    }
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java?view=diff&rev=15954&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java&r1=15953&r2=15954
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLModelElementListModel2.java	2008-11-02 02:27:35-0700
@@ -535,5 +535,9 @@
     public boolean buildPopup(JPopupMenu popup, int index) {
         return false;
     }
+    
+    protected boolean hasPopup() {
+        return false;
+    }
 
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java?view=diff&rev=15954&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java&r1=15953&r2=15954
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionEffectListModel.java	2008-11-02 02:27:35-0700
@@ -66,4 +66,8 @@
         return true;
     }
 
+    @Override
+    protected boolean hasPopup() {
+        return true;
+    }
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java?view=diff&rev=15954&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java&r1=15953&r2=15954
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionGuardListModel.java	2008-11-02 02:27:35-0700
@@ -67,4 +67,8 @@
         return true;
     }
 
+    @Override
+    protected boolean hasPopup() {
+        return true;
+    }
 }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java?view=diff&rev=15954&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java&r1=15953&r2=15954
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLTransitionTriggerListModel.java	2008-11-02 02:27:35-0700
@@ -64,4 +64,11 @@
                 ActionNewEvent.Roles.TRIGGER, getTarget());
         return true;
     }
+
+    @Override
+    protected boolean hasPopup() {
+        return true;
+    }
+    
+    
 }