From daa403cac0730ffa6b3da392eb08164271666a44 Mon Sep 17 00:00:00 2001 From: schrom01 Date: Fri, 29 Oct 2021 17:06:10 +0200 Subject: [PATCH] changes in Methods dummy and replace. static block to read dummy text file added --- PM2_ClassDiagram.drawio | 2 +- src/dummytext.txt => dummytext.txt | 0 src/Text.java | 54 +++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 13 deletions(-) rename src/dummytext.txt => dummytext.txt (100%) diff --git a/PM2_ClassDiagram.drawio b/PM2_ClassDiagram.drawio index 312b31c..94e625d 100644 --- a/PM2_ClassDiagram.drawio +++ b/PM2_ClassDiagram.drawio @@ -1 +1 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/dummytext.txt b/dummytext.txt similarity index 100% rename from src/dummytext.txt rename to dummytext.txt diff --git a/src/Text.java b/src/Text.java index b17364f..e16e82b 100644 --- a/src/Text.java +++ b/src/Text.java @@ -1,9 +1,30 @@ +import java.io.File; +import java.io.FileNotFoundException; import java.util.ArrayList; +import java.util.Scanner; public class Text { private ArrayList text = new ArrayList<>(); - private String dummyText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."; + private static final String dummyTextFileName = "dummytext.txt"; + private static String dummyText = ""; + + + /** + * Static block to get Dummytext from file. + */ + static { + File dummyTextFile = new File(dummyTextFileName); + try { + Scanner scanner = new Scanner(dummyTextFile); + while(scanner.hasNextLine()) { + dummyText = dummyText + scanner.nextLine() + " "; + } + } catch (FileNotFoundException e) { + dummyText = "File " + dummyTextFileName + " not found."; + } + } + /** * Method to add a paragraph at a specific position. @@ -12,8 +33,8 @@ public class Text { * @return returns true if the given paragraph exists and is added successfully */ public boolean add(int paragraphNumber, String text) { - if(paragraphNumber < this.text.size()) { - this.text.add(paragraphNumber, text); + if(paragraphNumber > 0 && (paragraphNumber <= this.text.size())) { + this.text.add((paragraphNumber - 1), text); return true; } return false; @@ -47,25 +68,34 @@ public class Text { } /** - * - * @param paragraphNumber - * @param oldString - * @param replaceString - * @return + * Method to replace characters in a specific paragraph + * @param paragraphNumber number of paragraph which should be changed. + * @param oldChar the old character. + * @param newChar the new character. + * @return returns true if the given paragraph exists and is changed successfully */ - public boolean replace(int paragraphNumber, String oldString, String replaceString) { - if(paragraphNumber < this.text.size()) { + public boolean replace(int paragraphNumber, String oldChar, String newChar) { + if(paragraphNumber > 0 && (paragraphNumber <= this.text.size())) { + text.set((paragraphNumber - 1), text.get(paragraphNumber - 1).replace(oldChar, newChar)); return true; } return false; } - public boolean replace(String oldString, String replaceString) { + + /** + * Method to replace characters in the last paragraph + * @param oldChar the old character. + * @param newChar the new character. + * @return returns true if the paragraph is changed successfully + */ + public boolean replace(String oldChar, String newChar) { + text.set((text.size() - 1), text.get(text.size() - 1).replace(oldChar, newChar)); return true; } public boolean del(int paragraphNumber) { - if(paragraphNumber < this.text.size()) { + if(paragraphNumber > 0 && (paragraphNumber <= this.text.size())) { //paragraph hier löschen. return true; }