Author: bbrossaud Date: 2010-08-24 10:31:16 +0200 (Tue, 24 Aug 2010) New Revision: 60 Url: http://chorem.org/repositories/revision/billy/60 Log: remove bug on cash Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java Modified: trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java =================================================================== --- trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-23 15:57:38 UTC (rev 59) +++ trunk/billy-ui-zk/src/main/java/org/chorem/billy/ui/CashController.java 2010-08-24 08:31:16 UTC (rev 60) @@ -152,25 +152,27 @@ int startYear = Integer.valueOf(start); int endYear = Integer.valueOf(end); + int i = 0; for (int currentYear = startYear; currentYear <= endYear; ++currentYear) { int startMonth = getStartMonth(startYear, currentYear); int endMonth = getEndMonth(currentYear, endYear); - for (int count = 0; startMonth <= endMonth; ++count) { + while (startMonth <= endMonth) { Label label = new Label(); Date first = getDate(currentYear, startMonth); Date last = getDate(currentYear, startMonth + 1); Double price = createLabelPrice(first, last, sub.getWikittyId(), label); label.setValue(price.toString()); row.appendChild(label); - if (total.size() < (count + 1)) { + if (total.size() < (i + 1)) { total.add(price); } else { - Double tmp = total.get(count); + Double tmp = total.get(i); tmp += price; - total.set(count, tmp); + total.set(i, tmp); } + ++i; ++startMonth; } }