ts2famix 1.0.13 → 1.0.15

package/src/lib/famix/src/model/famix/inheritance.ts

@@ -1,42 +1,42 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { Association } from "./association";
-import { Class } from "./class";
-import { Interface } from "./interface";
-
-export class Inheritance extends Association {
-
-  private superclass: Class | Interface;
-
-  public getSuperclass(): Class  | Interface {
-    return this.superclass;
-  }
-
-  public setSuperclass(superclass: Class | Interface): void {
-    this.superclass = superclass;
-    superclass.addSubInheritance(this);
-  }
-
-  private subclass: Class | Interface;
-
-  public getSubclass(): Class | Interface {
-    return this.subclass;
-  }
-
-  public setSubclass(subclass: Class | Interface): void {
-    this.subclass = subclass;
-    subclass.addSuperInheritance(this);
-  }
-
-
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Inheritance", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-    exporter.addProperty("superclass", this.getSuperclass());
-    exporter.addProperty("subclass", this.getSubclass());
-  }
-}
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Association } from "./association";
+import { Class } from "./class";
+import { Interface } from "./interface";
+
+export class Inheritance extends Association {
+
+  private superclass: Class | Interface;
+
+  public getSuperclass(): Class  | Interface {
+    return this.superclass;
+  }
+
+  public setSuperclass(superclass: Class | Interface): void {
+    this.superclass = superclass;
+    superclass.addSubInheritance(this);
+  }
+
+  private subclass: Class | Interface;
+
+  public getSubclass(): Class | Interface {
+    return this.subclass;
+  }
+
+  public setSubclass(subclass: Class | Interface): void {
+    this.subclass = subclass;
+    subclass.addSuperInheritance(this);
+  }
+
+
+  public getJSON(): string {
+    const mse: FamixJSONExporter = new FamixJSONExporter("Inheritance", this);
+    this.addPropertiesToExporter(mse);
+    return mse.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("superclass", this.getSuperclass());
+    exporter.addProperty("subclass", this.getSubclass());
+  }
+}

package/src/lib/famix/src/model/famix/interface.ts

@@ -1,75 +1,75 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { Type } from "./type";
-import { Method } from "./method";
-import { Property } from "./property";
-import { Inheritance } from "./inheritance";
-
-export class Interface extends Type {
-
-  private properties: Set<Property> = new Set();
-
-  public getProperties(): Set<Property> {
-    return this.properties;
-  }
-
-  public addProperty(property: Property): void {
-    if (!this.properties.has(property)) {
-      this.properties.add(property);
-      property.setParentEntity(this);
-    }
-  }
-
-  private methods: Set<Method> = new Set();
-
-  public getMethods(): Set<Method> {
-    return this.methods;
-  }
-
-  public addMethod(method: Method): void {
-    if (!this.methods.has(method)) {
-      this.methods.add(method);
-      method.setParentEntity(this);
-    }
-  }
-
-  private superInheritances: Set<Inheritance> = new Set();
-
-  public getSuperInheritances(): Set<Inheritance> {
-    return this.superInheritances;
-  }
-
-  public addSuperInheritance(superInheritance: Inheritance): void {
-    if (!this.superInheritances.has(superInheritance)) {
-      this.superInheritances.add(superInheritance);
-      superInheritance.setSubclass(this);
-    }
-  }
-
-  private subInheritances: Set<Inheritance> = new Set();
-
-  public getSubInheritances(): Set<Inheritance> {
-    return this.subInheritances;
-  }
-
-  public addSubInheritance(subInheritance: Inheritance): void {
-    if (!this.subInheritances.has(subInheritance)) {
-      this.subInheritances.add(subInheritance);
-      subInheritance.setSuperclass(this);
-    }
-  }
-
-
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Interface", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-    exporter.addProperty("properties", this.getProperties());
-    exporter.addProperty("methods", this.getMethods());
-    exporter.addProperty("superInheritances", this.getSuperInheritances());
-    exporter.addProperty("subInheritances", this.getSubInheritances());  
-  }
-}
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { Type } from "./type";
+import { Method } from "./method";
+import { Property } from "./property";
+import { Inheritance } from "./inheritance";
+
+export class Interface extends Type {
+
+  private properties: Set<Property> = new Set();
+
+  public getProperties(): Set<Property> {
+    return this.properties;
+  }
+
+  public addProperty(property: Property): void {
+    if (!this.properties.has(property)) {
+      this.properties.add(property);
+      property.setParentEntity(this);
+    }
+  }
+
+  private methods: Set<Method> = new Set();
+
+  public getMethods(): Set<Method> {
+    return this.methods;
+  }
+
+  public addMethod(method: Method): void {
+    if (!this.methods.has(method)) {
+      this.methods.add(method);
+      method.setParentEntity(this);
+    }
+  }
+
+  private superInheritances: Set<Inheritance> = new Set();
+
+  public getSuperInheritances(): Set<Inheritance> {
+    return this.superInheritances;
+  }
+
+  public addSuperInheritance(superInheritance: Inheritance): void {
+    if (!this.superInheritances.has(superInheritance)) {
+      this.superInheritances.add(superInheritance);
+      superInheritance.setSubclass(this);
+    }
+  }
+
+  private subInheritances: Set<Inheritance> = new Set();
+
+  public getSubInheritances(): Set<Inheritance> {
+    return this.subInheritances;
+  }
+
+  public addSubInheritance(subInheritance: Inheritance): void {
+    if (!this.subInheritances.has(subInheritance)) {
+      this.subInheritances.add(subInheritance);
+      subInheritance.setSuperclass(this);
+    }
+  }
+
+
+  public getJSON(): string {
+    const mse: FamixJSONExporter = new FamixJSONExporter("Interface", this);
+    this.addPropertiesToExporter(mse);
+    return mse.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("properties", this.getProperties());
+    exporter.addProperty("methods", this.getMethods());
+    exporter.addProperty("superInheritances", this.getSuperInheritances());
+    exporter.addProperty("subInheritances", this.getSubInheritances());  
+  }
+}

