mirror/teavm
2
0
Fork 0
mirror of https://github.com/konsoletyper/teavm.git synced 2025-01-06 10:15:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support of RFC 822 timezone format

Browse Source
This commit is contained in:
Alexey Andreev 2015-05-23 12:09:15 +03:00
parent e7a88d087c
commit c8743c6d1f
3 changed files with 105 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
teavm-classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java
View File

@ -343,62 +343,20 @@ abstract class TDateFormatElement {
}
}
public static class GeneralTimezone extends TDateFormatElement {
private static Map<TLocale, GeneralTimezone> cache;
public static abstract class BaseTimezone extends TDateFormatElement {
private static Map<TLocale, TrieNode> cache;
private static TrieNode idSearchTrie;
private TLocale locale;
protected TLocale locale;
private TrieNode searchTrie;
private GeneralTimezone(TLocale locale) {
public BaseTimezone(TLocale locale) {
this.locale = locale;
}
public static GeneralTimezone get(TLocale locale) {
if (cache == null) {
cache = new HashMap<>();
}
GeneralTimezone elem = cache.get(locale);
if (elem == null) {
elem = new GeneralTimezone(locale);
cache.put(locale, elem);
}
return elem;
}
@Override
public void format(TCalendar date, StringBuffer buffer) {
TTimeZone tz = date.getTimeZone();
if (tz.getID().startsWith("GMT")) {
int minutes = tz.getRawOffset() / 60_000;
buffer.append("GMT");
if (minutes >= 0) {
buffer.append('+');
} else {
minutes = -minutes;
buffer.append('-');
}
int hours = minutes / 60;
minutes %= 60;
buffer.append(hours / 10).append(hours % 10).append(':').append(minutes / 10).append(minutes % 10);
} else {
buffer.append(tz.getDisplayName(locale));
}
}
@Override
public void parse(String text, TCalendar date, TParsePosition position) {
if (position.getIndex() + 4 < text.length()) {
int signIndex = position.getIndex() + 3;
if (text.substring(position.getIndex(), signIndex).equals("GMT")) {
char signChar = text.charAt(signIndex);
if (signChar == '+' || signChar == '-') {
parseHoursMinutes(text, date, position);
return;
}
}
}
if (position.getIndex() + 1 < text.length()) {
if (tryParseFixedTimeZone(text, date, position)) {
return;
}
prepareTrie();
TTimeZone tz = match(searchTrie, text, position);
@ -443,6 +401,13 @@ abstract class TDateFormatElement {
}
private void prepareTrie() {
if (searchTrie != null) {
return;
}
if (cache == null) {
cache = new HashMap<>();
}
searchTrie = cache.get(locale);
if (searchTrie != null) {
return;
}
@ -452,6 +417,7 @@ abstract class TDateFormatElement {
builder.add(tz.getDisplayName(locale), tz);
}
searchTrie = builder.build();
cache.put(locale, searchTrie);
}
private static void prepareIdTrie() {
@ -467,6 +433,88 @@ abstract class TDateFormatElement {
}
}
public static class GeneralTimezone extends BaseTimezone {
public GeneralTimezone(TLocale locale) {
super(locale);
}
@Override
public void format(TCalendar date, StringBuffer buffer) {
TTimeZone tz = date.getTimeZone();
if (tz.getID().startsWith("GMT")) {
int minutes = tz.getRawOffset() / 60_000;
buffer.append("GMT");
if (minutes >= 0) {
buffer.append('+');
} else {
minutes = -minutes;
buffer.append('-');
}
int hours = minutes / 60;
minutes %= 60;
buffer.append(hours / 10).append(hours % 10).append(':').append(minutes / 10).append(minutes % 10);
} else {
buffer.append(tz.getDisplayName(locale));
}
}
}
public static class Rfc822Timezone extends BaseTimezone {
public Rfc822Timezone(TLocale locale) {
super(locale);
}
@Override
public void format(TCalendar date, StringBuffer buffer) {
TTimeZone tz = date.getTimeZone();
int minutes = tz.getOffset(date.getTimeInMillis()) / 60_000;
if (minutes >= 0) {
buffer.append('+');
} else {
minutes = -minutes;
buffer.append('-');
}
int hours = minutes / 60;
minutes %= 60;
buffer.append(hours / 10).append(hours % 10).append(minutes / 10).append(minutes % 10);
}
}
static boolean tryParseFixedTimeZone(String text, TCalendar date, TParsePosition position) {
general: if (position.getIndex() + 4 < text.length()) {
int signIndex = position.getIndex() + 3;
if (!text.substring(position.getIndex(), signIndex).equals("GMT")) {
break general;
}
char signChar = text.charAt(signIndex);
if (signChar != '+' && signChar != '-') {
break general;
}
parseHoursMinutes(text, date, position);
return true;
}
rfc822: if (position.getIndex() + 5 <= text.length()) {
int index = position.getIndex();
char signChar = text.charAt(index++);
if (signChar != '+' && signChar != '-') {
break rfc822;
}
for (int i = 0; i < 4; ++i) {
if (!Character.isDigit(text.charAt(index + i))) {
break rfc822;
}
}
int sign = signChar == '-' ? -1 : 1;
int hours = 10 * Character.digit(text.charAt(index), 10) +
Character.digit(text.charAt(index + 1), 10);
int minutes = 10 * Character.digit(text.charAt(index + 2), 10) +
Character.digit(text.charAt(index + 3), 10);
date.setTimeZone(getStaticTimeZone(sign * hours, minutes));
return true;
}
return false;
}
static void parseHoursMinutes(String text, TCalendar date, TParsePosition position) {
int index = position.getIndex() + 3;
int sign = text.charAt(index++) == '-' ? -1 : 1;
@ -504,7 +552,8 @@ abstract class TDateFormatElement {
}
static TTimeZone getStaticTimeZone(int hours, int minutes) {
return TTimeZone.getTimeZone("GMT" + (hours) + ":" + (minutes / 10) + (minutes % 10));
return TTimeZone.getTimeZone("GMT" + (hours > 0 ? '+' : '-') + Math.abs(hours) +
":" + (minutes / 10) + (minutes % 10));
}
static class TrieNode {

2
teavm-classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDateFormat.java
View File

@ -79,7 +79,7 @@ public class TSimpleDateFormat extends TDateFormat {
@Override
public TDate parse(String string, TParsePosition position) {
TCalendar calendar = new TGregorianCalendar(locale);
TCalendar calendar = (TCalendar)this.calendar.clone();
calendar.clear();
for (TDateFormatElement element : elements) {
if (position.getIndex() > string.length()) {

7
teavm-classlib/src/main/java/org/teavm/classlib/java/text/TSimpleDatePatternParser.java
View File

@ -153,7 +153,12 @@ class TSimpleDatePatternParser {
}
case 'z': {
parseRepetitions();
elements.add(TDateFormatElement.GeneralTimezone.get(locale));
elements.add(new TDateFormatElement.GeneralTimezone(locale));
break;
}
case 'Z': {
parseRepetitions();
elements.add(new TDateFormatElement.Rfc822Timezone(locale));
break;
}
default: