- Revision
- 607
- Author
- mauro
- Date
- 2008-04-14 05:20:48 -0500 (Mon, 14 Apr 2008)
Log Message
Renamed *DAO to *Persister.
Modified Paths
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java
Added Paths
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonPersister.java
- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonPersister.java
Removed Paths
Diff
Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java (606 => 607)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java 2008-04-14 10:15:01 UTC (rev 606) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java 2008-04-14 10:20:48 UTC (rev 607) @@ -3,7 +3,7 @@ import org.codehaus.waffle.registrar.AbstractRegistrar; import org.codehaus.waffle.registrar.Registrar; import org.codehaus.waffle.example.freemarker.controller.PersonController; -import org.codehaus.waffle.example.freemarker.persister.SimplePersonDAO; +import org.codehaus.waffle.example.freemarker.persister.SimplePersonPersister; public class FreemarkerRegistrar extends AbstractRegistrar { @@ -13,7 +13,7 @@ @Override public void application() { - register(SimplePersonDAO.class); + register(SimplePersonPersister.class); } @Override
Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java (606 => 607)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java 2008-04-14 10:15:01 UTC (rev 606) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/controller/PersonController.java 2008-04-14 10:20:48 UTC (rev 607) @@ -1,23 +1,23 @@ package org.codehaus.waffle.example.freemarker.controller; import org.codehaus.waffle.example.freemarker.model.Person; -import org.codehaus.waffle.example.freemarker.persister.PersonDAO; +import org.codehaus.waffle.example.freemarker.persister.PersonPersister; import java.util.ArrayList; import java.util.Collection; import java.util.List; public class PersonController { - private final PersonDAO personDAO; + private final PersonPersister persister; private Person person; private List<String> selectedIds = new ArrayList<String>(); - public PersonController(PersonDAO personDAO) { - this.personDAO = personDAO; + public PersonController(PersonPersister persister) { + this.persister = persister; } public Collection<Person> getPeople() { - return personDAO.findAll(); + return persister.findAll(); } public List<String> getSelectedIds(){ @@ -31,17 +31,17 @@ public Collection<Person> getSelectedPeople() { List<Person> selected = new ArrayList<Person>(); for ( String id : selectedIds ){ - selected.add(personDAO.findById(Long.parseLong(id))); + selected.add(persister.findById(Long.parseLong(id))); } return selected; } public void remove(Long personId) { - personDAO.delete(personId); + persister.delete(personId); } public void select(Long id) { - this.person = personDAO.findById(id); + this.person = persister.findById(id); } public void show() { @@ -49,7 +49,7 @@ } public void save() { - personDAO.save(person); + persister.save(person); } public void create() {
Deleted: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonDAO.java (606 => 607)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonDAO.java 2008-04-14 10:15:01 UTC (rev 606) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonDAO.java 2008-04-14 10:20:48 UTC (rev 607) @@ -1,17 +0,0 @@ -package org.codehaus.waffle.example.freemarker.persister; - -import org.codehaus.waffle.example.freemarker.model.Person; - -import java.util.Collection; - -public interface PersonDAO { - - Person findById(Long personId); - - Collection<Person> findAll(); - - void save(Person person); - - void delete(Long personId); - -}
Copied: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonPersister.java (from rev 606, trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonDAO.java) (0 => 607)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonPersister.java (rev 0) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/PersonPersister.java 2008-04-14 10:20:48 UTC (rev 607) @@ -0,0 +1,17 @@ +package org.codehaus.waffle.example.freemarker.persister; + +import org.codehaus.waffle.example.freemarker.model.Person; + +import java.util.Collection; + +public interface PersonPersister { + + Person findById(Long personId); + + Collection<Person> findAll(); + + void save(Person person); + + void delete(Long personId); + +}
Deleted: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonDAO.java (606 => 607)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonDAO.java 2008-04-14 10:15:01 UTC (rev 606) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonDAO.java 2008-04-14 10:20:48 UTC (rev 607) @@ -1,56 +0,0 @@ -package org.codehaus.waffle.example.freemarker.persister; - -import org.codehaus.waffle.example.freemarker.model.Person; -import org.codehaus.waffle.example.freemarker.persister.PersonDAO; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -public class SimplePersonDAO implements PersonDAO { - private static long COUNT = 3; - private final Map<Long, Person> map = new HashMap<Long, Person>(); - - public SimplePersonDAO() { - Person person = new Person(); - person.setId(1L); - person.setFirstName("Harry"); - person.setLastName("Potter"); - person.setEmail("[EMAIL PROTECTED]"); - map.put(1L, person); - - person = new Person(); - person.setId(2L); - person.setFirstName("Ronald"); - person.setLastName("Weasly"); - person.setEmail("[EMAIL PROTECTED]"); - map.put(2L, person); - - person = new Person(); - person.setId(3L); - person.setFirstName("Hermione"); - person.setLastName("Granger"); - person.setEmail("[EMAIL PROTECTED]"); - map.put(3L, person); - } - - public Person findById(Long personId) { - // create a copy so that edits don't propogate to the map - return new Person(map.get(personId)); - } - - public Collection<Person> findAll() { - return map.values(); - } - - public void save(Person person) { - if(person.getId().equals(new Long(0))) { - person.setId(++COUNT); - } - map.put(person.getId(), person); - } - - public void delete(Long personId) { - - } -}
Copied: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonPersister.java (from rev 606, trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonDAO.java) (0 => 607)
--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonPersister.java (rev 0) +++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/persister/SimplePersonPersister.java 2008-04-14 10:20:48 UTC (rev 607) @@ -0,0 +1,52 @@ +package org.codehaus.waffle.example.freemarker.persister; + +import org.codehaus.waffle.example.freemarker.model.Person; +import org.codehaus.waffle.example.freemarker.persister.PersonPersister; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +public class SimplePersonPersister implements PersonPersister { + private static long COUNT = 3; + private final Map<Long, Person> map = new HashMap<Long, Person>(); + + public SimplePersonPersister() { + loadPeople(); + } + + private void loadPeople() { + addPerson(1L, "Harry", "Potter", "[EMAIL PROTECTED]"); + addPerson(2L, "Ronald", "Weasly", "[EMAIL PROTECTED]"); + addPerson(3L, "Hermione", "Granger", "[EMAIL PROTECTED]"); + } + + private void addPerson(Long id, String firstName, String lastName, String email) { + Person person = new Person(); + person.setId(id); + person.setFirstName(firstName); + person.setLastName(lastName); + person.setEmail(email); + map.put(id, person); + } + + public Person findById(Long personId) { + // create a copy so that edits don't propogate to the map + return new Person(map.get(personId)); + } + + public Collection<Person> findAll() { + return map.values(); + } + + public void save(Person person) { + if(person.getId().equals(new Long(0))) { + person.setId(++COUNT); + } + map.put(person.getId(), person); + } + + public void delete(Long personId) { + + } +}
To unsubscribe from this list please visit:
