diff --git a/.gitignore b/.gitignore index 2b04b28136..2873e189e1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ /.idea/ /out/ /*.iml -/*.class # Gradle build files /.gradle/ diff --git a/build.gradle b/build.gradle index 8063a8adb8..d5e548e85f 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ test { } application { - mainClass = "Inka" + mainClass = "seedu.duke.Duke" } shadowJar { diff --git a/src/main/java/Inka.class b/src/main/java/Inka.class deleted file mode 100644 index d8aee0ed39..0000000000 Binary files a/src/main/java/Inka.class and /dev/null differ diff --git a/src/main/java/Inka.java b/src/main/java/Inka.java deleted file mode 100644 index 247f96f2b9..0000000000 --- a/src/main/java/Inka.java +++ /dev/null @@ -1,26 +0,0 @@ -import utils.parser.Parser; -import utils.userinterface.UserInterface; - -public class Inka { - private final UserInterface ui; - private final Parser parser; - public Inka() { - ui = new UserInterface(); - parser = new Parser(); - } - - public void run() { - ui.printGreeting(); - - //fill in the method here - //while(parser.getIsExecuting()) { - // String fullCommand = ui.getCommand(); - //} - - ui.printBye(); - } - - public static void main(String[] args) { - new Inka().run(); - } -} diff --git a/src/main/java/model/card/Card.java b/src/main/java/model/card/Card.java deleted file mode 100644 index 1c734e49fd..0000000000 --- a/src/main/java/model/card/Card.java +++ /dev/null @@ -1,10 +0,0 @@ -package model.card; - -//to be made into an abstract class containing a few types of Cards later, for now just a single Card will do -public class Card { - private int uuid ; //to be made into a hash later - private String question; - private String answer; - - //implement method such as toPrint() or any other appropriate method here -} diff --git a/src/main/java/model/cardlist/CardList.java b/src/main/java/model/cardlist/CardList.java deleted file mode 100644 index 4e65cb4fdc..0000000000 --- a/src/main/java/model/cardlist/CardList.java +++ /dev/null @@ -1,12 +0,0 @@ -package model.cardlist; - -import model.card.Card; -import java.util.ArrayList; - -public class CardList { - private ArrayList cards ; - - CardList() { - this.cards = new ArrayList<>(); - } -} diff --git a/src/main/java/utils/enums/StringArt.class b/src/main/java/utils/enums/StringArt.class deleted file mode 100644 index 7f0624d5d3..0000000000 Binary files a/src/main/java/utils/enums/StringArt.class and /dev/null differ diff --git a/src/main/java/utils/enums/StringArt.java b/src/main/java/utils/enums/StringArt.java deleted file mode 100644 index 87f8c9cf2c..0000000000 --- a/src/main/java/utils/enums/StringArt.java +++ /dev/null @@ -1,22 +0,0 @@ -package utils.enums; - -public enum StringArt { - INKA( - ".___ __ \n" + - "| | ____ | | _______ \n" + - "| |/ \\| |/ /\\__ \\ \n" + - "| | | \\ < / __ \\_\n" + - "|___|___| /__|_ \\(____ /\n" + - " \\/ \\/ \\/ "), - BYE( - " ____ _ _ ____ _ \n" + - "( _ \\( \\/ )( __) / \\ \n" + - " ) _ ( ) / ) _) \\_/ \n" + - "(____/(__/ (____) (_) " - ); - - public final String art; - StringArt(String art) { - this.art = art; - } -} diff --git a/src/main/java/utils/parser/Parser.class b/src/main/java/utils/parser/Parser.class deleted file mode 100644 index 583e71710e..0000000000 Binary files a/src/main/java/utils/parser/Parser.class and /dev/null differ diff --git a/src/main/java/utils/parser/Parser.java b/src/main/java/utils/parser/Parser.java deleted file mode 100644 index 13c0e854c9..0000000000 --- a/src/main/java/utils/parser/Parser.java +++ /dev/null @@ -1,15 +0,0 @@ -package utils.parser; - -public class Parser { - private boolean isExecuting; - - public Parser() { - this.isExecuting = true; - } - - public boolean getIsExecuting() { - return isExecuting; - } - - //add all parser methods here -} diff --git a/src/main/java/utils/userinterface/UserInterface.class b/src/main/java/utils/userinterface/UserInterface.class deleted file mode 100644 index 4640c265f6..0000000000 Binary files a/src/main/java/utils/userinterface/UserInterface.class and /dev/null differ diff --git a/src/main/java/utils/userinterface/UserInterface.java b/src/main/java/utils/userinterface/UserInterface.java deleted file mode 100644 index 3b610ccc40..0000000000 --- a/src/main/java/utils/userinterface/UserInterface.java +++ /dev/null @@ -1,48 +0,0 @@ -package utils.userinterface; - -import utils.enums.StringArt; - -import java.util.Scanner; - -public class UserInterface { - private static final int LINE_LENGTH = 100; - private static final String INKA_ART = - ".___ __ \n" + - "| | ____ | | _______ \n" + - "| |/ \\| |/ /\\__ \\ \n" + - "| | | \\ < / __ \\_\n" + - "|___|___| /__|_ \\(____ /\n" + - " \\/ \\/ \\/ "; - - private static final String BYE_ART = - " ____ _ _ ____ _ \n" + - "( _ \\( \\/ )( __) / \\ \n" + - " ) _ ( ) / ) _) \\_/ \n" + - "(____/(__/ (____) (_) "; - private final Scanner scanner; - public UserInterface() { - scanner = new Scanner(System.in); - } - - public String getCommand() { - return scanner.nextLine(); - } - - public void printLine() { - System.out.println("_".repeat(LINE_LENGTH)); - } - - public void printGreeting() { - printLine(); - System.out.println(StringArt.INKA.art); - System.out.println("Welcome to Inka ! Say no more to failing exams as Inka will be your lord and saviour!"); - printLine(); - } - - public void printBye() { - printLine(); - System.out.println(StringArt.BYE.art); - System.out.println("\n Bye! All the best for your exams man!!!"); - printLine(); - } -} diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT index 79c073f18d..892cb6cae7 100644 --- a/text-ui-test/EXPECTED.TXT +++ b/text-ui-test/EXPECTED.TXT @@ -1,17 +1,9 @@ -____________________________________________________________________________________________________ -.___ __ -| | ____ | | _______ -| |/ \| |/ /\__ \ -| | | \ < / __ \_ -|___|___| /__|_ \(____ / - \/ \/ \/ -Welcome to Inka ! Say no more to failing exams as Inka will be your lord and saviour! -____________________________________________________________________________________________________ -____________________________________________________________________________________________________ - ____ _ _ ____ _ -( _ \( \/ )( __) / \ - ) _ ( ) / ) _) \_/ -(____/(__/ (____) (_) +Hello from + ____ _ +| _ \ _ _| | _____ +| | | | | | | |/ / _ \ +| |_| | |_| | < __/ +|____/ \__,_|_|\_\___| - Bye! All the best for your exams man!!! -____________________________________________________________________________________________________ +What is your name? +Hello James Gosling diff --git a/text-ui-test/input.txt b/text-ui-test/input.txt index e69de29bb2..f6ec2e9f95 100644 --- a/text-ui-test/input.txt +++ b/text-ui-test/input.txt @@ -0,0 +1 @@ +James Gosling \ No newline at end of file