From: <fa...@vh...> - 2005-07-14 12:02:31
|
Author: fabrice Date: 2005-07-14 13:55:44 +0200 (Thu, 14 Jul 2005) New Revision: 628 Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/EmailValidationListener.java ccm-core/trunk/src/com/arsdigita/bebop/parameters/FloatValidationListener.java ccm-core/trunk/src/com/arsdigita/bebop/parameters/IntegerValidationListener.java ccm-core/trunk/src/com/arsdigita/bebop/parameters/URLValidationListener.java Log: don't make all widgets compulsory... Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/EmailValidationListener.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/parameters/EmailValidationListener.java 2005-07-14 11:55:08 UTC (rev 627) +++ ccm-core/trunk/src/com/arsdigita/bebop/parameters/EmailValidationListener.java 2005-07-14 11:55:44 UTC (rev 628) @@ -36,7 +36,7 @@ String value = (String)d.getValue(); Perl5Util re = new Perl5Util(); - if (!re.match("/^[^@<>\"\\t ]+@[^@<>\".\\t]+([.][^@<>\".\\n ]+)+$/", value)) { + if (!value.equals("") && !re.match("/^[^@<>\"\\t ]+@[^@<>\".\\t]+([.][^@<>\".\\n ]+)+$/", value)) { d.invalidate(); d.addError("Please enter an email address"); } Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/FloatValidationListener.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/parameters/FloatValidationListener.java 2005-07-14 11:55:08 UTC (rev 627) +++ ccm-core/trunk/src/com/arsdigita/bebop/parameters/FloatValidationListener.java 2005-07-14 11:55:44 UTC (rev 628) @@ -32,6 +32,7 @@ ParameterData d = e.getParameterData(); String value = (String)d.getValue(); + if (!value.equals("")) { try { new Float(value); } catch (NumberFormatException ex) { @@ -40,3 +41,4 @@ } } } +} Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/IntegerValidationListener.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/parameters/IntegerValidationListener.java 2005-07-14 11:55:08 UTC (rev 627) +++ ccm-core/trunk/src/com/arsdigita/bebop/parameters/IntegerValidationListener.java 2005-07-14 11:55:44 UTC (rev 628) @@ -32,6 +32,7 @@ ParameterData d = e.getParameterData(); String value = (String)d.getValue(); + if (!value.equals("")) { try { new Integer(value); } catch (NumberFormatException ex) { @@ -40,3 +41,4 @@ } } } +} Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/URLValidationListener.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/bebop/parameters/URLValidationListener.java 2005-07-14 11:55:08 UTC (rev 627) +++ ccm-core/trunk/src/com/arsdigita/bebop/parameters/URLValidationListener.java 2005-07-14 11:55:44 UTC (rev 628) @@ -35,6 +35,7 @@ ParameterData d = e.getParameterData(); String value = (String)d.getValue(); + if (!value.equals("")) { try { new URL(value); } catch (MalformedURLException ex) { @@ -43,3 +44,4 @@ } } } +} |