[jboss-cvs] JBossAS SVN: r101179 - in projects/snowdrop/examples/trunk/sportsclub: sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: lvlcek at redhat.com
Date: 2010-02-19 12:00:44 -0500 (Fri, 19 Feb 2010)
New Revision: 101179

Modified:
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java
   projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java
Log:
JBQA-3118

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java	2010-02-19 16:28:52 UTC (rev 101178)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-invoicing-webmvc/src/main/java/org/jboss/snowdrop/samples/sportsclub/springmvc/AccountController.java	2010-02-19 17:00:44 UTC (rev 101179)
@@ -53,9 +53,9 @@
    {
       String nameFragment = userInput.getNameFragment();
       Integer maxAccountNum = userInput.getMaxAccountNum();
-      boolean currentInvoice = (UserInput.INVOICE_WITH.equals(userInput.getInvoiceStatus()) ? true : false);
+      boolean withInvoice = (UserInput.INVOICE_WITH.equals(userInput.getInvoiceStatus()) ? true : false);
 
-      List<Account> accountList = subscriptionService.findAccountsBySubscriberName(nameFragment, 0, maxAccountNum, currentInvoice);
+      List<Account> accountList = subscriptionService.findAccountsBySubscriberName(nameFragment, 0, maxAccountNum, withInvoice);
 
       ModelMap model = new ModelMap();
       model.addAttribute(userInput)

Modified: projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java
===================================================================
--- projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java	2010-02-19 16:28:52 UTC (rev 101178)
+++ projects/snowdrop/examples/trunk/sportsclub/sportsclub-subscriptions-ejb/src/main/java/org/jboss/snowdrop/samples/sportsclub/ejb/SubscriptionServiceImpl.java	2010-02-19 17:00:44 UTC (rev 101179)
@@ -52,12 +52,8 @@
    {
       PersonSearchCriteria personSearchCriteria = new PersonSearchCriteria();
       personSearchCriteria.setName(name);
-      InvoiceSearchCriteria invoiceSearchCriteria = null;
-      if (currentInvoice)
-      {
-         invoiceSearchCriteria = new InvoiceSearchCriteria(new Date());
-         invoiceSearchCriteria.setExistingInvoice(currentInvoice);
-      }
+      InvoiceSearchCriteria invoiceSearchCriteria = new InvoiceSearchCriteria(new Date());
+      invoiceSearchCriteria.setExistingInvoice(currentInvoice);
       AccountSearchCriteria accountSearchCriteria = new AccountSearchCriteria();
       accountSearchCriteria.setPersonSearchCriteria(personSearchCriteria);
       accountSearchCriteria.setInvoiceSearchCriteria(invoiceSearchCriteria);