Author: norman.richards(a)jboss.com Date: 2008-05-07 13:07:48 -0400 (Wed, 07 May 2008) New Revision: 8133 Modified: branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/Checkout.java branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java Log: JBSEAM-2950 Modified: branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/Checkout.java =================================================================== --- branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/Checkout.java 2008-05-07 15:08:05 UTC (rev 8132) +++ branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/Checkout.java 2008-05-07 17:07:48 UTC (rev 8133) @@ -9,7 +9,7 @@ public interface Checkout { public void createOrder(); - public void submitOrder(); + public Order submitOrder(); public void destroy(); } Modified: branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java =================================================================== --- branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java 2008-05-07 15:08:05 UTC (rev 8132) +++ branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java 2008-05-07 17:07:48 UTC (rev 8133) @@ -75,7 +75,7 @@ @End @CreateProcess(definition="OrderManagement", processKey="#{completedOrder.orderId}") @Restrict("#{identity.loggedIn}") - public void submitOrder() { + public Order submitOrder() { try { completedOrder = purchase(customer, currentOrder); @@ -88,7 +88,10 @@ Contexts.getEventContext().set("prod", product); FacesMessages.instance().addFromResourceBundle("checkoutInsufficientQuantity"); } + return null; } + + return completedOrder; } private Order purchase(Customer customer, Order order) Modified: branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java =================================================================== --- branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java 2008-05-07 15:08:05 UTC (rev 8132) +++ branches/Seam_2_0/examples/dvdstore/src/com/jboss/dvd/seam/FullTextSearchAction.java 2008-05-07 17:07:48 UTC (rev 8133) @@ -106,7 +106,6 @@ @Begin(join = true) public void selectFromRequest() { - System.out.println("*** ID=" + id); if (id != null) { dvd = em.find(Product.class, id); } else if (selectedProduct != null) { @@ -199,7 +198,6 @@ } public void setSelectedId(Long id) { - System.out.println("- set id " + id); this.id = id; }