[richfaces-svn-commits] JBoss Rich Faces SVN: r1796 - in trunk/sandbox/ui/message/src/main: java/org/richfaces/component and 1 other directories.

Author: abelevich Date: 2007-07-23 13:27:05 -0400 (Mon, 23 Jul 2007) New Revision: 1796 Modified: trunk/sandbox/ui/message/src/main/config/component/message.xml trunk/sandbox/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java Log: remove markerLocation attribute Modified: trunk/sandbox/ui/message/src/main/config/component/message.xml =================================================================== --- trunk/sandbox/ui/message/src/main/config/component/message.xml 2007-07-23 17:05:46 UTC (rev 1795) +++ trunk/sandbox/ui/message/src/main/config/component/message.xml 2007-07-23 17:27:05 UTC (rev 1796) @@ -46,15 +46,6 @@ </description> </property> - <property attachedstate="true"> - <name>markerLocation</name> - <classname>java.lang.String</classname> - <description> - marker location relatively to informational part. Possible values are left(default) and right - </description> - <defaultvalue>"left"</defaultvalue> - </property> - <property> <name>for</name> <classname>java.lang.String</classname> Modified: trunk/sandbox/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java =================================================================== --- trunk/sandbox/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-07-23 17:05:46 UTC (rev 1795) +++ trunk/sandbox/ui/message/src/main/java/org/richfaces/component/UIRichMessage.java 2007-07-23 17:27:05 UTC (rev 1796) @@ -18,8 +18,6 @@ private String passedLabel = "passed"; - private String markerLocation = "left"; - private boolean isError = false; public boolean isError() { @@ -30,10 +28,6 @@ public abstract void setPassedLabel(String passedLabel); - public abstract String getMarkerLocation(); - - public abstract void setMarkerLocation(String markerLocation); - public boolean isAjaxRendered() { return true; } Modified: trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java =================================================================== --- trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java 2007-07-23 17:05:46 UTC (rev 1795) +++ trunk/sandbox/ui/message/src/main/java/org/richfaces/renderkit/html/RichMessageHtmlBaseRenderer.java 2007-07-23 17:27:05 UTC (rev 1796) @@ -115,26 +115,15 @@ protected void encodingUIContent(UIRichMessage uiMsg, FacesContext context, FacesMessage facesMsg) throws IOException{ - String markerLocation = uiMsg.getMarkerLocation(); - markerLocation = markerLocation.toLowerCase(); - ResponseWriter writer = context.getResponseWriter(); + writer.startElement(HTML.SPAN_ELEM, uiMsg); getUtils().writeAttribute(writer, HTML.id_ATTRIBUTE, uiMsg.getClientId(context)); renderOuterStyle(uiMsg, context, writer, facesMsg); - - if(markerLocation.equals(uiMsg.MARKER_LOCATION_LEFT)){ + renderMarkerFacet(uiMsg,context, writer,facesMsg); + renderLabel(uiMsg, context, writer, facesMsg); - renderMarkerFacet(uiMsg,context, writer,facesMsg); - renderLabel(uiMsg, context, writer, facesMsg); - - }else if(markerLocation.equals(uiMsg.MARKER_LOCATION_RIGHT)){ - - renderLabel(uiMsg, context, writer, facesMsg); - renderMarkerFacet(uiMsg,context, writer,facesMsg); - - } writer.endElement(HTML.SPAN_ELEM); }