From c9e3921fbbc47b641c0e9b69208ccbf5e9ed6559 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sun, 25 Feb 2018 17:35:00 +0900 Subject: [PATCH] Fix warnings about boxing/unboxing Boolean Change-Id: I9d81d510282e9181267750fe3f9c571c35b61407 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/ignore/IgnoreNode.java | 6 ++++-- .../src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java index 621978333..1224df422 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java @@ -150,7 +150,8 @@ public MatchResult isIgnored(String entryPath, boolean isDirectory) { return MatchResult.CHECK_PARENT; } - return result ? MatchResult.IGNORED : MatchResult.NOT_IGNORED; + return result.booleanValue() ? MatchResult.IGNORED + : MatchResult.NOT_IGNORED; } /** @@ -178,7 +179,8 @@ public MatchResult isIgnored(String entryPath, boolean isDirectory, : MatchResult.CHECK_PARENT; } - return result ? MatchResult.IGNORED : MatchResult.NOT_IGNORED; + return result.booleanValue() ? MatchResult.IGNORED + : MatchResult.NOT_IGNORED; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 37b7d0956..4ebf01feb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -1476,7 +1476,7 @@ private boolean isDirectoryIgnored(String pathRel, String pathAbs) Boolean ignored = state.directoryToIgnored.get(pathAbs); if (ignored != null) { - return ignored; + return ignored.booleanValue(); } final String parentRel = getParentPath(pathRel); @@ -1491,7 +1491,7 @@ private boolean isDirectoryIgnored(String pathRel, String pathAbs) ignored = node.checkIgnored(p, true); if (ignored != null) { state.directoryToIgnored.put(pathAbs, ignored); - return ignored; + return ignored.booleanValue(); } }