Author: bleny Date: 2014-06-10 18:02:27 +0200 (Tue, 10 Jun 2014) New Revision: 2021 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2021 Log: reduce duplication by reusing getNow() Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-10 15:10:23 UTC (rev 2020) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/SamplingPlanAction.java 2014-06-10 16:02:27 UTC (rev 2021) @@ -42,8 +42,6 @@ protected ObsMerSamplingPlan samplingPlan; - private Date now; - public void setService(ObsMerSamplingPlanService service) { this.service = service; } @@ -58,8 +56,6 @@ @Override public void prepare() { - now = new Date(); - filter = getSession().getSampleRowsFilter(); if (filter == null) { @@ -99,18 +95,18 @@ public boolean isCurrentMonth(Date month) { - String currentStr = dateFormat.format(now); + String currentStr = dateFormat.format(getNow()); String monthStr = dateFormat.format(month); return currentStr.equals(monthStr); } public String getFilterPeriodFromPlaceholder() { - String placeholder = formatMonth(DateUtils.addMonths(now, 1)); + String placeholder = formatMonth(DateUtils.addMonths(getNow(), 1)); return placeholder; } public String getFilterPeriodToPlaceholder() { - String placeholder = formatMonth(DateUtils.addYears(now, 1)); + String placeholder = formatMonth(DateUtils.addYears(getNow(), 1)); return placeholder; } }