Updated methods

MainApplication.java

@@ -1,5 +1,3 @@
- 
-
 /**
  * Created by leon on 2/9/18.
  */
@@ -9,13 +7,58 @@ 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();
         
+        // Menu Input
+        String menuInput = " ";
         // Giant while loop that links back to main menu
-        memory.memoryMenu();
-        
+        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");
@@ -25,9 +68,6 @@ public class MainApplication {
         Console.println("The user input %s as a integer", i);
         Console.println("The user input %s as a d", d);
         */
-        
-        
-        
 
     }
 }

SciCalc.java

@@ -10,21 +10,12 @@
 */
 public class SciCalc 
 {
-    public void toSwitchDisplay() {
-        SwitchDisplay switchDisplayMenu =  new SwitchDisplay();
-    }
-    
-    public void toMemory() {
-        MemoryFunc memoryMenu = new MemoryFunc();
-    }
-    
-    /**
-     * To Trig -
-     * sends user to trig functions of the calculator
-     */
-     public void toTrig(int y)
-    {
-        // calls the trig menu
-        Trig trigMenu = new Trig();
+    public void toSciMenu() {
+        Console.println("Scientific Calculator Functions:"
+                         + "\n1: Base Conversion - Converts input to selected base"
+                         + "\n2: Memory - Memory functions"
+                         + "\n3: Trigonometry "
+                         + "\n4: Return to Main Menu");        
+        
     }
 }

SwitchDisplay.java

@@ -32,16 +32,18 @@ public class SwitchDisplay
     
     public void switchDisplay()
     {
-        String mode = "";
-        while (!mode.equals("cancel")) {
+        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" 
-                             + "\nBinary"
-                             + "\nOctal"
-                             + "\nDecimal"
-                             + "\nHexadecimal"
-                             + "\nCancel: returns to Main Menu");
+                             + "\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: ");
             
@@ -57,21 +59,24 @@ public class SwitchDisplay
     
     public String switchDisplayOutput(String mode, int baseInput) {
         switch (mode) {
-            case "binary":
+            case "1":
                 return toBinary(baseInput);
                 
-            case "octal":
+            case "2":
                 return toOctal(baseInput);
                 
-            case "decimal":
+            case "3":
                 return toDecimal(baseInput);
                 
-            case "hexadecimal":
+            case "4":
                 return toHexa(baseInput);
                 
+            case "5":
+                return mode;
+                
             default:
                 return "Invalid Input";
-            }
+        }
     }
     
     /**