Index: lutingenerator/src/java/org/codelutin/generator/PackageValidator.java diff -u lutingenerator/src/java/org/codelutin/generator/PackageValidator.java:1.1 lutingenerator/src/java/org/codelutin/generator/PackageValidator.java:1.2 --- lutingenerator/src/java/org/codelutin/generator/PackageValidator.java:1.1 Fri Apr 22 17:06:29 2005 +++ lutingenerator/src/java/org/codelutin/generator/PackageValidator.java Mon Apr 25 10:06:24 2005 @@ -24,7 +24,7 @@ * Created: 21 avr. 2005 * * @author Arnaud Thimel - * @version $Revision: 1.1 $ + * @version $Revision: 1.2 $ */ package org.codelutin.generator; @@ -71,21 +71,18 @@ * @return true is the current package is valid */ public static boolean isValid(String fullPackageName, - String localPackageNameDot, String extraPackages) { - if (localPackageNameDot.startsWith(".")) - return false; - if (extraPackages != null && !"".equals(extraPackages)) { - extraPackages = fullPackageName + ", " + extraPackages; - } else { - extraPackages = fullPackageName; - } - String[] packages = extraPackages.split(","); - for (int i = 0; i < packages.length; i++) { - packages[i] = packages[i].trim(); - if ((localPackageNameDot).matches(packages[i]) || localPackageNameDot.equals(packages[i] + ".")) { - return true; - } - } - return false; - } + String localPackageName, String extraPackages) { + if (localPackageName.startsWith(fullPackageName)) + return true; + if (localPackageName.startsWith(".")) + return false; + String[] packages = extraPackages.split(","); + for (int i = 0; i < packages.length; i++) { + packages[i] = packages[i].trim(); + if ((localPackageName).matches(packages[i])) { + return true; + } + } + return false; + } }