Commit b0e5ba69 authored by Jan Tattermusch's avatar Jan Tattermusch

rename persons to people

parent 359d32d4
...@@ -80,7 +80,7 @@ class AddPerson { ...@@ -80,7 +80,7 @@ class AddPerson {
} }
// Add an address. // Add an address.
addressBook.addPersons( addressBook.addPeople(
PromptForAddress(new BufferedReader(new InputStreamReader(System.in)), PromptForAddress(new BufferedReader(new InputStreamReader(System.in)),
System.out)); System.out));
......
...@@ -9,7 +9,7 @@ import java.io.PrintStream; ...@@ -9,7 +9,7 @@ import java.io.PrintStream;
class ListPeople { class ListPeople {
// Iterates though all people in the AddressBook and prints info about them. // Iterates though all people in the AddressBook and prints info about them.
static void Print(AddressBook addressBook) { static void Print(AddressBook addressBook) {
for (Person person: addressBook.getPersonsList()) { for (Person person: addressBook.getPeopleList()) {
System.out.println("Person ID: " + person.getId()); System.out.println("Person ID: " + person.getId());
System.out.println(" Name: " + person.getName()); System.out.println(" Name: " + person.getName());
if (!person.getEmail().isEmpty()) { if (!person.getEmail().isEmpty()) {
......
...@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) { ...@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) {
} }
// Add an address. // Add an address.
PromptForAddress(address_book.add_persons()); PromptForAddress(address_book.add_people());
{ {
// Write the new address book back to disk. // Write the new address book back to disk.
......
...@@ -50,7 +50,7 @@ except IOError: ...@@ -50,7 +50,7 @@ except IOError:
print sys.argv[1] + ": File not found. Creating a new file." print sys.argv[1] + ": File not found. Creating a new file."
# Add an address. # Add an address.
PromptForAddress(address_book.persons.add()) PromptForAddress(address_book.people.add())
# Write the new address book back to disk. # Write the new address book back to disk.
f = open(sys.argv[1], "wb") f = open(sys.argv[1], "wb")
......
...@@ -29,5 +29,5 @@ message Person { ...@@ -29,5 +29,5 @@ message Person {
// Our address book file is just one of these. // Our address book file is just one of these.
message AddressBook { message AddressBook {
repeated Person persons = 1; repeated Person people = 1;
} }
...@@ -8,8 +8,8 @@ using namespace std; ...@@ -8,8 +8,8 @@ using namespace std;
// 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 ListPeople(const tutorial::AddressBook& address_book) { void ListPeople(const tutorial::AddressBook& address_book) {
for (int i = 0; i < address_book.persons_size(); i++) { for (int i = 0; i < address_book.people_size(); i++) {
const tutorial::Person& person = address_book.persons(i); const tutorial::Person& person = address_book.people(i);
cout << "Person ID: " << person.id() << endl; cout << "Person ID: " << person.id() << endl;
cout << " Name: " << person.name() << endl; cout << " Name: " << person.name() << endl;
......
...@@ -7,7 +7,7 @@ import sys ...@@ -7,7 +7,7 @@ import sys
# Iterates though all people in the AddressBook and prints info about them. # Iterates though all people in the AddressBook and prints info about them.
def ListPeople(address_book): def ListPeople(address_book):
for person in address_book.persons: for person in address_book.people:
print "Person ID:", person.id print "Person ID:", person.id
print " Name:", person.name print " Name:", person.name
if person.email != "": if person.email != "":
......
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