ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Expand.java
Date Thu, 06 Feb 2003 17:28:41 GMT
bodewig     2003/02/06 09:28:40

  Modified:    src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Expand.java
  Log:
  Merge fix for 11100 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.30.2.4  +8 -11     jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
  
  Index: Expand.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
  retrieving revision 1.30.2.3
  retrieving revision 1.30.2.4
  diff -u -r1.30.2.3 -r1.30.2.4
  --- Expand.java	4 Dec 2002 17:02:32 -0000	1.30.2.3
  +++ Expand.java	6 Feb 2003 17:28:36 -0000	1.30.2.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -182,25 +182,22 @@
               String name = entryName;
               boolean included = false;
               for (int v = 0; v < patternsets.size(); v++) {
  +                included = true;
                   PatternSet p = (PatternSet) patternsets.elementAt(v);
  -                String[] incls = p.getIncludePatterns(project);
  +                String[] incls = p.getIncludePatterns(getProject());
                   if (incls != null) {
                       for (int w = 0; w < incls.length; w++) {
  -                        boolean isIncl =
  -                            DirectoryScanner.match(incls[w], name);
  -                        if (isIncl) {
  -                            included = true;
  +                        included = DirectoryScanner.match(incls[w], name);
  +                        if (included) {
                               break;
                           }
                       }
                   }
  -                String[] excls = p.getExcludePatterns(project);
  +                String[] excls = p.getExcludePatterns(getProject());
                   if (excls != null) {
                       for (int w = 0; w < excls.length; w++) {
  -                        boolean isExcl =
  -                            DirectoryScanner.match(excls[w], name);
  -                        if (isExcl) {
  -                            included = false;
  +                        included = !(DirectoryScanner.match(excls[w], name));
  +                        if (!included) {
                               break;
                           }
                       }
  
  
  

Mime
View raw message