package/src/lib/famix/src/model/famix/invocation.ts

@@ -1,68 +1,68 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { NamedEntity } from "./named_entity";
-import { Association } from "./association";
-import { BehavioralEntity } from "./behavioral_entity";
-import { ContainerEntity } from "./container_entity";
-
-export class Invocation extends Association {
-
-  private candidates: Set<BehavioralEntity> = new Set();
-
-  public getCandidates(): Set<BehavioralEntity> {
-    return this.candidates;
-  }
-
-  public addCandidate(candidate: BehavioralEntity): void {  
-    if (!this.candidates.has(candidate)) {
-      this.candidates.add(candidate);
-      candidate.addIncomingInvocation(this);
-    }
-  }
-
-  private receiver: NamedEntity;
-
-  public getReceiver(): NamedEntity {
-    return this.receiver;
-  }
-
-  public setReceiver(receiver: NamedEntity): void {
-    this.receiver = receiver;
-    receiver.addReceivedInvocation(this);
-  }
-
-  private sender: ContainerEntity;
-
-  public getSender(): ContainerEntity {
-    return this.sender;
-  }
-
-  public setSender(sender: ContainerEntity): void {
-    this.sender = sender;
-    sender.addOutgoingInvocation(this);
-  }
-
-  private signature: string;
-
-  public getSignature(): string {
-    return this.signature;
-  }
-
-  public setSignature(signature: string): void {
-    this.signature = signature;
-  }
-
-
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Invocation", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-    exporter.addProperty("candidates", this.getCandidates());
-    exporter.addProperty("receiver", this.getReceiver());
-    exporter.addProperty("sender", this.getSender());
-    exporter.addProperty("signature", this.getSignature());
-  }
-}
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { NamedEntity } from "./named_entity";
+import { Association } from "./association";
+import { BehavioralEntity } from "./behavioral_entity";
+import { ContainerEntity } from "./container_entity";
+
+export class Invocation extends Association {
+
+  private candidates: Set<BehavioralEntity> = new Set();
+
+  public getCandidates(): Set<BehavioralEntity> {
+    return this.candidates;
+  }
+
+  public addCandidate(candidate: BehavioralEntity): void {  
+    if (!this.candidates.has(candidate)) {
+      this.candidates.add(candidate);
+      candidate.addIncomingInvocation(this);
+    }
+  }
+
+  private receiver: NamedEntity;
+
+  public getReceiver(): NamedEntity {
+    return this.receiver;
+  }
+
+  public setReceiver(receiver: NamedEntity): void {
+    this.receiver = receiver;
+    receiver.addReceivedInvocation(this);
+  }
+
+  private sender: ContainerEntity;
+
+  public getSender(): ContainerEntity {
+    return this.sender;
+  }
+
+  public setSender(sender: ContainerEntity): void {
+    this.sender = sender;
+    sender.addOutgoingInvocation(this);
+  }
+
+  private signature: string;
+
+  public getSignature(): string {
+    return this.signature;
+  }
+
+  public setSignature(signature: string): void {
+    this.signature = signature;
+  }
+
+
+  public getJSON(): string {
+    const mse: FamixJSONExporter = new FamixJSONExporter("Invocation", this);
+    this.addPropertiesToExporter(mse);
+    return mse.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("candidates", this.getCandidates());
+    exporter.addProperty("receiver", this.getReceiver());
+    exporter.addProperty("sender", this.getSender());
+    exporter.addProperty("signature", this.getSignature());
+  }
+}

