Return-Path: X-Original-To: apmail-maven-commits-archive@www.apache.org Delivered-To: apmail-maven-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 526C3C3A1 for ; Tue, 8 May 2012 13:49:29 +0000 (UTC) Received: (qmail 55955 invoked by uid 500); 8 May 2012 13:49:29 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 55873 invoked by uid 500); 8 May 2012 13:49:29 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 55866 invoked by uid 99); 8 May 2012 13:49:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2012 13:49:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 May 2012 13:49:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 68BD52388C5D for ; Tue, 8 May 2012 13:48:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r816646 [12/41] - in /websites/production/maventest/content/plugins/maven-shade-plugin-latest: ./ apidocs/ apidocs/org/apache/maven/plugins/shade/ apidocs/org/apache/maven/plugins/shade/class-use/ apidocs/org/apache/maven/plugins/shade/filt... Date: Tue, 08 May 2012 13:48:19 -0000 To: commits@maven.apache.org From: hboutemy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120508134838.68BD52388C5D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.filter.SimpleFilter.html ============================================================================== --- websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.filter.SimpleFilter.html (original) +++ websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.filter.SimpleFilter.html Tue May 8 13:48:12 2012 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
SimpleFilter
96%
31/32
85%
24/28
2.778
SimpleFilter
84 %
27/32
75 %
24/32
2,9
 
@@ -68,181 +68,197 @@  25   
 import java.util.HashSet;
 26   - 
 import java.util.Iterator;
-  27   
 import java.util.Set;
-  28   +  27   
 
-  29   +  28   
 /**
-  30   +  29   
  * @author David Blevins
-  31   +  30   
  */
-  32   +  31   
 public class SimpleFilter
-  33   +  32   
     implements Filter
-  34   +  33   
 {
-  35   +  34   
 
+  35   + 
     private Set<File> jars;
 36   - 
     private Set jars;
-  37   
 
+  37   + 
     private Set<String> includes;
 38   - 
     private Set includes;
-  39   
 
+  39   + 
     private Set<String> excludes;
 40   - 
     private Set excludes;
+ 
 
 41   + 
     public SimpleFilter( Set<File> jars, Set<String> includes, Set<String> excludes )
+  42  9 
     {
+  43  9 
         this.jars = ( jars != null ) ? new HashSet( jars ) : new HashSet();
+  44  9 
         this.includes = normalizePatterns( includes );
+  45  9 
         this.excludes = normalizePatterns( excludes );
+  46  9 
     }
+  47   
 
-  42   - 
     public SimpleFilter( Set jars, Set includes, Set excludes )
-  43  9 
     {
-  44  9 
         this.jars = ( jars != null ) ? new HashSet( jars ) : new HashSet();
-  45  9 
         this.includes = normalizePatterns( includes );
-  46  9 
         this.excludes = normalizePatterns( excludes );
-  47  9 
     }
 48   - 
 
-  49   
     public boolean canFilter( File jar )
-  50   +  49   
     {
-  51  2 
         return jars.contains( jar );
-  52   +  50  2 
         return jars.contains( jar );
+  51   
     }
-  53   +  52   
 
-  54   +  53   
     public boolean isFiltered( String classFile )
-  55   +  54   
     {
-  56  23 
         String path = normalizePath( classFile );
-  57   +  55  23 
         String path = normalizePath( classFile );
+  56   
 
-  58  23 
         return !( isIncluded( path ) && !isExcluded( path ) );
-  59   +  57  23 
         return !( isIncluded( path ) && !isExcluded( path ) );
+  58   
     }
-  60   +  59   
 
+  60   + 
     public boolean isSpecificallyIncluded( String classFile )
 61   - 
     private boolean isIncluded( String classFile )
-  62   
     {
-  63  23 
         if ( includes == null || includes.isEmpty() )
-  64   +  62  0 
         if ( includes == null || includes.isEmpty() )
+  63   
         {
-  65  16 
             return true;
-  66   +  64  0 
             return false;
+  65   
         }
-  67   +  66   
 
-  68  7 
         return matchPaths( includes, classFile );
-  69   - 
     }
-  70   +  67  0 
         String path = normalizePath( classFile );
+  68   
 
+  69  0 
         return isIncluded( path );
+  70   + 
     }
 71   - 
     private boolean isExcluded( String classFile )
+ 
 
 72   + 
     private boolean isIncluded( String classFile )
+  73   
     {
-  73  20 
         if ( excludes == null || excludes.isEmpty() )
-  74   +  74  23 
         if ( includes == null || includes.isEmpty() )
+  75   
         {
-  75  8 
             return false;
-  76   - 
         }
+  76  16 
             return true;
 77   + 
         }
