diff --git a/sll/src/main/java/com/tabrizu/ds/App.java b/sll/src/main/java/com/tabrizu/ds/App.java index 57527f3..a8d7221 100644 --- a/sll/src/main/java/com/tabrizu/ds/App.java +++ b/sll/src/main/java/com/tabrizu/ds/App.java @@ -1,44 +1,23 @@ package com.tabrizu.ds; + import java.util.Scanner; + public class App { ISingleLinkedList m_unfinished; ISingleLinkedList m_finished; - public void userInterface(){ - Scanner sc = new Scanner(System.in); - while (true){ - int menuOption; - menuOption = mainMenu(); - if(menuOption == 7){ - break; - } - switch (menuOption) { - case 1: - System.out.println("What is the title of the task? "); - String taskTitle = sc.next(); - Task task = new Task(taskTitle); - addTask(task, true); - break; - default: - System.out.println("DEFAULT"); - break; - } - - } - - } - public int mainMenu(){ + public int mainMenu() { int command; Scanner scanner = new Scanner(System.in); System.out.println( "Task Manager App:\n" + - "\t 1. Add new normal task.\n" + - "\t 2. Add new important task.\n" + - "\t 3. Get the list of available tasks.\n" + - "\t 4. Get current task.\n" + - "\t 5. Change current task's status to DONE.\n" + - "\t 6. Get the list of finished tasks.\n" + - "\t 7. Quit" + "\t 1. Add new normal task.\n" + + "\t 2. Add new important task.\n" + + "\t 3. Get the list of available tasks.\n" + + "\t 4. Get current task.\n" + + "\t 5. Change current task's status to DONE.\n" + + "\t 6. Get the list of finished tasks.\n" + + "\t 7. Quit" ); System.out.print("What is your command? [1-7]: "); command = scanner.nextInt(); @@ -47,37 +26,72 @@ public class App { return command; } + public void userInterface() { + Scanner sc = new Scanner(System.in); + while (true) { + int menuOption; + menuOption = mainMenu(); + if (menuOption == 7) { + break; + } + switch (menuOption) { + case 1: { + System.out.println("What is the title of the task? "); + String taskTitle = sc.next(); + Task task = new Task(taskTitle); + addTask(task, true); + break; + } + + case 2: { + System.out.println("What is the title of the task? "); + String taskTitle = sc.next(); + Task task = new Task(taskTitle); + addTask(task, false); + break; + } + + + default: + System.out.println("DEFAULT"); + break; + } + + } + + } + public App() { m_unfinished = ISingleLinkedList.create(); m_finished = ISingleLinkedList.create(); } + public static void main(String[] Args) { App app = new App(); app.userInterface(); } - public void addTask(Task task, boolean isNormalTask){ - if(isNormalTask){ + public void addTask(Task task, boolean isNormalTask) { + if (isNormalTask) { m_unfinished.addLast(task); - } - else{ + } else { m_unfinished.addFirst(task); } } - public Task getCurrentTasks(){ + public Task getCurrentTasks() { return m_unfinished.getFirst(); } - public void taskDone(){ + public void taskDone() { m_finished.addFirst(m_unfinished.removeFirst()); } - public String showFinishedTasks(){ + public String showFinishedTasks() { return m_finished.toString(); } - public String showUnFinishedTasks(){ + public String showUnFinishedTasks() { return m_unfinished.toString(); } } diff --git a/sll/src/main/java/com/tabrizu/ds/SingleLinkedList.java b/sll/src/main/java/com/tabrizu/ds/SingleLinkedList.java index 3158644..7fee071 100644 --- a/sll/src/main/java/com/tabrizu/ds/SingleLinkedList.java +++ b/sll/src/main/java/com/tabrizu/ds/SingleLinkedList.java @@ -45,7 +45,9 @@ public class SingleLinkedList implements ISingleLinkedList { m_tail = m_head; } m_size += 1; - System.out.println("First Node added with value: " + value); + System.out.println( + "First Node added with value: " + value + ); } @@ -59,7 +61,9 @@ public class SingleLinkedList implements ISingleLinkedList { m_tail.setNext(newNode); m_tail = newNode; m_size++; - System.out.println("Last Node added with value: " + value); + System.out.println( + "Last Node added with value: " + value + ); } diff --git a/sll/src/main/java/com/tabrizu/ds/Task.java b/sll/src/main/java/com/tabrizu/ds/Task.java index 973b9fb..f6e1aef 100644 --- a/sll/src/main/java/com/tabrizu/ds/Task.java +++ b/sll/src/main/java/com/tabrizu/ds/Task.java @@ -10,4 +10,9 @@ public class Task { public String getTitle(){ return m_title; } + + @Override + public String toString() { + return "[Task] " + m_title; + } } diff --git a/sll/target/classes/com/tabrizu/ds/App.class b/sll/target/classes/com/tabrizu/ds/App.class index f74c1c6..89aedb2 100644 Binary files a/sll/target/classes/com/tabrizu/ds/App.class and b/sll/target/classes/com/tabrizu/ds/App.class differ diff --git a/sll/target/classes/com/tabrizu/ds/ISingleLinkedList.class b/sll/target/classes/com/tabrizu/ds/ISingleLinkedList.class index ca585dd..9695f2f 100644 Binary files a/sll/target/classes/com/tabrizu/ds/ISingleLinkedList.class and b/sll/target/classes/com/tabrizu/ds/ISingleLinkedList.class differ diff --git a/sll/target/classes/com/tabrizu/ds/SingleLinkedList.class b/sll/target/classes/com/tabrizu/ds/SingleLinkedList.class index 1e189bf..6e5dab9 100644 Binary files a/sll/target/classes/com/tabrizu/ds/SingleLinkedList.class and b/sll/target/classes/com/tabrizu/ds/SingleLinkedList.class differ diff --git a/sll/target/classes/com/tabrizu/ds/Task.class b/sll/target/classes/com/tabrizu/ds/Task.class new file mode 100644 index 0000000..8862cde Binary files /dev/null and b/sll/target/classes/com/tabrizu/ds/Task.class differ