From f4beb7261f4c04895040d3e4937bf3fd7d9b9b4a Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Sat, 17 Mar 2012 16:32:31 +0000
Subject: [PATCH] enabled number formatting in LocaleFormatter tests now that
 issue KT-1583 is fixed

---
 libraries/stdlib/src/kotlin/template/Templates.kt    | 5 +----
 libraries/stdlib/test/template/LocaleTemplateTest.kt | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/template/Templates.kt b/libraries/stdlib/src/kotlin/template/Templates.kt
index 852c20b0621..4d55394e46c 100644
--- a/libraries/stdlib/src/kotlin/template/Templates.kt
+++ b/libraries/stdlib/src/kotlin/template/Templates.kt
@@ -130,12 +130,9 @@ open class LocaleFormatter(val locale : Locale = defaultLocale) : ToStringFormat
     public var dateFormat : DateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, locale).sure()
 
     override fun format(out : Appendable, value : Any?) {
-        /* TODO KT-1583 - uncomment when its fixed
         if (value is Number) {
             format(out, format(value))
-        } else
-        */
-        if (value is Date) {
+        } else if (value is Date) {
             format(out, format(value))
         } else {
             super.format(out, value)
diff --git a/libraries/stdlib/test/template/LocaleTemplateTest.kt b/libraries/stdlib/test/template/LocaleTemplateTest.kt
index eef0c0749d6..b1483ab377e 100644
--- a/libraries/stdlib/test/template/LocaleTemplateTest.kt
+++ b/libraries/stdlib/test/template/LocaleTemplateTest.kt
@@ -22,8 +22,7 @@ class LocaleTemplateTest : TestCase() {
 
     fun format(formatter: LocaleFormatter): Unit {
         val name = "James"
-        // TODO currently numbers cause: java.lang.ClassNotFoundException: jet.Number
-        //val price: Double = 1.99
+        val price: Double = 1.99
         val now = Date()
 
 
@@ -34,8 +33,7 @@ class LocaleTemplateTest : TestCase() {
         // TODO will use a tuple soon
         //val actual = formatter.format(StringTemplate(Tuple2<String,String>("hello ", name))
         val actual = StringTemplate(array("hello ", name,
-            // TODO currently numbers cause: java.lang.ClassNotFoundException: jet.Number
-            // " price ", price,
+            " price ", price,
             " data ", now)).toString(formatter)
 
         println("Got text: $actual")