LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-01 19:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #128 improved imports

Browse Source
This commit is contained in:
Jindra Petk
2013-06-16 20:19:25 +02:00
parent f464ed5605
commit 0aadf53cb7
1 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
View File

@@ -77,6 +77,13 @@ public class TraitClass extends Trait implements TraitWithSlot {
name = "*";
}
String newimport = ns.getName(abc.constants);
System.out.println(newimport + ":" + name + ":" + ns.getKindStr());
if ((ns.kind != Namespace.KIND_PACKAGE)
&& (ns.kind != Namespace.KIND_NAMESPACE)
&& (ns.kind != Namespace.KIND_STATIC_PROTECTED)) {
return false;
}
System.out.println(newimport);
/*if (ns.kind == Namespace.KIND_NAMESPACE)*/ {
String oldimport = newimport;
newimport = null;
@@ -90,7 +97,18 @@ public class TraitClass extends Trait implements TraitWithSlot {
break;
}
}
if (newimport == null) {
newimport = oldimport;
newimport += "." + name;
}
if (newimport.equals("")) {
newimport = null;
}
if (newimport != null) {
/* if(ns.kind==Namespace.KIND_PACKAGE){
newimport+=".*";
}*/
if (!imports.contains(newimport)) {
if (newimport.contains(":")) {
return true;
@@ -103,11 +121,15 @@ public class TraitClass extends Trait implements TraitWithSlot {
if (usname.contains(".")) {
usname = usname.substring(usname.lastIndexOf(".") + 1);
}
if (!pkg.equals(ignorePackage)) {
imports.add(newimport);
if (ns.kind == Namespace.KIND_PACKAGE) {
if (!pkg.equals(ignorePackage)) {
imports.add(newimport);
}
}
if (!uses.contains(usname)) {
uses.add(usname);
if (ns.kind == Namespace.KIND_NAMESPACE) {
if (!uses.contains(usname)) {
uses.add(usname);
}
}
}
return true;
@@ -166,6 +188,10 @@ public class TraitClass extends Trait implements TraitWithSlot {
if (nss != null) {
if (nss.namespaces.length == 1) {
parseUsagesFromNS(abcTags, abc, imports, uses, nss.namespaces[0], ignorePackage, name);
} else {
for (int n : nss.namespaces) {
parseUsagesFromNS(abcTags, abc, imports, uses, n, ignorePackage, "");
}
}
}
}
@@ -379,6 +405,19 @@ public class TraitClass extends Trait implements TraitWithSlot {
}
imports = imports2;*/
for(int i=0;i<imports.size();i++){
String imp=imports.get(i);
String pkg=imp.substring(0,imp.lastIndexOf("."));
String name=imp.substring(imp.lastIndexOf(".")+1);
if(name.equals("*")){
continue;
}
if(imports.contains(pkg+".*")){
imports.remove(i);
i--;
}
}
for (String imp : imports) {
if (!imp.startsWith(".")) {
out.println(ABC.IDENT_STRING + "import " + imp + ";");