diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java index ad4309258..b968122a4 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java @@ -82,13 +82,13 @@ public class InstructionDefinition { protected FullMultinameTreeItem resolveMultiname(Stack stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) { TreeItem ns = null; - TreeItem name = null; - if (constants.constant_multiname[multinameIndex].needsNs()) { - ns = (TreeItem) stack.pop(); - } + TreeItem name = null; if (constants.constant_multiname[multinameIndex].needsName()) { name = (TreeItem) stack.pop(); } + if (constants.constant_multiname[multinameIndex].needsNs()) { + ns = (TreeItem) stack.pop(); + } return new FullMultinameTreeItem(ins, multinameIndex, name, ns); } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java index 30f03cb82..0149d0646 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/FullMultinameTreeItem.java @@ -56,21 +56,17 @@ public class FullMultinameTreeItem extends TreeItem { public String toString(ConstantPool constants, HashMap localRegNames) { String ret = ""; if (name != null) { - ret = name.toString(constants,localRegNames); + ret = "["+name.toString(constants,localRegNames)+"]"; } else { - ret = constants.constant_multiname[multinameIndex].getName(constants); + ret = hilight(constants.constant_multiname[multinameIndex].getName(constants)); } if (namespace != null) { - ret = ret + "[" + namespace.toString(constants,localRegNames) + "]"; + ret=namespace.toString(constants,localRegNames)+"::"+ret; } else { - Namespace ns = constants.constant_multiname[multinameIndex].getNamespace(constants); - if (ns != null) { - ret = ret + "[" + ns.getName(constants) + "]"; - } - } - - if ((name == null) && (namespace == null)) { - ret = hilight(constants.constant_multiname[multinameIndex].getName(constants)); + /*Namespace ns = constants.constant_multiname[multinameIndex].getNamespace(constants); + if ((ns != null)&&(ns.name_index!=0)) { + ret = hilight(ns.getName(constants) + "::")+ret; + }*/ } return ret; } diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java index da8fe6e0a..03154f392 100644 --- a/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/asdec/abc/avm2/treemodel/TreeItem.java @@ -91,10 +91,13 @@ public abstract class TreeItem { if (((LocalRegTreeItem) object).computedValue instanceof FindPropertyTreeItem) obStr = ""; } + if(obStr.equals("")){ + return propertyName.toString(constants,localRegNames); + } if (propertyName instanceof FullMultinameTreeItem) { - if (((FullMultinameTreeItem) propertyName).isRuntime()) { - return obStr + "[" + propertyName.toString(constants,localRegNames) + "]"; + if (((FullMultinameTreeItem) propertyName).isRuntime()) { + return obStr + propertyName.toString(constants,localRegNames); } else { if (!obStr.equals("")) obStr += "."; return obStr + ((FullMultinameTreeItem) propertyName).toString(constants,localRegNames); diff --git a/trunk/src/com/jpexs/asdec/gui/graphics/icon256.png b/trunk/src/com/jpexs/asdec/gui/graphics/icon256.png new file mode 100644 index 000000000..795fbf28b Binary files /dev/null and b/trunk/src/com/jpexs/asdec/gui/graphics/icon256.png differ