Merge pull request dart-archive#99 from chalin/patch-0312-recipe-json-ctr-rename

refactor(Recipe): rename constructor fromJsonMap to fromJson

Author: kwalrath

Chapter_05/lib/recipe.dart

@@ -22,7 +22,7 @@ class Recipe {
     "imgUrl": imgUrl
   };
 
-  factory Recipe.fromJsonMap(Map<String, dynamic> json) => new Recipe(json['id'],
+  factory Recipe.fromJson(Map<String, dynamic> json) => new Recipe(json['id'],
       json['name'], json['category'], json['ingredients'], json['directions'],
       json['rating'], json['imgUrl']);
 }

Chapter_05/lib/recipe_book.dart

@@ -63,7 +63,7 @@ kitchen and took the recipe book with him!""";
       .then((HttpResponse response) {
         print(response);
         for (Map recipe in response.data) {
-          recipes.add(new Recipe.fromJsonMap(recipe));
+          recipes.add(new Recipe.fromJson(recipe));
         }
         recipesLoaded = true;
       })

Chapter_06/lib/service/query_service.dart

@@ -23,9 +23,9 @@ class QueryService {
   Future _loadRecipes() {
     return _http.get(_recipesUrl)
       .then((HttpResponse response) {
-        _recipesCache = new Map();
+        _recipesCache = new Map<String, Recipe>();
         for (Map recipe in response.data) {
-          Recipe r = new Recipe.fromJsonMap(recipe);
+          Recipe r = new Recipe.fromJson(recipe);
           _recipesCache[r.id] = r;
         }
       });
@@ -34,7 +34,7 @@ class QueryService {
   Future _loadCategories() {
     return _http.get(_categoriesUrl)
         .then((HttpResponse response) {
-          _categoriesCache = new List();
+          _categoriesCache = new List<String>();
           for (String category in response.data) {
             _categoriesCache.add(category);
           }

Chapter_06/lib/service/recipe.dart

@@ -22,7 +22,7 @@ class Recipe {
     "imgUrl": imgUrl
   };
 
-  factory Recipe.fromJsonMap(Map<String, dynamic> json) => new Recipe(json['id'],
+  factory Recipe.fromJson(Map<String, dynamic> json) => new Recipe(json['id'],
       json['name'], json['category'], json['ingredients'], json['directions'],
       json['rating'], json['imgUrl']);
 }

Chapter_07/lib/service/query_service.dart

@@ -23,9 +23,9 @@ class QueryService {
   Future _loadRecipes() {
     return _http.get(_recipesUrl)
       .then((HttpResponse response) {
-        _recipesCache = new Map();
+        _recipesCache = new Map<String, Recipe>();
         for (Map recipe in response.data) {
-          Recipe r = new Recipe.fromJsonMap(recipe);
+          Recipe r = new Recipe.fromJson(recipe);
           _recipesCache[r.id] = r;
         }
       });
@@ -34,7 +34,7 @@ class QueryService {
   Future _loadCategories() {
     return _http.get(_categoriesUrl)
         .then((HttpResponse response) {
-          _categoriesCache = new List();
+          _categoriesCache = new List<String>();
           for (String category in response.data) {
             _categoriesCache.add(category);
           }

Chapter_07/lib/service/recipe.dart

@@ -22,7 +22,7 @@ class Recipe {
     "imgUrl": imgUrl
   };
 
-  factory Recipe.fromJsonMap(Map<String, dynamic> json) => new Recipe(json['id'],
+  factory Recipe.fromJson(Map<String, dynamic> json) => new Recipe(json['id'],
       json['name'], json['category'], json['ingredients'], json['directions'],
       json['rating'], json['imgUrl']);
 }