Commit dc974d22 authored by Roman Kamyk's avatar Roman Kamyk Committed by Adam Cozzette

Fix small style issues in the dart example, following Effective Dart:

- use final instead of obvious types for local variables
- add missing `void` return type
- make the comments doccomments (///)
parent 929a72d6
...@@ -2,34 +2,31 @@ import 'dart:io'; ...@@ -2,34 +2,31 @@ import 'dart:io';
import 'dart_tutorial/addressbook.pb.dart'; import 'dart_tutorial/addressbook.pb.dart';
// This function fills in a Person message based on user input. /// This function fills in a Person message based on user input.
Person promptForAddress() { Person promptForAddress() {
Person person = Person(); final person = Person();
print('Enter person ID: '); print('Enter person ID: ');
String input = stdin.readLineSync(); final input = stdin.readLineSync();
person.id = int.parse(input); person.id = int.parse(input);
print('Enter name'); print('Enter name');
person.name = stdin.readLineSync(); person.name = stdin.readLineSync();
print('Enter email address (blank for none) : '); print('Enter email address (blank for none) : ');
String email = stdin.readLineSync(); final email = stdin.readLineSync();
if (email.isNotEmpty) { if (email.isNotEmpty) person.email = email;
person.email = email;
}
while (true) { while (true) {
print('Enter a phone number (or leave blank to finish): '); print('Enter a phone number (or leave blank to finish): ');
String number = stdin.readLineSync(); final number = stdin.readLineSync();
if (number.isEmpty) break; if (number.isEmpty) break;
Person_PhoneNumber phoneNumber = Person_PhoneNumber(); final phoneNumber = Person_PhoneNumber()..number = number;
phoneNumber.number = number;
print('Is this a mobile, home, or work phone? '); print('Is this a mobile, home, or work phone? ');
String type = stdin.readLineSync(); final type = stdin.readLineSync();
switch (type) { switch (type) {
case 'mobile': case 'mobile':
phoneNumber.type = Person_PhoneType.MOBILE; phoneNumber.type = Person_PhoneType.MOBILE;
...@@ -49,15 +46,15 @@ Person promptForAddress() { ...@@ -49,15 +46,15 @@ Person promptForAddress() {
return person; return person;
} }
// Reads the entire address book from a file, adds one person based /// Reads the entire address book from a file, adds one person based
// on user input, then writes it back out to the same file. /// on user input, then writes it back out to the same file.
main(List<String> arguments) { void main(List<String> arguments) {
if (arguments.length != 1) { if (arguments.length != 1) {
print('Usage: add_person ADDRESS_BOOK_FILE'); print('Usage: add_person ADDRESS_BOOK_FILE');
exit(-1); exit(-1);
} }
File file = File(arguments.first); final file = File(arguments.first);
AddressBook addressBook; AddressBook addressBook;
if (!file.existsSync()) { if (!file.existsSync()) {
print('File not found. Creating new file.'); print('File not found. Creating new file.');
......
...@@ -3,16 +3,16 @@ import 'dart:io'; ...@@ -3,16 +3,16 @@ import 'dart:io';
import 'dart_tutorial/addressbook.pb.dart'; import 'dart_tutorial/addressbook.pb.dart';
import 'dart_tutorial/addressbook.pbenum.dart'; import 'dart_tutorial/addressbook.pbenum.dart';
// Iterates though all people in the AddressBook and prints info about them. /// Iterates though all people in the AddressBook and prints info about them.
void printAddressBook(AddressBook addressBook) { void printAddressBook(AddressBook addressBook) {
for (Person person in addressBook.people) { for (var person in addressBook.people) {
print('Person ID: ${person.id}'); print('Person ID: ${person.id}');
print(' Name: ${person.name}'); print(' Name: ${person.name}');
if (person.hasEmail()) { if (person.hasEmail()) {
print(' E-mail address:${person.email}'); print(' E-mail address:${person.email}');
} }
for (Person_PhoneNumber phoneNumber in person.phones) { for (var phoneNumber in person.phones) {
switch (phoneNumber.type) { switch (phoneNumber.type) {
case Person_PhoneType.MOBILE: case Person_PhoneType.MOBILE:
print(' Mobile phone #: '); print(' Mobile phone #: ');
...@@ -32,16 +32,16 @@ void printAddressBook(AddressBook addressBook) { ...@@ -32,16 +32,16 @@ void printAddressBook(AddressBook addressBook) {
} }
} }
// Reads the entire address book from a file and prints all /// Reads the entire address book from a file and prints all
// the information inside. /// the information inside.
main(List<String> arguments) { void main(List<String> arguments) {
if (arguments.length != 1) { if (arguments.length != 1) {
print('Usage: list_person ADDRESS_BOOK_FILE'); print('Usage: list_person ADDRESS_BOOK_FILE');
exit(-1); exit(-1);
} }
// Read the existing address book. // Read the existing address book.
File file = new File(arguments.first); final file = new File(arguments.first);
AddressBook addressBook = new AddressBook.fromBuffer(file.readAsBytesSync()); final addressBook = new AddressBook.fromBuffer(file.readAsBytesSync());
printAddressBook(addressBook); printAddressBook(addressBook);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment