Bug 449258 - Add new NLS support API (Formatters, LocaleProvider, ...)

12 files changed, 15 insertions, 21 deletions

diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/dateformatter.xml b/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/dateformatter.xml
index 04f3a0762..8b82e267d 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/dateformatter.xml
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/dateformatter.xml
@@ -4,5 +4,5 @@
    <service>
       <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
    </service>
-   <property name="service.context.key" type="String" value="org.eclipse.fx.core.di.text.DateFormatter"/>
+   <property name="service.context.key" type="String" value="org.eclipse.fx.core.text.DateFormatter"/>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/numberformatter.xml b/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/numberformatter.xml
index f5eda6274..ce727c779 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/numberformatter.xml
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/numberformatter.xml
@@ -4,5 +4,5 @@
    <service>
       <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
    </service>
-   <property name="service.context.key" type="String" value="org.eclipse.fx.core.di.text.NumberFormatter"/>
+   <property name="service.context.key" type="String" value="org.eclipse.fx.core.text.NumberFormatter"/>
 </scr:component>
\ No newline at end of file
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/temporalaccessformatter.xml b/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/temporalaccessformatter.xml
index 9832ee8c8..bd324c6c6 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/temporalaccessformatter.xml
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/OSGI-INF/services/temporalaccessformatter.xml
@@ -4,5 +4,5 @@
    <service>
       <provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
    </service>
-   <property name="service.context.key" type="String" value="org.eclipse.fx.core.di.text.TemporalAccessorFormatter"/>
+   <property name="service.context.key" type="String" value="org.eclipse.fx.core.text.TemporalAccessorFormatter"/>
 </scr:component>
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/DateFormatterFunction.java b/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/DateFormatterFunction.java
index 7c38e6184..c7a79ef20 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/DateFormatterFunction.java
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/DateFormatterFunction.java
@@ -14,7 +14,7 @@ import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.fx.core.di.text.DateFormatter;
+import org.eclipse.fx.core.text.DateFormatter;
 
 /**
  * {@link IContextFunction} to create {@link DateFormatter}
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/NumberFormatterFunction.java b/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/NumberFormatterFunction.java
index c63b9523f..1dc10ccf2 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/NumberFormatterFunction.java
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/NumberFormatterFunction.java
@@ -14,7 +14,7 @@ import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.fx.core.di.text.NumberFormatter;
+import org.eclipse.fx.core.text.NumberFormatter;
 
 /**
  * {@link IContextFunction} to create {@link NumberFormatter}
diff --git a/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/TemportalAccessorFormatterFunction.java b/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/TemportalAccessorFormatterFunction.java
index 1880d5f68..0f5e92e75 100644
--- a/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/TemportalAccessorFormatterFunction.java
+++ b/bundles/runtime/org.eclipse.fx.core.di.context/src/org/eclipse/fx/core/di/context/internal/TemportalAccessorFormatterFunction.java
@@ -14,7 +14,7 @@ import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.fx.core.di.text.TemporalAccessorFormatter;
+import org.eclipse.fx.core.text.TemporalAccessorFormatter;
 
 /**
  * {@link IContextFunction} to create {@link TemporalAccessorFormatter}
diff --git a/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
index e6b892e8e..66fc006c6 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core.di/META-INF/MANIFEST.MF
@@ -8,5 +8,4 @@ Import-Package: javax.annotation;version="1.2.0",
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.fx.core;bundle-version="0.9.0",
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.fx.core.di,
- org.eclipse.fx.core.di.text
+Export-Package: org.eclipse.fx.core.di
diff --git a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
index d23755675..b61ac94ef 100755
--- a/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.core/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.fx.core

 Bundle-Version: 1.1.0.qualifier

 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Import-Package: javax.inject;version="1.0.0",

+Import-Package: javax.annotation;version="1.2.0",

+ javax.inject;version="1.0.0",

  org.apache.commons.lang.text;version="2.6.0"

 Export-Package: org.eclipse.fx.core,

  org.eclipse.fx.core.adapter,

diff --git a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/AbstractMessageRegistry.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/AbstractTextRegistry.java
index 6415746b8..07b54f8e3 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/AbstractMessageRegistry.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/AbstractTextRegistry.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *******************************************************************************/
-package org.eclipse.fx.core.di.text;
+package org.eclipse.fx.core.text;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -29,7 +29,7 @@ import org.eclipse.fx.core.Subscription;
  *            the message class type
  * @since 1.1
  */
-public class AbstractMessageRegistry<M> {
+public class AbstractTextRegistry<M> {
 	private M messages;
 
 	Map<Consumer<String>, Supplier<String>> bindings = new HashMap<>();
@@ -83,7 +83,7 @@ public class AbstractMessageRegistry<M> {
 
 			@Override
 			public void dispose() {
-				AbstractMessageRegistry.this.bindings.remove(consumer);
+				AbstractTextRegistry.this.bindings.remove(consumer);
 			}
 		};
 	}
diff --git a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/DateFormatter.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/DateFormatter.java
index 05214cd92..4df73493c 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/DateFormatter.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/DateFormatter.java
@@ -8,15 +8,13 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *******************************************************************************/
-package org.eclipse.fx.core.di.text;
+package org.eclipse.fx.core.text;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 import javax.inject.Inject;
 
-import org.eclipse.fx.core.text.Formatter;
-import org.eclipse.fx.core.text.LocaleProvider;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
diff --git a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/NumberFormatter.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/NumberFormatter.java
index 36dd2c799..3a15b8b7e 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/NumberFormatter.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/NumberFormatter.java
@@ -8,15 +8,13 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *******************************************************************************/
-package org.eclipse.fx.core.di.text;
+package org.eclipse.fx.core.text;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 
 import javax.inject.Inject;
 
-import org.eclipse.fx.core.text.Formatter;
-import org.eclipse.fx.core.text.LocaleProvider;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
diff --git a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/TemporalAccessorFormatter.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/TemporalAccessorFormatter.java
index b39a322ef..4b0f7873c 100644
--- a/bundles/runtime/org.eclipse.fx.core.di/src/org/eclipse/fx/core/di/text/TemporalAccessorFormatter.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/text/TemporalAccessorFormatter.java
@@ -8,15 +8,13 @@
  * Contributors:
  *     Tom Schindl <tom.schindl@bestsolution.at> - initial API and implementation
  *******************************************************************************/
-package org.eclipse.fx.core.di.text;
+package org.eclipse.fx.core.text;
 
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAccessor;
 
 import javax.inject.Inject;
 
-import org.eclipse.fx.core.text.Formatter;
-import org.eclipse.fx.core.text.LocaleProvider;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;