From 0759ba6722d966e5c2144ee4e6c1a1f46021ce78 Mon Sep 17 00:00:00 2001 From: Victor Woeltjen Date: Mon, 17 Oct 2016 10:43:12 -0700 Subject: [PATCH] [Composition] Fix adapter composition policy ...as this had fallen out-of-date with existing APIs. Fixes #1257. --- .../policies/AdapterCompositionPolicy.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/adapter/policies/AdapterCompositionPolicy.js b/src/adapter/policies/AdapterCompositionPolicy.js index 50e9312d54..865b08cb59 100644 --- a/src/adapter/policies/AdapterCompositionPolicy.js +++ b/src/adapter/policies/AdapterCompositionPolicy.js @@ -21,8 +21,8 @@ *****************************************************************************/ define([], function () { - function AdapterCompositionPolicy(mct) { - this.mct = mct; + function AdapterCompositionPolicy(openmct) { + this.openmct = openmct; } AdapterCompositionPolicy.prototype.allow = function ( @@ -32,16 +32,10 @@ define([], function () { var containerObject = containerType.getInitialModel(); var childObject = childType.getInitialModel(); - containerObject.type = containerType.getKey(); - childObject.type = childType.getKey(); - - var composition = this.mct.Composition(containerObject); - - if (composition) { - return composition.canContain(childObject); - } - - return true; + return this.openmct.composition.checkPolicy( + containerObject, + childObject + ); }; return AdapterCompositionPolicy;