LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 06:00:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into flexcompile

Browse Source 
Conflicts:
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
	src/com/jpexs/decompiler/flash/gui/locales/MainFrame.properties
This commit is contained in:
Jindra Petřík
2016-08-14 19:55:15 +02:00
parent 0121eb171b ced5b85877
commit 003d923c80
82 changed files with 12408 additions and 11924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/docs/As3PCodeDocs.java
+4 -4
View File
@@ -190,8 +190,8 @@ public class As3PCodeDocs {
String operandTypeRaw = AVM2Code.operandTypeToString(op, false);
String operandTypeCombined = AVM2Code.operandTypeToString(op, true);
if (operandTypeCombined.contains(", ")) {
String operandTypesCombined[] = operandTypeCombined.split(", ?");
String operandTypesRaw[] = operandTypeRaw.split(", ?");
String[] operandTypesCombined = operandTypeCombined.split(", ?");
String[] operandTypesRaw = operandTypeRaw.split(", ?");
for (int j = 0; j < operandTypesCombined.length; j++) {
if (!first) {
@@ -225,8 +225,8 @@ public class As3PCodeDocs {
}
}
}
sb.append("</div>").append(NEWLINE);
}
sb.append("</div>").append(NEWLINE);
sb.append("<div class=\"short-description\">").append(insShortDescription).append("</div>").append(NEWLINE);
@@ -236,7 +236,7 @@ public class As3PCodeDocs {
sb.append("<div class=\"stack\"><strong class=\"stack-title\">").append(getProperty("ui.stack")).append("</strong><span class=\"stack-values " + (def.hasFlag(AVM2InstructionFlag.UNKNOWN_STACK) ? " unknown" : "") + "\">").append(stack).append("</span>").append("</div>").append(NEWLINE);
boolean flagsPrinted = false;
AVM2InstructionFlag flags[] = def.flags.clone();
AVM2InstructionFlag[] flags = def.flags.clone();
Arrays.sort(flags, Enum::compareTo);
for (AVM2InstructionFlag fl : flags) {