Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Refactoring the name from qname to multiname
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Richardson committed Mar 30, 2012
1 parent f803206 commit f7fc6ed
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion src/com/codeazur/as3swf/data/abc/reflect/ABCReflect.as
Expand Up @@ -73,7 +73,7 @@ package com.codeazur.as3swf.data.abc.reflect
const total:uint = instances.length;
for(var i:uint=0; i<total; i++) {
const item:IABCReflectInstance = instances[i];
if(item.qname.equals(qname)) {
if(item.multiname.equals(qname)) {
result = item;
break;
}
Expand Down
6 changes: 3 additions & 3 deletions src/com/codeazur/as3swf/data/abc/reflect/ABCReflectClass.as
Expand Up @@ -137,14 +137,14 @@ package com.codeazur.as3swf.data.abc.reflect
}

public function getTraitByQualifiedName(qname:ABCQualifiedName):IABCReflectTrait {
if(qname.ns && (qname.ns.value == super.qname.fullName || qname.ns.value.length == 0)) {
if(qname.ns && (qname.ns.value == super.multiname.fullName || qname.ns.value.length == 0)) {
const label:String = qname.label;

const traits:Vector.<IABCReflectTrait> = getInstanceTraits();
const total:uint = traits.length;
for(var i:uint=0; i<total; i++) {
const trait:IABCReflectTrait = traits[i];
const traitQName:ABCQualifiedName = trait.qname.toQualifiedName();
const traitQName:ABCQualifiedName = trait.multiname.toQualifiedName();
if(traitQName && (traitQName.label == label || traitQName.fullName == qname.fullName)) {
return trait;
}
Expand All @@ -166,7 +166,7 @@ package com.codeazur.as3swf.data.abc.reflect

private function getTraitItemForVisibilty(trait:IABCReflectTrait, visiblity:ABCReflectMemberVisibility):IABCReflectTrait {
var instance:IABCReflectTrait = null;
const traitQName:ABCQualifiedName = trait.qname.toQualifiedName();
const traitQName:ABCQualifiedName = trait.multiname.toQualifiedName();
if(traitQName.ns && traitQName.ns.kind) {
if(ABCReflectMemberVisibility.isType(visiblity, ABCReflectMemberVisibility.ALL)) {
instance = trait;
Expand Down
12 changes: 6 additions & 6 deletions src/com/codeazur/as3swf/data/abc/reflect/ABCReflectInstance.as
Expand Up @@ -9,21 +9,21 @@ package com.codeazur.as3swf.data.abc.reflect
*/
public class ABCReflectInstance implements IABCReflectInstance {

private var _qname:IABCMultiname;
private var _multiname:IABCMultiname;

public function ABCReflectInstance(qname:IABCMultiname) {
_qname = qname;
public function ABCReflectInstance(multiname:IABCMultiname) {
_multiname = multiname;
}

public function get kind():ABCReflectKind { return null; }
public function get qname():IABCMultiname { return _qname; }
public function get multiname():IABCMultiname { return _multiname; }
public function get name():String { return "ABCReflectInstance"; }

public function toString(indent:uint=0):String {
var str:String = ABC.toStringCommon(name, indent);

str += "\n" + StringUtils.repeat(indent + 2) + "QName:";
str += "\n" + qname.toString(indent + 4);
str += "\n" + StringUtils.repeat(indent + 2) + "Multiname:";
str += "\n" + multiname.toString(indent + 4);

return str;
}
Expand Down
Expand Up @@ -7,12 +7,12 @@ package com.codeazur.as3swf.data.abc.reflect
*/
public class ABCReflectInterface extends ABCReflectInstance {

public function ABCReflectInterface(qname:IABCMultiname){
super(qname);
public function ABCReflectInterface(multiname:IABCMultiname){
super(multiname);
}

public static function create(qname:IABCMultiname):ABCReflectInterface{
return new ABCReflectInterface(qname);
public static function create(multiname:IABCMultiname):ABCReflectInterface{
return new ABCReflectInterface(multiname);
}

override public function get name():String { return "ABCReflectInterface"; }
Expand Down
Expand Up @@ -8,6 +8,6 @@ package com.codeazur.as3swf.data.abc.reflect
public interface IABCReflectInstance {

function get kind():ABCReflectKind;
function get qname():IABCMultiname;
function get multiname():IABCMultiname;
}
}
Expand Up @@ -9,8 +9,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectClassTrait extends ABCReflectTrait {

public function ABCReflectClassTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectClassTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitClassInfo):ABCReflectClassTrait {
Expand Down
Expand Up @@ -8,8 +8,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectConstTrait extends ABCReflectTrait {

public function ABCReflectConstTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectConstTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitConstInfo):ABCReflectConstTrait {
Expand Down
Expand Up @@ -8,8 +8,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectFunctionTrait extends ABCReflectTrait {

public function ABCReflectFunctionTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectFunctionTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitFunctionInfo):ABCReflectFunctionTrait {
Expand Down
Expand Up @@ -8,8 +8,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectGetterTrait extends ABCReflectTrait {

public function ABCReflectGetterTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectGetterTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitMethodInfo):ABCReflectGetterTrait {
Expand Down
Expand Up @@ -8,8 +8,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectMethodTrait extends ABCReflectTrait {

public function ABCReflectMethodTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectMethodTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitMethodInfo):ABCReflectMethodTrait {
Expand Down
Expand Up @@ -8,8 +8,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectSetterTrait extends ABCReflectTrait {

public function ABCReflectSetterTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectSetterTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitMethodInfo):ABCReflectSetterTrait {
Expand Down
Expand Up @@ -8,8 +8,8 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectSlotTrait extends ABCReflectTrait {

public function ABCReflectSlotTrait(qname : IABCMultiname) {
super(qname);
public function ABCReflectSlotTrait(multiname : IABCMultiname) {
super(multiname);
}

public static function create(trait:ABCTraitSlotInfo):ABCReflectSlotTrait {
Expand Down
Expand Up @@ -10,20 +10,20 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public class ABCReflectTrait implements IABCReflectTrait {

private var _qname:IABCMultiname;
private var _multiname:IABCMultiname;

public function ABCReflectTrait(qname:IABCMultiname) {
_qname = qname;
public function ABCReflectTrait(multiname:IABCMultiname) {
_multiname = multiname;
}

public function get qname():IABCMultiname { return _qname; }
public function get multiname():IABCMultiname { return _multiname; }
public function get name():String { return "ABCReflectTrait"; }

public function toString(indent:uint=0):String {
var str:String = ABC.toStringCommon(name, indent);

str += "\n" + StringUtils.repeat(indent + 2) + "QName:";
str += "\n" + qname.toString(indent + 4);
str += "\n" + StringUtils.repeat(indent + 2) + "Multiname:";
str += "\n" + multiname.toString(indent + 4);

return str;
}
Expand Down
Expand Up @@ -7,6 +7,6 @@ package com.codeazur.as3swf.data.abc.reflect.traits
*/
public interface IABCReflectTrait {

function get qname():IABCMultiname;
function get multiname():IABCMultiname;
}
}

0 comments on commit f7fc6ed

Please sign in to comment.