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

Merge pull request #131 from afffsdd/master

Browse source 
Fix crash on start; update Fernflower and CFR
This commit is contained in:
Kalen (Konloch) Kinloch 2016-03-12 20:04:41 -07:00
commit 45c8bb4aac
7 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
libs/cfr_0_110.jar → libs/cfr_0_115.jar
View file

Binary file not shown.

BIN
libs/fernflower-2016.jar Normal file
View file

Binary file not shown.

BIN
libs/fernflower2015-1.jar
View file

Binary file not shown.

BIN
libs/slf4j-api-1.7.18.jar Normal file
View file

Binary file not shown.

BIN
libs/slf4j-nop-1.7.18.jar Normal file
View file

Binary file not shown.

2
src/main/java/the/bytecode/club/bytecodeviewer/decompilers/CFRDecompiler.java
View file

@ -195,7 +195,7 @@ public class CFRDecompiler extends Decompiler {
e1.analyseTop(dcCommonState); e1.analyseTop(dcCommonState);
TypeUsageCollector collectingDumper = new TypeUsageCollector(e1); TypeUsageCollector collectingDumper = new TypeUsageCollector(e1);
e1.collectTypeUsages(collectingDumper); e1.collectTypeUsages(collectingDumper);
d = new FileDumper(output.toAbsolutePath().toString(), e1.getClassType(), summaryDumper, collectingDumper.getTypeUsageInformation(), options, illegalIdentifierDump); d = new FileDumper(output.toAbsolutePath().toString(), true, e1.getClassType(), summaryDumper, collectingDumper.getTypeUsageInformation(), options, illegalIdentifierDump);
e1.dump(d); e1.dump(d);
d.print("\n"); d.print("\n");
d.print("\n"); d.print("\n");

2
src/main/java/the/bytecode/club/bytecodeviewer/gui/MainViewerGUI.java
View file

@ -1245,7 +1245,7 @@ public class MainViewerGUI extends JFrame implements FileChangeNotifier {
} }
} }
}); });
panelGroup1.setSelected(allDecompilersRev.get(panelGroup1).get(Decompiler.JDGUI).getModel(), true); panelGroup1.setSelected(allDecompilersRev.get(panelGroup1).get(Decompiler.FERNFLOWER).getModel(), true);
panelGroup2.setSelected(allDecompilersRev.get(panelGroup2).get(Decompiler.BYTECODE).getModel(), true); panelGroup2.setSelected(allDecompilersRev.get(panelGroup2).get(Decompiler.BYTECODE).getModel(), true);
panelGroup3.setSelected(allDecompilersRev.get(panelGroup3).get(null).getModel(), true); panelGroup3.setSelected(allDecompilersRev.get(panelGroup3).get(null).getModel(), true);
this.setLocationRelativeTo(null); this.setLocationRelativeTo(null);