From 8415f8e6f5cca6eb4938f6ccafaf9798baa27cbc Mon Sep 17 00:00:00 2001
From: Egor Ushakov <egor.ushakov@jetbrains.com>
Date: Fri, 16 Feb 2018 21:02:19 +0300
Subject: [PATCH] cleanup: use putIfAbsent

---
 .../main/collectors/BytecodeMappingTracer.java         | 10 +++-------
 .../main/collectors/BytecodeSourceMapper.java          |  8 ++------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
index 449c5df..c6a23b3 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeMappingTracer.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.struct.attr.StructLineNumberTableAttribute;
@@ -28,9 +28,7 @@ public class BytecodeMappingTracer {
   }
 
   public void addMapping(int bytecode_offset) {
-    if (!mapping.containsKey(bytecode_offset)) {
-      mapping.put(bytecode_offset, currentSourceLine);
-    }
+    mapping.putIfAbsent(bytecode_offset, currentSourceLine);
   }
 
   public void addMapping(Set<Integer> bytecode_offsets) {
@@ -44,9 +42,7 @@ public class BytecodeMappingTracer {
   public void addTracer(BytecodeMappingTracer tracer) {
     if (tracer != null) {
       for (Entry<Integer, Integer> entry : tracer.mapping.entrySet()) {
-        if (!mapping.containsKey(entry.getKey())) {
-          mapping.put(entry.getKey(), entry.getValue());
-        }
+        mapping.putIfAbsent(entry.getKey(), entry.getValue());
       }
     }
   }
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
index d5166b8..67fb04f 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/BytecodeSourceMapper.java
@@ -1,6 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.java.decompiler.main.collectors;
 
 import org.jetbrains.java.decompiler.main.DecompilerContext;
@@ -24,9 +22,7 @@ public class BytecodeSourceMapper {
     Map<Integer, Integer> method_mapping = class_mapping.computeIfAbsent(methodName, k -> new HashMap<>());
 
     // don't overwrite
-    if (!method_mapping.containsKey(bytecodeOffset)) {
-      method_mapping.put(bytecodeOffset, sourceLine);
-    }
+    method_mapping.putIfAbsent(bytecodeOffset, sourceLine);
   }
 
   public void addTracer(String className, String methodName, BytecodeMappingTracer tracer) {