Never exclude directories listed in the class path, only sub-folders …

…if they cannot be Java packages.
jacoco · Mar 23, 2012 · 9997859 · 9997859
1 parent f7449d6
commit 9997859
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/...eclemma.core/src/com/mountainminds/eclemma/internal/core/analysis/ResourceTreeWalker.java b/...eclemma.core/src/com/mountainminds/eclemma/internal/core/analysis/ResourceTreeWalker.java
@@ -47,12 +47,12 @@ public void walk(IResource resource) throws CoreException, IOException {
         in.close();
       }
     } else {
-      walkResource(resource);
+      walkResource(resource, true);
     }
   }
 
-  private void walkResource(IResource resource) throws CoreException,
-      IOException {
+  private void walkResource(IResource resource, boolean root)
+      throws CoreException, IOException {
     switch (resource.getType()) {
     case IResource.FILE:
       if (resource.getName().endsWith(".class")) { //$NON-NLS-1$
@@ -67,11 +67,11 @@ private void walkResource(IResource resource) throws CoreException,
       break;
     case IResource.FOLDER:
     case IResource.PROJECT:
-      // Do not traverse into folders like ".svn"
-      if (isJavaIdentifier(resource.getName())) {
+      // Do not traverse into sub-folders like ".svn"
+      if (root || isJavaIdentifier(resource.getName())) {
         final IContainer container = (IContainer) resource;
         for (final IResource child : container.members()) {
-          walkResource(child);
+          walkResource(child, false);
         }
       }
       break;
@@ -88,11 +88,11 @@ public void walk(IPath path) throws IOException {
         in.close();
       }
     } else {
-      walkFile(file);
+      walkFile(file, true);
     }
   }
 
-  private void walkFile(File file) throws IOException {
+  private void walkFile(File file, boolean root) throws IOException {
     if (file.isFile()) {
       if (file.getName().endsWith(".class")) { //$NON-NLS-1$
         final InputStream in = open(file);
@@ -104,9 +104,9 @@ private void walkFile(File file) throws IOException {
       }
     } else {
       // Do not traverse into folders like ".svn"
-      if (isJavaIdentifier(file.getName())) {
+      if (root || isJavaIdentifier(file.getName())) {
         for (final File child : file.listFiles()) {
-          walkFile(child);
+          walkFile(child, false);
         }
       }
     }