Author: sohil.shah(a)jboss.com Date: 2008-10-19 21:56:32 -0400 (Sun, 19 Oct 2008) New Revision: 12088 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp Log: JBPORTAL-2156 - Use localized date/time format in CMS admin portlet Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminConstants.java 2008-10-20 01:56:32 UTC (rev 12088) @@ -117,4 +117,8 @@ public static final String CMS_FILENAME_INVALID = "CMS_FILENAME_INVALID"; public static final String CMS_FOLDERNAME_INVALID = "CMS_FOLDERNAME_INVALID"; + + public static final String CMS_DATE_PATTERN = "CMS_DATE_PATTERN"; + + public static final String DATE_FORMAT = "dateFormat"; } Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-20 01:56:32 UTC (rev 12088) @@ -78,7 +78,6 @@ import javax.portlet.UnavailableException; import java.io.IOException; import java.io.InputStream; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.Collection; import java.util.Date; @@ -89,6 +88,8 @@ import java.util.Set; import java.util.Vector; import java.util.ResourceBundle; +import java.text.SimpleDateFormat; +import java.text.Format; /** * @author <a href="mailto:roy@jboss.org">Roy Russo</a> @@ -155,6 +156,17 @@ protected void doView(final JBossRenderRequest rReq, final JBossRenderResponse rRes) throws PortletException, IOException, UnavailableException { + //SetUp the properly localized Date Formatter to be used by the View JSPs + Format dateFormat = (Format)rReq.getPortletSession().getAttribute(CMSAdminConstants.DATE_FORMAT); + if(dateFormat == null) + { + ResourceBundle bundle = this.getPortletConfig().getResourceBundle(rReq.getLocale()); + String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN); + dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale()); + } + rReq.setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat); + + //check and make sure the CMSAdminPortlet is accessible to the current user if (!this.isPortletAccessible(rReq)) { Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-10-20 01:56:32 UTC (rev 12088) @@ -146,4 +146,6 @@ CMS_MSG_DESTINATION_ALREADY_EXISTS=The command was not performed, because the destination already exists. +CMS_DATE_PATTERN=MM/dd/yy HH:mm + Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_de.properties 2008-10-20 01:56:32 UTC (rev 12088) @@ -130,3 +130,4 @@ CMS_MISSING_DOCUMENT=404 - Seite nicht gefunden CMS_MISSING_DOCUMENT_DESCRIPTION=Das von ihnen angeforderte Dokument ist nicht verf�gbar +CMS_DATE_PATTERN=dd/MM/yy HH:mm \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-10-20 01:56:32 UTC (rev 12088) @@ -2,7 +2,6 @@ <%@ page import="org.jboss.portal.cms.model.Folder" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page import="java.text.Format" %> -<%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.List" %> <%@ page import="java.util.StringTokenizer" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> @@ -22,6 +21,7 @@ String modifiedDate = ""; Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible"); List<String> messages = (List<String>)request.getAttribute("messages"); + Format dateFormat = (Format)request.getAttribute("dateFormat"); %> <div class="admin-ui"> @@ -239,10 +239,8 @@ <td> <% if (folder.getCreationDate() != null) - { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - createDate = formatter.format(folder.getCreationDate()); + { + createDate = dateFormat.format(folder.getCreationDate()); } %> <%= createDate %> @@ -251,9 +249,7 @@ <% if (folder.getLastModified() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - modifiedDate = formatter.format(folder.getLastModified()); + modifiedDate = dateFormat.format(folder.getLastModified()); } %> <%= modifiedDate %> @@ -300,9 +296,7 @@ <% if (file.getCreationDate() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - createDate = formatter.format(file.getCreationDate()); + createDate = dateFormat.format(file.getCreationDate()); } %> <%= createDate %> @@ -311,9 +305,7 @@ <% if (file.getLastModified() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - modifiedDate = formatter.format(file.getLastModified()); + modifiedDate = dateFormat.format(file.getLastModified()); } %> <%= modifiedDate %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-10-20 01:56:32 UTC (rev 12088) @@ -1,13 +1,16 @@ <%@ page import="org.jboss.portal.cms.model.File" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page import="java.text.Format" %> -<%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.List" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page isELIgnored="false" %> +<% +Format dateFormat = (Format)request.getAttribute("dateFormat"); +%> + <portlet:defineObjects/> <link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> @@ -96,9 +99,7 @@ <% if (file.getCreationDate() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - createDate = formatter.format(file.getCreationDate()); + createDate = dateFormat.format(file.getCreationDate()); } %> <%= createDate %> @@ -107,9 +108,7 @@ <% if (file.getLastModified() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - modifiedDate = formatter.format(file.getLastModified()); + modifiedDate = dateFormat.format(file.getLastModified()); } %> <%= modifiedDate %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-10-20 01:56:32 UTC (rev 12088) @@ -7,7 +7,6 @@ <%@ page import="org.jboss.portal.cms.util.NodeUtil" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page import="java.text.Format" %> -<%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Iterator" %> <%@ page import="java.util.List" %> @@ -48,6 +47,8 @@ String exception = request.getParameter("exception"); Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible"); + + Format dateFormat = (Format)request.getAttribute("dateFormat"); %> @@ -307,9 +308,7 @@ <% if (version.getCreationDate() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - createDate = formatter.format(version.getCreationDate()); + createDate = dateFormat.format(version.getCreationDate()); } %> <%= createDate %> @@ -318,9 +317,7 @@ <% if (version.getLastModified() != null) { - Format formatter; - formatter = new SimpleDateFormat("MM/dd/yy HH:mm"); - modifiedDate = formatter.format(version.getLastModified()); + modifiedDate = dateFormat.format(version.getLastModified()); } %> <%= modifiedDate %> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-10-18 20:14:56 UTC (rev 12087) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-10-20 01:56:32 UTC (rev 12088) @@ -3,7 +3,6 @@ <%@ page import="org.jboss.portal.cms.model.Content" %> <%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %> <%@ page import="java.text.Format" %> -<%@ page import="java.text.SimpleDateFormat" %> <%@ page import="java.util.List" %> <%@ page import="java.util.StringTokenizer" %> <%@ page import="javax.portlet.PortletURL" %> @@ -22,6 +21,7 @@ PortletURL url = renderResponse.createRenderURL(); url.setParameter("op", CMSAdminConstants.OP_MAIN); url.setParameter("path", "/"); + Format dateFormat = (Format)request.getAttribute("dateFormat"); %> <!-- Currently browsing -->