svn commit: r15495 - trunk/src/argouml-app/src/org/argouml/uml/ui

Author: bobtarling
Date: 2008-08-02 18:02:20-0700
New Revision: 15495

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java

Log:
Issue 5269: Don't show popup menu on lists for readonly elements

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=15495&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=15494&r2=15495
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLList2.java	2008-08-02 18:02:20-0700
@@ -33,6 +33,7 @@
 import javax.swing.ListCellRenderer;
 import javax.swing.ListModel;
 
+import org.argouml.model.Model;
 import org.argouml.ui.LookAndFeelMgr;
 import org.argouml.ui.targetmanager.TargetListener;
 import org.argouml.ui.targetmanager.TargettableModelView;
@@ -88,55 +89,46 @@
      * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
      */
     public void mouseClicked(MouseEvent e) {
-        if (e.isPopupTrigger()) {
-            showPopup(e);
-        }
+        showPopup(e);
     }
     
     /*
      * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent)
      */
     public void mouseEntered(MouseEvent e) {
-        if (e.isPopupTrigger()) {
-            showPopup(e);
-        }
     }
     
     /*
      * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent)
      */
     public void mouseExited(MouseEvent e) {
-        if (e.isPopupTrigger()) {
-            showPopup(e);
-        }
     }
     
     /*
      * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
      */
     public void mousePressed(MouseEvent e) {
-        if (e.isPopupTrigger()) {
-            showPopup(e);
-        }
+        showPopup(e);
     }
     
     /*
      * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent)
      */
     public void mouseReleased(MouseEvent e) {
-        if (e.isPopupTrigger()) {
-            showPopup(e);
-        }
+        showPopup(e);
     }
 
     private final void showPopup(MouseEvent event) {
-        Point point = event.getPoint();
-        int index = locationToIndex(point);
-        JPopupMenu popup = new JPopupMenu();
-        ListModel lm = getModel(); 
-        if (lm instanceof UMLModelElementListModel2) {
-            if (((UMLModelElementListModel2) lm).buildPopup(popup, index)) {
-                popup.show(this, point.x, point.y);
+        if (event.isPopupTrigger()
+                && !Model.getModelManagementHelper().isReadOnly(getTarget())) {
+            Point point = event.getPoint();
+            int index = locationToIndex(point);
+            JPopupMenu popup = new JPopupMenu();
+            ListModel lm = getModel(); 
+            if (lm instanceof UMLModelElementListModel2) {
+                if (((UMLModelElementListModel2) lm).buildPopup(popup, index)) {
+                    popup.show(this, point.x, point.y);
+                }
             }
         }
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java?view=diff&rev=15495&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java&r1=15494&r2=15495
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UMLMutableLinkedList.java	2008-08-02 18:02:20-0700
@@ -32,6 +32,8 @@
 
 import javax.swing.JPopupMenu;
 
+import org.argouml.model.Model;
+
 /**
  * This class is the GUI front for a mutable linked list. The user can add,
  * delete or create modelelements to the model. He can do that via a popup menu.
@@ -292,7 +294,8 @@
      */
     @Override
     public void mouseReleased(MouseEvent e) {
-        if (e.isPopupTrigger()) {
+        if (e.isPopupTrigger()
+                && !Model.getModelManagementHelper().isReadOnly(getTarget())) {
             Point point = e.getPoint();
             int index = locationToIndex(point);
             JPopupMenu popup = getPopupMenu();
@@ -313,7 +316,8 @@
      */
     @Override
     public void mousePressed(MouseEvent e) {
-        if (e.isPopupTrigger()) {
+        if (e.isPopupTrigger()
+                && !Model.getModelManagementHelper().isReadOnly(getTarget())) {
             JPopupMenu popup = getPopupMenu();
             if (popup.getComponentCount() > 0) {
                 initActions();
@@ -374,7 +378,8 @@
      */
     @Override
     public void mouseClicked(MouseEvent e) {
-        if (e.isPopupTrigger()) {
+        if (e.isPopupTrigger()
+                && !Model.getModelManagementHelper().isReadOnly(getTarget())) {
             JPopupMenu popup = getPopupMenu();
             if (popup.getComponentCount() > 0) {
                 initActions();