From: <sim...@us...> - 2008-10-19 12:19:04
|
Revision: 837 http://zkforge.svn.sourceforge.net/zkforge/?rev=837&view=rev Author: simon_massey Date: 2008-10-19 12:18:54 +0000 (Sun, 19 Oct 2008) Log Message: ----------- Modified Paths: -------------- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoController.java trunk/zktodo2/src/main/resources/spring-context.xml Added Paths: ----------- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java trunk/zktodo2/src/test/java/org/zkforge/zktodo2/ReminderTest.java Removed Paths: ------------- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Event.java trunk/zktodo2/src/main/java/org/zkforge/zktodo2/EventService.java trunk/zktodo2/src/test/java/org/zkforge/zktodo2/EventTest.java Property Changed: ---------------- trunk/zktodo2/ Property changes on: trunk/zktodo2 ___________________________________________________________________ Modified: svn:ignore - target zktodo2test.dat.lck zktodo2test.dat.properties zktodo2test.dat.script zktodo2.dat.lck zktodo2.dat.properties + target zktodo2test.dat.lck zktodo2test.dat.properties zktodo2test.dat.script zktodo2.dat.lck zktodo2.dat.properties zktodo2.dat.script Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Event.java =================================================================== --- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Event.java 2008-10-19 11:21:02 UTC (rev 836) +++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Event.java 2008-10-19 12:18:54 UTC (rev 837) @@ -1,71 +0,0 @@ -package org.zkforge.zktodo2; - -import java.util.Date; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; - -@Entity -@Table(name = "EVENTS") -public class Event { - @Override - public boolean equals(Object obj) { - if( obj instanceof Event ){ - Event other = (Event) obj; - if( this.getId() != null && other.getId() != null && this.getId().equals(other.getId())){ - return true; - } - } - return false; - } - @Override - public int hashCode() { - return Long.valueOf(this.getId()).hashCode(); - } - @Id @GeneratedValue - @Column(name = "EVENT_ID") - private Long id; - - @Column(name = "NAME") - private String name; - - @Column(name = "PRIORITY") - private int priority; - - @Column(name = "DATE") - private Date date; - - public Event(){} - public Event(String name,int priority,Date date){ - this.name = name; - this.priority = priority; - this.date = date; - } - public Date getDate() { - return date; - } - public void setDate(Date date) { - this.date = date; - } - public int getPriority() { - return priority; - } - public void setPriority(int priority) { - this.priority = priority; - } - public Long getId() { - return id; - } - public void setId(Long id) { - this.id = id; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } -} Deleted: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/EventService.java =================================================================== --- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/EventService.java 2008-10-19 11:21:02 UTC (rev 836) +++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/EventService.java 2008-10-19 12:18:54 UTC (rev 837) @@ -1,40 +0,0 @@ -package org.zkforge.zktodo2; - -import java.util.List; - -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -public class EventService { - protected BasicDao basicDao; - - public BasicDao getBasicDao() { - return basicDao; - } - - public void setBasicDao(BasicDao basicDao) { - this.basicDao = basicDao; - } - - @SuppressWarnings("unchecked") - @Transactional(readOnly=true) - public List<Event> findAll(){ - List<?> events = this.basicDao.findAll(Event.class); - return(List<Event>) events; - } - - @Transactional(readOnly=false,propagation = Propagation.REQUIRED) - public void persistEvent(Event event){ - this.basicDao.persist(event); - } - - @Transactional(readOnly=false,propagation = Propagation.REQUIRED) - public void deleteEvent(Event event) throws EntityNotFoundException { - this.basicDao.remove(Event.class, event.getId()); - } - - @Transactional(readOnly=false,propagation = Propagation.REQUIRED) - public void mergeEvent(Event event) throws EntityNotFoundException { - this.basicDao.merge(event); - } -} Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java (from rev 834, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Event.java) =================================================================== --- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java (rev 0) +++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java 2008-10-19 12:18:54 UTC (rev 837) @@ -0,0 +1,71 @@ +package org.zkforge.zktodo2; + +import java.util.Date; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "REMINDER") +public class Reminder { + @Override + public boolean equals(Object obj) { + if( obj instanceof Reminder ){ + Reminder other = (Reminder) obj; + if( this.getId() != null && other.getId() != null && this.getId().equals(other.getId())){ + return true; + } + } + return false; + } + @Override + public int hashCode() { + return Long.valueOf(this.getId()).hashCode(); + } + @Id @GeneratedValue + @Column(name = "REMINDER_ID") + private Long id; + + @Column(name = "NAME") + private String name; + + @Column(name = "PRIORITY") + private int priority; + + @Column(name = "DATE") + private Date date; + + public Reminder(){} + public Reminder(String name,int priority,Date date){ + this.name = name; + this.priority = priority; + this.date = date; + } + public Date getDate() { + return date; + } + public void setDate(Date date) { + this.date = date; + } + public int getPriority() { + return priority; + } + public void setPriority(int priority) { + this.priority = priority; + } + public Long getId() { + return id; + } + public void setId(Long id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } +} Property changes on: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/Reminder.java ___________________________________________________________________ Added: svn:mergeinfo + Copied: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java (from rev 834, trunk/zktodo2/src/main/java/org/zkforge/zktodo2/EventService.java) =================================================================== --- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java (rev 0) +++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java 2008-10-19 12:18:54 UTC (rev 837) @@ -0,0 +1,40 @@ +package org.zkforge.zktodo2; + +import java.util.List; + +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +public class ReminderService { + protected BasicDao basicDao; + + public BasicDao getBasicDao() { + return basicDao; + } + + public void setBasicDao(BasicDao basicDao) { + this.basicDao = basicDao; + } + + @SuppressWarnings("unchecked") + @Transactional(readOnly=true) + public List<Reminder> findAll(){ + List<?> events = this.basicDao.findAll(Reminder.class); + return(List<Reminder>) events; + } + + @Transactional(readOnly=false,propagation = Propagation.REQUIRED) + public void persistEvent(Reminder reminder){ + this.basicDao.persist(reminder); + } + + @Transactional(readOnly=false,propagation = Propagation.REQUIRED) + public void deleteEvent(Reminder reminder) throws EntityNotFoundException { + this.basicDao.remove(Reminder.class, reminder.getId()); + } + + @Transactional(readOnly=false,propagation = Propagation.REQUIRED) + public void mergeEvent(Reminder reminder) throws EntityNotFoundException { + this.basicDao.merge(reminder); + } +} Property changes on: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ReminderService.java ___________________________________________________________________ Added: svn:mergeinfo + Modified: trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoController.java =================================================================== --- trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoController.java 2008-10-19 11:21:02 UTC (rev 836) +++ trunk/zktodo2/src/main/java/org/zkforge/zktodo2/ZkToDoController.java 2008-10-19 12:18:54 UTC (rev 837) @@ -1,10 +1,13 @@ package org.zkforge.zktodo2; +import static java.lang.System.out; + import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Datebox; @@ -16,42 +19,40 @@ import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Textbox; -import static java.lang.System.out; - public class ZkToDoController extends GenericForwardComposer implements ListitemRenderer { public ZkToDoController() { } - protected EventService eventService; + protected ReminderService reminderService; - public EventService getEventService() { - return eventService; + public ReminderService getReminderService() { + return reminderService; } - public void setEventService(EventService eventService) { - this.eventService = eventService; + public void setReminderService(ReminderService reminderService) { + this.reminderService = reminderService; } - protected Event selectedEvent = null; + protected Reminder selectedReminder = null; @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); listModelList = new ListModelList(); - List<Event> events = eventService.findAll(); - listModelList.addAll(events); + List<Reminder> reminders = reminderService.findAll(); + listModelList.addAll(reminders); list.setModel(listModelList); list.setItemRenderer(this); list.addEventListener("onSelect", new EventListener(){ - public void onEvent(org.zkoss.zk.ui.event.Event e) + public void onEvent(Event e) throws Exception { int index = list.getSelectedIndex(); - selectedEvent = (Event) listModelList.get(index); - date.setValue(selectedEvent.getDate()); - priority.setValue(selectedEvent.getPriority()); - name.setValue(selectedEvent.getName()); + selectedReminder = (Reminder) listModelList.get(index); + date.setValue(selectedReminder.getDate()); + priority.setValue(selectedReminder.getPriority()); + name.setValue(selectedReminder.getName()); return; }}); } @@ -62,71 +63,71 @@ protected Listbox list; protected ListModelList listModelList; - public void onClick$add(org.zkoss.zk.ui.event.Event e) { + public void onClick$add(Event e) { Date dateValue = date.getValue(); Integer priorityValue = priority.getValue(); String nameValue = name.getValue(); if( dateValue != null && priorityValue != null && nameValue != null ){ - Event event = new Event(); - event.setDate(date.getValue()); - event.setName(name.getValue()); - event.setPriority(priority.getValue()); - this.eventService.persistEvent(event); - List<Event> events = this.eventService.findAll(); + Reminder reminder = new Reminder(); + reminder.setDate(date.getValue()); + reminder.setName(name.getValue()); + reminder.setPriority(priority.getValue()); + this.reminderService.persistEvent(reminder); + List<Reminder> reminders = this.reminderService.findAll(); this.listModelList.clear(); - this.listModelList.addAll(events); - this.selectedEvent = event; + this.listModelList.addAll(reminders); + this.selectedReminder = reminder; } } - public void onClick$update(org.zkoss.zk.ui.event.Event e) { - if( selectedEvent != null ){ - selectedEvent.setDate(date.getValue()); - selectedEvent.setPriority(priority.getValue()); - selectedEvent.setName(name.getValue()); + public void onClick$update(Event e) { + if( selectedReminder != null ){ + selectedReminder.setDate(date.getValue()); + selectedReminder.setPriority(priority.getValue()); + selectedReminder.setName(name.getValue()); try { - this.eventService.mergeEvent(selectedEvent); + this.reminderService.mergeEvent(selectedReminder); } catch (EntityNotFoundException exception){ int index = list.getSelectedIndex(); listModelList.remove(index); - alert("Event "+selectedEvent.getName()+" has been deleted by another user."); + alert("Reminder "+selectedReminder.getName()+" has been deleted by another user."); if( listModelList.size() > 0 ){ - selectedEvent = (Event)listModelList.get(0); + selectedReminder = (Reminder)listModelList.get(0); list.setSelectedIndex(0); - name.setValue(selectedEvent.getName()); - date.setValue(selectedEvent.getDate()); - priority.setValue(selectedEvent.getPriority()); + name.setValue(selectedReminder.getName()); + date.setValue(selectedReminder.getDate()); + priority.setValue(selectedReminder.getPriority()); } else { - selectedEvent = null; + selectedReminder = null; } } - List<Event> events = eventService.findAll(); + List<Reminder> reminders = reminderService.findAll(); listModelList.clear(); - listModelList.addAll(events); + listModelList.addAll(reminders); } } - public void onClick$delete(org.zkoss.zk.ui.event.Event e) { - if( null != selectedEvent ){ - int index = listModelList.indexOf(selectedEvent); + public void onClick$delete(Event e) { + if( null != selectedReminder ){ + int index = listModelList.indexOf(selectedReminder); try { - this.eventService.deleteEvent(selectedEvent); + this.reminderService.deleteEvent(selectedReminder); } catch (EntityNotFoundException exception ){ out.println("This is harmless as someone else has already deleted this item."); } - listModelList.remove(selectedEvent); + listModelList.remove(selectedReminder); if( index >= listModelList.size() ){ index = listModelList.size() - 1; } if( listModelList.size() > 0 ){ - selectedEvent = (Event)listModelList.get(index); + selectedReminder = (Reminder)listModelList.get(index); list.setSelectedIndex(index); - name.setValue(selectedEvent.getName()); - date.setValue(selectedEvent.getDate()); - priority.setValue(selectedEvent.getPriority()); + name.setValue(selectedReminder.getName()); + date.setValue(selectedReminder.getDate()); + priority.setValue(selectedReminder.getPriority()); } else { - selectedEvent = null; + selectedReminder = null; } } } @@ -134,9 +135,9 @@ protected SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MMM-yy"); public void render(Listitem listItem, Object data) throws Exception { - Event event = (Event) data; - new Listcell(event.getName()).setParent(listItem); - new Listcell(event.getPriority()+"").setParent(listItem); - new Listcell(dateFormat.format(event.getDate())).setParent(listItem); + Reminder reminder = (Reminder) data; + new Listcell(reminder.getName()).setParent(listItem); + new Listcell(reminder.getPriority()+"").setParent(listItem); + new Listcell(dateFormat.format(reminder.getDate())).setParent(listItem); } } Modified: trunk/zktodo2/src/main/resources/spring-context.xml =================================================================== --- trunk/zktodo2/src/main/resources/spring-context.xml 2008-10-19 11:21:02 UTC (rev 836) +++ trunk/zktodo2/src/main/resources/spring-context.xml 2008-10-19 12:18:54 UTC (rev 837) @@ -44,12 +44,12 @@ <bean id="basicDao" class="org.zkforge.zktodo2.BasicDao" /> - <bean id="eventService" class="org.zkforge.zktodo2.EventService" + <bean id="reminderService" class="org.zkforge.zktodo2.ReminderService" p:basicDao-ref="basicDao" /> <bean id="toDoController" class="org.zkforge.zktodo2.ZkToDoController" - p:eventService-ref="eventService" scope="prototype" + p:reminderService-ref="reminderService" scope="prototype" /> </beans> Deleted: trunk/zktodo2/src/test/java/org/zkforge/zktodo2/EventTest.java =================================================================== --- trunk/zktodo2/src/test/java/org/zkforge/zktodo2/EventTest.java 2008-10-19 11:21:02 UTC (rev 836) +++ trunk/zktodo2/src/test/java/org/zkforge/zktodo2/EventTest.java 2008-10-19 12:18:54 UTC (rev 837) @@ -1,112 +0,0 @@ -package org.zkforge.zktodo2; - -import java.util.Calendar; -import java.util.List; - -import javax.sql.DataSource; - -import org.springframework.test.AbstractDependencyInjectionSpringContextTests; -import org.springframework.test.jpa.AbstractJpaTests; - -public class EventTest extends AbstractJpaTests { - - public EventTest() { - this - .setAutowireMode(AbstractDependencyInjectionSpringContextTests.AUTOWIRE_BY_NAME); - } - - public String[] getConfigLocations() { - return new String[] { "classpath:dataSourceContext.xml", - "classpath:spring-context.xml" }; - } - - protected DataSource dataSource; - - public DataSource getDataSource() { - return dataSource; - } - - public void setDataSource(DataSource dataSource) { - this.dataSource = dataSource; - } - - protected BasicDao basicDao; - - public BasicDao getBasicDao() { - return basicDao; - } - - public void setBasicDao(BasicDao basicDao) { - this.basicDao = basicDao; - } - - protected EventService eventService; - - public void testConfig() throws Exception { - assertNotNull(dataSource); - assertNotNull(basicDao); - assertNotNull(eventService); - } - - public void testBasicDao() throws Exception { - Calendar calender = Calendar.getInstance(); - calender.set(1975, 5, 19); - Event event = new Event("My Birthday", 2, calender.getTime()); - basicDao.persist(event); - assertNotNull(event.getId()); - Event event2 = (Event)basicDao.findSingle("from Event where name = ?", "My Birthday"); - assertEquals(event, event2); - calender.set(1979, 4, 8); - Event event3 = new Event("My Ladies Birthday", 1, calender.getTime()); - basicDao.persist(event3); - assertNotNull(event3.getId()); - Event event4 = (Event)basicDao.findSingle("from Event where name = ?", "My Ladies Birthday"); - assertEquals(event3, event4); - List<Event> events = (List<Event>)basicDao.findAll(Event.class); - assertEquals(2, events.size()); - boolean foundMyDay = false; - boolean foundHerDay = false; - for( Event e : events ){ - if( e.getName().equals("My Birthday")){ - foundMyDay = true; - } else if ( e.getName().equals("My Ladies Birthday") ){ - foundHerDay = true; - } - } - assertTrue(foundMyDay); - assertTrue(foundHerDay); - } - - public void testEventModel() throws Exception { - Calendar calender = Calendar.getInstance(); - calender.set(1975, 5, 19); - Event event = new Event("My Birthday", 2, calender.getTime()); - eventService.persistEvent(event); - assertNotNull(event.getId()); - calender.set(1979, 4, 8); - Event event2 = new Event("My Ladies Birthday", 1, calender.getTime()); - eventService.persistEvent(event2); - assertNotNull(event2.getId()); - List<Event> events = eventService.findAll(); - assertEquals(2, events.size()); - boolean foundMyDay = false; - boolean foundHerDay = false; - for( Event e : events ){ - if( e.getName().equals("My Birthday")){ - foundMyDay = true; - } else if ( e.getName().equals("My Ladies Birthday") ){ - foundHerDay = true; - } - } - assertTrue(foundMyDay); - assertTrue(foundHerDay); - } - - public EventService getEventService() { - return eventService; - } - - public void setEventService(EventService eventService) { - this.eventService = eventService; - } -} Copied: trunk/zktodo2/src/test/java/org/zkforge/zktodo2/ReminderTest.java (from rev 834, trunk/zktodo2/src/test/java/org/zkforge/zktodo2/EventTest.java) =================================================================== --- trunk/zktodo2/src/test/java/org/zkforge/zktodo2/ReminderTest.java (rev 0) +++ trunk/zktodo2/src/test/java/org/zkforge/zktodo2/ReminderTest.java 2008-10-19 12:18:54 UTC (rev 837) @@ -0,0 +1,112 @@ +package org.zkforge.zktodo2; + +import java.util.Calendar; +import java.util.List; + +import javax.sql.DataSource; + +import org.springframework.test.AbstractDependencyInjectionSpringContextTests; +import org.springframework.test.jpa.AbstractJpaTests; + +public class ReminderTest extends AbstractJpaTests { + + public ReminderTest() { + this + .setAutowireMode(AbstractDependencyInjectionSpringContextTests.AUTOWIRE_BY_NAME); + } + + public String[] getConfigLocations() { + return new String[] { "classpath:dataSourceContext.xml", + "classpath:spring-context.xml" }; + } + + protected DataSource dataSource; + + public DataSource getDataSource() { + return dataSource; + } + + public void setDataSource(DataSource dataSource) { + this.dataSource = dataSource; + } + + protected BasicDao basicDao; + + public BasicDao getBasicDao() { + return basicDao; + } + + public void setBasicDao(BasicDao basicDao) { + this.basicDao = basicDao; + } + + protected ReminderService reminderService; + + public ReminderService getReminderService() { + return reminderService; + } + + public void setReminderService(ReminderService reminderService) { + this.reminderService = reminderService; + } + + public void testConfig() throws Exception { + assertNotNull(dataSource); + assertNotNull(basicDao); + assertNotNull(reminderService); + } + + public void testBasicDao() throws Exception { + Calendar calender = Calendar.getInstance(); + calender.set(1975, 5, 19); + Reminder reminder = new Reminder("My Birthday", 2, calender.getTime()); + basicDao.persist(reminder); + assertNotNull(reminder.getId()); + Reminder event2 = (Reminder)basicDao.findSingle("from Reminder where name = ?", "My Birthday"); + assertEquals(reminder, event2); + calender.set(1979, 4, 8); + Reminder event3 = new Reminder("My Ladies Birthday", 1, calender.getTime()); + basicDao.persist(event3); + assertNotNull(event3.getId()); + Reminder event4 = (Reminder)basicDao.findSingle("from Reminder where name = ?", "My Ladies Birthday"); + assertEquals(event3, event4); + List<Reminder> reminders = (List<Reminder>)basicDao.findAll(Reminder.class); + assertEquals(2, reminders.size()); + boolean foundMyDay = false; + boolean foundHerDay = false; + for( Reminder e : reminders ){ + if( e.getName().equals("My Birthday")){ + foundMyDay = true; + } else if ( e.getName().equals("My Ladies Birthday") ){ + foundHerDay = true; + } + } + assertTrue(foundMyDay); + assertTrue(foundHerDay); + } + + public void testEventModel() throws Exception { + Calendar calender = Calendar.getInstance(); + calender.set(1975, 5, 19); + Reminder reminder = new Reminder("My Birthday", 2, calender.getTime()); + reminderService.persistEvent(reminder); + assertNotNull(reminder.getId()); + calender.set(1979, 4, 8); + Reminder event2 = new Reminder("My Ladies Birthday", 1, calender.getTime()); + reminderService.persistEvent(event2); + assertNotNull(event2.getId()); + List<Reminder> reminders = reminderService.findAll(); + assertEquals(2, reminders.size()); + boolean foundMyDay = false; + boolean foundHerDay = false; + for( Reminder e : reminders ){ + if( e.getName().equals("My Birthday")){ + foundMyDay = true; + } else if ( e.getName().equals("My Ladies Birthday") ){ + foundHerDay = true; + } + } + assertTrue(foundMyDay); + assertTrue(foundHerDay); + } +} Property changes on: trunk/zktodo2/src/test/java/org/zkforge/zktodo2/ReminderTest.java ___________________________________________________________________ Added: svn:mergeinfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |