[jboss-cvs] jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam ...

[Gavin King]

  User: gavin   
  Date: 07/06/17 21:22:40

  Modified:    examples/dvdstore/src/com/jboss/dvd/seam   
                        AcceptAction.java ShipAction.java
                        ShowOrdersAction.java
  Log:
  improve
  
  Revision  Changes    Path
  1.15      +1 -6      jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/AcceptAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AcceptAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/AcceptAction.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- AcceptAction.java	14 Dec 2006 12:23:24 -0000	1.14
  +++ AcceptAction.java	18 Jun 2007 01:22:40 -0000	1.15
  @@ -14,13 +14,11 @@
   import javax.persistence.PersistenceContext;
   import javax.persistence.PersistenceContextType;
   
  -import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.BeginTask;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.EndTask;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
  -import org.jboss.seam.annotations.Out;
   
   
   @Stateful
  @@ -35,7 +33,7 @@
       @PersistenceContext(type=PersistenceContextType.EXTENDED)
       EntityManager em;
   
  -    @Out(scope=ScopeType.CONVERSATION)
  +    @In
       Order order;
   
       @In
  @@ -43,9 +41,6 @@
   
       @BeginTask
       public String viewTask() {
  -        order = (Order) em.createQuery("select distinct o from Order o join fetch o.orderLines where o.orderId = :orderId")
  -            .setParameter("orderId", orderId)
  -            .getSingleResult();
           return "accept";
       }
   
  
  
  
  1.15      +4 -13     jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShipAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ShipAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShipAction.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ShipAction.java	22 Mar 2007 19:39:31 -0000	1.14
  +++ ShipAction.java	18 Jun 2007 01:22:40 -0000	1.15
  @@ -10,19 +10,14 @@
   
   import javax.ejb.Remove;
   import javax.ejb.Stateful;
  -import javax.persistence.EntityManager;
  -import javax.persistence.PersistenceContext;
  -import javax.persistence.PersistenceContextType;
   
   import org.hibernate.validator.Length;
   import org.hibernate.validator.NotNull;
  -import org.jboss.seam.Component;
  -import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.BeginTask;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.EndTask;
  +import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
  -import org.jboss.seam.annotations.Out;
   
   @Stateful
   @Name("ship")
  @@ -32,10 +27,7 @@
   {
       private static final long serialVersionUID = -5284603520443473953L;
   
  -    @PersistenceContext(type=PersistenceContextType.EXTENDED)
  -    EntityManager em;
  -    
  -    @Out(required=false, scope=ScopeType.CONVERSATION)
  +    @In 
       Order order;
       
       String track;
  @@ -45,20 +37,19 @@
       public String getTrack() {
           return track;
       }
  +    
       public void setTrack(String track) {
           this.track=track;
       }
   
       @BeginTask
       public String viewTask() {          
  -        order = (Order) Component.getInstance("workingOrder");
           return "ship";
       }
       
       @EndTask
       public String ship() {        
           order.ship(track);
  -        
           return "admin";
       }
   
  
  
  
  1.17      +0 -3      jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShowOrdersAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ShowOrdersAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/ShowOrdersAction.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- ShowOrdersAction.java	17 Jun 2007 23:07:53 -0000	1.16
  +++ ShowOrdersAction.java	18 Jun 2007 01:22:40 -0000	1.17
  @@ -17,7 +17,6 @@
   
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Begin;
  -import org.jboss.seam.annotations.CreateProcess;
   import org.jboss.seam.annotations.Destroy;
   import org.jboss.seam.annotations.End;
   import org.jboss.seam.annotations.Factory;
  @@ -27,8 +26,6 @@
   import org.jboss.seam.annotations.ResumeProcess;
   import org.jboss.seam.annotations.datamodel.DataModel;
   import org.jboss.seam.annotations.datamodel.DataModelSelection;
  -import org.jboss.seam.core.ManagedJbpmContext;
  -import org.jbpm.JbpmContext;
   import org.jbpm.graph.exe.ProcessInstance;
   
   import com.jboss.dvd.seam.Order.Status;