Merge origin/master

Conflicts:
	libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScript3Parser.java
This commit is contained in:
Jindra Petřík
2015-11-10 11:51:18 +01:00
16 changed files with 234 additions and 210 deletions
@@ -786,7 +786,7 @@ public class ABCPanel extends JPanel implements ItemListener, SearchListener<ABC
nskind = newTraitDialog.getNamespaceKind();
name = newTraitDialog.getTraitName();
isStatic = newTraitDialog.getStatic();
m = new Multiname(Multiname.QNAME, abc.constants.getStringId(name, true), abc.constants.getNamespaceId(nskind, "", 0, true), 0);
m = Multiname.createQName(false, abc.constants.getStringId(name, true), abc.constants.getNamespaceId(nskind, "", 0, true));
int mid = abc.constants.getMultinameId(m, false);
if (mid <= 0) {
break;