Move instance tracker into app utils.

src/about-extension/index.ts

@@ -10,11 +10,7 @@ import {
 } from '../commandpalette';
 
 import {
-  InstanceTracker
-} from '../application';
-
-import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/application/index.ts

@@ -15,7 +15,6 @@ import {
 
 export { ModuleLoader } from './loader';
 export { ApplicationShell } from './shell';
-export * from './instancetracker';
 
 
 /**

src/apputils/index.ts

@@ -6,6 +6,7 @@ export * from './dialog';
 export * from './domutils';
 export * from './hoverbox';
 export * from './iframe';
+export * from './instancetracker';
 export * from './jsoneditor';
 export * from './layoutrestorer';
 export * from './sanitizer';

src/application/instancetracker.ts → src/apputils/instancetracker.ts

@@ -34,12 +34,12 @@ import {
 } from '@phosphor/widgets';
 
 import {
-  IStateDB
-} from '../statedb';
+  ApplicationShell
+} from '../application';
 
 import {
-  ApplicationShell
-} from './shell';
+  IStateDB
+} from '../statedb';
 
 
 /**

src/apputils/layoutrestorer.ts

@@ -24,13 +24,17 @@ import {
 } from '@phosphor/widgets';
 
 import {
-  ApplicationShell, InstanceTracker
+  ApplicationShell
 } from '../application';
 
 import {
   IStateDB
 } from '../statedb';
 
+import {
+  InstanceTracker
+} from './';
+
 
 /* tslint:disable */
 /**

src/console/plugin.ts

@@ -14,9 +14,13 @@ import {
 } from '@phosphor/widgets';
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
+import {
+  InstanceTracker
+} from '../apputils';
+
 import {
   IEditorServices
 } from '../codeeditor';

src/console/tracker.ts

@@ -7,7 +7,7 @@ import {
 
 import {
   IInstanceTracker
-} from '../application';
+} from '../apputils';
 
 import {
   ConsolePanel

src/csvwidget/plugin.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/editorwidget/index.ts

@@ -19,7 +19,7 @@ import {
 
 import {
   IInstanceTracker
-} from '../application';
+} from '../apputils';
 
 import {
   CommandIDs as ConsoleCommandIDs

src/editorwidget/plugin.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/faq-extension/index.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/help-extension/index.ts

@@ -14,11 +14,11 @@ import {
 } from '@phosphor/widgets';
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  IFrameWidget, ILayoutRestorer
+  IFrameWidget, ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/imagewidget/index.ts

@@ -11,7 +11,7 @@ import {
 
 import {
   IInstanceTracker
-} from '../application';
+} from '../apputils';
 
 import {
   ImageWidget

src/imagewidget/plugin.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/inspector/plugin.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/landing-extension/index.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  InstanceTracker, JupyterLab, JupyterLabPlugin
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/markdownwidget/plugin.ts

@@ -2,11 +2,11 @@
 // Distributed under the terms of the Modified BSD License.
 
 import {
-  JupyterLab, JupyterLabPlugin, InstanceTracker
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {

src/notebook/tracker.ts

@@ -11,7 +11,7 @@ import {
 
 import {
   IInstanceTracker, InstanceTracker
-} from '../application';
+} from '../apputils';
 
 import {
   NotebookPanel, Notebook

src/terminal/index.ts

@@ -11,7 +11,7 @@ import {
 
 import {
   IInstanceTracker
-} from '../application';
+} from '../apputils';
 
 import {
   TerminalWidget

src/terminal/plugin.ts

@@ -7,11 +7,11 @@ import {
 } from '@phosphor/widgets';
 
 import {
-  JupyterLab, JupyterLabPlugin, InstanceTracker
+  JupyterLab, JupyterLabPlugin
 } from '../application';
 
 import {
-  ILayoutRestorer
+  ILayoutRestorer, InstanceTracker
 } from '../apputils';
 
 import {