svn commit: r13762 - trunk/src_new/org/argouml/kernel/ProjectImpl.java

Author: tfmorris
Date: 2007-11-12 11:57:10-0800
New Revision: 13762

Modified:
   trunk/src_new/org/argouml/kernel/ProjectImpl.java

Log:
Return profile models instead of profiles themselves for getModels

Modified: trunk/src_new/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectImpl.java?view=diff&rev=13762&p1=trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=trunk/src_new/org/argouml/kernel/ProjectImpl.java&r1=13761&r2=13762
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectImpl.java	(original)
+++ trunk/src_new/org/argouml/kernel/ProjectImpl.java	2007-11-12 11:57:10-0800
@@ -506,7 +506,14 @@
     public Collection getModels() {
         Set result = new HashSet();
         result.addAll(models);
-        result.addAll(getProfileConfiguration().getProfiles());
+        for (Profile profile : getProfileConfiguration().getProfiles()) {
+            try {
+                result.addAll(profile.getProfilePackages());
+            } catch (org.argouml.uml.profile.ProfileException e) {
+                LOG.error("Exception when fetching models from profile "
+                        + profile.getDisplayName(), e);
+            }
+        }
         return Collections.unmodifiableCollection(result);
     }