From: Petter Holmström <petter.holmstrom@itmill.com>
Date: Tue, 17 Nov 2009 11:15:08 +0000 (+0000)
Subject: Merge with 6.2
X-Git-Tag: 6.7.0.beta1~2266^2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=375baea875ff03d5d91229fa7446f9ebcb089082;p=vaadin-framework.git

Merge with 6.2

svn changeset:9833/svn branch:portlet_2.0
---

375baea875ff03d5d91229fa7446f9ebcb089082
diff --cc src/com/vaadin/service/ApplicationContext.java
index 96a6f60906,308a936335..756a8e50c8
--- a/src/com/vaadin/service/ApplicationContext.java
+++ b/src/com/vaadin/service/ApplicationContext.java
@@@ -37,17 -38,16 +39,16 @@@ public interface ApplicationContext ext
      public File getBaseDirectory();
  
      /**
-      * Gets the applications in this context.
+      * Returns a collection of all the applications in this context.
       * 
-      * Gets all applications in this context. Each application context contains
-      * all applications that are open for one user.
+      * Each application context contains all active applications for one user.
       * 
-      * @return Collection containing all applications in this context
+      * @return A collection containing all the applications in this context.
       */
 -    public Collection getApplications();
 -
 +    public Collection<Application> getApplications();
 +    
      /**
-      * Adds transaction listener to this context.
+      * Adds a transaction listener to this context.
       * 
       * @param listener
       *            the listener to be added.