diff options
| author | Elliott Hughes <enh@google.com> | 2010-06-23 16:28:21 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-06-23 16:30:50 -0700 |
| commit | 3b777d1b4c1dc5d4c817fb70167b02a4f7e15092 (patch) | |
| tree | 9e7c77f090d6ce67a3d3dd0f37981356b9c030ed /luni/src/main/java | |
| parent | 21557bb6a8f35a2f9889adba449cac950c9d41b9 (diff) | |
| download | libcore-3b777d1b4c1dc5d4c817fb70167b02a4f7e15092.zip libcore-3b777d1b4c1dc5d4c817fb70167b02a4f7e15092.tar.gz libcore-3b777d1b4c1dc5d4c817fb70167b02a4f7e15092.tar.bz2 | |
A couple of intention-revealing renames I missed in the last commit.
Change-Id: Ifb16948b201d3f5e2359550d36ef66b213b0ac4c
Diffstat (limited to 'luni/src/main/java')
| -rw-r--r-- | luni/src/main/java/java/text/SimpleDateFormat.java | 2 | ||||
| -rw-r--r-- | luni/src/main/java/libcore/icu/TimeZones.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/luni/src/main/java/java/text/SimpleDateFormat.java b/luni/src/main/java/java/text/SimpleDateFormat.java index be03504..a46ec3c 100644 --- a/luni/src/main/java/java/text/SimpleDateFormat.java +++ b/luni/src/main/java/java/text/SimpleDateFormat.java @@ -744,7 +744,7 @@ public class SimpleDateFormat extends DateFormat { } // We can't call TimeZone.getDisplayName() because it would not use // the custom DateFormatSymbols of this SimpleDateFormat. - String custom = TimeZones.lookupDisplayTimeZone(formatData.zoneStrings, tz.getID(), daylight, style); + String custom = TimeZones.lookupDisplayName(formatData.zoneStrings, tz.getID(), daylight, style); if (custom != null) { buffer.append(custom); return; diff --git a/luni/src/main/java/libcore/icu/TimeZones.java b/luni/src/main/java/libcore/icu/TimeZones.java index 0403bcc..1b5de15 100644 --- a/luni/src/main/java/libcore/icu/TimeZones.java +++ b/luni/src/main/java/libcore/icu/TimeZones.java @@ -36,7 +36,7 @@ public final class TimeZones { // If we already have the strings, linear search through them is 10x quicker than // calling ICU for just the one we want. if (CachedTimeZones.locale.equals(locale)) { - String result = lookupDisplayTimeZone(CachedTimeZones.names, id, daylight, style); + String result = lookupDisplayName(CachedTimeZones.names, id, daylight, style); if (result != null) { return result; } @@ -44,7 +44,7 @@ public final class TimeZones { return getDisplayNameImpl(id, daylight, style, locale.toString()); } - public static String lookupDisplayTimeZone(String[][] zoneStrings, String id, boolean daylight, int style) { + public static String lookupDisplayName(String[][] zoneStrings, String id, boolean daylight, int style) { for (String[] row : zoneStrings) { if (row[0].equals(id)) { if (daylight) { |