replace short Type

crl · crl · commit 0717a9411779 · 2018-10-26T13:50:12.000+08:00
diff --git a/src/foundation/AbstactPanel.ts b/src/foundation/AbstactPanel.ts
@@ -38,7 +38,7 @@ module mvc {
 		}
 
 
-		addReayHandle(handle: (e: EventX) => void, thisObj?: any): boolean {
+		addReayHandle(handle: Action<EventX>, thisObj?: any): boolean {
 			if (this._isReady) {
 				handle(EventX.ReadyEventX);
 				return true;
@@ -56,7 +56,7 @@ module mvc {
 			this.readyHandle.push(new ListenerItemBox(handle, thisObj));
 			return true;
 		}
-		removeReayHandle(handle: (e: EventX) => void, thisObj?: any): boolean {
+		removeReayHandle(handle: Action<EventX>, thisObj?: any): boolean {
 			if (this._isReady) {
 				return false;
 			}
diff --git a/src/foundation/ListenerItemBox.ts b/src/foundation/ListenerItemBox.ts
@@ -1,3 +1,3 @@
 class ListenerItemBox<T>{
-    constructor(public handle: (e: T) => void,public thisObj:any){}
+    constructor(public handle: Action<T>,public thisObj:any){}
 }
diff --git a/src/foundation/SocketX.ts b/src/foundation/SocketX.ts
@@ -48,7 +48,7 @@ class SocketX {
 		SocketX.sender.removeEventListener(type,listener,thisObj,false);
 	}
 
-	public static AddListener(code: number, handler: (e: IStream) => void, thisObj: any): boolean {
+	public static AddListener(code: number, handler: Action<IStream>, thisObj: any): boolean {
 		let list = SocketX.cmds[code];
 		if (!list) {
 			list = new Array<ListenerItemBox<IStream>>();
diff --git a/src/mvc/Facade.ts b/src/mvc/Facade.ts
@@ -24,7 +24,7 @@ namespace mvc {
 		public hasMediatorByName(mediatorName: string): boolean {
 			return this.view.get(mediatorName) != null;
 		}
-		public hasMediator<T extends IMediator>(c: new () => T): boolean {
+		public hasMediator<T extends IMediator>(c: ClassT<T>): boolean {
 			let aliasName = Singleton.GetAliasName(c);
 			return this.hasMediatorByName(aliasName);
 		}
@@ -51,15 +51,15 @@ namespace mvc {
 			this.model.register(proxy);
 		}
 
-		public registerCommand<T>(eventType: string, c: new () => T): boolean {
+		public registerCommand<T>(eventType: string, c: ClassT<T>): boolean {
 			if (this.commandsMap[eventType]) {
 
 				return false;
 			}
 			this.commandsMap[eventType] = c;
 			return true;
 		}
-		public removeCommand<T>(eventType: string, c: new () => T): boolean {
+		public removeCommand<T>(eventType: string, c: ClassT<T>): boolean {
 			if (this.commandsMap[eventType]) {
 
 				delete this.commandsMap[eventType]
@@ -87,7 +87,7 @@ namespace mvc {
 			return this.mvcInjectLock[className];
 		}
 
-		protected routerCreateInstance(type: new () => any): any {
+		protected routerCreateInstance(type: Class): any {
 			return new type();
 		}
 
@@ -99,7 +99,7 @@ namespace mvc {
 		}
 
 
-		public getMediator<T extends IMediator>(c: new () => T): T {
+		public getMediator<T extends IMediator>(c: ClassT<T>): T {
 			let aliasName =  Singleton.GetAliasName(c);
 			let ins = <T>this.getMediatorByName(aliasName);
 			if (!ins) {
@@ -110,22 +110,22 @@ namespace mvc {
 			return ins;
 		}
 
-		public static GetMediator<T extends IMediator>(c: new () => T): T {
+		public static GetMediator<T extends IMediator>(c: ClassT<T>): T {
 			return Facade.GetInstance().getMediator(c);
 		}
-		public static GetProxy<T extends IProxy>(c: new () => T): T {
+		public static GetProxy<T extends IProxy>(c: ClassT<T>): T {
 			return Facade.GetInstance().getProxy(c);
 		}
 
-		public static ToggleMediator<T extends IMediator>(c: new () => T): T {
+		public static ToggleMediator<T extends IMediator>(c: ClassT<T>): T {
 			return Facade.GetInstance().toggleMediator(c);
 		}
 
 
 		public hasProxyByName(proxyName: string): boolean {
 			return this.model.get(proxyName) != null;
 		}
-		public hasProxy<T extends IProxy>(c: new () => T): boolean {
+		public hasProxy<T extends IProxy>(c: ClassT<T>): boolean {
 			let aliasName = Singleton.GetAliasName(c);
 			return this.hasProxyByName(aliasName);
 		}
@@ -142,7 +142,7 @@ namespace mvc {
 			}
 			return proxy;
 		}
-		public getProxy<T extends IProxy>(c: new () => T): T {
+		public getProxy<T extends IProxy>(c: ClassT<T>): T {
 			let aliasName = Singleton.GetAliasName(c);
 			let ins = <T>this.getProxyByName(aliasName);
 			if (!ins) {
@@ -212,7 +212,7 @@ namespace mvc {
 			return mediator;
 		}
 
-		public toggleMediator<T extends IMediator>(c: new () => T, type: number = -1): T {
+		public toggleMediator<T extends IMediator>(c: ClassT<T>, type: number = -1): T {
 			let aliasName = Singleton.GetAliasName(c);
 			let t = <T>this.toggleMediatorByName(aliasName, type);
 			if (t == null) {
diff --git a/src/mvc/core/AbstractMVHost.ts b/src/mvc/core/AbstractMVHost.ts
@@ -45,7 +45,7 @@ module mvc {
 			this.readyHandle.push(new ListenerItemBox(handle, thisObj));
 			return true;
 		}
-		public removeReayHandle(handle: (e: EventX) => void, thisObj?: any): boolean {
+		public removeReayHandle(handle: Action<EventX>, thisObj?: any): boolean {
 			if (this._isReady) {
 				return false;
 			}
diff --git a/src/mvc/core/Attribute.ts b/src/mvc/core/Attribute.ts
@@ -41,12 +41,12 @@ function MVCE(type: InjectEventType, ...events: Array<string>) {
 
 namespace mvc{
 	export class InjectEventTypeHandle {
-		public constructor(public injectType: InjectEventType, public events: Array<string>, public handle: (EventX) => void) { }
+		public constructor(public injectType: InjectEventType, public events: Array<string>, public handle: Action<EventX>) { }
 	}
 	export class InjectClassData {
 		public propertys: { [index: string]: any } = {};
 		//指令
-		public cmds: { [index: number]: Array<(e: IStream) => void> } = {};
+		public cmds: { [index: number]: Array<Action<IStream>> } = {};
 		public constructor(public classPrototype: Function) {
 		}
 		/**
@@ -81,7 +81,7 @@ namespace mvc{
             }
             classInjectData.propertys[property] = 1;
         }
-        public static AddCMD(classPrototype: Function, cmd: number, handle: (e: IStream) => void) {
+        public static AddCMD(classPrototype: Function, cmd: number, handle: Action<IStream>) {
             let classInjectData = null;
             for (let item of InjectAttribute.injectMapping) {
                 if (item.classPrototype == classPrototype) {
@@ -96,7 +96,7 @@ namespace mvc{
 
             let list = classInjectData.cmds[cmd];
             if (!list) {
-                list = new Array<(e: IStream) => void>();
+                list = new Array<Action<IStream>>();
                 classInjectData.cmds[cmd] = list;
             }
             if (list.indexOf(handle) == -1) {
diff --git a/src/mvc/core/MVCInject.ts b/src/mvc/core/MVCInject.ts
@@ -37,7 +37,7 @@ module mvc {
             this.facade = facade;
         }
 
-        private getInjectClassByDef(classInjectData: InjectClassData, property: string): new () => any {
+        private getInjectClassByDef(classInjectData: InjectClassData, property: string): Class {
             let fullClassName = classInjectData.getFullClassName();
             let dic = MVCInject.injectDefMapping[fullClassName];
             if (!dic) {
@@ -105,7 +105,7 @@ module mvc {
             }
 
         }
-        protected autoMVC(classType: new () => any): any {
+        protected autoMVC(classType:Class): any {
             let fullClassName = Singleton.GetClassFullName(classType);
             if (Singleton.IsUnique(fullClassName)) {
                 return Singleton.GetInstance(fullClassName);
diff --git a/src/mvc/core/Singleton.ts b/src/mvc/core/Singleton.ts
@@ -3,13 +3,13 @@ namespace mvc {
         /**
          * 单例辅助
          */
-        private static uniqueClassMap: { [index: string]: new () => any } = {};
+        private static uniqueClassMap: { [index: string]: Class } = {};
         private static uniqueInstanceMap: { [index: string]: any } = {};
 
         /**
          * 类名或都别名找到类
          */
-        private static __classMap: { [index: string]: new () => any } = {};
+        private static __classMap: { [index: string]: Class } = {};
 
         /**
          * 别名关系表
@@ -21,7 +21,7 @@ namespace mvc {
          * 取得一个别名，或者短名称 (eg: com.lingyu.BagView 得到已注册的别名 或者生成一个规则下的短名:BagView )
          * @param fullClassName 完整的类名
          */
-        static GetAliasName(fullClassName: string | { new(): any }): string {
+        static GetAliasName(fullClassName: string | Class): string {
             if (fullClassName) {
                 let str: string;
                 if (typeof fullClassName == "string") {
@@ -58,7 +58,7 @@ namespace mvc {
         * @param aliasName 取一个别名
         * @param fullClassName 实际的完整类名(因为js默认编译是不包含包的名称空间或者模块,完整名称有利于区别不同的模块下面的同名类)
         */
-        public static RegisterUnique<T>(c: new () => T, aliasName?: string, fullClassName?: string) {
+        public static RegisterUnique<T>(c: ClassT<T>, aliasName?: string, fullClassName?: string) {
             if (!fullClassName) {
                 fullClassName = Singleton.GetClassFullName(c);
             }
@@ -81,7 +81,7 @@ namespace mvc {
          * 注册类的别名(批量)
          * @param arg 
          */
-        public static RegisterMulitClass(...arg: Array<new () => any>) {
+        public static RegisterMulitClass(...arg: Array<Class>) {
             for (const iterator of arg) {
                 if (iterator) Singleton.RegisterClass(iterator);
             }
@@ -93,7 +93,7 @@ namespace mvc {
          * @param aliasName 取一个别名
          * @param fullClassName 实际的完整类名(因为js默认编译是不包含包的名称空间或者模块,完整名称有利于区别不同的模块下面的同名类)
          */
-        public static RegisterClass<T>(c: new () => T, aliasName?: string, fullClassName?: string) {
+        public static RegisterClass<T>(c: Class, aliasName?: string, fullClassName?: string) {
             if (!fullClassName) {
                 fullClassName = Singleton.GetClassFullName(c);
             }
@@ -185,7 +185,7 @@ namespace mvc {
          * 用别名 取得一个类型
          * @param aliasName 别名/完整类名
          */
-        public static GetClass(aliasName: string): new () => any {
+        public static GetClass(aliasName: string): Class {
             if (!aliasName) {
                 console.error("aliasName is empty:" + aliasName);
                 return null;
diff --git a/src/mvc/interface/IFacade.ts b/src/mvc/interface/IFacade.ts
@@ -1,62 +1,53 @@
 namespace mvc {
 	export interface IFacade extends INotifier {
-		
-		/**
-		 /**
-		 * h5特有的注册类 操作(因为js代码的 初始化顺序关系,可能会有互相依赖项,不能直接由反射来操作,所以注册了关系用于直接初始化)
-		 * @param mediatorClass 
-		 * @param proxyClass 
-		 * @param viewClass 
-		 */
-		//registerModule<M extends IMediator,P extends IProxy,V extends IPanel>(mediatorClass:new()=>M,proxyClass:new()=>P,viewClass:new()=>V):boolean;
 
 		/**
 		 * 
 		 * @param name 视图管理类
 		 */
-		getMediatorByName(name:string):IMediator;
-		getMediator<T extends IMediator>(c: new () => T): T;
+		getMediatorByName(name: string): IMediator;
+		getMediator<T extends IMediator>(c: ClassT<T>): T;
 
-		hasMediatorByName(mediatorName:string):boolean;
-        hasMediator<T extends IMediator>(c: new () => T):boolean
+		hasMediatorByName(mediatorName: string): boolean;
+		hasMediator<T extends IMediator>(c: ClassT<T>): boolean
 
-		toggleMediatorByName(mediatorName:string, type?:number):IMediator;
-		toggleMediator<T extends IMediator>(c: new () => T,type?:number):T;
-		registerMediator(mediator:IMediator);
+		toggleMediatorByName(mediatorName: string, type?: number): IMediator;
+		toggleMediator<T extends IMediator>(c: ClassT<T>, type?: number): T;
+		registerMediator(mediator: IMediator);
 
 		/**
 		 * 
 		 * @param proxyName 数据管理类
 		 */
-		getProxyByName(proxyName:string):IProxy;
-        getProxy<T extends IProxy>(c: new () => T):T;
+		getProxyByName(proxyName: string): IProxy;
+		getProxy<T extends IProxy>(c: ClassT<T>): T;
 
-		hasProxyByName(proxyName:string):boolean;
-        hasProxy<T extends IProxy>(c: new () => T):boolean;
-		registerProxy(proxy:IProxy);
+		hasProxyByName(proxyName: string): boolean;
+		hasProxy<T extends IProxy>(c: ClassT<T>): boolean;
+		registerProxy(proxy: IProxy);
 
 		/**
 		 * 
 		 * @param eventType 注册事件
 		 * @param c 事件独立处理类
 		 */
-		registerCommand<T>( eventType:string, c:new()=>T):boolean
-		removeCommand<T>( eventType:string, c:new()=>T):boolean
-		hasCommand(eventType:string):boolean;
-		
+		registerCommand<T>(eventType: string, c: ClassT<T>): boolean
+		removeCommand<T>(eventType: string, c: ClassT<T>): boolean
+		hasCommand(eventType: string): boolean;
+
 		/**
 		 * 
 		 * @param eventInterester 关注事件处理类
 		 * @param injectEventType 关注类型
 		 * @param isBind 添加还是删除
 		 */
-		registerEventInterester(eventInterester:IEventInterester,injectEventType:InjectEventType, isBind?:boolean);
+		registerEventInterester(eventInterester: IEventInterester, injectEventType: InjectEventType, isBind?: boolean);
 
 		/**
 		 * 用于限制互相依赖的锁
 		 * @param className 
 		 */
-		getInjectLock(className:string):any;
+		getInjectLock(className: string): any;
 		__unSafeInjectInstance(toLockInstance: IMVCHost, className?: string)
 	}
 }
diff --git a/src/mvc/interface/Interface.ts b/src/mvc/interface/Interface.ts
@@ -4,12 +4,12 @@ namespace mvc {
 		 * @property index:InjectEventType;
 		 */
 		__eventInteresting: { [index: string]: Array<InjectEventTypeHandle> };
-		getEventInterests(type: InjectEventType): Array<InjectEventTypeHandle>;
+		getEventInterests(InjectEventType): Array<InjectEventTypeHandle>;
 	}
 	export interface IView {
-		get(name: string): IMVCHost;
-		register(host: IMVCHost): boolean;
-		remove(host: IMVCHost): boolean;
+		get(string): IMVCHost;
+		register(IMVCHost): boolean;
+		remove(IMVCHost): boolean;
 	}
 	export interface IMVCHost extends IAsync, IEventInterester, IInjectable {
 		readonly name: string;
@@ -19,13 +19,13 @@ namespace mvc {
 	export interface IAsync {
 		readonly isReady: boolean;
 		startSync(): boolean;
-		addReayHandle(handle: (e: EventX) => void): boolean;
+		addReayHandle(handle: Action<EventX>): boolean;
 	}
 	export interface INotifier {
 		simpleDispatch(type: string, data: any): boolean
 	}
 	export interface ICommand {
-		execute(e: EventX): void;
+		execute(EventX): void;
 	}
 	export interface IInject {
 		inject(target: IInjectable): IInjectable;

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ module mvc {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`
`41`		`- addReayHandle(handle: (e: EventX) => void, thisObj?: any): boolean {`
	`41`	`+ addReayHandle(handle: Action<EventX>, thisObj?: any): boolean {`
`42`	`42`	`if (this._isReady) {`
`43`	`43`	`handle(EventX.ReadyEventX);`
`44`	`44`	`return true;`
`@@ -56,7 +56,7 @@ module mvc {`
`56`	`56`	`this.readyHandle.push(new ListenerItemBox(handle, thisObj));`
`57`	`57`	`return true;`
`58`	`58`	`}`
`59`		`- removeReayHandle(handle: (e: EventX) => void, thisObj?: any): boolean {`
	`59`	`+ removeReayHandle(handle: Action<EventX>, thisObj?: any): boolean {`
`60`	`60`	`if (this._isReady) {`
`61`	`61`	`return false;`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`class ListenerItemBox<T>{`
`2`		`- constructor(public handle: (e: T) => void,public thisObj:any){}`
	`2`	`+ constructor(public handle: Action<T>,public thisObj:any){}`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class SocketX {`
`48`	`48`	`SocketX.sender.removeEventListener(type,listener,thisObj,false);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static AddListener(code: number, handler: (e: IStream) => void, thisObj: any): boolean {`
	`51`	`+ public static AddListener(code: number, handler: Action<IStream>, thisObj: any): boolean {`
`52`	`52`	`let list = SocketX.cmds[code];`
`53`	`53`	`if (!list) {`
`54`	`54`	`list = new Array<ListenerItemBox<IStream>>();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace mvc {`
`24`	`24`	`public hasMediatorByName(mediatorName: string): boolean {`
`25`	`25`	`return this.view.get(mediatorName) != null;`
`26`	`26`	`}`
`27`		`- public hasMediator<T extends IMediator>(c: new () => T): boolean {`
	`27`	`+ public hasMediator<T extends IMediator>(c: ClassT<T>): boolean {`
`28`	`28`	`let aliasName = Singleton.GetAliasName(c);`
`29`	`29`	`return this.hasMediatorByName(aliasName);`
`30`	`30`	`}`
`@@ -51,15 +51,15 @@ namespace mvc {`
`51`	`51`	`this.model.register(proxy);`
`52`	`52`	`}`
`53`	`53`
`54`		`- public registerCommand<T>(eventType: string, c: new () => T): boolean {`
	`54`	`+ public registerCommand<T>(eventType: string, c: ClassT<T>): boolean {`
`55`	`55`	`if (this.commandsMap[eventType]) {`
`56`	`56`
`57`	`57`	`return false;`
`58`	`58`	`}`
`59`	`59`	`this.commandsMap[eventType] = c;`
`60`	`60`	`return true;`
`61`	`61`	`}`
`62`		`- public removeCommand<T>(eventType: string, c: new () => T): boolean {`
	`62`	`+ public removeCommand<T>(eventType: string, c: ClassT<T>): boolean {`
`63`	`63`	`if (this.commandsMap[eventType]) {`
`64`	`64`
`65`	`65`	`delete this.commandsMap[eventType]`
`@@ -87,7 +87,7 @@ namespace mvc {`
`87`	`87`	`return this.mvcInjectLock[className];`
`88`	`88`	`}`
`89`	`89`
`90`		`- protected routerCreateInstance(type: new () => any): any {`
	`90`	`+ protected routerCreateInstance(type: Class): any {`
`91`	`91`	`return new type();`
`92`	`92`	`}`
`93`	`93`
`@@ -99,7 +99,7 @@ namespace mvc {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`
`102`		`- public getMediator<T extends IMediator>(c: new () => T): T {`
	`102`	`+ public getMediator<T extends IMediator>(c: ClassT<T>): T {`
`103`	`103`	`let aliasName = Singleton.GetAliasName(c);`
`104`	`104`	`let ins = <T>this.getMediatorByName(aliasName);`
`105`	`105`	`if (!ins) {`
`@@ -110,22 +110,22 @@ namespace mvc {`
`110`	`110`	`return ins;`
`111`	`111`	`}`
`112`	`112`
`113`		`- public static GetMediator<T extends IMediator>(c: new () => T): T {`
	`113`	`+ public static GetMediator<T extends IMediator>(c: ClassT<T>): T {`
`114`	`114`	`return Facade.GetInstance().getMediator(c);`
`115`	`115`	`}`
`116`		`- public static GetProxy<T extends IProxy>(c: new () => T): T {`
	`116`	`+ public static GetProxy<T extends IProxy>(c: ClassT<T>): T {`
`117`	`117`	`return Facade.GetInstance().getProxy(c);`
`118`	`118`	`}`
`119`	`119`
`120`		`- public static ToggleMediator<T extends IMediator>(c: new () => T): T {`
	`120`	`+ public static ToggleMediator<T extends IMediator>(c: ClassT<T>): T {`
`121`	`121`	`return Facade.GetInstance().toggleMediator(c);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`
`125`	`125`	`public hasProxyByName(proxyName: string): boolean {`
`126`	`126`	`return this.model.get(proxyName) != null;`
`127`	`127`	`}`
`128`		`- public hasProxy<T extends IProxy>(c: new () => T): boolean {`
	`128`	`+ public hasProxy<T extends IProxy>(c: ClassT<T>): boolean {`
`129`	`129`	`let aliasName = Singleton.GetAliasName(c);`
`130`	`130`	`return this.hasProxyByName(aliasName);`
`131`	`131`	`}`
`@@ -142,7 +142,7 @@ namespace mvc {`
`142`	`142`	`}`
`143`	`143`	`return proxy;`
`144`	`144`	`}`
`145`		`- public getProxy<T extends IProxy>(c: new () => T): T {`
	`145`	`+ public getProxy<T extends IProxy>(c: ClassT<T>): T {`
`146`	`146`	`let aliasName = Singleton.GetAliasName(c);`
`147`	`147`	`let ins = <T>this.getProxyByName(aliasName);`
`148`	`148`	`if (!ins) {`
`@@ -212,7 +212,7 @@ namespace mvc {`
`212`	`212`	`return mediator;`
`213`	`213`	`}`
`214`	`214`
`215`		`- public toggleMediator<T extends IMediator>(c: new () => T, type: number = -1): T {`
	`215`	`+ public toggleMediator<T extends IMediator>(c: ClassT<T>, type: number = -1): T {`
`216`	`216`	`let aliasName = Singleton.GetAliasName(c);`
`217`	`217`	`let t = <T>this.toggleMediatorByName(aliasName, type);`
`218`	`218`	`if (t == null) {`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ module mvc {`
`45`	`45`	`this.readyHandle.push(new ListenerItemBox(handle, thisObj));`
`46`	`46`	`return true;`
`47`	`47`	`}`
`48`		`- public removeReayHandle(handle: (e: EventX) => void, thisObj?: any): boolean {`
	`48`	`+ public removeReayHandle(handle: Action<EventX>, thisObj?: any): boolean {`
`49`	`49`	`if (this._isReady) {`
`50`	`50`	`return false;`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ function MVCE(type: InjectEventType, ...events: Array<string>) {`
`41`	`41`
`42`	`42`	`namespace mvc{`
`43`	`43`	`export class InjectEventTypeHandle {`
`44`		`- public constructor(public injectType: InjectEventType, public events: Array<string>, public handle: (EventX) => void) { }`
	`44`	`+ public constructor(public injectType: InjectEventType, public events: Array<string>, public handle: Action<EventX>) { }`
`45`	`45`	`}`
`46`	`46`	`export class InjectClassData {`
`47`	`47`	`public propertys: { [index: string]: any } = {};`
`48`	`48`	`//指令`
`49`		`- public cmds: { [index: number]: Array<(e: IStream) => void> } = {};`
	`49`	`+ public cmds: { [index: number]: Array<Action<IStream>> } = {};`
`50`	`50`	`public constructor(public classPrototype: Function) {`
`51`	`51`	`}`
`52`	`52`	`/**`
`@@ -81,7 +81,7 @@ namespace mvc{`
`81`	`81`	`}`
`82`	`82`	`classInjectData.propertys[property] = 1;`
`83`	`83`	`}`
`84`		`- public static AddCMD(classPrototype: Function, cmd: number, handle: (e: IStream) => void) {`
	`84`	`+ public static AddCMD(classPrototype: Function, cmd: number, handle: Action<IStream>) {`
`85`	`85`	`let classInjectData = null;`
`86`	`86`	`for (let item of InjectAttribute.injectMapping) {`
`87`	`87`	`if (item.classPrototype == classPrototype) {`
`@@ -96,7 +96,7 @@ namespace mvc{`
`96`	`96`
`97`	`97`	`let list = classInjectData.cmds[cmd];`
`98`	`98`	`if (!list) {`
`99`		`- list = new Array<(e: IStream) => void>();`
	`99`	`+ list = new Array<Action<IStream>>();`
`100`	`100`	`classInjectData.cmds[cmd] = list;`
`101`	`101`	`}`
`102`	`102`	`if (list.indexOf(handle) == -1) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ module mvc {`
`37`	`37`	`this.facade = facade;`
`38`	`38`	`}`
`39`	`39`
`40`		`- private getInjectClassByDef(classInjectData: InjectClassData, property: string): new () => any {`
	`40`	`+ private getInjectClassByDef(classInjectData: InjectClassData, property: string): Class {`
`41`	`41`	`let fullClassName = classInjectData.getFullClassName();`
`42`	`42`	`let dic = MVCInject.injectDefMapping[fullClassName];`
`43`	`43`	`if (!dic) {`
`@@ -105,7 +105,7 @@ module mvc {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`}`
`108`		`- protected autoMVC(classType: new () => any): any {`
	`108`	`+ protected autoMVC(classType:Class): any {`
`109`	`109`	`let fullClassName = Singleton.GetClassFullName(classType);`
`110`	`110`	`if (Singleton.IsUnique(fullClassName)) {`
`111`	`111`	`return Singleton.GetInstance(fullClassName);`