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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/08/05 23:02:19

  Modified:    examples/seambay/src/org/jboss/seam/example/seambay    
                        AuctionAction.java AuctionDetailAction.java
                        AuctionService.java BidAction.java
  Log:
  bid history page
  
  Revision  Changes    Path
  1.15      +1 -1      jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuctionAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionAction.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- AuctionAction.java	11 Jul 2007 14:32:33 -0000	1.14
  +++ AuctionAction.java	6 Aug 2007 03:02:19 -0000	1.15
  @@ -57,7 +57,7 @@
            auction = new Auction();
            auction.setAccount(authenticatedAccount);
            auction.setStatus(Auction.STATUS_UNLISTED);
  -         auction.setPrice(0.01);
  +         auction.setStartingPrice(0.01);
           
            durationDays = DEFAULT_AUCTION_DURATION;
         }
  
  
  
  1.3       +39 -0     jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionDetailAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuctionDetailAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionDetailAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AuctionDetailAction.java	23 Apr 2007 11:31:04 -0000	1.2
  +++ AuctionDetailAction.java	6 Aug 2007 03:02:19 -0000	1.3
  @@ -1,5 +1,7 @@
   package org.jboss.seam.example.seambay;
   
  +import java.util.List;
  +
   import javax.persistence.EntityManager;
   
   import org.jboss.seam.annotations.Factory;
  @@ -11,14 +13,46 @@
   {
      @In EntityManager entityManager;
      
  +   @In(required = false) Account authenticatedAccount;
  +   
      private int selectedAuctionId;
      
      private Auction auction;
      
  +   private String status;
  +   
  +   @SuppressWarnings("unchecked")
      @Factory("auction")
      public Auction getAuction()
      {
         auction = entityManager.find(Auction.class, selectedAuctionId);
  +      
  +      if (authenticatedAccount != null)
  +      {
  +         List<Bid> bids = entityManager.createQuery(
  +         "from Bid b where b.auction = :auction")
  +         .setParameter("auction", auction)
  +         .getResultList();
  +   
  +         boolean isBidder = false;
  +         
  +         for (Bid b : bids)
  +         {
  +            if (b.getAccount().equals(authenticatedAccount))
  +            {
  +               isBidder = true;
  +               break;
  +            }
  +         }
  +         
  +         if (isBidder)
  +         {
  +            status = auction.getHighBid().getAccount().equals(authenticatedAccount) ?
  +                  "highBidder" : "outbid";
  +         }
  +         
  +      }
  +      
         return auction;
      }
      
  @@ -31,4 +65,9 @@
      {
         this.selectedAuctionId = selectedAuctionId;
      }
  +   
  +   public String getStatus()
  +   {
  +      return status;
  +   }
   }
  
  
  
  1.17      +1 -1      jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionService.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuctionService.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionService.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- AuctionService.java	25 Jun 2007 02:56:41 -0000	1.16
  +++ AuctionService.java	6 Aug 2007 03:02:19 -0000	1.17
  @@ -69,7 +69,7 @@
      @WebMethod
      public void setAuctionPrice(double price)
      {
  -      getAuctionAction().getAuction().setPrice(price);
  +      getAuctionAction().getAuction().setStartingPrice(price);
      }
      
      @WebMethod
  
  
  
  1.6       +29 -13    jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BidAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/BidAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- BidAction.java	17 Jul 2007 07:12:29 -0000	1.5
  +++ BidAction.java	6 Aug 2007 03:02:19 -0000	1.6
  @@ -50,9 +50,13 @@
      
      public void updateBid()
      {
  -      double amount = Double.parseDouble(Contexts.getEventContext().get("bidAmount").toString());
  +      String amt = Contexts.getEventContext().isSet("bidAmount") ?
  +            Contexts.getEventContext().get("bidAmount").toString() : null;
         
  -      if (amount >= bid.getAuction().getRequiredBid())
  +      if (amt != null)
  +      {
  +         double amount = Double.parseDouble(amt.toString());            
  +         if (amt != null && amount >= bid.getAuction().getRequiredBid())
         {
            bid.setMaxAmount(amount);
            outcome = "confirm";
  @@ -62,6 +66,11 @@
            outcome = "invalid";
         }      
      }
  +      else
  +      {
  +         outcome = "required";
  +      }
  +   }
      
      @SuppressWarnings("unchecked")
      public String confirmBid()
  @@ -141,12 +150,19 @@
         }
         else
         {
  +         if (!bid.getAccount().equals(highBid.getAccount()))
  +         {
            // Set this bid, and the highest bid's, actual bid amount to this
            // bid's maximum amount
            highBid.setActualAmount(bid.getMaxAmount());
            bid.setActualAmount(bid.getMaxAmount());
            outcome = "outbid";
         }
  +         else
  +         {
  +            outcome = "invalid";
  +         }
  +      }
                           
         if ("success".equals(outcome)) 
         {