svn commit: r14834 - trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java

Author: mvw
Date: 2008-05-29 11:50:05-0700
New Revision: 14834

Modified:
   trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java

Log:
Comment. 
Replaced the use of a deprecated method.

Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java?view=diff&rev=14834&p1=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java&p2=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java&r1=14833&r2=14834
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AttributeNotationUml.java	2008-05-29 11:50:05-0700
@@ -158,6 +158,8 @@
                 if (newAttribute != null) {
                     try {
                         parseAttribute(s, newAttribute);
+                        /* If the 1st attribute is static, 
+                         * then the new ones, too. */
                         Model.getCoreHelper().setStatic(
                                 newAttribute,
                                 Model.getFacade().isStatic(attribute));
@@ -548,11 +550,11 @@
                             Model.getFacade().getInitialValue(modelElement));
             }
             String changeableKind = "";
+            if (Model.getFacade().isReadOnly(modelElement)) {
+                changeableKind = "frozen";
+            }
             if (Model.getFacade().getChangeability(modelElement) != null) {
-                if (Model.getChangeableKind().getFrozen().equals(
-                        Model.getFacade().getChangeability(modelElement))) {
-                    changeableKind = "frozen";
-                } else if (Model.getChangeableKind().getAddOnly().equals(
+                if (Model.getChangeableKind().getAddOnly().equals(
                         Model.getFacade().getChangeability(modelElement))) {
                     changeableKind = "addOnly";
                 }