From 57d4784ba2a51cb464b0bf928a7c3186aa3493b6 Mon Sep 17 00:00:00 2001 From: crusader Date: Mon, 31 Jul 2017 12:43:16 +0900 Subject: [PATCH] ing --- src/ts/@overflow/commons/context/pouches/constants/types.ts | 2 +- .../@overflow/commons/context/pouches/factory/PouchFactory.ts | 3 ++- src/ts/@overflow/commons/react/component/Tree.tsx | 2 +- src/ts/@overflow/meta/react/components/SensorItemTree.tsx | 4 +--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ts/@overflow/commons/context/pouches/constants/types.ts b/src/ts/@overflow/commons/context/pouches/constants/types.ts index e43e154..04a6e25 100644 --- a/src/ts/@overflow/commons/context/pouches/constants/types.ts +++ b/src/ts/@overflow/commons/context/pouches/constants/types.ts @@ -2,6 +2,6 @@ export const POUCH_DEFAULT_QUALIFIER = Symbol('__QUALIFIER__'); export enum PouchScope { SINGLETON, - PROTOTYPE, + TRANSIENT, } diff --git a/src/ts/@overflow/commons/context/pouches/factory/PouchFactory.ts b/src/ts/@overflow/commons/context/pouches/factory/PouchFactory.ts index 5749634..ea753d7 100644 --- a/src/ts/@overflow/commons/context/pouches/factory/PouchFactory.ts +++ b/src/ts/@overflow/commons/context/pouches/factory/PouchFactory.ts @@ -1,3 +1,4 @@ +import { DecoratorType, Newable } from '@overflow/commons/core/constants'; import * as METADATA from '../constants'; import { @@ -99,7 +100,7 @@ class PouchFactory { instance = this._newInstance(clazz, pouchDefinition, args); } } else { - if (pouchDefinition.scope === PouchScope.PROTOTYPE) { + if (pouchDefinition.scope === PouchScope.TRANSIENT) { instance = this._newInstance(clazz, pouchDefinition, args); } else { if (this._hasPouchInstance(clazz, qualifier)) { diff --git a/src/ts/@overflow/commons/react/component/Tree.tsx b/src/ts/@overflow/commons/react/component/Tree.tsx index 54ca745..c8d88de 100644 --- a/src/ts/@overflow/commons/react/component/Tree.tsx +++ b/src/ts/@overflow/commons/react/component/Tree.tsx @@ -10,7 +10,7 @@ import Service from '@overflow/discovery/api/model/Service'; import MetaSensorItem from '@overflow/meta/api/model/MetaSensorItem'; -import * as Utils from '@overflow/commons/utils/Utils'; +import * as Utils from '@overflow/commons/util/Utils'; diff --git a/src/ts/@overflow/meta/react/components/SensorItemTree.tsx b/src/ts/@overflow/meta/react/components/SensorItemTree.tsx index 36df56b..79205f5 100644 --- a/src/ts/@overflow/meta/react/components/SensorItemTree.tsx +++ b/src/ts/@overflow/meta/react/components/SensorItemTree.tsx @@ -17,9 +17,7 @@ import { import MetaSensorItemType from '../../api/model/MetaSensorItemType'; import MetaSensorItem from '../../api/model/MetaSensorItem'; -import * as Utils from '@overflow/commons/utils/Utils'; - - +import * as Utils from '@overflow/commons/util/Utils'; export interface SensorItemTreeStateProps {