[jboss-cvs] jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay ...

[Gavin King]

  User: gavin   
  Date: 07/05/31 18:54:42

  Modified:    examples/seampay/src/org/jboss/seam/example/seampay  
                        Payment.java PaymentProcessor.java
  Log:
  fix use of 0 instead of null
  
  Revision  Changes    Path
  1.8       +19 -14    jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/Payment.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Payment.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/Payment.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- Payment.java	26 Feb 2007 20:57:17 -0000	1.7
  +++ Payment.java	31 May 2007 22:54:42 -0000	1.8
  @@ -1,13 +1,18 @@
   package org.jboss.seam.example.seampay;
   
  -import javax.ejb.*;
  -import javax.persistence.*;
  -
   import java.io.Serializable;
  -import java.util.*;
  -import java.math.*;
  +import java.math.BigDecimal;
  +import java.util.Date;
  +
  +import javax.ejb.TimerHandle;
  +import javax.persistence.Entity;
  +import javax.persistence.GeneratedValue;
  +import javax.persistence.Id;
  +import javax.persistence.Lob;
  +import javax.persistence.ManyToOne;
   
  -import org.hibernate.validator.*;
  +import org.hibernate.validator.Length;
  +import org.hibernate.validator.NotNull;
   
   @Entity
   public class Payment
  @@ -113,19 +118,19 @@
   
   
       public enum Frequency {
  -        ONCE(0), 
  -        EVERY_MINUTE(60*1000),
  -        HOURLY(60*60*1000), 
  -        DAILY(24*60*60*1000), 
  -        WEEKLY(7*24*60*60*1000);
  +        ONCE(null), 
  +        EVERY_MINUTE(60*1000l),
  +        HOURLY(60*60*1000l), 
  +        DAILY(24*60*60*1000l), 
  +        WEEKLY(7*24*60*60*1000l);
   
  -        long interval; 
  +        Long interval; 
   
  -        Frequency(long interval) {
  +        Frequency(Long interval) {
               this.interval = interval;
           }
           
  -        public long getInterval() {
  +        public Long getInterval() {
               return interval;
           }
       }
  
  
  
  1.7       +2 -2      jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/PaymentProcessor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PaymentProcessor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/PaymentProcessor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PaymentProcessor.java	26 Feb 2007 20:57:17 -0000	1.6
  +++ PaymentProcessor.java	31 May 2007 22:54:42 -0000	1.7
  @@ -14,6 +14,7 @@
   import org.jboss.seam.annotations.Transactional;
   import org.jboss.seam.annotations.timer.Expiration;
   import org.jboss.seam.annotations.timer.IntervalDuration;
  +import org.jboss.seam.example.seampay.Payment;
   import org.jboss.seam.log.Log;
   
   
  @@ -29,13 +30,12 @@
       @Asynchronous
       @Transactional
       public Timer schedulePayment(@Expiration Date when, 
  -                                 @IntervalDuration long interval, 
  +                                 @IntervalDuration Long interval, 
                                    Payment payment) 
       { 
           payment = entityManager.merge(payment);
           
           log.info("[#0] Processing payment #1", System.currentTimeMillis(), payment.getId());
  -        log.info("Timer handle is #0", payment.getTimerHandle());
   
           if (payment.getActive()) {
               BigDecimal balance = payment.getAccount().adjustBalance(payment.getAmount().negate());