[izpack-changes] r1734 - in izpack-src/trunk: . src/lib/com/izforge/izpack/util

[noreply at berlios.de]

Author: dreil
Date: 2007-02-16 09:41:43 +0100 (Fri, 16 Feb 2007)
New Revision: 1734

Modified:
   izpack-src/trunk/Versions.txt
   izpack-src/trunk/src/lib/com/izforge/izpack/util/RegularExpressionValidator.java
Log:
Fixed validation of regular expressions. Removed apache regex


Modified: izpack-src/trunk/Versions.txt
===================================================================
--- izpack-src/trunk/Versions.txt	2007-02-16 08:39:11 UTC (rev 1733)
+++ izpack-src/trunk/Versions.txt	2007-02-16 08:41:43 UTC (rev 1734)
@@ -4,6 +4,7 @@
 - Added ignore as possible value for failure argument in executables (Dennis Reil)
 - Added Conditional expressions (Dennis Reil)
 - Fixed selection of default language in LanguageSelectionDialog (Dennis Reil)
+- Fixed RegularExpressionValidator (Dennis Reil)
 
   > 3.10.0 (build 2007.01.29)
 

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/util/RegularExpressionValidator.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/util/RegularExpressionValidator.java	2007-02-16 08:39:11 UTC (rev 1733)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/util/RegularExpressionValidator.java	2007-02-16 08:41:43 UTC (rev 1734)
@@ -20,9 +20,8 @@
 package com.izforge.izpack.util;
 
 import java.util.Map;
+import java.util.regex.Pattern;
 
-import org.apache.regexp.RE;
-
 import com.izforge.izpack.panels.ProcessingClient;
 import com.izforge.izpack.panels.RuleInputField;
 import com.izforge.izpack.panels.Validator;
@@ -59,8 +58,8 @@
             patternString = STR_PATTERN_DEFAULT;
         }
 
-        RE pattern = new RE(patternString);
-        return pattern.match(((RuleInputField) client).getText());
+        Pattern pattern = Pattern.compile(patternString);
+        return pattern.matcher(((RuleInputField) client).getText()).matches();
     }
 
 }