#3988 add getPortletConfig() to PortletApplicationContext2, allows getting portlet init parameters etc.

svn changeset:14142/svn branch:6.4

2 files changed, 11 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index 9a868d5516..b3b261cb7c 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -352,6 +352,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
                 PortletApplicationContext2 applicationContext = PortletApplicationContext2
                         .getApplicationContext(request.getPortletSession());
                 applicationContext.setResponse(response);
+                applicationContext.setPortletConfig(getPortletConfig());
 
                 PortletCommunicationManager applicationManager = applicationContext
                         .getApplicationManager(application);
diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
index ac3ec8f866..1ff07479fd 100644
--- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
+++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java
@@ -16,6 +16,7 @@ import javax.portlet.ActionResponse;
 import javax.portlet.EventRequest;
 import javax.portlet.EventResponse;
 import javax.portlet.MimeResponse;
+import javax.portlet.PortletConfig;
 import javax.portlet.PortletMode;
 import javax.portlet.PortletModeException;
 import javax.portlet.PortletResponse;
@@ -49,6 +50,7 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
     protected Map<Application, Set<PortletListener>> portletListeners = new HashMap<Application, Set<PortletListener>>();
 
     protected transient PortletSession session;
+    protected transient PortletConfig portletConfig;
 
     protected HashMap<String, Application> portletWindowIdToApplicationMap = new HashMap<String, Application>();
 
@@ -126,6 +128,14 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext {
         return session;
     }
 
+    public PortletConfig getPortletConfig() {
+        return portletConfig;
+    }
+
+    public void setPortletConfig(PortletConfig config) {
+        portletConfig = config;
+    }
+
     public void addPortletListener(Application app, PortletListener listener) {
         Set<PortletListener> l = portletListeners.get(app);
         if (l == null) {