From 8cb318dfcbebb871e384d4c3db0beafcc73460fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sun, 5 May 2013 18:27:55 +0200 Subject: [PATCH] Issue #89 AS3: bracket in property name lead to missing dot --- .../flash/abc/avm2/treemodel/TreeItem.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java index b6bfc1cbd..dd2ee2ada 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java @@ -86,26 +86,16 @@ public abstract class TreeItem extends GraphTargetItem { return propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); } if (propertyName instanceof FullMultinameTreeItem) { - if (((FullMultinameTreeItem) propertyName).isRuntime()) { - return joinProperty(obStr, propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames))); + if (((FullMultinameTreeItem) propertyName).name != null) { + return obStr + propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); } else { - return joinProperty(obStr, ((FullMultinameTreeItem) propertyName).toString(constants, localRegNames, fullyQualifiedNames)); + return obStr + "." + propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)); } } else { return obStr + "[" + propertyName.toString(Helper.toList(constants, localRegNames, fullyQualifiedNames)) + "]"; } } - private String joinProperty(String prefix, String name) { - if (prefix.endsWith(".")) { - prefix = prefix.substring(0, prefix.length() - 1); - } - if (!Highlighting.stripHilights(name).startsWith("[")) { - return prefix + "." + name; - } - return prefix + name; - } - public static String localRegName(HashMap localRegNames, int reg) { if (localRegNames.containsKey(reg)) { return localRegNames.get(reg);