Merge pull request #374 from ThexXTURBOXx/master

Fix closed stream for Procyon

Author: Konloch

src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/ProcyonDecompiler.java

@@ -68,10 +68,9 @@
  * @author Konloch
  * @author DeathMarine
  */
-public class ProcyonDecompiler extends InternalDecompiler
-{
-    public DecompilerSettings getDecompilerSettings()
-    {
+public class ProcyonDecompiler extends InternalDecompiler {
+
+    public DecompilerSettings getDecompilerSettings() {
         DecompilerSettings settings = new DecompilerSettings();
         settings.setAlwaysGenerateExceptionVariableForCatchBlocks(BytecodeViewer.viewer.alwaysGenerateExceptionVars.isSelected());
         settings.setExcludeNestedTypes(BytecodeViewer.viewer.excludeNestedTypes.isSelected());
@@ -118,7 +117,7 @@ public String decompileClassNode(ClassNode cn, byte[] b) {
             TypeDefinition resolvedType;
             if (type == null || ((resolvedType = type.resolve()) == null))
                 throw new Exception("Unable to resolve type.");
-            
+
             StringWriter stringwriter = new StringWriter();
             settings.getLanguage().decompileType(resolvedType, new PlainTextOutput(stringwriter), decompilationOptions);
 
@@ -130,7 +129,7 @@ public String decompileClassNode(ClassNode cn, byte[] b) {
 
             exception = ExceptionUI.SEND_STACKTRACE_TO_NL + sw;
         }
-        
+
         return PROCYON + " " + ERROR + "! " + ExceptionUI.SEND_STACKTRACE_TO +
                 nl + nl + TranslatedStrings.SUGGESTED_FIX_DECOMPILER_ERROR +
                 nl + nl + exception;
@@ -184,12 +183,11 @@ private void doSaveJarDecompiled(File inFile, File outFile)
                                     || ((resolvedType = type.resolve()) == null)) {
                                 throw new Exception("Unable to resolve type.");
                             }
-                            try (Writer writer = new OutputStreamWriter(out)) {
-                                settings.getLanguage().decompileType(resolvedType,
-                                        new PlainTextOutput(writer),
-                                        decompilationOptions);
-                                writer.flush();
-                            }
+                            Writer writer = new OutputStreamWriter(out);
+                            settings.getLanguage().decompileType(resolvedType,
+                                    new PlainTextOutput(writer),
+                                    decompilationOptions);
+                            writer.flush();
                         } finally {
                             out.closeEntry();
                         }
@@ -212,8 +210,7 @@ private void doSaveJarDecompiled(File inFile, File outFile)
                             out.closeEntry();
                         }
                     } catch (ZipException ze) {
-                        // some jar-s contain duplicate pom.xml entries: ignore
-                        // it
+                        // some jars contain duplicate pom.xml entries: ignore it
                         if (!ze.getMessage().contains("duplicate")) {
                             throw ze;
                         }
@@ -227,6 +224,7 @@ private void doSaveJarDecompiled(File inFile, File outFile)
      * @author DeathMarine
      */
     public static final class LuytenTypeLoader implements ITypeLoader {
+
         private final List<ITypeLoader> _typeLoaders;
 
         public LuytenTypeLoader() {
@@ -251,5 +249,7 @@ public boolean tryLoadType(final String internalName,
 
             return false;
         }
+
     }
+
 }