From 8d3e5596dcfdcf0147990c5f86c0e3c86abe5941 Mon Sep 17 00:00:00 2001
From: Pawel Kozlowski <pkozlowski.opensource@gmail.com>
Date: Thu, 10 Dec 2015 16:24:34 +0100
Subject: [PATCH] refactor(playground): remove imports from 'angular2/angular2'

Part of #5710

Closes #5798
---
 modules/playground/src/animate/animate-app.ts |  7 +++----
 modules/playground/src/hash_routing/index.ts  |  2 +-
 modules/playground/src/http/http_comp.ts      |  7 +++----
 modules/playground/src/jsonp/jsonp_comp.ts    |  7 +++----
 modules/playground/src/routing/inbox-app.ts   | 19 ++++++++++---------
 modules/playground/src/routing/index.ts       |  2 +-
 .../playground/src/todo/services/TodoStore.ts |  2 +-
 modules/playground/src/upgrade/index.ts       |  4 ++--
 .../src/web_workers/images/index_common.ts    |  5 ++---
 .../src/web_workers/images/services/bitmap.ts |  2 +-
 .../playground/src/zippy_component/zippy.ts   |  2 +-
 11 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/modules/playground/src/animate/animate-app.ts b/modules/playground/src/animate/animate-app.ts
index d122d9b648..917119ec36 100644
--- a/modules/playground/src/animate/animate-app.ts
+++ b/modules/playground/src/animate/animate-app.ts
@@ -1,8 +1,7 @@
-import {Component, View, NgIf} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 
-@Component({selector: 'animate-app'})
-@View({
-  directives: [NgIf],
+@Component({
+  selector: 'animate-app',
   template: `
     <h1>The box is {{visible ? 'visible' : 'hidden'}}</h1>
     <div class="ng-animate box" *ngIf="visible"></div>
diff --git a/modules/playground/src/hash_routing/index.ts b/modules/playground/src/hash_routing/index.ts
index 860a8ccc3b..b9c3e9c4c4 100644
--- a/modules/playground/src/hash_routing/index.ts
+++ b/modules/playground/src/hash_routing/index.ts
@@ -1,4 +1,4 @@
-import {Component, provide} from 'angular2/angular2';
+import {Component, provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 import {
   RouteConfig,
diff --git a/modules/playground/src/http/http_comp.ts b/modules/playground/src/http/http_comp.ts
index 0718822a20..db5f148c47 100644
--- a/modules/playground/src/http/http_comp.ts
+++ b/modules/playground/src/http/http_comp.ts
@@ -1,10 +1,9 @@
-import {Component, View, NgFor} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 import {Http, Response} from 'angular2/http';
 import 'rxjs/add/operator/map';
 
-@Component({selector: 'http-app'})
-@View({
-  directives: [NgFor],
+@Component({
+  selector: 'http-app',
   template: `
     <h1>people</h1>
     <ul class="people">
diff --git a/modules/playground/src/jsonp/jsonp_comp.ts b/modules/playground/src/jsonp/jsonp_comp.ts
index 4a0ac1c992..00b3f333bb 100644
--- a/modules/playground/src/jsonp/jsonp_comp.ts
+++ b/modules/playground/src/jsonp/jsonp_comp.ts
@@ -1,10 +1,9 @@
-import {Component, View, NgFor} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 import {Jsonp, Response} from 'angular2/http';
 import {ObservableWrapper} from 'angular2/src/facade/async';
 
-@Component({selector: 'jsonp-app'})
-@View({
-  directives: [NgFor],
+@Component({
+  selector: 'jsonp-app',
   template: `
     <h1>people</h1>
     <ul class="people">
diff --git a/modules/playground/src/routing/inbox-app.ts b/modules/playground/src/routing/inbox-app.ts
index 875d3439ab..0205785c05 100644
--- a/modules/playground/src/routing/inbox-app.ts
+++ b/modules/playground/src/routing/inbox-app.ts
@@ -1,4 +1,4 @@
-import {NgIf, NgFor, EventEmitter, Component, View, Inject, Injectable} from 'angular2/angular2';
+import {Component, Injectable} from 'angular2/core';
 import {
   RouterLink,
   RouteConfig,
@@ -89,8 +89,7 @@ class DbService {
   }
 }
 
-@Component({selector: 'inbox-detail'})
-@View({templateUrl: 'inbox-detail.html', directives: [NgFor, RouterLink]})
+@Component({selector: 'inbox-detail', directives: [RouterLink], templateUrl: 'inbox-detail.html'})
 class InboxDetailCmp {
   record: InboxRecord = new InboxRecord();
   ready: boolean = false;
@@ -101,8 +100,7 @@ class InboxDetailCmp {
   }
 }
 
-@Component({selector: 'inbox'})
-@View({templateUrl: 'inbox.html', directives: [NgFor, RouterLink]})
+@Component({selector: 'inbox', templateUrl: 'inbox.html', directives: [RouterLink]})
 class InboxCmp {
   items: InboxRecord[] = [];
   ready: boolean = false;
@@ -127,8 +125,7 @@ class InboxCmp {
 }
 
 
-@Component({selector: 'drafts'})
-@View({templateUrl: 'drafts.html', directives: [NgFor, RouterLink]})
+@Component({selector: 'drafts', templateUrl: 'drafts.html', directives: [RouterLink]})
 class DraftsCmp {
   items: InboxRecord[] = [];
   ready: boolean = false;
@@ -141,8 +138,12 @@ class DraftsCmp {
   }
 }
 
-@Component({selector: 'inbox-app', viewProviders: [DbService]})
-@View({templateUrl: 'inbox-app.html', directives: [RouterOutlet, RouterLink]})
+@Component({
+  selector: 'inbox-app',
+  viewProviders: [DbService],
+  templateUrl: 'inbox-app.html',
+  directives: [RouterOutlet, RouterLink]
+})
 @RouteConfig([
   new Route({path: '/', component: InboxCmp, name: 'Inbox'}),
   new Route({path: '/drafts', component: DraftsCmp, name: 'Drafts'}),
diff --git a/modules/playground/src/routing/index.ts b/modules/playground/src/routing/index.ts
index 76aabda865..19b25f3e6a 100644
--- a/modules/playground/src/routing/index.ts
+++ b/modules/playground/src/routing/index.ts
@@ -1,5 +1,5 @@
 import {InboxApp} from './inbox-app';
-import {provide} from 'angular2/angular2';
+import {provide} from 'angular2/core';
 import {bootstrap} from 'angular2/bootstrap';
 import {ROUTER_PROVIDERS, HashLocationStrategy, LocationStrategy} from 'angular2/router';
 
diff --git a/modules/playground/src/todo/services/TodoStore.ts b/modules/playground/src/todo/services/TodoStore.ts
index 388706822d..3c031c4132 100644
--- a/modules/playground/src/todo/services/TodoStore.ts
+++ b/modules/playground/src/todo/services/TodoStore.ts
@@ -1,4 +1,4 @@
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 import {ListWrapper, Predicate} from 'angular2/src/facade/collection';
 
 // base model for RecordStore
diff --git a/modules/playground/src/upgrade/index.ts b/modules/playground/src/upgrade/index.ts
index 527e0c808a..e886105307 100644
--- a/modules/playground/src/upgrade/index.ts
+++ b/modules/playground/src/upgrade/index.ts
@@ -1,5 +1,5 @@
-import {Component, Input, Output, EventEmitter} from 'angular2/angular2';
-import {UpgradeAdapter} from 'angular2/angular2';
+import {Component, Input, Output, EventEmitter} from 'angular2/core';
+import {UpgradeAdapter} from 'angular2/upgrade';
 import * as angular from '../../../angular2/src/upgrade/angular_js';
 
 var styles = [
diff --git a/modules/playground/src/web_workers/images/index_common.ts b/modules/playground/src/web_workers/images/index_common.ts
index bae3045b42..71b9ba565d 100644
--- a/modules/playground/src/web_workers/images/index_common.ts
+++ b/modules/playground/src/web_workers/images/index_common.ts
@@ -1,11 +1,10 @@
-import {NgZone, NgFor, Component, View, NgIf, FORM_DIRECTIVES} from 'angular2/angular2';
+import {Component} from 'angular2/core';
 import {BitmapService} from './services/bitmap';
 import {EventListener} from 'angular2/src/facade/browser';
 import {FileReader, Uint8ArrayWrapper} from './file_api';
 import {TimerWrapper} from 'angular2/src/facade/async';
 
-@Component({selector: 'image-demo', viewProviders: [BitmapService]})
-@View({templateUrl: 'image_demo.html', directives: [NgFor, NgIf, FORM_DIRECTIVES]})
+@Component({selector: 'image-demo', viewProviders: [BitmapService], templateUrl: 'image_demo.html'})
 export class ImageDemo {
   images = [];
   fileInput: String;
diff --git a/modules/playground/src/web_workers/images/services/bitmap.ts b/modules/playground/src/web_workers/images/services/bitmap.ts
index a317656020..9bb68fb369 100644
--- a/modules/playground/src/web_workers/images/services/bitmap.ts
+++ b/modules/playground/src/web_workers/images/services/bitmap.ts
@@ -1,5 +1,5 @@
 /// <reference path="../bitmap.d.ts" /> /// <reference path="../b64.d.ts" />
-import {Injectable} from 'angular2/angular2';
+import {Injectable} from 'angular2/core';
 declare var base64js;
 
 // Temporary fix for Typescript issue #4220 (https://github.com/Microsoft/TypeScript/issues/4220)
diff --git a/modules/playground/src/zippy_component/zippy.ts b/modules/playground/src/zippy_component/zippy.ts
index 9fbe81b851..0be615248e 100644
--- a/modules/playground/src/zippy_component/zippy.ts
+++ b/modules/playground/src/zippy_component/zippy.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, Input, Output} from 'angular2/angular2';
+import {Component, EventEmitter, Input, Output} from 'angular2/core';
 import {ObservableWrapper} from 'angular2/src/facade/async';
 
 @Component({selector: 'zippy', templateUrl: 'zippy.html'})