Browse Source

Fix warnings about boxing/unboxing Boolean

Change-Id: I9d81d510282e9181267750fe3f9c571c35b61407
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
c9e3921fbb
  1. 6
      org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java
  2. 4
      org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

6
org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java

@ -150,7 +150,8 @@ public class IgnoreNode {
return MatchResult.CHECK_PARENT; return MatchResult.CHECK_PARENT;
} }
return result ? MatchResult.IGNORED : MatchResult.NOT_IGNORED; return result.booleanValue() ? MatchResult.IGNORED
: MatchResult.NOT_IGNORED;
} }
/** /**
@ -178,7 +179,8 @@ public class IgnoreNode {
: MatchResult.CHECK_PARENT; : MatchResult.CHECK_PARENT;
} }
return result ? MatchResult.IGNORED : MatchResult.NOT_IGNORED; return result.booleanValue() ? MatchResult.IGNORED
: MatchResult.NOT_IGNORED;
} }
/** /**

4
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java

@ -1476,7 +1476,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
Boolean ignored = state.directoryToIgnored.get(pathAbs); Boolean ignored = state.directoryToIgnored.get(pathAbs);
if (ignored != null) { if (ignored != null) {
return ignored; return ignored.booleanValue();
} }
final String parentRel = getParentPath(pathRel); final String parentRel = getParentPath(pathRel);
@ -1491,7 +1491,7 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator {
ignored = node.checkIgnored(p, true); ignored = node.checkIgnored(p, true);
if (ignored != null) { if (ignored != null) {
state.directoryToIgnored.put(pathAbs, ignored); state.directoryToIgnored.put(pathAbs, ignored);
return ignored; return ignored.booleanValue();
} }
} }

Loading…
Cancel
Save