Updated console and methods connecting to it

Basic.java

@@ -15,8 +15,6 @@ public class Basic
     
     public double Basic()
     {
-        //a check to make sure user input is valid.
-        boolean validInput = false;
         
         //Get input of first number
         input1 = Console.getDoubleInput("What is the first number?");

Console.java

@@ -1,12 +1,128 @@
- 
 
 import java.util.Scanner;
-
 /**
  * Created by leon on 2/9/18.
  */
 public class Console {
 
+    public static void main(String[] args) {
+        double answer;
+        // Create all instances of classes to be used for this program
+        MainMenu mainMenu = new MainMenu();
+        Basic basicCalc = new Basic();
+        SciCalc scientificCalc = new SciCalc();
+        MemoryFunc memory = new MemoryFunc();
+        SwitchDisplay baseChange = new SwitchDisplay();
+        Trig trigMenu = new Trig();
+
+        // Stored memory value should be able to be used throughout whole application
+        Double memoryValue = memory.memory;
+
+        // blanket input statement 
+        // create input methods to call when we need them with specific types
+        // we use 1 input variable statement to call the user to input, then manipulate
+        // Can user input M if native type is double
+        // if any input = "m", that input now = memoryValue;
+
+        // Menu Input
+        String menuInput = " ";
+        // Giant while loop that links back to main menu
+        while (!menuInput.equals("4")) {
+            mainMenu.mainMenuDisplay();
+            menuInput = Console.getStringInput("Enter the calculator you want to use by key. (ie. 1 for basic, etc.)");
+
+            switch (menuInput) {
+                case "1":
+                basicCalc.Basic();
+
+                double basicInput1 = Console.getIntegerInput("Enter the first input: ");
+
+                String basicMode = Console.getStringInput("Enter the mode: ");
+
+                double basicInput2 = Console.getIntegerInput("Enter the second input: ");
+
+                if (basicMode.equals("+")) {
+                    basicCalc.getSum(basicInput1, basicInput2);
+
+                    //subtraction    
+                } else if (basicMode.equals("-")) {
+                    basicCalc.getDiff(basicInput1, basicInput2);
+
+                    //multiplication
+                } else if (basicMode.equals("*")) {
+                    basicCalc.getProduct(basicInput1, basicInput2);
+
+                    //division    
+                } else if (basicMode.equals("/")) {
+                    //error message when trying to divide by 0.
+                    if (basicInput2 == 0) {
+                        Console.println("undefined");
+                        //Insert return to main menu.
+                    } else {
+                        basicCalc.getQuotient(basicInput1, basicInput2);
+                    }
+                } else {
+                    //error if wrong input was entered
+                    answer = Double.NaN;
+                    Console.println("Invalid Input");
+                }
+
+                
+                break;
+
+                case "2":
+
+                // Sends to Advanced Calculator Functions
+                break;
+
+                case "3":
+
+                // Sends to Scientific Calculator Functions
+                // displays the menu for scientific calc
+                scientificCalc.toSciMenu();
+                String sciMenuInput = Console.getStringInput("Enter the function you'd like to use by key.");
+                // if statement to use various calc functions
+                if (sciMenuInput.equals("1")) {
+                    // Base Conversions
+                    // while loop for display 
+                    String mode = "";
+                    while (!mode.equals("Invalid Input")) {
+                        baseChange.switchDisplay(); 
+                        mode = Console.getStringInput("Enter the desired display mode: ");
+                    }
+
+                    int userInput = getIntegerInput("Enter the number you want to convert to selected base: ");
+                    baseChange.switchDisplayOutput(mode, userInput);
+
+                    // display mode
+                    // gets mode
+                    // asks for input
+                } else if (sciMenuInput.equals("2")) {
+                    // Memory
+                    memory.memoryMenu();
+                } else if (sciMenuInput.equals("3")) {
+                    // To Trig Menu
+                    answer = trigMenu.TrigFunctions();
+                    Console.println(Double.toString(answer));
+                    String response = Console.getStringInput("Would you like to convert your answer from radian to degrees? Y or N").toLowerCase();
+
+                    if (response.equals("y") ) {
+                        trigMenu.toDegrees(answer);
+                    }
+                    break;
+                } else {
+                    break;
+                }
+                break;
+
+                case "4":
+                // Quits the calculator
+                break;
+            }
+
+        }
+    }
+
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
     }

MainApplication.java

@@ -6,73 +6,6 @@ import java.util.*;
 public class MainApplication {
     
     public static void main(String[] args) {
-        // Create all instances of classes to be used for this program
-        MainMenu mainMenu = new MainMenu();
-        SciCalc scientificCalc = new SciCalc();
-        MemoryFunc memory = new MemoryFunc();
-        SwitchDisplay baseChange = new SwitchDisplay();
-        
-        // Stored memory value should be able to be used throughout whole application
-        Double memoryValue = memory.memory;
-        
-        // if any input = "m", that input now = the memory value
-        
-        // Menu Input
-        String menuInput = " ";
-        // Giant while loop that links back to main menu
-        while (!menuInput.equals("4")) {
-            mainMenu.mainMenuDisplay();
-            menuInput = Console.getStringInput("Enter the calculator you want to use by key. (ie. 1 for basic, etc.)");
-           
-            switch (menuInput) {
-                case "1":
-                
-                    // Sends to basic calculator functions
-                    break;
-                
-                case "2":
-                
-                    // Sends to Advanced Calculator Functions
-                    break;
-                
-                case "3":
-                
-                    // Sends to Scientific Calculator Functions
-                    // displays the menu for scientific calc
-                    scientificCalc.toSciMenu();
-                    String sciMenuInput = Console.getStringInput("Enter the function you'd like to use by key.");
-                    // if statement to use various calc functions
-                    if (sciMenuInput.equals("1")) {
-                        // Base Conversions
-                        baseChange.switchDisplay();
-                        
-                    } else if (sciMenuInput.equals("2")) {
-                        // Memory
-                        memory.memoryMenu();
-                    } else if (sciMenuInput.equals("3")) {
-                        // To Trig Menu
-                        
-                    } else {
-                        break;
-                    }
-                    break;
-                    
-                case "4":
-                    // Quits the calculator
-                    break;
-                }
-
-        }
-
-        Console.println("Welcome to my calculator!");
-        /** String s = Console.getStringInput("Enter a string");
-        Integer i = Console.getIntegerInput("Enter an integer");
-        Double d = Console.getDoubleInput("Enter a double.");
-
-        Console.println("The user input %s as a string", s);
-        Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
-        */
-
+        Console console = new Console();
     }
 }

SwitchDisplay.java

@@ -30,30 +30,19 @@ public class SwitchDisplay
      * switchDisplayMode(String mode) sets the display to the mode given
      */
     
-    public void switchDisplay()
+    public String switchDisplay()
     {
         String mode = "Invalid Input";
         
         while (mode.equals("Invalid Input")) {
-            int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
-    
             Console.println("Display Options" 
                              + "\n1: Binary"
                              + "\n2: Octal"
                              + "\n3: Decimal"
                              + "\n4: Hexadecimal"
                              + "\n5: Cancel - returns to Main Menu");
-                             
-            // Asks for the mode
-            mode = Console.getStringInput("Enter the desired display mode: ");
-            
-            String convertedInput = switchDisplayOutput(mode, baseInput);
-            
-            Console.println(convertedInput); 
-            // passes to switchDisplayOutput(mode) >> returns string
-            // displays the returned string
-            // while loops !cancel
         }
+        return mode = Console.getStringInput("Enter the desired display mode: ");
                          
     }
     

Trig.java

@@ -12,19 +12,6 @@ public class Trig
     double answer;
     String operation = "";
     
-    public double Trig() {
-        TrigFunctions();
-        
-        //Ask if they would like to convert.
-        String response = Console.getStringInput("Would you like to convert your answer from radian to degrees?  Y or N");
-        response = response.toLowerCase();
-        if (response.equals("y")) {
-            toDegrees(answer);
-    }
-    
-        return answer;
-}
-    
     public double TrigFunctions()
     {
         //a check to make sure user input is valid