Resovled merge conflicts

platform/commonUI/edit/src/services/DirtyModelCache.js

@@ -0,0 +1,47 @@
+/*****************************************************************************
+ * Open MCT Web, Copyright (c) 2014-2015, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT Web 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 Web 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() {
+        function DirtyModelCache(topic) {
+            this.cache = {};
+        }
+
+        DirtyModelCache.prototype.get = function () {
+            return this.cache;
+        };
+
+        DirtyModelCache.prototype.isDirty = function (domainObject) {
+            return !!this.get(domainObject.getId());
+        };
+
+        DirtyModelCache.prototype.markDirty = function (domainObject) {
+            this.cache[domainObject.getId()] = domainObject;
+        };
+
+        DirtyModelCache.prototype.markClean = function (domainObject) {
+            delete this.cache[domainObject.getId()];
+        };
+
+        return DirtyModelCache;
+    });