Skip to content

Commit 00340ec

Browse files
Bl3ndBl3nd
committed
Remove test field on FernFlowerDecompiler generateMainMethod
1 parent 756c823 commit 00340ec

1 file changed

Lines changed: 37 additions & 31 deletions

File tree

‎src/main/java/the/bytecode/club/bytecodeviewer/decompilers/impl/FernFlowerDecompiler.java‎

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public FernFlowerDecompiler()
5959

6060
private String[] inners;
6161
private final List<File> innerFiles = new ArrayList<>();
62+
6263
@Override
6364
public String decompileClassNode(ClassNode cn, byte[] bytes)
6465
{
@@ -88,19 +89,24 @@ else if (innerClasses.get(i).outerName == null)
8889
}
8990
}
9091

91-
for (ResourceContainer container :BytecodeViewer.resourceContainers.values()) {
92+
for (ResourceContainer container : BytecodeViewer.resourceContainers.values())
93+
{
9294
container.resourceClasses.forEach((s, classNode) -> {
93-
for (String innerClassName : inners) {
94-
if (s.equals(innerClassName)) {
95+
for (String innerClassName : inners)
96+
{
97+
if (s.equals(innerClassName))
98+
{
9599
innerTempFile.set(TempFile.createTemporaryFile(true, ".class"));
96100
File tempInputClassFile2 = innerTempFile.get().getFile();
97-
try (FileOutputStream fos = new FileOutputStream(tempInputClassFile2)) {
101+
try (FileOutputStream fos = new FileOutputStream(tempInputClassFile2))
102+
{
98103
fos.write(ASMUtil.nodeToBytes(classNode));
99104
}
100105
catch (IOException e)
101106
{
102107
throw new RuntimeException(e);
103-
} finally
108+
}
109+
finally
104110
{
105111
innerFiles.add(tempInputClassFile2);
106112
innerTempFile.get().markAsCreatedFile(tempInputClassFile2);
@@ -135,7 +141,7 @@ else if (innerClasses.get(i).outerName == null)
135141
{
136142
ExternalResources.getSingleton().getJavaCommand(true),
137143
"-jar", ExternalResources.getSingleton().findLibrary("fernflower")
138-
}, generateMainMethod(tempInputClassFile.getAbsolutePath(), "", tempFile.getParent().getAbsolutePath())
144+
}, generateMainMethod(tempInputClassFile.getAbsolutePath(), tempFile.getParent().getAbsolutePath())
139145
), false);
140146
}
141147
else
@@ -170,7 +176,7 @@ else if (innerClasses.get(i).outerName == null)
170176
finally
171177
{
172178
//cleanup temp files
173-
if(tempFile != null)
179+
if (tempFile != null)
174180
tempFile.cleanup();
175181

176182
if (innerTempFile.get() != null)
@@ -202,7 +208,7 @@ public void decompileToZip(String sourceJar, String zipName)
202208

203209
try
204210
{
205-
ConsoleDecompiler.main(generateMainMethod(tempInputJarFile.getAbsolutePath(), "", TEMP_DIRECTORY + "./temp/"));
211+
ConsoleDecompiler.main(generateMainMethod(tempInputJarFile.getAbsolutePath(), TEMP_DIRECTORY + "./temp/"));
206212
}
207213
catch (StackOverflowError | Exception ignored)
208214
{
@@ -248,31 +254,31 @@ private List<String> generate(String className, String folder)
248254
return strings;
249255
}
250256

251-
private String[] generateMainMethod(String className, String test, String folder)
257+
private String[] generateMainMethod(String className, String folder)
252258
{
253259
return new String[]
254-
{
255-
"-rbr=" + ffOnValue(BytecodeViewer.viewer.rbr.isSelected()),
256-
"-rsy=" + ffOnValue(BytecodeViewer.viewer.rsy.isSelected()),
257-
"-din=" + ffOnValue(BytecodeViewer.viewer.din.isSelected()),
258-
"-dc4=" + ffOnValue(BytecodeViewer.viewer.dc4.isSelected()),
259-
"-das=" + ffOnValue(BytecodeViewer.viewer.das.isSelected()),
260-
"-hes=" + ffOnValue(BytecodeViewer.viewer.hes.isSelected()),
261-
"-hdc=" + ffOnValue(BytecodeViewer.viewer.hdc.isSelected()),
262-
"-dgs=" + ffOnValue(BytecodeViewer.viewer.dgs.isSelected()),
263-
"-ner=" + ffOnValue(BytecodeViewer.viewer.ner.isSelected()),
264-
"-den=" + ffOnValue(BytecodeViewer.viewer.den.isSelected()),
265-
"-rgn=" + ffOnValue(BytecodeViewer.viewer.rgn.isSelected()),
266-
"-bto=" + ffOnValue(BytecodeViewer.viewer.bto.isSelected()),
267-
"-nns=" + ffOnValue(BytecodeViewer.viewer.nns.isSelected()),
268-
"-uto=" + ffOnValue(BytecodeViewer.viewer.uto.isSelected()),
269-
"-udv=" + ffOnValue(BytecodeViewer.viewer.udv.isSelected()),
270-
"-rer=" + ffOnValue(BytecodeViewer.viewer.rer.isSelected()),
271-
"-fdi=" + ffOnValue(BytecodeViewer.viewer.fdi.isSelected()),
272-
"-asc=" + ffOnValue(BytecodeViewer.viewer.asc.isSelected()),
273-
"-ren=" + ffOnValue(BytecodeViewer.viewer.ren.isSelected()),
274-
className, test, folder
275-
};
260+
{
261+
"-rbr=" + ffOnValue(BytecodeViewer.viewer.rbr.isSelected()),
262+
"-rsy=" + ffOnValue(BytecodeViewer.viewer.rsy.isSelected()),
263+
"-din=" + ffOnValue(BytecodeViewer.viewer.din.isSelected()),
264+
"-dc4=" + ffOnValue(BytecodeViewer.viewer.dc4.isSelected()),
265+
"-das=" + ffOnValue(BytecodeViewer.viewer.das.isSelected()),
266+
"-hes=" + ffOnValue(BytecodeViewer.viewer.hes.isSelected()),
267+
"-hdc=" + ffOnValue(BytecodeViewer.viewer.hdc.isSelected()),
268+
"-dgs=" + ffOnValue(BytecodeViewer.viewer.dgs.isSelected()),
269+
"-ner=" + ffOnValue(BytecodeViewer.viewer.ner.isSelected()),
270+
"-den=" + ffOnValue(BytecodeViewer.viewer.den.isSelected()),
271+
"-rgn=" + ffOnValue(BytecodeViewer.viewer.rgn.isSelected()),
272+
"-bto=" + ffOnValue(BytecodeViewer.viewer.bto.isSelected()),
273+
"-nns=" + ffOnValue(BytecodeViewer.viewer.nns.isSelected()),
274+
"-uto=" + ffOnValue(BytecodeViewer.viewer.uto.isSelected()),
275+
"-udv=" + ffOnValue(BytecodeViewer.viewer.udv.isSelected()),
276+
"-rer=" + ffOnValue(BytecodeViewer.viewer.rer.isSelected()),
277+
"-fdi=" + ffOnValue(BytecodeViewer.viewer.fdi.isSelected()),
278+
"-asc=" + ffOnValue(BytecodeViewer.viewer.asc.isSelected()),
279+
"-ren=" + ffOnValue(BytecodeViewer.viewer.ren.isSelected()),
280+
className, folder
281+
};
276282
}
277283

278284
private String ffOnValue(boolean b)

0 commit comments

Comments
 (0)