[seam-commits] Seam SVN: r8748 - in trunk/examples: groovybooking/src/action/org/jboss/seam/example/groovy and 7 other directories.

Author: pete.muir(a)jboss.org Date: 2008-08-20 08:08:30 -0400 (Wed, 20 Aug 2008) New Revision: 8748 Modified: trunk/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java trunk/examples/groovybooking/src/action/org/jboss/seam/example/groovy/BookingListAction.groovy trunk/examples/hibernate/src/org/jboss/seam/example/hibernate/BookingListAction.java trunk/examples/icefaces/src/org/jboss/seam/example/booking/BookingListAction.java trunk/examples/jee5/booking/src/org/jboss/seam/example/booking/BookingListAction.java trunk/examples/jpa/src/org/jboss/seam/example/jpa/BookingListAction.java trunk/examples/nestedbooking/src/org/jboss/seam/example/booking/BookingListAction.java trunk/examples/spring/src/org/jboss/seam/example/spring/BookingListAction.java trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java Log: JBSEAM-3288 Modified: trunk/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java =================================================================== --- trunk/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/booking/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -63,7 +63,7 @@ Booking cancelled = em.find(Booking.class, booking.getId()); if (cancelled!=null) em.remove( cancelled ); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/groovybooking/src/action/org/jboss/seam/example/groovy/BookingListAction.groovy =================================================================== --- trunk/examples/groovybooking/src/action/org/jboss/seam/example/groovy/BookingListAction.groovy 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/groovybooking/src/action/org/jboss/seam/example/groovy/BookingListAction.groovy 2008-08-20 12:08:30 UTC (rev 8748) @@ -51,7 +51,7 @@ Booking cancelled = em.find(Booking.class, booking.id) if (cancelled != null) em.remove( cancelled ) getBookings() - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}", new Object[0]) + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()) } } Modified: trunk/examples/hibernate/src/org/jboss/seam/example/hibernate/BookingListAction.java =================================================================== --- trunk/examples/hibernate/src/org/jboss/seam/example/hibernate/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/hibernate/src/org/jboss/seam/example/hibernate/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -56,7 +56,7 @@ Booking cancelled = (Booking) bookingDatabase.get(Booking.class, booking.getId()); if (cancelled!=null) bookingDatabase.delete( cancelled ); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/icefaces/src/org/jboss/seam/example/booking/BookingListAction.java =================================================================== --- trunk/examples/icefaces/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/icefaces/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -63,7 +63,7 @@ Booking cancelled = em.find(Booking.class, booking.getId()); if (cancelled!=null) em.remove( cancelled ); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/jee5/booking/src/org/jboss/seam/example/booking/BookingListAction.java =================================================================== --- trunk/examples/jee5/booking/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/jee5/booking/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -62,7 +62,7 @@ Booking cancelled = em.find(Booking.class, booking.getId()); if (cancelled!=null) em.remove( cancelled ); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/jpa/src/org/jboss/seam/example/jpa/BookingListAction.java =================================================================== --- trunk/examples/jpa/src/org/jboss/seam/example/jpa/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/jpa/src/org/jboss/seam/example/jpa/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -57,7 +57,7 @@ Booking cancelled = em.find(Booking.class, booking.getId()); if (cancelled!=null) em.remove( cancelled ); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/nestedbooking/src/org/jboss/seam/example/booking/BookingListAction.java =================================================================== --- trunk/examples/nestedbooking/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/nestedbooking/src/org/jboss/seam/example/booking/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -59,7 +59,7 @@ Booking cancelled = em.find(Booking.class, booking.getId()); if (cancelled!=null) em.remove( cancelled ); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/spring/src/org/jboss/seam/example/spring/BookingListAction.java =================================================================== --- trunk/examples/spring/src/org/jboss/seam/example/spring/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/spring/src/org/jboss/seam/example/spring/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -51,7 +51,7 @@ log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}"); bookingService.cancelBooking(booking.getId()); getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #{bookingList.booking.id}"); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); } public Booking getBooking() Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java =================================================================== --- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java 2008-08-20 11:36:09 UTC (rev 8747) +++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java 2008-08-20 12:08:30 UTC (rev 8748) @@ -21,6 +21,7 @@ import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.security.Restrict; +import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessages; import org.jboss.seam.log.Log; @@ -63,7 +64,7 @@ Booking cancelled = em.find(Booking.class, booking.getId()); if (cancelled!=null) em.remove( cancelled ); getBookings(); - StatusMessages.instance().addToControl("body", "Booking cancelled for confirmation number #{bookingList.booking.id}"); + StatusMessages.instance().addToControl("body", "Booking cancelled for confirmation number #0", booking.getId()); } // TODO replace this with @Out in Wicket