LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-17 05:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed empty lines afer use clause.

Browse Source 
Removed printStackTrace in favor of log.
This commit is contained in:
Jindra Petřík
2024-08-17 12:05:25 +02:00
parent 45512d29a0
commit 996559ae01
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java
View File

@@ -2917,7 +2917,7 @@ public class ActionScript3Parser {
try {
gen.generateScriptInfo(sinitVariables, sinitNeedsActivation, importedClasses, openedNamespaces, scriptIndex, si, allOpenedNamespaces, localData, items, classPos);
} catch (Exception ex) {
ex.printStackTrace(); // FIXME
Logger.getLogger(ActionScript3Parser.class.getName()).log(Level.FINE, "Script generation exception", ex);
abcIndex.getSelectedAbc().script_info.remove(si);
throw ex;
}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/Trait.java
View File

@@ -501,9 +501,11 @@ public abstract class Trait implements Cloneable, Serializable {
for (String u : uses) {
writer.appendNoHilight("use namespace " + u + ";").newLine();
}
writer.newLine();
}
if (numberContextRef.getVal() != null) {
if (uses.isEmpty() && hasImport) {
writer.newLine();
}
writer.appendNoHilight("use ");
NumberContext nc = new NumberContext(numberContextRef.getVal());
writer.appendNoHilight(NumberContext.usageToName(nc.getUsage()));

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
View File

@@ -230,15 +230,17 @@ public class TraitClass extends Trait implements TraitWithSlot {
DottedChain packageName = instanceInfoMultiname.getNamespace(abc.constants).getName(abc.constants); //assume not null name
fullyQualifiedNames = new ArrayList<>();
Reference<Boolean> first = new Reference<>(true);
if (getName(abc).getNamespace(abc.constants).kind != Namespace.KIND_PACKAGE_INTERNAL) {
writeImports(this, -1, abcIndex, scriptIndex, classIndex, false, abc, writer, packageName, fullyQualifiedNames);
first.setVal(!writeImports(this, -1, abcIndex, scriptIndex, classIndex, false, abc, writer, packageName, fullyQualifiedNames));
}
String instanceInfoName = instanceInfoMultiname.getName(abc.constants, fullyQualifiedNames, false, true);
getMetaData(this, convertData, abc, writer);
boolean allowEmbed = true;
if (convertData.exportEmbedFlaMode) {
@@ -275,9 +277,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
writer.endTrait();
writer.startBlock();
writer.startClass(class_info);
Reference<Boolean> first = new Reference<>(true);
//static variables & constants
ClassInfo classInfo = abc.class_info.get(class_info);
classInfo.static_traits.toString(first, abcIndex, new Class[]{TraitSlotConst.class}, this, convertData, path + "/" + instanceInfoName, abc, true, exportMode, false, scriptIndex, class_info, writer, fullyQualifiedNames, parallel, new ArrayList<>(), isInterface);