From 4cc020f0eacf27d66eaa4da008ae0132ae1998e8 Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Thu, 20 Oct 2016 14:32:34 -0700
Subject: [PATCH] [Examples] Simplified MSL example, fixed object tree not
 loading by default, renamed. Fixes #1256. Fixes #1255

---
 example/msl/bundle.js                       | 12 +---
 example/msl/src/RemsTelemetryInitializer.js | 71 ---------------------
 2 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 example/msl/src/RemsTelemetryInitializer.js

diff --git a/example/msl/bundle.js b/example/msl/bundle.js
index fbd0843935..5b8e6070c8 100644
--- a/example/msl/bundle.js
+++ b/example/msl/bundle.js
@@ -23,20 +23,18 @@
 
 define([
     "./src/RemsTelemetryServerAdapter",
-    "./src/RemsTelemetryInitializer",
     "./src/RemsTelemetryModelProvider",
     "./src/RemsTelemetryProvider",
     'legacyRegistry',
     "module"
 ], function (
     RemsTelemetryServerAdapter,
-    RemsTelemetryInitializer,
     RemsTelemetryModelProvider,
     RemsTelemetryProvider,
     legacyRegistry
 ) {
     "use strict";
-    legacyRegistry.register("example/msl-adapter", {
+    legacyRegistry.register("example/msl", {
         "name" : "Mars Science Laboratory Data Adapter",
         "extensions" : {
         "types": [
@@ -81,7 +79,7 @@ define([
                 "model": {
                     "type": "msl.curiosity",
                     "name": "Mars Science Laboratory",
-                    "composition": []
+                    "composition": ["msl_tlm:rems"]
                 }
             }
         ],
@@ -92,12 +90,6 @@ define([
                 "depends": ["$q", "$http", "$log", "REMS_WS_URL"]
             }
         ],
-        "runs": [
-            {
-                "implementation": RemsTelemetryInitializer,
-                "depends": ["rems.adapter", "objectService"]
-            }
-        ],
         "components": [
             {
                 "provides": "modelService",
diff --git a/example/msl/src/RemsTelemetryInitializer.js b/example/msl/src/RemsTelemetryInitializer.js
deleted file mode 100644
index 695f05d257..0000000000
--- a/example/msl/src/RemsTelemetryInitializer.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2016, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    function (){
-        "use strict";
-
-        var TAXONOMY_ID = "msl:curiosity",
-            PREFIX = "msl_tlm:";
-
-        /**
-         * Function that is executed on application startup and populates
-         * the navigation tree with objects representing the MSL REMS
-         * telemetry points. The tree is populated based on the data
-         * dictionary on the provider.
-         *
-         * @param {RemsTelemetryServerAdapter} adapter The server adapter
-         * (necessary in order to retrieve data dictionary)
-         * @param objectService the ObjectService which allows for lookup of
-         * objects by ID
-         * @constructor
-         */
-        function RemsTelemetryInitializer(adapter, objectService) {
-            function makeId(element) {
-                return PREFIX + element.identifier;
-            }
-
-            function initializeTaxonomy(dictionary) {
-                function getTaxonomyObject(domainObjects) {
-                    return domainObjects[TAXONOMY_ID];
-                }
-
-                function populateModel (taxonomyObject) {
-                    return taxonomyObject.useCapability(
-                        "mutation",
-                        function (model) {
-                            model.name = dictionary.name;
-                            model.composition = dictionary.instruments.map(makeId);
-                        }
-                    );
-                }
-
-                objectService.getObjects([TAXONOMY_ID])
-                    .then(getTaxonomyObject)
-                    .then(populateModel);
-            }
-            initializeTaxonomy(adapter.dictionary);
-        }
-        return RemsTelemetryInitializer;
-    }
-);