better multibane namespace resolving

icon 256

trunk/src/com/jpexs/asdec/abc/avm2/instructions/InstructionDefinition.java

@@ -82,13 +82,13 @@ public class InstructionDefinition {
 
     protected FullMultinameTreeItem resolveMultiname(Stack<TreeItem> stack, ConstantPool constants, int multinameIndex, AVM2Instruction ins) {
         TreeItem ns = null;
-        TreeItem name = null;
+        TreeItem name = null;        
-        if (constants.constant_multiname[multinameIndex].needsNs()) {
-            ns = (TreeItem) stack.pop();
-        }
         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);
     }
 

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<Integer,String> 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);
+            /*Namespace ns = constants.constant_multiname[multinameIndex].getNamespace(constants);
-            if (ns != null) {
+            if ((ns != null)&&(ns.name_index!=0)) {
-                ret = ret + "[" + ns.getName(constants) + "]";
+                ret =  hilight(ns.getName(constants) + "::")+ret;
-            }
+            }*/
-        }
-
-        if ((name == null) && (namespace == null)) {
-            ret = hilight(constants.constant_multiname[multinameIndex].getName(constants));
         }
         return ret;
     }

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()) {
+            if (((FullMultinameTreeItem) propertyName).isRuntime()) {                
-                return obStr + "[" + propertyName.toString(constants,localRegNames) + "]";
+                return obStr + propertyName.toString(constants,localRegNames);
             } else {
                 if (!obStr.equals("")) obStr += ".";
                 return obStr + ((FullMultinameTreeItem) propertyName).toString(constants,localRegNames);