Remove references to LocaleServiceProvider

Helps with Google App Engine integration Fixes #22
ThreeTen · Dec 9, 2014 · f1ae2cf · f1ae2cf
1 parent a9e0d56
commit f1ae2cf
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 8 deletions.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,12 @@
   <body>
 
     <!-- types are add, fix, remove, update -->
+    <release version="1.2" date="SNAPSHOT" description="v1.2">
+      <action dev="jodastephen" type="fix" >
+        Remove references to LocaleServiceProvider.
+        Fixes #22.
+      </action>
+    </release>
     <release version="1.1" date="2014-10-24" description="v1.1">
       <action dev="jodastephen" type="update" >
         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
@@ -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.
      * <p>

diff --git 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<Entry<String, Long>> 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
@@ -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.