+  78   
 
-  78  12 
         return matchPaths( excludes, classFile );
-  79   - 
     }
+  79  7 
         return matchPaths( includes, classFile );
 80   - 
 
+ 
     }
 81   - 
     private boolean matchPaths( Set patterns, String classFile )
+ 
 
 82   + 
     private boolean isExcluded( String classFile )
+  83   
     {
-  83  19 
         for ( Iterator iterator = patterns.iterator(); iterator.hasNext(); )
-  84   +  84  20 
         if ( excludes == null || excludes.isEmpty() )
+  85   
         {
-  85  19 
             String pattern = (String) iterator.next();
-  86   - 
 
-  87  19 
             if ( SelectorUtils.matchPath( pattern, classFile ) )
+  86  8 
             return false;
+  87   + 
         }
 88   - 
             {
-  89  10 
                 return true;
-  90   - 
             }
-  91  9 
         }
-  92   
 
-  93  9 
         return false;
-  94   +  89  12 
         return matchPaths( excludes, classFile );
+  90   
     }
-  95   +  91   
 
-  96   - 
     private String normalizePath( String path )
-  97   +  92   + 
     private boolean matchPaths( Set<String> patterns, String classFile )
+  93   
     {
-  98  29 
         return ( path != null ) ? path.replace( File.separatorChar == '/' ? '\\' : '/', File.separatorChar ) : null;
-  99   - 
     }
-  100   +  94  19 
         for ( String pattern : patterns )
+  95   + 
         {
+  96   
 
+  97  19 
             if ( SelectorUtils.matchPath( pattern, classFile ) )
+  98   + 
             {
+  99  10 
                 return true;
+  100   + 
             }
 101   - 
     private Set normalizePatterns( Set patterns )
+ 
         }
 102   - 
     {
-  103  18 
         Set result = new HashSet();
+ 
 
+  103  9 
         return false;
 104   + 
     }
+  105   
 
-  105  18 
         if ( patterns != null )
 106   - 
         {
-  107  14 
             for ( Iterator it = patterns.iterator(); it.hasNext(); )
-  108   - 
             {
-  109  6 
                 String pattern = (String) it.next();
+ 
     private String normalizePath( String path )
+  107   + 
     {
+  108  29 
         return ( path != null ) ? path.replace( File.separatorChar == '/' ? '\\' : '/', File.separatorChar ) : null;
+  109   + 
     }
 110   
 
-  111  6 
                 pattern = normalizePath( pattern );
+  111   + 
     private Set normalizePatterns( Set<String> patterns )
 112   - 
 
-  113  6 
                 if ( pattern.endsWith( File.separator ) )
+ 
     {
+  113  18 
         Set<String> result = new HashSet<String>();
 114   - 
                 {
-  115  1 
                     pattern += "**";
+ 
 
+  115  18 
         if ( patterns != null )
 116   + 
         {
+  117  14 
             for ( String pattern : patterns )
+  118   + 
             {
+  119  6 
                 pattern = normalizePath( pattern );
+  120   + 
 
+  121  6 
                 if ( pattern.endsWith( File.separator ) )
+  122   + 
                 {
+  123  1 
                     pattern += "**";
+  124   
                 }
-  117   +  125   
 
-  118  6 
                 result.add( pattern );
-  119  6 
             }
-  120   +  126  6 
                 result.add( pattern );
+  127   + 
             }
+  128   
         }
-  121   +  129   
 
-  122  18 
         return result;
-  123   +  130  18 
         return result;
+  131   
     }
-  124   +  132   
 
-  125   +  133   
     public void finished()
-  126   +  134   
     {
-  127  0 
     }
-  128   +  135  0 
     }
+  136   
 }
-
Report generated by Cobertura 1.9.4.1 on 10/28/11 7:53 PM.
+
Report generated by Cobertura 1.9.4.1 on 15/03/12 09:17.
\ No newline at end of file Modified: websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.mojo.ArchiveFilter.html ============================================================================== --- websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.mojo.ArchiveFilter.html (original) +++ websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.mojo.ArchiveFilter.html Tue May 8 13:48:12 2012 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
ArchiveFilter
100%
4/4
N/A
N/A
1
ArchiveFilter
100 %
4/4
N/A
N/A
1
 
@@ -77,11 +77,11 @@  30   
 
 31   - 
     private Set includes;
+ 
     private Set<String> includes;
 32   
 
 33   - 
     private Set excludes;
+ 
     private Set<String> excludes;
 34   
 
 35   @@ -94,7 +94,7 @@  39   
 
 40   - 
     public Set getIncludes()
