From e0937b049202d0fc0d53ba5cecbd1a8e4bf1b543 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 22 Mar 2022 18:44:46 +0200
Subject: [PATCH] fix rebase errors

---
 .../file-preview/components/comments/comments.component.ts    | 2 +-
 .../app/modules/file-preview/file-preview-screen.component.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts
index 78ff74a8e..7af16c61f 100644
--- a/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/components/comments/comments.component.ts
@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostBinding, Input, OnChanges, ViewChild } from '@angular/core';
 import { Dossier, File, IComment } from '@red/domain';
-import { ManualAnnotationService } from '@services/manual-annotation.service';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
 import { UserService } from '@services/user.service';
 import { PermissionsService } from '@services/permissions.service';
@@ -9,6 +8,7 @@ import { firstValueFrom, Observable } from 'rxjs';
 import { CommentingService } from '../../services/commenting.service';
 import { tap } from 'rxjs/operators';
 import { FilePreviewStateService } from '../../services/file-preview-state.service';
+import { ManualRedactionService } from '../../services/manual-redaction.service';
 
 @Component({
     selector: 'redaction-comments',
diff --git a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
index c5c59063f..77885751e 100644
--- a/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
@@ -108,7 +108,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
         private readonly _pageRotationService: PageRotationService,
         private readonly _annotationDrawService: AnnotationDrawService,
         private readonly _fileManagementService: FileManagementService,
-        private readonly _manualAnnotationService: ManualAnnotationService,
+        private readonly _manualRedactionService: ManualRedactionService,
         private readonly _annotationProcessingService: AnnotationProcessingService,
     ) {
         super();
@@ -290,7 +290,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
                 null,
                 { manualRedactionEntryWrapper, dossierId: this.dossierId },
                 async ({ manualRedactionEntry }: ManualRedactionEntryWrapper) => {
-                    const addAnnotation$ = this._manualAnnotationService.addAnnotation(manualRedactionEntry, this.dossierId, this.fileId);
+                    const addAnnotation$ = this._manualRedactionService.addAnnotation(manualRedactionEntry, this.dossierId, this.fileId);
                     await firstValueFrom(addAnnotation$.pipe(catchError(() => of(undefined))));
                     await this._fileDataService.loadAnnotations();
                 },