Author: mvitenkov Date: 2008-07-15 08:13:46 -0400 (Tue, 15 Jul 2008) New Revision: 9601 Modified: trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java Log: Modified: trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java =================================================================== --- trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-15 11:52:55 UTC (rev 9600) +++ trunk/test-applications/jsp/src/main/java/util/componentInfo/ComponentInfo.java 2008-07-15 12:13:46 UTC (rev 9601) @@ -90,11 +90,11 @@ ValueExpression ve = comp.getValueExpression(str); if(ve != null){ if(ve.isLiteralText()){ - componentAttribute.putStyle(str, ve == null ? "null" : ve.getExpressionString()); + componentAttribute.putStyle(str, ve.getExpressionString()); } else{ - componentAttribute.putStyle(str, ve == null ? "null" : ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString()); + componentAttribute.putStyle(str, ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString()); } - } + } else componentAttribute.putStyle(str, "null"); } catch (IllegalArgumentException e) { // TODO Auto-generated catch block @@ -114,7 +114,7 @@ } else{ componentAttribute.putAttribute(str, ve.getValue(FacesContext.getCurrentInstance().getELContext()).toString()); } - } + }else componentAttribute.putAttribute(str, "null"); // Object obj = field.get(component); // componentAttribute.putAttribute(str, obj == null ? "null" : obj.toString()); } else componentAttribute.putAttribute(str, "---");