+ 
     public Set<String> getIncludes()
 41   
     {
 42  1 
         return includes;
@@ -103,7 +103,7 @@  44   
 
 45   - 
     public Set getExcludes()
+ 
     public Set<String> getExcludes()
 46   
     {
 47  1 
         return excludes;
@@ -113,6 +113,6 @@ 
 }
-
Report generated by Cobertura 1.9.4.1 on 10/28/11 7:53 PM.
+
Report generated by Cobertura 1.9.4.1 on 15/03/12 09:17.
\ No newline at end of file Modified: websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.mojo.ArtifactId.html ============================================================================== --- websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.mojo.ArtifactId.html (original) +++ websites/production/maventest/content/plugins/maven-shade-plugin-latest/cobertura/org.apache.maven.plugins.shade.mojo.ArtifactId.html Tue May 8 13:48:12 2012 @@ -12,7 +12,7 @@
 
- +
Classes in this File Line Coverage Branch Coverage Complexity
ArtifactId
91%
32/35
87%
28/32
3.1
ArtifactId
91 %
32/35
87 %
28/32
3,1
 
@@ -114,10 +114,10 @@  50   
     public ArtifactId( String groupId, String artifactId, String type, String classifier )
 51  51 
     {
-  52  51 
         this.groupId = ( groupId != null ) ? groupId : "";
-  53  51 
         this.artifactId = ( artifactId != null ) ? artifactId : "";
-  54  51 
         this.type = ( type != null ) ? type : "";
-  55  51 
         this.classifier = ( classifier != null ) ? classifier : "";
+  52  51 
         this.groupId = ( groupId != null ) ? groupId : "";
+  53  51 
         this.artifactId = ( artifactId != null ) ? artifactId : "";
+  54  51 
         this.type = ( type != null ) ? type : "";
+  55  51 
         this.classifier = ( classifier != null ) ? classifier : "";
 56  51 
     }
 57   
 
@@ -125,16 +125,16 @@ 
     public ArtifactId( String id )
 59  56 
     {
 60  56 
         String[] tokens = new String[0];
-  61  56 
         if ( id != null && id.length() > 0 )
+  61  56 
         if ( id != null && id.length() > 0 )
 62   
         {
 63  54 
             tokens = id.split( ":", -1 );
 64   
         }
-  65  56 
         groupId = ( tokens.length > 0 ) ? tokens[0] : "";
-  66  56 
         artifactId = ( tokens.length > 1 ) ? tokens[1] : "*";
-  67  56 
         type = ( tokens.length > 3 ) ? tokens[2] : "*";
-  68  56 
         classifier = ( tokens.length > 3 ) ? tokens[3] : ( ( tokens.length > 2 ) ? tokens[2] : "*" );
+  65  56 
         groupId = ( tokens.length > 0 ) ? tokens[0] : "";
+  66  56 
         artifactId = ( tokens.length > 1 ) ? tokens[1] : "*";
+  67  56 
         type = ( tokens.length > 3 ) ? tokens[2] : "*";
+  68  56 
         classifier = ( tokens.length > 3 ) ? tokens[3] : ( ( tokens.length > 2 ) ? tokens[2] : "*" );
 69  56 
     }
 70   
 
@@ -178,31 +178,31 @@ 
     public boolean matches( ArtifactId pattern )
 92   
     {
-  93  49 
         if ( pattern == null )
+  93  49 
         if ( pattern == null )
 94   
         {
 95  0 
             return false;
 96   
         }
-  97  49 
         if ( !match( getGroupId(), pattern.getGroupId() ) )
+  97  49 
         if ( !match( getGroupId(), pattern.getGroupId() ) )
 98   
         {
 99  9 
             return false;
 100   
         }
-  101  40 
         if ( !match( getArtifactId(), pattern.getArtifactId() ) )
+  101  40 
         if ( !match( getArtifactId(), pattern.getArtifactId() ) )
 102   
         {
 103  10 
             return false;
 104   
         }
-  105  30 
         if ( !match( getType(), pattern.getType() ) )
+  105  30 
         if ( !match( getType(), pattern.getType() ) )
 106   
         {
 107  1 
             return false;
 108   
         }
-  109  29 
         if ( !match( getClassifier(), pattern.getClassifier() ) )
+  109  29 
         if ( !match( getClassifier(), pattern.getClassifier() ) )
 110   
         {
 111  1 
             return false;
@@ -228,6 +228,6 @@ 
 }
-
Report generated by Cobertura 1.9.4.1 on 10/28/11 7:53 PM.
+
Report generated by Cobertura 1.9.4.1 on 15/03/12 09:17.
\ No newline at end of file