[richfaces-svn-commits] JBoss Rich Faces SVN: r2458 - in trunk/ui/inputnumber-slider/src: main/java/org/richfaces/component and 4 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: ishabalov
Date: 2007-08-23 21:31:08 -0400 (Thu, 23 Aug 2007)
New Revision: 2458

Modified:
   trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml
   trunk/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java
   trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
   trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
   trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
   trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
Log:
Duplicate attributes, width and height handling moved to css, fixed unit test.

Modified: trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml
===================================================================
--- trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml	2007-08-23 21:51:36 UTC (rev 2457)
+++ trunk/ui/inputnumber-slider/src/main/config/component/inputNumberSlider.xml	2007-08-24 01:31:08 UTC (rev 2458)
@@ -70,13 +70,11 @@
 	    	<name> width </name>
 	    	<classname>java.lang.String</classname>
 	    	<description> The width of a slider control</description>
-	    	<defaultvalue><![CDATA["200px"]]></defaultvalue>
 	    </property>
     	<property hidden="true">
 	    	<name> height </name>
 	    	<classname>java.lang.String</classname>
 	    	<description> The height of a slider control</description>
-	    	<defaultvalue><![CDATA["20px"]]></defaultvalue>
 	    </property>
     	<property>
 	    	<name> enableManualInput </name>

Modified: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java	2007-08-23 21:51:36 UTC (rev 2457)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/component/UIInputNumberSlider.java	2007-08-24 01:31:08 UTC (rev 2458)
@@ -30,4 +30,22 @@
 
 	public static final String COMPONENT_TYPE = "org.richfaces.inputNumberSlider";
 	
+	public String getStyleValue() {
+		StringBuffer buf = new StringBuffer();
+		String width = (String)getAttributes().get("width");
+		String height = (String)getAttributes().get("height");
+		String style = (String)getAttributes().get("style");
+		if (width!=null&&width.length()>0) {
+			buf.append("width:"+width);
+			buf.append(";");
+		}
+
+		if (height!=null&&height.length()>0) {
+			buf.append("height:"+height);
+			buf.append(";");
+		}
+		buf.append(style);
+		return buf.toString();
+	}
+	
 }

Modified: trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java
===================================================================
--- trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java	2007-08-23 21:51:36 UTC (rev 2457)
+++ trunk/ui/inputnumber-slider/src/main/java/org/richfaces/renderkit/InputNumberSliderRendererBase.java	2007-08-24 01:31:08 UTC (rev 2458)
@@ -40,4 +40,5 @@
 	protected boolean attributeToBoolean(UIComponent component, String attributeName) {
 		return getUtils().isBooleanAttribute(component, attributeName);
 	}
+
 }

Modified: trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
===================================================================
--- trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss	2007-08-23 21:51:36 UTC (rev 2457)
+++ trunk/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss	2007-08-24 01:31:08 UTC (rev 2458)
@@ -2,9 +2,13 @@
 <f:template xmlns:f='http:/jsf.exadel.com/template'
    xmlns:u='http:/jsf.exadel.com/template/util'
    xmlns="http://www.w3.org/1999/xhtml" >
-
 	<f:verbatim><![CDATA[
 
+.dr-insldr {
+	width : 200px;
+	height : 20px;
+}
+
 .dr-insldr-tip {
 	position : absolute;
 	white-space	: nowrap;

Modified: trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
--- trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx	2007-08-23 21:51:36 UTC (rev 2457)
+++ trunk/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx	2007-08-24 01:31:08 UTC (rev 2458)
@@ -35,10 +35,12 @@
         }
 
         variables.setVariable("inputSize", component.getAttributes().get("inputSize"));
+	variables.setVariable("style",component.getStyleValue());
+
     ]]></jsp:scriptlet>
 
-    <table id="#{clientId}" border="0" cellpadding="0" cellspacing="0" class="rich-slider #{component.attributes['styleClass']}"
-           style="width:#{component.attributes['width']};#{component.attributes['style']}" x:passThruWithExclusions="id,boundClass,tipClass">
+    <table id="#{clientId}" border="0" cellpadding="0" cellspacing="0" class="dr-insldr rich-slider #{component.attributes['styleClass']}"
+           style="#{style}" x:passThruWithExclusions="id,boundClass,tipClass,class,width,height,style">
 		<tbody>
 			<tr>
                 <jsp:scriptlet><![CDATA[

Modified: trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
===================================================================
--- trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java	2007-08-23 21:51:36 UTC (rev 2457)
+++ trunk/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java	2007-08-24 01:31:08 UTC (rev 2458)
@@ -123,15 +123,16 @@
         assertNotNull(htmlSlider);
 
         assertTrue(htmlSlider.getAttributeValue("class").contains(
-                "rich-slider"));
+                "dr-insldr rich-slider"));
 
         HtmlInput htmlSliderInput = (HtmlInput) renderedView.getHtmlElementById(
                 slider.getClientId(facesContext) + "Input");
 
         assertNotNull(htmlSliderInput);
 
+        String a = htmlSliderInput.getClassAttribute();
         assertTrue(htmlSliderInput.getClassAttribute().contains(
-                "dr-insldr-field rich-inslider-field"));
+                "dr-insldr-field dr-insldr-field-right rich-inslider-field"));
         assertTrue(htmlSliderInput.getTypeAttribute().equals("text"));
 
         DomNode numContainer = htmlSliderInput.getParentNode()