From 71fa130612e42095393f768652d87eed8f4edd3e Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 4 Aug 2011 11:34:28 +0200 Subject: [PATCH] Fix problem in ConstraintChecker * Previously ConstraintChecker was only working with Textbox and Datebox, now it should work for any InputElement FEA: ItEr75S04BugFixing --- .../web/common/ConstraintChecker.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConstraintChecker.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConstraintChecker.java index 2a725dffd..a44583b2f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConstraintChecker.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConstraintChecker.java @@ -25,8 +25,6 @@ import java.util.List; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.WrongValueException; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Textbox; import org.zkoss.zul.impl.InputElement; /** @@ -50,19 +48,14 @@ public class ConstraintChecker { } private static boolean checkIsValid(Component child) { - if (child instanceof Textbox) { - return textboxIsValid((Textbox) child); - } - if (child instanceof Datebox) { - return dateboxIsValid((Datebox) child); + if (child instanceof InputElement) { + return inputIsValid((InputElement) child); } return true; } - private static boolean textboxIsValid(Textbox component) { - inputElementIsValid((InputElement) component); - // Forces constraint to be checked - component.getValue(); + private static boolean inputIsValid(InputElement component) { + inputElementIsValid(component); return (component.isValid()); } @@ -76,10 +69,4 @@ public class ConstraintChecker { } } - private static boolean dateboxIsValid(Datebox component) { - inputElementIsValid((InputElement) component); - component.getValue(); - return (component.isValid()); - } - }