package/src/lib/famix/src/model/famix/method.ts

@@ -1,96 +1,96 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { BehavioralEntity } from "./behavioral_entity";
-import { Class } from "./class";
-import { Interface } from "./interface";
-
-export class Method extends BehavioralEntity {
-
-  private parentEntity: Class | Interface;
-
-  public getParentEntity(): Class | Interface {
-    return this.parentEntity;
-  }
-
-  public setParentEntity(parentEntity: Class | Interface): void {
-    this.parentEntity = parentEntity;
-    parentEntity.addMethod(this);
-  }
-
-  private kind: string;
-
-  public getKind(): string {
-    return this.kind;
-  }
-
-  public setKind(kind: string): void {
-    this.kind = kind;
-  }
-
-  private isAbstract: boolean;
-
-  public getIsAbstract(): boolean {
-    return this.isAbstract;
-  }
-
-  public setIsAbstract(isAbstract: boolean): void {
-    this.isAbstract = isAbstract;
-  }
-
-  private isClassSide: boolean;
-
-  public getIsClassSide(): boolean {
-    return this.isClassSide;
-  }
-
-  public setIsClassSide(isClassSide: boolean): void {
-    this.isClassSide = isClassSide;
-  }
-
-  private isPrivate: boolean;
-
-  public getIsPrivate(): boolean {
-    return this.isPrivate;
-  }
-
-  public setIsPrivate(isPrivate: boolean): void {
-    this.isPrivate = isPrivate;
-  }
-
-  private isPublic: boolean;
-
-  public getIsPublic(): boolean {
-    return this.isPublic;
-  }
-
-  public setIsPublic(isPublic: boolean): void {
-    this.isPublic = isPublic;
-  }
-
-  private isProtected: boolean;
-
-  public getIsProtected(): boolean {
-    return this.isProtected;
-  }
-
-  public setIsProtected(isProtected: boolean): void {
-    this.isProtected = isProtected;
-  }
-
-  
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Method", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-    exporter.addProperty("parentEntity", this.getParentEntity());
-    exporter.addProperty("kind", this.getKind());
-    exporter.addProperty("isAbstract", this.getIsAbstract());
-    exporter.addProperty("isClassSide", this.getIsClassSide());
-    exporter.addProperty("isPrivate", this.getIsPrivate());
-    exporter.addProperty("isPublic", this.getIsPublic());
-    exporter.addProperty("isProtected", this.getIsProtected());
-  }
-}
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { BehavioralEntity } from "./behavioral_entity";
+import { Class } from "./class";
+import { Interface } from "./interface";
+
+export class Method extends BehavioralEntity {
+
+  private parentEntity: Class | Interface;
+
+  public getParentEntity(): Class | Interface {
+    return this.parentEntity;
+  }
+
+  public setParentEntity(parentEntity: Class | Interface): void {
+    this.parentEntity = parentEntity;
+    parentEntity.addMethod(this);
+  }
+
+  private kind: string;
+
+  public getKind(): string {
+    return this.kind;
+  }
+
+  public setKind(kind: string): void {
+    this.kind = kind;
+  }
+
+  private isAbstract: boolean;
+
+  public getIsAbstract(): boolean {
+    return this.isAbstract;
+  }
+
+  public setIsAbstract(isAbstract: boolean): void {
+    this.isAbstract = isAbstract;
+  }
+
+  private isClassSide: boolean;
+
+  public getIsClassSide(): boolean {
+    return this.isClassSide;
+  }
+
+  public setIsClassSide(isClassSide: boolean): void {
+    this.isClassSide = isClassSide;
+  }
+
+  private isPrivate: boolean;
+
+  public getIsPrivate(): boolean {
+    return this.isPrivate;
+  }
+
+  public setIsPrivate(isPrivate: boolean): void {
+    this.isPrivate = isPrivate;
+  }
+
+  private isPublic: boolean;
+
+  public getIsPublic(): boolean {
+    return this.isPublic;
+  }
+
+  public setIsPublic(isPublic: boolean): void {
+    this.isPublic = isPublic;
+  }
+
+  private isProtected: boolean;
+
+  public getIsProtected(): boolean {
+    return this.isProtected;
+  }
+
+  public setIsProtected(isProtected: boolean): void {
+    this.isProtected = isProtected;
+  }
+
+  
+  public getJSON(): string {
+    const mse: FamixJSONExporter = new FamixJSONExporter("Method", this);
+    this.addPropertiesToExporter(mse);
+    return mse.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("parentEntity", this.getParentEntity());
+    exporter.addProperty("kind", this.getKind());
+    exporter.addProperty("isAbstract", this.getIsAbstract());
+    exporter.addProperty("isClassSide", this.getIsClassSide());
+    exporter.addProperty("isPrivate", this.getIsPrivate());
+    exporter.addProperty("isPublic", this.getIsPublic());
+    exporter.addProperty("isProtected", this.getIsProtected());
+  }
+}

