ZHAW-IT21b_WIN/gruppe06-hufflepuff-projekt2-texteditor
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reformating code

Browse Source
This commit is contained in:
schrom01
2021-11-12 10:37:38 +01:00
parent c76c35a62c
commit b8b3d78b78
8 changed files with 99 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Text.java
+6 -7
View File
@@ -10,11 +10,11 @@ import java.util.Map;
*/
public class Text {
private static final String dummyText = "The standard Lorem Ipsum passage, used since the 1500s \"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.\" Section 1.10.32 of \"de Finibus Bonorum et Malorum\", written by Cicero in 45 BC \"Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?";
/**
* The DataFields text and dummyText save the objects that are being used in this class.
*/
private final ArrayList<String> text = new ArrayList<>();
private static final String dummyText = "The standard Lorem Ipsum passage, used since the 1500s \"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.\" Section 1.10.32 of \"de Finibus Bonorum et Malorum\", written by Cicero in 45 BC \"Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?";
/**
* Method to check if a specific paragraph exists.
@@ -48,7 +48,7 @@ public class Text {
* @return returns true if the paragraph is added successfully.
*/
public boolean add(String text) {
this.text.add(text.replaceAll("[^A-Za-z0-9 .,:?!\"'-]",""));
this.text.add(text.replaceAll("[^A-Za-z0-9 .,:?!\"'-]", ""));
return true;
}
@@ -105,7 +105,7 @@ public class Text {
* @return returns true if the paragraph is changed successfully.
*/
public boolean replace(String oldChar, String newChar) {
if(paragraphExists(text.size())) {
if (paragraphExists(text.size())) {
text.set((text.size() - 1), text.get(text.size() - 1).replace(oldChar, newChar));
return true;
}
@@ -133,7 +133,7 @@ public class Text {
* @return True: if paragraph has been deleted.
*/
public boolean del() {
if(paragraphExists(text.size())){
if (paragraphExists(text.size())) {
text.remove(text.size() - 1);
return true;
}
@@ -148,7 +148,7 @@ public class Text {
* @return ArrayList<String>
*/
public ArrayList<String> index() {
HashMap<String,ArrayList<Integer>> wordbook = new HashMap<>();
HashMap<String, ArrayList<Integer>> wordbook = new HashMap<>();
createWordlist(wordbook);
String input;
ArrayList<String> output = new ArrayList<>();
@@ -174,9 +174,8 @@ public class Text {
/**
* This method counts all words in text and adds the count together with the paragraph where the word has been used to a Hashmap.
*
*/
private void createWordlist(HashMap<String,ArrayList<Integer>> wordbook) {
private void createWordlist(HashMap<String, ArrayList<Integer>> wordbook) {
int counter;
ArrayList<Integer> numbersList;
String firstLetter;
src/TextLogic.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class TextLogic {
switch (command[0]) {
case "ADD":
String inputText = "";
while(inputText.length() == 0) {
while (inputText.length() == 0) {
textOutput.userInfoOutput("Please enter your text: ");
inputText = TextInput.getTextInput();
}
src/TextOutput.java
+9 -12
View File
@@ -17,10 +17,9 @@ public class TextOutput {
* @param text the ArrayList which is then formatted into the desired output.
*/
public void print(ArrayList<String> text) {
if(text.size() == 0) {
if (text.size() == 0) {
errorMissingText();
}
else if (formatRaw) {
} else if (formatRaw) {
printFormated(text);
} else {
toFormat(text);
@@ -50,15 +49,15 @@ public class TextOutput {
String[] words = paragraph.split(" ");
int lastWordNumber = words.length;
int currentWordNumber = 0;
for(String word : words) {
for (String word : words) {
currentWordNumber++;
if (word.length()>= columnWidth - currentLength && currentWordNumber != 1) {
if (word.length() >= columnWidth - currentLength && currentWordNumber != 1) {
System.out.println();
currentLength = 0;
}
System.out.print(word);
if(!(currentWordNumber == lastWordNumber)) {
if (!(currentWordNumber == lastWordNumber)) {
System.out.print(" ");
currentLength = currentLength + word.length() + 1;
} else {
@@ -86,12 +85,11 @@ public class TextOutput {
* @param length the paragraph length when printing the text.
*/
public void formatFix(int length) {
if(length > 0) {
if (length > 0) {
formatRaw = false;
columnWidth = length;
userInfoOutput("Command was successful");
}
else {
} else {
System.err.println("Minimum length has to be greater than 0");
}
}
@@ -111,10 +109,9 @@ public class TextOutput {
* @param index ArrayList with words and in which part they have
*/
public void indexOutput(ArrayList<String> index) {
if(index.size() == 0) {
if (index.size() == 0) {
userInfoOutput("index empty");
}
else {
} else {
for (String word : index) {
System.out.println(word);
}