diff --git a/src/main/java/com/unitime/App.java b/src/main/java/com/unitime/App.java index a872934..b423ab9 100644 --- a/src/main/java/com/unitime/App.java +++ b/src/main/java/com/unitime/App.java @@ -3,21 +3,19 @@ import java.util.List; import java.util.Scanner; - +import com.unitime.UI.IntroScreen; import com.unitime.UI.ResultView; -import com.unitime.feature.InputHandler; +import com.unitime.algorthm.Scheduler; import com.unitime.feature.Course; -import com.unitime.algorthm.Scheduler; +import com.unitime.feature.InputHandler; public class App { public static void main( String[] args ) { Scanner sc = new Scanner(System.in); - - System.out.println("\n=== Welcome to UniTime-Solver! ==="); + IntroScreen.start(); System.out.println("Press [ENTER] to start..."); sc.nextLine(); - while(true) { InputHandler inputHandler = new InputHandler(); @@ -42,6 +40,7 @@ public static void main( String[] args ) { if (currentIndex + 5 < results.size()) { currentIndex += 5; } else { + } } else if (command.equals("edit")) { @@ -50,4 +49,5 @@ else if (command.equals("edit")) { } } } + } diff --git a/src/main/java/com/unitime/UI/IntroScreen.java b/src/main/java/com/unitime/UI/IntroScreen.java index d6f4dc8..44d9b40 100644 --- a/src/main/java/com/unitime/UI/IntroScreen.java +++ b/src/main/java/com/unitime/UI/IntroScreen.java @@ -1,4 +1,4 @@ -import java.util.Scanner; +package com.unitime.UI; public class IntroScreen { //set color for introscreen @@ -17,7 +17,7 @@ public class IntroScreen { private static final int NUM_COLORS = ANSI_COLORS.length; private static final int WIDTH = 80; - public static boolean start() { + public static void start() { printBorderedBox(); System.out.println("=".repeat(WIDTH + 4)); @@ -25,12 +25,6 @@ public static boolean start() { System.out.println("=".repeat(WIDTH + 4)); //waiting user's enter - try (Scanner scanner = new Scanner(System.in)) { - scanner.nextLine(); - return true; //if user's enter succeed - }catch (Exception e) { - return false; //else - } } private static void printBorderedBox() { diff --git a/src/main/java/com/unitime/UI/ResultView.java b/src/main/java/com/unitime/UI/ResultView.java index 0f3472a..699d397 100644 --- a/src/main/java/com/unitime/UI/ResultView.java +++ b/src/main/java/com/unitime/UI/ResultView.java @@ -3,6 +3,7 @@ import java.util.Collections; import java.util.List; import java.util.Scanner; + import com.unitime.feature.Course; public class ResultView {