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

[Gavin King]

  User: gavin   
  Date: 07/06/17 19:07:53

  Modified:    examples/dvdstore/src/com/jboss/dvd/seam  
                        CheckoutAction.java ShowOrdersAction.java
  Log:
  yay, finally :)
  
  Revision  Changes    Path
  1.8       +1 -1      jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CheckoutAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/src/com/jboss/dvd/seam/CheckoutAction.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- CheckoutAction.java	17 Dec 2006 07:20:05 -0000	1.7
  +++ CheckoutAction.java	17 Jun 2007 23:07:53 -0000	1.8
  @@ -73,7 +73,7 @@
       }
   
       @End
  -    @CreateProcess(definition="OrderManagement")
  +    @CreateProcess(definition="OrderManagement", processKey="#{completedOrder.orderId}")
       public void submitOrder() {
           try {
               completedOrder = purchase(customer, currentOrder);
  
  
  
  1.16      +7 -12     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.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- ShowOrdersAction.java	22 Sep 2006 16:32:08 -0000	1.15
  +++ ShowOrdersAction.java	17 Jun 2007 23:07:53 -0000	1.16
  @@ -17,12 +17,14 @@
   
   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;
   import org.jboss.seam.annotations.In;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Out;
  +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;
  @@ -61,7 +63,10 @@
           return "showorders";
       }
   
  +    @In(required=false) 
  +    ProcessInstance processInstance;
   
  +    @ResumeProcess(definition="OrderManagement", processKey="#{orders.rowData.orderId}")
       public String cancelOrder() {
          
           em.refresh(order);
  @@ -72,17 +77,7 @@
   
           order.setStatus(Status.CANCELLED);
           
  -        JbpmContext context = ManagedJbpmContext.instance();
  -
  -        ProcessInstance pi = (ProcessInstance) context.getSession()
  -            .createQuery("select pi from LongInstance si join si.processInstance pi " +
  -                         "where si.name = 'orderId' and si.value = :orderId")
  -            .setLong("orderId", order.getOrderId())
  -            .uniqueResult();
  -        
  -        pi.signal("cancel");
  -        
  -        context.save(pi);
  +        processInstance.signal("cancel");
           
           return findOrders();
       }