Skip to content

Commit 949a78b

Browse files
committed
2.2.1
12/13/2014 - Fixed an issue with the Bytecode Decompiler. - Thanks bibl
1 parent 0a81d69 commit 949a78b

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed
Binary file not shown.

README.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ FernFlower by Stiver
1414
Procyon by Mstrobel
1515
CFR by Lee Benfield
1616

17-
Video of Beta 1.5.2: https://the.bytecode.club/pages.php?page=bytecode-viewer
18-
19-
Download the latest version here: https://github.com/Konloch/bytecode-viewer/releases if you're looking for an older copy, check out https://the.bytecode.club/bcv-archive/
20-
17+
Video: http://the.bytecode.club/bytecodeviewer-video/
18+
Source Code: https://github.com/konloch/bytecode-viewer
19+
Bin/Archive: https://github.com/konloch/bytecode-viewer/releases
2120
Java Docs: https://the.bytecode.club/docs/bytecode-viewer/
2221

2322
Features:
@@ -175,4 +174,6 @@ Changelog:
175174
12/09/2014 - When you press enter in the text search bar, it will now search.
176175
12/13/2014 - The Bytecode Decompiler now shows the method's description in a comment.
177176
12/13/2014 - Fixed an issue with the text search function.
178-
12/13/2014 - Search results are now clickable.
177+
12/13/2014 - Search results are now clickable.
178+
--- 2.2.1 ---:
179+
12/13/2014 - Fixed an issue with the Bytecode Decompiler. - Thanks bibl

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
2.2.1

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@
208208
* 12/13/2014 - The Bytecode Decompiler now shows the method's description in a comment.
209209
* 12/13/2014 - Fixed an issue with the text search function.
210210
* 12/13/2014 - Search results are now clickable.
211+
* -----2.2.1-----:
212+
* 12/13/2014 - Fixed an issue with the Bytecode Decompiler. - Thanks bibl
211213
*
212214
* @author Konloch
213215
*
@@ -229,7 +231,7 @@ public class BytecodeViewer {
229231
private static ArrayList<String> recentPlugins = DiskReader.loadArrayList(pluginsName, false);
230232
public static boolean runningObfuscation = false;
231233

232-
public static String version = "2.2.0";
234+
public static String version = "2.2.1";
233235

234236
public static void main(String[] args) {
235237
iconList = new ArrayList<BufferedImage>();

src/the/bytecode/club/bytecodeviewer/decompilers/bytecode/InstructionPrinter.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,21 @@ protected String printIntInsnNode(IntInsnNode iin, ListIterator<?> it) {
163163
}
164164

165165
protected String printFieldInsnNode(FieldInsnNode fin, ListIterator<?> it) {
166-
return nameOpcode(fin.getOpcode()) + " " + fin.owner + "." + fin.name + ":" + Type.getType(fin.desc).getClassName();
166+
String desc = Type.getType(fin.desc).getClassName();
167+
if(desc == null || desc.equals("null"))
168+
desc = fin.desc;
169+
return nameOpcode(fin.getOpcode()) + " " + fin.owner + "." + fin.name + ":" + desc;
167170
}
168171

169172
protected String printMethodInsnNode(MethodInsnNode min, ListIterator<?> it) {
170173
StringBuilder sb = new StringBuilder();
171174
sb.append(nameOpcode(min.getOpcode()) + " " + min.owner + " " + min.name + "(");
172175

173-
if(Type.getType(min.desc).getClassName() == null ||
174-
Type.getType(min.desc).getClassName().equalsIgnoreCase("null"))
175-
{
176-
//sb.append(min.desc);
177-
} else {
178-
sb.append(Type.getType(min.desc).getClassName());
179-
}
176+
String desc = Type.getType(min.desc).getClassName();
177+
if(desc == null || desc.equals("null"))
178+
desc = min.desc;
179+
sb.append(desc);
180+
180181
sb.append(");");
181182

182183
return sb.toString();
@@ -216,7 +217,10 @@ protected String printLabelnode(LabelNode label) {
216217

217218
protected String printTypeInsnNode(TypeInsnNode tin) {
218219
try {
219-
return nameOpcode(tin.getOpcode()) + " " + Type.getType(tin.desc).getClassName();
220+
String desc = Type.getType(tin.desc).getClassName();
221+
if(desc == null || desc.equals("null"))
222+
desc = tin.desc;
223+
return nameOpcode(tin.getOpcode()) + " " + desc;
220224
} catch(Exception e) {
221225
new the.bytecode.club.bytecodeviewer.api.ExceptionUI(e);
222226
}

0 commit comments

Comments
 (0)