motiejus
/
jgit
1
Fork 0
Code Releases Activity

Let the date formatter pick the locale. 

Instead of using the locale from the SystemReader we let the
SystemReader create the date formats without passing the locale.

Bug 368756
Change-Id: I6be9e07af804a08f3f3ac2d2d526ef594eed19e3
Signed-off-by: Daniel Megert <daniel_megert@ch.ibm.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Daniel Megert 2012-02-22 21:32:43 +01:00 committed by Matthias Sohn
parent 54f23873d6
commit 709cd52958
3 changed files with 51 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java
View File

@ -47,6 +47,8 @@
import java.io.File;
import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
@ -151,6 +153,17 @@ public Locale getLocale() {
return Locale.US;
}
@Override
public SimpleDateFormat getSimpleDateFormat(String pattern) {
return new SimpleDateFormat(pattern, getLocale());
}
@Override
public DateFormat getDateTimeInstance(int dateStyle, int timeStyle) {
return DateFormat
.getDateTimeInstance(dateStyle, timeStyle, getLocale());
}
/**
* Assign some properties for the currently executing platform
*/

10
org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2011, Robin Rosenberg
* Copyright (C) 2011, 2012 Robin Rosenberg
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
@ -144,10 +144,10 @@ public GitDateFormatter(Format format) {
break;
case LOCALE:
case LOCALELOCAL:
Locale locale = SystemReader.getInstance().getLocale();
dateTimeInstance = DateFormat.getDateTimeInstance(
DateFormat.DEFAULT, DateFormat.DEFAULT, locale);
dateTimeInstance2 = new SimpleDateFormat("Z", locale);
SystemReader systemReader = SystemReader.getInstance();
dateTimeInstance = systemReader.getDateTimeInstance(
DateFormat.DEFAULT, DateFormat.DEFAULT);
dateTimeInstance2 = systemReader.getSimpleDateFormat("Z");
break;
}
}

33
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java
View File

@ -2,6 +2,7 @@
* Copyright (C) 2009, Google Inc.
* Copyright (C) 2009, Robin Rosenberg <robin.rosenberg@dewire.com>
* Copyright (C) 2009, Yann Simon <yann.simon.fr@gmail.com>
* Copyright (C) 2012, Daniel Megert <daniel_megert@ch.ibm.com>
* and other copyright owners as documented in the project's IP log.
*
* This program and the accompanying materials are made available
@ -48,6 +49,8 @@
import java.io.File;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Locale;
import java.util.TimeZone;
@ -204,4 +207,34 @@ public TimeZone getTimeZone() {
public Locale getLocale() {
return Locale.getDefault();
}
/**
* Returns a simple date format instance as specified by the given pattern.
*
* @param pattern
* the pattern as defined in
* {@link SimpleDateFormat#SimpleDateFormat(String)}
* @return the simple date format
* @since 2.0
*/
public SimpleDateFormat getSimpleDateFormat(String pattern) {
return new SimpleDateFormat(pattern);
}
/**
* Returns a date/time format instance for the given styles.
*
* @param dateStyle
* the date style as specified in
* {@link DateFormat#getDateTimeInstance(int, int)}
* @param timeStyle
* the time style as specified in
* {@link DateFormat#getDateTimeInstance(int, int)}
* @return the date format
* @since 2.0
*/
public DateFormat getDateTimeInstance(int dateStyle, int timeStyle) {
return DateFormat.getDateTimeInstance(dateStyle, timeStyle);
}
}