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

Author: tfmorris
Date: 2007-10-03 21:04:50-0700
New Revision: 13636

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

Log:
Fix cut/paste error in addModel().

Add profile models to getModels() to match API description.

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=13636&p1=trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=trunk/src_new/org/argouml/kernel/ProjectImpl.java&r1=13635&r2=13636
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectImpl.java	(original)
+++ trunk/src_new/org/argouml/kernel/ProjectImpl.java	2007-10-03 21:04:50-0700
@@ -355,7 +355,6 @@
         if (!models.contains(model)) {
             setRoot(model);
         }        
-        addModelInternal(model);
     }
 
     private void addModelInternal(final Object model) {
@@ -507,9 +506,8 @@
     public Collection getModels() {
         Set ret = new HashSet();
         ret.addAll(models);
-        // TODO are the profiles part of the getModels()???
-//        ret.addAll(profilePackages);
-        return ret;
+        ret.addAll(getProfileConfiguration().getProfiles());
+        return Collections.unmodifiableCollection(models);
     }
 
 
@@ -517,7 +515,7 @@
         if (models.size() != 1) {
             return null;
         }
-        return models.get(0);
+        return models.iterator().next();
     }
 
 
@@ -598,7 +596,7 @@
 
 
     public Collection findAllPresentationsFor(Object obj) {
-        Collection figs = new ArrayList();
+        Collection<Fig> figs = new ArrayList<Fig>();
         for (ArgoDiagram diagram : diagrams) {
             Fig aFig = diagram.presentationFor(obj);
             if (aFig != null) {
@@ -760,7 +758,7 @@
             return diagrams.get(0);
         }
         if (models.size() > 0) {
-            return models.get(0);
+            return models.iterator().next();
         }
         return null;
     }