updating memory functions

Console.java

@@ -16,17 +16,6 @@ public class Console {
         SwitchDisplay baseChange = new SwitchDisplay();
         Trig trigMenu = new Trig();
 
-        // Stored memory value should be able to be used throughout whole application
-        Double memoryValue = memory.memory;
-
-        // Ask if you want to use memory, KEEP TRACK OF MEMORY USE
-        // by boolean
-        Boolean memoryChanged = memory.memoryChanged;
-
-        // 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
@@ -38,35 +27,33 @@ public class Console {
                 // Basic Calculator
                 case "1":
                 basicCalc.Basic();
-                
+
                 double basicInput1 = 0,
-                       basicInput2 = 0;
-                       
+                basicInput2 = 0;
+
                 String basicMode = Console.getStringInput("Enter the mode: ");
-                
+
                 if (memory.memoryChanged != true) {
                     basicInput1 = Console.getDoubleInput("Enter the first input: ");
                     basicInput2 = Console.getDoubleInput("Enter the second input: ");
-                } else if (memoryChanged == true) {
+                } else if (memory.memoryChanged == true) {
                     String useMemory = Console.getStringInput("Do you want to use the stored memory value? Y or N: ").toLowerCase();
                     if (useMemory.equals("y")) {
                         String whichBasInput = Console.getStringInput("Which input? 1 or 2 or both").toLowerCase();
                         if (whichBasInput.equals("1")) {
-                            basicInput1 = memoryValue;
+                            basicInput1 = memory.memory;
                             basicInput2 = Console.getDoubleInput("Enter the second input: ");
                         } else if (whichBasInput.equals("2")) {
-                            basicInput2 = memoryValue;
+                            basicInput2 = memory.memory;
                             basicInput1 = Console.getDoubleInput("Enter the first input: ");
                         } else if (whichBasInput.equals("both")) {
-                            basicInput1 = memoryValue;
-                            basicInput2 = memoryValue;
+                            basicInput1 = memory.memory;
+                            basicInput2 = memory.memory;
                         }
                     }
                 }
-                
 
                 double basicAnswer = 0;
-
                 if (basicMode.equals("1")) {
                     basicAnswer = basicCalc.getSum(basicInput1, basicInput2);
 
@@ -142,12 +129,32 @@ public class Console {
                     String baseMode = "";
 
                     baseChange.switchDisplay(); 
+                    String baseAnswer = "";
                     baseMode = Console.getStringInput("Enter the desired display mode: ");
-
                     int userInput = getIntegerInput("Enter the number you want to convert to selected base: ");
 
-                    String baseOutput = baseChange.switchDisplayOutput(baseMode, userInput);
-                    Console.println(baseOutput);
+                    switch (baseMode) {
+                        case "1":
+                        baseAnswer = baseChange.toBinary(userInput);
+
+                        case "2":
+                        baseAnswer = baseChange.toOctal(userInput);
+
+                        case "3":
+                        baseAnswer = baseChange.toDecimal(userInput);
+
+                        case "4":
+                        baseAnswer = baseChange.toHexa(userInput);
+
+                        case "5":
+                        break;
+
+                        default:
+                        Console.println("Invalid Input");
+                        break;
+                    }
+                    
+                    Console.println(baseAnswer);
 
                     break;
                     // display mode

SwitchDisplay.java

@@ -40,29 +40,7 @@ public class SwitchDisplay
                              + "\n5: Cancel - returns to Main Menu");
                          
     }
-    
-    public String switchDisplayOutput(String mode, int baseInput) {
-        switch (mode) {
-            case "1":
-                return toBinary(baseInput);
-                
-            case "2":
-                return toOctal(baseInput);
-                
-            case "3":
-                return toDecimal(baseInput);
-                
-            case "4":
-                return toHexa(baseInput);
-                
-            case "5":
-                break;
-                
-            default:
-                return "Invalid Input";
-        }
-    }
-    
+
     /**
      * Converts the user input into corresponding base types
      */