6 files changed, 45 insertions, 60 deletions
diff --git a/sdc-workflow-designer-ui/src/app/model/workflow/plan-model.ts b/sdc-workflow-designer-ui/src/app/model/plan-model.ts
index 764bae71..055bc924 100644
--- a/sdc-workflow-designer-ui/src/app/model/workflow/plan-model.ts
+++ b/sdc-workflow-designer-ui/src/app/model/plan-model.ts
@@ -9,14 +9,8 @@
  * Contributors:
  *     ZTE - initial API and implementation and/or initial documentation
  */
+import { WorkflowNode } from './workflow/workflow-node';
 
-import { Injectable } from '@angular/core';
-import { WorkflowNode } from "./workflow-node";
-import { Configs } from "./configs";
-
-/**
- * PlanModel
- */
 export class PlanModel {
     public nodes: WorkflowNode[] = [];
     public configs: any = {};
diff --git a/sdc-workflow-designer-ui/src/app/model/plan-treeview-item.ts b/sdc-workflow-designer-ui/src/app/model/plan-treeview-item.ts
index a1d98500..aa3f81b5 100644
--- a/sdc-workflow-designer-ui/src/app/model/plan-treeview-item.ts
+++ b/sdc-workflow-designer-ui/src/app/model/plan-treeview-item.ts
@@ -14,6 +14,6 @@ export class PlanTreeviewItem {
     constructor(public name: string,
                 public value: string,
                 public children: PlanTreeviewItem[],
-                public canSelect?: boolean) {
+                public canSelect = true) {
     }
 }
diff --git a/sdc-workflow-designer-ui/src/app/model/workflow/microservice.ts b/sdc-workflow-designer-ui/src/app/model/swagger-setting.ts
index c0cb2586..41e30fd1 100644
--- a/sdc-workflow-designer-ui/src/app/model/workflow/microservice.ts
+++ b/sdc-workflow-designer-ui/src/app/model/swagger-setting.ts
@@ -1,21 +1,18 @@
-/**
- * Copyright (c) 2017 ZTE Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *     ZTE - initial API and implementation and/or initial documentation
- */
-
-import { Injectable } from '@angular/core';
-import { Swagger } from "../swagger";
-
-/**
- * Microservice
- */
-export class Microservice {
-    constructor(public name: string, public version: string, public swaggerJson: string, public definition: string) {}
-}
+/**
+ * Copyright (c) 2017 ZTE Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and the Apache License 2.0 which both accompany this distribution,
+ * and are available at http://www.eclipse.org/legal/epl-v10.html
+ * and http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Contributors:
+ *     ZTE - initial API and implementation and/or initial documentation
+ */
+import { Swagger } from './swagger';
+
+export class SwaggerSetting {
+    constructor(public name: string, public version: string, public url: string, public path: string,
+        public swagger?: Swagger) {
+    }
+}
diff --git a/sdc-workflow-designer-ui/src/app/model/workflow/configs.ts b/sdc-workflow-designer-ui/src/app/model/workflow/exclusive-gateway.ts
index 9a5a08f2..6db7bcfd 100644
--- a/sdc-workflow-designer-ui/src/app/model/workflow/configs.ts
+++ b/sdc-workflow-designer-ui/src/app/model/workflow/exclusive-gateway.ts
@@ -1,21 +1,15 @@
-/**
- * Copyright (c) 2017 ZTE Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
- * and http://www.apache.org/licenses/LICENSE-2.0
- *
- * Contributors:
- *     ZTE - initial API and implementation and/or initial documentation
- */
-
-import { Injectable } from '@angular/core';
-import { Microservice } from "./microservice";
-
-/**
- * Configs
- */
-export class Configs {
-    constructor(public microservices:Microservice[]) {}
-}
+/**
+ * Copyright (c) 2017 ZTE Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and the Apache License 2.0 which both accompany this distribution,
+ * and are available at http://www.eclipse.org/legal/epl-v10.html
+ * and http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Contributors:
+ *     ZTE - initial API and implementation and/or initial documentation
+ */
+import {WorkflowNode} from './workflow-node';
+
+export interface ExclusiveGateway extends WorkflowNode {
+}
diff --git a/sdc-workflow-designer-ui/src/app/model/workflow/position.ts b/sdc-workflow-designer-ui/src/app/model/workflow/position.ts
index 7f3fe6fb..7593b70d 100644
--- a/sdc-workflow-designer-ui/src/app/model/workflow/position.ts
+++ b/sdc-workflow-designer-ui/src/app/model/workflow/position.ts
@@ -10,12 +10,6 @@
  *     ZTE - initial API and implementation and/or initial documentation
  */
 
-import { Injectable } from '@angular/core';
-
-/**
- * Position
- * Workflow node position
- */
 export class Position {
-    constructor(public top: number, public left: number, public width: number = 200, public height: number = 100) { }
+    constructor(public left: number, public top: number, public width = 56, public height = 56) { }
 }
diff --git a/sdc-workflow-designer-ui/src/app/model/workflow/sequence-flow.ts b/sdc-workflow-designer-ui/src/app/model/workflow/sequence-flow.ts
index 492cc84d..53c09a31 100644
--- a/sdc-workflow-designer-ui/src/app/model/workflow/sequence-flow.ts
+++ b/sdc-workflow-designer-ui/src/app/model/workflow/sequence-flow.ts
@@ -9,8 +9,14 @@
  * Contributors:
  *     ZTE - initial API and implementation and/or initial documentation
  */
+import { WorkflowElement } from './workflow-element';
+import { Position } from './position';
 
-export class SequenceFlow {
-
-    constructor(public sourceRef: string, public targetRef: string, public name?: string, public condition?:string) { }
+export interface SequenceFlow extends WorkflowElement {
+    sourceRef: string;
+    // sourcePosition: Position;
+    targetRef: string;
+    // targetPosition: Position;
+    name?: string;
+    condition?: string;
 }