Skip to content

Commit

Permalink
Merge pull request #81 from weniseb/release-2.0.0
Browse files Browse the repository at this point in the history
#80 NOTE_014 Final release code refactor [SW, TH]
  • Loading branch information
weniseb authored Jun 3, 2020
2 parents 1e7b643 + c886eaa commit 52e459c
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 16 deletions.
3 changes: 0 additions & 3 deletions src/main/java/asd_morning_9/note/ui/MainView.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
@CssImport("./styles/MainView.css")
public class MainView extends VerticalLayout
{

private JsonParser parser;
public int language = 0; //0 = Englisch, 1 = Deutsch, 2 = Französisch
public MainView() {
Expand Down Expand Up @@ -82,7 +81,6 @@ public MainView() {
Notification.Position.MIDDLE);
notification.open();
}));

}
else if(language == 2)
{
Expand All @@ -98,7 +96,6 @@ else if(language == 2)
title.setLabel("Titre");
title.setClassName("newNoteTitle");


TextField tags = new TextField();
tags.setLabel("Tags");

Expand Down
12 changes: 0 additions & 12 deletions src/main/java/asd_morning_9/note/ui/SortAndFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,12 @@
@Route(value = "SortAndFilter", layout = MainLayout.class)
@CssImport("./styles/SortAndFilter.css")
public class SortAndFilter extends VerticalLayout {

private JsonParser parser;

public int language = 0; //0 = Englisch, 1 = Deutsch, 2 = Französisch
public SortAndFilter() {

parser = new JsonParser();
parser.ReadNotes();
//Note new_note = new Note(2, "new Title", "new Content");
//parser.AddNote(new_note);
parser.SaveNotes();
if(language == 1)
{
Expand All @@ -39,7 +35,6 @@ public SortAndFilter() {

Header head = new Header();
head.add(item.getTitle());
//li.addClassName(Integer.toString(item.getId()));
cont.add(head);
cont.add("Text: " + item.getContent());
cont.add(br);
Expand All @@ -51,7 +46,6 @@ public SortAndFilter() {

//Sort by title
add(new Button("Sortieren mit Titel", event -> {
//TextField id = new TextField("id");
parser.SortNoteByTitel();
remove(ui);

Expand All @@ -65,7 +59,6 @@ public SortAndFilter() {

Header head = new Header();
head.add(item.getTitle());
//li.addClassName(Integer.toString(item.getId()));
cont.add(head);
cont.add("Text: " + item.getContent());
cont.add(br);
Expand All @@ -82,7 +75,6 @@ public SortAndFilter() {
}));

//Filter by tag

TextField tag = new TextField();
tag.setLabel("Tags");
tag.setPlaceholder("Filtern mit tag ...");
Expand All @@ -109,7 +101,6 @@ public SortAndFilter() {

Header head = new Header();
head.add(item.getTitle());
//li.addClassName(Integer.toString(item.getId()));
cont.add(head);
cont.add("Text: " + item.getContent());
cont.add(br);
Expand Down Expand Up @@ -139,7 +130,6 @@ else if(language == 2)
for (Note item : parser.getNotesList())
{
Div cont = new Div();

Header head = new Header();
head.add(item.getTitle());
cont.add(head);
Expand All @@ -163,7 +153,6 @@ else if(language == 2)
{
Div cont = new Div();
Div footer = new Div();

Header head = new Header();
head.add(item.getTitle());
cont.add(head);
Expand Down Expand Up @@ -323,6 +312,5 @@ else if(language == 2)
}));
add(ui);
}

}
}
1 change: 0 additions & 1 deletion src/test/java/asd_morning_9/note/NoteTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

public class NoteTest
{

private int id = 0;
private String title = "title";
private String content = "content";
Expand Down

0 comments on commit 52e459c

Please sign in to comment.