svn commit: r15415 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java

Author: bobtarling
Date: 2008-07-30 12:46:55-0700
New Revision: 15415

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java

Log:
Issue 5267: Don't allow to go to edit mode on name by typing on readonly FigNode

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=15415&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=15414&r2=15415
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2008-07-30 12:46:55-0700
@@ -253,11 +253,13 @@
     private Vector<Fig> enclosedFigs = new Vector<Fig>();
 
     /**
-     * The figure enclosing this figure.
+     * The figure enclosing this figure such as a package surrounding a class.
      */
     private Fig encloser;
 
+    // TODO: Bobs says - what is the purpose of this flag? Please document.
     private boolean readyToEdit = true;
+    
     private boolean suppressCalcBounds;
     private static boolean showBoldName;
 
@@ -1201,7 +1203,7 @@
      * @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent)
      */
     public void keyTyped(KeyEvent ke) {
-        if (!editable) {
+        if (!editable || isReadOnly()) {
             return;
         }
         if (!readyToEdit) {
@@ -1712,8 +1714,7 @@
 
                 labelFig.addPropertyChangeListener(this);
 
-                getBigPort().
-                setBounds(stereotypeFigProfileIcon.getBounds());
+                getBigPort().setBounds(stereotypeFigProfileIcon.getBounds());
 
                 for (Object fig : getFigs()) {
                     ((Fig) fig).setVisible(fig == stereotypeFigProfileIcon);