echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Utils: Move new getSystemTimeZone() from DataHelper to SystemVersion,

Browse Source 
which is a better place for it.
This commit is contained in:
zzz
2015-12-06 16:28:14 +00:00
parent 5a7fc3f7f4
commit fdc160cf1d
12 changed files with 76 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/routerconsole/java/src/net/i2p/router/news/NewsManager.java
View File

@ -19,6 +19,7 @@ import static net.i2p.app.ClientAppState.*;
import net.i2p.data.DataHelper;
import net.i2p.util.FileUtil;
import net.i2p.util.Log;
import net.i2p.util.SystemVersion;
import net.i2p.util.TranslateReader;
import org.cybergarage.xml.Node;
@ -233,7 +234,7 @@ public class NewsManager implements ClientApp {
// Doesn't work if the date has a : in it, but SHORT hopefully does not
DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT);
// the router sets the JVM time zone to UTC but saves the original here so we can get it
fmt.setTimeZone(DataHelper.getSystemTimeZone(_context));
fmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
try {
Date date = fmt.parse(newsContent.substring(0, colon));
entry.updated = date.getTime();

3
apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
View File

@ -43,6 +43,7 @@ import net.i2p.util.PortMapper;
import net.i2p.util.ReusableGZIPInputStream;
import net.i2p.util.SecureFileOutputStream;
import net.i2p.util.SSLEepGet;
import net.i2p.util.SystemVersion;
import net.i2p.util.Translate;
import net.i2p.util.VersionComparator;
@ -589,7 +590,7 @@ class NewsFetcher extends UpdateRunner {
return;
DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT);
// the router sets the JVM time zone to UTC but saves the original here so we can get it
fmt.setTimeZone(DataHelper.getSystemTimeZone(_context));
fmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
for (NewsEntry e : entries) {
if (e.title == null || e.content == null)
continue;

3
apps/routerconsole/java/src/net/i2p/router/web/EventLogHelper.java
View File

@ -16,6 +16,7 @@ import java.util.TreeMap;
import net.i2p.data.DataHelper;
import net.i2p.router.util.EventLog;
import net.i2p.util.SystemVersion;
/**
* /events.jsp
@ -188,7 +189,7 @@ public class EventLogHelper extends FormHandler {
SimpleDateFormat fmt = (SimpleDateFormat) DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
// the router sets the JVM time zone to UTC but saves the original here so we can get it
fmt.setTimeZone(DataHelper.getSystemTimeZone(_context));
fmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
List<Map.Entry<Long, String>> entries = new ArrayList<Map.Entry<Long, String>>(events.entrySet());
Collections.reverse(entries);

3
apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java
View File

@ -10,6 +10,7 @@ import net.i2p.app.ClientAppManager;
import net.i2p.data.DataHelper;
import net.i2p.router.news.NewsEntry;
import net.i2p.router.news.NewsManager;
import net.i2p.util.SystemVersion;
/**
@ -55,7 +56,7 @@ public class NewsFeedHelper extends HelperBase {
if (!entries.isEmpty()) {
DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT);
// the router sets the JVM time zone to UTC but saves the original here so we can get it
fmt.setTimeZone(DataHelper.getSystemTimeZone(ctx));
fmt.setTimeZone(SystemVersion.getSystemTimeZone(ctx));
int i = 0;
for (NewsEntry entry : entries) {
if (i++ < start)

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
View File

@ -633,7 +633,7 @@ public class SummaryBarRenderer {
buf.append("<ul>\n");
DateFormat fmt = DateFormat.getDateInstance(DateFormat.SHORT);
// the router sets the JVM time zone to UTC but saves the original here so we can get it
fmt.setTimeZone(DataHelper.getSystemTimeZone(_context));
fmt.setTimeZone(SystemVersion.getSystemTimeZone(_context));
int i = 0;
final int max = 2;
for (NewsEntry entry : entries) {