Use computeIfAbsent where possible

Analysis was done with Sonarlint.

Change-Id: I9d543d37886c7cfbd3a43ecf4477b8e8f3f573ff
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>

5 files changed, 14 insertions, 28 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/AuthorColors.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/AuthorColors.java
index 271f87899b..eb31fa8ecf 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/AuthorColors.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/blame/AuthorColors.java
@@ -69,12 +69,8 @@ public class AuthorColors {
 	 * @return the corresponding color
 	 */
 	public RGB getCommitterRGB(String author) {
-		RGB rgb = colors.get(author);
-		if (rgb == null) {
-			rgb = COMMITTER_RGBs[count++ % COMMITTER_RGBs.length];
-			colors.put(author, rgb);
-		}
-		return rgb;
+		return colors.computeIfAbsent(author,
+				key -> COMMITTER_RGBs[count++ % COMMITTER_RGBs.length]);
 	}
 
 }
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java
index a95ca96eb6..b570a2ff27 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/DiffEditorOutlinePage.java
@@ -357,13 +357,12 @@ public class DiffEditorOutlinePage extends NestedContentOutlinePage {
 				} else {
 					path = "/"; //$NON-NLS-1$
 				}
-				Folder folder = folders.get(path);
-				if (folder == null) {
-					folder = new Folder();
-					folder.name = path;
-					folder.files = new ArrayList<>();
-					folders.put(path, folder);
-				}
+				Folder folder = folders.computeIfAbsent(path, key -> {
+					Folder newFolder = new Folder();
+					newFolder.name = key;
+					newFolder.files = new ArrayList<>();
+					return newFolder;
+				});
 				folder.files.add(range);
 				parents.put(range, folder);
 			}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/SubmoduleCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/SubmoduleCommand.java
index 3880efdccf..1c0c4ec51b 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/SubmoduleCommand.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/SubmoduleCommand.java
@@ -48,11 +48,8 @@ public abstract class SubmoduleCommand<V extends RepositoryTreeNode<?>> extends
 				Repository parent = node.getParent().getRepository();
 				String path = Repository.stripWorkDir(parent.getWorkTree(),
 						node.getRepository().getWorkTree());
-				List<String> paths = repoPaths.get(parent);
-				if (paths == null) {
-					paths = new ArrayList<>();
-					repoPaths.put(parent, paths);
-				}
+				List<String> paths = repoPaths.computeIfAbsent(parent,
+						key -> new ArrayList<>());
 				paths.add(path);
 			}
 		}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java
index a0f58339fa..48981715e1 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java
@@ -212,11 +212,8 @@ public class StagingViewContentProvider extends WorkbenchContentProvider {
 
 	private static void addChild(Map<IPath, List<Object>> childrenForPath,
 			IPath path, Object child) {
-		List<Object> children = childrenForPath.get(path);
-		if (children == null) {
-			children = new ArrayList<>();
-			childrenForPath.put(path, children);
-		}
+		List<Object> children = childrenForPath.computeIfAbsent(path,
+				key -> new ArrayList<>());
 		children.add(child);
 	}
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitSynchronizeWizardPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitSynchronizeWizardPage.java
index eabc4fa512..04f0a07258 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitSynchronizeWizardPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitSynchronizeWizardPage.java
@@ -103,11 +103,8 @@ class GitSynchronizeWizardPage extends WizardPage {
 			if (repositoryMapping == null)
 				continue;
 			Repository repo = repositoryMapping.getRepository();
-			Set<IProject> projects = resources.get(repo);
-			if (projects == null) {
-				projects = new HashSet<>();
-				resources.put(repo, projects);
-			}
+			Set<IProject> projects = resources.computeIfAbsent(repo,
+					key -> new HashSet<>());
 			projects.add(project);
 		}