diff options
| author | Ivan Frade <ifrade@google.com> | 2024-11-13 22:19:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <support@gerrithub.io> | 2024-11-13 22:19:48 +0000 |
| commit | 1c326c4e07b1023ef17961661ed6e4f29ffeeee8 (patch) | |
| tree | 7a792e6219d4a31c96024efe50a067f7effbac5d | |
| parent | 6cf5d194f528428f94bda3e2a1a8468244008c81 (diff) | |
| parent | c64bc936938b1388065be1c89eb929278b505a87 (diff) | |
| download | jgit-1c326c4e07b1023ef17961661ed6e4f29ffeeee8.tar.gz jgit-1c326c4e07b1023ef17961661ed6e4f29ffeeee8.zip | |
Merge "SystemReader: Give a default implementation to #getTimezoneAt()"
| -rw-r--r-- | org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java | 5 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 9 |
2 files changed, 3 insertions, 11 deletions
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index b0365aa7e1..b0a1827265 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -245,11 +245,6 @@ public class MockSystemReader extends SystemReader { } @Override - public ZoneOffset getTimeZoneAt(Instant when) { - return getTimeZoneId().getRules().getOffset(when); - } - - @Override public TimeZone getTimeZone() { return TimeZone.getTimeZone("GMT-03:30"); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 7150e471bc..18b0e152c9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -178,11 +178,6 @@ public abstract class SystemReader { public int getTimezone(long when) { return getTimeZone().getOffset(when) / (60 * 1000); } - - @Override - public ZoneOffset getTimeZoneAt(Instant when) { - return getTimeZoneId().getRules().getOffset(when); - } } /** @@ -569,7 +564,9 @@ public abstract class SystemReader { * @return the local time zone * @since 7.1 */ - public abstract ZoneOffset getTimeZoneAt(Instant when); + public ZoneOffset getTimeZoneAt(Instant when) { + return getTimeZoneId().getRules().getOffset(when); + } /** * Get system time zone, possibly mocked for testing |