From eb24465e775287fd02c2d7a849b59a88d60f7831 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Fri, 21 Oct 2016 10:45:46 +0100 Subject: [PATCH] Move gateway in a subfolder --- .../diagram-exclusive-gateway.component.html | 0 .../diagram-exclusive-gateway.component.ts | 4 +-- .../src/components/diagrams/gateway/index.ts | 25 +++++++++++++++++++ .../src/components/diagrams/index.ts | 6 ++--- 4 files changed, 30 insertions(+), 5 deletions(-) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{ => gateway}/diagram-exclusive-gateway.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{ => gateway}/diagram-exclusive-gateway.component.ts (92%) create mode 100644 ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/index.ts diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-exclusive-gateway.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-exclusive-gateway.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-exclusive-gateway.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.ts similarity index 92% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-exclusive-gateway.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.ts index 9c28359fb0..d1617c855d 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-exclusive-gateway.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.ts @@ -16,7 +16,7 @@ */ import { Component, ElementRef, Input, Output, EventEmitter } from '@angular/core'; -import { DiagramColorService } from './services/diagram-color.service'; +import { DiagramColorService } from './../services/diagram-color.service'; @Component({ moduleId: module.id, @@ -24,7 +24,7 @@ import { DiagramColorService } from './services/diagram-color.service'; templateUrl: './diagram-exclusive-gateway.component.html', styleUrls: ['./diagram-exclusive-gateway.component.css'] }) -export class DiagramExclusiveGatwayComponent { +export class DiagramExclusiveGatewayComponent { @Input() data: any; diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/index.ts new file mode 100644 index 0000000000..d61a45b52d --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/index.ts @@ -0,0 +1,25 @@ +/*! + * @license + * Copyright 2016 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { DiagramExclusiveGatewayComponent } from './diagram-exclusive-gateway.component'; + +// primitives +export * from './diagram-exclusive-gateway.component'; + +export const DIAGRAM_GATEWAY_DIRECTIVES: any[] = [ + DiagramExclusiveGatewayComponent +]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/index.ts index 07aedfa9bb..9a7f63afba 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/index.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/index.ts @@ -19,7 +19,8 @@ import { DiagramComponent } from './diagram.component'; import { DiagramEventComponent } from './diagram-event.component'; import { DiagramTaskComponent } from './diagram-task.component'; import { DiagramSequenceFlowComponent } from './diagram-sequence-flow.component'; -import { DiagramExclusiveGatwayComponent } from './diagram-exclusive-gateway.component'; + +import { DIAGRAM_GATEWAY_DIRECTIVES } from './gateway/index'; import { DiagramColorService } from './services/diagram-color.service'; @@ -28,14 +29,13 @@ export * from './diagram.component'; export * from './diagram-event.component'; export * from './diagram-task.component'; export * from './diagram-sequence-flow.component'; -export * from './diagram-exclusive-gateway.component'; export const DIAGRAM_DIRECTIVES: any[] = [ DiagramComponent, DiagramEventComponent, DiagramTaskComponent, DiagramSequenceFlowComponent, - DiagramExclusiveGatwayComponent + DIAGRAM_GATEWAY_DIRECTIVES ]; export const DIAGRAM_PROVIDERS: any[] = [