svn commit: r15956 - trunk/src/argouml-app/src/org/argouml: ui/explorer/rules uml/cognitive/critics

Author: maurelio1234
Date: 2008-11-03 03:39:05-0800
New Revision: 15956

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java
   trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java

Log:
fixing issue 5478

the CrMissingClassName was criticizing the wrong metatype (i.e., it was 
not working)

the GoCriticsToCritic was expecting a tree in a type that was not the 
one generated by the GoProfileToCritics



Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java?view=diff&rev=15956&p1=trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java&p2=trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java&r1=15955&r2=15956
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCriticsToCritic.java	2008-11-03 03:39:05-0800
@@ -52,10 +52,10 @@
      * @see org.argouml.ui.explorer.rules.PerspectiveRule#getChildren(java.lang.Object)
      */
     public Collection getChildren(final Object parent) {
-        if (parent instanceof Vector) {
-            Vector v = (Vector) parent;
+        if (parent instanceof Collection) {
+            Collection v = (Collection) parent;
             if (!v.isEmpty()) {
-                if (v.firstElement() instanceof Critic) {
+                if (v.iterator().next() instanceof Critic) {
                     Vector<Object> ret = new Vector<Object>();
                     for (Object critic : v) {
                         final Critic fc = (Critic) critic;

Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java?view=diff&rev=15956&p1=trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java&p2=trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java&r1=15955&r2=15956
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrMissingClassName.java	2008-11-03 03:39:05-0800
@@ -106,7 +106,7 @@
      */
     public Set<Object> getCriticizedDesignMaterials() {
         Set<Object> ret = new HashSet<Object>();
-        ret.add(Model.getMetaTypes().getModel());
+        ret.add(Model.getMetaTypes().getUMLClass());
         return ret;
     }