Index: 2-2-simple/lib/server/piratesapi.dart |
diff --git a/2-2-simple/lib/server/piratesapi.dart b/2-2-simple/lib/server/piratesapi.dart |
index 20fecfeb2f743fda77011b2e17bbdd9f0db524d2..e6bf54e5f173d636886f4e1426903f1980898c91 100644 |
--- a/2-2-simple/lib/server/piratesapi.dart |
+++ b/2-2-simple/lib/server/piratesapi.dart |
@@ -4,8 +4,6 @@ |
library pirate.server; |
-import 'dart:convert' show JSON; |
-import 'dart:io'; |
import 'package:rpc/rpc.dart'; |
import '../common/messages.dart'; |
@@ -13,20 +11,12 @@ import '../common/utils.dart'; |
@ApiClass(version: 'v1') |
class PiratesApi { |
- final Map<int, Pirate> _alivePirates = {}; |
- PirateShanghaier _shanghaier; |
- Map<String, List<String>> _properPirates; |
- |
- PiratesApi() { |
- var namesFile = new File( |
- Platform.script.resolve('../lib/server/piratenames.json').toFilePath()); |
- _properPirates = JSON.decode(namesFile.readAsStringSync()); |
- _shanghaier = new PirateShanghaier(_properPirates); |
- } |
+ final Map<int, Pirate> _pirateCrew = {}; |
+ final PirateShanghaier _shanghaier = new PirateShanghaier(properPirateNames); |
@ApiMethod(path: 'pirates') |
List<Pirate> listPirates() { |
- return _alivePirates.values.toList(); |
+ return _pirateCrew.values.toList(); |
} |
@ApiMethod(path: 'shanghai') |
@@ -35,7 +25,7 @@ class PiratesApi { |
if (pirate == null) { |
throw new InternalServerError('Ran out of pirates!'); |
} |
- _alivePirates[pirate.toString().hashCode] = pirate; |
+ _pirateCrew[pirate.toString().hashCode] = pirate; |
return pirate; |
} |
} |