Merge pull request dart-archive#69 from chalin/patch-chap3-comp

[chap3] maxRating() made more robust and component class comment updated

Author: kwalrath

Chapter_03/lib/rating/rating_component.dart

@@ -2,8 +2,8 @@ library rating;
 
 import 'package:angular/angular.dart';
 
-/* Use the NgComponent annotation to indicate that this class is an
- * Angular Component.
+/* Use the @NgComponent annotation to indicate that this class is an
+ * Angular component.
  *
  * The selector field defines the CSS selector that will trigger the
  * component. Typically, the CSS selector is an element name.
@@ -16,9 +16,10 @@ import 'package:angular/angular.dart';
  * The publishAs field specifies that the component instance should be
  * assigned to the current scope under the name specified.
  *
- * The map field publishes the list of attributes that can be set on
+ * The class field and setter annotated with @NgTwoWay and @NgAttr,
+ * respectively, identify the attributes that can be set on
  * the component. Users of this component will specify these attributes
- * in the html tag that is used to create the component. For example:
+ * in the HTML tag that is used to create the component. For example:
  *
  * <rating max-rating="5" rating="mycontrol.rating">
  *
@@ -38,14 +39,17 @@ class RatingComponent {
   static const String _starOnClass = "star-on";
   static const String _starOffClass = "star-off";
 
+  static final int DEFAULT_MAX = 5;
+  
   List<int> stars = [];
 
   @NgTwoWay('rating')
   int rating;
 
   @NgAttr('max-rating')
   set maxRating(String value) {
-    var count = value == null ? 5 : int.parse(value);
+    var count = value == null ? DEFAULT_MAX : 
+        int.parse(value, onError: (_) => DEFAULT_MAX);
     stars = new List.generate(count, (i) => i+1);
   }
 
@@ -58,10 +62,6 @@ class RatingComponent {
   }
 
   void handleClick(int star) {
-    if (star == 1 && rating == 1) {
-      rating = 0;
-    } else {
-      rating = star;
-    }
+    rating = (star == 1 && rating == 1) ? 0 : star;
   }
 }

Chapter_03/web/main.dart

@@ -19,6 +19,6 @@ class MyAppModule extends Module {
   }
 }
 
-main() {
+void main() {
   ngBootstrap(module: new MyAppModule());
 }

Chapter_04/lib/rating/rating_component.dart

@@ -2,8 +2,8 @@ library rating;
 
 import 'package:angular/angular.dart';
 
-/* Use the NgComponent annotation to indicate that this class is an
- * Angular Component.
+/* Use the @NgComponent annotation to indicate that this class is an
+ * Angular component.
  *
  * The selector field defines the CSS selector that will trigger the
  * component. Typically, the CSS selector is an element name.
@@ -16,9 +16,10 @@ import 'package:angular/angular.dart';
  * The publishAs field specifies that the component instance should be
  * assigned to the current scope under the name specified.
  *
- * The map field publishes the list of attributes that can be set on
+ * The class field and setter annotated with @NgTwoWay and @NgAttr,
+ * respectively, identify the attributes that can be set on
  * the component. Users of this component will specify these attributes
- * in the html tag that is used to create the component. For example:
+ * in the HTML tag that is used to create the component. For example:
  *
  * <rating max-rating="5" rating="mycontrol.rating">
  *
@@ -38,18 +39,18 @@ class RatingComponent {
   static const String _starOnClass = "star-on";
   static const String _starOffClass = "star-off";
 
+  static final int DEFAULT_MAX = 5;
+  
   List<int> stars = [];
 
   @NgTwoWay('rating')
   int rating;
 
   @NgAttr('max-rating')
   set maxRating(String value) {
-    stars = [];
-    var count = value == null ? 5 : int.parse(value);
-    for(var i=1; i <= count; i++) {
-      stars.add(i);
-    }
+    var count = value == null ? DEFAULT_MAX : 
+        int.parse(value, onError: (_) => DEFAULT_MAX);
+    stars = new List.generate(count, (i) => i+1);
   }
 
   String starClass(int star) {
@@ -61,10 +62,6 @@ class RatingComponent {
   }
 
   void handleClick(int star) {
-    if (star == 1 && rating == 1) {
-      rating = 0;
-    } else {
-      rating = star;
-    }
+    rating = (star == 1 && rating == 1) ? 0 : star;
   }
 }

Chapter_04/web/main.dart

@@ -23,6 +23,6 @@ class MyAppModule extends Module {
   }
 }
 
-main() {
+void main() {
   ngBootstrap(module: new MyAppModule());
 }

Chapter_05/lib/rating/rating_component.dart

@@ -2,8 +2,8 @@ library rating;
 
 import 'package:angular/angular.dart';
 
-/* Use the NgComponent annotation to indicate that this class is an
- * Angular Component.
+/* Use the @NgComponent annotation to indicate that this class is an
+ * Angular component.
  *
  * The selector field defines the CSS selector that will trigger the
  * component. Typically, the CSS selector is an element name.
@@ -16,9 +16,10 @@ import 'package:angular/angular.dart';
  * The publishAs field specifies that the component instance should be
  * assigned to the current scope under the name specified.
  *
- * The map field publishes the list of attributes that can be set on
+ * The class field and setter annotated with @NgTwoWay and @NgAttr,
+ * respectively, identify the attributes that can be set on
  * the component. Users of this component will specify these attributes
- * in the html tag that is used to create the component. For example:
+ * in the HTML tag that is used to create the component. For example:
  *
  * <rating max-rating="5" rating="mycontrol.rating">
  *
@@ -38,18 +39,18 @@ class RatingComponent {
   static const String _starOnClass = "star-on";
   static const String _starOffClass = "star-off";
 
+  static final int DEFAULT_MAX = 5;
+  
   List<int> stars = [];
 
   @NgTwoWay('rating')
   int rating;
 
   @NgAttr('max-rating')
   set maxRating(String value) {
-    stars = [];
-    var count = value == null ? 5 : int.parse(value);
-    for(var i=1; i <= count; i++) {
-      stars.add(i);
-    }
+    var count = value == null ? DEFAULT_MAX : 
+        int.parse(value, onError: (_) => DEFAULT_MAX);
+    stars = new List.generate(count, (i) => i+1);
   }
 
   String starClass(int star) {
@@ -61,10 +62,6 @@ class RatingComponent {
   }
 
   void handleClick(int star) {
-    if (star == 1 && rating == 1) {
-      rating = 0;
-    } else {
-      rating = star;
-    }
+    rating = (star == 1 && rating == 1) ? 0 : star;
   }
 }

Chapter_05/web/main.dart

@@ -25,6 +25,6 @@ class MyAppModule extends Module {
   }
 }
 
-main() {
+void main() {
   ngBootstrap(module: new MyAppModule());
 }

Chapter_06/lib/rating/rating_component.dart

@@ -2,8 +2,8 @@ library rating;
 
 import 'package:angular/angular.dart';
 
-/* Use the NgComponent annotation to indicate that this class is an
- * Angular Component.
+/* Use the @NgComponent annotation to indicate that this class is an
+ * Angular component.
  *
  * The selector field defines the CSS selector that will trigger the
  * component. Typically, the CSS selector is an element name.
@@ -16,9 +16,10 @@ import 'package:angular/angular.dart';
  * The publishAs field specifies that the component instance should be
  * assigned to the current scope under the name specified.
  *
- * The map field publishes the list of attributes that can be set on
+ * The class field and setter annotated with @NgTwoWay and @NgAttr,
+ * respectively, identify the attributes that can be set on
  * the component. Users of this component will specify these attributes
- * in the html tag that is used to create the component. For example:
+ * in the HTML tag that is used to create the component. For example:
  *
  * <rating max-rating="5" rating="mycontrol.rating">
  *
@@ -38,18 +39,18 @@ class RatingComponent {
   static const String _starOnClass = "star-on";
   static const String _starOffClass = "star-off";
 
+  static final int DEFAULT_MAX = 5;
+  
   List<int> stars = [];
 
   @NgTwoWay('rating')
   int rating;
 
   @NgAttr('max-rating')
   set maxRating(String value) {
-    stars = [];
-    var count = value == null ? 5 : int.parse(value);
-    for(var i=1; i <= count; i++) {
-      stars.add(i);
-    }
+    var count = value == null ? DEFAULT_MAX : 
+        int.parse(value, onError: (_) => DEFAULT_MAX);
+    stars = new List.generate(count, (i) => i+1);
   }
 
   String starClass(int star) {
@@ -61,10 +62,6 @@ class RatingComponent {
   }
 
   void handleClick(int star) {
-    if (star == 1 && rating == 1) {
-      rating = 0;
-    } else {
-      rating = star;
-    }
+    rating = (star == 1 && rating == 1) ? 0 : star;
   }
 }

Chapter_06/web/main.dart

@@ -38,7 +38,7 @@ class MyAppModule extends Module {
   }
 }
 
-main() {
+void main() {
   Logger.root.level = Level.FINEST;
   Logger.root.onRecord.listen((LogRecord r) { print(r.message); });
   ngBootstrap(module: new MyAppModule());

Chapter_07/lib/rating/rating_component.dart

@@ -2,8 +2,8 @@ library rating;
 
 import 'package:angular/angular.dart';
 
-/* Use the NgComponent annotation to indicate that this class is an
- * Angular Component.
+/* Use the @NgComponent annotation to indicate that this class is an
+ * Angular component.
  *
  * The selector field defines the CSS selector that will trigger the
  * component. Typically, the CSS selector is an element name.
@@ -16,13 +16,14 @@ import 'package:angular/angular.dart';
  * The publishAs field specifies that the component instance should be
  * assigned to the current scope under the name specified.
  *
- * The map field publishes the list of attributes that can be set on
+ * The class field and setter annotated with @NgTwoWay and @NgAttr,
+ * respectively, identify the attributes that can be set on
  * the component. Users of this component will specify these attributes
- * in the html tag that is used to create the component. For example:
+ * in the HTML tag that is used to create the component. For example:
  *
  * <rating max-rating="5" rating="mycontrol.rating">
  *
- * The compnoent's public fields are available for data binding from the
+ * The component's public fields are available for data binding from the
  * component's view. Similarly, the component's public methods can be
  * invoked from the component's view.
  */
