Browse Source

Add a method to SystemReader to get the time zone

Change-Id: Ifd31f408ed2c5b7869694b715fea3219e74963ef
tags/v1.2.0.201112221803-r
Robin Rosenberg 12 years ago
parent
commit
06b183f9b7

+ 5
- 1
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java View File

@@ -137,7 +137,11 @@ public class MockSystemReader extends SystemReader {

@Override
public int getTimezone(long when) {
return TimeZone.getTimeZone("GMT-03:30").getOffset(when) / (60 * 1000);
return getTimeZone().getOffset(when) / (60 * 1000);
}

@Override
public TimeZone getTimeZone() {
return TimeZone.getTimeZone("GMT-03:30");
}
}

+ 2
- 1
org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java View File

@@ -73,11 +73,12 @@ import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.notes.NoteMap;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.util.SystemReader;
import org.kohsuke.args4j.Option;

@Command(common = true, usage = "usage_viewCommitHistory")
class Log extends RevWalkTextBuiltin {
private final TimeZone myTZ = TimeZone.getDefault();
private final TimeZone myTZ = SystemReader.getInstance().getTimeZone();

private final DateFormat fmt;


+ 10
- 1
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java View File

@@ -118,7 +118,11 @@ public abstract class SystemReader {

@Override
public int getTimezone(long when) {
return TimeZone.getDefault().getOffset(when) / (60 * 1000);
return getTimeZone().getOffset(when) / (60 * 1000);
}

public TimeZone getTimeZone() {
return TimeZone.getDefault();
}
};

@@ -187,4 +191,9 @@ public abstract class SystemReader {
* @return the local time zone
*/
public abstract int getTimezone(long when);

/**
* @return system time zone, possibly mocked for testing
*/
public abstract TimeZone getTimeZone();
}

Loading…
Cancel
Save