refactor

Author: larisaVasile

src/aspect-meta-model/characteristic/default-enumeration.ts

@@ -10,19 +10,13 @@
  *
  * SPDX-License-Identifier: MPL-2.0
  */
-
 import {Type} from '../type';
-import {Characteristic, DefaultCharacteristic} from './default-characteristic';
+import {DefaultCharacteristic} from './default-characteristic';
 import {DefaultEntityInstance} from '../default-entity-instance';
 import {DefaultEntity} from '../default-entity';
+import { ValuesCollection } from './default-values-collection';
 
-export interface Enumeration extends Characteristic {
-    values: Array<DefaultEntityInstance | string | number>;
-
-    indexOf(value: string): number;
-}
-
-export class DefaultEnumeration extends DefaultCharacteristic implements Enumeration {
+export class DefaultEnumeration extends DefaultCharacteristic implements ValuesCollection {
     constructor(
         metaModelVersion: string,
         aspectModelUrn: string,

src/aspect-meta-model/characteristic/default-sorted-set.ts

@@ -16,14 +16,9 @@ import {Characteristic} from './default-characteristic';
 import {Type} from '../type';
 import { DefaultEntityInstance } from '../default-entity-instance';
 import { DefaultEntity } from '../default-entity';
+import { ValuesCollection } from './default-values-collection';
 
-export interface SortedSet extends Characteristic {
-    values: Array<DefaultEntityInstance | string | number>;
-
-    indexOf(value: string): number;
-}
-
-export class DefaultSortedSet extends DefaultCollection implements SortedSet {
+export class DefaultSortedSet extends DefaultCollection implements ValuesCollection {
     constructor(metaModelVersion: string, aspectModelUrn: string, name: string, elementCharacteristic?: Characteristic, dataType?: Type,private _values?: Array<DefaultEntityInstance | string | number>) {
         super(metaModelVersion, aspectModelUrn, name, false, true, elementCharacteristic, dataType);
     }

src/aspect-meta-model/characteristic/default-state.ts

@@ -12,10 +12,11 @@
  */
 
 import {Type} from '../type';
-import {DefaultEnumeration, Enumeration} from './default-enumeration';
+import {DefaultEnumeration} from './default-enumeration';
 import {DefaultEntityInstance} from '../default-entity-instance';
+import { ValuesCollection } from './default-values-collection';
 
-export interface State extends Enumeration {
+export interface State extends ValuesCollection {
     defaultValue: DefaultEntityInstance | string | number;
 }
 

src/aspect-meta-model/characteristic/default-values-collection.ts

@@ -0,0 +1,8 @@
+import { DefaultEntityInstance } from "../default-entity-instance";
+import { Characteristic } from "./default-characteristic";
+
+export interface ValuesCollection extends Characteristic {
+    values: Array<DefaultEntityInstance | string | number>;
+
+    indexOf(value: string): number;
+}

src/instantiator/characteristic/enumeration-characteristic-instantiator.ts

@@ -14,10 +14,11 @@ import {CharacteristicInstantiator} from './characteristic-instantiator';
 import {MetaModelElementInstantiator} from '../meta-model-element-instantiator';
 import {NamedNode, Quad, Util} from 'n3';
 import {Characteristic} from '../../aspect-meta-model';
-import {DefaultEnumeration, Enumeration} from '../../aspect-meta-model/characteristic/default-enumeration';
+import {DefaultEnumeration} from '../../aspect-meta-model/characteristic/default-enumeration';
 import {Samm} from '../../vocabulary';
 import {EntityInstantiator} from '../entity-instantiator';
 import {DefaultEntityInstance} from '../../aspect-meta-model/default-entity-instance';
+import { ValuesCollection } from '../../aspect-meta-model/characteristic/default-values-collection';
 
 export interface MultiLanguageText {
     value: string;
@@ -49,7 +50,7 @@ export class EnumerationCharacteristicInstantiator extends CharacteristicInstant
      * Override the method in the corresponding specific enumeration class to create the correct type of
      * collection e.g. see state-characteristic-instantiator.
      */
-    protected creatEnumerationObject(): Enumeration {
+    protected creatEnumerationObject(): ValuesCollection {
         return new DefaultEnumeration(null, null, null, null, null);
     }
 

src/instantiator/characteristic/sorted-set-characteristic-instantiator.ts

@@ -21,6 +21,7 @@ import {Characteristic} from '../../aspect-meta-model';
 import {Samm} from '../../vocabulary';
 import {EntityInstantiator} from '../entity-instantiator';
 import {DefaultEntityInstance} from '../../aspect-meta-model/default-entity-instance';
+import { ValuesCollection } from '../../aspect-meta-model/characteristic/default-values-collection';
 
 export interface MultiLanguageText {
     value: string;

src/instantiator/characteristic/state-characteristic-instantiator.ts

@@ -17,7 +17,7 @@ import {NamedNode, Quad, Util} from 'n3';
 import {Characteristic} from '../../aspect-meta-model';
 import {DefaultState} from '../../aspect-meta-model/characteristic/default-state';
 import {EnumerationCharacteristicInstantiator} from './enumeration-characteristic-instantiator';
-import {Enumeration} from '../../aspect-meta-model/characteristic/default-enumeration';
+import { ValuesCollection } from '../../aspect-meta-model/characteristic/default-values-collection';
 
 export class StateCharacteristicInstantiator extends EnumerationCharacteristicInstantiator {
     constructor(metaModelElementInstantiator: MetaModelElementInstantiator, nextProcessor: CharacteristicInstantiator) {
@@ -37,7 +37,7 @@ export class StateCharacteristicInstantiator extends EnumerationCharacteristicIn
         return stateCharacteristic;
     }
 
-    protected creatEnumerationObject(): Enumeration {
+    protected creatEnumerationObject(): ValuesCollection {
         return new DefaultState(null, null, null, null, null);
     }