Reverting to promise for handler

Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Feb 19, 2019 · 2a87f2b · 2a87f2b
1 parent 4bf48f2
commit 2a87f2b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/virtual-desktop/src/app/application-manager/viewport-manager/viewport-manager.service.ts b/virtual-desktop/src/app/application-manager/viewport-manager/viewport-manager.service.ts
@@ -20,7 +20,7 @@ export class ViewportManager implements MVDHosting.ViewportManagerInterface {
   private viewports: Map<MVDHosting.ViewportId, Viewport>;
   private viewportInstances: Map<MVDHosting.ViewportId, MVDHosting.InstanceId>;
   private readonly logger: ZLUX.ComponentLogger = BaseLogger;
-  private closeHandlers: Map<MVDHosting.ViewportId, Array<MVDHosting.ViewportCloseHandler>>;
+  private closeHandlers: Map<MVDHosting.ViewportId, Array<() => Promise<any>>>;
   constructor() {
     this.viewports = new Map();
     this.viewportInstances = new Map();
@@ -42,20 +42,20 @@ export class ViewportManager implements MVDHosting.ViewportManagerInterface {
     this.viewportInstances.set(viewportId, instanceId);
   }
 
-  registerViewportCloseHandler(viewportId: MVDHosting.ViewportId, handler: MVDHosting.ViewportCloseHandler):void {
+  registerViewportCloseHandler(viewportId: MVDHosting.ViewportId, handler: () => Promise<any>):void {
     let handlers = this.closeHandlers.get(viewportId);
     if (!handlers) {
-      handlers = new Array<MVDHosting.ViewportCloseHandler>();
+      handlers = new Array<() => Promise<any>>();
       this.closeHandlers.set(viewportId, handlers);
     }
     handlers.push(handler);
   }
 
-  private closeWatcherLoop(pos: number, handlers: Array<MVDHosting.ViewportCloseHandler>, finishedCallback: any, rejectCallback: any): void {
+  private closeWatcherLoop(pos: number, handlers: Array<() => Promise<any>>, finishedCallback: any, rejectCallback: any): void {
     if (pos >= handlers.length) {
       finishedCallback();
     } else {
-      handlers[pos].onViewportClosed().then(()=> {
+      handlers[pos]().then(()=> {
         this.closeWatcherLoop(++pos, handlers, finishedCallback, rejectCallback);
       }).catch((reason:any)=> {
         rejectCallback();

diff --git a/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts b/virtual-desktop/src/app/window-manager/mvd-window-manager/shared/window-manager.service.ts
@@ -242,7 +242,7 @@ export class WindowManagerService implements MVDWindowManagement.WindowManagerSe
     return {
       resized: events.windowResized,
       spawnContextMenu: (xRel, yRel, items) => this.spawnContextMenu(windowId, xRel, yRel, items),
-      registerCloseHandler: (handler: MVDHosting.ViewportCloseHandler) => this.viewportManager.registerViewportCloseHandler(viewportId, handler)
+      registerCloseHandler: (handler) => this.viewportManager.registerViewportCloseHandler(viewportId, handler)
     };
   }
 

diff --git a/...ual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.service.ts b/...ual-desktop/src/app/window-manager/simple-window-manager/simple-window-manager.service.ts
@@ -84,7 +84,7 @@ export class SimpleWindowManagerService implements MVDWindowManagement.WindowMan
     return {
       resized: this.windowResized,
       spawnContextMenu: (xRel, yRel, items) => this.spawnContextMenu(windowId, xRel, yRel, items),
-      registerCloseHandler: (handler: MVDHosting.ViewportCloseHandler) => this.viewportManager.registerViewportCloseHandler(viewportId, handler)
+      registerCloseHandler: (handler: ()=>Promise<any>) => this.viewportManager.registerViewportCloseHandler(viewportId, handler)
     };
   }
 

diff --git a/virtual-desktop/src/pluginlib/inject-resources.ts b/virtual-desktop/src/pluginlib/inject-resources.ts
@@ -61,7 +61,7 @@ export interface Angular2PluginWindowEvents {
 export interface Angular2PluginViewportEvents {
   readonly resized: Subject<{width: number, height: number}>;
   readonly spawnContextMenu: (xPos: number, yPos: number, items: ContextMenuItem[]) => void;
-  readonly registerCloseHandler: (handler: MVDHosting.ViewportCloseHandler) => void;
+  readonly registerCloseHandler: (handler: () => Promise<any>) => void;
 }
 
 export interface Angular2PluginEmbedActions {