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 2012/10/02 15:27:47 UTC
svn commit: r1392908 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/layout/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/
tobago-theme/...
Author: lofwyr
Date: Tue Oct 2 13:27:47 2012
New Revision: 1392908
URL: http://svn.apache.org/viewvc?rev=1392908&view=rev
Log:
TOBAGO-1204 Add a serialize() method to class Measure
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java?rev=1392908&r1=1392907&r2=1392908&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Measure.java Tue Oct 2 13:27:47 2012
@@ -141,6 +141,8 @@ public abstract class Measure implements
public abstract int getPixel();
+ public abstract String serialize();
+
/**
* Returns the maximum. If all parameters are null, than the result is {@value #ZERO}.
*/
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java?rev=1392908&r1=1392907&r2=1392908&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/PixelMeasure.java Tue Oct 2 13:27:47 2012
@@ -101,6 +101,11 @@ public final class PixelMeasure extends
@Override
public String toString() {
+ return serialize();
+ }
+
+ @Override
+ public String serialize() {
return pixel + "px";
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=1392908&r1=1392907&r2=1392908&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Tue Oct 2 13:27:47 2012
@@ -24,6 +24,7 @@ import org.apache.myfaces.tobago.config.
import org.apache.myfaces.tobago.context.Markup;
import org.apache.myfaces.tobago.context.ResourceManager;
import org.apache.myfaces.tobago.internal.context.ResourceManagerFactory;
+import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.util.ComponentUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,6 +125,9 @@ public class RendererBase extends Render
if (currentValue instanceof String) {
return (String) currentValue;
}
+ if (currentValue instanceof Measure) {
+ return ((Measure) currentValue).serialize();
+ }
Class converterType = currentValue.getClass();
converter = context.getApplication().createConverter(converterType);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java?rev=1392908&r1=1392907&r2=1392908&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Style.java Tue Oct 2 13:27:47 2012
@@ -143,22 +143,22 @@ public class Style implements Serializab
StringBuilder buf = new StringBuilder();
if (width != null) {
buf.append("width:");
- buf.append(width);
+ buf.append(width.serialize());
buf.append(';');
}
if (height != null) {
buf.append("height:");
- buf.append(height);
+ buf.append(height.serialize());
buf.append(';');
}
if (top != null) {
buf.append("top:");
- buf.append(top);
+ buf.append(top.serialize());
buf.append(';');
}
if (left != null) {
buf.append("left:");
- buf.append(left);
+ buf.append(left.serialize());
buf.append(';');
}
if (display != null) {
@@ -183,52 +183,52 @@ public class Style implements Serializab
}
if (marginLeft != null) {
buf.append("margin-left:");
- buf.append(marginLeft);
+ buf.append(marginLeft.serialize());
buf.append(';');
}
if (marginRight != null) {
buf.append("margin-right:");
- buf.append(marginRight);
+ buf.append(marginRight.serialize());
buf.append(';');
}
if (marginTop != null) {
buf.append("margin-top:");
- buf.append(marginTop);
+ buf.append(marginTop.serialize());
buf.append(';');
}
if (marginBottom != null) {
buf.append("margin-bottom:");
- buf.append(marginBottom);
+ buf.append(marginBottom.serialize());
buf.append(';');
}
if (margin != null) {
buf.append("margin:");
- buf.append(margin);
+ buf.append(margin.serialize());
buf.append(';');
}
if (paddingLeft != null) {
buf.append("padding-left:");
- buf.append(paddingLeft);
+ buf.append(paddingLeft.serialize());
buf.append(';');
}
if (paddingRight != null) {
buf.append("padding-right:");
- buf.append(paddingRight);
+ buf.append(paddingRight.serialize());
buf.append(';');
}
if (paddingTop != null) {
buf.append("padding-top:");
- buf.append(paddingTop);
+ buf.append(paddingTop.serialize());
buf.append(';');
}
if (paddingBottom != null) {
buf.append("padding-bottom:");
- buf.append(paddingBottom);
+ buf.append(paddingBottom.serialize());
buf.append(';');
}
if (padding != null) {
buf.append("padding:");
- buf.append(padding);
+ buf.append(padding.serialize());
buf.append(';');
}
if (backgroundImage != null) {
@@ -254,22 +254,22 @@ public class Style implements Serializab
StringBuilder buf = new StringBuilder("{");
if (width != null) {
buf.append("\"width\":\"");
- buf.append(width);
+ buf.append(width.serialize());
buf.append("\",");
}
if (height != null) {
buf.append("\"height\":\"");
- buf.append(height);
+ buf.append(height.serialize());
buf.append("\",");
}
if (top != null) {
buf.append("\"top\":\"");
- buf.append(top);
+ buf.append(top.serialize());
buf.append("\",");
}
if (left != null) {
buf.append("\"left\":\"");
- buf.append(left);
+ buf.append(left.serialize());
buf.append("\",");
}
if (display != null) {
@@ -294,52 +294,52 @@ public class Style implements Serializab
}
if (marginLeft != null) {
buf.append("\"marginLeft\":\"");
- buf.append(marginLeft);
+ buf.append(marginLeft.serialize());
buf.append("\",");
}
if (marginRight != null) {
buf.append("\"marginRight\":\"");
- buf.append(marginRight);
+ buf.append(marginRight.serialize());
buf.append("\",");
}
if (marginTop != null) {
buf.append("\"marginTop\":\"");
- buf.append(marginTop);
+ buf.append(marginTop.serialize());
buf.append("\",");
}
if (marginBottom != null) {
buf.append("\"marginBottom\":\"");
- buf.append(marginBottom);
+ buf.append(marginBottom.serialize());
buf.append("\",");
}
if (margin != null) {
buf.append("\"margin\":\"");
- buf.append(margin);
+ buf.append(margin.serialize());
buf.append("\",");
}
if (paddingLeft != null) {
buf.append("\"paddingLeft\":\"");
- buf.append(paddingLeft);
+ buf.append(paddingLeft.serialize());
buf.append("\",");
}
if (paddingRight != null) {
buf.append("\"paddingRight\":\"");
- buf.append(paddingRight);
+ buf.append(paddingRight.serialize());
buf.append("\",");
}
if (paddingTop != null) {
buf.append("\"paddingTop\":\"");
- buf.append(paddingTop);
+ buf.append(paddingTop.serialize());
buf.append("\",");
}
if (paddingBottom != null) {
buf.append("\"paddingBottom\":\"");
- buf.append(paddingBottom);
+ buf.append(paddingBottom.serialize());
buf.append("\",");
}
if (padding != null) {
buf.append("\"padding\":\"");
- buf.append(padding);
+ buf.append(padding.serialize());
buf.append("\",");
}
if (backgroundImage != null) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java?rev=1392908&r1=1392907&r2=1392908&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/DatePickerRenderer.java Tue Oct 2 13:27:47 2012
@@ -96,7 +96,7 @@ public class DatePickerRenderer extends
// fixme: should work automatically from the layout manager
final Measure width = getResourceManager().getThemeMeasure(facesContext, calendar, "minimumWidth");
- layoutOfBox.setColumns(width.toString());
+ layoutOfBox.setColumns(width.serialize());
// add time input
final UIPanel timePanel = (UIPanel) CreateComponentUtils.createComponent(