From cecc52f0a9f385979eb4ed9d65136dc69761a925 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon, 2 Nov 2015 12:28:46 -0800
Subject: [PATCH] [Time Conductor] Update formatService usages

...to remove checks for unknown formats.
---
 .../general/src/controllers/DateTimeFieldController.js   | 6 ------
 .../general/src/controllers/TimeRangeController.js       | 9 +--------
 platform/telemetry/bundle.json                           | 2 +-
 platform/telemetry/src/TelemetryFormatter.js             | 6 ++----
 4 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
index 7b58834aa5..b87268dc5a 100644
--- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js
+++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
@@ -26,9 +26,6 @@ define(
     function () {
         'use strict';
 
-        var UNRECOGNIZED_FORMAT_ERROR =
-            "Unrecognized format for date-time field.";
-
         /**
          * Controller to support the date-time entry field.
          *
@@ -69,9 +66,6 @@ define(
 
             function setFormat(format) {
                 formatter = formatService.getFormat(format || defaultFormat);
-                if (!formatter) {
-                    throw new Error(UNRECOGNIZED_FORMAT_ERROR);
-                }
                 updateFromModel($scope.ngModel[$scope.field]);
             }
 
diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js
index b0ef5efe70..cdcdb7f8d0 100644
--- a/platform/commonUI/general/src/controllers/TimeRangeController.js
+++ b/platform/commonUI/general/src/controllers/TimeRangeController.js
@@ -26,9 +26,7 @@ define(
     function (moment) {
         "use strict";
 
-        var TICK_SPACING_PX = 150,
-            UNRECOGNIZED_FORMAT_ERROR =
-                "Unrecognized format for time range control.";
+        var TICK_SPACING_PX = 150;
 
 
         /**
@@ -221,11 +219,6 @@ define(
 
             function updateFormat(key) {
                 formatter = formatService.getFormat(key || defaultFormat);
-
-                if (!formatter) {
-                    throw new Error(UNRECOGNIZED_FORMAT_ERROR);
-                }
-
                 updateViewForInnerSpanFromModel($scope.ngModel);
                 updateTicks();
             }
diff --git a/platform/telemetry/bundle.json b/platform/telemetry/bundle.json
index bb21ccaa35..d264a1d6c0 100644
--- a/platform/telemetry/bundle.json
+++ b/platform/telemetry/bundle.json
@@ -38,7 +38,7 @@
             {
                 "key": "telemetryFormatter",
                 "implementation": "TelemetryFormatter.js",
-                "depends": [ "formatService", "DEFAULT_TIME_FORMAT", "$log" ]
+                "depends": [ "formatService", "DEFAULT_TIME_FORMAT" ]
             },
             {
                 "key": "telemetrySubscriber",
diff --git a/platform/telemetry/src/TelemetryFormatter.js b/platform/telemetry/src/TelemetryFormatter.js
index cff80cf355..dd434d4ac3 100644
--- a/platform/telemetry/src/TelemetryFormatter.js
+++ b/platform/telemetry/src/TelemetryFormatter.js
@@ -40,12 +40,10 @@ define(
          *        domain values
          * @param {string} defaultFormatKey the format to request when no
          *        format has been otherwise specified
-         * @param $log Angular's `$log`, to log warnings
          */
-        function TelemetryFormatter(formatService, defaultFormatKey, $log) {
+        function TelemetryFormatter(formatService, defaultFormatKey) {
             this.formatService = formatService;
             this.defaultFormat = formatService.getFormat(defaultFormatKey);
-            this.$log = $log;
         }
 
         /**
@@ -62,7 +60,7 @@ define(
                     this.defaultFormat :
                     this.formatService.getFormat(key);
 
-            return isNaN(v) ? "" : formatter ? formatter.format(v) : String(v);
+            return isNaN(v) ? "" : formatter.format(v);
         };
 
         /**