Author: kwright
Date: Wed Aug 2 06:43:28 2017
New Revision: 1803766
URL: http://svn.apache.org/viewvc?rev=1803766&view=rev
Log:
More fixes for CONNECTORS-1445: Restore timezone functionality to reports.
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1803766&r1=1803765&r2=1803766&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
Wed Aug 2 06:43:28 2017
@@ -118,7 +118,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(startYear));
c.set(Calendar.MONTH,Integer.parseInt(startMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(startDay) + 1);
@@ -134,7 +134,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(endYear));
c.set(Calendar.MONTH,Integer.parseInt(endMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(endDay) + 1);
@@ -156,7 +156,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(startTime.longValue());
startYear = Integer.toString(c.get(Calendar.YEAR));
startMonth = Integer.toString(c.get(Calendar.MONTH));
@@ -177,7 +177,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(endTime.longValue());
endYear = Integer.toString(c.get(Calendar.YEAR));
endMonth = Integer.toString(c.get(Calendar.MONTH));
Modified:
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1803766&r1=1803765&r2=1803766&view=diff
==============================================================================
---
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
(original)
+++
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
Wed Aug 2 06:43:28 2017
@@ -118,7 +118,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(startYear));
c.set(Calendar.MONTH,Integer.parseInt(startMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(startDay) + 1);
@@ -134,7 +134,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(endYear));
c.set(Calendar.MONTH,Integer.parseInt(endMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(endDay) + 1);
@@ -156,7 +156,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(startTime.longValue());
startYear = Integer.toString(c.get(Calendar.YEAR));
startMonth = Integer.toString(c.get(Calendar.MONTH));
@@ -177,7 +177,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(endTime.longValue());
endYear = Integer.toString(c.get(Calendar.YEAR));
endMonth = Integer.toString(c.get(Calendar.MONTH));
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1803766&r1=1803765&r2=1803766&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/resultreport.jsp Wed
Aug 2 06:43:28 2017
@@ -118,7 +118,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(startYear));
c.set(Calendar.MONTH,Integer.parseInt(startMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(startDay) + 1);
@@ -134,7 +134,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(endYear));
c.set(Calendar.MONTH,Integer.parseInt(endMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(endDay) + 1);
@@ -156,7 +156,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(startTime.longValue());
startYear = Integer.toString(c.get(Calendar.YEAR));
startMonth = Integer.toString(c.get(Calendar.MONTH));
@@ -176,7 +176,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(endTime.longValue());
endYear = Integer.toString(c.get(Calendar.YEAR));
endMonth = Integer.toString(c.get(Calendar.MONTH));
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp?rev=1803766&r1=1803765&r2=1803766&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/simplereport.jsp Wed
Aug 2 06:43:28 2017
@@ -118,7 +118,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(startYear));
c.set(Calendar.MONTH,Integer.parseInt(startMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(startDay) + 1);
@@ -134,7 +134,7 @@ try
else
{
// Convert the specified times to a long.
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.set(Calendar.YEAR,Integer.parseInt(endYear));
c.set(Calendar.MONTH,Integer.parseInt(endMonth));
c.set(Calendar.DAY_OF_MONTH,Integer.parseInt(endDay) + 1);
@@ -156,7 +156,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(startTime.longValue());
startYear = Integer.toString(c.get(Calendar.YEAR));
startMonth = Integer.toString(c.get(Calendar.MONTH));
@@ -176,7 +176,7 @@ try
else
{
// Do the conversion
- Calendar c = new GregorianCalendar(TimeZone.getTimeZone("UTC"),
Locale.ROOT);
+ Calendar c = new GregorianCalendar(TimeZone.getDefault(),
pageContext.getRequest().getLocale());
c.setTimeInMillis(endTime.longValue());
endYear = Integer.toString(c.get(Calendar.YEAR));
endMonth = Integer.toString(c.get(Calendar.MONTH));
