TextLogik remove duplicated code

This commit is contained in:
Andrin Fassbind 2021-11-11 17:18:50 +01:00
parent 6b0eabea71
commit bc4dd38db4
3 changed files with 30 additions and 12 deletions

View File

@ -102,8 +102,11 @@ public class Text {
* @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;
if(paragraphExists((text.size()))) {
text.set((text.size() - 1), text.get(text.size() - 1).replace(oldChar, newChar));
return true;
}
return false;
}
/**
@ -127,8 +130,11 @@ public class Text {
* @return True: if paragraph has been deleted.
*/
public boolean del() {
text.remove(text.size() - 1);
return true;
if(paragraphExists(text.size())){
text.remove(text.size() - 1);
return true;
}
return false;
}
/**

View File

@ -71,13 +71,19 @@ public class TextLogik {
textOutput.print(text.getText());
break;
case "REPLACE":
textOutput.userInfoOutput("Please enter your text to replace: ");
if (command.length == 1){
checkIfSuccess(text.replace(TextInput.getTextInput(), TextInput.getTextInput()));
}else if(isNumeric(command[1])) {
String oldChar = "";
while (oldChar.length() == 0) {
textOutput.userInfoOutput("Please enter your text to replace: ");
oldChar = TextInput.getTextInput();
}
textOutput.userInfoOutput("Please enter the new text: ");
String newChar = TextInput.getTextInput();
if (command.length == 1) {
checkIfSuccess(text.replace(oldChar, newChar));
} else if (isNumeric(command[1])) {
int line = Integer.parseInt(command[1]);
checkIfSuccess(text.replace(line, TextInput.getTextInput(), TextInput.getTextInput()));
}else {
checkIfSuccess(text.replace(line, oldChar, newChar));
} else {
textOutput.errorInvalidCommand();
}
@ -101,9 +107,9 @@ public class TextLogik {
}
private void checkIfSuccess(boolean method) {
if(method) {
if (method) {
textOutput.userInfoOutput("Command was successfull");
}else {
} else {
textOutput.errorInvalidParagraph();
}
}

View File

@ -92,4 +92,10 @@ public class TextTest {
stringListe = txt.index();
Assertions.assertEquals(0,stringListe.size());
}
@Test
void testing() {
txt.add("");
txt.index();
}
}