Updated methods

MainApplication.java

@@ -11,6 +11,7 @@ public class MainApplication {
         // Create all instances of classes to be used for this program
         
         MemoryFunc memory = new MemoryFunc();
+        SwitchDisplay baseChange = new SwitchDisplay();
         
         // Giant while loop that links back to main menu
         memory.memoryMenu();

SwitchDisplay.java

@@ -32,32 +32,46 @@ public class SwitchDisplay
     
     public void switchDisplay()
     {
-        int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
-        // try catch for int vs double or other input
-        Console.println("Display Options" 
-                         + "\nBinary"
-                         + "\nOctal"
-                         + "\nDecimal"
-                         + "\nHexadecimal"
-                         + "\nCancel: returns to Main Menu");
-        // Accepts next input to display mode.
-        String mode = Console.getStringInput("Enter the base option to display.").toLowerCase();
-        
-        if (mode.equals("binary") == true) {
-            Console.println(baseInput + "in binary: " + toBinary(baseInput));
-        } else if (mode.equals("octal") == true) {
-            Console.println(baseInput + "in octal: " + toOctal(baseInput));
-        } else if (mode.equals("decimal") == true) {
-            Console.println(baseInput + "in decimal: " + baseInput);
-        } else if (mode.equals("hexadecimal") == true) {
-            Console.println(baseInput + "in hexadecimal: " + toHexa(baseInput));
-        } else if (mode.equals("cancel") == true) {
-            Console.println("Returning to Main Menu");
-            // calls back to main application menu
-        } else {
-            Console.println("Invalid input.");
+        String mode = "";
+        while (!mode.equals("cancel")) {
+            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");
+            // 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
         }
-        
+                         
+    }
+    
+    public String switchDisplayOutput(String mode, int baseInput) {
+        switch (mode) {
+            case "binary":
+                return toBinary(baseInput);
+                
+            case "octal":
+                return toOctal(baseInput);
+                
+            case "decimal":
+                return toDecimal(baseInput);
+                
+            case "hexadecimal":
+                return toHexa(baseInput);
+                
+            default:
+                return "Invalid Input";
+            }
     }
     
     /**