Skip to content

Commit 870987f

Browse files
committed
bug fixes
1 parent 31ce1dd commit 870987f

File tree

2 files changed

+8
-33
lines changed

2 files changed

+8
-33
lines changed

src/the/bytecode/club/bytecodeviewer/BytecodeViewer.java

Lines changed: 6 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -96,35 +96,9 @@
9696
* fix classfile searcher
9797
* make the decompilers launch in a separate process?
9898
*
99-
* -----2.9.8-----:
100-
* 07/19/2015 - Fixed enjarify.
101-
* 07/20/2015 - Bibl sexified the boot loading time.
102-
* 07/20/2015 - Decode APK Resources is selected by default.
103-
* 07/20/2015 - Made the security manager slightly safer, it can still be targeted but not as obviously now.
104-
* 07/20/2015 - Added CLI to the boot page.
105-
* 07/21/2015 - Added support for offline mode in case you cannot connect to github for some reason. (kicks in after 7 seconds)
106-
* 07/21/2015 - Added fatjar option back, in case anyone wants a 100% portable version.
107-
* 07/21/2015 - Made it so it now shows the decompiler it's using - http://i.imgur.com/yMEzXwv.png.
108-
* 07/21/2015 - Rewrote the file system, it now shows the path of the jar it's got loaded.
109-
* 07/21/2015 - Now it shows if the decompiler is in editable mode or not.
110-
* 07/21/2015 - Fixed Enjarify bug from new security manager.
111-
* 07/22/2015 - Fixed a typo (Thanks affffsdsd)
112-
* 07/22/2015 - Finally added icons to the File Navigator, credits to http://famfamfam.com/lab/icons/silk/ for the icons.
113-
* 07/22/2015 - JD-GUI is now the default decompiler for GUI.
114-
* 07/22/2015 - Added Set Python 3.X to the UI.
115-
* 07/22/2015 - Fixed krakatau/export as jar bug introduced by file system update.
116-
* 07/22/2015 - Sped up krakatau decompiler/disassembler on big files.
117-
* 07/22/2015 - Made it so when you press enter on the file navigation pane it opens the class.
118-
* 07/22/2015 - The Quick file search now opens the files again.
119-
* 07/23/2015 - Fixed opening single files and file folders into BCV
120-
* 07/24/2015 - Added File>Reload Resources.
121-
* 07/26/2015 - Fixed the view pane refresh after toggling a viewer, it's now flawless.
122-
* 07/26/2015 - Fixed Krakatau Disassembler.
123-
* 07/26/2015 - Mibbzz is gay once again.
124-
* 07/30/2015 - Removed Janino Compiler & moved to Javac, it can now compile decompiled classes again.
125-
* 07/30/2015 - Affssdd fixed the File Navigator Pane's Quick Class Search.
126-
* 07/30/2015 - Fixed a process leak in KrakatauDisassembler.
127-
* 07/30/2015 - Started working on converting all the decompilers to launch in their own process in an effort to reduce BCV resources (only for non-fatjar version).
99+
* -----2.9.9-----:
100+
* 08/01/2015 - Fixed a pingback concurrency exception issue.
101+
* 08/01/2015 - Fixed a typo for FernFlower decompiler.
128102
*
129103
* @author Konloch
130104
*
@@ -135,7 +109,7 @@ public class BytecodeViewer {
135109
/*per version*/
136110
public static String version = "2.9.8";
137111
public static boolean previewCopy = false;
138-
public static boolean fatJar = false;
112+
public static boolean fatJar = false; //could be automatic by checking if it's loaded a class named whatever for a library
139113
/*the rest*/
140114
public static boolean verify = false; //eventually may be a setting
141115
public static String[] args;
@@ -465,7 +439,8 @@ public static void pingback() {
465439

466440
if (result == 0) {
467441
try {
468-
PingBack.start();
442+
if(!PingBack.isAlive())
443+
PingBack.start();
469444
} catch (Exception e) {
470445
new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);
471446
}

src/the/bytecode/club/bytecodeviewer/gui/ClassViewer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ public void keyPressed(KeyEvent e) {
946946
@Override public void keyReleased(KeyEvent arg0) { }
947947
@Override public void keyTyped(KeyEvent arg0) { }
948948
});
949-
scrollPane.setColumnHeaderView(new JLabel("CFR Decompiler - Editable: " + panelArea.isEditable()));
949+
scrollPane.setColumnHeaderView(new JLabel("FernFlower Decompiler - Editable: " + panelArea.isEditable()));
950950
panel2.add(scrollPane);
951951
panelArea.setFont(new Font(Font.MONOSPACED, Font.PLAIN, (int)BytecodeViewer.viewer.fontSpinner.getValue()));
952952

@@ -1197,7 +1197,7 @@ public void keyPressed(KeyEvent e) {
11971197
@Override public void keyReleased(KeyEvent arg0) { }
11981198
@Override public void keyTyped(KeyEvent arg0) { }
11991199
});
1200-
scrollPane.setColumnHeaderView(new JLabel("CFR Decompiler - Editable: " + panelArea.isEditable()));
1200+
scrollPane.setColumnHeaderView(new JLabel("FernFlower Decompiler - Editable: " + panelArea.isEditable()));
12011201
panel3.add(scrollPane);
12021202
panelArea.setFont(new Font(Font.MONOSPACED, Font.PLAIN, (int)BytecodeViewer.viewer.fontSpinner.getValue()));
12031203

0 commit comments

Comments
 (0)