From bleny@users.forge.codelutin.com Thu Jun  5 15:39:25 2014
From: bleny@users.forge.codelutin.com
To: wao-commits@list.forge.codelutin.com
Subject: [Wao-commits] r2002 - in trunk/wao-web/src/main:
	java/fr/ifremer/wao/web webapp/WEB-INF/decorators
Date: Thu, 05 Jun 2014 15:39:25 +0200
Message-ID: <20140605133925.51A52181DDE@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5062256350686170298=="

--===============5062256350686170298==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bleny
Date: 2014-06-05 15:39:25 +0200 (Thu, 05 Jun 2014)
New Revision: 2002

Url: http://forge.codelutin.com/projects/wao/repository/revisions/2002

Log:
fix copyright year in layout

Modified:
   trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java
   trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp

Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.=
java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java	2=
014-06-05 13:26:56 UTC (rev 2001)
+++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoJspActionSupport.java	2=
014-06-05 13:39:25 UTC (rev 2002)
@@ -111,7 +111,11 @@
     }
=20
     public String getOneYearAgoDatePlaceHolder() {
-        return formatDate(DateUtils.addYears(new Date(), -1));
+        return formatDate(DateUtils.addYears(getNow(), -1));
     }
=20
+    protected Date getNow() {
+        return new Date();
+    }
+
 }

Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-06-05 13=
:26:56 UTC (rev 2001)
+++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp	2014-06-05 13=
:39:25 UTC (rev 2002)
@@ -235,7 +235,7 @@
                     </a>
                 </li>
                 <li>
-                    Copyright 2009-${currentYear}
+                    Copyright 2009-2014
                     <a href=3D"http://www.ifremer.fr" title=3D"Ifremer" targ=
et=3D"_blank">Ifremer</a>,
                     <a href=3D"http://www.codelutin.com" title=3D"Code Lutin=
" target=3D"_blank">Code Lutin</a>
                 </li>


--===============5062256350686170298==--