motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Add toString and improve Javadoc of NotIgnoredFilter"

This commit is contained in:
Chris Aniszczyk 2010-09-01 20:39:40 -04:00 committed by Code Review
parent 38327a54a8 028a613ced
commit 7a504b8d7c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/NotIgnoredFilter.java
View File

@ -50,32 +50,26 @@
import org.eclipse.jgit.treewalk.WorkingTreeIterator; import org.eclipse.jgit.treewalk.WorkingTreeIterator;
/** /**
* This filter includes workdir entries that are not ignored. This class is * Skip {@link WorkingTreeIterator} entries that appear in gitignore files.
* immutable.
*/ */
public class NotIgnoredFilter extends TreeFilter { public class NotIgnoredFilter extends TreeFilter {
private final int index;
private final int workdirTreeIndex;
/** /**
* constructor * Construct a filter to ignore paths known to a particular iterator.
* *
* @param workdirTreeIndex * @param workdirTreeIndex
* index of the workdir tree in the tree walk * index of the workdir tree in the tree walk
*/ */
public NotIgnoredFilter(final int workdirTreeIndex) { public NotIgnoredFilter(final int workdirTreeIndex) {
this.workdirTreeIndex = workdirTreeIndex; this.index = workdirTreeIndex;
} }
@Override @Override
public boolean include(TreeWalk walker) throws MissingObjectException, public boolean include(TreeWalk tw) throws MissingObjectException,
IncorrectObjectTypeException, IOException { IncorrectObjectTypeException, IOException {
WorkingTreeIterator workingTreeIterator = walker.getTree( WorkingTreeIterator i = tw.getTree(index, WorkingTreeIterator.class);
workdirTreeIndex, WorkingTreeIterator.class); return i == null || !i.isEntryIgnored();
if (workingTreeIterator != null)
// do not include ignored entries
return !workingTreeIterator.isEntryIgnored();
return true;
} }
@Override @Override
@ -89,4 +83,8 @@ public TreeFilter clone() {
return this; return this;
} }
@Override
public String toString() {
return "NotIgnored(" + index + ")";
}
} }