From 98cdca9b5a830f1c2ceca52379d662a68109d43e Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 17 Oct 2019 09:01:25 +0900 Subject: [PATCH] Enable and fix "Statement unnecessarily nested within else clause" warnings Since [1] the gerrit project includes jgit as a submodule, and has this warning enabled, resulting in 100s of warnings in the console. Also enable the warning here, and fix them. At the same time, add missing braces around adjacent and nearby one-line blocks. [1] https://gerrit-review.googlesource.com/c/gerrit/+/227897 Change-Id: I81df3fc7ed6eedf6874ce1a3bedfa727a1897e4c Signed-off-by: David Pursehouse --- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../http/server/glue/ServletBinderImpl.java | 6 +- .../resolver/DefaultUploadPackFactory.java | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../http/test/SmartClientSmartServerTest.java | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../eclipse/jgit/junit/http/AppServer.java | 6 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../eclipse/jgit/junit/TestRepository.java | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../jgit/lfs/server/fs/FileLfsRepository.java | 3 +- .../eclipse/jgit/lfs/server/s3/SignerV4.java | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../src/org/eclipse/jgit/lfs/BuiltinLFS.java | 6 +- .../src/org/eclipse/jgit/lfs/CleanFilter.java | 48 ++++---- .../lfs/internal/LfsConnectionFactory.java | 6 +- .../eclipse/jgit/lfs/lib/AnyLongObjectId.java | 6 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../console/ConsoleCredentialsProvider.java | 37 +++--- .../src/org/eclipse/jgit/pgm/Status.java | 4 +- .../jgit/pgm/debug/RebuildCommitGraph.java | 3 +- .../jgit/pgm/debug/TextHashFunctions.java | 3 +- .../eclipse/jgit/pgm/opt/CmdLineParser.java | 6 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../transport/sshd/JGitClientSession.java | 6 +- .../sshd/OpenSshServerKeyDatabase.java | 3 +- .../transport/sshd/proxy/HttpParser.java | 14 +-- .../sshd/proxy/Socks5ClientConnector.java | 7 +- .../jgit/transport/sshd/SshdSession.java | 3 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../storage/file/PackFileSnapshotTest.java | 3 +- .../jgit/lib/ObjectIdSerializerTest.java | 3 +- .../lib/RefDatabaseConflictingNamesTest.java | 3 +- .../eclipse/jgit/transport/HttpAuthTest.java | 15 ++- .../jgit/transport/WalkEncryptionTest.java | 24 ++-- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../org/eclipse/jgit/api/BlameCommand.java | 9 +- .../src/org/eclipse/jgit/api/DiffCommand.java | 30 ++--- .../org/eclipse/jgit/api/FetchCommand.java | 18 +-- .../jgit/api/GarbageCollectCommand.java | 3 +- .../org/eclipse/jgit/api/MergeCommand.java | 37 +++--- .../src/org/eclipse/jgit/api/PullCommand.java | 9 +- .../org/eclipse/jgit/api/RebaseCommand.java | 18 +-- .../org/eclipse/jgit/api/ResetCommand.java | 6 +- .../jgit/api/SubmoduleSyncCommand.java | 6 +- .../org/eclipse/jgit/blame/BlameResult.java | 10 +- .../org/eclipse/jgit/diff/DiffFormatter.java | 4 +- .../src/org/eclipse/jgit/diff/Edit.java | 16 +-- .../src/org/eclipse/jgit/diff/RawText.java | 12 +- .../jgit/dircache/DirCacheCheckout.java | 46 ++++---- .../eclipse/jgit/dircache/DirCacheEntry.java | 6 +- .../eclipse/jgit/fnmatch/AbstractHead.java | 6 +- .../eclipse/jgit/fnmatch/FileNameMatcher.java | 6 +- .../eclipse/jgit/gitrepo/ManifestParser.java | 7 +- .../org/eclipse/jgit/gitrepo/RepoCommand.java | 21 ++-- .../org/eclipse/jgit/gitrepo/RepoProject.java | 6 +- .../jgit/ignore/internal/PathMatcher.java | 37 +++--- .../eclipse/jgit/ignore/internal/Strings.java | 28 +++-- .../eclipse/jgit/internal/ketch/LagCheck.java | 3 +- .../internal/storage/dfs/DfsRefDatabase.java | 11 +- .../internal/storage/file/FileRepository.java | 3 +- .../jgit/internal/storage/file/GcLog.java | 7 +- .../storage/file/ObjectDirectoryInserter.java | 14 +-- .../jgit/internal/storage/file/PackFile.java | 11 +- .../internal/storage/file/RefDirectory.java | 14 +-- .../storage/file/RefDirectoryUpdate.java | 3 +- .../storage/file/ReflogEntryImpl.java | 6 +- .../internal/storage/file/UnpackedObject.java | 106 +++++++++--------- .../storage/file/UnpackedObjectCache.java | 12 +- .../internal/storage/pack/PackWriter.java | 18 +-- .../storage/reftable/ReftableDatabase.java | 20 ++-- .../storage/reftree/RefTreeBatch.java | 3 +- .../http/NetscapeCookieFileCache.java | 3 +- .../transport/ssh/OpenSshConfigFile.java | 8 +- .../src/org/eclipse/jgit/lib/AnyObjectId.java | 6 +- .../jgit/lib/BaseRepositoryBuilder.java | 19 ++-- .../org/eclipse/jgit/lib/BranchConfig.java | 6 +- .../src/org/eclipse/jgit/lib/Config.java | 11 +- .../jgit/lib/DefaultTypedConfigGetter.java | 6 +- .../src/org/eclipse/jgit/lib/IndexDiff.java | 9 +- .../org/eclipse/jgit/lib/ObjectReader.java | 6 +- .../src/org/eclipse/jgit/lib/Repository.java | 28 ++--- .../org/eclipse/jgit/merge/MergeConfig.java | 12 +- .../jgit/merge/MergeMessageFormatter.java | 9 +- .../org/eclipse/jgit/merge/ResolveMerger.java | 92 ++++++++------- .../eclipse/jgit/merge/ThreeWayMerger.java | 8 +- .../org/eclipse/jgit/notes/FanoutBucket.java | 39 +++---- .../org/eclipse/jgit/notes/LeafBucket.java | 38 +++---- .../src/org/eclipse/jgit/notes/NoteMap.java | 6 +- .../org/eclipse/jgit/notes/NoteMapMerger.java | 6 +- .../org/eclipse/jgit/notes/NoteParser.java | 3 +- .../eclipse/jgit/revplot/PlotCommitList.java | 7 +- .../org/eclipse/jgit/revplot/PlotWalk.java | 7 +- .../eclipse/jgit/revwalk/TreeRevFilter.java | 24 ++-- .../jgit/transport/BaseReceivePack.java | 12 +- .../CredentialsProviderUserInfo.java | 10 +- .../transport/HMACSHA1NonceGenerator.java | 3 +- .../eclipse/jgit/transport/RemoteConfig.java | 16 ++- .../org/eclipse/jgit/transport/Transport.java | 13 ++- .../eclipse/jgit/transport/TransportHttp.java | 13 +-- .../org/eclipse/jgit/transport/URIish.java | 5 +- .../jgit/transport/resolver/FileResolver.java | 4 +- .../jgit/treewalk/FileTreeIterator.java | 6 +- .../jgit/treewalk/WorkingTreeIterator.java | 27 +++-- .../jgit/treewalk/filter/IndexDiffFilter.java | 5 +- .../treewalk/filter/PathSuffixFilter.java | 6 +- .../org/eclipse/jgit/util/ChangeIdUtil.java | 23 ++-- .../src/org/eclipse/jgit/util/FS.java | 25 ++--- .../src/org/eclipse/jgit/util/IO.java | 33 +++--- .../src/org/eclipse/jgit/util/RefMap.java | 9 +- .../src/org/eclipse/jgit/util/SshSupport.java | 3 +- .../jgit/util/io/LimitedInputStream.java | 18 +-- 122 files changed, 672 insertions(+), 751 deletions(-) diff --git a/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ant.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs index 94a1c4f10..4335e66bf 100644 --- a/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ant/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs index ef6f5e732..bc7ba1e50 100644 --- a/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.archive/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs index 94a1c4f10..4335e66bf 100644 --- a/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.http.apache/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs index 94a1c4f10..4335e66bf 100644 --- a/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.http.server/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java index f16749775..574e94a89 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java @@ -86,10 +86,10 @@ public void with(HttpServlet servlet) { * @return the configured servlet, or singleton returning 404 if none. */ protected HttpServlet getServlet() { - if (httpServlet != null) + if (httpServlet != null) { return httpServlet; - else - return new ErrorServlet(HttpServletResponse.SC_NOT_FOUND); + } + return new ErrorServlet(HttpServletResponse.SC_NOT_FOUND); } /** diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java index a69fab0af..b9e688255 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/resolver/DefaultUploadPackFactory.java @@ -83,8 +83,7 @@ public UploadPack create(HttpServletRequest req, Repository db) up.setExtraParameters(Arrays.asList(params)); } return up; - } else { - throw new ServiceNotEnabledException(); } + throw new ServiceNotEnabledException(); } } diff --git a/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.http.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 3401e264c..99aa06b17 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -331,9 +331,8 @@ private String local(String url, boolean toLocal) { String fragment = u.getRawFragment(); if (fragment != null) { return u.getRawPath() + '#' + fragment; - } else { - return u.getRawPath(); } + return u.getRawPath(); } catch (URISyntaxException e) { return url; } diff --git a/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit.http/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java index 9aef086b7..14f54bef9 100644 --- a/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java +++ b/org.eclipse.jgit.junit.http/src/org/eclipse/jgit/junit/http/AppServer.java @@ -308,10 +308,10 @@ protected void doStart() throws Exception { @Override protected String[] loadRoleInfo(UserPrincipal user) { - if (users.get(user.getName()) == null) + if (users.get(user.getName()) == null) { return null; - else - return new String[] { role }; + } + return new String[] { role }; } @Override diff --git a/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit.ssh/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs index b6750293d..530f8f607 100644 --- a/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.junit/.settings/org.eclipse.jdt.core.prefs @@ -103,7 +103,7 @@ org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 362007a98..240c4429e 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -782,9 +782,8 @@ public RevCommit cherryPick(AnyObjectId id) throws Exception { } update(Constants.HEAD, result); return pool.parseCommit(result); - } else { - throw new IOException("Merge conflict"); } + throw new IOException("Merge conflict"); } /** diff --git a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.server.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs index 525ac6714..9fd92b109 100644 --- a/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.server/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java index 0a7c37ca5..ad9ef7803 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsRepository.java @@ -110,9 +110,8 @@ public long getSize(AnyLongObjectId id) throws IOException { Path p = getPath(id); if (Files.exists(p)) { return Files.size(p); - } else { - return -1; } + return -1; } /** diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java index 7b76cecf0..4bcca4a9a 100644 --- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java +++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/SignerV4.java @@ -352,9 +352,8 @@ private static String canonicalizeResourcePath(URL endpoint) { String encodedPath = urlEncode(path, true); if (encodedPath.startsWith("/")) { //$NON-NLS-1$ return encodedPath; - } else { - return "/" + encodedPath; //$NON-NLS-1$ } + return "/" + encodedPath; //$NON-NLS-1$ } private static byte[] hash(String s) { diff --git a/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs index 525ac6714..9fd92b109 100644 --- a/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.lfs/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java index 56e3a12dd..3c5826362 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/BuiltinLFS.java @@ -83,9 +83,8 @@ public ObjectLoader applySmudgeFilter(Repository db, ObjectLoader loader, Attribute attribute) throws IOException { if (isEnabled(db) && (attribute == null || isEnabled(db, attribute))) { return LfsBlobFilter.smudgeLfsBlob(db, loader); - } else { - return loader; } + return loader; } @Override @@ -93,9 +92,8 @@ public LfsInputStream applyCleanFilter(Repository db, InputStream input, long length, Attribute attribute) throws IOException { if (isEnabled(db, attribute)) { return new LfsInputStream(LfsBlobFilter.cleanLfsBlob(db, input)); - } else { - return new LfsInputStream(input, length); } + return new LfsInputStream(input, length); } @Override diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java index 80da802db..2329ade29 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/CleanFilter.java @@ -138,32 +138,30 @@ public int run() throws IOException { aOut.write(buf, 0, length); size += length; return length; - } else { - aOut.close(); - AnyLongObjectId loid = aOut.getId(); - aOut = null; - Path mediaFile = lfsUtil.getMediaFile(loid); - if (Files.isRegularFile(mediaFile)) { - long fsSize = Files.size(mediaFile); - if (fsSize != size) { - throw new CorruptMediaFile(mediaFile, size, fsSize); - } else { - FileUtils.delete(tmpFile.toFile()); - } - } else { - Path parent = mediaFile.getParent(); - if (parent != null) { - FileUtils.mkdirs(parent.toFile(), true); - } - FileUtils.rename(tmpFile.toFile(), mediaFile.toFile(), - StandardCopyOption.ATOMIC_MOVE); - } - LfsPointer lfsPointer = new LfsPointer(loid, size); - lfsPointer.encode(out); - in.close(); - out.close(); - return -1; } + aOut.close(); + AnyLongObjectId loid = aOut.getId(); + aOut = null; + Path mediaFile = lfsUtil.getMediaFile(loid); + if (Files.isRegularFile(mediaFile)) { + long fsSize = Files.size(mediaFile); + if (fsSize != size) { + throw new CorruptMediaFile(mediaFile, size, fsSize); + } + FileUtils.delete(tmpFile.toFile()); + } else { + Path parent = mediaFile.getParent(); + if (parent != null) { + FileUtils.mkdirs(parent.toFile(), true); + } + FileUtils.rename(tmpFile.toFile(), mediaFile.toFile(), + StandardCopyOption.ATOMIC_MOVE); + } + LfsPointer lfsPointer = new LfsPointer(loid, size); + lfsPointer.encode(out); + in.close(); + out.close(); + return -1; } catch (IOException e) { if (aOut != null) { aOut.abort(); diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java index feb8b4ae5..184658d4d 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java @@ -179,9 +179,8 @@ private static String discoverLfsUrl(Repository db, String purpose, remoteUrl, u); additionalHeaders.putAll(action.header); return action.href; - } else { - return remoteUrl + Protocol.INFO_LFS_ENDPOINT; } + return remoteUrl + Protocol.INFO_LFS_ENDPOINT; } private static Protocol.ExpiringAction getSshAuthentication( @@ -262,9 +261,8 @@ private static String extractProjectName(URIish u) { if (path.endsWith(org.eclipse.jgit.lib.Constants.DOT_GIT)) { return path.substring(0, path.length() - 4); - } else { - return path; } + return path; } /** diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java index b095d20e6..a9bd27f5c 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java @@ -303,10 +303,10 @@ public final boolean equals(AnyLongObjectId other) { /** {@inheritDoc} */ @Override public final boolean equals(Object o) { - if (o instanceof AnyLongObjectId) + if (o instanceof AnyLongObjectId) { return equals((AnyLongObjectId) o); - else - return false; + } + return false; } /** diff --git a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs index ef6f5e732..bc7ba1e50 100644 --- a/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.pgm/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java index f8442facb..039d0946b 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/console/ConsoleCredentialsProvider.java @@ -136,18 +136,15 @@ private boolean get(CredentialItem.StringType item) { if (v != null) { item.setValue(new String(v)); return true; - } else { - return false; - } - } else { - String v = cons.readLine("%s: ", item.getPromptText()); //$NON-NLS-1$ - if (v != null) { - item.setValue(v); - return true; - } else { - return false; } + return false; } + String v = cons.readLine("%s: ", item.getPromptText()); //$NON-NLS-1$ + if (v != null) { + item.setValue(v); + return true; + } + return false; } private boolean get(CredentialItem.CharArrayType item) { @@ -156,18 +153,15 @@ private boolean get(CredentialItem.CharArrayType item) { if (v != null) { item.setValueNoCopy(v); return true; - } else { - return false; - } - } else { - String v = cons.readLine("%s: ", item.getPromptText()); //$NON-NLS-1$ - if (v != null) { - item.setValueNoCopy(v.toCharArray()); - return true; - } else { - return false; } + return false; } + String v = cons.readLine("%s: ", item.getPromptText()); //$NON-NLS-1$ + if (v != null) { + item.setValueNoCopy(v.toCharArray()); + return true; + } + return false; } private boolean get(CredentialItem.InformationalMessage item) { @@ -182,8 +176,7 @@ private boolean get(CredentialItem.YesNoType item) { if (r != null) { item.setValue(CLIText.get().answerYes.equalsIgnoreCase(r)); return true; - } else { - return false; } + return false; } } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java index c3887fe9c..23ee9337b 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java @@ -306,8 +306,8 @@ protected int printList(Collection list) throws IOException { } outw.flush(); return list.size(); - } else - return 0; + } + return 0; } /** diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java index 8948c2753..0d30f3661 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java @@ -189,9 +189,8 @@ private void recreateCommitGraph() throws IOException { // rewritten. queue.add(t); continue REWRITE; - } else { - newParents[k] = p.newId; } + newParents[k] = p.newId; } else { // We have the old parent object. Use it. // diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java index a2ea8c20b..1242bb754 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java @@ -138,9 +138,8 @@ protected int hashRegion(byte[] raw, int ptr, int end) { Arrays.fill(buf16, (byte) 0); System.arraycopy(raw, ptr, buf16, 0, end - ptr); return rabin(buf16, 0); - } else { - return rabin(raw, ptr); } + return rabin(raw, ptr); } private int rabin(byte[] raw, int ptr) { diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java index b97aa5b7a..d3aa38cf2 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java @@ -299,10 +299,10 @@ public boolean required() { /** {@inheritDoc} */ @Override protected OptionHandler createOptionHandler(OptionDef o, Setter setter) { - if (o instanceof NamedOptionDef) + if (o instanceof NamedOptionDef) { return super.createOptionHandler(o, setter); - else - return super.createOptionHandler(new MyOptionDef(o), setter); + } + return super.createOptionHandler(new MyOptionDef(o), setter); } diff --git a/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs index 794592dee..822846c4d 100644 --- a/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ssh.apache.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs index 13c32a6d9..15ef2aad5 100644 --- a/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ssh.apache/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java index 1954abc75..79bd3faa0 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitClientSession.java @@ -179,9 +179,8 @@ protected IoWriteFuture sendIdentification(String ident) } catch (Exception other) { throw new IOException(other.getLocalizedMessage(), other); } - } else { - return super.sendIdentification(ident); } + return super.sendIdentification(ident); } @Override @@ -205,9 +204,8 @@ protected byte[] sendKexInit() } catch (Exception other) { throw new IOException(other.getLocalizedMessage(), other); } - } else { - return super.sendKexInit(); } + return super.sendKexInit(); } /** diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java index f4849ce4a..9c0a79312 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java @@ -453,9 +453,8 @@ private static boolean askUser(CredentialsProvider provider, URIish uri, prompt); items.add(answer); return provider.get(uri, items) && answer.getValue(); - } else { - return provider.get(uri, items); } + return provider.get(uri, items); } private Check checkMode(SocketAddress remoteAddress, boolean changed) { diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/HttpParser.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/HttpParser.java index b9b32b130..02771b501 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/HttpParser.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/HttpParser.java @@ -207,11 +207,10 @@ private static int parseChallenge(AuthenticationChallenge challenge, next++; } return next; - } else { - // This token must be the name of the next authentication - // scheme. - return start; } + // This token must be the name of the next authentication + // scheme. + return start; } int nextStart = skipWhiteSpace(header, next + 1); if (nextStart >= length) { @@ -244,11 +243,10 @@ private static int parseChallenge(AuthenticationChallenge challenge, // token, and the equals sign is part of the token challenge.setToken(header.substring(start, end + 1)); return nextStart + 1; - } else { - // Key without value... - challenge.addArgument(header.substring(start, end), null); - start = nextStart + 1; } + // Key without value... + challenge.addArgument(header.substring(start, end), null); + start = nextStart + 1; } else { if (header.charAt(nextStart) == '"') { int nextEnd[] = { nextStart + 1 }; diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/Socks5ClientConnector.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/Socks5ClientConnector.java index 27d6f418b..b3681d14a 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/Socks5ClientConnector.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/proxy/Socks5ClientConnector.java @@ -281,11 +281,10 @@ private byte[] getAuthenticationProposals() { } if (i == proposals.length) { return proposals; - } else { - byte[] result = new byte[i]; - System.arraycopy(proposals, 0, result, 0, i); - return result; } + byte[] result = new byte[i]; + System.arraycopy(proposals, 0, result, 0, i); + return result; } private void sendConnectInfo(IoSession session) throws Exception { diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java index 1e8d7d1e1..3fc955ab2 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSession.java @@ -354,9 +354,8 @@ private String absolute(String path) { if (path.charAt(0) != '/') { if (cwd.charAt(cwd.length() - 1) == '/') { return cwd + path; - } else { - return cwd + '/' + path; } + return cwd + '/' + path; } return path; } diff --git a/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs index 2ca78ff2d..3dd584039 100644 --- a/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.test/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java index d5bc61a69..9016a02b0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackFileSnapshotTest.java @@ -295,9 +295,8 @@ private Path copyFile(Path src, Path dst) throws IOException { Files.copy(src, dstOut); return dst; } - } else { - return Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING); } + return Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING); } private Path copyPack(Path base, String srcSuffix, String dstSuffix) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdSerializerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdSerializerTest.java index d98b792d7..f0733f478 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdSerializerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdSerializerTest.java @@ -88,9 +88,8 @@ private ObjectId writeAndReadBackFromTempFile(ObjectId objectId) try (InputStream in = new FileInputStream(file)) { if (objectId == null) { return ObjectIdSerializer.read(in); - } else { - return ObjectIdSerializer.readWithoutMarker(in); } + return ObjectIdSerializer.readWithoutMarker(in); } } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java index cbb47fa82..3f77ca25a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java @@ -67,9 +67,8 @@ public Map getRefs(String prefix) throws IOException { existing.put("refs/heads/a/b", null /* not used */); existing.put("refs/heads/q", null /* not used */); return existing; - } else { - return Collections.emptyMap(); } + return Collections.emptyMap(); } @Override diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/HttpAuthTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/HttpAuthTest.java index ea15ebe7d..947ca9761 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/HttpAuthTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/HttpAuthTest.java @@ -133,16 +133,15 @@ public void connect() throws IOException { @Override public String getHeaderField(String name) { - if (!headerFields.containsKey(name)) + if (!headerFields.containsKey(name)) { return null; - else { - int n = headerFields.get(name).size(); - - if (n > 0) - return headerFields.get(name).get(n - 1); - else - return null; } + int n = headerFields.get(name).size(); + + if (n > 0) { + return headerFields.get(name).get(n - 1); + } + return null; } @Override diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java index 4750d15b3..d1d7a1d81 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/WalkEncryptionTest.java @@ -239,9 +239,8 @@ && haveEnvVar(ENV_BUCKET_NAME)) { loadEnvVar(ENV_SECRET_KEY, SECRET_KEY, props); loadEnvVar(ENV_BUCKET_NAME, TEST_BUCKET, props); return props; - } else { - return null; } + return null; } static Properties fromEnvFile() throws Exception { @@ -250,12 +249,10 @@ static Properties fromEnvFile() throws Exception { props.load(new FileInputStream(ENV_CONFIG_FILE)); if (checkTestProps(props)) { return props; - } else { - throw new Error("Environment config file is incomplete."); } - } else { - return null; + throw new Error("Environment config file is incomplete."); } + return null; } static Properties fromSysProps() { @@ -266,9 +263,8 @@ && haveSysProp(SYS_BUCKET_NAME)) { loadSysProp(SYS_SECRET_KEY, SECRET_KEY, props); loadSysProp(SYS_BUCKET_NAME, TEST_BUCKET, props); return props; - } else { - return null; } + return null; } static Properties fromSysFile() throws Exception { @@ -277,12 +273,10 @@ static Properties fromSysFile() throws Exception { props.load(new FileInputStream(SYS_CONFIG_FILE)); if (checkTestProps(props)) { return props; - } else { - throw new Error("System props config file is incomplete."); } - } else { - return null; + throw new Error("System props config file is incomplete."); } + return null; } static Properties fromConfigFile(String path) throws Exception { @@ -292,12 +286,10 @@ static Properties fromConfigFile(String path) throws Exception { props.load(new FileInputStream(file)); if (checkTestProps(props)) { return props; - } else { - throw new Error("Props config file is incomplete: " + path); } - } else { - return null; + throw new Error("Props config file is incomplete: " + path); } + return null; } /** diff --git a/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs index 525ac6714..9fd92b109 100644 --- a/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.ui/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs index ef6f5e732..bc7ba1e50 100644 --- a/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs @@ -92,7 +92,7 @@ org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/BlameCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/BlameCommand.java index f7576e9e9..0c765b01c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/BlameCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/BlameCommand.java @@ -275,13 +275,12 @@ private static byte[] toByteArray(InputStream source, int upperSizeLimit) byte[] buffer = new byte[upperSizeLimit]; try { int read = IO.readFully(source, buffer, 0); - if (read == upperSizeLimit) + if (read == upperSizeLimit) { return buffer; - else { - byte[] copy = new byte[read]; - System.arraycopy(buffer, 0, copy, 0, read); - return copy; } + byte[] copy = new byte[read]; + System.arraycopy(buffer, 0, copy, 0, read); + return copy; } finally { source.close(); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java index f65b5735d..1c3c79041 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DiffCommand.java @@ -136,28 +136,32 @@ public List call() throws GitAPIException { } newTree = new DirCacheIterator(repo.readDirCache()); } else { - if (oldTree == null) + if (oldTree == null) { oldTree = new DirCacheIterator(repo.readDirCache()); - if (newTree == null) + } + if (newTree == null) { newTree = new FileTreeIterator(repo); + } } diffFmt.setPathFilter(pathFilter); List result = diffFmt.scan(oldTree, newTree); - if (showNameAndStatusOnly) - return result; - else { - if (contextLines >= 0) - diffFmt.setContext(contextLines); - if (destinationPrefix != null) - diffFmt.setNewPrefix(destinationPrefix); - if (sourcePrefix != null) - diffFmt.setOldPrefix(sourcePrefix); - diffFmt.format(result); - diffFmt.flush(); + if (showNameAndStatusOnly) { return result; } + if (contextLines >= 0) { + diffFmt.setContext(contextLines); + } + if (destinationPrefix != null) { + diffFmt.setNewPrefix(destinationPrefix); + } + if (sourcePrefix != null) { + diffFmt.setOldPrefix(sourcePrefix); + } + diffFmt.format(result); + diffFmt.flush(); + return result; } catch (IOException e) { throw new JGitInternalException(e.getMessage(), e); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java index 2c9c5f20c..9020c58d4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java @@ -360,17 +360,17 @@ public FetchCommand setCheckFetchedObjects(boolean checkFetchedObjects) { * @return whether to remove refs which no longer exist in the source */ public boolean isRemoveDeletedRefs() { - if (removeDeletedRefs != null) + if (removeDeletedRefs != null) { return removeDeletedRefs.booleanValue(); - else { // fall back to configuration - boolean result = false; - StoredConfig config = repo.getConfig(); - result = config.getBoolean(ConfigConstants.CONFIG_FETCH_SECTION, - null, ConfigConstants.CONFIG_KEY_PRUNE, result); - result = config.getBoolean(ConfigConstants.CONFIG_REMOTE_SECTION, - remote, ConfigConstants.CONFIG_KEY_PRUNE, result); - return result; } + // fall back to configuration + boolean result = false; + StoredConfig config = repo.getConfig(); + result = config.getBoolean(ConfigConstants.CONFIG_FETCH_SECTION, null, + ConfigConstants.CONFIG_KEY_PRUNE, result); + result = config.getBoolean(ConfigConstants.CONFIG_REMOTE_SECTION, + remote, ConfigConstants.CONFIG_KEY_PRUNE, result); + return result; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java index 7ea277157..474e2f573 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java @@ -243,9 +243,8 @@ public Properties getStatistics() throws GitAPIException { if (repo instanceof FileRepository) { GC gc = new GC((FileRepository) repo); return toProperties(gc.getStatistics()); - } else { - return new Properties(); } + return new Properties(); } catch (IOException e) { throw new JGitInternalException( JGitText.get().couldNotGetRepoStatistics, e); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java index f9a9baf91..9a843f63a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java @@ -409,27 +409,24 @@ public MergeResult call() throws GitAPIException, NoHeadException, new ObjectId[] { headCommit.getId(), srcCommit.getId() }, mergeStatus, mergeStrategy, null, msg); - } else { - if (failingPaths != null) { - repo.writeMergeCommitMsg(null); - repo.writeMergeHeads(null); - return new MergeResult(null, merger.getBaseCommitId(), - new ObjectId[] { - headCommit.getId(), srcCommit.getId() }, - MergeStatus.FAILED, mergeStrategy, - lowLevelResults, failingPaths, null); - } else { - String mergeMessageWithConflicts = new MergeMessageFormatter() - .formatWithConflicts(mergeMessage, - unmergedPaths); - repo.writeMergeCommitMsg(mergeMessageWithConflicts); - return new MergeResult(null, merger.getBaseCommitId(), - new ObjectId[] { headCommit.getId(), - srcCommit.getId() }, - MergeStatus.CONFLICTING, mergeStrategy, - lowLevelResults, null); - } } + if (failingPaths != null) { + repo.writeMergeCommitMsg(null); + repo.writeMergeHeads(null); + return new MergeResult(null, merger.getBaseCommitId(), + new ObjectId[] { headCommit.getId(), + srcCommit.getId() }, + MergeStatus.FAILED, mergeStrategy, lowLevelResults, + failingPaths, null); + } + String mergeMessageWithConflicts = new MergeMessageFormatter() + .formatWithConflicts(mergeMessage, unmergedPaths); + repo.writeMergeCommitMsg(mergeMessageWithConflicts); + return new MergeResult(null, merger.getBaseCommitId(), + new ObjectId[] { headCommit.getId(), + srcCommit.getId() }, + MergeStatus.CONFLICTING, mergeStrategy, lowLevelResults, + null); } } catch (org.eclipse.jgit.errors.CheckoutConflictException e) { List conflicts = (dco == null) ? Collections diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java index bdb2d1bbc..834b68d6d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java @@ -315,23 +315,24 @@ public PullResult call() throws GitAPIException, Ref r = null; if (fetchRes != null) { r = fetchRes.getAdvertisedRef(remoteBranchName); - if (r == null) + if (r == null) { r = fetchRes.getAdvertisedRef(Constants.R_HEADS + remoteBranchName); + } } if (r == null) { throw new RefNotAdvertisedException(MessageFormat.format( JGitText.get().couldNotGetAdvertisedRef, remote, remoteBranchName)); - } else { - commitToMerge = r.getObjectId(); } + commitToMerge = r.getObjectId(); } else { try { commitToMerge = repo.resolve(remoteBranchName); - if (commitToMerge == null) + if (commitToMerge == null) { throw new RefNotFoundException(MessageFormat.format( JGitText.get().refNotResolved, remoteBranchName)); + } } catch (IOException e) { throw new JGitInternalException( JGitText.get().exceptionCaughtDuringExecutionOfPullCommand, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 0dacd4dfb..715d9768d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -509,10 +509,10 @@ private RebaseResult cherryPickCommit(RevCommit commitToPick) monitor.beginTask(MessageFormat.format( JGitText.get().applyingCommit, commitToPick.getShortMessage()), ProgressMonitor.UNKNOWN); - if (preserveMerges) + if (preserveMerges) { return cherryPickCommitPreservingMerges(commitToPick); - else - return cherryPickCommitFlattening(commitToPick); + } + return cherryPickCommitFlattening(commitToPick); } finally { monitor.endTask(); } @@ -539,11 +539,11 @@ private RebaseResult cherryPickCommitFlattening(RevCommit commitToPick) .call(); switch (cherryPickResult.getStatus()) { case FAILED: - if (operation == Operation.BEGIN) + if (operation == Operation.BEGIN) { return abort(RebaseResult .failed(cherryPickResult.getFailingPaths())); - else - return stop(commitToPick, Status.STOPPED); + } + return stop(commitToPick, Status.STOPPED); case CONFLICTING: return stop(commitToPick, Status.STOPPED); case OK: @@ -599,11 +599,11 @@ private RebaseResult cherryPickCommitPreservingMerges(RevCommit commitToPick) CherryPickResult cherryPickResult = pickCommand.call(); switch (cherryPickResult.getStatus()) { case FAILED: - if (operation == Operation.BEGIN) + if (operation == Operation.BEGIN) { return abort(RebaseResult.failed( cherryPickResult.getFailingPaths())); - else - return stop(commitToPick, Status.STOPPED); + } + return stop(commitToPick, Status.STOPPED); case CONFLICTING: return stop(commitToPick, Status.STOPPED); case OK: diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java index d7c9ad5e0..3031a197a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java @@ -334,10 +334,10 @@ public boolean isReflogDisabled() { } private String getRefOrHEAD() { - if (ref != null) + if (ref != null) { return ref; - else - return Constants.HEAD; + } + return Constants.HEAD; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleSyncCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleSyncCommand.java index 52393695d..74def9e89 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleSyncCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleSyncCommand.java @@ -106,10 +106,10 @@ public SubmoduleSyncCommand addPath(String path) { */ protected String getHeadBranch(Repository subRepo) throws IOException { Ref head = subRepo.exactRef(Constants.HEAD); - if (head != null && head.isSymbolic()) + if (head != null && head.isSymbolic()) { return Repository.shortenRefName(head.getLeaf().getName()); - else - return null; + } + return null; } /** {@inheritDoc} */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java index 5fb77501f..394aba6a5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java @@ -267,18 +267,18 @@ public void computeAll() throws IOException { */ public int computeNext() throws IOException { BlameGenerator gen = generator; - if (gen == null) + if (gen == null) { return -1; + } if (gen.next()) { loadFrom(gen); lastLength = gen.getRegionLength(); return gen.getResultStart(); - } else { - gen.close(); - generator = null; - return -1; } + gen.close(); + generator = null; + return -1; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index 1cecff6fb..fa552aabe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -489,8 +489,8 @@ private AbstractTreeIterator makeIteratorFromTreeOrNull(RevTree tree) CanonicalTreeParser parser = new CanonicalTreeParser(); parser.reset(reader, tree); return parser; - } else - return new EmptyTreeIterator(); + } + return new EmptyTreeIterator(); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java index 5c876e87f..831074d2e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/Edit.java @@ -125,17 +125,17 @@ public Edit(int as, int ae, int bs, int be) { */ public final Type getType() { if (beginA < endA) { - if (beginB < endB) + if (beginB < endB) { return Type.REPLACE; - else /* if (beginB == endB) */ - return Type.DELETE; + } + return Type.DELETE; - } else /* if (beginA == endA) */{ - if (beginB < endB) - return Type.INSERT; - else /* if (beginB == endB) */ - return Type.EMPTY; } + if (beginB < endB) { + return Type.INSERT; + } + // beginB == endB) + return Type.EMPTY; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java index 6c0d90eba..219da0e9b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java @@ -383,15 +383,17 @@ public static boolean isCrLfText(byte[] raw, int length) { * @return the line delimiter or null */ public String getLineDelimiter() { - if (size() == 0) + if (size() == 0) { return null; + } int e = getEnd(0); - if (content[e - 1] != '\n') + if (content[e - 1] != '\n') { return null; - if (content.length > 1 && e > 1 && content[e - 2] == '\r') + } + if (content.length > 1 && e > 1 && content[e - 2] == '\r') { return "\r\n"; //$NON-NLS-1$ - else - return "\n"; //$NON-NLS-1$ + } + return "\n"; //$NON-NLS-1$ } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index 6bc294607..1334949eb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -517,10 +517,10 @@ private boolean doCheckout() throws CorruptObjectException, IOException, prescanOneTree(); if (!conflicts.isEmpty()) { - if (failOnConflict) + if (failOnConflict) { throw new CheckoutConflictException(conflicts.toArray(new String[0])); - else - cleanUpConflicts(); + } + cleanUpConflicts(); } // update our index @@ -895,15 +895,14 @@ void processEntry(CanonicalTreeParser h, CanonicalTreeParser m, // the workingtree entry doesn't exist or also contains a folder // -> no problem return; - } else { - // the workingtree entry exists and is not a folder - if (!idEqual(h, m)) { - // Because HEAD and MERGE differ we will try to update the - // workingtree with a folder -> return a conflict - conflict(name, null, null, null); - } - return; } + // the workingtree entry exists and is not a folder + if (!idEqual(h, m)) { + // Because HEAD and MERGE differ we will try to update the + // workingtree with a folder -> return a conflict + conflict(name, null, null, null); + } + return; } if ((ffMask == 0x00F) && f != null && FileMode.TREE.equals(f.getEntryFileMode())) { @@ -1083,15 +1082,15 @@ else if (m == null) // Something in Head if (!FileMode.TREE.equals(f.getEntryFileMode()) - && FileMode.TREE.equals(iMode)) + && FileMode.TREE.equals(iMode)) { // The workingtree contains a file and the index semantically contains a folder. // Git considers the workingtree file as untracked. Just keep the untracked file. return; - else - // -> file is dirty and tracked but is should be - // removed. That's a conflict - conflict(name, dce, h, m); - } else + } + // -> file is dirty and tracked but is should be + // removed. That's a conflict + conflict(name, dce, h, m); + } else { // file doesn't exist or is clean // Index contains the same as Head // Something different from a submodule in Index @@ -1099,7 +1098,8 @@ else if (m == null) // Something in Head // -> Remove from index and delete the file remove(name); - } else + } + } else { // Index contains something different from Head // Something different from a submodule in Index // Nothing in Merge @@ -1108,6 +1108,7 @@ else if (m == null) // filesystem). But Merge wants the path to be removed. // Report a conflict conflict(name, dce, h, m); + } } } else { // Something in Merge @@ -1340,13 +1341,14 @@ private boolean isModifiedSubtree_IndexWorkingtree(String path) private boolean isModified_IndexTree(String path, ObjectId iId, FileMode iMode, ObjectId tId, FileMode tMode, ObjectId rootTree) throws CorruptObjectException, IOException { - if (iMode != tMode) + if (iMode != tMode) { return true; + } if (FileMode.TREE.equals(iMode) - && (iId == null || ObjectId.zeroId().equals(iId))) + && (iId == null || ObjectId.zeroId().equals(iId))) { return isModifiedSubtree_IndexTree(path, rootTree); - else - return !equalIdAndMode(iId, iMode, tId, tMode); + } + return !equalIdAndMode(iId, iMode, tId, tMode); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java index 0e91f0d74..cbf96e468 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java @@ -824,10 +824,10 @@ private void encodeTS(int pIdx, Instant when) { } private int getExtendedFlags() { - if (isExtended()) + if (isExtended()) { return NB.decodeUInt16(info, infoOffset + P_FLAGS2) << 16; - else - return 0; + } + return 0; } private static void checkPath(byte[] path) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java index 60669bb95..2c93d55f4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/AbstractHead.java @@ -82,10 +82,10 @@ public final void setNewHeads(List newHeads) { /** {@inheritDoc} */ @Override public List getNextHeads(char c) { - if (matches(c)) + if (matches(c)) { return newHeads; - else - return FileNameMatcher.EMPTY_HEAD_LIST; + } + return FileNameMatcher.EMPTY_HEAD_LIST; } boolean isStar() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/FileNameMatcher.java b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/FileNameMatcher.java index bfcc580ba..8125c356a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/FileNameMatcher.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/fnmatch/FileNameMatcher.java @@ -304,11 +304,11 @@ private static List createSimpleHeads( private static AbstractHead createWildCardHead( final Character invalidWildgetCharacter, final boolean star) { - if (invalidWildgetCharacter != null) + if (invalidWildgetCharacter != null) { return new RestrictedWildCardHead(invalidWildgetCharacter .charValue(), star); - else - return new WildCardHead(star); + } + return new WildCardHead(star); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 8e463415b..febdb9209 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -293,13 +293,12 @@ public void endDocument() throws SAXException { String revision = defaultRevision; if (remote == null) { if (defaultRemote == null) { - if (filename != null) + if (filename != null) { throw new SAXException(MessageFormat.format( RepoText.get().errorNoDefaultFilename, filename)); - else - throw new SAXException( - RepoText.get().errorNoDefault); + } + throw new SAXException(RepoText.get().errorNoDefault); } remote = defaultRemote; } else { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index cb62925a1..728867800 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -761,18 +761,17 @@ public RevCommit call() throws GitAPIException { } catch (GitAPIException | IOException e) { throw new ManifestErrorException(e); } - } else { - try (Git git = new Git(repo)) { - for (RepoProject proj : filteredProjects) { - addSubmodule(proj.getName(), proj.getUrl(), proj.getPath(), - proj.getRevision(), proj.getCopyFiles(), - proj.getLinkFiles(), git); - } - return git.commit().setMessage(RepoText.get().repoCommitMessage) - .call(); - } catch (GitAPIException | IOException e) { - throw new ManifestErrorException(e); + } + try (Git git = new Git(repo)) { + for (RepoProject proj : filteredProjects) { + addSubmodule(proj.getName(), proj.getUrl(), proj.getPath(), + proj.getRevision(), proj.getCopyFiles(), + proj.getLinkFiles(), git); } + return git.commit().setMessage(RepoText.get().repoCommitMessage) + .call(); + } catch (GitAPIException | IOException e) { + throw new ManifestErrorException(e); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index d79dfa8b2..684d1e457 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -422,10 +422,10 @@ public void clearLinkFiles() { } private String getPathWithSlash() { - if (path.endsWith("/")) //$NON-NLS-1$ + if (path.endsWith("/")) { //$NON-NLS-1$ return path; - else - return path + "/"; //$NON-NLS-1$ + } + return path + "/"; //$NON-NLS-1$ } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java index 3c0f17ab3..b7d6acce1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/PathMatcher.java @@ -291,26 +291,25 @@ && isWild(matchers.get(matcher))) { // We had a prefix match here. if (!pathMatch) { return true; + } + if (right == endExcl - 1) { + // Extra slash at the end: actually a full match. + // Must meet directory expectations + return !dirOnly || assumeDirectory; + } + // Prefix matches only if pattern ended with /** + if (wasWild) { + return true; + } + if (lastWildmatch >= 0) { + // Consider pattern **/x and input x/x. + // We've matched the prefix x/ so far: we + // must try to extend the **! + matcher = lastWildmatch + 1; + right = wildmatchBacktrackPos; + wildmatchBacktrackPos = -1; } else { - if (right == endExcl - 1) { - // Extra slash at the end: actually a full match. - // Must meet directory expectations - return !dirOnly || assumeDirectory; - } - // Prefix matches only if pattern ended with /** - if (wasWild) { - return true; - } - if (lastWildmatch >= 0) { - // Consider pattern **/x and input x/x. - // We've matched the prefix x/ so far: we - // must try to extend the **! - matcher = lastWildmatch + 1; - right = wildmatchBacktrackPos; - wildmatchBacktrackPos = -1; - } else { - return false; - } + return false; } } } else if (lastWildmatch != -1) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java index 41923eed1..b18aed982 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/internal/Strings.java @@ -192,22 +192,20 @@ private static boolean isComplexWildcard(String pattern) { } if (pattern.indexOf('?') != -1) { return true; - } else { - // check if the backslash escapes one of the glob special characters - // if not, backslash is not part of a regex and treated literally - int backSlash = pattern.indexOf('\\'); - if (backSlash >= 0) { - int nextIdx = backSlash + 1; - if (pattern.length() == nextIdx) { - return false; - } - char nextChar = pattern.charAt(nextIdx); - if (escapedByBackslash(nextChar)) { - return true; - } else { - return false; - } + } + // check if the backslash escapes one of the glob special characters + // if not, backslash is not part of a regex and treated literally + int backSlash = pattern.indexOf('\\'); + if (backSlash >= 0) { + int nextIdx = backSlash + 1; + if (pattern.length() == nextIdx) { + return false; } + char nextChar = pattern.charAt(nextIdx); + if (escapedByBackslash(nextChar)) { + return true; + } + return false; } return false; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/LagCheck.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/LagCheck.java index 53fd19800..a27a9bc44 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/LagCheck.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/ketch/LagCheck.java @@ -132,9 +132,8 @@ KetchReplica.State check(ObjectId acceptId, ReceiveCommand acceptCmd) { // TODO(sop) Check term to see if my leader was deposed. if (rw.isMergedInto(head, remote)) { return AHEAD; - } else { - return DIVERGENT; } + return DIVERGENT; } catch (IOException err) { KetchReplica.log.error(String.format( "Cannot compare %s", //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java index 732cd4d1c..b3b9e3937 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsRefDatabase.java @@ -191,14 +191,11 @@ Ref doPeel(Ref leaf) throws MissingObjectException, rw.peel(obj).copy(), hasVersioning() ? leaf.getUpdateIndex() : UNDEFINED_UPDATE_INDEX); - } else { - return new ObjectIdRef.PeeledNonTag( - leaf.getStorage(), - leaf.getName(), - leaf.getObjectId(), - hasVersioning() ? leaf.getUpdateIndex() - : UNDEFINED_UPDATE_INDEX); } + return new ObjectIdRef.PeeledNonTag(leaf.getStorage(), + leaf.getName(), leaf.getObjectId(), + hasVersioning() ? leaf.getUpdateIndex() + : UNDEFINED_UPDATE_INDEX); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index 4f5f8a613..130e39b14 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -358,9 +358,8 @@ public String getIdentifier() { File directory = getDirectory(); if (directory != null) { return directory.getPath(); - } else { - throw new IllegalStateException(); } + throw new IllegalStateException(); } /** {@inheritDoc} */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java index 82458c1ac..13b9e79be 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java @@ -152,11 +152,10 @@ void unlock() { boolean commit() { if (nonEmpty) { return lock.commit(); - } else { - logFile.delete(); - lock.unlock(); - return true; } + logFile.delete(); + lock.unlock(); + return true; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryInserter.java index e5a54e372..09f202168 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryInserter.java @@ -109,10 +109,9 @@ private ObjectId insert( ObjectId id = idFor(type, data, off, len); if (!createDuplicate && db.has(id)) { return id; - } else { - File tmp = toTemp(type, data, off, len); - return insertOneObject(tmp, id, createDuplicate); } + File tmp = toTemp(type, data, off, len); + return insertOneObject(tmp, id, createDuplicate); } /** {@inheritDoc} */ @@ -141,12 +140,11 @@ ObjectId insert(int type, long len, InputStream is, boolean createDuplicate) int actLen = IO.readFully(is, buf, 0); return insert(type, buf, 0, actLen, createDuplicate); - } else { - SHA1 md = digest(); - File tmp = toTemp(md, type, len, is); - ObjectId id = md.toObjectId(); - return insertOneObject(tmp, id, createDuplicate); } + SHA1 md = digest(); + File tmp = toTemp(md, type, len, is); + ObjectId id = md.toObjectId(); + return insertOneObject(tmp, id, createDuplicate); } private ObjectId insertOneObject( diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index 88e05af41..9b9c3a7de 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -844,19 +844,20 @@ ObjectLoader load(WindowCursor curs, long pos) case Constants.OBJ_TREE: case Constants.OBJ_BLOB: case Constants.OBJ_TAG: { - if (delta != null || sz < curs.getStreamFileThreshold()) + if (delta != null || sz < curs.getStreamFileThreshold()) { data = decompress(pos + p, (int) sz, curs); + } if (delta != null) { type = typeCode; break SEARCH; } - if (data != null) + if (data != null) { return new ObjectLoader.SmallObject(typeCode, data); - else - return new LargePackedWholeObject(typeCode, sz, pos, p, - this, curs.db); + } + return new LargePackedWholeObject(typeCode, sz, pos, p, + this, curs.db); } case Constants.OBJ_OFS_DELTA: { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index e5cea6c01..7733df15f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -594,10 +594,9 @@ private ObjectIdRef doPeel(Ref leaf) throws MissingObjectException, if (obj instanceof RevTag) { return new ObjectIdRef.PeeledTag(leaf.getStorage(), leaf .getName(), leaf.getObjectId(), rw.peel(obj).copy()); - } else { - return new ObjectIdRef.PeeledNonTag(leaf.getStorage(), leaf - .getName(), leaf.getObjectId()); } + return new ObjectIdRef.PeeledNonTag(leaf.getStorage(), + leaf.getName(), leaf.getObjectId()); } } @@ -894,10 +893,9 @@ private Ref peeledPackedRef(Ref f) if (peeledObjectId != null) { return new ObjectIdRef.PeeledTag(PACKED, f.getName(), f.getObjectId(), peeledObjectId); - } else { - return new ObjectIdRef.PeeledNonTag(PACKED, f.getName(), - f.getObjectId()); } + return new ObjectIdRef.PeeledNonTag(PACKED, f.getName(), + f.getObjectId()); } void log(boolean force, RefUpdate update, String msg, boolean deref) @@ -1480,10 +1478,8 @@ public LooseRef peel(ObjectIdRef newLeaf) { if (peeledObjectId != null) { return new LoosePeeledTag(snapShot, getName(), objectId, peeledObjectId); - } else { - return new LooseNonTag(snapShot, getName(), - objectId); } + return new LooseNonTag(snapShot, getName(), objectId); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java index 1a0d6953a..dc4967fe4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectoryUpdate.java @@ -90,9 +90,8 @@ protected boolean tryLock(boolean deref) throws IOException { dst = database.findRef(name); setOldObjectId(dst != null ? dst.getObjectId() : null); return true; - } else { - return false; } + return false; } /** {@inheritDoc} */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java index 08a14b28d..3cdd90408 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogEntryImpl.java @@ -140,9 +140,9 @@ public String toString() { /** {@inheritDoc} */ @Override public CheckoutEntry parseCheckout() { - if (getComment().startsWith(CheckoutEntryImpl.CHECKOUT_MOVING_FROM)) + if (getComment().startsWith(CheckoutEntryImpl.CHECKOUT_MOVING_FROM)) { return new CheckoutEntryImpl(this); - else - return null; + } + return null; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObject.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObject.java index 79f130757..fb06623d7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObject.java @@ -139,49 +139,48 @@ static ObjectLoader open(InputStream in, File path, AnyObjectId id, } return new LargeObject(type, size, path, id, wc.db); - } else { - readSome(in, hdr, 2, 18); - int c = hdr[0] & 0xff; - int type = (c >> 4) & 7; - long size = c & 15; - int shift = 4; - int p = 1; - while ((c & 0x80) != 0) { - c = hdr[p++] & 0xff; - size += ((long) (c & 0x7f)) << shift; - shift += 7; - } - - switch (type) { - case Constants.OBJ_COMMIT: - case Constants.OBJ_TREE: - case Constants.OBJ_BLOB: - case Constants.OBJ_TAG: - // Acceptable types for a loose object. - break; - default: - throw new CorruptObjectException(id, - JGitText.get().corruptObjectInvalidType); - } - - if (path == null && Integer.MAX_VALUE < size) { - LargeObjectException.ExceedsByteArrayLimit e; - e = new LargeObjectException.ExceedsByteArrayLimit(); - e.setObjectId(id); - throw e; - } - if (size < wc.getStreamFileThreshold() || path == null) { - in.reset(); - IO.skipFully(in, p); - Inflater inf = wc.inflater(); - InputStream zIn = inflate(in, inf); - byte[] data = new byte[(int) size]; - IO.readFully(zIn, data, 0, data.length); - checkValidEndOfStream(in, inf, id, hdr); - return new ObjectLoader.SmallObject(type, data); - } - return new LargeObject(type, size, path, id, wc.db); } + readSome(in, hdr, 2, 18); + int c = hdr[0] & 0xff; + int type = (c >> 4) & 7; + long size = c & 15; + int shift = 4; + int p = 1; + while ((c & 0x80) != 0) { + c = hdr[p++] & 0xff; + size += ((long) (c & 0x7f)) << shift; + shift += 7; + } + + switch (type) { + case Constants.OBJ_COMMIT: + case Constants.OBJ_TREE: + case Constants.OBJ_BLOB: + case Constants.OBJ_TAG: + // Acceptable types for a loose object. + break; + default: + throw new CorruptObjectException(id, + JGitText.get().corruptObjectInvalidType); + } + + if (path == null && Integer.MAX_VALUE < size) { + LargeObjectException.ExceedsByteArrayLimit e; + e = new LargeObjectException.ExceedsByteArrayLimit(); + e.setObjectId(id); + throw e; + } + if (size < wc.getStreamFileThreshold() || path == null) { + in.reset(); + IO.skipFully(in, p); + Inflater inf = wc.inflater(); + InputStream zIn = inflate(in, inf); + byte[] data = new byte[(int) size]; + IO.readFully(zIn, data, 0, data.length); + checkValidEndOfStream(in, inf, id, hdr); + return new ObjectLoader.SmallObject(type, data); + } + return new LargeObject(type, size, path, id, wc.db); } catch (ZipException badStream) { throw new CorruptObjectException(id, JGitText.get().corruptObjectBadStream); @@ -213,19 +212,18 @@ static long getSize(InputStream in, AnyObjectId id, WindowCursor wc) JGitText.get().corruptObjectNegativeSize); return size; - } else { - readSome(in, hdr, 2, 18); - int c = hdr[0] & 0xff; - long size = c & 15; - int shift = 4; - int p = 1; - while ((c & 0x80) != 0) { - c = hdr[p++] & 0xff; - size += ((long) (c & 0x7f)) << shift; - shift += 7; - } - return size; } + readSome(in, hdr, 2, 18); + int c = hdr[0] & 0xff; + long size = c & 15; + int shift = 4; + int p = 1; + while ((c & 0x80) != 0) { + c = hdr[p++] & 0xff; + size += ((long) (c & 0x7f)) << shift; + shift += 7; + } + return size; } catch (ZipException badStream) { throw new CorruptObjectException(id, JGitText.get().corruptObjectBadStream); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObjectCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObjectCache.java index ea0d26905..616447a65 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObjectCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/UnpackedObjectCache.java @@ -126,17 +126,19 @@ boolean add(AnyObjectId toAdd) { for (int n = 0; n < MAX_CHAIN;) { ObjectId obj = ids.get(i); if (obj == null) { - if (ids.compareAndSet(i, null, toAdd.copy())) + if (ids.compareAndSet(i, null, toAdd.copy())) { return true; - else - continue; + } + continue; } - if (AnyObjectId.isEqual(obj, toAdd)) + if (AnyObjectId.isEqual(obj, toAdd)) { return true; + } - if (++i == ids.length()) + if (++i == ids.length()) { i = 0; + } n++; } return false; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 2f770e96f..e4536643a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -1751,23 +1751,23 @@ private void writeObjectImpl(PackOutputStream out, ObjectToPack otp) NullProgressMonitor.INSTANCE, Collections.singleton(otp)); continue; - } else { - // Object writing already started, we cannot recover. - // - CorruptObjectException coe; - coe = new CorruptObjectException(otp, ""); //$NON-NLS-1$ - coe.initCause(gone); - throw coe; } + // Object writing already started, we cannot recover. + // + CorruptObjectException coe; + coe = new CorruptObjectException(otp, ""); //$NON-NLS-1$ + coe.initCause(gone); + throw coe; } } // If we reached here, reuse wasn't possible. // - if (otp.isDeltaRepresentation()) + if (otp.isDeltaRepresentation()) { writeDeltaObjectDeflate(out, otp); - else + } else { writeWholeObjectDeflate(out, otp); + } out.endObject(); otp.setCRC((int) crc32.getValue()); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java index 6c8d4fc03..ce6ddb9cc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableDatabase.java @@ -87,16 +87,14 @@ public static ReceiveCommand toCommand(Ref oldRef, Ref newRef) { if (newRef.isSymbolic()) { return ReceiveCommand.link(oldRef.getTarget().getName(), newRef.getTarget().getName(), name); - } else { - // This should pass in oldId for compat with - // RefDirectoryUpdate - return ReceiveCommand.unlink(oldRef.getTarget().getName(), - newId, name); } - } else { + // This should pass in oldId for compat with + // RefDirectoryUpdate return ReceiveCommand.unlink(oldRef.getTarget().getName(), - ObjectId.zeroId(), name); + newId, name); } + return ReceiveCommand.unlink(oldRef.getTarget().getName(), + ObjectId.zeroId(), name); } if (newRef != null && newRef.isSymbolic()) { @@ -104,14 +102,12 @@ public static ReceiveCommand toCommand(Ref oldRef, Ref newRef) { if (oldRef.isSymbolic()) { return ReceiveCommand.link(oldRef.getTarget().getName(), newRef.getTarget().getName(), name); - } else { - return ReceiveCommand.link(oldId, - newRef.getTarget().getName(), name); } - } else { - return ReceiveCommand.link(ObjectId.zeroId(), + return ReceiveCommand.link(oldId, newRef.getTarget().getName(), name); } + return ReceiveCommand.link(ObjectId.zeroId(), + newRef.getTarget().getName(), name); } return new ReceiveCommand(oldId, newId, name); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeBatch.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeBatch.java index da98e3fad..9c5423fb0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeBatch.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeBatch.java @@ -102,9 +102,8 @@ public void execute(RevWalk rw, ProgressMonitor monitor) if (isAtomic()) { ReceiveCommand.abort(getCommands()); return; - } else { - continue; } + continue; } } todo.add(new Command(rw, c)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileCache.java index 882b2d055..39a67afae 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/http/NetscapeCookieFileCache.java @@ -82,9 +82,8 @@ private NetscapeCookieFileCache(HttpConfig config) { public static NetscapeCookieFileCache getInstance(HttpConfig config) { if (instance == null) { return new NetscapeCookieFileCache(config); - } else { - return instance; } + return instance; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java index c1e94a0a3..ee6adeee9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java @@ -384,9 +384,8 @@ protected List validate(String key, List value) { private static boolean isHostMatch(String pattern, String name) { if (pattern.startsWith("!")) { //$NON-NLS-1$ return !patternMatchesHost(pattern.substring(1), name); - } else { - return patternMatchesHost(pattern, name); } + return patternMatchesHost(pattern, name); } private static boolean patternMatchesHost(String pattern, String name) { @@ -399,10 +398,9 @@ private static boolean patternMatchesHost(String pattern, String name) { } fn.append(name); return fn.isMatch(); - } else { - // Not a pattern but a full host name - return pattern.equals(name); } + // Not a pattern but a full host name + return pattern.equals(name); } private static String dequote(String value) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java index 4f90e6900..24850ee44 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java @@ -302,10 +302,10 @@ public final boolean equals(AnyObjectId other) { /** {@inheritDoc} */ @Override public final boolean equals(Object o) { - if (o instanceof AnyObjectId) + if (o instanceof AnyObjectId) { return equals((AnyObjectId) o); - else - return false; + } + return false; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java index 96e50667b..98a46f3e5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java @@ -103,25 +103,29 @@ private static boolean isSymRef(byte[] ref) { private static File getSymRef(File workTree, File dotGit, FS fs) throws IOException { byte[] content = IO.readFully(dotGit); - if (!isSymRef(content)) + if (!isSymRef(content)) { throw new IOException(MessageFormat.format( JGitText.get().invalidGitdirRef, dotGit.getAbsolutePath())); + } int pathStart = 8; int lineEnd = RawParseUtils.nextLF(content, pathStart); while (content[lineEnd - 1] == '\n' || - (content[lineEnd - 1] == '\r' && SystemReader.getInstance().isWindows())) + (content[lineEnd - 1] == '\r' + && SystemReader.getInstance().isWindows())) { lineEnd--; - if (lineEnd == pathStart) + } + if (lineEnd == pathStart) { throw new IOException(MessageFormat.format( JGitText.get().invalidGitdirRef, dotGit.getAbsolutePath())); + } String gitdirPath = RawParseUtils.decode(content, pathStart, lineEnd); File gitdirFile = fs.resolve(workTree, gitdirPath); - if (gitdirFile.isAbsolute()) + if (gitdirFile.isAbsolute()) { return gitdirFile; - else - return new File(workTree, gitdirPath).getCanonicalFile(); + } + return new File(workTree, gitdirPath).getCanonicalFile(); } private FS fs; @@ -723,9 +727,8 @@ protected Config loadConfig() throws IOException { .getAbsolutePath(), err.getMessage())); } return cfg; - } else { - return new Config(); } + return new Config(); } private File guessWorkTreeOrFail() throws IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java index be53c4b4f..cad747bcf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java @@ -232,9 +232,9 @@ private String findRemoteTrackingBranch(String remote, String mergeRef) { private String getRemoteOrDefault() { String remote = getRemote(); - if (remote == null) + if (remote == null) { return Constants.DEFAULT_REMOTE_NAME; - else - return remote; + } + return remote; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java index 16db71703..938fa2394 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java @@ -1395,12 +1395,11 @@ private static String readValue(StringReader in) } trailingSpaces.append(cc); continue; - } else { - inLeadingSpace = false; - if (trailingSpaces != null) { - value.append(trailingSpaces); - trailingSpaces.setLength(0); - } + } + inLeadingSpace = false; + if (trailingSpaces != null) { + value.append(trailingSpaces); + trailingSpaces.setLength(0); } if ('\\' == c) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java index e865da83b..23e8de0e3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java @@ -134,11 +134,9 @@ public > T getEnum(Config config, T[] all, String section, throw new IllegalArgumentException( MessageFormat.format(JGitText.get().enumValueNotSupported3, section, subsection, name, value)); - } else { - throw new IllegalArgumentException( - MessageFormat.format(JGitText.get().enumValueNotSupported2, - section, name, value)); } + throw new IllegalArgumentException(MessageFormat.format( + JGitText.get().enumValueNotSupported2, section, name, value)); } /** {@inheritDoc} */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java index 88d085984..b87a031f5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java @@ -606,16 +606,17 @@ public boolean diff(final ProgressMonitor monitor, int estWorkTreeSize, } // consume the remaining work - if (monitor != null) + if (monitor != null) { monitor.endTask(); + } ignored = indexDiffFilter.getIgnoredPaths(); if (added.isEmpty() && changed.isEmpty() && removed.isEmpty() && missing.isEmpty() && modified.isEmpty() - && untracked.isEmpty()) + && untracked.isEmpty()) { return false; - else - return true; + } + return true; } private boolean hasFiles(File directory) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java index 700b9dbe8..e14fb102b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectReader.java @@ -293,9 +293,8 @@ public boolean next() throws MissingObjectException, IOException { if (idItr.hasNext()) { cur = idItr.next(); return true; - } else { - return false; } + return false; } @Override @@ -383,9 +382,8 @@ public boolean next() throws MissingObjectException, IOException { cur = idItr.next(); sz = getObjectSize(cur, OBJ_ANY); return true; - } else { - return false; } + return false; } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 68866ea27..0e9cf58cf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -503,9 +503,8 @@ public ObjectId resolve(String revstr) if (resolved instanceof String) { final Ref ref = findRef((String) resolved); return ref != null ? ref.getLeaf().getObjectId() : null; - } else { - return (ObjectId) resolved; } + return (ObjectId) resolved; } } @@ -527,11 +526,12 @@ public String simplify(String revstr) try (RevWalk rw = new RevWalk(this)) { rw.setRetainBody(true); Object resolved = resolve(rw, revstr); - if (resolved != null) - if (resolved instanceof String) + if (resolved != null) { + if (resolved instanceof String) { return (String) resolved; - else - return ((AnyObjectId) resolved).getName(); + } + return ((AnyObjectId) resolved).getName(); + } return null; } } @@ -760,15 +760,15 @@ private Object resolve(RevWalk rw, String revstr) if (name == null) throw new RevisionSyntaxException(revstr); } else if (time.matches("^-\\d+$")) { //$NON-NLS-1$ - if (name != null) + if (name != null) { throw new RevisionSyntaxException(revstr); - else { - String previousCheckout = resolveReflogCheckout(-Integer - .parseInt(time)); - if (ObjectId.isId(previousCheckout)) - rev = parseSimple(rw, previousCheckout); - else - name = previousCheckout; + } + String previousCheckout = resolveReflogCheckout( + -Integer.parseInt(time)); + if (ObjectId.isId(previousCheckout)) { + rev = parseSimple(rw, previousCheckout); + } else { + name = previousCheckout; } } else { if (name == null) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java index cdbe3cd26..12f353e0d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeConfig.java @@ -166,10 +166,10 @@ private static String[] getMergeOptions(String branch, Config config) { String mergeOptions = config.getString( ConfigConstants.CONFIG_BRANCH_SECTION, branch, ConfigConstants.CONFIG_KEY_MERGEOPTIONS); - if (mergeOptions != null) + if (mergeOptions != null) { return mergeOptions.split("\\s"); //$NON-NLS-1$ - else - return new String[0]; + } + return new String[0]; } private static class MergeConfigSectionParser implements @@ -188,10 +188,10 @@ public MergeConfig parse(Config cfg) { @Override public boolean equals(Object obj) { - if (obj instanceof MergeConfigSectionParser) + if (obj instanceof MergeConfigSectionParser) { return branch.equals(((MergeConfigSectionParser) obj).branch); - else - return false; + } + return false; } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java index ca0e18a0e..ca2f37abe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java @@ -153,15 +153,16 @@ public String formatWithConflicts(String message, private static void addConflictsMessage(List conflictingPaths, StringBuilder sb) { sb.append("Conflicts:\n"); //$NON-NLS-1$ - for (String conflictingPath : conflictingPaths) + for (String conflictingPath : conflictingPaths) { sb.append('\t').append(conflictingPath).append('\n'); + } } private static String joinNames(List names, String singular, String plural) { - if (names.size() == 1) + if (names.size() == 1) { return singular + " " + names.get(0); //$NON-NLS-1$ - else - return plural + " " + StringUtils.join(names, ", ", " and "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + return plural + " " + StringUtils.join(names, ", ", " and "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 0b423fb5d..e0b00c0bd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -652,42 +652,40 @@ protected boolean processEntry(CanonicalTreeParser base, keep(ourDce); // no checkout needed! return true; - } else { - // same content but different mode on OURS and THEIRS. - // Try to merge the mode and report an error if this is - // not possible. - int newMode = mergeFileModes(modeB, modeO, modeT); - if (newMode != FileMode.MISSING.getBits()) { - if (newMode == modeO) - // ours version is preferred - keep(ourDce); - else { - // the preferred version THEIRS has a different mode - // than ours. Check it out! - if (isWorktreeDirty(work, ourDce)) - return false; - // we know about length and lastMod only after we have written the new content. - // This will happen later. Set these values to 0 for know. - DirCacheEntry e = add(tw.getRawPath(), theirs, - DirCacheEntry.STAGE_0, EPOCH, 0); - addToCheckout(tw.getPathString(), e, attributes); - } - return true; + } + // same content but different mode on OURS and THEIRS. + // Try to merge the mode and report an error if this is + // not possible. + int newMode = mergeFileModes(modeB, modeO, modeT); + if (newMode != FileMode.MISSING.getBits()) { + if (newMode == modeO) { + // ours version is preferred + keep(ourDce); } else { - // FileModes are not mergeable. We found a conflict on modes. - // For conflicting entries we don't know lastModified and length. - add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); - add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); - add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, - 0); - unmergedPaths.add(tw.getPathString()); - mergeResults.put( - tw.getPathString(), - new MergeResult<>(Collections - . emptyList())); + // the preferred version THEIRS has a different mode + // than ours. Check it out! + if (isWorktreeDirty(work, ourDce)) { + return false; + } + // we know about length and lastMod only after we have + // written the new content. + // This will happen later. Set these values to 0 for know. + DirCacheEntry e = add(tw.getRawPath(), theirs, + DirCacheEntry.STAGE_0, EPOCH, 0); + addToCheckout(tw.getPathString(), e, attributes); } return true; } + // FileModes are not mergeable. We found a conflict on modes. + // For conflicting entries we don't know lastModified and + // length. + add(tw.getRawPath(), base, DirCacheEntry.STAGE_1, EPOCH, 0); + add(tw.getRawPath(), ours, DirCacheEntry.STAGE_2, EPOCH, 0); + add(tw.getRawPath(), theirs, DirCacheEntry.STAGE_3, EPOCH, 0); + unmergedPaths.add(tw.getPathString()); + mergeResults.put(tw.getPathString(), + new MergeResult<>(Collections. emptyList())); + return true; } if (modeB == modeT && tw.idEqual(T_BASE, T_THEIRS)) { @@ -716,21 +714,20 @@ protected boolean processEntry(CanonicalTreeParser base, addToCheckout(tw.getPathString(), e, attributes); } return true; - } else { - // we want THEIRS ... but THEIRS contains a folder or the - // deletion of the path. Delete what's in the working tree, - // which we know to be clean. - if (tw.getTreeCount() > T_FILE && tw.getRawMode(T_FILE) == 0) { - // Not present in working tree, so nothing to delete - return true; - } - if (modeT != 0 && modeT == modeB) { - // Base, ours, and theirs all contain a folder: don't delete - return true; - } - addDeletion(tw.getPathString(), nonTree(modeO), attributes); + } + // we want THEIRS ... but THEIRS contains a folder or the + // deletion of the path. Delete what's in the working tree, + // which we know to be clean. + if (tw.getTreeCount() > T_FILE && tw.getRawMode(T_FILE) == 0) { + // Not present in working tree, so nothing to delete return true; } + if (modeT != 0 && modeT == modeB) { + // Base, ours, and theirs all contain a folder: don't delete + return true; + } + addDeletion(tw.getPathString(), nonTree(modeO), attributes); + return true; } if (tw.isSubtree()) { @@ -1310,10 +1307,9 @@ protected boolean mergeTrees(AbstractTreeIterator baseTree, if (getUnmergedPaths().isEmpty() && !failed()) { resultTree = dircache.writeTree(getObjectInserter()); return true; - } else { - resultTree = null; - return false; } + resultTree = null; + return false; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java index 2fc0f4f07..d56e5c0c1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ThreeWayMerger.java @@ -143,17 +143,17 @@ public ObjectId getBaseCommitId() { * @throws java.io.IOException */ protected AbstractTreeIterator mergeBase() throws IOException { - if (baseTree != null) + if (baseTree != null) { return openTree(baseTree); + } RevCommit baseCommit = (baseCommitId != null) ? walk .parseCommit(baseCommitId) : getBaseCommit(sourceCommits[0], sourceCommits[1]); if (baseCommit == null) { baseCommitId = null; return new EmptyTreeIterator(); - } else { - baseCommitId = baseCommit.toObjectId(); - return openTree(baseCommit.getTree()); } + baseCommitId = baseCommit.toObjectId(); + return openTree(baseCommit.getTree()); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/FanoutBucket.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/FanoutBucket.java index 7827a9aa0..c1616b3ed 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/FanoutBucket.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/FanoutBucket.java @@ -167,10 +167,10 @@ public boolean hasNext() { @Override public Note next() { - if (hasNext()) + if (hasNext()) { return itr.next(); - else - throw new NoSuchElementException(); + } + throw new NoSuchElementException(); } @Override @@ -214,30 +214,31 @@ InMemoryNoteBucket set(AnyObjectId noteOn, AnyObjectId noteData, NoteBucket b = table[cell]; if (b == null) { - if (noteData == null) + if (noteData == null) { return this; + } LeafBucket n = new LeafBucket(prefixLen + 2); table[cell] = n.set(noteOn, noteData, or); cnt++; return this; - } else { - NoteBucket n = b.set(noteOn, noteData, or); - if (n == null) { - table[cell] = null; - cnt--; - - if (cnt == 0) - return null; - - return contractIfTooSmall(noteOn, or); - - } else if (n != b) { - table[cell] = n; - } - return this; } + NoteBucket n = b.set(noteOn, noteData, or); + if (n == null) { + table[cell] = null; + cnt--; + + if (cnt == 0) { + return null; + } + + return contractIfTooSmall(noteOn, or); + + } else if (n != b) { + table[cell] = n; + } + return this; } InMemoryNoteBucket contractIfTooSmall(AnyObjectId noteOn, ObjectReader or) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/LeafBucket.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/LeafBucket.java index 6723b6309..0fa2a6306 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/LeafBucket.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/LeafBucket.java @@ -129,10 +129,10 @@ public boolean hasNext() { @Override public Note next() { - if (hasNext()) + if (hasNext()) { return notes[idx++]; - else - throw new NoSuchElementException(); + } + throw new NoSuchElementException(); } @Override @@ -156,25 +156,23 @@ InMemoryNoteBucket set(AnyObjectId noteOn, AnyObjectId noteData, notes[p].setData(noteData.copy()); return this; - } else { - System.arraycopy(notes, p + 1, notes, p, cnt - p - 1); - cnt--; - return 0 < cnt ? this : null; } + System.arraycopy(notes, p + 1, notes, p, cnt - p - 1); + cnt--; + return 0 < cnt ? this : null; } else if (noteData != null) { if (shouldSplit()) { return split().set(noteOn, noteData, or); - - } else { - growIfFull(); - p = -(p + 1); - if (p < cnt) - System.arraycopy(notes, p, notes, p + 1, cnt - p); - notes[p] = new Note(noteOn, noteData.copy()); - cnt++; - return this; } + growIfFull(); + p = -(p + 1); + if (p < cnt) { + System.arraycopy(notes, p, notes, p + 1, cnt - p); + } + notes[p] = new Note(noteOn, noteData.copy()); + cnt++; + return this; } else { return this; @@ -234,12 +232,10 @@ void parseOneEntry(AnyObjectId noteOn, AnyObjectId noteData) { InMemoryNoteBucket append(Note note) { if (shouldSplit()) { return split().append(note); - - } else { - growIfFull(); - notes[cnt++] = note; - return this; } + growIfFull(); + notes[cnt++] = note; + return this; } private void growIfFull() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java index cbef61338..e4eef433d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMap.java @@ -278,10 +278,10 @@ public boolean contains(AnyObjectId id) throws IOException { public byte[] getCachedBytes(AnyObjectId id, int sizeLimit) throws LargeObjectException, MissingObjectException, IOException { ObjectId dataId = get(id); - if (dataId != null) + if (dataId != null) { return reader.open(dataId).getCachedBytes(sizeLimit); - else - return null; + } + return null; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java index ba7223b8f..6ff140290 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java @@ -307,10 +307,10 @@ private static boolean sameContent(Note a, Note b) { private static InMemoryNoteBucket addIfNotNull(InMemoryNoteBucket result, Note note) { - if (note != null) + if (note != null) { return result.append(note); - else - return result; + } + return result; } private NonNoteEntry mergeNonNotes(NonNoteEntry baseList, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteParser.java index 8ef3af10a..7dfc47deb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteParser.java @@ -181,9 +181,8 @@ private int parseFanoutCell() { } catch (ArrayIndexOutOfBoundsException notHex) { return -1; } - } else { - return -1; } + return -1; } private void storeNonNote() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java index 45508ce02..2bb45c55d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotCommitList.java @@ -391,11 +391,10 @@ private int getFreePosition(BitSet blockedPositions) { return pos.intValue(); } return positionsAllocated++; - } else { - final Integer min = freePositions.first(); - freePositions.remove(min); - return min.intValue(); } + final Integer min = freePositions.first(); + freePositions.remove(min); + return min.intValue(); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java index ee18fe7c2..19e40b562 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revplot/PlotWalk.java @@ -176,11 +176,10 @@ private Ref[] getRefs(AnyObjectId commitId) { Collection list = reverseRefMap.get(commitId); if (list == null) { return PlotCommit.NO_REFS; - } else { - Ref[] tags = list.toArray(new Ref[0]); - Arrays.sort(tags, new PlotRefComparator()); - return tags; } + Ref[] tags = list.toArray(new Ref[0]); + Arrays.sort(tags, new PlotRefComparator()); + return tags; } class PlotRefComparator implements Comparator { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TreeRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TreeRevFilter.java index f7c321885..090d1e110 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TreeRevFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/TreeRevFilter.java @@ -169,19 +169,19 @@ public boolean include(RevWalk walker, RevCommit c) // c.flags |= rewriteFlag; return false; - } else { - // We have interesting items, but neither of the special - // cases denoted above. - // - if (adds > 0 && tw.getFilter() instanceof FollowFilter) { - // One of the paths we care about was added in this - // commit. We need to update our filter to its older - // name, if we can discover it. Find out what that is. - // - updateFollowFilter(trees, ((FollowFilter) tw.getFilter()).cfg); - } - return true; } + + // We have interesting items, but neither of the special + // cases denoted above. + // + if (adds > 0 && tw.getFilter() instanceof FollowFilter) { + // One of the paths we care about was added in this + // commit. We need to update our filter to its older + // name, if we can discover it. Find out what that is. + // + updateFollowFilter(trees, ((FollowFilter) tw.getFilter()).cfg); + } + return true; } else if (nParents == 0) { // We have no parents to compare against. Consider us to be // REWRITE only if we have no paths matching our filter. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java index 954359eba..d4fa17e25 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java @@ -1579,14 +1579,15 @@ private void checkConnectivity() throws IOException { RevObject o; while ((o = ow.nextObject()) != null) { checking.update(1); - if (o.has(RevFlag.UNINTERESTING)) + if (o.has(RevFlag.UNINTERESTING)) { continue; + } if (providedObjects != null) { - if (providedObjects.contains(o)) + if (providedObjects.contains(o)) { continue; - else - throw new MissingObjectException(o, o.getType()); + } + throw new MissingObjectException(o, o.getType()); } if (o instanceof RevBlob && !db.getObjectDatabase().has(o)) @@ -1597,8 +1598,9 @@ private void checkConnectivity() throws IOException { if (baseObjects != null) { for (ObjectId id : baseObjects) { o = ow.parseAny(id); - if (!o.has(RevFlag.UNINTERESTING)) + if (!o.has(RevFlag.UNINTERESTING)) { throw new MissingObjectException(o, o.getType()); + } } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProviderUserInfo.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProviderUserInfo.java index d90102178..6325a2353 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProviderUserInfo.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/CredentialsProviderUserInfo.java @@ -107,10 +107,9 @@ public boolean promptPassphrase(String msg) { if (provider.get(uri, v)) { passphrase = v.getValue(); return true; - } else { - passphrase = null; - return false; } + passphrase = null; + return false; } /** {@inheritDoc} */ @@ -120,10 +119,9 @@ public boolean promptPassword(String msg) { if (provider.get(uri, p)) { password = new String(p.getValue()); return true; - } else { - password = null; - return false; } + password = null; + return false; } private CredentialItem.StringType newPrompt(String msg) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java index 01f6fec7e..72e95e6ba 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/HMACSHA1NonceGenerator.java @@ -135,9 +135,8 @@ public NonceStatus verify(String received, String sent, if (nonceStampSlop <= slop) { return NonceStatus.OK; - } else { - return NonceStatus.SLOP; } + return NonceStatus.SLOP; } private static final String HEX = "0123456789ABCDEF"; //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java index 0a621f19e..4474d1a85 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RemoteConfig.java @@ -292,22 +292,26 @@ private Map getReplacements(final Config config, private String replaceUri(final String uri, final Map replacements) { - if (replacements.isEmpty()) + if (replacements.isEmpty()) { return uri; + } Entry match = null; for (Entry replacement : replacements.entrySet()) { // Ignore current entry if not longer than previous match if (match != null - && match.getKey().length() > replacement.getKey().length()) + && match.getKey().length() > replacement.getKey() + .length()) { continue; - if (!uri.startsWith(replacement.getKey())) + } + if (!uri.startsWith(replacement.getKey())) { continue; + } match = replacement; } - if (match != null) + if (match != null) { return match.getValue() + uri.substring(match.getKey().length()); - else - return uri; + } + return uri; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java index 0b7907035..2382f4c3a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java @@ -302,11 +302,12 @@ public static Transport open(final Repository local, final String remote, URISyntaxException, TransportException { if (local != null) { final RemoteConfig cfg = new RemoteConfig(local.getConfig(), remote); - if (doesNotExist(cfg)) + if (doesNotExist(cfg)) { return open(local, new URIish(remote), null); + } return open(local, cfg, op); - } else - return open(new URIish(remote)); + } + return open(new URIish(remote)); } @@ -708,11 +709,11 @@ private static String findTrackingRefName(final String remoteName, // try to find matching tracking refs for (RefSpec fetchSpec : fetchSpecs) { if (fetchSpec.matchSource(remoteName)) { - if (fetchSpec.isWildcard()) + if (fetchSpec.isWildcard()) { return fetchSpec.expandFromSource(remoteName) .getDestination(); - else - return fetchSpec.getDestination(); + } + return fetchSpec.getDestination(); } } return null; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java index 3029327c5..2637a0273 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/TransportHttp.java @@ -698,9 +698,8 @@ private static class CredentialItems { public CredentialItem[] items() { if (forRepo == null) { return new CredentialItem[] { message, now, always }; - } else { - return new CredentialItem[] { message, now, forRepo, always }; } + return new CredentialItem[] { message, now, forRepo, always }; } } @@ -1076,13 +1075,11 @@ static boolean matchesCookieDomain(String host, String cookieDomain) { host = host.toLowerCase(Locale.ROOT); if (host.equals(cookieDomain)) { return true; - } else { - if (!host.endsWith(cookieDomain)) { - return false; - } - return host - .charAt(host.length() - cookieDomain.length() - 1) == '.'; } + if (!host.endsWith(cookieDomain)) { + return false; + } + return host.charAt(host.length() - cookieDomain.length() - 1) == '.'; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index 7ca9cc134..d5e03ebd5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -351,10 +351,7 @@ private static String escape(String s, boolean escapeReservedChars, } private String n2e(String s) { - if (s == null) - return ""; //$NON-NLS-1$ - else - return s; + return s == null ? "" : s; //$NON-NLS-1$ } // takes care to cut of a leading slash if a windows drive letter or a diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/FileResolver.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/FileResolver.java index b4a7af094..9a08c080c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/FileResolver.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/resolver/FileResolver.java @@ -124,8 +124,8 @@ public Repository open(C req, String name) // are responsible for closing the repository if we // complete successfully. return db; - } else - throw new ServiceNotEnabledException(); + } + throw new ServiceNotEnabledException(); } catch (RuntimeException | IOException e) { db.close(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java index 4f3eb05b1..6969ae45a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java @@ -285,9 +285,8 @@ public FileMode getMode(File f, FS.Attributes attributes) { } else if (attributes.isDirectory()) { if (new File(f, Constants.DOT_GIT).exists()) { return FileMode.GITLINK; - } else { - return FileMode.TREE; } + return FileMode.TREE; } else if (attributes.isExecutable()) { return FileMode.EXECUTABLE_FILE; } else { @@ -425,9 +424,8 @@ public InputStream openInputStream() throws IOException { if (attributes.isSymbolicLink()) { return new ByteArrayInputStream(fs.readSymLink(getFile()) .getBytes(UTF_8)); - } else { - return new FileInputStream(getFile()); } + return new FileInputStream(getFile()); } /** 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 315591623..88b76f712 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -685,10 +685,10 @@ public Instant getEntryLastModifiedInstant() { public InputStream openEntryStream() throws IOException { InputStream rawis = current().openInputStream(); if (getCleanFilterCommand() == null - && getEolStreamType() == EolStreamType.DIRECT) + && getEolStreamType() == EolStreamType.DIRECT) { return rawis; - else - return filterClean(rawis); + } + return filterClean(rawis); } /** @@ -979,13 +979,13 @@ public boolean isModified(DirCacheEntry entry, boolean forceContentCheck, MetadataDiff diff = compareMetadata(entry); switch (diff) { case DIFFER_BY_TIMESTAMP: - if (forceContentCheck) + if (forceContentCheck) { // But we are told to look at content even though timestamps // tell us about modification return contentCheck(entry, reader); - else - // We are told to assume a modification if timestamps differs - return true; + } + // We are told to assume a modification if timestamps differs + return true; case SMUDGED: // The file is clean by timestamps but the entry was smudged. // Lets do a content check @@ -1086,14 +1086,13 @@ private boolean contentCheck(DirCacheEntry entry, ObjectReader reader) entry.setLength((int) getEntryLength()); return false; - } else { - if (mode == FileMode.SYMLINK.getBits()) { - return !new File(readSymlinkTarget(current())).equals( - new File(readContentAsNormalizedString(entry, reader))); - } - // Content differs: that's a real change - return true; } + if (mode == FileMode.SYMLINK.getBits()) { + return !new File(readSymlinkTarget(current())).equals( + new File(readContentAsNormalizedString(entry, reader))); + } + // Content differs: that's a real change + return true; } private static String readContentAsNormalizedString(DirCacheEntry entry, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/IndexDiffFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/IndexDiffFilter.java index 6cca582b3..52fb88829 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/IndexDiffFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/IndexDiffFilter.java @@ -212,10 +212,9 @@ public boolean include(TreeWalk tw) throws MissingObjectException, // If i is cnt then the path does not appear in any other tree, // and this working tree entry can be safely ignored. return i != cnt; - } else { - // In working tree and not ignored, and not in DirCache. - return true; } + // In working tree and not ignored, and not in DirCache. + return true; } // Always include subtrees as WorkingTreeIterator cannot provide diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java index 3d9f875e9..11896e424 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/PathSuffixFilter.java @@ -99,10 +99,10 @@ public TreeFilter clone() { @Override public boolean include(TreeWalk walker) throws MissingObjectException, IncorrectObjectTypeException, IOException { - if (walker.isSubtree()) + if (walker.isSubtree()) { return true; - else - return walker.isPathSuffix(pathRaw, pathRaw.length); + } + return walker.isPathSuffix(pathRaw, pathRaw.length); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java index c8e6645f5..66f996554 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java @@ -173,20 +173,19 @@ public static String insertId(String message, ObjectId changeId, boolean replaceExisting) { int indexOfChangeId = indexOfChangeId(message, "\n"); //$NON-NLS-1$ if (indexOfChangeId > 0) { - if (!replaceExisting) + if (!replaceExisting) { return message; - else { - StringBuilder ret = new StringBuilder(message.substring(0, - indexOfChangeId)); - ret.append(CHANGE_ID); - ret.append(" I"); //$NON-NLS-1$ - ret.append(ObjectId.toString(changeId)); - int indexOfNextLineBreak = message.indexOf("\n", //$NON-NLS-1$ - indexOfChangeId); - if (indexOfNextLineBreak > 0) - ret.append(message.substring(indexOfNextLineBreak)); - return ret.toString(); } + StringBuilder ret = new StringBuilder( + message.substring(0, indexOfChangeId)); + ret.append(CHANGE_ID); + ret.append(" I"); //$NON-NLS-1$ + ret.append(ObjectId.toString(changeId)); + int indexOfNextLineBreak = message.indexOf("\n", //$NON-NLS-1$ + indexOfChangeId); + if (indexOfNextLineBreak > 0) + ret.append(message.substring(indexOfNextLineBreak)); + return ret.toString(); } String[] lines = message.split("\n"); //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 29519298c..068e6450f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -147,15 +147,15 @@ protected FSFactory() { */ public FS detect(Boolean cygwinUsed) { if (SystemReader.getInstance().isWindows()) { - if (cygwinUsed == null) + if (cygwinUsed == null) { cygwinUsed = Boolean.valueOf(FS_Win32_Cygwin.isCygwin()); - if (cygwinUsed.booleanValue()) + } + if (cygwinUsed.booleanValue()) { return new FS_Win32_Cygwin(); - else - return new FS_Win32(); - } else { - return new FS_POSIX(); + } + return new FS_Win32(); } + return new FS_POSIX(); } } @@ -1197,14 +1197,13 @@ protected static String readPipe(File dir, String[] command, gobbler.join(); if (rc == 0 && !gobbler.fail.get()) { return r; - } else { - if (debug) { - LOG.debug("readpipe rc=" + rc); //$NON-NLS-1$ - } - throw new CommandFailedException(rc, - gobbler.errorMessage.get(), - gobbler.exception.get()); } + if (debug) { + LOG.debug("readpipe rc=" + rc); //$NON-NLS-1$ + } + throw new CommandFailedException(rc, + gobbler.errorMessage.get(), + gobbler.exception.get()); } catch (InterruptedException ie) { // Stop bothering me, I have a zombie to reap. } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java index a07a4fd1a..391598d8a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java @@ -345,13 +345,14 @@ public static List readLines(String s) { c = s.charAt(++i); l.add(sb.toString()); sb.setLength(0); - if (c != '\n') + if (c != '\n') { sb.append(c); + } continue; - } else { // EOF - l.add(sb.toString()); - break; } + // EOF + l.add(sb.toString()); + break; } sb.append(c); } @@ -401,20 +402,18 @@ public static String readLine(Reader in, int sizeHint) throws IOException { } resetAndSkipFully(in, n); } - } else { - StringBuilder buf = sizeHint > 0 - ? new StringBuilder(sizeHint) - : new StringBuilder(); - int i; - while ((i = in.read()) != -1) { - char c = (char) i; - buf.append(c); - if (c == '\n') { - break; - } - } - return buf.toString(); } + StringBuilder buf = sizeHint > 0 ? new StringBuilder(sizeHint) + : new StringBuilder(); + int i; + while ((i = in.read()) != -1) { + char c = (char) i; + buf.append(c); + if (c == '\n') { + break; + } + } + return buf.toString(); } private static void resetAndSkipFully(Reader fd, long toSkip) throws IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RefMap.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RefMap.java index 9663e3cef..ce1308f33 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RefMap.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RefMap.java @@ -191,12 +191,11 @@ public Ref put(String keyName, Ref value) { Ref prior = loose.get(name); loose = loose.set(idx, value); return prior; - } else { - Ref prior = get(keyName); - loose = loose.add(idx, value); - sizeIsValid = false; - return prior; } + Ref prior = get(keyName); + loose = loose.add(idx, value); + sizeIsValid = false; + return prior; } /** {@inheritDoc} */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SshSupport.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SshSupport.java index 913aa7286..84db786b1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SshSupport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SshSupport.java @@ -109,9 +109,8 @@ public static String runSshCommand(URIish sshUri, // wrong exception type :( if (process.waitFor() == 0) { return stdout.toString(); - } else { - return null; // still running after timeout } + return null; // still running after timeout } catch (InterruptedException e) { return null; // error } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/LimitedInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/LimitedInputStream.java index 9ab2caa1a..e437c1114 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/LimitedInputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/LimitedInputStream.java @@ -98,15 +98,16 @@ public synchronized void mark(int readLimit) { @Override public int read() throws IOException { if (left == 0) { - if (in.available() == 0) + if (in.available() == 0) { return -1; - else - limitExceeded(); + } + limitExceeded(); } int result = in.read(); - if (result != -1) + if (result != -1) { --left; + } return result; } @@ -114,16 +115,17 @@ public int read() throws IOException { @Override public int read(byte[] b, int off, int len) throws IOException { if (left == 0) { - if (in.available() == 0) + if (in.available() == 0) { return -1; - else - limitExceeded(); + } + limitExceeded(); } len = (int) Math.min(len, left); int result = in.read(b, off, len); - if (result != -1) + if (result != -1) { left -= result; + } return result; }