Browse Source

Some early modifications to the client side to allow for Portlet URLs. Don't know if they work yet.

svn changeset:9509/svn branch:portlet_2.0
tags/6.7.0.beta1
Petter Holmström 14 years ago
parent
commit
ccad5b2ed8

+ 16
- 1
src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java View File

private String communicationErrorMessage; private String communicationErrorMessage;
private String communicationErrorUrl; private String communicationErrorUrl;
private boolean useDebugIdInDom = true; private boolean useDebugIdInDom = true;
private boolean usePortletURLs = false;
private String portletActionURLBase;


private Class<? extends Paintable>[] classes = new Class[1024]; private Class<? extends Paintable>[] classes = new Class[1024];


private static ArrayList<ApplicationConnection> unstartedApplications = new ArrayList<ApplicationConnection>(); private static ArrayList<ApplicationConnection> unstartedApplications = new ArrayList<ApplicationConnection>();
private static ArrayList<ApplicationConnection> runningApplications = new ArrayList<ApplicationConnection>(); private static ArrayList<ApplicationConnection> runningApplications = new ArrayList<ApplicationConnection>();


public boolean usePortletURLs() {
return usePortletURLs;
}
public String getPortletActionURLBase() {
return portletActionURLBase;
}
public String getRootPanelId() { public String getRootPanelId() {
return id; return id;
} }
this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorMessage = jsobj.comErrMsg.message; this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorMessage = jsobj.comErrMsg.message;
this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorUrl = jsobj.comErrMsg.url; this.@com.vaadin.terminal.gwt.client.ApplicationConfiguration::communicationErrorUrl = jsobj.comErrMsg.url;
} }
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;
}
} else { } else {
$wnd.alert("Vaadin app failed to initialize: " + this.id); $wnd.alert("Vaadin app failed to initialize: " + this.id);
} }

+ 13
- 3
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java View File

final String rd = uidl_security_key + VAR_BURST_SEPARATOR + requestData; final String rd = uidl_security_key + VAR_BURST_SEPARATOR + requestData;


console.log("Making UIDL Request with params: " + rd); console.log("Making UIDL Request with params: " + rd);
String uri = getAppUri() + "UIDL" + configuration.getPathInfo();
String uri;
if (configuration.usePortletURLs()) {
uri = configuration.getPortletActionURLBase() + "&UIDL=true";
} else {
uri = getAppUri() + "UIDL" + configuration.getPathInfo();
}
if (repaintAll) { if (repaintAll) {
// collect some client side data that will be sent to server on // collect some client side data that will be sent to server on
// initial uidl request // initial uidl request
// TODO figure out how client and view size could be used better on // TODO figure out how client and view size could be used better on
// server. screen size can be accessed via Browser object, but other // server. screen size can be accessed via Browser object, but other
// values currently only via transaction listener. // values currently only via transaction listener.
uri += "?repaintAll=1&" + "sh=" + screenHeight + "&sw="
if (configuration.usePortletURLs()) {
uri += "&";
} else {
uri += "?";
}
uri += "repaintAll=1&" + "sh=" + screenHeight + "&sw="
+ screenWidth + "&cw=" + clientWidth + "&ch=" + screenWidth + "&cw=" + clientWidth + "&ch="
+ clientHeight + "&vw=" + offsetWidth + "&vh=" + clientHeight + "&vw=" + offsetWidth + "&vh="
+ offsetHeight + "&fr=" + token; + offsetHeight + "&fr=" + token;
} }
} }
if (windowName != null && windowName.length() > 0) { if (windowName != null && windowName.length() > 0) {
uri += (repaintAll ? "&" : "?") + "windowName=" + windowName;
uri += (repaintAll || configuration.usePortletURLs() ? "&" : "?") + "windowName=" + windowName;
} }


if (!forceSync) { if (!forceSync) {

Loading…
Cancel
Save