Optimize code and get rid of deprecations

ThexXTURBOXx · Feb 18, 2024 · 55c5df7 · 55c5df7
1 parent 6d462cf
commit 55c5df7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/JasminDumper.java b/d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/JasminDumper.java
@@ -656,11 +656,7 @@ protected void print(final Object cst) {
     }
 
     protected void print(final Label l) {
-        String name = labelNames.get(l);
-        if (name == null) {
-            name = "L" + labelNames.size();
-            labelNames.put(l, name);
-        }
+        String name = labelNames.computeIfAbsent(l, k -> "L" + labelNames.size());
         pw.print(name);
     }
 

diff --git a/dex-reader/src/test/java/com/googlecode/d2j/reader/test/BadZipEntryFlagTest.java b/dex-reader/src/test/java/com/googlecode/d2j/reader/test/BadZipEntryFlagTest.java
@@ -18,7 +18,7 @@ public class BadZipEntryFlagTest {
     public void test1() throws IOException {
         ZipArchiveInputStream zis = new ZipArchiveInputStream(BadZipEntryFlagTest.class.getResourceAsStream("/bad"
                 + ".zip"));
-        for (ZipArchiveEntry e = zis.getNextZipEntry(); e != null; e = zis.getNextZipEntry()) {
+        for (ZipArchiveEntry e = zis.getNextEntry(); e != null; e = zis.getNextEntry()) {
             e.getGeneralPurposeBit().useEncryption(false);
             if (!e.isDirectory()) {
                 zis.read();

diff --git a/dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InvocationWeaver.java b/dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InvocationWeaver.java
@@ -657,11 +657,7 @@ private void genSwitchMethod(ClassVisitor cw, String typeName, String methodName
         for (int i = 0; i < labels.length; i++) {
             Callback cb = callbacks.get(i);
             String key = callback.getKey((MtdInfo) cb.target);
-            Label label = strMap.get(key);
-            if (label == null) {
-                label = new Label();
-                strMap.put(key, label);
-            }
+            Label label = strMap.computeIfAbsent(key, k -> new Label());
             labels[i] = label;
         }