@compass-framework/core 1.0.5 → 1.0.6

package/@types/ApplicationWindow.d.ts

@@ -1,4 +1,4 @@
-import { XML } from "@compass-framework/library";
+import {ArrayList, XML} from "@compass-framework/library";
 import { IWindow } from "./IWindow";
 import { Resources } from "./Resources";
 import { View } from "./View";
@@ -10,7 +10,12 @@ export declare class ApplicationWindow implements IWindow {
   public constructor();
   public constructor(context: WindowContext);
 
-  public createViewQuery(): View.ViewQuery;
+  public findViewById(id: number): View;
+  public findViewById(id: string): View;
+
+  public findViewByTag(tag: string): View;
+
+  public findViewsByTag(tag: string): ArrayList<View>;
 
   public onAttach(context: WindowContext): void;
 

package/@types/IWindow.d.ts

@@ -1,12 +1,18 @@
-import { Interface, XML } from "@compass-framework/library";
-import { Resources } from "./Resources";
-import { View } from "./View";
-import { WindowContext } from "./WindowContext";
-import { WindowManager } from "./WindowManager";
+import {ArrayList, Interface, XML} from "@compass-framework/library";
+import {Resources} from "./Resources";
+import {View} from "./View";
+import {WindowContext} from "./WindowContext";
+import {WindowManager} from "./WindowManager";
 
 export const IWindowInterface: Interface<IWindow>;
+
 export interface IWindow {
-  createViewQuery(): View.ViewQuery;
+  findViewById(id: number): View;
+  findViewById(id: string): View;
+
+  findViewByTag(tag: string): View;
+
+  findViewsByTag(tag: string): ArrayList<View>;
 
   onAttach(context: WindowContext): void
 

package/@types/PopupWindow.d.ts

@@ -1,4 +1,4 @@
-import { XML } from "@compass-framework/library";
+import {ArrayList, XML} from "@compass-framework/library";
 import { Resources } from "./Resources";
 import { View } from "./View";
 import { IWindow } from "./IWindow";
@@ -8,17 +8,22 @@ import { WindowManager } from "./WindowManager";
 export declare class PopupWindow implements IWindow {
   public constructor();
 
-  public onCreate(): void;
+  public findViewById(id: number): View;
+  public findViewById(id: string): View;
 
-  public onStart(): void;
+  public findViewByTag(tag: string): View;
 
-  public onResume(): void;
+  public findViewsByTag(tag: string): ArrayList<View>;
+
+  public onAttach(context: WindowContext): void;
 
-  public onStop(): void;
+  public onCreate(): void;
+
+  public onResume(): void;
 
   public onDestroy(): void;
 
-  public createViewQuery(): View.ViewQuery;
+  public onDetach(): void;
 
   public dismiss(): void;
 
@@ -26,7 +31,7 @@ export declare class PopupWindow implements IWindow {
 
   public update(x: number, y: number, width: number, height: number): void;
 
-  public getContext(): WindowContext;
+  public getWindowContext(): WindowContext;
 
   public getResources(): Resources;
 

package/@types/View.d.ts

@@ -1,8 +1,7 @@
 import {
-  Runnable,
-  List,
   Interface,
-  Nullable,
+  Runnable,
+  ArrayList,
 } from "@compass-framework/library";
 import { Context } from "./Context";
 import { AttributeSet } from "./AttributeSet";
@@ -58,6 +57,13 @@ export declare class View implements Drawable.Callback {
 
   public draw(canvas: Canvas): void;
 
+  public findViewById(id: number): View;
+  public findViewById(id: string): View;
+
+  public findViewByTag(tag: string): View;
+
+  public findViewsByTag(tag: string): ArrayList<View>;
+
   public post(action:Runnable): boolean;
 
   public removeCallbacks(action: Runnable): boolean;
@@ -68,9 +74,6 @@ export declare class View implements Drawable.Callback {
 
   public requestFocus(): boolean;
 
-  public createViewQuery(): View.ViewQuery;
-  public createViewQuery(resources: Resources): View.ViewQuery;
-
   public clearFocus(): void;
 
   public addOnAttachStateChangeListener(listener:View.OnAttachStateChangeListener): void;
@@ -267,14 +270,6 @@ export declare namespace View {
     public getTransformation(): Transformation;
   }
 
-  export class ViewQuery {
-    public findViewById<T extends View>(id: string): Nullable<T>;
-
-    public findViewByTag<T extends View>(tag: string): Nullable<T>;
-
-    public findViewsWithTag<T extends View>(tag: string): List<T>;
-  }
-
   export class MeasureSpec {
     public static MODE_SHIFT: number;
     public static MODE_MASK: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@compass-framework/core",
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"description": "@compass-framework/core public api",
 	"types": "./index.d.ts",
 	"main": "./index.js",