Added styleClass property to watermark component.

@@ -24,14 +24,14 @@
         <taghandler generate="true">
         <taghandler generate="true">
             <classname>org.richfaces.taglib.WatermarkTagHandler</classname>
             <classname>org.richfaces.taglib.WatermarkTagHandler</classname>
             <superclass>com.sun.facelets.tag.jsf.ComponentHandler</superclass>
             <superclass>com.sun.facelets.tag.jsf.ComponentHandler</superclass>
-        </taghandler> &ui_output_attributes;
+        </taghandler>
+        &ui_output_attributes;
         <property>
         <property>
-            <name>for</name>
+            <name>styleClass</name>
             <classname>java.lang.String</classname>
             <classname>java.lang.String</classname>
-            <description>
-                Id of component that should be focused
+            <description>Assigns one or more CSS class names to the component. Corresponds to the HTML &quot;class&quot;
+                attribute.
             </description>
             </description>
-            <defaultvalue>""</defaultvalue>
         </property>
         </property>
     </component>
     </component>
 </components>
 </components>

@@ -7,8 +7,8 @@ public abstract class UIWatermark extends UIOutput {
     public static final String COMPONENT_TYPE = "org.richfaces.Watermark";
     public static final String COMPONENT_TYPE = "org.richfaces.Watermark";
     public static final String COMPONENT_FAMILY = "org.richfaces.Watermark";
     public static final String COMPONENT_FAMILY = "org.richfaces.Watermark";
 
 
-    public abstract String getFor();
+    public abstract String getStyleClass();
 
 
-    public abstract void setFor(String value);
+    public abstract void setStyleClass(String styleClass);
 
 
 }
 }

 if (window.RichFaces == null) {
 if (window.RichFaces == null) {
     window.RichFaces = {};
     window.RichFaces = {};
 }
 }
-RichFaces.Watermark = function(targetId, text) {
+RichFaces.Watermark = function(targetId, text, options) {
     jQuery(function() {
     jQuery(function() {
-        jQuery(document.getElementById(targetId)).watermark(text);
+        jQuery(document.getElementById(targetId)).watermark(text, options);
     });
     });
 };
 };

@@ -19,27 +19,12 @@
 
 
     <jsp:scriptlet>
     <jsp:scriptlet>
         <![CDATA[
         <![CDATA[
-        String sid = (String) component.getAttributes().get("for");
-        String target;
-        if (sid != null && ! "".equals(sid)) {
-            try {
-                UIComponent forcomp = getUtils().findComponentFor((UIComponent)component,sid);
-                if (forcomp != null) {
-                        target = forcomp.getClientId(context);
-                } else {
-                    target = sid;
-                }
-             }catch(IllegalArgumentException e) {
-                target = sid;
-             }
-        } else {
-            target = component.getParent().getClientId(context);
-        }
+        String target = getUtils().clientId(context,component.getParent());
         variables.setVariable("for",target);
         variables.setVariable("for",target);
         ]]>
         ]]>
     </jsp:scriptlet>
     </jsp:scriptlet>
 
 
     <script type="text/javascript" id="#{clientId}">
     <script type="text/javascript" id="#{clientId}">
-        RichFaces.Watermark('#{for}', '#{component.attributes["value"]}');
+        RichFaces.Watermark('#{for}', '#{component.attributes["value"]}', {className:'#{component.attributes["styleClass"]}'});
     </script>
     </script>
 </f:root>
 </f:root>