You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/11/12 15:33:55 UTC
svn commit: r1541085 - in /myfaces/tobago/branches/tobago-1.5.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/...
Author: lofwyr
Date: Tue Nov 12 14:33:55 2013
New Revision: 1541085
URL: http://svn.apache.org/r1541085
Log:
TOBAGO-1343: Client Dimension should be stored in session (ClientProperties)
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=1541085&r1=1541084&r2=1541085&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Tue Nov 12 14:33:55 2013
@@ -66,6 +66,9 @@ public class ClientProperties implements
private Measure verticalScrollbarWeight;
private Measure horizontalScrollbarWeight;
+ private Measure pageWidth;
+ private Measure pageHeight;
+
/**
* managed bean constructor
*/
@@ -231,6 +234,22 @@ public class ClientProperties implements
this.horizontalScrollbarWeight = horizontalScrollbarWeight;
}
+ public Measure getPageWidth() {
+ return pageWidth;
+ }
+
+ public void setPageWidth(Measure pageWidth) {
+ this.pageWidth = pageWidth;
+ }
+
+ public Measure getPageHeight() {
+ return pageHeight;
+ }
+
+ public void setPageHeight(Measure pageHeight) {
+ this.pageHeight = pageHeight;
+ }
+
public void updateUserAgent(FacesContext facesContext) {
ExternalContext externalContext = facesContext.getExternalContext();
String requestUserAgent = (String) externalContext.getRequestHeaderMap().get("User-Agent");
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java?rev=1541085&r1=1541084&r2=1541085&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Tue Nov 12 14:33:55 2013
@@ -20,13 +20,14 @@
package org.apache.myfaces.tobago.renderkit;
import org.apache.commons.lang.StringUtils;
+import org.apache.myfaces.tobago.context.ClientProperties;
+import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
+import org.apache.myfaces.tobago.layout.Box;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.model.PageState;
+import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.internal.component.AbstractUIPage;
-import org.apache.myfaces.tobago.layout.Box;
-import org.apache.myfaces.tobago.util.ComponentUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -80,16 +81,17 @@ public class PageRendererBase extends La
value = (String) facesContext.getExternalContext().getRequestParameterMap().get(name);
if (value != null) {
StringTokenizer tokenizer = new StringTokenizer(value, ";");
- Measure width = Measure.parse(tokenizer.nextToken());
- Measure height = Measure.parse(tokenizer.nextToken());
+ final Measure width = Measure.valueOf(tokenizer.nextToken());
+ final Measure height = Measure.valueOf(tokenizer.nextToken());
// XXX remove me later
PageState pageState = page.getPageState(facesContext);
if (pageState != null) {
pageState.setClientWidth(width.getPixel());
pageState.setClientHeight(height.getPixel());
}
- facesContext.getExternalContext().getRequestMap().put("tobago-page-clientDimension-width", width);
- facesContext.getExternalContext().getRequestMap().put("tobago-page-clientDimension-height", height);
+ final ClientProperties clientProperties = ClientProperties.getInstance(facesContext);
+ clientProperties.setPageWidth(width);
+ clientProperties.setPageHeight(height);
}
} catch (Exception e) {
LOG.error("Error in decoding state: value='" + value + "'", e);
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=1541085&r1=1541084&r2=1541085&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Tue Nov 12 14:33:55 2013
@@ -813,8 +813,7 @@ public class PageRenderer extends PageRe
@Override
public Measure getWidth(FacesContext facesContext, Configurable component) {
// width of the actual browser window
- Measure width = (Measure) FacesContext.getCurrentInstance().getExternalContext()
- .getRequestMap().get("tobago-page-clientDimension-width");
+ Measure width = ClientProperties.getInstance(facesContext).getPageWidth();
if (width != null) {
return width;
} else {
@@ -825,8 +824,7 @@ public class PageRenderer extends PageRe
@Override
public Measure getHeight(FacesContext facesContext, Configurable component) {
// height of the actual browser window
- Measure height = (Measure) FacesContext.getCurrentInstance().getExternalContext()
- .getRequestMap().get("tobago-page-clientDimension-height");
+ Measure height = ClientProperties.getInstance(facesContext).getPageHeight();
if (height != null) {
return height;
} else {