From: Petter Holmström <petter.holmstrom@itmill.com>
Date: Tue, 3 Nov 2009 07:42:31 +0000 (+0000)
Subject: More changes
X-Git-Tag: 6.7.0.beta1~2266^2~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b47a8d3e858fd90e0252ceb0c01adbe43073a46a;p=vaadin-framework.git

More changes

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

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index ca86467e04..bea366307d 100644
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@ -119,6 +119,11 @@ public abstract class Application implements URIHandler,
      */
     private URL applicationUrl;
 
+    /**
+     * The ID of the portlet window that this application runs in.
+     */
+    private String portletWindowId;
+    
     /**
      * Name of the theme currently used by the application.
      */
@@ -181,6 +186,16 @@ public abstract class Application implements URIHandler,
      */
     private Terminal.ErrorListener errorHandler = this;
 
+    // TODO Document me!
+    public String getPortletWindowId() {
+        return portletWindowId;
+    }
+    
+    // TODO Document me!
+    public void setPortletWindowId(String portletWindowId) {
+        this.portletWindowId = portletWindowId;
+    }
+    
     /**
      * <p>
      * Gets a window by name. Returns <code>null</code> if the application is
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index b4ea4cafff..f5df828a2c 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -25,7 +25,7 @@ public class ApplicationConfiguration {
     private String communicationErrorUrl;
     private boolean useDebugIdInDom = true;
     private boolean usePortletURLs = false;
-    private String portletActionURLBase;
+    private String portletUidlURLBase;
 
     private Class<? extends Paintable>[] classes = new Class[1024];
 
@@ -36,8 +36,8 @@ public class ApplicationConfiguration {
         return usePortletURLs;
     }
     
-    public String getPortletActionURLBase() {
-        return portletActionURLBase;
+    public String getPortletUidlURLBase() {
+        return portletUidlURLBase;
     }
     
     public String getRootPanelId() {
@@ -91,7 +91,7 @@ public class ApplicationConfiguration {
         if($wnd.vaadin.vaadinConfigurations && $wnd.vaadin.vaadinConfigurations[id]) {
             var jsobj = $wnd.vaadin.vaadinConfigurations[id];
             var uri = jsobj.appUri;
-            if(uri[uri.length -1] != "/") {
+            if(uri != null && uri[uri.length -1] != "/") {
                 uri = uri + "/";
             }
             this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::appUri = uri;
@@ -114,8 +114,8 @@ public class ApplicationConfiguration {
             if (jsobj.usePortletURLs) {
                 this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::usePortletURLs = jsobj.usePortletURLs;
             }
-            if (jsobj.portletActionURLBase) {
-                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::portletActionURLBase = jsobj.portletActionURLBase;
+            if (jsobj.portletUidlURLBase) {
+                this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::portletUidlURLBase = jsobj.portletUidlURLBase;
             }
         } else {
             $wnd.alert("Vaadin app failed to initialize: " + this.id);
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 1b1a3ee9e9..4719b0cbd3 100755
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -307,7 +307,7 @@ public class ApplicationConnection {
         console.log("Making UIDL Request with params: " + rd);
         String uri;
         if (configuration.usePortletURLs()) {
-            uri = configuration.getPortletActionURLBase() + "&UIDL=true";
+            uri = configuration.getPortletUidlURLBase();
         } else {
             uri = getAppUri() + "UIDL" + configuration.getPathInfo();
         }