diff --git a/e2e/helpers/common.po.ts b/e2e/helpers/common.po.ts index 5d06c069..e40e30be 100644 --- a/e2e/helpers/common.po.ts +++ b/e2e/helpers/common.po.ts @@ -1,5 +1,4 @@ -import { browser, by, element } from 'protractor'; -import { ServersPage } from './server.po'; +import { browser } from 'protractor'; export class TestHelper { sleep(value: number) { diff --git a/e2e/helpers/project-map.po.ts b/e2e/helpers/project-map.po.ts index d2df6967..3e5c9e06 100644 --- a/e2e/helpers/project-map.po.ts +++ b/e2e/helpers/project-map.po.ts @@ -1,5 +1,5 @@ -import { TestHelper } from './common.po'; import { browser, by } from 'protractor'; +import { TestHelper } from './common.po'; export class ProjectMapPage { helper = new TestHelper(); diff --git a/e2e/helpers/project.po.ts b/e2e/helpers/project.po.ts index 0afcc74e..5288d917 100644 --- a/e2e/helpers/project.po.ts +++ b/e2e/helpers/project.po.ts @@ -1,5 +1,5 @@ -import { TestHelper } from './common.po'; import { browser, by } from 'protractor'; +import { TestHelper } from './common.po'; export class ProjectsPage { helper = new TestHelper(); diff --git a/e2e/helpers/server.po.ts b/e2e/helpers/server.po.ts index eec3956c..90250c7e 100644 --- a/e2e/helpers/server.po.ts +++ b/e2e/helpers/server.po.ts @@ -1,4 +1,4 @@ -import { browser, by, element } from 'protractor'; +import { browser, by } from 'protractor'; import { TestHelper } from './common.po'; export class ServersPage { diff --git a/e2e/project-map.e2e-spec.ts b/e2e/project-map.e2e-spec.ts index d489b1d5..8986d97a 100644 --- a/e2e/project-map.e2e-spec.ts +++ b/e2e/project-map.e2e-spec.ts @@ -1,8 +1,7 @@ -import { ServersPage } from './helpers/server.po'; import { TestHelper } from './helpers/common.po'; -import { element } from 'protractor'; -import { ProjectsPage } from './helpers/project.po'; import { ProjectMapPage } from './helpers/project-map.po'; +import { ProjectsPage } from './helpers/project.po'; +import { ServersPage } from './helpers/server.po'; describe('Project map page', () => { let serversPage: ServersPage; diff --git a/e2e/projects.e2e-spec.ts b/e2e/projects.e2e-spec.ts index 0333b065..01df6aee 100644 --- a/e2e/projects.e2e-spec.ts +++ b/e2e/projects.e2e-spec.ts @@ -1,7 +1,6 @@ -import { ServersPage } from './helpers/server.po'; import { TestHelper } from './helpers/common.po'; -import { element } from 'protractor'; import { ProjectsPage } from './helpers/project.po'; +import { ServersPage } from './helpers/server.po'; describe('Projects page', () => { let serversPage: ServersPage; diff --git a/e2e/servers.e2e-spec.ts b/e2e/servers.e2e-spec.ts index be7f65c9..45da0436 100644 --- a/e2e/servers.e2e-spec.ts +++ b/e2e/servers.e2e-spec.ts @@ -1,6 +1,5 @@ -import { ServersPage } from './helpers/server.po'; import { TestHelper } from './helpers/common.po'; -import { element } from 'protractor'; +import { ServersPage } from './helpers/server.po'; describe('Servers page', () => { let page: ServersPage; diff --git a/package.json b/package.json index edbc409b..4a9cf05b 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "node-fetch": "^2.6.1", "notosans-fontface": "1.2.2", "office-ui-fabric-react": "^7.166.0", + "prettier-plugin-organize-imports": "^1.1.1", "react": "^17.0.2", "react-bootstrap": "^1.5.2", "react-dom": "^17.0.2", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 46959a94..2e95bbec 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,70 +1,59 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - -import { ProjectMapComponent } from './components/project-map/project-map.component'; -import { ServersComponent } from './components/servers/servers.component'; -import { ProjectsComponent } from './components/projects/projects.component'; -import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; -import { SettingsComponent } from './components/settings/settings.component'; import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component'; -import { PreferencesComponent } from './components/preferences/preferences.component'; -import { QemuPreferencesComponent } from './components/preferences/qemu/qemu-preferences/qemu-preferences.component'; -import { QemuVmTemplatesComponent } from './components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component'; -import { QemuVmTemplateDetailsComponent } from './components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component'; -import { AddQemuVmTemplateComponent } from './components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component'; -import { GeneralPreferencesComponent } from './components/preferences/general/general-preferences.component'; -import { VpcsPreferencesComponent } from './components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component'; -import { VpcsTemplatesComponent } from './components/preferences/vpcs/vpcs-templates/vpcs-templates.component'; -import { AddVpcsTemplateComponent } from './components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component'; -import { VpcsTemplateDetailsComponent } from './components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component'; -import { VirtualBoxPreferencesComponent } from './components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component'; -import { VirtualBoxTemplatesComponent } from './components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component'; -import { VirtualBoxTemplateDetailsComponent } from './components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component'; -import { AddVirtualBoxTemplateComponent } from './components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component'; +import { DirectLinkComponent } from './components/direct-link/direct-link.component'; +import { HelpComponent } from './components/help/help.component'; +import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; +import { InstalledSoftwareComponent } from './components/installed-software/installed-software.component'; +import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component'; import { BuiltInPreferencesComponent } from './components/preferences/built-in/built-in-preferences.component'; -import { EthernetHubsTemplatesComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component'; -import { EthernetHubsAddTemplateComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component'; -import { EthernetHubsTemplateDetailsComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component'; -import { CloudNodesTemplatesComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component'; import { CloudNodesAddTemplateComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component'; import { CloudNodesTemplateDetailsComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component'; -import { EthernetSwitchesTemplatesComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component'; +import { CloudNodesTemplatesComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component'; +import { EthernetHubsAddTemplateComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component'; +import { EthernetHubsTemplateDetailsComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component'; +import { EthernetHubsTemplatesComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component'; import { EthernetSwitchesAddTemplateComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component'; import { EthernetSwitchesTemplateDetailsComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component'; -import { DynamipsPreferencesComponent } from './components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component'; -import { IosTemplatesComponent } from './components/preferences/dynamips/ios-templates/ios-templates.component'; -import { InstalledSoftwareComponent } from './components/installed-software/installed-software.component'; -import { IosTemplateDetailsComponent } from './components/preferences/dynamips/ios-template-details/ios-template-details.component'; -import { AddIosTemplateComponent } from './components/preferences/dynamips/add-ios-template/add-ios-template.component'; -import { VmwarePreferencesComponent } from './components/preferences/vmware/vmware-preferences/vmware-preferences.component'; -import { VmwareTemplatesComponent } from './components/preferences/vmware/vmware-templates/vmware-templates.component'; -import { VmwareTemplateDetailsComponent } from './components/preferences/vmware/vmware-template-details/vmware-template-details.component'; -import { AddVmwareTemplateComponent } from './components/preferences/vmware/add-vmware-template/add-vmware-template.component'; -import { DockerTemplatesComponent } from './components/preferences/docker/docker-templates/docker-templates.component'; +import { EthernetSwitchesTemplatesComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component'; import { AddDockerTemplateComponent } from './components/preferences/docker/add-docker-template/add-docker-template.component'; -import { DockerTemplateDetailsComponent } from './components/preferences/docker/docker-template-details/docker-template-details.component'; -import { IouTemplatesComponent } from './components/preferences/ios-on-unix/iou-templates/iou-templates.component'; -import { AddIouTemplateComponent } from './components/preferences/ios-on-unix/add-iou-template/add-iou-template.component'; -import { IouTemplateDetailsComponent } from './components/preferences/ios-on-unix/iou-template-details/iou-template-details.component'; -import { CopyQemuVmTemplateComponent } from './components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component'; -import { CopyIosTemplateComponent } from './components/preferences/dynamips/copy-ios-template/copy-ios-template.component'; import { CopyDockerTemplateComponent } from './components/preferences/docker/copy-docker-template/copy-docker-template.component'; -import { CopyIouTemplateComponent } from './components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component'; -import { ListOfSnapshotsComponent } from './components/snapshots/list-of-snapshots/list-of-snapshots.component'; -import { ConsoleComponent } from './components/settings/console/console.component'; -import { HelpComponent } from './components/help/help.component'; -import { TracengPreferencesComponent } from './components/preferences/traceng/traceng-preferences/traceng-preferences.component'; -import { TracengTemplatesComponent } from './components/preferences/traceng/traceng-templates/traceng-templates.component'; -import { AddTracengTemplateComponent } from './components/preferences/traceng/add-traceng/add-traceng-template.component'; -import { TracengTemplateDetailsComponent } from './components/preferences/traceng/traceng-template-details/traceng-template-details.component'; -import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component'; +import { DockerTemplateDetailsComponent } from './components/preferences/docker/docker-template-details/docker-template-details.component'; +import { DockerTemplatesComponent } from './components/preferences/docker/docker-templates/docker-templates.component'; +import { AddIosTemplateComponent } from './components/preferences/dynamips/add-ios-template/add-ios-template.component'; +import { CopyIosTemplateComponent } from './components/preferences/dynamips/copy-ios-template/copy-ios-template.component'; +import { IosTemplateDetailsComponent } from './components/preferences/dynamips/ios-template-details/ios-template-details.component'; +import { IosTemplatesComponent } from './components/preferences/dynamips/ios-templates/ios-templates.component'; import { Gns3vmComponent } from './components/preferences/gns3vm/gns3vm.component'; -import { DirectLinkComponent } from './components/direct-link/direct-link.component'; +import { AddIouTemplateComponent } from './components/preferences/ios-on-unix/add-iou-template/add-iou-template.component'; +import { CopyIouTemplateComponent } from './components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component'; +import { IouTemplateDetailsComponent } from './components/preferences/ios-on-unix/iou-template-details/iou-template-details.component'; +import { IouTemplatesComponent } from './components/preferences/ios-on-unix/iou-templates/iou-templates.component'; +import { PreferencesComponent } from './components/preferences/preferences.component'; +import { AddQemuVmTemplateComponent } from './components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component'; +import { CopyQemuVmTemplateComponent } from './components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component'; +import { QemuVmTemplateDetailsComponent } from './components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component'; +import { QemuVmTemplatesComponent } from './components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component'; +import { AddVirtualBoxTemplateComponent } from './components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component'; +import { VirtualBoxTemplateDetailsComponent } from './components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component'; +import { VirtualBoxTemplatesComponent } from './components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component'; +import { AddVmwareTemplateComponent } from './components/preferences/vmware/add-vmware-template/add-vmware-template.component'; +import { VmwareTemplateDetailsComponent } from './components/preferences/vmware/vmware-template-details/vmware-template-details.component'; +import { VmwareTemplatesComponent } from './components/preferences/vmware/vmware-templates/vmware-templates.component'; +import { AddVpcsTemplateComponent } from './components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component'; +import { VpcsTemplateDetailsComponent } from './components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component'; +import { VpcsTemplatesComponent } from './components/preferences/vpcs/vpcs-templates/vpcs-templates.component'; +import { ProjectMapComponent } from './components/project-map/project-map.component'; +import { ProjectsComponent } from './components/projects/projects.component'; +import { ServersComponent } from './components/servers/servers.component'; +import { ConsoleComponent } from './components/settings/console/console.component'; +import { SettingsComponent } from './components/settings/settings.component'; +import { ListOfSnapshotsComponent } from './components/snapshots/list-of-snapshots/list-of-snapshots.component'; import { SystemStatusComponent } from './components/system-status/system-status.component'; -import { ServerResolve } from './resolvers/server-resolve'; import { WebConsoleFullWindowComponent } from './components/web-console-full-window/web-console-full-window.component'; import { ConsoleGuard } from './guards/console-guard'; -import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; +import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; +import { ServerResolve } from './resolvers/server-resolve'; const routes: Routes = [ { diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 00903884..388f4ac6 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,14 +1,14 @@ -import { TestBed, async, ComponentFixture } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; - -import { AppComponent } from './app.component'; +import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatIconModule } from '@angular/material/icon'; -import { SettingsService } from './services/settings.service'; +import { RouterTestingModule } from '@angular/router/testing'; import { PersistenceService } from 'angular-persistence'; import { ElectronService, NgxElectronModule } from 'ngx-electron'; -import createSpyObj = jasmine.createSpyObj; -import { NO_ERRORS_SCHEMA } from '@angular/core'; +import { AppComponent } from './app.component'; import { ProgressService } from './common/progress/progress.service'; +import { SettingsService } from './services/settings.service'; + +import createSpyObj = jasmine.createSpyObj; // import 'jasmine'; describe('AppComponent', () => { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8d89c006..e9e5233a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,12 +1,12 @@ +import { OverlayContainer } from '@angular/cdk/overlay'; import { Component, HostBinding, OnInit } from '@angular/core'; import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer } from '@angular/platform-browser'; +import { NavigationCancel, NavigationEnd, NavigationError, NavigationStart, Router } from '@angular/router'; import { ElectronService } from 'ngx-electron'; +import { ProgressService } from './common/progress/progress.service'; import { SettingsService } from './services/settings.service'; import { ThemeService } from './services/theme.service'; -import { Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router'; -import { ProgressService } from './common/progress/progress.service'; -import { OverlayContainer } from '@angular/cdk/overlay'; @Component({ selector: 'app-root', diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a05a1878..85d3d09f 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,289 +1,277 @@ -import { BrowserModule, Title } from '@angular/platform-browser'; -import { NgModule, ErrorHandler } from '@angular/core'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { AngularReactBrowserModule } from '@angular-react/core'; +import { DragDropModule } from '@angular/cdk/drag-drop'; +import { OverlayModule } from '@angular/cdk/overlay'; import { CdkTableModule } from '@angular/cdk/table'; import { HttpClientModule } from '@angular/common/http'; - +import { ErrorHandler, NgModule } from '@angular/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { BrowserModule, Title } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; - -import { D3Service } from 'd3-ng2-service'; +import { DragAndDropModule } from 'angular-draggable-droppable'; import { PersistenceModule } from 'angular-persistence'; -import { NgxElectronModule } from 'ngx-electron'; +import { ResizableModule } from 'angular-resizable-element'; +import { D3Service } from 'd3-ng2-service'; +import { NgCircleProgressModule } from 'ng-circle-progress'; import { FileUploadModule } from 'ng2-file-upload'; +import { NgxChildProcessModule } from 'ngx-childprocess'; +import { NgxElectronModule } from 'ngx-electron'; import { AppRoutingModule } from './app-routing.module'; - -import { VersionService } from './services/version.service'; -import { ProjectService } from './services/project.service'; -import { SymbolService } from './services/symbol.service'; -import { ServerService } from './services/server.service'; -import { IndexedDbService } from './services/indexed-db.service'; -import { HttpServer, ServerErrorHandler } from './services/http-server.service'; -import { SnapshotService } from './services/snapshot.service'; -import { ProgressDialogService } from './common/progress-dialog/progress-dialog.service'; -import { NodeService } from './services/node.service'; -import { TemplateService } from './services/template.service'; -import { LinkService } from './services/link.service'; - -import { ProjectsComponent } from './components/projects/projects.component'; -import { AddBlankProjectDialogComponent } from './components/projects/add-blank-project-dialog/add-blank-project-dialog.component'; -import { ImportProjectDialogComponent } from './components/projects/import-project-dialog/import-project-dialog.component'; -import { ConfirmationDialogComponent } from './components/projects/confirmation-dialog/confirmation-dialog.component'; -import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; -import { ProgressDialogComponent } from './common/progress-dialog/progress-dialog.component'; import { AppComponent } from './app.component'; - -import { ProjectMapComponent } from './components/project-map/project-map.component'; -import { ServersComponent } from './components/servers/servers.component'; -import { AddServerDialogComponent } from './components/servers/add-server-dialog/add-server-dialog.component'; -import { ContextMenuComponent } from './components/project-map/context-menu/context-menu.component'; -import { ContextConsoleMenuComponent } from './components/project-map/context-console-menu/context-console-menu.component'; -import { StartNodeActionComponent } from './components/project-map/context-menu/actions/start-node-action/start-node-action.component'; -import { StopNodeActionComponent } from './components/project-map/context-menu/actions/stop-node-action/stop-node-action.component'; -import { TemplateComponent } from './components/template/template.component'; -import { TemplateListDialogComponent } from './components/template/template-list-dialog/template-list-dialog.component'; import { CartographyModule } from './cartography/cartography.module'; -import { ToasterService } from './services/toaster.service'; -import { ProjectWebServiceHandler } from './handlers/project-web-service-handler'; +import { DrawingsDataSource } from './cartography/datasources/drawings-datasource'; import { LinksDataSource } from './cartography/datasources/links-datasource'; import { NodesDataSource } from './cartography/datasources/nodes-datasource'; import { SymbolsDataSource } from './cartography/datasources/symbols-datasource'; -import { SelectionManager } from './cartography/managers/selection-manager'; import { InRectangleHelper } from './cartography/helpers/in-rectangle-helper'; -import { DrawingsDataSource } from './cartography/datasources/drawings-datasource'; -import { EditStyleActionComponent } from './components/project-map/context-menu/actions/edit-style-action/edit-style-action.component'; -import { MoveLayerDownActionComponent } from './components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component'; -import { MoveLayerUpActionComponent } from './components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component'; -import { SettingsComponent } from './components/settings/settings.component'; -import { SettingsService } from './services/settings.service'; - -import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component'; +import { SelectionManager } from './cartography/managers/selection-manager'; +import { ToasterErrorHandler } from './common/error-handlers/toaster-error-handler'; +import { ProgressDialogComponent } from './common/progress-dialog/progress-dialog.component'; +import { ProgressDialogService } from './common/progress-dialog/progress-dialog.service'; import { ProgressComponent } from './common/progress/progress.component'; import { ProgressService } from './common/progress/progress.service'; -import { version } from './version'; -import { ToasterErrorHandler } from './common/error-handlers/toaster-error-handler'; -import { environment } from '../environments/environment'; -import { ServerDiscoveryComponent } from './components/servers/server-discovery/server-discovery.component'; -import { ServerDatabase } from './services/server.database'; -import { CreateSnapshotDialogComponent } from './components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component'; -import { SnapshotMenuItemComponent } from './components/snapshots/snapshot-menu-item/snapshot-menu-item.component'; -import { MATERIAL_IMPORTS } from './material.imports'; -import { DrawingService } from './services/drawing.service'; -import { ProjectNameValidator } from './components/projects/models/projectNameValidator'; -import { MatSidenavModule } from '@angular/material/sidenav'; -import { NodeSelectInterfaceComponent } from './components/project-map/node-select-interface/node-select-interface.component'; -import { DrawLinkToolComponent } from './components/project-map/draw-link-tool/draw-link-tool.component'; - -import { InstalledSoftwareComponent } from './components/installed-software/installed-software.component'; +import { AdbutlerComponent } from './components/adbutler/adbutler.component'; +import { BundledServerFinderComponent } from './components/bundled-server-finder/bundled-server-finder.component'; +import { InformationDialogComponent } from './components/dialogs/information-dialog.component'; +import { DirectLinkComponent } from './components/direct-link/direct-link.component'; +import { DrawingAddedComponent } from './components/drawings-listeners/drawing-added/drawing-added.component'; +import { DrawingDraggedComponent } from './components/drawings-listeners/drawing-dragged/drawing-dragged.component'; import { DrawingResizedComponent } from './components/drawings-listeners/drawing-resized/drawing-resized.component'; -import { TextEditedComponent } from './components/drawings-listeners/text-edited/text-edited.component'; +import { InterfaceLabelDraggedComponent } from './components/drawings-listeners/interface-label-dragged/interface-label-dragged.component'; +import { LinkCreatedComponent } from './components/drawings-listeners/link-created/link-created.component'; import { NodeDraggedComponent } from './components/drawings-listeners/node-dragged/node-dragged.component'; import { NodeLabelDraggedComponent } from './components/drawings-listeners/node-label-dragged/node-label-dragged.component'; -import { DrawingDraggedComponent } from './components/drawings-listeners/drawing-dragged/drawing-dragged.component'; -import { LinkCreatedComponent } from './components/drawings-listeners/link-created/link-created.component'; -import { InterfaceLabelDraggedComponent } from './components/drawings-listeners/interface-label-dragged/interface-label-dragged.component'; -import { ToolsService } from './services/tools.service'; import { TextAddedComponent } from './components/drawings-listeners/text-added/text-added.component'; -import { DrawingAddedComponent } from './components/drawings-listeners/drawing-added/drawing-added.component'; +import { TextEditedComponent } from './components/drawings-listeners/text-edited/text-edited.component'; +import { HelpComponent } from './components/help/help.component'; +import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; import { InstallSoftwareComponent } from './components/installed-software/install-software/install-software.component'; - -import { StyleEditorDialogComponent } from './components/project-map/drawings-editors/style-editor/style-editor.component'; -import { EditTextActionComponent } from './components/project-map/context-menu/actions/edit-text-action/edit-text-action.component'; -import { TextEditorDialogComponent } from './components/project-map/drawings-editors/text-editor/text-editor.component'; -import { PreferencesComponent } from './components/preferences/preferences.component'; -import { QemuPreferencesComponent } from './components/preferences/qemu/qemu-preferences/qemu-preferences.component'; -import { ServerSettingsService } from './services/server-settings.service'; -import { QemuVmTemplatesComponent } from './components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component'; -import { AddQemuVmTemplateComponent } from './components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component'; -import { QemuVmTemplateDetailsComponent } from './components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component'; -import { QemuService } from './services/qemu.service'; -import { GeneralPreferencesComponent } from './components/preferences/general/general-preferences.component'; -import { VpcsPreferencesComponent } from './components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component'; -import { VpcsTemplatesComponent } from './components/preferences/vpcs/vpcs-templates/vpcs-templates.component'; -import { VpcsService } from './services/vpcs.service'; -import { AddVpcsTemplateComponent } from './components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component'; -import { VpcsTemplateDetailsComponent } from './components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component'; -import { TemplateMocksService } from './services/template-mocks.service'; -import { VirtualBoxPreferencesComponent } from './components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component'; -import { VirtualBoxTemplatesComponent } from './components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component'; -import { VirtualBoxService } from './services/virtual-box.service'; -import { VirtualBoxTemplateDetailsComponent } from './components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component'; -import { AddVirtualBoxTemplateComponent } from './components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component'; +import { InstalledSoftwareComponent } from './components/installed-software/installed-software.component'; +import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component'; import { BuiltInPreferencesComponent } from './components/preferences/built-in/built-in-preferences.component'; -import { EthernetHubsTemplatesComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component'; -import { BuiltInTemplatesService } from './services/built-in-templates.service'; -import { EthernetHubsAddTemplateComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component'; -import { EthernetHubsTemplateDetailsComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component'; -import { CloudNodesTemplatesComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component'; import { CloudNodesAddTemplateComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-add-template/cloud-nodes-add-template.component'; import { CloudNodesTemplateDetailsComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-template-details/cloud-nodes-template-details.component'; -import { EthernetSwitchesTemplatesComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component'; +import { CloudNodesTemplatesComponent } from './components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component'; +import { EthernetHubsAddTemplateComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-add-template/ethernet-hubs-add-template.component'; +import { EthernetHubsTemplateDetailsComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-template-details/ethernet-hubs-template-details.component'; +import { EthernetHubsTemplatesComponent } from './components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component'; import { EthernetSwitchesAddTemplateComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-add-template/ethernet-switches-add-template.component'; import { EthernetSwitchesTemplateDetailsComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-template-details/ethernet-switches-template-details.component'; -import { DynamipsPreferencesComponent } from './components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component'; -import { IosTemplatesComponent } from './components/preferences/dynamips/ios-templates/ios-templates.component'; -import { IosService } from './services/ios.service'; -import { SymbolsComponent } from './components/preferences/common/symbols/symbols.component'; -import { InstalledSoftwareService } from './services/installed-software.service'; -import { ExternalSoftwareDefinitionService } from './services/external-software-definition.service'; -import { PlatformService } from './services/platform.service'; -import { IosTemplateDetailsComponent } from './components/preferences/dynamips/ios-template-details/ios-template-details.component'; -import { AddIosTemplateComponent } from './components/preferences/dynamips/add-ios-template/add-ios-template.component'; -import { IosConfigurationService } from './services/ios-configuration.service'; -import { QemuConfigurationService } from './services/qemu-configuration.service'; -import { VirtualBoxConfigurationService } from './services/virtual-box-configuration.service'; -import { VpcsConfigurationService } from './services/vpcs-configuration.service'; -import { BuiltInTemplatesConfigurationService } from './services/built-in-templates-configuration.service'; -import { VmwarePreferencesComponent } from './components/preferences/vmware/vmware-preferences/vmware-preferences.component'; -import { VmwareTemplatesComponent } from './components/preferences/vmware/vmware-templates/vmware-templates.component'; -import { VmwareService } from './services/vmware.service'; -import { VmwareConfigurationService } from './services/vmware-configuration.service'; -import { VmwareTemplateDetailsComponent } from './components/preferences/vmware/vmware-template-details/vmware-template-details.component'; -import { AddVmwareTemplateComponent } from './components/preferences/vmware/add-vmware-template/add-vmware-template.component'; +import { EthernetSwitchesTemplatesComponent } from './components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component'; +import { CustomAdaptersTableComponent } from './components/preferences/common/custom-adapters-table/custom-adapters-table.component'; +import { CustomAdaptersComponent } from './components/preferences/common/custom-adapters/custom-adapters.component'; import { DeleteConfirmationDialogComponent } from './components/preferences/common/delete-confirmation-dialog/delete-confirmation-dialog.component'; import { DeleteTemplateComponent } from './components/preferences/common/delete-template-component/delete-template.component'; -import { DockerService } from './services/docker.service'; -import { DockerTemplatesComponent } from './components/preferences/docker/docker-templates/docker-templates.component'; -import { DockerConfigurationService } from './services/docker-configuration.service'; -import { AddDockerTemplateComponent } from './components/preferences/docker/add-docker-template/add-docker-template.component'; -import { DockerTemplateDetailsComponent } from './components/preferences/docker/docker-template-details/docker-template-details.component'; -import { IouTemplatesComponent } from './components/preferences/ios-on-unix/iou-templates/iou-templates.component'; -import { IouService } from './services/iou.service'; -import { AddIouTemplateComponent } from './components/preferences/ios-on-unix/add-iou-template/add-iou-template.component'; -import { IouConfigurationService } from './services/iou-configuration.service'; -import { IouTemplateDetailsComponent } from './components/preferences/ios-on-unix/iou-template-details/iou-template-details.component'; -import { CopyQemuVmTemplateComponent } from './components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component'; -import { CopyIosTemplateComponent } from './components/preferences/dynamips/copy-ios-template/copy-ios-template.component'; -import { CopyIouTemplateComponent } from './components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component'; -import { CopyDockerTemplateComponent } from './components/preferences/docker/copy-docker-template/copy-docker-template.component'; import { EmptyTemplatesListComponent } from './components/preferences/common/empty-templates-list/empty-templates-list.component'; -import { SymbolsMenuComponent } from './components/preferences/common/symbols-menu/symbols-menu.component'; -import { SearchFilter } from './filters/searchFilter.pipe'; -import { RecentlyOpenedProjectService } from './services/recentlyOpenedProject.service'; -import { ServerManagementService } from './services/server-management.service'; -import { DeleteActionComponent } from './components/project-map/context-menu/actions/delete-action/delete-action.component'; -import { ListOfSnapshotsComponent } from './components/snapshots/list-of-snapshots/list-of-snapshots.component'; -import { DateFilter } from './filters/dateFilter.pipe'; -import { NameFilter } from './filters/nameFilter.pipe'; -import { CustomAdaptersComponent } from './components/preferences/common/custom-adapters/custom-adapters.component'; - -import { ConsoleDeviceActionComponent } from './components/project-map/context-menu/actions/console-device-action/console-device-action.component'; -import { ConsoleComponent } from './components/settings/console/console.component'; -import { NodesMenuComponent } from './components/project-map/nodes-menu/nodes-menu.component'; -import { PacketFiltersActionComponent } from './components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component'; -import { PacketFiltersDialogComponent } from './components/project-map/packet-capturing/packet-filters/packet-filters.component'; -import { HelpDialogComponent } from './components/project-map/help-dialog/help-dialog.component'; -import { StartCaptureActionComponent } from './components/project-map/context-menu/actions/start-capture/start-capture-action.component'; -import { StartCaptureDialogComponent } from './components/project-map/packet-capturing/start-capture/start-capture.component'; -import { SuspendLinkActionComponent } from './components/project-map/context-menu/actions/suspend-link/suspend-link-action.component'; -import { ResumeLinkActionComponent } from './components/project-map/context-menu/actions/resume-link-action/resume-link-action.component'; -import { StopCaptureActionComponent } from './components/project-map/context-menu/actions/stop-capture/stop-capture-action.component'; -import { MapScaleService } from './services/mapScale.service'; -import { AdbutlerComponent } from './components/adbutler/adbutler.component'; -import { ConsoleService } from './services/settings/console.service'; -import { DefaultConsoleService } from './services/settings/default-console.service'; -import { NodeCreatedLabelStylesFixer } from './components/project-map/helpers/node-created-label-styles-fixer'; -import { NonNegativeValidator } from './validators/non-negative-validator'; -import { RotationValidator } from './validators/rotation-validator'; -import { DuplicateActionComponent } from './components/project-map/context-menu/actions/duplicate-action/duplicate-action.component'; -import { MapSettingsService } from './services/mapsettings.service'; -import { ProjectMapMenuComponent } from './components/project-map/project-map-menu/project-map-menu.component'; -import { HelpComponent } from './components/help/help.component'; -import { ConfigEditorDialogComponent } from './components/project-map/node-editors/config-editor/config-editor.component'; -import { EditConfigActionComponent } from './components/project-map/context-menu/actions/edit-config/edit-config-action.component'; -import { LogConsoleComponent } from './components/project-map/log-console/log-console.component'; -import { LogEventsDataSource } from './components/project-map/log-console/log-events-datasource'; -import { SaveProjectDialogComponent } from './components/projects/save-project-dialog/save-project-dialog.component'; -import { TopologySummaryComponent } from './components/topology-summary/topology-summary.component'; -import { ShowNodeActionComponent } from './components/project-map/context-menu/actions/show-node-action/show-node-action.component'; -import { InfoDialogComponent } from './components/project-map/info-dialog/info-dialog.component'; -import { InfoService } from './services/info.service'; -import { BringToFrontActionComponent } from './components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component'; -import { ExportConfigActionComponent } from './components/project-map/context-menu/actions/export-config/export-config-action.component'; -import { ImportConfigActionComponent } from './components/project-map/context-menu/actions/import-config/import-config-action.component'; -import { ConsoleDeviceActionBrowserComponent } from './components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component'; -import { ChangeSymbolDialogComponent } from './components/project-map/change-symbol-dialog/change-symbol-dialog.component'; -import { ChangeSymbolActionComponent } from './components/project-map/context-menu/actions/change-symbol/change-symbol-action.component'; -import { EditProjectDialogComponent } from './components/projects/edit-project-dialog/edit-project-dialog.component'; -import { ProjectsFilter } from './filters/projectsFilter.pipe'; -import { ComputeService } from './services/compute.service'; -import { ReloadNodeActionComponent } from './components/project-map/context-menu/actions/reload-node-action/reload-node-action.component'; -import { SuspendNodeActionComponent } from './components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component'; -import { ConfigActionComponent } from './components/project-map/context-menu/actions/config-action/config-action.component'; -import { ConfiguratorDialogVpcsComponent } from './components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component'; -import { ConfiguratorDialogEthernetHubComponent } from './components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component'; -import { ConfiguratorDialogEthernetSwitchComponent } from './components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component'; import { PortsComponent } from './components/preferences/common/ports/ports.component'; -import { ConfiguratorDialogSwitchComponent } from './components/project-map/node-editors/configurator/switch/configurator-switch.component'; -import { ConfiguratorDialogVirtualBoxComponent } from './components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component'; -import { CustomAdaptersTableComponent } from './components/preferences/common/custom-adapters-table/custom-adapters-table.component'; -import { ConfiguratorDialogQemuComponent } from './components/project-map/node-editors/configurator/qemu/configurator-qemu.component'; -import { ConfiguratorDialogCloudComponent } from './components/project-map/node-editors/configurator/cloud/configurator-cloud.component'; +import { SymbolsMenuComponent } from './components/preferences/common/symbols-menu/symbols-menu.component'; +import { SymbolsComponent } from './components/preferences/common/symbols/symbols.component'; import { UdpTunnelsComponent } from './components/preferences/common/udp-tunnels/udp-tunnels.component'; -import { ConfiguratorDialogAtmSwitchComponent } from './components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component'; -import { ConfiguratorDialogVmwareComponent } from './components/project-map/node-editors/configurator/vmware/configurator-vmware.component'; -import { ConfiguratorDialogIouComponent } from './components/project-map/node-editors/configurator/iou/configurator-iou.component'; -import { ConfiguratorDialogIosComponent } from './components/project-map/node-editors/configurator/ios/configurator-ios.component'; -import { ConfiguratorDialogDockerComponent } from './components/project-map/node-editors/configurator/docker/configurator-docker.component'; -import { EditNetworkConfigurationDialogComponent } from './components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component'; -import { ConfigureCustomAdaptersDialogComponent } from './components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component'; -import { ConfiguratorDialogNatComponent } from './components/project-map/node-editors/configurator/nat/configurator-nat.component'; -import { ConfiguratorDialogTracengComponent } from './components/project-map/node-editors/configurator/traceng/configurator-traceng.component'; +import { AddDockerTemplateComponent } from './components/preferences/docker/add-docker-template/add-docker-template.component'; +import { CopyDockerTemplateComponent } from './components/preferences/docker/copy-docker-template/copy-docker-template.component'; +import { DockerTemplateDetailsComponent } from './components/preferences/docker/docker-template-details/docker-template-details.component'; +import { DockerTemplatesComponent } from './components/preferences/docker/docker-templates/docker-templates.component'; +import { AddIosTemplateComponent } from './components/preferences/dynamips/add-ios-template/add-ios-template.component'; +import { CopyIosTemplateComponent } from './components/preferences/dynamips/copy-ios-template/copy-ios-template.component'; +import { DynamipsPreferencesComponent } from './components/preferences/dynamips/dynamips-preferences/dynamips-preferences.component'; +import { IosTemplateDetailsComponent } from './components/preferences/dynamips/ios-template-details/ios-template-details.component'; +import { IosTemplatesComponent } from './components/preferences/dynamips/ios-templates/ios-templates.component'; +import { GeneralPreferencesComponent } from './components/preferences/general/general-preferences.component'; +import { Gns3vmComponent } from './components/preferences/gns3vm/gns3vm.component'; +import { AddIouTemplateComponent } from './components/preferences/ios-on-unix/add-iou-template/add-iou-template.component'; +import { CopyIouTemplateComponent } from './components/preferences/ios-on-unix/copy-iou-template/copy-iou-template.component'; +import { IouTemplateDetailsComponent } from './components/preferences/ios-on-unix/iou-template-details/iou-template-details.component'; +import { IouTemplatesComponent } from './components/preferences/ios-on-unix/iou-templates/iou-templates.component'; +import { PreferencesComponent } from './components/preferences/preferences.component'; +import { AddQemuVmTemplateComponent } from './components/preferences/qemu/add-qemu-vm-template/add-qemu-vm-template.component'; +import { CopyQemuVmTemplateComponent } from './components/preferences/qemu/copy-qemu-vm-template/copy-qemu-vm-template.component'; +import { QemuPreferencesComponent } from './components/preferences/qemu/qemu-preferences/qemu-preferences.component'; +import { QemuVmTemplateDetailsComponent } from './components/preferences/qemu/qemu-vm-template-details/qemu-vm-template-details.component'; +import { QemuVmTemplatesComponent } from './components/preferences/qemu/qemu-vm-templates/qemu-vm-templates.component'; import { AddTracengTemplateComponent } from './components/preferences/traceng/add-traceng/add-traceng-template.component'; import { TracengPreferencesComponent } from './components/preferences/traceng/traceng-preferences/traceng-preferences.component'; -import { TracengTemplatesComponent } from './components/preferences/traceng/traceng-templates/traceng-templates.component'; -import { TracengService } from './services/traceng.service'; import { TracengTemplateDetailsComponent } from './components/preferences/traceng/traceng-template-details/traceng-template-details.component'; -import { QemuImageCreatorComponent } from './components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component'; -import { ChooseNameDialogComponent } from './components/projects/choose-name-dialog/choose-name-dialog.component'; -import { PacketCaptureService } from './services/packet-capture.service'; -import { StartCaptureOnStartedLinkActionComponent } from './components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component'; -import { LockActionComponent } from './components/project-map/context-menu/actions/lock-action/lock-action.component'; -import { NavigationDialogComponent } from './components/projects/navigation-dialog/navigation-dialog.component'; -import { ScreenshotDialogComponent } from './components/project-map/screenshot-dialog/screenshot-dialog.component'; -import { ResizableModule } from 'angular-resizable-element'; -import { DragAndDropModule } from 'angular-draggable-droppable'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { PageNotFoundComponent } from './components/page-not-found/page-not-found.component'; +import { TracengTemplatesComponent } from './components/preferences/traceng/traceng-templates/traceng-templates.component'; +import { AddVirtualBoxTemplateComponent } from './components/preferences/virtual-box/add-virtual-box-template/add-virtual-box-template.component'; +import { VirtualBoxPreferencesComponent } from './components/preferences/virtual-box/virtual-box-preferences/virtual-box-preferences.component'; +import { VirtualBoxTemplateDetailsComponent } from './components/preferences/virtual-box/virtual-box-template-details/virtual-box-template-details.component'; +import { VirtualBoxTemplatesComponent } from './components/preferences/virtual-box/virtual-box-templates/virtual-box-templates.component'; +import { AddVmwareTemplateComponent } from './components/preferences/vmware/add-vmware-template/add-vmware-template.component'; +import { VmwarePreferencesComponent } from './components/preferences/vmware/vmware-preferences/vmware-preferences.component'; +import { VmwareTemplateDetailsComponent } from './components/preferences/vmware/vmware-template-details/vmware-template-details.component'; +import { VmwareTemplatesComponent } from './components/preferences/vmware/vmware-templates/vmware-templates.component'; +import { AddVpcsTemplateComponent } from './components/preferences/vpcs/add-vpcs-template/add-vpcs-template.component'; +import { VpcsPreferencesComponent } from './components/preferences/vpcs/vpcs-preferences/vpcs-preferences.component'; +import { VpcsTemplateDetailsComponent } from './components/preferences/vpcs/vpcs-template-details/vpcs-template-details.component'; +import { VpcsTemplatesComponent } from './components/preferences/vpcs/vpcs-templates/vpcs-templates.component'; +import { ChangeHostnameDialogComponent } from './components/project-map/change-hostname-dialog/change-hostname-dialog.component'; +import { ChangeSymbolDialogComponent } from './components/project-map/change-symbol-dialog/change-symbol-dialog.component'; +import { ConsoleWrapperComponent } from './components/project-map/console-wrapper/console-wrapper.component'; +import { ContextConsoleMenuComponent } from './components/project-map/context-console-menu/context-console-menu.component'; import { AlignHorizontallyActionComponent } from './components/project-map/context-menu/actions/align-horizontally/align-horizontally.component'; import { AlignVerticallyActionComponent } from './components/project-map/context-menu/actions/align_vertically/align-vertically.component'; -import { ConfirmationBottomSheetComponent } from './components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component'; -import { TemplateFilter } from './filters/templateFilter.pipe'; -import { NotificationService } from './services/notification.service'; -import { ConfigDialogComponent } from './components/project-map/context-menu/dialogs/config-dialog/config-dialog.component'; -import { Gns3vmComponent } from './components/preferences/gns3vm/gns3vm.component'; -import { Gns3vmService } from './services/gns3vm.service'; -import { ThemeService } from './services/theme.service'; -import { ConfigureGns3VMDialogComponent } from './components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component'; -import { ImportApplianceComponent } from './components/project-map/import-appliance/import-appliance.component'; -import { GoogleAnalyticsService } from './services/google-analytics.service'; -import { DirectLinkComponent } from './components/direct-link/direct-link.component'; -import { SystemStatusComponent } from './components/system-status/system-status.component'; -import { StatusInfoComponent } from './components/system-status/status-info/status-info.component'; -import { StatusChartComponent } from './components/system-status/status-chart/status-chart.component'; -import { NgCircleProgressModule } from 'ng-circle-progress'; -import { OpenFileExplorerActionComponent } from './components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component'; -import { NgxChildProcessModule } from 'ngx-childprocess'; -import { ServerResolve } from './resolvers/server-resolve'; -import { HttpConsoleActionComponent } from './components/project-map/context-menu/actions/http-console/http-console-action.component'; -import { WebConsoleComponent } from './components/project-map/web-console/web-console.component'; -import { ConsoleWrapperComponent } from './components/project-map/console-wrapper/console-wrapper.component'; -import { NodeConsoleService } from './services/nodeConsole.service'; -import { HttpConsoleNewTabActionComponent } from './components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component'; -import { WebConsoleFullWindowComponent } from './components/web-console-full-window/web-console-full-window.component'; -import { ConsoleGuard } from './guards/console-guard'; -import { NewTemplateDialogComponent } from './components/project-map/new-template-dialog/new-template-dialog.component'; -import { ApplianceService } from './services/appliances.service'; -import { DataSourceFilter } from './filters/dataSourceFilter'; +import { BringToFrontActionComponent } from './components/project-map/context-menu/actions/bring-to-front-action/bring-to-front-action.component'; import { ChangeHostnameActionComponent } from './components/project-map/context-menu/actions/change-hostname/change-hostname-action.component'; -import { ChangeHostnameDialogComponent } from './components/project-map/change-hostname-dialog/change-hostname-dialog.component'; +import { ChangeSymbolActionComponent } from './components/project-map/context-menu/actions/change-symbol/change-symbol-action.component'; +import { ConfigActionComponent } from './components/project-map/context-menu/actions/config-action/config-action.component'; +import { ConsoleDeviceActionBrowserComponent } from './components/project-map/context-menu/actions/console-device-action-browser/console-device-action-browser.component'; +import { ConsoleDeviceActionComponent } from './components/project-map/context-menu/actions/console-device-action/console-device-action.component'; +import { DeleteActionComponent } from './components/project-map/context-menu/actions/delete-action/delete-action.component'; +import { DuplicateActionComponent } from './components/project-map/context-menu/actions/duplicate-action/duplicate-action.component'; +import { EditConfigActionComponent } from './components/project-map/context-menu/actions/edit-config/edit-config-action.component'; +import { EditStyleActionComponent } from './components/project-map/context-menu/actions/edit-style-action/edit-style-action.component'; +import { EditTextActionComponent } from './components/project-map/context-menu/actions/edit-text-action/edit-text-action.component'; +import { ExportConfigActionComponent } from './components/project-map/context-menu/actions/export-config/export-config-action.component'; +import { HttpConsoleNewTabActionComponent } from './components/project-map/context-menu/actions/http-console-new-tab/http-console-new-tab-action.component'; +import { HttpConsoleActionComponent } from './components/project-map/context-menu/actions/http-console/http-console-action.component'; +import { ImportConfigActionComponent } from './components/project-map/context-menu/actions/import-config/import-config-action.component'; +import { LockActionComponent } from './components/project-map/context-menu/actions/lock-action/lock-action.component'; +import { MoveLayerDownActionComponent } from './components/project-map/context-menu/actions/move-layer-down-action/move-layer-down-action.component'; +import { MoveLayerUpActionComponent } from './components/project-map/context-menu/actions/move-layer-up-action/move-layer-up-action.component'; +import { OpenFileExplorerActionComponent } from './components/project-map/context-menu/actions/open-file-explorer/open-file-explorer-action.component'; +import { PacketFiltersActionComponent } from './components/project-map/context-menu/actions/packet-filters-action/packet-filters-action.component'; +import { ReloadNodeActionComponent } from './components/project-map/context-menu/actions/reload-node-action/reload-node-action.component'; +import { ResumeLinkActionComponent } from './components/project-map/context-menu/actions/resume-link-action/resume-link-action.component'; +import { ShowNodeActionComponent } from './components/project-map/context-menu/actions/show-node-action/show-node-action.component'; +import { StartCaptureOnStartedLinkActionComponent } from './components/project-map/context-menu/actions/start-capture-on-started-link/start-capture-on-started-link.component'; +import { StartCaptureActionComponent } from './components/project-map/context-menu/actions/start-capture/start-capture-action.component'; +import { StartNodeActionComponent } from './components/project-map/context-menu/actions/start-node-action/start-node-action.component'; +import { StopCaptureActionComponent } from './components/project-map/context-menu/actions/stop-capture/stop-capture-action.component'; +import { StopNodeActionComponent } from './components/project-map/context-menu/actions/stop-node-action/stop-node-action.component'; +import { SuspendLinkActionComponent } from './components/project-map/context-menu/actions/suspend-link/suspend-link-action.component'; +import { SuspendNodeActionComponent } from './components/project-map/context-menu/actions/suspend-node-action/suspend-node-action.component'; +import { ContextMenuComponent } from './components/project-map/context-menu/context-menu.component'; +import { ConfigDialogComponent } from './components/project-map/context-menu/dialogs/config-dialog/config-dialog.component'; +import { DrawLinkToolComponent } from './components/project-map/draw-link-tool/draw-link-tool.component'; +import { StyleEditorDialogComponent } from './components/project-map/drawings-editors/style-editor/style-editor.component'; +import { TextEditorDialogComponent } from './components/project-map/drawings-editors/text-editor/text-editor.component'; +import { HelpDialogComponent } from './components/project-map/help-dialog/help-dialog.component'; +import { NodeCreatedLabelStylesFixer } from './components/project-map/helpers/node-created-label-styles-fixer'; +import { ImportApplianceComponent } from './components/project-map/import-appliance/import-appliance.component'; +import { InfoDialogComponent } from './components/project-map/info-dialog/info-dialog.component'; +import { LogConsoleComponent } from './components/project-map/log-console/log-console.component'; +import { LogEventsDataSource } from './components/project-map/log-console/log-events-datasource'; import { ApplianceInfoDialogComponent } from './components/project-map/new-template-dialog/appliance-info-dialog/appliance-info-dialog.component'; -import { InformationDialogComponent } from './components/dialogs/information-dialog.component'; +import { NewTemplateDialogComponent } from './components/project-map/new-template-dialog/new-template-dialog.component'; import { TemplateNameDialogComponent } from './components/project-map/new-template-dialog/template-name-dialog/template-name-dialog.component'; +import { ConfigEditorDialogComponent } from './components/project-map/node-editors/config-editor/config-editor.component'; +import { ConfiguratorDialogAtmSwitchComponent } from './components/project-map/node-editors/configurator/atm_switch/configurator-atm-switch.component'; +import { ConfiguratorDialogCloudComponent } from './components/project-map/node-editors/configurator/cloud/configurator-cloud.component'; +import { ConfiguratorDialogDockerComponent } from './components/project-map/node-editors/configurator/docker/configurator-docker.component'; +import { ConfigureCustomAdaptersDialogComponent } from './components/project-map/node-editors/configurator/docker/configure-custom-adapters/configure-custom-adapters.component'; +import { EditNetworkConfigurationDialogComponent } from './components/project-map/node-editors/configurator/docker/edit-network-configuration/edit-network-configuration.component'; +import { ConfiguratorDialogEthernetSwitchComponent } from './components/project-map/node-editors/configurator/ethernet-switch/configurator-ethernet-switch.component'; +import { ConfiguratorDialogEthernetHubComponent } from './components/project-map/node-editors/configurator/ethernet_hub/configurator-ethernet-hub.component'; +import { ConfiguratorDialogIosComponent } from './components/project-map/node-editors/configurator/ios/configurator-ios.component'; +import { ConfiguratorDialogIouComponent } from './components/project-map/node-editors/configurator/iou/configurator-iou.component'; +import { ConfiguratorDialogNatComponent } from './components/project-map/node-editors/configurator/nat/configurator-nat.component'; +import { ConfiguratorDialogQemuComponent } from './components/project-map/node-editors/configurator/qemu/configurator-qemu.component'; +import { QemuImageCreatorComponent } from './components/project-map/node-editors/configurator/qemu/qemu-image-creator/qemu-image-creator.component'; +import { ConfiguratorDialogSwitchComponent } from './components/project-map/node-editors/configurator/switch/configurator-switch.component'; +import { ConfiguratorDialogTracengComponent } from './components/project-map/node-editors/configurator/traceng/configurator-traceng.component'; +import { ConfiguratorDialogVirtualBoxComponent } from './components/project-map/node-editors/configurator/virtualbox/configurator-virtualbox.component'; +import { ConfiguratorDialogVmwareComponent } from './components/project-map/node-editors/configurator/vmware/configurator-vmware.component'; +import { ConfiguratorDialogVpcsComponent } from './components/project-map/node-editors/configurator/vpcs/configurator-vpcs.component'; +import { NodeSelectInterfaceComponent } from './components/project-map/node-select-interface/node-select-interface.component'; +import { NodesMenuComponent } from './components/project-map/nodes-menu/nodes-menu.component'; +import { PacketFiltersDialogComponent } from './components/project-map/packet-capturing/packet-filters/packet-filters.component'; +import { StartCaptureDialogComponent } from './components/project-map/packet-capturing/start-capture/start-capture.component'; +import { ProjectMapMenuComponent } from './components/project-map/project-map-menu/project-map-menu.component'; +import { ProjectMapComponent } from './components/project-map/project-map.component'; +import { ScreenshotDialogComponent } from './components/project-map/screenshot-dialog/screenshot-dialog.component'; +import { WebConsoleComponent } from './components/project-map/web-console/web-console.component'; +import { AddBlankProjectDialogComponent } from './components/projects/add-blank-project-dialog/add-blank-project-dialog.component'; +import { ChooseNameDialogComponent } from './components/projects/choose-name-dialog/choose-name-dialog.component'; +import { ConfirmationBottomSheetComponent } from './components/projects/confirmation-bottomsheet/confirmation-bottomsheet.component'; +import { ConfirmationDialogComponent } from './components/projects/confirmation-dialog/confirmation-dialog.component'; +import { EditProjectDialogComponent } from './components/projects/edit-project-dialog/edit-project-dialog.component'; +import { ImportProjectDialogComponent } from './components/projects/import-project-dialog/import-project-dialog.component'; +import { ProjectNameValidator } from './components/projects/models/projectNameValidator'; +import { NavigationDialogComponent } from './components/projects/navigation-dialog/navigation-dialog.component'; +import { ProjectsComponent } from './components/projects/projects.component'; +import { SaveProjectDialogComponent } from './components/projects/save-project-dialog/save-project-dialog.component'; +import { AddServerDialogComponent } from './components/servers/add-server-dialog/add-server-dialog.component'; +import { ConfigureGns3VMDialogComponent } from './components/servers/configure-gns3vm-dialog/configure-gns3vm-dialog.component'; +import { ServerDiscoveryComponent } from './components/servers/server-discovery/server-discovery.component'; +import { ServersComponent } from './components/servers/servers.component'; +import { ConsoleComponent } from './components/settings/console/console.component'; +import { SettingsComponent } from './components/settings/settings.component'; +import { CreateSnapshotDialogComponent } from './components/snapshots/create-snapshot-dialog/create-snapshot-dialog.component'; +import { ListOfSnapshotsComponent } from './components/snapshots/list-of-snapshots/list-of-snapshots.component'; +import { SnapshotMenuItemComponent } from './components/snapshots/snapshot-menu-item/snapshot-menu-item.component'; +import { StatusChartComponent } from './components/system-status/status-chart/status-chart.component'; +import { StatusInfoComponent } from './components/system-status/status-info/status-info.component'; +import { SystemStatusComponent } from './components/system-status/system-status.component'; +import { TemplateListDialogComponent } from './components/template/template-list-dialog/template-list-dialog.component'; +import { TemplateComponent } from './components/template/template.component'; +import { TopologySummaryComponent } from './components/topology-summary/topology-summary.component'; +import { WebConsoleFullWindowComponent } from './components/web-console-full-window/web-console-full-window.component'; +import { DataSourceFilter } from './filters/dataSourceFilter'; +import { DateFilter } from './filters/dateFilter.pipe'; +import { NameFilter } from './filters/nameFilter.pipe'; +import { ProjectsFilter } from './filters/projectsFilter.pipe'; +import { SearchFilter } from './filters/searchFilter.pipe'; +import { TemplateFilter } from './filters/templateFilter.pipe'; +import { ConsoleGuard } from './guards/console-guard'; +import { ProjectWebServiceHandler } from './handlers/project-web-service-handler'; +import { DefaultLayoutComponent } from './layouts/default-layout/default-layout.component'; +import { MATERIAL_IMPORTS } from './material.imports'; +import { ServerResolve } from './resolvers/server-resolve'; +import { ApplianceService } from './services/appliances.service'; +import { BuiltInTemplatesConfigurationService } from './services/built-in-templates-configuration.service'; +import { BuiltInTemplatesService } from './services/built-in-templates.service'; +import { ComputeService } from './services/compute.service'; +import { DockerConfigurationService } from './services/docker-configuration.service'; +import { DockerService } from './services/docker.service'; +import { DrawingService } from './services/drawing.service'; +import { ExternalSoftwareDefinitionService } from './services/external-software-definition.service'; +import { Gns3vmService } from './services/gns3vm.service'; +import { GoogleAnalyticsService } from './services/google-analytics.service'; +import { HttpServer, ServerErrorHandler } from './services/http-server.service'; +import { IndexedDbService } from './services/indexed-db.service'; +import { InfoService } from './services/info.service'; +import { InstalledSoftwareService } from './services/installed-software.service'; +import { IosConfigurationService } from './services/ios-configuration.service'; +import { IosService } from './services/ios.service'; +import { IouConfigurationService } from './services/iou-configuration.service'; +import { IouService } from './services/iou.service'; +import { LinkService } from './services/link.service'; +import { MapScaleService } from './services/mapScale.service'; +import { MapSettingsService } from './services/mapsettings.service'; +import { NodeService } from './services/node.service'; +import { NodeConsoleService } from './services/nodeConsole.service'; +import { NotificationService } from './services/notification.service'; +import { PacketCaptureService } from './services/packet-capture.service'; +import { PlatformService } from './services/platform.service'; +import { ProjectService } from './services/project.service'; +import { QemuConfigurationService } from './services/qemu-configuration.service'; +import { QemuService } from './services/qemu.service'; +import { RecentlyOpenedProjectService } from './services/recentlyOpenedProject.service'; +import { ServerManagementService } from './services/server-management.service'; +import { ServerSettingsService } from './services/server-settings.service'; +import { ServerDatabase } from './services/server.database'; +import { ServerService } from './services/server.service'; +import { SettingsService } from './services/settings.service'; +import { ConsoleService } from './services/settings/console.service'; +import { DefaultConsoleService } from './services/settings/default-console.service'; +import { SnapshotService } from './services/snapshot.service'; +import { SymbolService } from './services/symbol.service'; +import { TemplateMocksService } from './services/template-mocks.service'; +import { TemplateService } from './services/template.service'; +import { ThemeService } from './services/theme.service'; +import { ToasterService } from './services/toaster.service'; +import { ToolsService } from './services/tools.service'; +import { TracengService } from './services/traceng.service'; import { UpdatesService } from './services/updates.service'; -import { ReportIssueComponent } from './components/help/report-issue/report-issue.component'; -import { AngularReactBrowserModule } from '@angular-react/core'; -import { FabDialogModule, FabButtonModule } from '@angular-react/fabric'; -import { OverlayContainer, OverlayModule } from '@angular/cdk/overlay'; +import { VersionService } from './services/version.service'; +import { VirtualBoxConfigurationService } from './services/virtual-box-configuration.service'; +import { VirtualBoxService } from './services/virtual-box.service'; +import { VmwareConfigurationService } from './services/vmware-configuration.service'; +import { VmwareService } from './services/vmware.service'; +import { VpcsConfigurationService } from './services/vpcs-configuration.service'; +import { VpcsService } from './services/vpcs.service'; +import { NonNegativeValidator } from './validators/non-negative-validator'; +import { RotationValidator } from './validators/rotation-validator'; @NgModule({ declarations: [ diff --git a/src/app/cartography/angular-map.imports.ts b/src/app/cartography/angular-map.imports.ts index 06856ccf..711585e8 100644 --- a/src/app/cartography/angular-map.imports.ts +++ b/src/app/cartography/angular-map.imports.ts @@ -1,6 +1,4 @@ -import { NodeComponent } from './components/experimental-map/node/node.component'; -import { LinkComponent } from './components/experimental-map/link/link.component'; -import { StatusComponent } from './components/experimental-map/status/status.component'; +import { DraggableComponent } from './components/experimental-map/draggable/draggable.component'; import { DrawingComponent } from './components/experimental-map/drawing/drawing.component'; import { EllipseComponent } from './components/experimental-map/drawing/drawings/ellipse/ellipse.component'; import { ImageComponent } from './components/experimental-map/drawing/drawings/image/image.component'; @@ -8,8 +6,10 @@ import { LineComponent } from './components/experimental-map/drawing/drawings/li import { RectComponent } from './components/experimental-map/drawing/drawings/rect/rect.component'; import { TextComponent } from './components/experimental-map/drawing/drawings/text/text.component'; import { InterfaceLabelComponent } from './components/experimental-map/interface-label/interface-label.component'; -import { DraggableComponent } from './components/experimental-map/draggable/draggable.component'; +import { LinkComponent } from './components/experimental-map/link/link.component'; +import { NodeComponent } from './components/experimental-map/node/node.component'; import { SelectionComponent } from './components/experimental-map/selection/selection.component'; +import { StatusComponent } from './components/experimental-map/status/status.component'; export const ANGULAR_MAP_DECLARATIONS = [ NodeComponent, diff --git a/src/app/cartography/cartography.module.ts b/src/app/cartography/cartography.module.ts index 46c44721..7d7c813d 100644 --- a/src/app/cartography/cartography.module.ts +++ b/src/app/cartography/cartography.module.ts @@ -1,27 +1,22 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { MatIconModule } from '@angular/material/icon'; import { MatMenuModule } from '@angular/material/menu'; - -import { CssFixer } from './helpers/css-fixer'; -import { FontFixer } from './helpers/font-fixer'; -import { DefaultDrawingsFactory } from './helpers/default-drawings-factory'; -import { MultiLinkCalculatorHelper } from './helpers/multi-link-calculator-helper'; -import { SvgToDrawingConverter } from './helpers/svg-to-drawing-converter'; -import { QtDasharrayFixer } from './helpers/qt-dasharray-fixer'; -import { LayersManager } from './managers/layers-manager'; -import { MapChangeDetectorRef } from './services/map-change-detector-ref'; -import { Context } from './models/context'; import { ANGULAR_MAP_DECLARATIONS } from './angular-map.imports'; -import { D3_MAP_IMPORTS } from './d3-map.imports'; -import { CanvasSizeDetector } from './helpers/canvas-size-detector'; -import { DrawingsEventSource } from './events/drawings-event-source'; -import { NodesEventSource } from './events/nodes-event-source'; -import { MapDrawingToSvgConverter } from './converters/map/map-drawing-to-svg-converter'; +import { D3MapComponent } from './components/d3-map/d3-map.component'; +import { DraggableSelectionComponent } from './components/draggable-selection/draggable-selection.component'; +import { DrawingAddingComponent } from './components/drawing-adding/drawing-adding.component'; +import { DrawingResizingComponent } from './components/drawing-resizing/drawing-resizing.component'; +import { ExperimentalMapComponent } from './components/experimental-map/experimental-map.component'; +import { SelectionControlComponent } from './components/selection-control/selection-control.component'; +import { SelectionSelectComponent } from './components/selection-select/selection-select.component'; +import { TextEditorComponent } from './components/text-editor/text-editor.component'; import { DrawingToMapDrawingConverter } from './converters/map/drawing-to-map-drawing-converter'; import { LabelToMapLabelConverter } from './converters/map/label-to-map-label-converter'; +import { LinkNodeToMapLinkNodeConverter } from './converters/map/link-node-to-map-link-node-converter'; import { LinkToMapLinkConverter } from './converters/map/link-to-map-link-converter'; import { MapDrawingToDrawingConverter } from './converters/map/map-drawing-to-drawing-converter'; +import { MapDrawingToSvgConverter } from './converters/map/map-drawing-to-svg-converter'; import { MapLabelToLabelConverter } from './converters/map/map-label-to-label-converter'; import { MapLinkNodeToLinkNodeConverter } from './converters/map/map-link-node-to-link-node-converter'; import { MapLinkToLinkConverter } from './converters/map/map-link-to-link-converter'; @@ -31,34 +26,38 @@ import { MapSymbolToSymbolConverter } from './converters/map/map-symbol-to-symbo import { NodeToMapNodeConverter } from './converters/map/node-to-map-node-converter'; import { PortToMapPortConverter } from './converters/map/port-to-map-port-converter'; import { SymbolToMapSymbolConverter } from './converters/map/symbol-to-map-symbol-converter'; -import { LinkNodeToMapLinkNodeConverter } from './converters/map/link-node-to-map-link-node-converter'; -import { GraphDataManager } from './managers/graph-data-manager'; +import { StylesToFontConverter } from './converters/styles-to-font-converter'; +import { D3_MAP_IMPORTS } from './d3-map.imports'; import { - MapNodesDataSource, - MapLinksDataSource, MapDrawingsDataSource, + MapLinksDataSource, + MapNodesDataSource, MapSymbolsDataSource, } from './datasources/map-datasource'; -import { LinksEventSource } from './events/links-event-source'; -import { D3MapComponent } from './components/d3-map/d3-map.component'; -import { ExperimentalMapComponent } from './components/experimental-map/experimental-map.component'; -import { SelectionEventSource } from './events/selection-event-source'; -import { SelectionControlComponent } from './components/selection-control/selection-control.component'; -import { SelectionSelectComponent } from './components/selection-select/selection-select.component'; -import { DraggableSelectionComponent } from './components/draggable-selection/draggable-selection.component'; -import { MapSettingsManager } from './managers/map-settings-manager'; -import { DrawingResizingComponent } from './components/drawing-resizing/drawing-resizing.component'; -import { FontBBoxCalculator } from './helpers/font-bbox-calculator'; -import { StylesToFontConverter } from './converters/styles-to-font-converter'; -import { TextElementFactory } from './helpers/drawings-factory/text-element-factory'; -import { EllipseElementFactory } from './helpers/drawings-factory/ellipse-element-factory'; -import { RectangleElementFactory } from './helpers/drawings-factory/rectangle-element-factory'; -import { LineElementFactory } from './helpers/drawings-factory/line-element-factory'; -import { TextEditorComponent } from './components/text-editor/text-editor.component'; -import { DrawingAddingComponent } from './components/drawing-adding/drawing-adding.component'; -import { MovingEventSource } from './events/moving-event-source'; import { MovingCanvasDirective } from './directives/moving-canvas.directive'; import { ZoomingCanvasDirective } from './directives/zooming-canvas.directive'; +import { DrawingsEventSource } from './events/drawings-event-source'; +import { LinksEventSource } from './events/links-event-source'; +import { MovingEventSource } from './events/moving-event-source'; +import { NodesEventSource } from './events/nodes-event-source'; +import { SelectionEventSource } from './events/selection-event-source'; +import { CanvasSizeDetector } from './helpers/canvas-size-detector'; +import { CssFixer } from './helpers/css-fixer'; +import { DefaultDrawingsFactory } from './helpers/default-drawings-factory'; +import { EllipseElementFactory } from './helpers/drawings-factory/ellipse-element-factory'; +import { LineElementFactory } from './helpers/drawings-factory/line-element-factory'; +import { RectangleElementFactory } from './helpers/drawings-factory/rectangle-element-factory'; +import { TextElementFactory } from './helpers/drawings-factory/text-element-factory'; +import { FontBBoxCalculator } from './helpers/font-bbox-calculator'; +import { FontFixer } from './helpers/font-fixer'; +import { MultiLinkCalculatorHelper } from './helpers/multi-link-calculator-helper'; +import { QtDasharrayFixer } from './helpers/qt-dasharray-fixer'; +import { SvgToDrawingConverter } from './helpers/svg-to-drawing-converter'; +import { GraphDataManager } from './managers/graph-data-manager'; +import { LayersManager } from './managers/layers-manager'; +import { MapSettingsManager } from './managers/map-settings-manager'; +import { Context } from './models/context'; +import { MapChangeDetectorRef } from './services/map-change-detector-ref'; import { EthernetLinkWidget } from './widgets/links/ethernet-link'; import { SerialLinkWidget } from './widgets/links/serial-link'; diff --git a/src/app/cartography/components/d3-map/d3-map.component.spec.ts b/src/app/cartography/components/d3-map/d3-map.component.spec.ts index 1cafcb0e..007b05f2 100644 --- a/src/app/cartography/components/d3-map/d3-map.component.spec.ts +++ b/src/app/cartography/components/d3-map/d3-map.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { D3MapComponent } from './d3-map.component'; describe('D3MapComponent', () => { diff --git a/src/app/cartography/components/d3-map/d3-map.component.ts b/src/app/cartography/components/d3-map/d3-map.component.ts index 46368f45..b79b3bbe 100644 --- a/src/app/cartography/components/d3-map/d3-map.component.ts +++ b/src/app/cartography/components/d3-map/d3-map.component.ts @@ -7,33 +7,30 @@ import { OnDestroy, OnInit, SimpleChange, - EventEmitter, - Output, ViewChild, } from '@angular/core'; -import { Selection, select } from 'd3-selection'; - -import { GraphLayout } from '../../widgets/graph-layout'; -import { Context } from '../../models/context'; -import { Size } from '../../models/size'; +import { select, Selection } from 'd3-selection'; import { Subscription } from 'rxjs'; -import { InterfaceLabelWidget } from '../../widgets/interface-label'; -import { SelectionTool } from '../../tools/selection-tool'; -import { MovingTool } from '../../tools/moving-tool'; -import { MapChangeDetectorRef } from '../../services/map-change-detector-ref'; -import { CanvasSizeDetector } from '../../helpers/canvas-size-detector'; -import { Node } from '../../models/node'; import { Link } from '../../../models/link'; -import { Drawing } from '../../models/drawing'; +import { Project } from '../../../models/project'; +import { Server } from '../../../models/server'; import { Symbol } from '../../../models/symbol'; +import { MapScaleService } from '../../../services/mapScale.service'; +import { MapSettingsService } from '../../../services/mapsettings.service'; +import { ToolsService } from '../../../services/tools.service'; +import { CanvasSizeDetector } from '../../helpers/canvas-size-detector'; import { GraphDataManager } from '../../managers/graph-data-manager'; import { MapSettingsManager } from '../../managers/map-settings-manager'; -import { Server } from '../../../models/server'; -import { ToolsService } from '../../../services/tools.service'; +import { Context } from '../../models/context'; +import { Drawing } from '../../models/drawing'; +import { Node } from '../../models/node'; +import { Size } from '../../models/size'; +import { MapChangeDetectorRef } from '../../services/map-change-detector-ref'; +import { MovingTool } from '../../tools/moving-tool'; +import { SelectionTool } from '../../tools/selection-tool'; +import { GraphLayout } from '../../widgets/graph-layout'; +import { InterfaceLabelWidget } from '../../widgets/interface-label'; import { TextEditorComponent } from '../text-editor/text-editor.component'; -import { MapScaleService } from '../../../services/mapScale.service'; -import { Project } from '../../../models/project'; -import { MapSettingsService } from '../../../services/mapsettings.service'; @Component({ selector: 'app-d3-map', diff --git a/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts b/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts index 492da989..21a994dc 100644 --- a/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts +++ b/src/app/cartography/components/draggable-selection/draggable-selection.component.spec.ts @@ -1,27 +1,26 @@ -import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing'; - -import { DraggableSelectionComponent } from './draggable-selection.component'; -import { NodesWidget } from '../../widgets/nodes'; -import { DrawingsWidget } from '../../widgets/drawings'; -import { LinksWidget } from '../../widgets/links'; -import { LabelWidget } from '../../widgets/label'; -import { InterfaceLabelWidget } from '../../widgets/interface-label'; -import { SelectionManager } from '../../managers/selection-manager'; -import { SelectionManagerMock } from '../../managers/selection-manager.spec'; -import { NodesEventSource } from '../../events/nodes-event-source'; +import { EventEmitter } from '@angular/core'; +import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { select } from 'd3-selection'; +import { MapSettingsService } from '../../../services/mapsettings.service'; +import { DraggableDrag, DraggableEnd, DraggableStart } from '../../events/draggable'; import { DrawingsEventSource } from '../../events/drawings-event-source'; +import { LinksEventSource } from '../../events/links-event-source'; +import { NodesEventSource } from '../../events/nodes-event-source'; import { GraphDataManager } from '../../managers/graph-data-manager'; import { MockedGraphDataManager } from '../../managers/graph-data-manager.spec'; -import { LinksEventSource } from '../../events/links-event-source'; -import { DraggableStart, DraggableDrag, DraggableEnd } from '../../events/draggable'; -import { MapNode } from '../../models/map/map-node'; -import { EventEmitter } from '@angular/core'; +import { SelectionManager } from '../../managers/selection-manager'; +import { SelectionManagerMock } from '../../managers/selection-manager.spec'; import { MapDrawing } from '../../models/map/map-drawing'; import { MapLabel } from '../../models/map/map-label'; -import { MapLinkNode } from '../../models/map/map-link-node'; -import { select } from 'd3-selection'; import { MapLink } from '../../models/map/map-link'; -import { MapSettingsService } from '../../../services/mapsettings.service'; +import { MapLinkNode } from '../../models/map/map-link-node'; +import { MapNode } from '../../models/map/map-node'; +import { DrawingsWidget } from '../../widgets/drawings'; +import { InterfaceLabelWidget } from '../../widgets/interface-label'; +import { LabelWidget } from '../../widgets/label'; +import { LinksWidget } from '../../widgets/links'; +import { NodesWidget } from '../../widgets/nodes'; +import { DraggableSelectionComponent } from './draggable-selection.component'; describe('DraggableSelectionComponent', () => { let component: DraggableSelectionComponent; diff --git a/src/app/cartography/components/draggable-selection/draggable-selection.component.ts b/src/app/cartography/components/draggable-selection/draggable-selection.component.ts index 3bcf8c74..988ac140 100644 --- a/src/app/cartography/components/draggable-selection/draggable-selection.component.ts +++ b/src/app/cartography/components/draggable-selection/draggable-selection.component.ts @@ -1,23 +1,23 @@ -import { Component, OnInit, OnDestroy, Input } from '@angular/core'; -import { Subscription, merge } from 'rxjs'; -import { NodesWidget } from '../../widgets/nodes'; -import { DrawingsWidget } from '../../widgets/drawings'; -import { LinksWidget } from '../../widgets/links'; -import { SelectionManager } from '../../managers/selection-manager'; -import { NodesEventSource } from '../../events/nodes-event-source'; -import { DrawingsEventSource } from '../../events/drawings-event-source'; -import { GraphDataManager } from '../../managers/graph-data-manager'; -import { DraggableStart, DraggableDrag, DraggableEnd } from '../../events/draggable'; -import { MapNode } from '../../models/map/map-node'; -import { MapDrawing } from '../../models/map/map-drawing'; -import { DraggedDataEvent } from '../../events/event-source'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { select } from 'd3-selection'; -import { MapLabel } from '../../models/map/map-label'; -import { LabelWidget } from '../../widgets/label'; -import { InterfaceLabelWidget } from '../../widgets/interface-label'; -import { MapLinkNode } from '../../models/map/map-link-node'; -import { LinksEventSource } from '../../events/links-event-source'; +import { merge, Subscription } from 'rxjs'; import { MapSettingsService } from '../../../services/mapsettings.service'; +import { DraggableDrag, DraggableEnd, DraggableStart } from '../../events/draggable'; +import { DrawingsEventSource } from '../../events/drawings-event-source'; +import { DraggedDataEvent } from '../../events/event-source'; +import { LinksEventSource } from '../../events/links-event-source'; +import { NodesEventSource } from '../../events/nodes-event-source'; +import { GraphDataManager } from '../../managers/graph-data-manager'; +import { SelectionManager } from '../../managers/selection-manager'; +import { MapDrawing } from '../../models/map/map-drawing'; +import { MapLabel } from '../../models/map/map-label'; +import { MapLinkNode } from '../../models/map/map-link-node'; +import { MapNode } from '../../models/map/map-node'; +import { DrawingsWidget } from '../../widgets/drawings'; +import { InterfaceLabelWidget } from '../../widgets/interface-label'; +import { LabelWidget } from '../../widgets/label'; +import { LinksWidget } from '../../widgets/links'; +import { NodesWidget } from '../../widgets/nodes'; @Component({ selector: 'app-draggable-selection', diff --git a/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts b/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts index 8b67bff4..ea508b70 100644 --- a/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts +++ b/src/app/cartography/components/drawing-adding/drawing-adding.component.spec.ts @@ -1,8 +1,8 @@ -import { DrawingAddingComponent } from './drawing-adding.component'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { DrawingsEventSource } from '../../events/drawings-event-source'; import { Context } from '../../models/context'; +import { DrawingAddingComponent } from './drawing-adding.component'; describe('DrawingAddingComponent', () => { let component: DrawingAddingComponent; diff --git a/src/app/cartography/components/drawing-adding/drawing-adding.component.ts b/src/app/cartography/components/drawing-adding/drawing-adding.component.ts index 48880ec9..b8994561 100644 --- a/src/app/cartography/components/drawing-adding/drawing-adding.component.ts +++ b/src/app/cartography/components/drawing-adding/drawing-adding.component.ts @@ -1,8 +1,8 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Context } from '../../models/context'; +import { Subscription } from 'rxjs'; import { DrawingsEventSource } from '../../events/drawings-event-source'; import { AddedDataEvent } from '../../events/event-source'; -import { Subscription } from 'rxjs'; +import { Context } from '../../models/context'; @Component({ selector: 'app-drawing-adding', diff --git a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts index 8801f747..7cd3fac2 100644 --- a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts +++ b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.spec.ts @@ -1,12 +1,11 @@ -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; - -import { DrawingResizingComponent } from './drawing-resizing.component'; -import { DrawingsWidget } from '../../widgets/drawings'; -import { DrawingsEventSource } from '../../events/drawings-event-source'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { EventEmitter } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { DrawingsEventSource } from '../../events/drawings-event-source'; import { ResizingEnd } from '../../events/resizing'; import { MapDrawing } from '../../models/map/map-drawing'; +import { DrawingsWidget } from '../../widgets/drawings'; +import { DrawingResizingComponent } from './drawing-resizing.component'; export class DrawingWidgetMock { resizingFinished = new EventEmitter>(); diff --git a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts index de912d6c..015ad485 100644 --- a/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts +++ b/src/app/cartography/components/drawing-resizing/drawing-resizing.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit, ElementRef, OnDestroy, Input, Output, EventEmitter } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { DrawingsEventSource } from '../../events/drawings-event-source'; -import { DrawingsWidget } from '../../widgets/drawings'; -import { MapDrawing } from '../../models/map/map-drawing'; import { ResizedDataEvent } from '../../events/event-source'; import { ResizingEnd } from '../../events/resizing'; +import { MapDrawing } from '../../models/map/map-drawing'; +import { DrawingsWidget } from '../../widgets/drawings'; @Component({ selector: 'app-drawing-resizing', diff --git a/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts b/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts index ff6afe29..3182c040 100644 --- a/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts +++ b/src/app/cartography/components/experimental-map/draggable/draggable.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { DraggableComponent } from './draggable.component'; describe('DraggableComponent', () => { diff --git a/src/app/cartography/components/experimental-map/draggable/draggable.component.ts b/src/app/cartography/components/experimental-map/draggable/draggable.component.ts index 43125bbf..b039a610 100644 --- a/src/app/cartography/components/experimental-map/draggable/draggable.component.ts +++ b/src/app/cartography/components/experimental-map/draggable/draggable.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ElementRef, AfterViewInit, OnDestroy, Input, Output, EventEmitter } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { Observable, Subscription } from 'rxjs'; import { Point } from '../../../models/point'; diff --git a/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts index eb7027c0..b07d4b9f 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawing.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { DrawingComponent } from './drawing.component'; describe('DrawingComponent', () => { diff --git a/src/app/cartography/components/experimental-map/drawing/drawing.component.ts b/src/app/cartography/components/experimental-map/drawing/drawing.component.ts index 727bf748..f8bc603f 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawing.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawing.component.ts @@ -1,13 +1,13 @@ -import { Component, OnInit, Input, ChangeDetectorRef } from '@angular/core'; +import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import { DrawingsEventSource } from '../../../events/drawings-event-source'; +import { DraggedDataEvent } from '../../../events/event-source'; +import { SvgToDrawingConverter } from '../../../helpers/svg-to-drawing-converter'; import { EllipseElement } from '../../../models/drawings/ellipse-element'; import { ImageElement } from '../../../models/drawings/image-element'; import { LineElement } from '../../../models/drawings/line-element'; import { RectElement } from '../../../models/drawings/rect-element'; import { TextElement } from '../../../models/drawings/text-element'; -import { SvgToDrawingConverter } from '../../../helpers/svg-to-drawing-converter'; -import { DraggedDataEvent } from '../../../events/event-source'; import { MapDrawing } from '../../../models/map/map-drawing'; -import { DrawingsEventSource } from '../../../events/drawings-event-source'; @Component({ selector: '[app-drawing]', diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts index 3d1cc6f9..1e8c38d8 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { EllipseComponent } from './ellipse.component'; describe('EllipseComponent', () => { diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts index f3019e6b..74b3f11e 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/ellipse/ellipse.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { EllipseElement } from '../../../../../models/drawings/ellipse-element'; +import { Component, Input, OnInit } from '@angular/core'; import { QtDasharrayFixer } from '../../../../../helpers/qt-dasharray-fixer'; +import { EllipseElement } from '../../../../../models/drawings/ellipse-element'; @Component({ selector: '[app-ellipse]', diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts index 0ea04f1d..65bf9959 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { ImageComponent } from './image.component'; describe('ImageComponent', () => { diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts index 25a96833..b8151e68 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/image/image.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { ImageElement } from '../../../../../models/drawings/image-element'; @Component({ diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts index 5318150e..c6cfb82a 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { LineComponent } from './line.component'; describe('LineComponent', () => { diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts index 8c75758a..175d66a4 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/line/line.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { QtDasharrayFixer } from '../../../../../helpers/qt-dasharray-fixer'; import { LineElement } from '../../../../../models/drawings/line-element'; diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts index b739bbdc..17c35d33 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { RectComponent } from './rect.component'; describe('RectComponent', () => { diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts index def416c5..3fc17a26 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/rect/rect.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { RectElement } from '../../../../../models/drawings/rect-element'; +import { Component, Input, OnInit } from '@angular/core'; import { QtDasharrayFixer } from '../../../../../helpers/qt-dasharray-fixer'; +import { RectElement } from '../../../../../models/drawings/rect-element'; @Component({ selector: '[app-rect]', diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts index 7d8e11ac..5dfb1368 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { TextComponent } from './text.component'; describe('TextComponent', () => { diff --git a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts index 5afc6fba..2292278b 100644 --- a/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts +++ b/src/app/cartography/components/experimental-map/drawing/drawings/text/text.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit, Input, ViewChild, ElementRef, DoCheck } from '@angular/core'; +import { Component, DoCheck, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; -import { TextElement } from '../../../../../models/drawings/text-element'; import { FontFixer } from '../../../../../helpers/font-fixer'; +import { TextElement } from '../../../../../models/drawings/text-element'; @Component({ selector: '[app-text]', diff --git a/src/app/cartography/components/experimental-map/experimental-map.component.ts b/src/app/cartography/components/experimental-map/experimental-map.component.ts index 22c0201b..36f96ca2 100644 --- a/src/app/cartography/components/experimental-map/experimental-map.component.ts +++ b/src/app/cartography/components/experimental-map/experimental-map.component.ts @@ -1,4 +1,6 @@ import { + ChangeDetectionStrategy, + ChangeDetectorRef, Component, ElementRef, HostListener, @@ -7,23 +9,20 @@ import { OnDestroy, OnInit, SimpleChange, - ChangeDetectionStrategy, - ChangeDetectorRef, ViewChild, } from '@angular/core'; - -import { GraphLayout } from '../../widgets/graph-layout'; -import { Context } from '../../models/context'; -import { Size } from '../../models/size'; import { Subscription } from 'rxjs'; -import { MapChangeDetectorRef } from '../../services/map-change-detector-ref'; -import { CanvasSizeDetector } from '../../helpers/canvas-size-detector'; -import { Node } from '../../models/node'; import { Link } from '../../../models/link'; -import { Drawing } from '../../models/drawing'; import { Symbol } from '../../../models/symbol'; +import { CanvasSizeDetector } from '../../helpers/canvas-size-detector'; import { GraphDataManager } from '../../managers/graph-data-manager'; import { LayersManager } from '../../managers/layers-manager'; +import { Context } from '../../models/context'; +import { Drawing } from '../../models/drawing'; +import { Node } from '../../models/node'; +import { Size } from '../../models/size'; +import { MapChangeDetectorRef } from '../../services/map-change-detector-ref'; +import { GraphLayout } from '../../widgets/graph-layout'; @Component({ selector: 'app-experimental-map', diff --git a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts index d2d7cd5a..70e8d378 100644 --- a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts +++ b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { InterfaceLabelComponent } from './interface-label.component'; describe('InterfaceLabelComponent', () => { diff --git a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts index 9c1e2a0b..cd316ec9 100644 --- a/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts +++ b/src/app/cartography/components/experimental-map/interface-label/interface-label.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, Input, ChangeDetectorRef, ElementRef, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { CssFixer } from '../../../helpers/css-fixer'; diff --git a/src/app/cartography/components/experimental-map/link/link.component.spec.ts b/src/app/cartography/components/experimental-map/link/link.component.spec.ts index 50849f8b..f1e1960b 100644 --- a/src/app/cartography/components/experimental-map/link/link.component.spec.ts +++ b/src/app/cartography/components/experimental-map/link/link.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { LinkComponent } from './link.component'; describe('LinkComponent', () => { diff --git a/src/app/cartography/components/experimental-map/link/link.component.ts b/src/app/cartography/components/experimental-map/link/link.component.ts index c6a86d97..80069d94 100644 --- a/src/app/cartography/components/experimental-map/link/link.component.ts +++ b/src/app/cartography/components/experimental-map/link/link.component.ts @@ -1,20 +1,20 @@ import { + ChangeDetectorRef, Component, - OnInit, - Input, - ViewChild, ElementRef, EventEmitter, - ChangeDetectorRef, + Input, OnDestroy, + OnInit, + ViewChild, } from '@angular/core'; import { Subscription } from 'rxjs'; -import { LinkStrategy } from './strategies/link-strategy'; -import { EthernetLinkStrategy } from './strategies/ethernet-link-strategy'; -import { SerialLinkStrategy } from './strategies/serial-link-strategy'; import { MultiLinkCalculatorHelper } from '../../../helpers/multi-link-calculator-helper'; -import { Node } from '../../../models/node'; import { MapLink } from '../../../models/map/map-link'; +import { Node } from '../../../models/node'; +import { EthernetLinkStrategy } from './strategies/ethernet-link-strategy'; +import { LinkStrategy } from './strategies/link-strategy'; +import { SerialLinkStrategy } from './strategies/serial-link-strategy'; @Component({ selector: '[app-link]', diff --git a/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts b/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts index 554d17f0..98d2d1ba 100644 --- a/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts +++ b/src/app/cartography/components/experimental-map/link/strategies/ethernet-link-strategy.ts @@ -1,6 +1,6 @@ -import { LinkStrategy } from './link-strategy'; import { path } from 'd3-path'; import { MapLink } from '../../../../models/map/map-link'; +import { LinkStrategy } from './link-strategy'; export class EthernetLinkStrategy implements LinkStrategy { public d(link: MapLink): string { diff --git a/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts b/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts index 63cb4b12..c3872aaa 100644 --- a/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts +++ b/src/app/cartography/components/experimental-map/link/strategies/serial-link-strategy.ts @@ -1,6 +1,6 @@ import { path } from 'd3-path'; -import { LinkStrategy } from './link-strategy'; import { MapLink } from '../../../../models/map/map-link'; +import { LinkStrategy } from './link-strategy'; export class SerialLinkStrategy implements LinkStrategy { private linkToPoints(link: MapLink) { diff --git a/src/app/cartography/components/experimental-map/node/node.component.spec.ts b/src/app/cartography/components/experimental-map/node/node.component.spec.ts index 82d887f9..c35dda52 100644 --- a/src/app/cartography/components/experimental-map/node/node.component.spec.ts +++ b/src/app/cartography/components/experimental-map/node/node.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { NodeComponent } from './node.component'; describe('NodeComponent', () => { diff --git a/src/app/cartography/components/experimental-map/node/node.component.ts b/src/app/cartography/components/experimental-map/node/node.component.ts index fdd1d842..cea785f2 100644 --- a/src/app/cartography/components/experimental-map/node/node.component.ts +++ b/src/app/cartography/components/experimental-map/node/node.component.ts @@ -1,25 +1,24 @@ import { - Component, - OnInit, - Input, - ElementRef, - ViewChild, - ChangeDetectorRef, - ChangeDetectionStrategy, - Output, - EventEmitter, - OnDestroy, - OnChanges, AfterViewInit, + ChangeDetectionStrategy, + ChangeDetectorRef, + Component, + ElementRef, + EventEmitter, + Input, + OnChanges, + OnDestroy, + OnInit, + ViewChild, } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { Subscription } from 'rxjs'; +import { Symbol } from '../../../../models/symbol'; +import { DraggedDataEvent } from '../../../events/event-source'; +import { NodesEventSource } from '../../../events/nodes-event-source'; import { CssFixer } from '../../../helpers/css-fixer'; import { FontFixer } from '../../../helpers/font-fixer'; -import { Symbol } from '../../../../models/symbol'; import { MapNode } from '../../../models/map/map-node'; -import { NodesEventSource } from '../../../events/nodes-event-source'; -import { DraggedDataEvent } from '../../../events/event-source'; @Component({ selector: '[app-node]', diff --git a/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts b/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts index 174d5211..94c95763 100644 --- a/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts +++ b/src/app/cartography/components/experimental-map/selection/selection.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { SelectionComponent } from './selection.component'; describe('SelectionComponent', () => { diff --git a/src/app/cartography/components/experimental-map/selection/selection.component.ts b/src/app/cartography/components/experimental-map/selection/selection.component.ts index c8fb8959..f2d915a4 100644 --- a/src/app/cartography/components/experimental-map/selection/selection.component.ts +++ b/src/app/cartography/components/experimental-map/selection/selection.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, Input, AfterViewInit, ChangeDetectorRef, Output, EventEmitter } from '@angular/core'; -import { Observable, Subscription, Subject } from 'rxjs'; +import { AfterViewInit, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Observable, Subscription } from 'rxjs'; import { Rectangle } from '../../../models/rectangle'; @Component({ diff --git a/src/app/cartography/components/experimental-map/status/status.component.spec.ts b/src/app/cartography/components/experimental-map/status/status.component.spec.ts index 69e3562e..51032287 100644 --- a/src/app/cartography/components/experimental-map/status/status.component.spec.ts +++ b/src/app/cartography/components/experimental-map/status/status.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { StatusComponent } from './status.component'; describe('StatusComponent', () => { diff --git a/src/app/cartography/components/experimental-map/status/status.component.ts b/src/app/cartography/components/experimental-map/status/status.component.ts index cb7a5547..bc30e11c 100644 --- a/src/app/cartography/components/experimental-map/status/status.component.ts +++ b/src/app/cartography/components/experimental-map/status/status.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, Input, ChangeDetectorRef } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, Input } from '@angular/core'; @Component({ selector: '[app-status]', diff --git a/src/app/cartography/components/selection-control/selection-control.component.spec.ts b/src/app/cartography/components/selection-control/selection-control.component.spec.ts index 3299b5a3..6952edda 100644 --- a/src/app/cartography/components/selection-control/selection-control.component.spec.ts +++ b/src/app/cartography/components/selection-control/selection-control.component.spec.ts @@ -1,14 +1,13 @@ import { fakeAsync, tick } from '@angular/core/testing'; - -import { SelectionControlComponent } from './selection-control.component'; -import { SelectionManager } from '../../managers/selection-manager'; +import { instance, mock, when } from 'ts-mockito'; import { SelectionEventSource } from '../../events/selection-event-source'; -import { mock, when, instance } from 'ts-mockito'; -import { GraphDataManager } from '../../managers/graph-data-manager'; -import { MapNode } from '../../models/map/map-node'; -import { MapLink } from '../../models/map/map-link'; import { InRectangleHelper } from '../../helpers/in-rectangle-helper'; +import { GraphDataManager } from '../../managers/graph-data-manager'; +import { SelectionManager } from '../../managers/selection-manager'; +import { MapLink } from '../../models/map/map-link'; +import { MapNode } from '../../models/map/map-node'; import { Rectangle } from '../../models/rectangle'; +import { SelectionControlComponent } from './selection-control.component'; describe('SelectionControlComponent', () => { let component: SelectionControlComponent; diff --git a/src/app/cartography/components/selection-control/selection-control.component.ts b/src/app/cartography/components/selection-control/selection-control.component.ts index aa9f14d4..2f50d276 100644 --- a/src/app/cartography/components/selection-control/selection-control.component.ts +++ b/src/app/cartography/components/selection-control/selection-control.component.ts @@ -1,8 +1,8 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { SelectionEventSource } from '../../events/selection-event-source'; -import { GraphDataManager } from '../../managers/graph-data-manager'; import { InRectangleHelper } from '../../helpers/in-rectangle-helper'; +import { GraphDataManager } from '../../managers/graph-data-manager'; import { SelectionManager } from '../../managers/selection-manager'; import { Rectangle } from '../../models/rectangle'; diff --git a/src/app/cartography/components/selection-select/selection-select.component.spec.ts b/src/app/cartography/components/selection-select/selection-select.component.spec.ts index e7c45496..f819be27 100644 --- a/src/app/cartography/components/selection-select/selection-select.component.spec.ts +++ b/src/app/cartography/components/selection-select/selection-select.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { SelectionSelectComponent } from './selection-select.component'; describe('SelectionSelectComponent', () => { diff --git a/src/app/cartography/components/selection-select/selection-select.component.ts b/src/app/cartography/components/selection-select/selection-select.component.ts index 38e2775c..28d615b4 100644 --- a/src/app/cartography/components/selection-select/selection-select.component.ts +++ b/src/app/cartography/components/selection-select/selection-select.component.ts @@ -1,4 +1,4 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { SelectionManager } from '../../managers/selection-manager'; import { MapChangeDetectorRef } from '../../services/map-change-detector-ref'; diff --git a/src/app/cartography/components/text-editor/text-editor.component.spec.ts b/src/app/cartography/components/text-editor/text-editor.component.spec.ts index ef059460..7619b5c0 100644 --- a/src/app/cartography/components/text-editor/text-editor.component.spec.ts +++ b/src/app/cartography/components/text-editor/text-editor.component.spec.ts @@ -1,17 +1,17 @@ -import { TextEditorComponent } from './text-editor.component'; -import { ComponentFixture, TestBed, async } from '@angular/core/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { DrawingsEventSource } from '../../events/drawings-event-source'; -import { ToolsService } from '../../../services/tools.service'; -import { Context } from '../../models/context'; import { Renderer2 } from '@angular/core'; -import { MapScaleService } from '../../../services/mapScale.service'; -import { LinkService } from '../../../services/link.service'; -import { NodesDataSource } from '../../datasources/nodes-datasource'; -import { LinksDataSource } from '../../datasources/links-datasource'; -import { SelectionManager } from '../../managers/selection-manager'; -import { FontFixer } from '../../helpers/font-fixer'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MockedLinkService } from '../../../components/project-map/project-map.component.spec'; +import { LinkService } from '../../../services/link.service'; +import { MapScaleService } from '../../../services/mapScale.service'; +import { ToolsService } from '../../../services/tools.service'; +import { LinksDataSource } from '../../datasources/links-datasource'; +import { NodesDataSource } from '../../datasources/nodes-datasource'; +import { DrawingsEventSource } from '../../events/drawings-event-source'; +import { FontFixer } from '../../helpers/font-fixer'; +import { SelectionManager } from '../../managers/selection-manager'; +import { Context } from '../../models/context'; +import { TextEditorComponent } from './text-editor.component'; describe('TextEditorComponent', () => { let component: TextEditorComponent; diff --git a/src/app/cartography/components/text-editor/text-editor.component.ts b/src/app/cartography/components/text-editor/text-editor.component.ts index 237fc3f8..aed89350 100644 --- a/src/app/cartography/components/text-editor/text-editor.component.ts +++ b/src/app/cartography/components/text-editor/text-editor.component.ts @@ -1,35 +1,33 @@ import { Component, - ViewChild, ElementRef, - OnInit, - Input, EventEmitter, - OnDestroy, - Renderer2, + Input, NgZone, + OnDestroy, + OnInit, + Renderer2, + ViewChild, } from '@angular/core'; +import { select } from 'd3-selection'; +import { Subscription } from 'rxjs'; +import { StyleProperty } from '../../../components/project-map/drawings-editors/text-editor/text-editor.component'; +import { Link } from '../../../models/link'; +import { Server } from '../../../models/server'; +import { LinkService } from '../../../services/link.service'; +import { MapScaleService } from '../../../services/mapScale.service'; +import { ToolsService } from '../../../services/tools.service'; +import { LinksDataSource } from '../../datasources/links-datasource'; +import { NodesDataSource } from '../../datasources/nodes-datasource'; import { DrawingsEventSource } from '../../events/drawings-event-source'; import { TextAddedDataEvent, TextEditedDataEvent } from '../../events/event-source'; -import { ToolsService } from '../../../services/tools.service'; -import { select } from 'd3-selection'; -import { TextElement } from '../../models/drawings/text-element'; -import { Context } from '../../models/context'; -import { Subscription } from 'rxjs'; -import { MapScaleService } from '../../../services/mapScale.service'; -import { MapLabel } from '../../models/map/map-label'; -import { MapNode } from '../../models/map/map-node'; -import { NodesDataSource } from '../../datasources/nodes-datasource'; -import { Node } from '../../models/node'; -import { SelectionManager } from '../../managers/selection-manager'; -import { Server } from '../../../models/server'; -import { MapLinkNode } from '../../models/map/map-link-node'; -import { LinkService } from '../../../services/link.service'; -import { LinksDataSource } from '../../datasources/links-datasource'; -import { Link } from '../../../models/link'; -import { StyleProperty } from '../../../components/project-map/drawings-editors/text-editor/text-editor.component'; import { FontFixer } from '../../helpers/font-fixer'; +import { SelectionManager } from '../../managers/selection-manager'; +import { Context } from '../../models/context'; +import { TextElement } from '../../models/drawings/text-element'; import { Font } from '../../models/font'; +import { MapLinkNode } from '../../models/map/map-link-node'; +import { Node } from '../../models/node'; @Component({ selector: 'app-text-editor', diff --git a/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts b/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts index a45ebd29..52713816 100644 --- a/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts +++ b/src/app/cartography/converters/map/drawing-to-map-drawing-converter.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; import { Drawing } from '../../models/drawing'; import { MapDrawing } from '../../models/map/map-drawing'; +import { Converter } from '../converter'; @Injectable() export class DrawingToMapDrawingConverter implements Converter { diff --git a/src/app/cartography/converters/map/label-to-map-label-converter.ts b/src/app/cartography/converters/map/label-to-map-label-converter.ts index 0d1f0095..8214f2b8 100644 --- a/src/app/cartography/converters/map/label-to-map-label-converter.ts +++ b/src/app/cartography/converters/map/label-to-map-label-converter.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; +import { CssFixer } from '../../helpers/css-fixer'; +import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator'; +import { FontFixer } from '../../helpers/font-fixer'; import { Label } from '../../models/label'; import { MapLabel } from '../../models/map/map-label'; -import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator'; -import { CssFixer } from '../../helpers/css-fixer'; -import { FontFixer } from '../../helpers/font-fixer'; +import { Converter } from '../converter'; @Injectable() export class LabelToMapLabelConverter implements Converter { diff --git a/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts b/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts index 66039723..98a857a3 100644 --- a/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts +++ b/src/app/cartography/converters/map/link-node-to-map-link-node-converter.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; -import { LabelToMapLabelConverter } from './label-to-map-label-converter'; import { LinkNode } from '../../../models/link-node'; import { MapLinkNode } from '../../models/map/map-link-node'; +import { Converter } from '../converter'; +import { LabelToMapLabelConverter } from './label-to-map-label-converter'; @Injectable() export class LinkNodeToMapLinkNodeConverter implements Converter { diff --git a/src/app/cartography/converters/map/link-to-map-link-converter.ts b/src/app/cartography/converters/map/link-to-map-link-converter.ts index d22c646d..28ecf2c8 100644 --- a/src/app/cartography/converters/map/link-to-map-link-converter.ts +++ b/src/app/cartography/converters/map/link-to-map-link-converter.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; -import { LinkNodeToMapLinkNodeConverter } from './link-node-to-map-link-node-converter'; import { Link } from '../../../models/link'; import { MapLink } from '../../models/map/map-link'; +import { Converter } from '../converter'; +import { LinkNodeToMapLinkNodeConverter } from './link-node-to-map-link-node-converter'; @Injectable() export class LinkToMapLinkConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts b/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts index 88ee6c59..aa8a6c42 100644 --- a/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts +++ b/src/app/cartography/converters/map/map-drawing-to-drawing-converter.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; import { Drawing } from '../../models/drawing'; import { MapDrawing } from '../../models/map/map-drawing'; +import { Converter } from '../converter'; @Injectable() export class MapDrawingToDrawingConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts b/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts index 661b344a..e5466483 100644 --- a/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts +++ b/src/app/cartography/converters/map/map-drawing-to-svg-converter.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; -import { MapDrawing } from '../../models/map/map-drawing'; -import { RectElement } from '../../models/drawings/rect-element'; import { EllipseElement } from '../../models/drawings/ellipse-element'; import { LineElement } from '../../models/drawings/line-element'; +import { RectElement } from '../../models/drawings/rect-element'; import { TextElement } from '../../models/drawings/text-element'; +import { MapDrawing } from '../../models/map/map-drawing'; +import { Converter } from '../converter'; @Injectable() export class MapDrawingToSvgConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-label-to-label-converter.ts b/src/app/cartography/converters/map/map-label-to-label-converter.ts index d6aea518..bc3b0865 100644 --- a/src/app/cartography/converters/map/map-label-to-label-converter.ts +++ b/src/app/cartography/converters/map/map-label-to-label-converter.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; +import { CssFixer } from '../../helpers/css-fixer'; +import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator'; +import { FontFixer } from '../../helpers/font-fixer'; import { Label } from '../../models/label'; import { MapLabel } from '../../models/map/map-label'; -import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator'; -import { CssFixer } from '../../helpers/css-fixer'; -import { FontFixer } from '../../helpers/font-fixer'; +import { Converter } from '../converter'; @Injectable() export class MapLabelToLabelConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts b/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts index 7e2f739f..f8087278 100644 --- a/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts +++ b/src/app/cartography/converters/map/map-link-node-to-link-node-converter.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; -import { MapLinkNode } from '../../models/map/map-link-node'; -import { MapLabelToLabelConverter } from './map-label-to-label-converter'; import { LinkNode } from '../../../models/link-node'; +import { MapLinkNode } from '../../models/map/map-link-node'; +import { Converter } from '../converter'; +import { MapLabelToLabelConverter } from './map-label-to-label-converter'; @Injectable() export class MapLinkNodeToLinkNodeConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-link-to-link-converter.ts b/src/app/cartography/converters/map/map-link-to-link-converter.ts index ba56d14e..ae269a42 100644 --- a/src/app/cartography/converters/map/map-link-to-link-converter.ts +++ b/src/app/cartography/converters/map/map-link-to-link-converter.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; -import { MapLinkNodeToLinkNodeConverter } from './map-link-node-to-link-node-converter'; import { Link } from '../../../models/link'; import { MapLink } from '../../models/map/map-link'; +import { Converter } from '../converter'; +import { MapLinkNodeToLinkNodeConverter } from './map-link-node-to-link-node-converter'; @Injectable() export class MapLinkToLinkConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-node-to-node-converter.ts b/src/app/cartography/converters/map/map-node-to-node-converter.ts index 3a207c55..072bfee2 100644 --- a/src/app/cartography/converters/map/map-node-to-node-converter.ts +++ b/src/app/cartography/converters/map/map-node-to-node-converter.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; import { MapNode } from '../../models/map/map-node'; +import { Node } from '../../models/node'; +import { Converter } from '../converter'; import { MapLabelToLabelConverter } from './map-label-to-label-converter'; import { MapPortToPortConverter } from './map-port-to-port-converter'; -import { Node } from '../../models/node'; @Injectable() export class MapNodeToNodeConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-port-to-port-converter.ts b/src/app/cartography/converters/map/map-port-to-port-converter.ts index aecd4fde..464985f4 100644 --- a/src/app/cartography/converters/map/map-port-to-port-converter.ts +++ b/src/app/cartography/converters/map/map-port-to-port-converter.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; import { Port } from '../../../models/port'; import { MapPort } from '../../models/map/map-port'; +import { Converter } from '../converter'; @Injectable() export class MapPortToPortConverter implements Converter { diff --git a/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts b/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts index 9503e80b..5e95e61c 100644 --- a/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts +++ b/src/app/cartography/converters/map/map-symbol-to-symbol-converter.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; -import { MapSymbol } from '../../models/map/map-symbol'; import { Symbol } from '../../../models/symbol'; +import { MapSymbol } from '../../models/map/map-symbol'; +import { Converter } from '../converter'; @Injectable() export class MapSymbolToSymbolConverter implements Converter { diff --git a/src/app/cartography/converters/map/node-to-map-node-converter.ts b/src/app/cartography/converters/map/node-to-map-node-converter.ts index b56ce698..b31e4b84 100644 --- a/src/app/cartography/converters/map/node-to-map-node-converter.ts +++ b/src/app/cartography/converters/map/node-to-map-node-converter.ts @@ -1,13 +1,12 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; +import { CssFixer } from '../../helpers/css-fixer'; +import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator'; +import { FontFixer } from '../../helpers/font-fixer'; import { MapNode } from '../../models/map/map-node'; import { Node } from '../../models/node'; +import { Converter } from '../converter'; import { LabelToMapLabelConverter } from './label-to-map-label-converter'; import { PortToMapPortConverter } from './port-to-map-port-converter'; -import { FontBBoxCalculator } from '../../helpers/font-bbox-calculator'; -import { CssFixer } from '../../helpers/css-fixer'; -import { FontFixer } from '../../helpers/font-fixer'; @Injectable() export class NodeToMapNodeConverter implements Converter { diff --git a/src/app/cartography/converters/map/port-to-map-port-converter.ts b/src/app/cartography/converters/map/port-to-map-port-converter.ts index 8a348ae1..efbdc253 100644 --- a/src/app/cartography/converters/map/port-to-map-port-converter.ts +++ b/src/app/cartography/converters/map/port-to-map-port-converter.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; import { Port } from '../../../models/port'; import { MapPort } from '../../models/map/map-port'; +import { Converter } from '../converter'; @Injectable() export class PortToMapPortConverter implements Converter { diff --git a/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts b/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts index 46f1077d..011c0571 100644 --- a/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts +++ b/src/app/cartography/converters/map/symbol-to-map-symbol-converter.ts @@ -1,8 +1,7 @@ import { Injectable } from '@angular/core'; - -import { Converter } from '../converter'; import { Symbol } from '../../../models/symbol'; import { MapSymbol } from '../../models/map/map-symbol'; +import { Converter } from '../converter'; @Injectable() export class SymbolToMapSymbolConverter implements Converter { diff --git a/src/app/cartography/converters/styles-to-font-converter.ts b/src/app/cartography/converters/styles-to-font-converter.ts index 26cb132c..3c699151 100644 --- a/src/app/cartography/converters/styles-to-font-converter.ts +++ b/src/app/cartography/converters/styles-to-font-converter.ts @@ -1,8 +1,7 @@ -import * as csstree from 'css-tree'; - import { Injectable } from '@angular/core'; -import { Converter } from './converter'; +import * as csstree from 'css-tree'; import { Font } from '../models/font'; +import { Converter } from './converter'; @Injectable() export class StylesToFontConverter implements Converter { diff --git a/src/app/cartography/d3-map.imports.ts b/src/app/cartography/d3-map.imports.ts index 4f4ab643..2c35abaa 100644 --- a/src/app/cartography/d3-map.imports.ts +++ b/src/app/cartography/d3-map.imports.ts @@ -1,22 +1,22 @@ -import { GraphLayout } from './widgets/graph-layout'; -import { LinksWidget } from './widgets/links'; -import { NodesWidget } from './widgets/nodes'; -import { DrawingsWidget } from './widgets/drawings'; -import { DrawingLineWidget } from './widgets/drawing-line'; -import { SelectionTool } from './tools/selection-tool'; import { MovingTool } from './tools/moving-tool'; -import { LayersWidget } from './widgets/layers'; -import { LinkWidget } from './widgets/link'; -import { InterfaceStatusWidget } from './widgets/interface-status'; -import { InterfaceLabelWidget } from './widgets/interface-label'; +import { SelectionTool } from './tools/selection-tool'; +import { DrawingWidget } from './widgets/drawing'; +import { DrawingLineWidget } from './widgets/drawing-line'; +import { DrawingsWidget } from './widgets/drawings'; import { EllipseDrawingWidget } from './widgets/drawings/ellipse-drawing'; import { ImageDrawingWidget } from './widgets/drawings/image-drawing'; +import { LineDrawingWidget } from './widgets/drawings/line-drawing'; import { RectDrawingWidget } from './widgets/drawings/rect-drawing'; import { TextDrawingWidget } from './widgets/drawings/text-drawing'; -import { LineDrawingWidget } from './widgets/drawings/line-drawing'; -import { NodeWidget } from './widgets/node'; -import { DrawingWidget } from './widgets/drawing'; +import { GraphLayout } from './widgets/graph-layout'; +import { InterfaceLabelWidget } from './widgets/interface-label'; +import { InterfaceStatusWidget } from './widgets/interface-status'; import { LabelWidget } from './widgets/label'; +import { LayersWidget } from './widgets/layers'; +import { LinkWidget } from './widgets/link'; +import { LinksWidget } from './widgets/links'; +import { NodeWidget } from './widgets/node'; +import { NodesWidget } from './widgets/nodes'; export const D3_MAP_IMPORTS = [ GraphLayout, diff --git a/src/app/cartography/datasources/drawings-datasource.spec.ts b/src/app/cartography/datasources/drawings-datasource.spec.ts index 9404dfd6..ccdbc539 100644 --- a/src/app/cartography/datasources/drawings-datasource.spec.ts +++ b/src/app/cartography/datasources/drawings-datasource.spec.ts @@ -1,5 +1,5 @@ -import { DrawingsDataSource } from './drawings-datasource'; import { Drawing } from '../models/drawing'; +import { DrawingsDataSource } from './drawings-datasource'; describe('DrawingsDataSource', () => { let dataSource: DrawingsDataSource; diff --git a/src/app/cartography/datasources/drawings-datasource.ts b/src/app/cartography/datasources/drawings-datasource.ts index a5f4c67f..bf9f5eb0 100644 --- a/src/app/cartography/datasources/drawings-datasource.ts +++ b/src/app/cartography/datasources/drawings-datasource.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; - -import { DataSource } from './datasource'; import { Drawing } from '../models/drawing'; +import { DataSource } from './datasource'; @Injectable() export class DrawingsDataSource extends DataSource { diff --git a/src/app/cartography/datasources/links-datasource.spec.ts b/src/app/cartography/datasources/links-datasource.spec.ts index 107f49e6..99675e9e 100644 --- a/src/app/cartography/datasources/links-datasource.spec.ts +++ b/src/app/cartography/datasources/links-datasource.spec.ts @@ -1,5 +1,5 @@ -import { LinksDataSource } from './links-datasource'; import { Link } from '../../models/link'; +import { LinksDataSource } from './links-datasource'; describe('LinksDataSource', () => { let dataSource: LinksDataSource; diff --git a/src/app/cartography/datasources/links-datasource.ts b/src/app/cartography/datasources/links-datasource.ts index ee626e19..a60e3fba 100644 --- a/src/app/cartography/datasources/links-datasource.ts +++ b/src/app/cartography/datasources/links-datasource.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; - -import { DataSource } from './datasource'; import { Link } from '../../models/link'; +import { DataSource } from './datasource'; @Injectable() export class LinksDataSource extends DataSource { diff --git a/src/app/cartography/datasources/map-datasource.ts b/src/app/cartography/datasources/map-datasource.ts index 8fbe3466..4a42ee8f 100644 --- a/src/app/cartography/datasources/map-datasource.ts +++ b/src/app/cartography/datasources/map-datasource.ts @@ -1,9 +1,9 @@ -import { DataSource } from './datasource'; -import { MapNode } from '../models/map/map-node'; -import { MapLink } from '../models/map/map-link'; -import { MapDrawing } from '../models/map/map-drawing'; -import { MapSymbol } from '../models/map/map-symbol'; import { Injectable } from '@angular/core'; +import { MapDrawing } from '../models/map/map-drawing'; +import { MapLink } from '../models/map/map-link'; +import { MapNode } from '../models/map/map-node'; +import { MapSymbol } from '../models/map/map-symbol'; +import { DataSource } from './datasource'; export interface Indexed { id: number | string; diff --git a/src/app/cartography/datasources/nodes-datasource.spec.ts b/src/app/cartography/datasources/nodes-datasource.spec.ts index f0f87fee..4c3278d3 100644 --- a/src/app/cartography/datasources/nodes-datasource.spec.ts +++ b/src/app/cartography/datasources/nodes-datasource.spec.ts @@ -1,5 +1,5 @@ -import { NodesDataSource } from './nodes-datasource'; import { Node } from '../models/node'; +import { NodesDataSource } from './nodes-datasource'; describe('NodesDataSource', () => { let dataSource: NodesDataSource; diff --git a/src/app/cartography/datasources/nodes-datasource.ts b/src/app/cartography/datasources/nodes-datasource.ts index d6277283..a3230830 100644 --- a/src/app/cartography/datasources/nodes-datasource.ts +++ b/src/app/cartography/datasources/nodes-datasource.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; - import { Node } from '../models/node'; import { DataSource } from './datasource'; diff --git a/src/app/cartography/datasources/symbols-datasource.spec.ts b/src/app/cartography/datasources/symbols-datasource.spec.ts index f9d3d461..124e7d1e 100644 --- a/src/app/cartography/datasources/symbols-datasource.spec.ts +++ b/src/app/cartography/datasources/symbols-datasource.spec.ts @@ -1,5 +1,5 @@ -import { SymbolsDataSource } from './symbols-datasource'; import { Symbol } from '../../models/symbol'; +import { SymbolsDataSource } from './symbols-datasource'; describe('SymbolsDataSource', () => { let dataSource: SymbolsDataSource; diff --git a/src/app/cartography/datasources/symbols-datasource.ts b/src/app/cartography/datasources/symbols-datasource.ts index 599b5eb5..36f7225e 100644 --- a/src/app/cartography/datasources/symbols-datasource.ts +++ b/src/app/cartography/datasources/symbols-datasource.ts @@ -1,7 +1,6 @@ import { Injectable } from '@angular/core'; - -import { DataSource } from './datasource'; import { Symbol } from '../../models/symbol'; +import { DataSource } from './datasource'; @Injectable() export class SymbolsDataSource extends DataSource { diff --git a/src/app/cartography/directives/moving-canvas.directive.spec.ts b/src/app/cartography/directives/moving-canvas.directive.spec.ts index db5333cf..0a9cda7d 100644 --- a/src/app/cartography/directives/moving-canvas.directive.spec.ts +++ b/src/app/cartography/directives/moving-canvas.directive.spec.ts @@ -1,9 +1,9 @@ -import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { Context } from '../models/context'; -import { MovingEventSource } from '../events/moving-event-source'; -import { MovingCanvasDirective } from './moving-canvas.directive'; import { Component } from '@angular/core'; +import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { MovingEventSource } from '../events/moving-event-source'; +import { Context } from '../models/context'; +import { MovingCanvasDirective } from './moving-canvas.directive'; @Component({ template: ` diff --git a/src/app/cartography/directives/moving-canvas.directive.ts b/src/app/cartography/directives/moving-canvas.directive.ts index 79fdfbd0..d431ea5f 100644 --- a/src/app/cartography/directives/moving-canvas.directive.ts +++ b/src/app/cartography/directives/moving-canvas.directive.ts @@ -1,8 +1,8 @@ -import { HostListener, ElementRef, Directive, Input, OnInit, OnDestroy, Renderer2 } from '@angular/core'; +import { Directive, ElementRef, HostListener, OnDestroy, OnInit } from '@angular/core'; +import { select } from 'd3-selection'; import { Subscription } from 'rxjs'; import { MovingEventSource } from '../events/moving-event-source'; import { Context } from '../models/context'; -import { select } from 'd3-selection'; @Directive({ selector: '[movingCanvas]', diff --git a/src/app/cartography/directives/zooming-canvas.directive.spec.ts b/src/app/cartography/directives/zooming-canvas.directive.spec.ts index 9b4e077a..3407eaef 100644 --- a/src/app/cartography/directives/zooming-canvas.directive.spec.ts +++ b/src/app/cartography/directives/zooming-canvas.directive.spec.ts @@ -1,10 +1,10 @@ -import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core/testing'; -import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { Context } from '../models/context'; -import { MovingEventSource } from '../events/moving-event-source'; import { Component } from '@angular/core'; -import { ZoomingCanvasDirective } from './zooming-canvas.directive'; +import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { MapScaleService } from '../../services/mapScale.service'; +import { MovingEventSource } from '../events/moving-event-source'; +import { Context } from '../models/context'; +import { ZoomingCanvasDirective } from './zooming-canvas.directive'; @Component({ template: ` diff --git a/src/app/cartography/directives/zooming-canvas.directive.ts b/src/app/cartography/directives/zooming-canvas.directive.ts index bc1b6b61..c72bc874 100644 --- a/src/app/cartography/directives/zooming-canvas.directive.ts +++ b/src/app/cartography/directives/zooming-canvas.directive.ts @@ -1,9 +1,9 @@ -import { ElementRef, Directive, OnInit, OnDestroy } from '@angular/core'; +import { Directive, ElementRef, OnDestroy, OnInit } from '@angular/core'; +import { select } from 'd3-selection'; import { Subscription } from 'rxjs'; +import { MapScaleService } from '../../services/mapScale.service'; import { MovingEventSource } from '../events/moving-event-source'; import { Context } from '../models/context'; -import { select } from 'd3-selection'; -import { MapScaleService } from '../../services/mapScale.service'; @Directive({ selector: '[zoomingCanvas]', diff --git a/src/app/cartography/events/drawings-event-source.ts b/src/app/cartography/events/drawings-event-source.ts index 35173a19..fb1cbabc 100644 --- a/src/app/cartography/events/drawings-event-source.ts +++ b/src/app/cartography/events/drawings-event-source.ts @@ -1,12 +1,12 @@ -import { Injectable, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; +import { MapDrawing } from '../models/map/map-drawing'; import { + AddedDataEvent, DraggedDataEvent, ResizedDataEvent, TextAddedDataEvent, TextEditedDataEvent, - AddedDataEvent, } from './event-source'; -import { MapDrawing } from '../models/map/map-drawing'; @Injectable() export class DrawingsEventSource { diff --git a/src/app/cartography/events/event-source.ts b/src/app/cartography/events/event-source.ts index 1b7fdd72..7aa7d22b 100644 --- a/src/app/cartography/events/event-source.ts +++ b/src/app/cartography/events/event-source.ts @@ -1,8 +1,8 @@ import { TextElement } from '../models/drawings/text-element'; import { MapDrawing } from '../models/map/map-drawing'; +import { MapLabel } from '../models/map/map-label'; import { MapLink } from '../models/map/map-link'; import { MapLinkNode } from '../models/map/map-link-node'; -import { MapLabel } from '../models/map/map-label'; export class DataEventSource { constructor(public datum: T, public dx: number, public dy: number) {} diff --git a/src/app/cartography/events/links-event-source.ts b/src/app/cartography/events/links-event-source.ts index df1f2981..53341290 100644 --- a/src/app/cartography/events/links-event-source.ts +++ b/src/app/cartography/events/links-event-source.ts @@ -1,7 +1,7 @@ -import { Injectable, EventEmitter } from '@angular/core'; -import { MapLinkCreated } from './links'; +import { EventEmitter, Injectable } from '@angular/core'; import { MapLinkNode } from '../models/map/map-link-node'; import { DraggedDataEvent } from './event-source'; +import { MapLinkCreated } from './links'; @Injectable() export class LinksEventSource { diff --git a/src/app/cartography/events/moving-event-source.ts b/src/app/cartography/events/moving-event-source.ts index 1dc96de8..af55f675 100644 --- a/src/app/cartography/events/moving-event-source.ts +++ b/src/app/cartography/events/moving-event-source.ts @@ -1,4 +1,4 @@ -import { Injectable, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; @Injectable() export class MovingEventSource { diff --git a/src/app/cartography/events/nodes-event-source.ts b/src/app/cartography/events/nodes-event-source.ts index 02406606..ea180e25 100644 --- a/src/app/cartography/events/nodes-event-source.ts +++ b/src/app/cartography/events/nodes-event-source.ts @@ -1,7 +1,7 @@ -import { Injectable, EventEmitter } from '@angular/core'; -import { DraggedDataEvent, ClickedDataEvent } from './event-source'; -import { MapNode } from '../models/map/map-node'; +import { EventEmitter, Injectable } from '@angular/core'; import { MapLabel } from '../models/map/map-label'; +import { MapNode } from '../models/map/map-node'; +import { ClickedDataEvent, DraggedDataEvent } from './event-source'; @Injectable() export class NodesEventSource { diff --git a/src/app/cartography/helpers/css-fixer.ts b/src/app/cartography/helpers/css-fixer.ts index 6b021b61..15ea0f94 100644 --- a/src/app/cartography/helpers/css-fixer.ts +++ b/src/app/cartography/helpers/css-fixer.ts @@ -1,6 +1,5 @@ -import * as csstree from 'css-tree'; - import { Injectable } from '@angular/core'; +import * as csstree from 'css-tree'; @Injectable() export class CssFixer { diff --git a/src/app/cartography/helpers/default-drawings-factory.ts b/src/app/cartography/helpers/default-drawings-factory.ts index d87af1e9..7cd8044b 100644 --- a/src/app/cartography/helpers/default-drawings-factory.ts +++ b/src/app/cartography/helpers/default-drawings-factory.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; -import { TextElementFactory } from './drawings-factory/text-element-factory'; -import { EllipseElementFactory } from './drawings-factory/ellipse-element-factory'; -import { RectangleElementFactory } from './drawings-factory/rectangle-element-factory'; -import { LineElementFactory } from './drawings-factory/line-element-factory'; -import { DrawingElementFactory } from './drawings-factory/drawing-element-factory'; import { MapDrawing } from '../models/map/map-drawing'; +import { DrawingElementFactory } from './drawings-factory/drawing-element-factory'; +import { EllipseElementFactory } from './drawings-factory/ellipse-element-factory'; +import { LineElementFactory } from './drawings-factory/line-element-factory'; +import { RectangleElementFactory } from './drawings-factory/rectangle-element-factory'; +import { TextElementFactory } from './drawings-factory/text-element-factory'; @Injectable() export class DefaultDrawingsFactory { diff --git a/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts b/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts index b2b6b7e7..2385268b 100644 --- a/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts +++ b/src/app/cartography/helpers/drawings-factory/ellipse-element-factory.ts @@ -1,7 +1,7 @@ -import { DrawingElementFactory } from './drawing-element-factory'; +import { Injectable } from '@angular/core'; import { DrawingElement } from '../../models/drawings/drawing-element'; import { EllipseElement } from '../../models/drawings/ellipse-element'; -import { Injectable } from '@angular/core'; +import { DrawingElementFactory } from './drawing-element-factory'; @Injectable() export class EllipseElementFactory implements DrawingElementFactory { diff --git a/src/app/cartography/helpers/drawings-factory/line-element-factory.ts b/src/app/cartography/helpers/drawings-factory/line-element-factory.ts index e5bf1fb7..f528258c 100644 --- a/src/app/cartography/helpers/drawings-factory/line-element-factory.ts +++ b/src/app/cartography/helpers/drawings-factory/line-element-factory.ts @@ -1,7 +1,7 @@ -import { DrawingElementFactory } from './drawing-element-factory'; +import { Injectable } from '@angular/core'; import { DrawingElement } from '../../models/drawings/drawing-element'; import { LineElement } from '../../models/drawings/line-element'; -import { Injectable } from '@angular/core'; +import { DrawingElementFactory } from './drawing-element-factory'; @Injectable() export class LineElementFactory implements DrawingElementFactory { diff --git a/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts b/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts index 96ea65fa..5e13236b 100644 --- a/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts +++ b/src/app/cartography/helpers/drawings-factory/rectangle-element-factory.ts @@ -1,7 +1,7 @@ -import { DrawingElementFactory } from './drawing-element-factory'; +import { Injectable } from '@angular/core'; import { DrawingElement } from '../../models/drawings/drawing-element'; import { RectElement } from '../../models/drawings/rect-element'; -import { Injectable } from '@angular/core'; +import { DrawingElementFactory } from './drawing-element-factory'; @Injectable() export class RectangleElementFactory implements DrawingElementFactory { diff --git a/src/app/cartography/helpers/drawings-factory/text-element-factory.ts b/src/app/cartography/helpers/drawings-factory/text-element-factory.ts index 48449a3f..d4d978ba 100644 --- a/src/app/cartography/helpers/drawings-factory/text-element-factory.ts +++ b/src/app/cartography/helpers/drawings-factory/text-element-factory.ts @@ -1,7 +1,7 @@ -import { DrawingElementFactory } from './drawing-element-factory'; +import { Injectable } from '@angular/core'; import { DrawingElement } from '../../models/drawings/drawing-element'; import { TextElement } from '../../models/drawings/text-element'; -import { Injectable } from '@angular/core'; +import { DrawingElementFactory } from './drawing-element-factory'; @Injectable() export class TextElementFactory implements DrawingElementFactory { diff --git a/src/app/cartography/helpers/font-fixer.spec.ts b/src/app/cartography/helpers/font-fixer.spec.ts index 67064c12..ea9d6eaa 100644 --- a/src/app/cartography/helpers/font-fixer.spec.ts +++ b/src/app/cartography/helpers/font-fixer.spec.ts @@ -1,5 +1,5 @@ -import { FontFixer } from './font-fixer'; import { Font } from '../models/font'; +import { FontFixer } from './font-fixer'; describe('FontFixer', () => { let fixer: FontFixer; diff --git a/src/app/cartography/helpers/font-fixer.ts b/src/app/cartography/helpers/font-fixer.ts index 75a4bbc0..f038ca8a 100644 --- a/src/app/cartography/helpers/font-fixer.ts +++ b/src/app/cartography/helpers/font-fixer.ts @@ -1,5 +1,5 @@ -import * as csstree from 'css-tree'; import { Injectable } from '@angular/core'; +import * as csstree from 'css-tree'; import { Font } from '../models/font'; /** diff --git a/src/app/cartography/helpers/in-rectangle-helper.spec.ts b/src/app/cartography/helpers/in-rectangle-helper.spec.ts index 06414819..13f92663 100644 --- a/src/app/cartography/helpers/in-rectangle-helper.spec.ts +++ b/src/app/cartography/helpers/in-rectangle-helper.spec.ts @@ -1,5 +1,5 @@ -import { InRectangleHelper } from './in-rectangle-helper'; import { Rectangle } from '../models/rectangle'; +import { InRectangleHelper } from './in-rectangle-helper'; describe('InRectangleHelper', () => { let inRectangleHelper: InRectangleHelper; diff --git a/src/app/cartography/helpers/in-rectangle-helper.ts b/src/app/cartography/helpers/in-rectangle-helper.ts index 98c86239..d72f1bb6 100644 --- a/src/app/cartography/helpers/in-rectangle-helper.ts +++ b/src/app/cartography/helpers/in-rectangle-helper.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; - import { Rectangle } from '../models/rectangle'; @Injectable() diff --git a/src/app/cartography/helpers/qt-dasharray-fixer.ts b/src/app/cartography/helpers/qt-dasharray-fixer.ts index 1f13a71f..31e2a7c2 100644 --- a/src/app/cartography/helpers/qt-dasharray-fixer.ts +++ b/src/app/cartography/helpers/qt-dasharray-fixer.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { Font } from '../models/font'; /** * GNS3 GUI performs mapping from QT styles to SVG dasharray, but styles don't match diff --git a/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts b/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts index 05f00655..de7734de 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter.spec.ts @@ -1,5 +1,5 @@ -import { SvgToDrawingConverter } from './svg-to-drawing-converter'; import { TextElement } from '../models/drawings/text-element'; +import { SvgToDrawingConverter } from './svg-to-drawing-converter'; describe('SvgToDrawingHelper', () => { let svgToDrawingConverter: SvgToDrawingConverter; diff --git a/src/app/cartography/helpers/svg-to-drawing-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter.ts index 77eea3a7..44a066f2 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter.ts @@ -1,11 +1,11 @@ import { Injectable } from '@angular/core'; import { DrawingElement } from '../models/drawings/drawing-element'; +import { EllipseConverter } from './svg-to-drawing-converter/ellipse-converter'; +import { ImageConverter } from './svg-to-drawing-converter/image-converter'; +import { LineConverter } from './svg-to-drawing-converter/line-converter'; +import { RectConverter } from './svg-to-drawing-converter/rect-converter'; import { SvgConverter } from './svg-to-drawing-converter/svg-converter'; import { TextConverter } from './svg-to-drawing-converter/text-converter'; -import { ImageConverter } from './svg-to-drawing-converter/image-converter'; -import { RectConverter } from './svg-to-drawing-converter/rect-converter'; -import { LineConverter } from './svg-to-drawing-converter/line-converter'; -import { EllipseConverter } from './svg-to-drawing-converter/ellipse-converter'; @Injectable() export class SvgToDrawingConverter { diff --git a/src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.ts index b72ba356..451034eb 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter/ellipse-converter.ts @@ -1,5 +1,5 @@ -import { SvgConverter } from './svg-converter'; import { EllipseElement } from '../../models/drawings/ellipse-element'; +import { SvgConverter } from './svg-converter'; export class EllipseConverter implements SvgConverter { convert(element: Element): EllipseElement { diff --git a/src/app/cartography/helpers/svg-to-drawing-converter/image-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/image-converter.ts index e3412146..e40b28de 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter/image-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter/image-converter.ts @@ -1,5 +1,5 @@ -import { SvgConverter } from './svg-converter'; import { ImageElement } from '../../models/drawings/image-element'; +import { SvgConverter } from './svg-converter'; export class ImageConverter implements SvgConverter { convert(element: Element): ImageElement { diff --git a/src/app/cartography/helpers/svg-to-drawing-converter/line-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/line-converter.ts index 19c1a792..4fbb9857 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter/line-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter/line-converter.ts @@ -1,5 +1,5 @@ -import { SvgConverter } from './svg-converter'; import { LineElement } from '../../models/drawings/line-element'; +import { SvgConverter } from './svg-converter'; export class LineConverter implements SvgConverter { convert(element: Element): LineElement { diff --git a/src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.ts index 7682202c..a5b98d24 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter/rect-converter.ts @@ -1,5 +1,5 @@ -import { SvgConverter } from './svg-converter'; import { RectElement } from '../../models/drawings/rect-element'; +import { SvgConverter } from './svg-converter'; export class RectConverter implements SvgConverter { convert(element: Element): RectElement { diff --git a/src/app/cartography/helpers/svg-to-drawing-converter/text-converter.ts b/src/app/cartography/helpers/svg-to-drawing-converter/text-converter.ts index 7900a2bf..387a8faa 100644 --- a/src/app/cartography/helpers/svg-to-drawing-converter/text-converter.ts +++ b/src/app/cartography/helpers/svg-to-drawing-converter/text-converter.ts @@ -1,5 +1,5 @@ -import { SvgConverter } from './svg-converter'; import { TextElement } from '../../models/drawings/text-element'; +import { SvgConverter } from './svg-converter'; export class TextConverter implements SvgConverter { convert(element: Element): TextElement { diff --git a/src/app/cartography/managers/graph-data-manager.ts b/src/app/cartography/managers/graph-data-manager.ts index 5f682600..278e96a0 100644 --- a/src/app/cartography/managers/graph-data-manager.ts +++ b/src/app/cartography/managers/graph-data-manager.ts @@ -1,22 +1,22 @@ import { Injectable } from '@angular/core'; -import { Node } from '../models/node'; -import { NodeToMapNodeConverter } from '../converters/map/node-to-map-node-converter'; -import { LinkToMapLinkConverter } from '../converters/map/link-to-map-link-converter'; -import { DrawingToMapDrawingConverter } from '../converters/map/drawing-to-map-drawing-converter'; -import { SymbolToMapSymbolConverter } from '../converters/map/symbol-to-map-symbol-converter'; -import { MapNode } from '../models/map/map-node'; -import { MapLink } from '../models/map/map-link'; import { Link } from '../../models/link'; -import { Drawing } from '../models/drawing'; import { Symbol } from '../../models/symbol'; -import { LayersManager } from './layers-manager'; +import { DrawingToMapDrawingConverter } from '../converters/map/drawing-to-map-drawing-converter'; +import { LinkToMapLinkConverter } from '../converters/map/link-to-map-link-converter'; +import { NodeToMapNodeConverter } from '../converters/map/node-to-map-node-converter'; +import { SymbolToMapSymbolConverter } from '../converters/map/symbol-to-map-symbol-converter'; import { - MapNodesDataSource, - MapLinksDataSource, MapDrawingsDataSource, + MapLinksDataSource, + MapNodesDataSource, MapSymbolsDataSource, } from '../datasources/map-datasource'; import { MultiLinkCalculatorHelper } from '../helpers/multi-link-calculator-helper'; +import { Drawing } from '../models/drawing'; +import { MapLink } from '../models/map/map-link'; +import { MapNode } from '../models/map/map-node'; +import { Node } from '../models/node'; +import { LayersManager } from './layers-manager'; @Injectable() export class GraphDataManager { diff --git a/src/app/cartography/managers/layers-manager.spec.ts b/src/app/cartography/managers/layers-manager.spec.ts index 8da09cd6..21cfb6af 100644 --- a/src/app/cartography/managers/layers-manager.spec.ts +++ b/src/app/cartography/managers/layers-manager.spec.ts @@ -1,7 +1,7 @@ -import { LayersManager } from './layers-manager'; import { MapDrawing } from '../models/map/map-drawing'; import { MapLink } from '../models/map/map-link'; import { MapNode } from '../models/map/map-node'; +import { LayersManager } from './layers-manager'; describe('LayersManager', () => { let manager: LayersManager; diff --git a/src/app/cartography/managers/layers-manager.ts b/src/app/cartography/managers/layers-manager.ts index b359489f..f0e6007b 100644 --- a/src/app/cartography/managers/layers-manager.ts +++ b/src/app/cartography/managers/layers-manager.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; - import { Layer } from '../models/layer'; -import { Dictionary } from '../models/types'; -import { MapNode } from '../models/map/map-node'; import { MapDrawing } from '../models/map/map-drawing'; import { MapLink } from '../models/map/map-link'; +import { MapNode } from '../models/map/map-node'; +import { Dictionary } from '../models/types'; @Injectable() export class LayersManager { diff --git a/src/app/cartography/managers/selection-manager.ts b/src/app/cartography/managers/selection-manager.ts index 5be598f8..e8aaf740 100644 --- a/src/app/cartography/managers/selection-manager.ts +++ b/src/app/cartography/managers/selection-manager.ts @@ -1,5 +1,4 @@ -import { Injectable, EventEmitter } from '@angular/core'; - +import { EventEmitter, Injectable } from '@angular/core'; import { Indexed } from '../datasources/map-datasource'; @Injectable() diff --git a/src/app/cartography/models/context.ts b/src/app/cartography/models/context.ts index ae90fac1..07340beb 100644 --- a/src/app/cartography/models/context.ts +++ b/src/app/cartography/models/context.ts @@ -1,6 +1,6 @@ -import { Size } from './size'; -import { Point } from './point'; import { Injectable } from '@angular/core'; +import { Point } from './point'; +import { Size } from './size'; export class Transformation { constructor(public x: number, public y: number, public k: number) {} diff --git a/src/app/cartography/models/drawings/text-element.ts b/src/app/cartography/models/drawings/text-element.ts index 79c9c7f3..ba5ea6e0 100644 --- a/src/app/cartography/models/drawings/text-element.ts +++ b/src/app/cartography/models/drawings/text-element.ts @@ -1,5 +1,5 @@ -import { DrawingElement } from './drawing-element'; import { Font } from '../font'; +import { DrawingElement } from './drawing-element'; export class TextElement implements DrawingElement, Font { height: number; diff --git a/src/app/cartography/models/layer.ts b/src/app/cartography/models/layer.ts index 88c55487..54ec697a 100644 --- a/src/app/cartography/models/layer.ts +++ b/src/app/cartography/models/layer.ts @@ -1,6 +1,6 @@ -import { MapNode } from './map/map-node'; import { MapDrawing } from './map/map-drawing'; import { MapLink } from './map/map-link'; +import { MapNode } from './map/map-node'; export class Layer { constructor( diff --git a/src/app/cartography/models/map/map-drawing.ts b/src/app/cartography/models/map/map-drawing.ts index 3510125b..f263fe34 100644 --- a/src/app/cartography/models/map/map-drawing.ts +++ b/src/app/cartography/models/map/map-drawing.ts @@ -1,5 +1,5 @@ -import { DrawingElement } from '../drawings/drawing-element'; import { Indexed } from '../../datasources/map-datasource'; +import { DrawingElement } from '../drawings/drawing-element'; export class MapDrawing implements Indexed { id: string; diff --git a/src/app/cartography/models/map/map-link-node.ts b/src/app/cartography/models/map/map-link-node.ts index 577a2d6b..b7009753 100644 --- a/src/app/cartography/models/map/map-link-node.ts +++ b/src/app/cartography/models/map/map-link-node.ts @@ -1,5 +1,5 @@ -import { MapLabel } from './map-label'; import { Indexed } from '../../datasources/map-datasource'; +import { MapLabel } from './map-label'; export class MapLinkNode implements Indexed { id: string; diff --git a/src/app/cartography/models/map/map-link.ts b/src/app/cartography/models/map/map-link.ts index 8dda2d8f..57bac994 100644 --- a/src/app/cartography/models/map/map-link.ts +++ b/src/app/cartography/models/map/map-link.ts @@ -1,7 +1,7 @@ +import { Filter } from '../../../models/filter'; +import { Indexed } from '../../datasources/map-datasource'; import { MapLinkNode } from './map-link-node'; import { MapNode } from './map-node'; -import { Indexed } from '../../datasources/map-datasource'; -import { Filter } from '../../../models/filter'; export class MapLink implements Indexed { id: string; diff --git a/src/app/cartography/models/map/map-node.ts b/src/app/cartography/models/map/map-node.ts index 9f3e9749..7c0b282e 100644 --- a/src/app/cartography/models/map/map-node.ts +++ b/src/app/cartography/models/map/map-node.ts @@ -1,6 +1,6 @@ +import { Indexed } from '../../datasources/map-datasource'; import { MapLabel } from './map-label'; import { MapPort } from './map-port'; -import { Indexed } from '../../datasources/map-datasource'; export class MapNode implements Indexed { id: string; diff --git a/src/app/cartography/models/node.ts b/src/app/cartography/models/node.ts index 7fa9ff3e..f2362a92 100644 --- a/src/app/cartography/models/node.ts +++ b/src/app/cartography/models/node.ts @@ -1,6 +1,5 @@ -import { Label } from './label'; import { Port } from '../../models/port'; -import { CustomAdapter } from '../../models/qemu/qemu-custom-adapter'; +import { Label } from './label'; export class PortsMapping { name: string; diff --git a/src/app/cartography/services/map-change-detector-ref.ts b/src/app/cartography/services/map-change-detector-ref.ts index 5137c342..c97c0df1 100644 --- a/src/app/cartography/services/map-change-detector-ref.ts +++ b/src/app/cartography/services/map-change-detector-ref.ts @@ -1,4 +1,4 @@ -import { Injectable, EventEmitter } from '@angular/core'; +import { EventEmitter, Injectable } from '@angular/core'; @Injectable() export class MapChangeDetectorRef { diff --git a/src/app/cartography/tools/moving-tool.spec.ts b/src/app/cartography/tools/moving-tool.spec.ts index 06ee6607..95001453 100644 --- a/src/app/cartography/tools/moving-tool.spec.ts +++ b/src/app/cartography/tools/moving-tool.spec.ts @@ -1,8 +1,8 @@ import { Context } from '../models/context'; -import { SVGSelection } from '../models/types'; -import { MovingTool } from './moving-tool'; -import { TestSVGCanvas } from '../testing'; import { Size } from '../models/size'; +import { SVGSelection } from '../models/types'; +import { TestSVGCanvas } from '../testing'; +import { MovingTool } from './moving-tool'; describe('MovingTool', () => { let tool: MovingTool; diff --git a/src/app/cartography/tools/moving-tool.ts b/src/app/cartography/tools/moving-tool.ts index 62b27867..887a734e 100644 --- a/src/app/cartography/tools/moving-tool.ts +++ b/src/app/cartography/tools/moving-tool.ts @@ -1,10 +1,8 @@ import { Injectable } from '@angular/core'; - -import { D3ZoomEvent, zoom, ZoomBehavior } from 'd3-zoom'; import { event } from 'd3-selection'; - -import { SVGSelection } from '../models/types'; +import { D3ZoomEvent, zoom, ZoomBehavior } from 'd3-zoom'; import { Context } from '../models/context'; +import { SVGSelection } from '../models/types'; @Injectable() export class MovingTool { diff --git a/src/app/cartography/tools/selection-tool.spec.ts b/src/app/cartography/tools/selection-tool.spec.ts index bda014e5..73ebe9fb 100644 --- a/src/app/cartography/tools/selection-tool.spec.ts +++ b/src/app/cartography/tools/selection-tool.spec.ts @@ -1,9 +1,9 @@ -import { SelectionTool } from './selection-tool'; -import { Context } from '../models/context'; -import { SVGSelection } from '../models/types'; -import { Rectangle } from '../models/rectangle'; -import { TestSVGCanvas } from '../testing'; import { SelectionEventSource } from '../events/selection-event-source'; +import { Context } from '../models/context'; +import { Rectangle } from '../models/rectangle'; +import { SVGSelection } from '../models/types'; +import { TestSVGCanvas } from '../testing'; +import { SelectionTool } from './selection-tool'; describe('SelectionTool', () => { let tool: SelectionTool; diff --git a/src/app/cartography/tools/selection-tool.ts b/src/app/cartography/tools/selection-tool.ts index 9d1e24dd..50be5b42 100644 --- a/src/app/cartography/tools/selection-tool.ts +++ b/src/app/cartography/tools/selection-tool.ts @@ -1,11 +1,10 @@ -import { Injectable, EventEmitter } from '@angular/core'; -import { mouse, select, event } from 'd3-selection'; +import { EventEmitter, Injectable } from '@angular/core'; +import { event, mouse, select } from 'd3-selection'; import { Subject } from 'rxjs'; - -import { SVGSelection } from '../models/types'; +import { SelectionEventSource } from '../events/selection-event-source'; import { Context } from '../models/context'; import { Rectangle } from '../models/rectangle'; -import { SelectionEventSource } from '../events/selection-event-source'; +import { SVGSelection } from '../models/types'; @Injectable() export class SelectionTool { diff --git a/src/app/cartography/widgets/drawing-line.ts b/src/app/cartography/widgets/drawing-line.ts index bb694524..0fa27da8 100644 --- a/src/app/cartography/widgets/drawing-line.ts +++ b/src/app/cartography/widgets/drawing-line.ts @@ -1,12 +1,10 @@ import { Injectable } from '@angular/core'; - -import { line } from 'd3-shape'; import { mouse } from 'd3-selection'; - -import { DrawingLine } from '../models/drawing-line'; -import { SVGSelection } from '../models/types'; -import { Point } from '../models/point'; +import { line } from 'd3-shape'; import { Context } from '../models/context'; +import { DrawingLine } from '../models/drawing-line'; +import { Point } from '../models/point'; +import { SVGSelection } from '../models/types'; @Injectable() export class DrawingLineWidget { diff --git a/src/app/cartography/widgets/drawing.ts b/src/app/cartography/widgets/drawing.ts index 4e82080d..167cc472 100644 --- a/src/app/cartography/widgets/drawing.ts +++ b/src/app/cartography/widgets/drawing.ts @@ -1,19 +1,18 @@ import { Injectable } from '@angular/core'; - -import { Widget } from './widget'; +import { MapSettingsService } from '../../services/mapsettings.service'; +import { SelectionManager } from '../managers/selection-manager'; +import { EllipseElement } from '../models/drawings/ellipse-element'; +import { LineElement } from '../models/drawings/line-element'; +import { RectElement } from '../models/drawings/rect-element'; +import { MapDrawing } from '../models/map/map-drawing'; import { SVGSelection } from '../models/types'; import { DrawingShapeWidget } from './drawings/drawing-shape-widget'; -import { TextDrawingWidget } from './drawings/text-drawing'; -import { ImageDrawingWidget } from './drawings/image-drawing'; -import { RectDrawingWidget } from './drawings/rect-drawing'; -import { LineDrawingWidget } from './drawings/line-drawing'; import { EllipseDrawingWidget } from './drawings/ellipse-drawing'; -import { MapDrawing } from '../models/map/map-drawing'; -import { SelectionManager } from '../managers/selection-manager'; -import { LineElement } from '../models/drawings/line-element'; -import { EllipseElement } from '../models/drawings/ellipse-element'; -import { RectElement } from '../models/drawings/rect-element'; -import { MapSettingsService } from '../../services/mapsettings.service'; +import { ImageDrawingWidget } from './drawings/image-drawing'; +import { LineDrawingWidget } from './drawings/line-drawing'; +import { RectDrawingWidget } from './drawings/rect-drawing'; +import { TextDrawingWidget } from './drawings/text-drawing'; +import { Widget } from './widget'; @Injectable() export class DrawingWidget implements Widget { diff --git a/src/app/cartography/widgets/drawings.backup.ts b/src/app/cartography/widgets/drawings.backup.ts index 5ecb032b..239768ac 100644 --- a/src/app/cartography/widgets/drawings.backup.ts +++ b/src/app/cartography/widgets/drawings.backup.ts @@ -1,19 +1,18 @@ -import { Injectable, EventEmitter } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { Layer } from '../models/layer'; -import { SvgToDrawingConverter } from '../helpers/svg-to-drawing-converter'; -import { Draggable, DraggableDrag, DraggableStart, DraggableEnd } from '../events/draggable'; -import { DrawingWidget } from './drawing'; -import { drag, D3DragEvent } from 'd3-drag'; +import { EventEmitter, Injectable } from '@angular/core'; +import { drag } from 'd3-drag'; import { event } from 'd3-selection'; -import { MapDrawing } from '../models/map/map-drawing'; +import { Draggable } from '../events/draggable'; +import { ResizingEnd } from '../events/resizing'; +import { SvgToDrawingConverter } from '../helpers/svg-to-drawing-converter'; +import { MapSettingsManager } from '../managers/map-settings-manager'; import { Context } from '../models/context'; import { EllipseElement } from '../models/drawings/ellipse-element'; -import { ResizingEnd } from '../events/resizing'; import { LineElement } from '../models/drawings/line-element'; -import { MapSettingsManager } from '../managers/map-settings-manager'; +import { Layer } from '../models/layer'; +import { MapDrawing } from '../models/map/map-drawing'; +import { SVGSelection } from '../models/types'; +import { DrawingWidget } from './drawing'; +import { Widget } from './widget'; @Injectable() export class DrawingsWidget implements Widget { diff --git a/src/app/cartography/widgets/drawings.ts b/src/app/cartography/widgets/drawings.ts index 6bd108d3..a4f9a174 100644 --- a/src/app/cartography/widgets/drawings.ts +++ b/src/app/cartography/widgets/drawings.ts @@ -1,20 +1,19 @@ -import { Injectable, EventEmitter } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { Layer } from '../models/layer'; -import { SvgToDrawingConverter } from '../helpers/svg-to-drawing-converter'; -import { Draggable, DraggableDrag, DraggableStart, DraggableEnd } from '../events/draggable'; -import { DrawingWidget } from './drawing'; -import { drag, D3DragEvent } from 'd3-drag'; +import { EventEmitter, Injectable } from '@angular/core'; +import { drag } from 'd3-drag'; import { event } from 'd3-selection'; -import { MapDrawing } from '../models/map/map-drawing'; +import { Draggable } from '../events/draggable'; +import { DrawingContextMenu } from '../events/event-source'; +import { ResizingEnd } from '../events/resizing'; +import { SvgToDrawingConverter } from '../helpers/svg-to-drawing-converter'; +import { MapSettingsManager } from '../managers/map-settings-manager'; import { Context } from '../models/context'; import { EllipseElement } from '../models/drawings/ellipse-element'; -import { ResizingEnd } from '../events/resizing'; import { LineElement } from '../models/drawings/line-element'; -import { MapSettingsManager } from '../managers/map-settings-manager'; -import { DrawingContextMenu } from '../events/event-source'; +import { Layer } from '../models/layer'; +import { MapDrawing } from '../models/map/map-drawing'; +import { SVGSelection } from '../models/types'; +import { DrawingWidget } from './drawing'; +import { Widget } from './widget'; @Injectable() export class DrawingsWidget implements Widget { diff --git a/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts b/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts index 42d0ad42..20279666 100644 --- a/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/ellipse-drawing.spec.ts @@ -1,7 +1,7 @@ -import { TestSVGCanvas } from '../../testing'; -import { EllipseElement } from '../../models/drawings/ellipse-element'; import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; +import { EllipseElement } from '../../models/drawings/ellipse-element'; import { MapDrawing } from '../../models/map/map-drawing'; +import { TestSVGCanvas } from '../../testing'; import { EllipseDrawingWidget } from './ellipse-drawing'; describe('EllipseDrawingWidget', () => { diff --git a/src/app/cartography/widgets/drawings/ellipse-drawing.ts b/src/app/cartography/widgets/drawings/ellipse-drawing.ts index 005fe033..06435a9f 100644 --- a/src/app/cartography/widgets/drawings/ellipse-drawing.ts +++ b/src/app/cartography/widgets/drawings/ellipse-drawing.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; - -import { SVGSelection } from '../../models/types'; -import { EllipseElement } from '../../models/drawings/ellipse-element'; -import { DrawingShapeWidget } from './drawing-shape-widget'; import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; +import { EllipseElement } from '../../models/drawings/ellipse-element'; import { MapDrawing } from '../../models/map/map-drawing'; +import { SVGSelection } from '../../models/types'; +import { DrawingShapeWidget } from './drawing-shape-widget'; @Injectable() export class EllipseDrawingWidget implements DrawingShapeWidget { diff --git a/src/app/cartography/widgets/drawings/image-drawing.spec.ts b/src/app/cartography/widgets/drawings/image-drawing.spec.ts index 16b8e524..f9eceb84 100644 --- a/src/app/cartography/widgets/drawings/image-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/image-drawing.spec.ts @@ -1,7 +1,7 @@ -import { TestSVGCanvas } from '../../testing'; -import { ImageDrawingWidget } from './image-drawing'; import { ImageElement } from '../../models/drawings/image-element'; import { MapDrawing } from '../../models/map/map-drawing'; +import { TestSVGCanvas } from '../../testing'; +import { ImageDrawingWidget } from './image-drawing'; describe('ImageDrawingWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/drawings/image-drawing.ts b/src/app/cartography/widgets/drawings/image-drawing.ts index 25e44700..430b5d30 100644 --- a/src/app/cartography/widgets/drawings/image-drawing.ts +++ b/src/app/cartography/widgets/drawings/image-drawing.ts @@ -1,9 +1,8 @@ import { Injectable } from '@angular/core'; - -import { SVGSelection } from '../../models/types'; import { ImageElement } from '../../models/drawings/image-element'; -import { DrawingShapeWidget } from './drawing-shape-widget'; import { MapDrawing } from '../../models/map/map-drawing'; +import { SVGSelection } from '../../models/types'; +import { DrawingShapeWidget } from './drawing-shape-widget'; @Injectable() export class ImageDrawingWidget implements DrawingShapeWidget { diff --git a/src/app/cartography/widgets/drawings/line-drawing.spec.ts b/src/app/cartography/widgets/drawings/line-drawing.spec.ts index c0b9e6a7..aaa6ca73 100644 --- a/src/app/cartography/widgets/drawings/line-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/line-drawing.spec.ts @@ -1,8 +1,8 @@ +import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; +import { LineElement } from '../../models/drawings/line-element'; +import { MapDrawing } from '../../models/map/map-drawing'; import { TestSVGCanvas } from '../../testing'; import { LineDrawingWidget } from './line-drawing'; -import { LineElement } from '../../models/drawings/line-element'; -import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; -import { MapDrawing } from '../../models/map/map-drawing'; describe('LineDrawingWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/drawings/line-drawing.ts b/src/app/cartography/widgets/drawings/line-drawing.ts index f56ad918..6027ddce 100644 --- a/src/app/cartography/widgets/drawings/line-drawing.ts +++ b/src/app/cartography/widgets/drawings/line-drawing.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; - -import { SVGSelection } from '../../models/types'; -import { LineElement } from '../../models/drawings/line-element'; -import { DrawingShapeWidget } from './drawing-shape-widget'; import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; +import { LineElement } from '../../models/drawings/line-element'; import { MapDrawing } from '../../models/map/map-drawing'; +import { SVGSelection } from '../../models/types'; +import { DrawingShapeWidget } from './drawing-shape-widget'; @Injectable() export class LineDrawingWidget implements DrawingShapeWidget { diff --git a/src/app/cartography/widgets/drawings/rect-drawing.spec.ts b/src/app/cartography/widgets/drawings/rect-drawing.spec.ts index eaf3a043..ecd5e63a 100644 --- a/src/app/cartography/widgets/drawings/rect-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/rect-drawing.spec.ts @@ -1,8 +1,8 @@ +import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; +import { RectElement } from '../../models/drawings/rect-element'; +import { MapDrawing } from '../../models/map/map-drawing'; import { TestSVGCanvas } from '../../testing'; import { RectDrawingWidget } from './rect-drawing'; -import { RectElement } from '../../models/drawings/rect-element'; -import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; -import { MapDrawing } from '../../models/map/map-drawing'; describe('RectDrawingWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/drawings/rect-drawing.ts b/src/app/cartography/widgets/drawings/rect-drawing.ts index 1153cfb0..de6a31d2 100644 --- a/src/app/cartography/widgets/drawings/rect-drawing.ts +++ b/src/app/cartography/widgets/drawings/rect-drawing.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; - -import { SVGSelection } from '../../models/types'; -import { RectElement } from '../../models/drawings/rect-element'; -import { DrawingShapeWidget } from './drawing-shape-widget'; import { QtDasharrayFixer } from '../../helpers/qt-dasharray-fixer'; +import { RectElement } from '../../models/drawings/rect-element'; import { MapDrawing } from '../../models/map/map-drawing'; +import { SVGSelection } from '../../models/types'; +import { DrawingShapeWidget } from './drawing-shape-widget'; @Injectable() export class RectDrawingWidget implements DrawingShapeWidget { diff --git a/src/app/cartography/widgets/drawings/text-drawing.spec.ts b/src/app/cartography/widgets/drawings/text-drawing.spec.ts index 57f907c1..f4b42733 100644 --- a/src/app/cartography/widgets/drawings/text-drawing.spec.ts +++ b/src/app/cartography/widgets/drawings/text-drawing.spec.ts @@ -1,8 +1,8 @@ +import { FontFixer } from '../../helpers/font-fixer'; +import { TextElement } from '../../models/drawings/text-element'; +import { MapDrawing } from '../../models/map/map-drawing'; import { TestSVGCanvas } from '../../testing'; import { TextDrawingWidget } from './text-drawing'; -import { TextElement } from '../../models/drawings/text-element'; -import { FontFixer } from '../../helpers/font-fixer'; -import { MapDrawing } from '../../models/map/map-drawing'; describe('TextDrawingWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/drawings/text-drawing.ts b/src/app/cartography/widgets/drawings/text-drawing.ts index f72902eb..78876d75 100644 --- a/src/app/cartography/widgets/drawings/text-drawing.ts +++ b/src/app/cartography/widgets/drawings/text-drawing.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; - -import { SVGSelection } from '../../models/types'; -import { TextElement } from '../../models/drawings/text-element'; -import { DrawingShapeWidget } from './drawing-shape-widget'; -import { FontFixer } from '../../helpers/font-fixer'; import { select } from 'd3-selection'; +import { FontFixer } from '../../helpers/font-fixer'; +import { TextElement } from '../../models/drawings/text-element'; import { MapDrawing } from '../../models/map/map-drawing'; +import { SVGSelection } from '../../models/types'; +import { DrawingShapeWidget } from './drawing-shape-widget'; @Injectable() export class TextDrawingWidget implements DrawingShapeWidget { diff --git a/src/app/cartography/widgets/graph-layout.ts b/src/app/cartography/widgets/graph-layout.ts index eeb86e55..aa62ed35 100644 --- a/src/app/cartography/widgets/graph-layout.ts +++ b/src/app/cartography/widgets/graph-layout.ts @@ -1,13 +1,13 @@ +import { Injectable } from '@angular/core'; +import { LayersManager } from '../managers/layers-manager'; import { Context } from '../models/context'; +import { SVGSelection } from '../models/types'; +import { MovingTool } from '../tools/moving-tool'; +import { SelectionTool } from '../tools/selection-tool'; +import { DrawingLineWidget } from './drawing-line'; +import { LayersWidget } from './layers'; import { NodesWidget } from './nodes'; import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { DrawingLineWidget } from './drawing-line'; -import { SelectionTool } from '../tools/selection-tool'; -import { MovingTool } from '../tools/moving-tool'; -import { LayersWidget } from './layers'; -import { LayersManager } from '../managers/layers-manager'; -import { Injectable } from '@angular/core'; @Injectable() export class GraphLayout implements Widget { diff --git a/src/app/cartography/widgets/interface-label.spec.ts b/src/app/cartography/widgets/interface-label.spec.ts index 453b5aac..2bc80598 100644 --- a/src/app/cartography/widgets/interface-label.spec.ts +++ b/src/app/cartography/widgets/interface-label.spec.ts @@ -1,15 +1,14 @@ import { Selection } from 'd3-selection'; - -import { TestSVGCanvas } from '../testing'; -import { InterfaceLabelWidget } from './interface-label'; import { CssFixer } from '../helpers/css-fixer'; -import { MapNode } from '../models/map/map-node'; +import { FontFixer } from '../helpers/font-fixer'; +import { MapSettingsManager } from '../managers/map-settings-manager'; +import { SelectionManager } from '../managers/selection-manager'; +import { MapLabel } from '../models/map/map-label'; import { MapLink } from '../models/map/map-link'; import { MapLinkNode } from '../models/map/map-link-node'; -import { MapLabel } from '../models/map/map-label'; -import { FontFixer } from '../helpers/font-fixer'; -import { SelectionManager } from '../managers/selection-manager'; -import { MapSettingsManager } from '../managers/map-settings-manager'; +import { MapNode } from '../models/map/map-node'; +import { TestSVGCanvas } from '../testing'; +import { InterfaceLabelWidget } from './interface-label'; describe('InterfaceLabelsWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/interface-label.ts b/src/app/cartography/widgets/interface-label.ts index d72d155e..c6060978 100644 --- a/src/app/cartography/widgets/interface-label.ts +++ b/src/app/cartography/widgets/interface-label.ts @@ -1,16 +1,15 @@ -import { Injectable, EventEmitter } from '@angular/core'; - -import { SVGSelection } from '../models/types'; -import { CssFixer } from '../helpers/css-fixer'; +import { EventEmitter, Injectable } from '@angular/core'; import { select } from 'd3-selection'; -import { MapLink } from '../models/map/map-link'; +import { Draggable } from '../events/draggable'; +import { InterfaceLabelContextMenu } from '../events/event-source'; +import { CssFixer } from '../helpers/css-fixer'; import { FontFixer } from '../helpers/font-fixer'; +import { MapSettingsManager } from '../managers/map-settings-manager'; import { SelectionManager } from '../managers/selection-manager'; +import { MapLink } from '../models/map/map-link'; import { MapLinkNode } from '../models/map/map-link-node'; import { MapNode } from '../models/map/map-node'; -import { Draggable } from '../events/draggable'; -import { MapSettingsManager } from '../managers/map-settings-manager'; -import { InterfaceLabelContextMenu } from '../events/event-source'; +import { SVGSelection } from '../models/types'; @Injectable() export class InterfaceLabelWidget { diff --git a/src/app/cartography/widgets/interface-status.ts b/src/app/cartography/widgets/interface-status.ts index 6298a47a..ebafddcc 100644 --- a/src/app/cartography/widgets/interface-status.ts +++ b/src/app/cartography/widgets/interface-status.ts @@ -1,12 +1,10 @@ import { Injectable } from '@angular/core'; - import { select } from 'd3-selection'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; +import { MapSettingsService } from '../../services/mapsettings.service'; import { LinkStatus } from '../models/link-status'; import { MapLink } from '../models/map/map-link'; -import { MapSettingsService } from '../../services/mapsettings.service'; +import { SVGSelection } from '../models/types'; +import { Widget } from './widget'; @Injectable() export class InterfaceStatusWidget implements Widget { diff --git a/src/app/cartography/widgets/label.ts b/src/app/cartography/widgets/label.ts index 90d6865f..3d3b93dc 100644 --- a/src/app/cartography/widgets/label.ts +++ b/src/app/cartography/widgets/label.ts @@ -1,17 +1,15 @@ -import { Injectable, EventEmitter } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; +import { EventEmitter, Injectable } from '@angular/core'; +import { select } from 'd3-selection'; +import { Draggable } from '../events/draggable'; +import { LabelContextMenu } from '../events/event-source'; import { CssFixer } from '../helpers/css-fixer'; import { FontFixer } from '../helpers/font-fixer'; -import { select } from 'd3-selection'; -import { MapNode } from '../models/map/map-node'; -import { SelectionManager } from '../managers/selection-manager'; -import { Draggable } from '../events/draggable'; -import { MapLabel } from '../models/map/map-label'; import { MapSettingsManager } from '../managers/map-settings-manager'; -import { LabelContextMenu } from '../events/event-source'; -import { TextElement } from '../models/drawings/text-element'; +import { SelectionManager } from '../managers/selection-manager'; +import { MapLabel } from '../models/map/map-label'; +import { MapNode } from '../models/map/map-node'; +import { SVGSelection } from '../models/types'; +import { Widget } from './widget'; @Injectable() export class LabelWidget implements Widget { diff --git a/src/app/cartography/widgets/layers.spec.ts b/src/app/cartography/widgets/layers.spec.ts index 4dfdf830..3994168c 100644 --- a/src/app/cartography/widgets/layers.spec.ts +++ b/src/app/cartography/widgets/layers.spec.ts @@ -1,11 +1,10 @@ -import { instance, mock, when, verify } from 'ts-mockito'; - -import { TestSVGCanvas } from '../testing'; -import { LayersWidget } from './layers'; +import { instance, mock } from 'ts-mockito'; import { Layer } from '../models/layer'; +import { TestSVGCanvas } from '../testing'; +import { DrawingsWidget } from './drawings'; +import { LayersWidget } from './layers'; import { LinksWidget } from './links'; import { NodesWidget } from './nodes'; -import { DrawingsWidget } from './drawings'; describe('LayersWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/layers.ts b/src/app/cartography/widgets/layers.ts index 5ab26601..938d2943 100644 --- a/src/app/cartography/widgets/layers.ts +++ b/src/app/cartography/widgets/layers.ts @@ -1,12 +1,10 @@ import { Injectable } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { GraphLayout } from './graph-layout'; import { Layer } from '../models/layer'; +import { SVGSelection } from '../models/types'; +import { DrawingsWidget } from './drawings'; import { LinksWidget } from './links'; import { NodesWidget } from './nodes'; -import { DrawingsWidget } from './drawings'; +import { Widget } from './widget'; @Injectable() export class LayersWidget implements Widget { diff --git a/src/app/cartography/widgets/link.ts b/src/app/cartography/widgets/link.ts index 08e93abd..3e9a3334 100644 --- a/src/app/cartography/widgets/link.ts +++ b/src/app/cartography/widgets/link.ts @@ -1,16 +1,15 @@ -import { Injectable, EventEmitter } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { SerialLinkWidget } from './links/serial-link'; -import { EthernetLinkWidget } from './links/ethernet-link'; -import { MultiLinkCalculatorHelper } from '../helpers/multi-link-calculator-helper'; -import { InterfaceLabelWidget } from './interface-label'; -import { InterfaceStatusWidget } from './interface-status'; -import { MapLink } from '../models/map/map-link'; -import { SelectionManager } from '../managers/selection-manager'; +import { EventEmitter, Injectable } from '@angular/core'; import { event } from 'd3-selection'; import { LinkContextMenu } from '../events/event-source'; +import { MultiLinkCalculatorHelper } from '../helpers/multi-link-calculator-helper'; +import { SelectionManager } from '../managers/selection-manager'; +import { MapLink } from '../models/map/map-link'; +import { SVGSelection } from '../models/types'; +import { InterfaceLabelWidget } from './interface-label'; +import { InterfaceStatusWidget } from './interface-status'; +import { EthernetLinkWidget } from './links/ethernet-link'; +import { SerialLinkWidget } from './links/serial-link'; +import { Widget } from './widget'; @Injectable() export class LinkWidget implements Widget { diff --git a/src/app/cartography/widgets/links.spec.ts b/src/app/cartography/widgets/links.spec.ts index 9c408529..4f3b1a5f 100644 --- a/src/app/cartography/widgets/links.spec.ts +++ b/src/app/cartography/widgets/links.spec.ts @@ -1,13 +1,12 @@ -import { instance, mock } from 'ts-mockito'; import { Selection } from 'd3-selection'; - -import { TestSVGCanvas } from '../testing'; -import { Layer } from '../models/layer'; -import { LinksWidget } from './links'; -import { LinkWidget } from './link'; +import { instance, mock } from 'ts-mockito'; import { MultiLinkCalculatorHelper } from '../helpers/multi-link-calculator-helper'; -import { MapNode } from '../models/map/map-node'; +import { Layer } from '../models/layer'; import { MapLink } from '../models/map/map-link'; +import { MapNode } from '../models/map/map-node'; +import { TestSVGCanvas } from '../testing'; +import { LinkWidget } from './link'; +import { LinksWidget } from './links'; describe('LinksWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/links.ts b/src/app/cartography/widgets/links.ts index 9283ce8b..f6eecce6 100644 --- a/src/app/cartography/widgets/links.ts +++ b/src/app/cartography/widgets/links.ts @@ -1,11 +1,10 @@ import { Injectable } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; import { MultiLinkCalculatorHelper } from '../helpers/multi-link-calculator-helper'; import { Layer } from '../models/layer'; -import { LinkWidget } from './link'; import { MapLink } from '../models/map/map-link'; +import { SVGSelection } from '../models/types'; +import { LinkWidget } from './link'; +import { Widget } from './widget'; @Injectable() export class LinksWidget implements Widget { diff --git a/src/app/cartography/widgets/links/ethernet-link.ts b/src/app/cartography/widgets/links/ethernet-link.ts index e841da5f..3de741e0 100644 --- a/src/app/cartography/widgets/links/ethernet-link.ts +++ b/src/app/cartography/widgets/links/ethernet-link.ts @@ -1,9 +1,9 @@ -import { path } from 'd3-path'; import { EventEmitter, Injectable } from '@angular/core'; -import { Widget } from '../widget'; -import { SVGSelection } from '../../models/types'; -import { MapLink } from '../../models/map/map-link'; +import { path } from 'd3-path'; import { LinkContextMenu } from '../../events/event-source'; +import { MapLink } from '../../models/map/map-link'; +import { SVGSelection } from '../../models/types'; +import { Widget } from '../widget'; class EthernetLinkPath { constructor(public source: [number, number], public target: [number, number]) {} diff --git a/src/app/cartography/widgets/links/serial-link.ts b/src/app/cartography/widgets/links/serial-link.ts index d87fd035..9fc0e921 100644 --- a/src/app/cartography/widgets/links/serial-link.ts +++ b/src/app/cartography/widgets/links/serial-link.ts @@ -1,10 +1,9 @@ +import { EventEmitter, Injectable } from '@angular/core'; import { path } from 'd3-path'; - -import { Widget } from '../widget'; -import { SVGSelection } from '../../models/types'; -import { MapLink } from '../../models/map/map-link'; -import { Injectable, EventEmitter } from '@angular/core'; import { LinkContextMenu } from '../../events/event-source'; +import { MapLink } from '../../models/map/map-link'; +import { SVGSelection } from '../../models/types'; +import { Widget } from '../widget'; class SerialLinkPath { constructor( diff --git a/src/app/cartography/widgets/node.spec.ts b/src/app/cartography/widgets/node.spec.ts index e10cb21d..f8e669e1 100644 --- a/src/app/cartography/widgets/node.spec.ts +++ b/src/app/cartography/widgets/node.spec.ts @@ -1,12 +1,8 @@ -import { TestSVGCanvas } from '../testing'; -import { CssFixer } from '../helpers/css-fixer'; -import { FontFixer } from '../helpers/font-fixer'; -import { NodeWidget } from './node'; -import { MapNode } from '../models/map/map-node'; -import { MapLabel } from '../models/map/map-label'; import { MockedGraphDataManager } from '../managers/graph-data-manager.spec'; -import { GraphDataManager } from '../managers/graph-data-manager'; -import { SelectionManager } from '../managers/selection-manager'; +import { MapLabel } from '../models/map/map-label'; +import { MapNode } from '../models/map/map-node'; +import { TestSVGCanvas } from '../testing'; +import { NodeWidget } from './node'; describe('NodesWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/node.ts b/src/app/cartography/widgets/node.ts index aff5a477..fc217f85 100644 --- a/src/app/cartography/widgets/node.ts +++ b/src/app/cartography/widgets/node.ts @@ -1,16 +1,15 @@ -import { Injectable, EventEmitter } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { NodeContextMenu, NodeClicked } from '../events/nodes'; -import { select, event } from 'd3-selection'; -import { MapNode } from '../models/map/map-node'; +import { EventEmitter, Injectable } from '@angular/core'; +import { event, select } from 'd3-selection'; +import { MapSettingsService } from '../../services/mapsettings.service'; +import { ClickedDataEvent } from '../events/event-source'; +import { NodeClicked, NodeContextMenu } from '../events/nodes'; +import { NodesEventSource } from '../events/nodes-event-source'; import { GraphDataManager } from '../managers/graph-data-manager'; import { SelectionManager } from '../managers/selection-manager'; +import { MapNode } from '../models/map/map-node'; +import { SVGSelection } from '../models/types'; import { LabelWidget } from './label'; -import { NodesEventSource } from '../events/nodes-event-source'; -import { ClickedDataEvent } from '../events/event-source'; -import { MapSettingsService } from '../../services/mapsettings.service'; +import { Widget } from './widget'; @Injectable() export class NodeWidget implements Widget { diff --git a/src/app/cartography/widgets/nodes.spec.ts b/src/app/cartography/widgets/nodes.spec.ts index 8d0983c2..f0445712 100644 --- a/src/app/cartography/widgets/nodes.spec.ts +++ b/src/app/cartography/widgets/nodes.spec.ts @@ -1,8 +1,8 @@ -import { TestSVGCanvas } from '../testing'; -import { NodesWidget } from './nodes'; -import { NodeWidget } from './node'; import { instance, mock } from 'ts-mockito'; import { MapSettingsManager } from '../managers/map-settings-manager'; +import { TestSVGCanvas } from '../testing'; +import { NodeWidget } from './node'; +import { NodesWidget } from './nodes'; describe('NodesWidget', () => { let svg: TestSVGCanvas; diff --git a/src/app/cartography/widgets/nodes.ts b/src/app/cartography/widgets/nodes.ts index 45b18831..960d5232 100644 --- a/src/app/cartography/widgets/nodes.ts +++ b/src/app/cartography/widgets/nodes.ts @@ -1,12 +1,11 @@ import { Injectable } from '@angular/core'; - -import { Widget } from './widget'; -import { SVGSelection } from '../models/types'; -import { Layer } from '../models/layer'; -import { NodeWidget } from './node'; import { Draggable } from '../events/draggable'; -import { MapNode } from '../models/map/map-node'; import { MapSettingsManager } from '../managers/map-settings-manager'; +import { Layer } from '../models/layer'; +import { MapNode } from '../models/map/map-node'; +import { SVGSelection } from '../models/types'; +import { NodeWidget } from './node'; +import { Widget } from './widget'; @Injectable() export class NodesWidget implements Widget { diff --git a/src/app/common/error-handlers/sentry-error-handler.ts b/src/app/common/error-handlers/sentry-error-handler.ts index 1b2410a2..d9d31bcf 100644 --- a/src/app/common/error-handlers/sentry-error-handler.ts +++ b/src/app/common/error-handlers/sentry-error-handler.ts @@ -1,12 +1,8 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { NgModule, ErrorHandler, Injectable, Injector, Inject } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; - -import { environment } from '../../../environments/environment'; -import { AppComponent } from '../../app.component'; - +import { ErrorHandler, Inject, Injectable, Injector } from '@angular/core'; import * as Sentry from '@sentry/browser'; import { BrowserOptions, init } from '@sentry/browser'; +import { environment } from '../../../environments/environment'; const config = { dsn: 'https://d8be3a98530f49eb90968ff396db326c@o19455.ingest.sentry.io/842726', diff --git a/src/app/common/error-handlers/toaster-error-handler.spec.ts b/src/app/common/error-handlers/toaster-error-handler.spec.ts index 3e4d40ee..199b114f 100644 --- a/src/app/common/error-handlers/toaster-error-handler.spec.ts +++ b/src/app/common/error-handlers/toaster-error-handler.spec.ts @@ -1,11 +1,11 @@ +import { Injector } from '@angular/core'; import { TestBed } from '@angular/core/testing'; -import { ToasterService } from '../../services/toaster.service'; -import { MockedToasterService } from '../../services/toaster.service.spec'; -import { ToasterErrorHandler } from './toaster-error-handler'; import { SettingsService } from '../../services/settings.service'; import { MockedSettingsService } from '../../services/settings.service.spec'; -import { Injector } from '@angular/core'; +import { ToasterService } from '../../services/toaster.service'; +import { MockedToasterService } from '../../services/toaster.service.spec'; import { SentryErrorHandler } from './sentry-error-handler'; +import { ToasterErrorHandler } from './toaster-error-handler'; class MockedToasterErrorHandler extends ToasterErrorHandler { handleError(err: any): void { diff --git a/src/app/common/error-handlers/toaster-error-handler.ts b/src/app/common/error-handlers/toaster-error-handler.ts index 7f3ccae8..54549731 100644 --- a/src/app/common/error-handlers/toaster-error-handler.ts +++ b/src/app/common/error-handlers/toaster-error-handler.ts @@ -1,5 +1,5 @@ -import { ToasterService } from '../../services/toaster.service'; import { Injectable } from '@angular/core'; +import { ToasterService } from '../../services/toaster.service'; import { SentryErrorHandler } from './sentry-error-handler'; @Injectable() diff --git a/src/app/common/progress-dialog/progress-dialog.component.spec.ts b/src/app/common/progress-dialog/progress-dialog.component.spec.ts index 081b5f53..cf08db74 100644 --- a/src/app/common/progress-dialog/progress-dialog.component.spec.ts +++ b/src/app/common/progress-dialog/progress-dialog.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { ProgressDialogComponent } from './progress-dialog.component'; describe('ProgressDialogComponent', () => { diff --git a/src/app/common/progress-dialog/progress-dialog.component.ts b/src/app/common/progress-dialog/progress-dialog.component.ts index 4852d92d..a27152c7 100644 --- a/src/app/common/progress-dialog/progress-dialog.component.ts +++ b/src/app/common/progress-dialog/progress-dialog.component.ts @@ -1,5 +1,5 @@ import { Component, Inject, OnInit } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; @Component({ selector: 'app-progress-dialog', diff --git a/src/app/common/progress-dialog/progress-dialog.service.spec.ts b/src/app/common/progress-dialog/progress-dialog.service.spec.ts index d530a49e..86b6ba0f 100644 --- a/src/app/common/progress-dialog/progress-dialog.service.spec.ts +++ b/src/app/common/progress-dialog/progress-dialog.service.spec.ts @@ -1,5 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; - +import { TestBed } from '@angular/core/testing'; import { ProgressDialogService } from './progress-dialog.service'; describe('ProgressDialogService', () => { diff --git a/src/app/common/progress/progress.component.spec.ts b/src/app/common/progress/progress.component.spec.ts index 7649964c..368de1e8 100644 --- a/src/app/common/progress/progress.component.spec.ts +++ b/src/app/common/progress/progress.component.spec.ts @@ -1,12 +1,11 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ProgressComponent } from './progress.component'; import { MatIconModule } from '@angular/material/icon'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { ProgressService } from './progress.service'; -import { RouterTestingModule } from '@angular/router/testing'; import { Router } from '@angular/router'; -import { BehaviorSubject, Observable } from 'rxjs'; +import { RouterTestingModule } from '@angular/router/testing'; +import { BehaviorSubject } from 'rxjs'; +import { ProgressComponent } from './progress.component'; +import { ProgressService } from './progress.service'; export class MockedRouter { events: BehaviorSubject; diff --git a/src/app/common/progress/progress.component.ts b/src/app/common/progress/progress.component.ts index d6fada6e..e554d232 100644 --- a/src/app/common/progress/progress.component.ts +++ b/src/app/common/progress/progress.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ProgressService } from './progress.service'; import { Router } from '@angular/router'; import { Subscription } from 'rxjs'; +import { ProgressService } from './progress.service'; @Component({ selector: 'app-progress', diff --git a/src/app/common/progress/progress.service.spec.ts b/src/app/common/progress/progress.service.spec.ts index 52a714a9..efdf1989 100644 --- a/src/app/common/progress/progress.service.spec.ts +++ b/src/app/common/progress/progress.service.spec.ts @@ -1,5 +1,4 @@ -import { TestBed, inject } from '@angular/core/testing'; - +import { TestBed } from '@angular/core/testing'; import { ProgressService, State } from './progress.service'; describe('ProgressService', () => { diff --git a/src/app/common/progress/progress.service.ts b/src/app/common/progress/progress.service.ts index 45895536..b9b52fde 100644 --- a/src/app/common/progress/progress.service.ts +++ b/src/app/common/progress/progress.service.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; - import { BehaviorSubject } from 'rxjs'; export class State { diff --git a/src/app/components/adbutler/adbutler.component.spec.ts b/src/app/components/adbutler/adbutler.component.spec.ts index 2e66cd83..15ff30f3 100644 --- a/src/app/components/adbutler/adbutler.component.spec.ts +++ b/src/app/components/adbutler/adbutler.component.spec.ts @@ -1,5 +1,4 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - import { AdbutlerComponent } from './adbutler.component'; xdescribe('AdbutlerComponent', () => { diff --git a/src/app/components/adbutler/adbutler.component.ts b/src/app/components/adbutler/adbutler.component.ts index e2e7797d..1232ee3f 100644 --- a/src/app/components/adbutler/adbutler.component.ts +++ b/src/app/components/adbutler/adbutler.component.ts @@ -1,7 +1,7 @@ -import { Component, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { ThemeService } from '../../services/theme.service'; +import { Component, OnInit } from '@angular/core'; import { AdButlerResponse } from '../../models/adbutler'; +import { ThemeService } from '../../services/theme.service'; const adButlerResponseBodyRegex: RegExp = /(.*)<\/a>(.*)\s*