svn commit: r15562 - branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java

Author: maurelio1234
Date: 2008-08-14 04:48:29-0700
New Revision: 15562

Modified:
   branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java

Log:
issue 5308



Modified: branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java?view=diff&rev=15562&p1=branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java&p2=branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java&r1=15561&r2=15562
==============================================================================
--- branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java	(original)
+++ branches/gsoc2008/work_issue5042_merged15552_maurelio1234/src/org/argouml/profile/UserDefinedProfile.java	2008-08-14 04:48:29-0700
@@ -180,10 +180,15 @@
      * Reads the informations defined as TaggedValues
      */
     private void finishLoading() {
-
-        for (Object obj : profilePackages) {
-            if (Model.getExtensionMechanismsHelper().hasStereotype(obj,
-                    "profile")) {
+        Collection packagesInProfile = filterPackages();
+        
+        for (Object obj : packagesInProfile) {
+            // if there is only one package in the model, we should suppose it's
+            // the profile model, if there is more than one, we take the ones
+            // marked as <<profile>>
+            if (Model.getFacade().isAModelElement(obj)
+                    && (Model.getExtensionMechanismsHelper().hasStereotype(obj,
+                            "profile") || (packagesInProfile.size() == 1))) {
 
                 // load profile name
                 String name = Model.getFacade().getName(obj);
@@ -219,7 +224,7 @@
 
         // load fig nodes
         Collection allStereotypes = Model.getExtensionMechanismsHelper()
-                .getStereotypes(profilePackages);
+                .getStereotypes(packagesInProfile);
         for (Object stereotype : allStereotypes) {
             Collection tags = Model.getFacade().getTaggedValuesCollection(
                     stereotype);
@@ -254,6 +259,19 @@
         this.setCritics(myCritics);
     }
 
+    /**
+     * @return the packages in the <code>profilePackages</code>
+     */
+    private Collection filterPackages() {
+        Vector<Object> ret = new Vector<Object>();
+        for (Object object : profilePackages) {
+            if (Model.getFacade().isAPackage(object)) {
+                ret.add(object);
+            }
+        }
+        return ret;
+    }
+
     private CrOCL generateCriticFromComment(Object critique) {
         String ocl = "" + Model.getFacade().getBody(critique);
         String headline = null;