Index: lutingenerator/src/java/org/codelutin/generator/PackageValidator.java diff -u lutingenerator/src/java/org/codelutin/generator/PackageValidator.java:1.2 lutingenerator/src/java/org/codelutin/generator/PackageValidator.java:1.3 --- lutingenerator/src/java/org/codelutin/generator/PackageValidator.java:1.2 Mon Apr 25 10:06:24 2005 +++ lutingenerator/src/java/org/codelutin/generator/PackageValidator.java Thu May 19 09:18:23 2005 @@ -24,7 +24,7 @@ * Created: 21 avr. 2005 * * @author Arnaud Thimel - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ package org.codelutin.generator; @@ -36,7 +36,7 @@ * ObjectModel. */ public class PackageValidator { - + /** * The toContinue method indicates if the package * localPackageNameDot has to be iterated by the stylesheet. @@ -54,9 +54,10 @@ for (int i = 0; i < packages.length; i++) { packages[i] = packages[i].trim(); if (packages[i].startsWith(localPackageNameDot)) { - if (packages[i].equals(localPackageNameDot + "*")) - return false; - return true; + if (localPackageNameDot.length() < (packages[i].lastIndexOf(".") + 1)) { + return true; + } + return false; } } return false; @@ -70,19 +71,20 @@ * @param extraPackages the list of extra packages * @return true is the current package is valid */ - public static boolean isValid(String fullPackageName, + public static boolean isValid(String fullPackagePath, 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; - } + if (localPackageName.startsWith(fullPackagePath)) + return true; + if (localPackageName.length() == 0) + return false; + String[] packages = extraPackages.split(","); + for (int i = 0; i < packages.length; i++) { + packages[i] = packages[i].trim(); + if ((localPackageName).matches(packages[i]) + || packages[i].startsWith(localPackageName)) { + return true; + } + } + return false; + } }