From 5040958240f5deb1330ef7b9ec7dfcf6be8b60f1 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 11 Nov 2021 21:49:39 +0100 Subject: [PATCH 1/8] added method invalidInput --- src/TextOutput.java | 7 +++++++ test/TextOutputTest.java | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/TextOutput.java b/src/TextOutput.java index 4b5c46e..c52739a 100644 --- a/src/TextOutput.java +++ b/src/TextOutput.java @@ -130,4 +130,11 @@ public class TextOutput { public void errorInvalidCommand() { System.err.println("Invalid Command"); } + + /** + * Method to give out the Error "Invalid Input". + */ + public void invalidInput() { + System.err.println("Invalid Input"); + } } diff --git a/test/TextOutputTest.java b/test/TextOutputTest.java index 57bb624..17d72b9 100644 --- a/test/TextOutputTest.java +++ b/test/TextOutputTest.java @@ -17,7 +17,7 @@ class TextOutputTest { text.add("Virtute praecedunt, quod fere cotidianis proeliis cum Germanis contendunt, septentr ionesimmensoslongusw ordos."); text.add("Virtutedasjdhashdkjhakjdhakdshjkashd praecedunt, quod fere cotidianis proeliis cum"); //text.add("ordos."); - //text.add("1234"); + text.add("1234"); text.add("12417575147517845 445264565"); text.add(" "); //text.add("1eeeeeee8597389751"); From 3e2bfbaf420247667927c0f9a1a8deb7783a3af0 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 11 Nov 2021 21:55:45 +0100 Subject: [PATCH 2/8] removed method invalidInput --- src/TextOutput.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/TextOutput.java b/src/TextOutput.java index c52739a..4b5c46e 100644 --- a/src/TextOutput.java +++ b/src/TextOutput.java @@ -130,11 +130,4 @@ public class TextOutput { public void errorInvalidCommand() { System.err.println("Invalid Command"); } - - /** - * Method to give out the Error "Invalid Input". - */ - public void invalidInput() { - System.err.println("Invalid Input"); - } } From 9874bf41297507c34137a2cb2910b55143291104 Mon Sep 17 00:00:00 2001 From: schrom01 Date: Thu, 11 Nov 2021 21:59:47 +0100 Subject: [PATCH 3/8] changed TextLogik.java error handling --- src/Text.java | 6 ------ src/TextLogik.java | 14 +++++++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Text.java b/src/Text.java index 60c830c..0f9c165 100644 --- a/src/Text.java +++ b/src/Text.java @@ -25,9 +25,6 @@ public class Text { * @return returns true if the given paragraph exists and is added successfully */ public boolean add(int paragraphNumber, String text) { - if(text.length() < 1) { - return false; - } if (paragraphExists(paragraphNumber)) { this.text.add((paragraphNumber - 1), text); return true; @@ -42,9 +39,6 @@ public class Text { * @return returns true if the paragraph is added successfully */ public boolean add(String text) { - if(text.length() < 1) { - return false; - } this.text.add(text.replaceAll("[^A-Za-z0-9 .,:?!\"'-]","")); return true; } diff --git a/src/TextLogik.java b/src/TextLogik.java index a8682c8..9bd8f88 100644 --- a/src/TextLogik.java +++ b/src/TextLogik.java @@ -12,21 +12,25 @@ public class TextLogik { textOutput = new TextOutput(); String[] command; - textOutput.userInfoOutput("######################"); + textOutput.userInfoOutput("#######################"); textOutput.userInfoOutput("#WELCOME TO THE EDITOR#"); - textOutput.userInfoOutput("######################"); + textOutput.userInfoOutput("#######################"); do { textOutput.userInfoOutput("Please enter a Command: "); command = TextInput.checkForInput(); switch (command[0]) { case "ADD": - textOutput.userInfoOutput("Please enter your text: "); + String inputText = ""; + while(inputText.length() == 0) { + textOutput.userInfoOutput("Please enter your text: "); + inputText = TextInput.getTextInput(); + } if (command.length == 1) { - checkIfSuccess(text.add(TextInput.getTextInput())); + checkIfSuccess(text.add(inputText)); } else if (isNumeric(command[1])) { int line = Integer.parseInt(command[1]); - checkIfSuccess(text.add(line, TextInput.getTextInput())); + checkIfSuccess(text.add(line, inputText)); } else { textOutput.errorInvalidCommand(); } From fc2df137900297cfd49a96845ef80135e5321153 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 11 Nov 2021 22:10:33 +0100 Subject: [PATCH 4/8] added error method missing text and implemented indexOutput and print to throw it when empty --- src/TextOutput.java | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/TextOutput.java b/src/TextOutput.java index 4b5c46e..2d32977 100644 --- a/src/TextOutput.java +++ b/src/TextOutput.java @@ -14,7 +14,10 @@ public class TextOutput { * @param text the ArrayList which is then formatted into the desired output. */ public void print(ArrayList text) { - if (formatRaw) { + if(text.size() == 0) { + errorMissingText(); + } + else if (formatRaw) { printFormated(text); } else { toFormat(text); @@ -112,8 +115,13 @@ public class TextOutput { * @param index ArrayList with words and in which part they have */ public void indexOutput(ArrayList index) { - for (String word : index) { - System.out.println(word); + if(index.size() == 0) { + errorMissingText(); + } + else { + for (String word : index) { + System.out.println(word); + } } } @@ -130,4 +138,11 @@ public class TextOutput { public void errorInvalidCommand() { System.err.println("Invalid Command"); } + + /** + * Method to give out the Error "Missing Text". + */ + public void errorMissingText() { + System.err.println("Missing Text"); + } } From d4b66010334f8d3d8d89d3ddaa237f9d1afe4d8e Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 11 Nov 2021 22:19:52 +0100 Subject: [PATCH 5/8] implemented index is empty to index --- src/TextOutput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TextOutput.java b/src/TextOutput.java index 2d32977..47c37bf 100644 --- a/src/TextOutput.java +++ b/src/TextOutput.java @@ -116,7 +116,7 @@ public class TextOutput { */ public void indexOutput(ArrayList index) { if(index.size() == 0) { - errorMissingText(); + System.out.println("index empty"); } else { for (String word : index) { From afd78900646b870c7e749ed717e01e7612a0a5d7 Mon Sep 17 00:00:00 2001 From: Leonardo Brandenberger Date: Thu, 11 Nov 2021 22:20:44 +0100 Subject: [PATCH 6/8] implemented index is empty to index --- src/TextOutput.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TextOutput.java b/src/TextOutput.java index 47c37bf..653e050 100644 --- a/src/TextOutput.java +++ b/src/TextOutput.java @@ -116,7 +116,7 @@ public class TextOutput { */ public void indexOutput(ArrayList index) { if(index.size() == 0) { - System.out.println("index empty"); + userInfoOutput("index empty"); } else { for (String word : index) { From dc798600e7c06f9fdbc30de6dd57c6ee3ca14d05 Mon Sep 17 00:00:00 2001 From: schrom01 Date: Thu, 11 Nov 2021 22:42:10 +0100 Subject: [PATCH 7/8] change in TextTest.java --- test/TextTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/TextTest.java b/test/TextTest.java index 8091360..376dc42 100644 --- a/test/TextTest.java +++ b/test/TextTest.java @@ -58,8 +58,11 @@ public class TextTest { Assertions.assertFalse(txt.replace(3, "alt", "neu")); Assertions.assertTrue(txt.replace(1, "erste", "zweite")); Assertions.assertTrue(txt.replace("zweite", "erste")); + Assertions.assertTrue(txt.add("Text Text hallo Text")); + Assertions.assertTrue(txt.replace("Text", "Test")); Assertions.assertEquals("Das ist der zweite Beispiel Text.", txt.getText().get(0)); Assertions.assertEquals("Das ist der erste Beispiel Text.", txt.getText().get(1)); + Assertions.assertEquals("Test Test hallo Test", txt.getText().get(2)); } /** From 56707c32ce7ef907a366df91eb9b7a117971e034 Mon Sep 17 00:00:00 2001 From: amadoste Date: Thu, 11 Nov 2021 23:36:58 +0100 Subject: [PATCH 8/8] README file has been written for all commands. --- README.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/README.md b/README.md index e69de29..bca003d 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,46 @@ +#Texteditor +Texteditor is a program to edit a text by in- and output into the console. +#Usermanual +#ADD a Textline +```ADD``` +First please enter the command add to add a new textline. Then enter the text you want to add . + +```ADD [n]``` +If you want to add a textline to a certain paragraph then please use the command add and then enter that paragraphnummber. +After that enter the text you want to add to that paragraph. + +#DUMMY Text +```DUMMY``` +First please enter the command dummy to enter a pre written text into the textline. + +```DUMMY [n]``` +If you want to enter a pre written dummy text into a specific paragraph then please enter the command dummy and then the paragraph that you want to use. + +#REPLACE a Text +```REPLACE``` +First please enter the command replace then enter the characters that you want to replace. After that please enter +the new characters that should replace the old characters. + +```REPLACE [n]``` +If you want to replace a text from a certain paragraph, please enter the command replace and then enter the characters you want to +replace. After you entered the characters you want to replace please enter now the new characters that should replace the +old characters. + +#DELETE a Text +```DEL``` +First please enter the command del to delete a text. Then please enter the text size you want to delete. + +```DEL [n]``` +If you want to delete a text from a certain paragraph then please enter the command del and then the paragraph that you want to delete. + +#INDEX +``ÌNDEX`` +First please enter the command index to show the index. + +#Print the Text +```PRINT``` +First please enter the command print to print out the current text you have. + +#FORMAT the Text +```FORMAT``` +