Refactored old PortletApplicationContext a little and fixed removeApplication()

svn changeset:10024/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
index 0e3289dea660d3c31da0865b65d6b810ca2acbfb..65fe91a267fe1db854b246c89e07354de2710fa2 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java
@@ -1,11 +1,10 @@
 /**\r
- * \r
+ *\r
  */\r
 package com.vaadin.terminal.gwt.server;\r
 \r
 import java.io.Serializable;\r
 import java.util.HashMap;\r
-import java.util.Iterator;\r
 import java.util.LinkedHashSet;\r
 import java.util.Map;\r
 import java.util.Set;\r
@@ -31,9 +30,9 @@ public class PortletApplicationContext extends WebApplicationContext implements
 \r
     protected PortletSession portletSession;\r
 \r
-    protected Map portletListeners = new HashMap();\r
+    protected Map<Application, Set<PortletListener>> portletListeners = new HashMap<Application, Set<PortletListener>>();\r
 \r
-    protected Map portletToApplication = new HashMap();\r
+    protected Map<Portlet, Application> portletToApplication = new HashMap<Portlet, Application>();\r
 \r
     PortletApplicationContext() {\r
 \r
@@ -84,10 +83,8 @@ public class PortletApplicationContext extends WebApplicationContext implements
     @Override\r
     protected void removeApplication(Application application) {\r
         portletListeners.remove(application);\r
-        for (Iterator it = portletToApplication.keySet().iterator(); it\r
-                .hasNext();) {\r
-            Object key = it.next();\r
-            if (key == application) {\r
+        for (Portlet key : portletToApplication.keySet()) {\r
+            if (portletToApplication.get(key) == application) {\r
                 portletToApplication.remove(key);\r
             }\r
         }\r
@@ -99,7 +96,7 @@ public class PortletApplicationContext extends WebApplicationContext implements
     }\r
 \r
     public Application getPortletApplication(Portlet portlet) {\r
-        return (Application) portletToApplication.get(portlet);\r
+        return portletToApplication.get(portlet);\r
     }\r
 \r
     public PortletSession getPortletSession() {\r
@@ -107,16 +104,16 @@ public class PortletApplicationContext extends WebApplicationContext implements
     }\r
 \r
     public void addPortletListener(Application app, PortletListener listener) {\r
-        Set l = (Set) portletListeners.get(app);\r
+        Set<PortletListener> l = portletListeners.get(app);\r
         if (l == null) {\r
-            l = new LinkedHashSet();\r
+            l = new LinkedHashSet<PortletListener>();\r
             portletListeners.put(app, l);\r
         }\r
         l.add(listener);\r
     }\r
 \r
     public void removePortletListener(Application app, PortletListener listener) {\r
-        Set l = (Set) portletListeners.get(app);\r
+        Set<PortletListener> l = portletListeners.get(app);\r
         if (l != null) {\r
             l.remove(listener);\r
         }\r
@@ -143,10 +140,9 @@ public class PortletApplicationContext extends WebApplicationContext implements
     public void firePortletRenderRequest(Portlet portlet,\r
             RenderRequest request, RenderResponse response) {\r
         Application app = getPortletApplication(portlet);\r
-        Set listeners = (Set) portletListeners.get(app);\r
+        Set<PortletListener> listeners = portletListeners.get(app);\r
         if (listeners != null) {\r
-            for (Iterator it = listeners.iterator(); it.hasNext();) {\r
-                PortletListener l = (PortletListener) it.next();\r
+            for (PortletListener l : listeners) {\r
                 l.handleRenderRequest(request, new RestrictedRenderResponse(\r
                         response));\r
             }\r
@@ -156,10 +152,9 @@ public class PortletApplicationContext extends WebApplicationContext implements
     public void firePortletActionRequest(Portlet portlet,\r
             ActionRequest request, ActionResponse response) {\r
         Application app = getPortletApplication(portlet);\r
-        Set listeners = (Set) portletListeners.get(app);\r
+        Set<PortletListener> listeners = portletListeners.get(app);\r
         if (listeners != null) {\r
-            for (Iterator it = listeners.iterator(); it.hasNext();) {\r
-                PortletListener l = (PortletListener) it.next();\r
+            for (PortletListener l : listeners) {\r
                 l.handleActionRequest(request, response);\r
             }\r
         }\r