From f1ae2cff6c7df440d710a302e84f05d25450c789 Mon Sep 17 00:00:00 2001 From: Stephen Colebourne Date: Tue, 9 Dec 2014 11:13:47 +0000 Subject: [PATCH] Remove references to LocaleServiceProvider Helps with Google App Engine integration Fixes #22 --- src/changes/changes.xml | 6 ++++++ .../bp/format/DateTimeFormatStyleProvider.java | 12 ++++++++++-- .../threeten/bp/format/DateTimeFormatterBuilder.java | 4 ---- .../org/threeten/bp/format/DateTimeTextProvider.java | 12 ++++++++++-- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 1beca3eb1..39da6c34e 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -8,6 +8,12 @@ + + + Remove references to LocaleServiceProvider. + Fixes #22. + + Update to time-zone data 2014i. diff --git a/src/main/java/org/threeten/bp/format/DateTimeFormatStyleProvider.java b/src/main/java/org/threeten/bp/format/DateTimeFormatStyleProvider.java index 245e30037..5c9724f1f 100644 --- a/src/main/java/org/threeten/bp/format/DateTimeFormatStyleProvider.java +++ b/src/main/java/org/threeten/bp/format/DateTimeFormatStyleProvider.java @@ -32,7 +32,6 @@ package org.threeten.bp.format; import java.util.Locale; -import java.util.spi.LocaleServiceProvider; import org.threeten.bp.chrono.Chronology; @@ -45,7 +44,7 @@ * Implementations must be thread-safe. * Implementations should cache the returned formatters. */ - abstract class DateTimeFormatStyleProvider extends LocaleServiceProvider { + abstract class DateTimeFormatStyleProvider { /** * Gets the provider. @@ -56,6 +55,15 @@ static DateTimeFormatStyleProvider getInstance() { return new SimpleDateTimeFormatStyleProvider(); } + /** + * Gets the available locales. + * + * @return the locales + */ + public Locale[] getAvailableLocales() { + throw new UnsupportedOperationException(); + } + /** * Gets a localized date, time or date-time formatter. *

diff --git a/src/main/java/org/threeten/bp/format/DateTimeFormatterBuilder.java b/src/main/java/org/threeten/bp/format/DateTimeFormatterBuilder.java index 3622fdaf5..49515b16f 100644 --- a/src/main/java/org/threeten/bp/format/DateTimeFormatterBuilder.java +++ b/src/main/java/org/threeten/bp/format/DateTimeFormatterBuilder.java @@ -733,10 +733,6 @@ public String getText(TemporalField field, long value, TextStyle style, Locale l public Iterator> getTextIterator(TemporalField field, TextStyle style, Locale locale) { return store.getTextIterator(style); } - @Override - public Locale[] getAvailableLocales() { - throw new UnsupportedOperationException(); - } }; appendInternal(new TextPrinterParser(field, TextStyle.FULL, provider)); return this; diff --git a/src/main/java/org/threeten/bp/format/DateTimeTextProvider.java b/src/main/java/org/threeten/bp/format/DateTimeTextProvider.java index 05130ad6a..3cd37185c 100644 --- a/src/main/java/org/threeten/bp/format/DateTimeTextProvider.java +++ b/src/main/java/org/threeten/bp/format/DateTimeTextProvider.java @@ -34,7 +34,6 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map.Entry; -import java.util.spi.LocaleServiceProvider; import org.threeten.bp.temporal.TemporalField; @@ -47,7 +46,7 @@ * Implementations must be thread-safe. * Implementations should cache the textual information. */ -abstract class DateTimeTextProvider extends LocaleServiceProvider { +abstract class DateTimeTextProvider { /** * Gets the provider. @@ -58,6 +57,15 @@ static DateTimeTextProvider getInstance() { return new SimpleDateTimeTextProvider(); } + /** + * Gets the available locales. + * + * @return the locales + */ + public Locale[] getAvailableLocales() { + throw new UnsupportedOperationException(); + } + /** * Gets the text for the specified field, locale and style * for the purpose of printing.