From: Norman R. <nor...@jb...> - 2005-09-20 21:59:42
|
User: nrichards Date: 05/09/20 17:59:37 Modified: examples/dvdstore/src/com/jboss/dvd/seam EditCustomerAction.java LoggedInInterceptor.java LoginIfInterceptor.java Search.java SearchAction.java SelectableItem.java ShoppingCartBean.java Log: use facelets Revision Changes Path 1.3 +0 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/EditCustomerAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EditCustomerAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/EditCustomerAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- EditCustomerAction.java 19 Sep 2005 00:49:07 -0000 1.2 +++ EditCustomerAction.java 20 Sep 2005 21:59:37 -0000 1.3 @@ -105,7 +105,6 @@ em.persist(customer); sessionContext.set("currentUser", customer); - System.out.println("Created: " + customer); return "ok"; } catch (RuntimeException e) { System.out.println("not created"); 1.2 +0 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoggedInInterceptor.java (In the diff below, changes in quantity of whitespace are not shown.) Index: LoggedInInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoggedInInterceptor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- LoggedInInterceptor.java 18 Sep 2005 05:18:18 -0000 1.1 +++ LoggedInInterceptor.java 20 Sep 2005 21:59:37 -0000 1.2 @@ -22,7 +22,6 @@ public Object checkLoggedIn(InvocationContext invocation) throws Exception { - System.out.println("!!!! LoggedIn: " + Contexts.getSessionContext().get(LoginIfInterceptor.LOGIN_KEY)); boolean isLoggedIn = Contexts.getSessionContext().get(LoginIfInterceptor.LOGIN_KEY)!=null; if (isLoggedIn) { log.info("User is already logged in"); 1.3 +3 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginIfInterceptor.java (In the diff below, changes in quantity of whitespace are not shown.) Index: LoginIfInterceptor.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/LoginIfInterceptor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- LoginIfInterceptor.java 19 Sep 2005 00:49:07 -0000 1.2 +++ LoginIfInterceptor.java 20 Sep 2005 21:59:37 -0000 1.3 @@ -19,6 +19,7 @@ public class LoginIfInterceptor { public static final String LOGIN_KEY = "loggedIn"; + private static final Logger log = Logger.getLogger(LoggedInInterceptor.class); @AroundInvoke public Object loginIf(InvocationContext invocation) @@ -27,7 +28,9 @@ Object result = invocation.proceed(); LoginIf anno = invocation.getMethod().getAnnotation(LoginIf.class); if (anno != null) { + log.info("testing result " + result); if (Arrays.asList(anno.outcome()).contains(result)) { + log.info("logged in"); Contexts.getSessionContext().set(LOGIN_KEY, true); } } 1.3 +2 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Search.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Search.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/Search.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- Search.java 18 Sep 2005 22:41:43 -0000 1.2 +++ Search.java 20 Sep 2005 21:59:37 -0000 1.3 @@ -10,6 +10,8 @@ public interface Search { + public java.util.List getSearchResults(); + public String getActor(); public void setActor(String actor); 1.4 +9 -2 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/SearchAction.java (In the diff below, changes in quantity of whitespace are not shown.) Index: SearchAction.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/SearchAction.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- SearchAction.java 18 Sep 2005 23:45:39 -0000 1.3 +++ SearchAction.java 20 Sep 2005 21:59:37 -0000 1.4 @@ -74,8 +74,11 @@ return actor; } - @DataModel List<SelectableItem<Product>> searchResults; + public List getSearchResults() { + return searchResults; + } + List<Category> categories; Map<String,Integer> categoryMap; @@ -89,7 +92,7 @@ System.out.println("search.doSearch! -> browse"); currentPage=0; updateResults(); - return null; + return "browse"; } public boolean getHasResults() { @@ -195,14 +198,18 @@ public String addToCart() { + System.out.println("ADD TO CART: " + cart); for (SelectableItem<Product> item: searchResults) { if (item.getSelected()) { item.setSelected(false); + + System.out.println("ADDING: " + item.getItem()); cart.addProduct(item.getItem(), 1); } } + System.out.println("!!"); return null; } 1.2 +4 -0 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/SelectableItem.java (In the diff below, changes in quantity of whitespace are not shown.) Index: SelectableItem.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/SelectableItem.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- SelectableItem.java 18 Sep 2005 05:18:18 -0000 1.1 +++ SelectableItem.java 20 Sep 2005 21:59:37 -0000 1.2 @@ -33,4 +33,8 @@ this.selected=val; } + public String toString() { + return super.toString() + "[selected=" + selected + "]"; + } + } 1.4 +1 -1 jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShoppingCartBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ShoppingCartBean.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShoppingCartBean.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- ShoppingCartBean.java 18 Sep 2005 23:45:39 -0000 1.3 +++ ShoppingCartBean.java 20 Sep 2005 21:59:37 -0000 1.4 @@ -37,7 +37,7 @@ implements ShoppingCart, Serializable { - @In("currentUser") + @In(value="currentUser",required=false) Customer customer; @PersistenceContext(unitName="dvd") |