Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 965cdca

Browse files
committed
Tweak samples
1 parent 5e943e5 commit 965cdca

File tree

4 files changed

+30
-36
lines changed

4 files changed

+30
-36
lines changed

public/docs/_examples/dependency-injection/dart/lib/car/car_factory.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// #docregion
22
import 'car.dart';
33

4+
// BAD pattern!
45
class CarFactory {
56
Car createCar() {
67
var car = new Car(createEngine(), createTires());

public/docs/_examples/dependency-injection/dart/lib/car/car_no_di.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ class Car {
1313
engine = new Engine();
1414
tires = new Tires();
1515
}
16-
1716
//#enddocregion car-ctor
1817

1918
// Method using the engine and tires
20-
drive() => '$description car with ${engine.cylinders} cylinders and ${tires.make} tires.';
19+
drive() => '$description car with '
20+
'${engine.cylinders} cylinders and ${tires.make} tires.';
2121
}
2222
//#enddocregion car

public/docs/_examples/dependency-injection/dart/lib/heroes/heroes_component_1.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import 'package:angular2/angular2.dart';
66
import 'hero_list_component.dart';
77
// #enddocregion v1
88
import 'hero_service.dart';
9-
109
// #docregion v1
10+
1111
@Component(
1212
selector: 'my-heroes',
1313
template: '''

public/docs/_examples/dependency-injection/dart/lib/providers_component.dart

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ class ProviderComponent2 {
3939
String log;
4040

4141
ProviderComponent2(Logger logger) {
42-
logger.log(
43-
'Hello from logger provided with Provider class and useClass');
42+
logger.log('Hello from logger provided with Provider class and useClass');
4443
log = logger.logs[0];
4544
}
4645
}
@@ -75,8 +74,7 @@ class ProviderComponent4 {
7574
String log;
7675

7776
ProviderComponent4(Logger logger) {
78-
logger
79-
.log('Hello from logger provided with useClass:BetterLogger');
77+
logger.log('Hello from logger provided with useClass:BetterLogger');
8078
log = logger.logs[0];
8179
}
8280
}
@@ -100,10 +98,7 @@ class EvenBetterLogger implements Logger {
10098
// #enddocregion EvenBetterLogger
10199
@Component(selector: 'provider-5', template: '{{log}}', providers:
102100
//#docregion providers-5
103-
const [
104-
UserService,
105-
const Provider(Logger, useClass: EvenBetterLogger)
106-
]
101+
const [UserService, const Provider(Logger, useClass: EvenBetterLogger)]
107102
//#enddocregion providers-5
108103
)
109104
class ProviderComponent5 {
@@ -139,8 +134,7 @@ class ProviderComponent6a {
139134

140135
ProviderComponent6a(NewLogger newLogger, OldLogger oldLogger) {
141136
if (identical(newLogger, oldLogger)) {
142-
throw new Exception(
143-
'expected the two loggers to be different instances');
137+
throw new Exception('expected the two loggers to be different instances');
144138
}
145139
oldLogger.log('Hello OldLogger (but we want NewLogger)');
146140
// The newLogger wasn't called so no logs[]
@@ -165,8 +159,7 @@ class ProviderComponent6b {
165159

166160
ProviderComponent6b(NewLogger newLogger, OldLogger oldLogger) {
167161
if (!identical(newLogger, oldLogger)) {
168-
throw new Exception(
169-
'expected the two loggers to be the same instance');
162+
throw new Exception('expected the two loggers to be the same instance');
170163
}
171164
oldLogger.log('Hello from NewLogger (via aliased OldLogger)');
172165
log = newLogger.logs[0];
@@ -175,17 +168,16 @@ class ProviderComponent6b {
175168

176169
// #docregion silent-logger
177170
// An object in the shape of the logger service
178-
class SilentLogger /*implements Logger*/ {
179-
const SilentLogger({this.logs});
171+
class SilentLogger {
172+
final List<String> logs = const [
173+
'Silent logger says "Shhhhh!". Provided via "useValue"'];
180174

181-
final List<String> logs;
175+
const SilentLogger();
182176

183-
log(String message) {}
177+
void log(String msg) {}
184178
}
185179

186-
const silentLogger = const SilentLogger(logs: const [
187-
'Silent logger says "Shhhhh!". Provided via "useValue"'
188-
]);
180+
const silentLogger = const SilentLogger();
189181
// #enddocregion silent-logger
190182

191183
@Component(selector: 'provider-7', template: '{{log}}', providers:
@@ -207,14 +199,11 @@ class ProviderComponent7 {
207199
}
208200
}
209201

210-
@Component(
211-
selector: 'provider-8',
212-
template: '{{log}}',
213-
providers: const [
214-
const Provider(HeroService, useFactory: heroServiceFactory),
215-
Logger,
216-
UserService
217-
])
202+
@Component(selector: 'provider-8', template: '{{log}}', providers: const [
203+
const Provider(HeroService, useFactory: heroServiceFactory),
204+
Logger,
205+
UserService
206+
])
218207
class ProviderComponent8 {
219208
// #docregion provider-8-ctor
220209
ProviderComponent8(HeroService heroService);
@@ -267,9 +256,7 @@ class ProviderComponent9a implements OnInit {
267256

268257
@Component(selector: 'provider-9b', template: '{{log}}', providers:
269258
// #docregion providers-9b
270-
const [
271-
const Provider(APP_CONFIG, useValue: CONFIG_HASH)
272-
])
259+
const [const Provider(APP_CONFIG, useValue: CONFIG_HASH)])
273260
// #enddocregion providers-9b
274261
class ProviderComponent9b implements OnInit {
275262
Config _config;
@@ -303,6 +290,13 @@ class ProviderComponent10a {
303290
}
304291
}
305292

293+
class DoNothingLogger extends Logger {
294+
log(String msg) {
295+
logs.add(msg);
296+
}
297+
List<String> logs;
298+
}
299+
306300
// Optional logger
307301
@Component(selector: 'provider-10b', template: '{{log}}')
308302
class ProviderComponent10b implements OnInit {
@@ -318,12 +312,11 @@ class ProviderComponent10b implements OnInit {
318312
// #docregion provider-10-logger
319313
// No logger? Make one!
320314
if (_logger == null) {
321-
_logger = new Logger();
315+
_logger = new DoNothingLogger();
322316
// #enddocregion provider-10-logger
323-
_logger.log('Optional logger was not available.');
317+
_logger.log('Nothing to see here.');
324318
} else {
325319
_logger.log('Hello from the injected logger.');
326-
log = _logger.logs[0];
327320
}
328321
log = _logger.logs[0];
329322
}

0 commit comments

Comments
 (0)