fixed newline character insertion

Author: Garret29

server/src/main/java/pl/piotrowski/remotetexteditor/controller/DocumentsController.java

@@ -34,12 +34,9 @@ public DocumentsController(DocumentsService documentsService) {
     @MessageMapping("/update/{name}")
     @SendTo("/topic/updates/{name}")
     public Update updateDocumentsContent(@DestinationVariable String name, @Payload Update update) {
-        Document document;
-
-
 
         try {
-            document = documentsService.updateDocumentsContent(name, update);
+            documentsService.updateDocumentsContent(name, update);
         } catch (DocumentNotFoundException e) {
             e.printStackTrace();
         }

server/src/main/java/pl/piotrowski/remotetexteditor/model/Document.java

@@ -81,6 +81,13 @@ public int hashCode() {
 
     @Override
     public void applyUpdate(Update update) {
-
+        if (update.isAppending()){
+            content = content+update.getContent();
+        } else  {
+            String first = content.substring(0, update.getStart());
+            String last = content.substring(update.getEnd());
+
+            content = first+update.getContent()+last;
+        }
     }
 }

webclient/src/main/web/src/app/document/document.component.ts

@@ -1,5 +1,4 @@
 import {Component, ElementRef, OnInit, ViewChild} from '@angular/core';
-import {el} from "@angular/platform-browser/testing/src/browser_util";
 import {applyUpdate, Document} from "../model/document";
 import {createUpdate, Update} from "../model/update";
 import {DocumentService} from "../services/document.service";
@@ -15,7 +14,7 @@ export class DocumentComponent implements OnInit {
   currentDocument: Document;
   newDocument: Document;
   newName: string;
-  updateSubject:WebSocketSubject<Update>;
+  updateSubject: WebSocketSubject<Update>;
   private textArea: ElementRef;
   selectionStart: number;
   selectionEnd: number;
@@ -31,7 +30,7 @@ export class DocumentComponent implements OnInit {
     this.newName = "";
   }
 
-  updateCurrentDocument(update: Update){
+  updateCurrentDocument(update: Update) {
     this.updateSubject.send(update)
   }
 
@@ -40,7 +39,7 @@ export class DocumentComponent implements OnInit {
         this.documents = docs;
         if (docs.length > 0) {
           this.currentDocument = docs[0];
-          this.currentDocument.previousContent=this.currentDocument.content;
+          this.currentDocument.previousContent = this.currentDocument.content;
           this.documentSelected(this.currentDocument)
         }
       }
@@ -72,20 +71,20 @@ export class DocumentComponent implements OnInit {
     )
   }
 
-  documentSelected(document: Document){
-    if (this.updateSubject){
+  documentSelected(document: Document) {
+    if (this.updateSubject) {
       this.updateSubject.complete()
     }
-    this.documentService.getWsConnection(document.name).subscribe((ws:WebSocketSubject<Update>)=>{
+    this.documentService.getWsConnection(document.name).subscribe((ws: WebSocketSubject<Update>) => {
       this.updateSubject = ws;
-      this.updateSubject.subscribe((update: Update)=>{
-        applyUpdate(document ,update)
+      this.updateSubject.subscribe((update: Update) => {
+        applyUpdate(document, update)
       })
     });
   }
 
   isRenamingDisabled() {
-    return this.newName.length===0;
+    return this.newName.length === 0;
   }
 
   @ViewChild("textArea")
@@ -96,28 +95,28 @@ export class DocumentComponent implements OnInit {
 
   textChanged(event, document: Document) {
 
-    let update:Update;
+    let update: Update;
 
-    if(event.inputType==="deleteContentBackward"){
-      if(this.selectionStart===this.selectionEnd){
-        update = createUpdate("",this.selectionStart-1, this.selectionEnd, false)
+    if (event.inputType === "deleteContentBackward") {
+      if (this.selectionStart === this.selectionEnd) {
+        update = createUpdate("", this.selectionStart - 1, this.selectionEnd, false)
       } else {
-        update = createUpdate("",this.selectionStart, this.selectionEnd, false)
+        update = createUpdate("", this.selectionStart, this.selectionEnd, false)
       }
-    } else if(event.inputType==="deleteContentForward"){
-      update = createUpdate("",this.selectionStart, this.selectionEnd+1, false)
+    } else if (event.inputType === "deleteContentForward") {
+      update = createUpdate("", this.selectionStart, this.selectionEnd + 1, false)
+    } else if (event.inputType==="insertLineBreak") {
+      update = createUpdate("\n",this.selectionStart,this.selectionEnd,false)
     } else {
-      const appending: boolean =this.selectionStart===this.selectionEnd && document.content.length===this.selectionEnd+1;
-      update = createUpdate(document.content.substring(this.selectionStart, this.selectionEnd+1), this.selectionStart, this.selectionEnd, appending)
+      const appending: boolean = this.selectionStart === this.selectionEnd && document.content.length === this.selectionEnd + 1;
+      update = createUpdate(document.content.substring(this.selectionStart, this.selectionEnd + 1), this.selectionStart, this.selectionEnd, appending)
     }
 
     this.updateCurrentDocument(update)
   }
 
   updateSelection() {
-    this.selectionStart=this.textArea.nativeElement.selectionStart;
-    this.selectionEnd=this.textArea.nativeElement.selectionEnd;
-    console.log(this.selectionStart);
-    console.log(this.selectionEnd);
+    this.selectionStart = this.textArea.nativeElement.selectionStart;
+    this.selectionEnd = this.textArea.nativeElement.selectionEnd;
   }
 }

webclient/src/main/web/src/app/model/document.ts

@@ -15,17 +15,12 @@ export class Document {
 
 
 export function applyUpdate(document: Document ,update: Update){
-  console.log(update.content);
-  console.log(document.previousContent);
   if(update.appending){
     document.previousContent = document.previousContent+update.content
   } else {
     const first = document.previousContent.substring(0, update.start);
     const last = document.previousContent.substring(update.end);
 
-    console.log("first:"+first);
-    console.log("last:"+last);
-
     document.previousContent = first+update.content+ last
   }
   if(document.content !== document.previousContent){

webclient/src/main/web/src/app/services/webSocketSubject.ts

@@ -36,7 +36,6 @@ export class WebSocketSubject<T>{
     const observable = Rx.Observable.create((obs) => {
       stomp.connect({}, (frame) => {
         stomp.subscribe(this.webConfig.topicUrl + "/" + name, (response) => {
-          console.log(response.body);
           obs.next(JSON.parse(response.body))
         });
       });