svn commit: r16326 - trunk/src/argouml-app/src/org/argouml/uml: ui/foundation/core util

Author: tfmorris
Date: 2008-12-11 09:33:59-0800
New Revision: 16326

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
   trunk/src/argouml-app/src/org/argouml/uml/util/PathComparator.java

Log:
RESOLVED - task 5555: Can't define type of attributes with null type
http://argouml.tigris.org/issues/show_bug.cgi?id=5555

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java?view=diff&pathrev=16326&r1=16325&r2=16326
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java	2008-12-11 09:33:59-0800
@@ -119,7 +119,7 @@
             o = Model.getFacade().getType(getTarget());
         }
         if (o == null) {
-            o = " ";
+            o = "";
         }
         return o;
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/util/PathComparator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/util/PathComparator.java?view=diff&pathrev=16326&r1=16325&r2=16326
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/util/PathComparator.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/util/PathComparator.java	2008-12-11 09:33:59-0800
@@ -83,7 +83,10 @@
             name1 = Model.getFacade().getName(o1);
             name2 = Model.getFacade().getName(o2);
         } catch (IllegalArgumentException e) {
-            throw new ClassCastException("Model element or String required");
+            throw new ClassCastException(
+                "Model element or String required" 
+                    + "\n - o1 = " + ((o1 == null) ? "(null)" : o1.toString()) 
+                    + "\n - o2 = " + ((o2 == null) ? "(null)" : o2.toString()));
         }
         if (name1 != null && name2 != null) {
             int comparison = collator.compare(name1, name2);

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=982945

To unsubscribe from this discussion, e-mail: [[email protected]].