restructured folders

src/MCT.js

@@ -265,7 +265,6 @@ define([
         this.install(this.plugins.ImportExport());
         this.install(this.plugins.WebPage());
         this.install(this.plugins.Condition());
-        this.install(this.plugins.ConditionSet());
     }
 
     MCT.prototype = Object.create(EventEmitter.prototype);

src/plugins/condition/plugin.js

@@ -19,8 +19,20 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+import ConditionSetViewProvider from './ConditionSetViewProvider.js';
 
 export default function ConditionPlugin() {
+    const conditionSetType = {
+        name: 'Condition Set',
+        key: 'conditionSet',
+        description: 'A set of one or more conditions based on user-specified criteria.',
+        creatable: true,
+        cssClass: 'icon-folder',
+        initialize: function (domainObject) {
+            domainObject.composition = [];
+        }
+    };
+
     return function install(openmct) {
         openmct.types.addType('condition', {
             name: 'Condition',
@@ -31,5 +43,10 @@ export default function ConditionPlugin() {
                 domainObject.composition = [];
             }
         });
+
+        openmct.types.addType('conditionSet', conditionSetType);
+
+        openmct.objectViews.addProvider(new ConditionSetViewProvider(openmct));
+
     }
 }

src/plugins/conditionSet/plugin.js

@@ -1,41 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2019, 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.
- *****************************************************************************/
-import ConditionSetViewProvider from './ConditionSetViewProvider.js';
-
-export default function plugin() {
-    const conditionSetType = {
-        name: 'Condition Set',
-        key: 'conditionSet',
-        description: 'A set of one or more conditions based on user-specified criteria.',
-        creatable: true,
-        cssClass: 'icon-folder',
-        initialize: function (domainObject) {
-            domainObject.composition = [];
-        }
-    };
-
-    return function install(openmct) {
-        openmct.objectViews.addProvider(new ConditionSetViewProvider(openmct));
-
-        openmct.types.addType('conditionSet', conditionSetType);
-    };
-}

src/plugins/plugins.js

@@ -47,11 +47,10 @@ define([
     './goToOriginalAction/plugin',
     './clearData/plugin',
     './webPage/plugin',
-    './conditionSet/plugin',
+    './condition/plugin',
     './themes/espresso',
     './themes/maelstrom',
-    './themes/snow',
-    './condition/plugin'
+    './themes/snow'
 ], function (
     _,
     UTCTimeSystem,
@@ -79,11 +78,10 @@ define([
     GoToOriginalAction,
     ClearData,
     WebPagePlugin,
-    ConditionSetPlugin,
+    ConditionPlugin,
     Espresso,
     Maelstrom,
-    Snow,
-    ConditionPlugin
+    Snow
 ) {
     var bundleMap = {
         LocalStorage: 'platform/persistence/local',
@@ -186,7 +184,6 @@ define([
     plugins.GoToOriginalAction = GoToOriginalAction.default;
     plugins.ClearData = ClearData;
     plugins.WebPage = WebPagePlugin.default;
-    plugins.ConditionSet = ConditionSetPlugin.default;
     plugins.Espresso = Espresso.default;
     plugins.Maelstrom = Maelstrom.default;
     plugins.Snow = Snow.default;

src/styles/vue-styles.scss

@@ -1,7 +1,7 @@
 @import "../api/overlays/components/dialog-component.scss";
 @import "../api/overlays/components/overlay-component.scss";
 @import "../plugins/condition/components/condition.scss";
-@import "../plugins/conditionSet/components/condition-set.scss";
+@import "../plugins/condition/components/condition-set.scss";
 @import "../plugins/displayLayout/components/box-view.scss";
 @import "../plugins/displayLayout/components/display-layout.scss";
 @import "../plugins/displayLayout/components/edit-marquee.scss";