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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/06/24 05:24:26

  Modified:    examples/seambay/src/org/jboss/seam/example/seambay    
                        Auction.java AuctionAction.java AuctionService.java
                        AuctionServiceRemote.java
  Log:
  auto-propagation of conversation id on web service test page
  
  Revision  Changes    Path
  1.9       +0 -3      jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/Auction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Auction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/Auction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- Auction.java	19 Apr 2007 04:35:52 -0000	1.8
  +++ Auction.java	24 Jun 2007 09:24:26 -0000	1.9
  @@ -152,9 +152,6 @@
         timeLeft -= hours * 60 * 60;
         int minutes = (int) Math.floor(timeLeft / 60);
         
  -//      timeLeft -= minutes * 60;
  -//      int seconds = (int) timeLeft;
  -
         StringBuilder sb = new StringBuilder();
         
         if (days > 0)
  
  
  
  1.7       +6 -8      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- AuctionAction.java	24 Jun 2007 07:09:52 -0000	1.6
  +++ AuctionAction.java	24 Jun 2007 09:24:26 -0000	1.7
  @@ -16,6 +16,12 @@
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.security.Restrict;
   
  +/**
  + * This component is used to create new auctions, and is invoked via both the
  + * web interface and the AuctionService web service. 
  + *  
  + * @author Shane Bryzak
  + */
   @Scope(CONVERSATION)
   @Name("auctionAction")
   @Restrict("#{identity.loggedIn}")
  @@ -44,12 +50,6 @@
         }
      }   
         
  -   @Begin
  -   public void editAuction(Integer auctionId)
  -   {
  -      auction = entityManager.find(Auction.class, auctionId);
  -   }
  -   
      public void setDetails(String title, String description, int categoryId)
      {
         auction.setTitle(title);
  @@ -70,8 +70,6 @@
         auction.setEndDate(cal.getTime());
         auction.setStatus(Auction.STATUS_LIVE);
         entityManager.persist(auction);
  -      
  -      auction = null;
      }
   
      public Auction getAuction()
  
  
  
  1.13      +13 -19    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.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- AuctionService.java	24 Jun 2007 07:09:52 -0000	1.12
  +++ AuctionService.java	24 Jun 2007 09:24:26 -0000	1.13
  @@ -45,8 +45,7 @@
      @WebMethod
      public Integer createAuction(String title, String description, int categoryId)
      {
  -      AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
  -      
  +      AuctionAction action = getAuctionAction();      
         action.createAuction();
         action.setDetails(title, description, categoryId);
         
  @@ -56,35 +55,30 @@
      @WebMethod
      public Auction getNewAuctionDetails()
      {
  -      AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
  -      
  -      // TODO remove the auction image from the result
  -      
  -      return action.getAuction();
  +      return getAuctionAction().getAuction();
      }
      
      @WebMethod
  -   public void updateAuction(int auctionId, String title, String description, int categoryId)
  +   public void updateAuctionDetails(String title, String description, int categoryId)
      {
  -      AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
  -      
  -      action.editAuction(auctionId);
  -      action.setDetails(title, description, categoryId);
  +      getAuctionAction().setDetails(title, description, categoryId);
      }
      
      @WebMethod
      public void setAuctionDuration(int days)
      {
  -      AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
  -      action.setDuration(days);
  +      getAuctionAction().setDuration(days);
      }
      
      @WebMethod
  -   public void confirmAuction(int auctionId)
  +   public void confirmAuction()
      {
  -      AuctionAction action = (AuctionAction) Component.getInstance(AuctionAction.class, true);
  +      getAuctionAction().confirm();
  +   }
         
  -      action.confirm();
  +   private AuctionAction getAuctionAction()
  +   {
  +      return (AuctionAction) Component.getInstance(AuctionAction.class, true);
      }
      
      @WebMethod
  
  
  
  1.8       +2 -2      jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionServiceRemote.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AuctionServiceRemote.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/seambay/src/org/jboss/seam/example/seambay/AuctionServiceRemote.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- AuctionServiceRemote.java	24 Jun 2007 07:09:52 -0000	1.7
  +++ AuctionServiceRemote.java	24 Jun 2007 09:24:26 -0000	1.8
  @@ -12,9 +12,9 @@
      
      Integer createAuction(String title, String description, int categoryId);   
      Auction getNewAuctionDetails();
  -   void updateAuction(int auctionId, String title, String description, int categoryId);
  +   void updateAuctionDetails(String title, String description, int categoryId);
      void setAuctionDuration(int days);
  -   void confirmAuction(int auctionId);
  +   void confirmAuction();
      
      Auction[] findAuctions(String searchTerm);
   }