svn commit: r17515 - trunk/src/argouml-app/src/org/argouml/ui/explorer/rules

Author: thn
Date: 2009-11-21 13:01:51-0800
New Revision: 17515

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java
   trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoPackageToElementImport.java

Log:
UML2: suppressing extensions, element imports and stereotype base properties for profiles in the explorer

Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java?view=diff&pathrev=17515&r1=17514&r2=17515
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java	2009-11-21 13:01:51-0800
@@ -78,6 +78,24 @@
                     continue;
                 }
             }
+            if (Model.getFacade().getUmlVersion().charAt(0) == '2') {
+                if (Model.getFacade().isAProfile(parent)) {
+                    if (Model.getFacade().isAElementImport(o)) {
+                        // in UML2, don't show element imports in profiles
+                        continue;
+                    } else if (Model.getFacade().isAExtension(o)) {
+                        // in UML2, don't show extensions in profiles
+                        continue;
+                    }
+                }
+                if (Model.getFacade().isAStereotype(parent)
+                        //&& Model.getFacade().isAProperty(o)
+                        && Model.getFacade().getName(o) != null
+                        && Model.getFacade().getName(o).startsWith("base_")) {
+                    // in UML2, don't show base_... properties in stereotypes
+                    continue;
+                }
+            }
 	    ret.add(o);
         }
         return ret;

Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoPackageToElementImport.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoPackageToElementImport.java?view=diff&pathrev=17515&r1=17514&r2=17515
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoPackageToElementImport.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoPackageToElementImport.java	2009-11-21 13:01:51-0800
@@ -42,6 +42,11 @@
      * @see org.argouml.ui.explorer.rules.AbstractPerspectiveRule#getChildren(java.lang.Object)
      */
     public Collection getChildren(Object parent) {
+        if (Model.getFacade().getUmlVersion().charAt(0) == '2'
+                && Model.getFacade().isAProfile(parent)) {
+            // in UML2, we don't want to see element imports in profiles
+            return Collections.EMPTY_SET;
+        }
         if (Model.getFacade().isAPackage(parent)) {
             return Model.getFacade().getElementImports(parent);
         }

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

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