svn commit: r17442 - trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java

Author: bobtarling
Date: 2009-11-01 16:41:32-0700
New Revision: 17442

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java

Log:
Reduce tests of AttributesCompartmentContainer

Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java?view=diff&pathrev=17442&r1=17441&r2=17442
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/ClAttributeCompartment.java	2009-11-01 16:41:32-0700
@@ -31,6 +31,7 @@
 
 import org.apache.log4j.Logger;
 import org.argouml.cognitive.ToDoItem;
+import org.argouml.model.Model;
 import org.argouml.ui.Clarifier;
 import org.argouml.uml.diagram.AttributesCompartmentContainer;
 import org.tigris.gef.presentation.Fig;
@@ -70,7 +71,9 @@
      * int, int)
      */
     public void paintIcon(Component c, Graphics g, int x, int y) {
-	if (fig instanceof AttributesCompartmentContainer) {
+        final Object modelElement = fig.getOwner();
+        if (Model.getUmlFactory().isContainmentValid(
+                Model.getMetaTypes().getAttribute(), modelElement)) {
 	    AttributesCompartmentContainer fc =
 	        (AttributesCompartmentContainer) fig;
 
@@ -122,16 +125,16 @@
      * @see org.argouml.ui.Clarifier#hit(int, int)
      */
     public boolean hit(int x, int y) {
-	if (!(fig instanceof AttributesCompartmentContainer)) {
-	    LOG.debug("not a FigClass");
-	    return false;
-	}
-	AttributesCompartmentContainer fc =
-	    (AttributesCompartmentContainer) fig;
-	Rectangle fr = fc.getAttributesBounds();
-	boolean res = fr.contains(x, y);
-	fig = null;
-	return res;
+	final Object modelElement = fig.getOwner();
+        if (Model.getUmlFactory().isContainmentValid(
+                Model.getMetaTypes().getAttribute(), modelElement)) {
+            AttributesCompartmentContainer fc =
+                (AttributesCompartmentContainer) fig;
+            Rectangle fr = fc.getAttributesBounds();
+            fig = null;
+            return fr.contains(x, y);
+        }
+        return false;
     }
     /**
      * @return Returns the theInstance.

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

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