Author: fdesbois Date: 2010-02-16 10:56:02 +0000 (Tue, 16 Feb 2010) New Revision: 353 Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java Log: Improve isCurrentMonth method adding year test Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java 2010-02-12 18:18:54 UTC (rev 352) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/entity/SampleMonthImpl.java 2010-02-16 10:56:02 UTC (rev 353) @@ -103,8 +103,10 @@ int currentMonth = current.get(Calendar.MONTH); int month = calendar.get(Calendar.MONTH); + int currentYear = current.get(Calendar.YEAR); + int year = calendar.get(Calendar.YEAR); - return month == currentMonth; + return month == currentMonth && currentYear == year; } }