Cynosphere
/
bcv-vf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #374 from ThexXTURBOXx/master 

Fix closed stream for Procyon
This commit is contained in:
Konloch 2021-11-18 12:39:09 -08:00 committed by GitHub
parent 713edc016e 1f009d5c69
commit bf1faa949d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,10 +68,9 @@ import static the.bytecode.club.bytecodeviewer.translation.TranslatedStrings.PRO
* @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 class ProcyonDecompiler extends InternalDecompiler
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 class ProcyonDecompiler extends InternalDecompiler
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 @@ public class ProcyonDecompiler extends InternalDecompiler
|| ((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 @@ public class ProcyonDecompiler extends InternalDecompiler
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 @@ public class ProcyonDecompiler extends InternalDecompiler
* @author DeathMarine
*/
public static final class LuytenTypeLoader implements ITypeLoader {
private final List<ITypeLoader> _typeLoaders;
public LuytenTypeLoader() {
@ -251,5 +249,7 @@ public class ProcyonDecompiler extends InternalDecompiler
return false;
}
}
}