[jboss-cvs] jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay ...
Gavin King
gavin.king at jboss.com
Mon Feb 26 15:57:17 EST 2007
User: gavin
Date: 07/02/26 15:57:17
Modified: examples/seampay/src/org/jboss/seam/example/seampay
Account.java DigitsValidator.java Payment.java
PaymentController.java PaymentProcessor.java
Log:
fix cancel on expired timer
Revision Changes Path
1.3 +8 -5 jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/Account.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Account.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/Account.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Account.java 17 Dec 2006 05:10:40 -0000 1.2
+++ Account.java 26 Feb 2007 20:57:17 -0000 1.3
@@ -1,13 +1,16 @@
package org.jboss.seam.example.seampay;
-import java.util.ArrayList;
-import java.util.List;
import java.io.Serializable;
-
import java.math.BigDecimal;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
-import javax.persistence.*;
-import org.hibernate.validator.*;
+import org.hibernate.validator.NotNull;
@Entity
public class Account
1.2 +3 -3 jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/DigitsValidator.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DigitsValidator.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/DigitsValidator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- DigitsValidator.java 17 Dec 2006 05:10:40 -0000 1.1
+++ DigitsValidator.java 26 Feb 2007 20:57:17 -0000 1.2
@@ -1,9 +1,9 @@
package org.jboss.seam.example.seampay;
-import java.math.*;
-import org.hibernate.validator.*;
+import java.math.BigDecimal;
+import java.math.BigInteger;
-import org.hibernate.mapping.*;
+import org.hibernate.validator.Validator;
public class DigitsValidator
implements Validator<Digits>
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Payment.java 26 Dec 2006 18:41:43 -0000 1.6
+++ Payment.java 26 Feb 2007 20:57:17 -0000 1.7
@@ -128,5 +128,5 @@
public long getInterval() {
return interval;
}
- };
+ }
}
1.7 +12 -2 jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/PaymentController.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PaymentController.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/seampay/src/org/jboss/seam/example/seampay/PaymentController.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PaymentController.java 15 Nov 2006 19:57:16 -0000 1.6
+++ PaymentController.java 26 Feb 2007 20:57:17 -0000 1.7
@@ -1,5 +1,6 @@
package org.jboss.seam.example.seampay;
+import javax.ejb.NoSuchObjectLocalException;
import javax.ejb.Timer;
import javax.ejb.TimerHandle;
@@ -8,6 +9,7 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.RequestParameter;
import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.core.FacesMessages;
import org.jboss.seam.framework.EntityHome;
import org.jboss.seam.log.Log;
@@ -16,7 +18,7 @@
extends EntityHome<Payment>
{
@RequestParameter Long paymentId;
- @In(create=true) PaymentProcessor processor;
+ @In PaymentProcessor processor;
@Logger Log log;
@@ -36,6 +38,7 @@
return result;
}
+ @Override
public Object getId() {
return paymentId;
}
@@ -48,7 +51,14 @@
payment.setTimerHandle(null);
payment.setActive(false);
+ try
+ {
handle.getTimer().cancel();
}
+ catch (NoSuchObjectLocalException nsole)
+ {
+ FacesMessages.instance().add("Payment already processed");
+ }
+ }
}
1.6 +13 -6 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PaymentProcessor.java 26 Feb 2007 20:24:54 -0000 1.5
+++ PaymentProcessor.java 26 Feb 2007 20:57:17 -0000 1.6
@@ -1,17 +1,24 @@
package org.jboss.seam.example.seampay;
-import org.jboss.seam.annotations.*;
-import org.jboss.seam.annotations.timer.*;
-import org.jboss.seam.log.Log;
-
+import java.math.BigDecimal;
import java.util.Date;
-import javax.persistence.*;
+
import javax.ejb.Timer;
+import javax.persistence.EntityManager;
-import java.math.BigDecimal;
+import org.jboss.seam.annotations.Asynchronous;
+import org.jboss.seam.annotations.AutoCreate;
+import org.jboss.seam.annotations.In;
+import org.jboss.seam.annotations.Logger;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Transactional;
+import org.jboss.seam.annotations.timer.Expiration;
+import org.jboss.seam.annotations.timer.IntervalDuration;
+import org.jboss.seam.log.Log;
@Name("processor")
+ at AutoCreate
public class PaymentProcessor {
@In
More information about the jboss-cvs-commits
mailing list