svn commit: r17443 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java

Author: bobtarling
Date: 2009-11-01 16:50:24-0700
New Revision: 17443

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

Log:
Reduce tests of AttributesCompartmentContainer

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java?view=diff&pathrev=17443&r1=17442&r2=17443
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionCompartmentDisplay.java	2009-11-01 16:50:24-0700
@@ -33,6 +33,7 @@
 import javax.swing.Action;
 
 import org.argouml.i18n.Translator;
+import org.argouml.model.Model;
 import org.argouml.uml.diagram.AttributesCompartmentContainer;
 import org.argouml.uml.diagram.ExtensionPointsCompartmentContainer;
 import org.argouml.uml.diagram.OperationsCompartmentContainer;
@@ -203,7 +204,9 @@
         List<Fig> figs = ce.getSelectionManager().getFigs();
         for (Fig f : figs) {
             
-            if (f instanceof AttributesCompartmentContainer) {
+            final Object modelElement = f.getOwner();
+            if (Model.getUmlFactory().isContainmentValid(
+                    Model.getMetaTypes().getAttribute(), modelElement)) {
                 present++;
                 attrPresent = true;
                 attrVisible = 
@@ -304,12 +307,14 @@
 	Iterator i =
             Globals.curEditor().getSelectionManager().selections().iterator();
 	while (i.hasNext()) {
-	    Selection sel = (Selection) i.next();
-	    Fig       f   = sel.getContent();
+	    final Selection sel = (Selection) i.next();
+	    final Fig f = sel.getContent();
+	    final Object modelElement = f.getOwner();
 
             // Perform the action
             if ((cType & COMPARTMENT_ATTRIBUTE) != 0) {
-		if (f instanceof AttributesCompartmentContainer) {
+		if (Model.getUmlFactory().isContainmentValid(
+		        Model.getMetaTypes().getAttribute(), modelElement)) {
 		    ((AttributesCompartmentContainer) f)
                         .setAttributesVisible(display);
 		}

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

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