You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pl...@apache.org on 2007/05/02 16:21:07 UTC

svn commit: r534475 - in /myfaces/tobago/trunk: example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/ example/sandbox/src/main/webapp/ sandbox/src/main/java/org/apache/myfaces/tobago/component/ sandbox/src/main/java/org/apache/myface...

Author: pleff
Date: Wed May  2 07:21:06 2007
New Revision: 534475

URL: http://svn.apache.org/viewvc?view=rev&rev=534475
Log:
Added validation.

Modified:
    myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
    myfaces/tobago/trunk/example/sandbox/src/main/webapp/inputSlider.jsp
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java
    myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
    myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css

Modified: myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java?view=diff&rev=534475&r1=534474&r2=534475
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/java/org/apache/myfaces/tobago/example/sandbox/Controller.java Wed May  2 07:21:06 2007
@@ -33,6 +33,8 @@
 
   private TreeState state;
 
+  private int sliderValue;
+
   public Controller() {
     // tree
     tree = new DefaultMutableTreeNode(new Node("Category"));
@@ -108,5 +110,19 @@
 
   public void setState(TreeState state) {
     this.state = state;
+  }
+
+
+  public int getSliderValue() {
+    return sliderValue;
+  }
+
+  public void setSliderValue(int sliderValue) {
+    this.sliderValue = sliderValue;
+  }
+
+  public String sliderSubmit() {
+    LOG.info("Slider: "+sliderValue);
+    return null;
   }
 }

Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/inputSlider.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/inputSlider.jsp?view=diff&rev=534475&r1=534474&r2=534475
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/inputSlider.jsp (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/inputSlider.jsp Wed May  2 07:21:06 2007
@@ -30,9 +30,9 @@
       <f:facet name="layout">
         <tc:gridLayout columns="fixed;*" rows="fixed;*"/>
       </f:facet>
-      <tcs:numberSlider value="80" min="0" max="200">
+      <tcs:numberSlider value="#{controller.sliderValue}" min="0" max="200">
       </tcs:numberSlider>
-      <tc:cell/>
+      <tc:button action="#{controller.sliderSubmit}" label="Submit" />
       <tc:cell/>
       <tc:cell/>
     </tc:box>

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java?view=diff&rev=534475&r1=534474&r2=534475
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/component/UIInputNumberSlider.java Wed May  2 07:21:06 2007
@@ -21,6 +21,8 @@
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
+import javax.faces.validator.LongRangeValidator;
+import javax.faces.validator.ValidatorException;
 
 public class UIInputNumberSlider extends javax.faces.component.UIInput {
 
@@ -112,5 +114,14 @@
     values[3] = max;
     values[4] = disabled;
     return values;
+  }
+
+  public void validate(FacesContext context) {
+    super.validate(context);
+    try {
+      new LongRangeValidator(max, min).validate(context, this, getValue());
+    } catch (ValidatorException e) {
+      context.addMessage(getClientId(context), e.getFacesMessage());
+    }
   }
 }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java?view=diff&rev=534475&r1=534474&r2=534475
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java Wed May  2 07:21:06 2007
@@ -54,8 +54,6 @@
         boolean disabled = ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED);
         Integer min = ComponentUtil.getIntAttribute(component, "min");
         Integer max = ComponentUtil.getIntAttribute(component, "max");
-        LOG.info("### min = " + min);
-        LOG.info("### max = " + max);
         TobagoResponseWriter writer = (TobagoResponseWriter) facesContext.getResponseWriter();
 
 
@@ -80,11 +78,6 @@
             sliderWidth = (width * sliderWidthPerc) / 100;
             inputWidth = (width * (100 - sliderWidthPerc)) / 100;
         }
-
-        LOG.info("Slider width: " + sliderWidth);
-        LOG.info("Input width: " + inputWidth);
-        LOG.info("Width: " + width);
-        LOG.info("Percentage: " + sliderWidthPerc);
 
         writer.startElement(HtmlConstants.TABLE, component);
         writer.writeIdAttribute(id);

Modified: myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css?view=diff&rev=534475&r1=534474&r2=534475
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css (original)
+++ myfaces/tobago/trunk/sandbox/src/main/resources/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/style/style.css Wed May  2 07:21:06 2007
@@ -55,8 +55,7 @@
 }
 
 .tobago-inputNumberSlider-min-default {
-  font-family: bold arial, helvetica, sans-serif;
-  font-size: 11px;
+  font: bold 11px arial, helvetica, sans-serif;
 }
 
 .tobago-inputNumberSlider-max-default {
@@ -64,8 +63,7 @@
 }
 
 .tobago-inputNumberSlider-max-default {
-  font-family: bold arial, helvetica, sans-serif;
-  font-size: 11px;
+  font: bold 11px arial, helvetica, sans-serif;
 }
 
 .tobago-inputNumberSlider-input-default {
@@ -73,6 +71,6 @@
 
 .tobago-inputNumberSlider-slider-default {
   width: 100%;
-  height: 5px;
+  height: 3px;
   background-color: #660000;
-}
+}
\ No newline at end of file