package/src/lib/famix/src/model/famix/module.ts

@@ -1,31 +1,31 @@
-import { FamixJSONExporter } from "../../famix_JSON_exporter";
-import { ScriptEntity } from "./script_entity";
-import { ImportClause } from "./import_clause";
-
-export class Module extends ScriptEntity {
-
-  private importClauses: Set<ImportClause> = new Set();
-
-  public getImportClauses(): Set<ImportClause> {
-    return this.importClauses;
-  }
-
-  public addImportClause(importClause: ImportClause): void {
-    if (!this.importClauses.has(importClause)) {
-      this.importClauses.add(importClause);
-      importClause.setImporter(this);
-    }
-  }
-
-
-  public getJSON(): string {
-    const mse: FamixJSONExporter = new FamixJSONExporter("Module", this);
-    this.addPropertiesToExporter(mse);
-    return mse.getJSON();
-  }
-
-  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
-    super.addPropertiesToExporter(exporter);
-    exporter.addProperty("importClauses", this.getImportClauses());
-  }
-}
+import { FamixJSONExporter } from "../../famix_JSON_exporter";
+import { ScriptEntity } from "./script_entity";
+import { ImportClause } from "./import_clause";
+
+export class Module extends ScriptEntity {
+
+  // incomingImports are in NamedEntity
+  private outgoingImports: Set<ImportClause> = new Set();
+  
+  getOutgoingImports() {
+    return this.outgoingImports;
+  }
+
+  addOutgoingImport(importClause: ImportClause) {
+    if (!this.outgoingImports.has(importClause)) {
+      this.outgoingImports.add(importClause);
+      importClause.setImportingEntity(this);  // opposite
+    }
+  }
+
+  public getJSON(): string {
+    const mse: FamixJSONExporter = new FamixJSONExporter("Module", this);
+    this.addPropertiesToExporter(mse);
+    return mse.getJSON();
+  }
+
+  public addPropertiesToExporter(exporter: FamixJSONExporter): void {
+    super.addPropertiesToExporter(exporter);
+    exporter.addProperty("outgoingImports", this.getOutgoingImports());
+  }
+}