[richfaces-svn-commits] JBoss Rich Faces SVN: r9557 - in trunk/test-applications/facelets/src/main/java/util: style and 1 other directory.
Author: mvitenkov
Date: 2008-07-14 05:49:05 -0400 (Mon, 14 Jul 2008)
New Revision: 9557
Modified:
trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java
trunk/test-applications/facelets/src/main/java/util/style/Style.java
Log:
componentInfo correction
Modified:
trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java
===================================================================
---
trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-14
09:48:21 UTC (rev 9556)
+++
trunk/test-applications/facelets/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-14
09:49:05 UTC (rev 9557)
@@ -117,11 +117,13 @@
//Object obj = field.get(component);
UIComponentBase comp = (UIComponentBase) component;
ValueExpression ve = comp.getValueExpression(str);
+ if(ve != null){
if(ve.isLiteralText()){
componentAttribute.putStyle(str, ve == null ? "null" :
ve.getExpressionString());
} else{
componentAttribute.putStyle(str, ve == null ? "null" :
ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
}
+ }
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
@@ -137,9 +139,9 @@
ValueExpression ve = comp.getValueExpression(str);
if(ve != null){
if(ve.isLiteralText()){
- componentAttribute.putStyle(str, ve == null ? "null" :
ve.getExpressionString());
+ componentAttribute.putAttribute(str, ve.getExpressionString());
} else{
- componentAttribute.putStyle(str, ve == null ? "null" :
ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
+ componentAttribute.putAttribute(str,
ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString());
}
}
// Object obj = field.get(component);
Modified: trunk/test-applications/facelets/src/main/java/util/style/Style.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-07-14
09:48:21 UTC (rev 9556)
+++ trunk/test-applications/facelets/src/main/java/util/style/Style.java 2008-07-14
09:49:05 UTC (rev 9557)
@@ -65,7 +65,7 @@
private String trailerStyleClass;
private String barClass;
private String handleStyle;
-
+ private String contentStyle;
private String styleA;
private String styleClassA;
private String selectStyleA;
@@ -139,7 +139,7 @@
trailerStyleClass = "trailerStyleClass";
barClass = "barClass";
handleStyle = "handleStyle";
-
+ contentStyle = "contentStyle";
styleA = "styleA";
styleClassA = "styleClassA";
selectStyleA = "selectStyleA";
@@ -727,4 +727,12 @@
public void setHandleStyle(String handleStyle) {
this.handleStyle = handleStyle;
}
+
+ public String getContentStyle() {
+ return contentStyle;
+ }
+
+ public void setContentStyle(String contentStyle) {
+ this.contentStyle = contentStyle;
+ }
}