Merge pull request #299 from leibnitz27/tidy-structured-finally

Tidy prev commit

decompilation-test/test-data-expected-output/classes/TryTest1.10.expected.java

@@ -0,0 +1,21 @@
+/*
+ * Decompiled with CFR.
+ */
+package org.benf.cfr.tests;
+
+public class TryTest1 {
+    public void test1() {
+        try {
+            try {
+                System.out.print(3);
+                throw new NoSuchFieldException();
+            } catch (NoSuchFieldException noSuchFieldException) {
+                System.out.print("Finally!");
+            }
+        } catch (Throwable throwable) {
+            System.out.print("Finally!");
+            throw throwable;
+        }
+        System.out.print(5);
+    }
+}

decompilation-test/test-specs/classes.xml

@@ -28,4 +28,9 @@
         <name>EnumTestEmpty</name>
         <label>13</label>
     </class>
+    <class>
+        <path>precompiled_tests/java_10/org/benf/cfr/tests</path>
+        <name>TryTest1</name>
+        <label>10</label>
+    </class>
 </classes>

src/org/benf/cfr/reader/bytecode/analysis/structured/statement/StructuredTry.java

@@ -14,7 +14,6 @@
 import org.benf.cfr.reader.util.collections.ListFactory;
 import org.benf.cfr.reader.util.output.Dumper;
 
-import java.util.Iterator;
 import java.util.List;
 
 public class StructuredTry extends AbstractStructuredStatement {
@@ -78,15 +77,12 @@ public Dumper dump(Dumper dumper) {
             dumper.separator(")");
         }
         tryBlock.dump(dumper);
-        dumper.removePendingCarriageReturn().separator(" ");
-        for (Iterator<Op04StructuredStatement> it = catchBlocks.iterator(); it.hasNext();) {
-            Op04StructuredStatement catchBlock = it.next();
+        for (Op04StructuredStatement catchBlock : catchBlocks) {
+            dumper.removePendingCarriageReturn().separator(" ");
             catchBlock.dump(dumper);
-            if (it.hasNext() || finallyBlock != null) {
-                dumper.removePendingCarriageReturn().separator(" ");
-            }
         }
         if (finallyBlock != null) {
+            dumper.removePendingCarriageReturn().separator(" ");
             finallyBlock.dump(dumper);
         }
         return dumper;