From 0f3c0b425a1c682958d4206422e29184a16b0a61 Mon Sep 17 00:00:00 2001 From: mauriziovitale84 Date: Fri, 21 Oct 2016 15:25:16 +0100 Subject: [PATCH] Refactoring of directories --- .../diagram-task.component.html | 0 .../diagram-task.component.ts | 2 +- .../components/diagrams/activities/index.ts | 25 +++++++++++++++++++ .../{ => events}/diagram-event.component.html | 0 .../{ => events}/diagram-event.component.ts | 2 +- .../src/components/diagrams/events/index.ts | 25 +++++++++++++++++++ .../diagram-event-gateway.component.html | 0 .../diagram-event-gateway.component.ts | 0 .../diagram-exclusive-gateway.component.html | 0 .../diagram-exclusive-gateway.component.ts | 0 .../diagram-gateway.component.html | 0 .../diagram-gateway.component.ts | 0 .../diagram-inclusive-gateway.component.html | 0 .../diagram-inclusive-gateway.component.ts | 0 .../diagram-parallel-gateway.component.html | 0 .../diagram-parallel-gateway.component.ts | 0 .../diagrams/{gateway => gateways}/index.ts | 0 .../src/components/diagrams/index.ts | 15 ++++++----- 18 files changed, 59 insertions(+), 10 deletions(-) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{ => activities}/diagram-task.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{ => activities}/diagram-task.component.ts (96%) create mode 100644 ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{ => events}/diagram-event.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{ => events}/diagram-event.component.ts (96%) create mode 100644 ng2-components/ng2-activiti-analytics/src/components/diagrams/events/index.ts rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-event-gateway.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-event-gateway.component.ts (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-exclusive-gateway.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-exclusive-gateway.component.ts (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-gateway.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-gateway.component.ts (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-inclusive-gateway.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-inclusive-gateway.component.ts (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-parallel-gateway.component.html (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/diagram-parallel-gateway.component.ts (100%) rename ng2-components/ng2-activiti-analytics/src/components/diagrams/{gateway => gateways}/index.ts (100%) diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-task.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-task.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-task.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-task.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-task.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-task.component.ts similarity index 96% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-task.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-task.component.ts index 1efa86f934..ca76d87bb4 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-task.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/diagram-task.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, diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/index.ts new file mode 100644 index 0000000000..f0b19030d8 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/activities/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 { DiagramTaskComponent } from './diagram-task.component'; + +// primitives +export * from './diagram-task.component'; + +export const DIAGRAM_ACTIVITIES_DIRECTIVES: any[] = [ + DiagramTaskComponent +]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-event.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/events/diagram-event.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-event.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/events/diagram-event.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-event.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/events/diagram-event.component.ts similarity index 96% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-event.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/events/diagram-event.component.ts index a13e637db7..f588272b0f 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/diagram-event.component.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/events/diagram-event.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, diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/events/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/events/index.ts new file mode 100644 index 0000000000..b879aad332 --- /dev/null +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/events/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 { DiagramEventComponent } from './diagram-event.component'; + +// primitives +export * from './diagram-event.component'; + +export const DIAGRAM_EVENTS_DIRECTIVES: any[] = [ + DiagramEventComponent +]; diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-event-gateway.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-event-gateway.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-event-gateway.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-event-gateway.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-event-gateway.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-event-gateway.component.ts similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-event-gateway.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-event-gateway.component.ts diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-exclusive-gateway.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-exclusive-gateway.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-exclusive-gateway.component.ts similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-exclusive-gateway.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-exclusive-gateway.component.ts diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-gateway.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-gateway.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-gateway.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-gateway.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-gateway.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-gateway.component.ts similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-gateway.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-gateway.component.ts diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-inclusive-gateway.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-inclusive-gateway.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-inclusive-gateway.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-inclusive-gateway.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-inclusive-gateway.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-inclusive-gateway.component.ts similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-inclusive-gateway.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-inclusive-gateway.component.ts diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-parallel-gateway.component.html b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-parallel-gateway.component.html similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-parallel-gateway.component.html rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-parallel-gateway.component.html diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-parallel-gateway.component.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-parallel-gateway.component.ts similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/diagram-parallel-gateway.component.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/diagram-parallel-gateway.component.ts diff --git a/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/index.ts b/ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/index.ts similarity index 100% rename from ng2-components/ng2-activiti-analytics/src/components/diagrams/gateway/index.ts rename to ng2-components/ng2-activiti-analytics/src/components/diagrams/gateways/index.ts 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 9a7f63afba..5b4c7716c8 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/diagrams/index.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/diagrams/index.ts @@ -16,24 +16,23 @@ */ 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 { DIAGRAM_GATEWAY_DIRECTIVES } from './gateway/index'; +import { DIAGRAM_ACTIVITIES_DIRECTIVES } from './activities/index'; +import { DIAGRAM_EVENTS_DIRECTIVES } from './events/index'; +import { DIAGRAM_GATEWAY_DIRECTIVES } from './gateways/index'; import { DiagramColorService } from './services/diagram-color.service'; // primitives export * from './diagram.component'; -export * from './diagram-event.component'; -export * from './diagram-task.component'; +export * from './events/index'; +export * from './activities/index'; export * from './diagram-sequence-flow.component'; export const DIAGRAM_DIRECTIVES: any[] = [ DiagramComponent, - DiagramEventComponent, - DiagramTaskComponent, + DIAGRAM_EVENTS_DIRECTIVES, + DIAGRAM_ACTIVITIES_DIRECTIVES, DiagramSequenceFlowComponent, DIAGRAM_GATEWAY_DIRECTIVES ];