@@ -33,23 +34,23 @@ import 'package:angular/angular.dart';
     publishAs: 'ctrl'
 )
 class RatingComponent {
-  String _starOnChar = "\u2605";
-  String _starOffChar = "\u2606";
-  String _starOnClass = "star-on";
-  String _starOffClass = "star-off";
+  static const String _starOnChar = "\u2605";
+  static const String _starOffChar = "\u2606";
+  static const String _starOnClass = "star-on";
+  static const String _starOffClass = "star-off";
 
+  static final int DEFAULT_MAX = 5;
+  
   List<int> stars = [];
 
   @NgTwoWay('rating')
   int rating;
 
   @NgAttr('max-rating')
   set maxRating(String value) {
-    stars = [];
-    var count = value == null ? 5 : int.parse(value);
-    for(var i=1; i <= count; i++) {
-      stars.add(i);
-    }
+    var count = value == null ? DEFAULT_MAX : 
+        int.parse(value, onError: (_) => DEFAULT_MAX);
+    stars = new List.generate(count, (i) => i+1);
   }
 
   String starClass(int star) {
@@ -61,10 +62,6 @@ class RatingComponent {
   }
 
   void handleClick(int star) {
-    if (star == 1 && rating == 1) {
-      rating = 0;
-    } else {
-      rating = star;
-    }
+    rating = (star == 1 && rating == 1) ? 0 : star;
   }
 }

Chapter_07/web/main.dart

@@ -52,7 +52,7 @@ class MyAppModule extends Module {
   }
 }
 
-main() {
+void main() {
   Logger.root.level = Level.FINEST;
   Logger.root.onRecord.listen((LogRecord r) { print(r.message); });
   ngBootstrap(module: new MyAppModule(), injectorFactory: init.createInjector);