Author: rob.stryker(a)jboss.com
Date: 2007-07-27 15:04:55 -0400 (Fri, 27 Jul 2007)
New Revision: 2706
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
Log:
extended scanner factory did not check whether filename was excluded.
method name changed to not override superclass.
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2007-07-27
19:04:09 UTC (rev 2705)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2007-07-27
19:04:55 UTC (rev 2706)
@@ -55,10 +55,12 @@
/**
* Exposes the isIncluded method so that entire scans do not need to occur
* to find matches.
+ *
+ * Overwrites
*/
public static class DirectoryScannerExtension extends DirectoryScanner {
- public boolean isIncluded(String name) {
- return super.isIncluded(name);
+ public boolean isUltimatelyIncluded(String name) {
+ return super.isIncluded(name) && !super.isExcluded(name);
}
}
}
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java
===================================================================
---
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-07-27
19:04:09 UTC (rev 2705)
+++
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2007-07-27
19:04:55 UTC (rev 2706)
@@ -126,7 +126,7 @@
private boolean matchesPath(DirectoryScannerExtension scanner, IPath path) {
if( getGlobalSourcePath().isPrefixOf(path)) {
String s =
path.toOSString().substring(getGlobalSourcePath().toOSString().length()+1);
- return scanner.isIncluded(s);
+ return scanner.isUltimatelyIncluded(s);
}
return false;
}