motiejus
/
jgit
1
Fork 0
Code Releases Activity

WorkingTreeIterator: Add NON-NLS suppressions 

Change-Id: I369b8f68912134fc3880c162e9a2c5a1669bb4ac
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-02-25 17:30:03 +09:00
parent 3e3554c9eb
commit 6ea21b454c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
View File

@ -1487,7 +1487,7 @@ private boolean isDirectoryIgnored(String pathRel, String pathAbs)
final IgnoreNode ignoreNode = getIgnoreNode();
for (String path = pathRel; ignoreNode != null
&& !"".equals(path); path = getParentPath(path)) {
&& !"".equals(path); path = getParentPath(path)) { //$NON-NLS-1$
ignored = ignoreNode.checkIgnored(path, true);
if (ignored != null) {
state.directoryToIgnored.put(pathAbs, ignored);
@ -1515,10 +1515,10 @@ private static String getParentPath(String path) {
if (slashIndex > 0) {
return path.substring(path.charAt(0) == '/' ? 1 : 0, slashIndex);
}
return path.length() > 0 ? "" : null;
return path.length() > 0 ? "" : null; //$NON-NLS-1$
}
private static String concatPath(String p1, String p2) {
return p1 + (p1.length() > 0 && p2.length() > 0 ? "/" : "") + p2;
return p1 + (p1.length() > 0 && p2.length() > 0 ? "/" : "") + p2; //$NON-NLS-1$ //$NON-NLS-2$
}
}