Tested and updated methods

MainApplication.java

@@ -3,15 +3,22 @@
 /**
  * Created by leon on 2/9/18.
  */
+import java.util.*;
+
 public class MainApplication {
+    
     public static void main(String[] args) {
         Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
+        /** 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);
+        */
+        
+        MemoryFunc memory = new MemoryFunc();
+
     }
 }

MemoryFunc.java

@@ -1,48 +1,38 @@
 
 /**
- * Scientific Calculator Lab
- * Trinh Tong
- * Memory Class
+
  */
-public class MemoryFunc
-{
-    // instance variables - replace the example below with your own
-    private double memory = 0;
+public class MemoryFunc {
+    private Double memory;
+    public static final Double DEFAULT_MEMORY_VALUE = new Double(0);
 
+    public MemoryFunc() {
+        this.memory = DEFAULT_MEMORY_VALUE;
+    }
     /**
-     * Store 1 numeric value in memory for recall later
-     * M+ = add currently displayed value to the value in memorie (default = 0)
-     * MC = reset memory
-     * MRC = recall current valie from memory to display
+     * Menu
+     * Clear
+     * Print
+     * Update
      */
-    public void memory()
-    {
-        // Memory menu
-        Console.println("Memory Mode");
-        // Ask for input of a number
-        double memoryInput = Console.getDoubleInput("Enter a number to store. ");
-        // Display memory keys
-        Console.println("Memory Options: " 
-                         + "\nM+ : adds input to memory"
-                         + "\nMC : clears current memory"
-                         + "\nMRC : displays current memory input");
+    public void memoryMenu() {
+        Console.println("Memory Menu"
+                         + "\nM+: Update stored memory value"
+                         + "\nMC: Clear to default memory value"
+                         + "\nMCR: Display stored memory value" );
                          
-        String memorySelect = Console.getStringInput("What would you like to do? (Enter the key)");
-
-        
-        if (memorySelect.equals("M+") == true) {
-            // M+
-            memory = memoryInput;
-            
-        } else if (memorySelect.equals("MC") == true) {
-            // MC
-            memory = 0;
-            
-        } else if (memorySelect.equals("MCR") == true) {
-            // MCR
-            Console.println(Double.toString(memory));
-        
-        }
-        
-    }  
+    }
+    
+    public void updateMemory(Double memoryInput) {
+        this.memory = memoryInput;
+    }
+    
+    public void clearMemory() {
+        this.memory = DEFAULT_MEMORY_VALUE;
+    }
+    
+    public void displayMemory() {
+        Console.println(memory.toString());
+    }
+    
 }

SwitchDisplay.java

@@ -29,7 +29,8 @@ public class SwitchDisplay
      * switchDisplayMode() rotates through the options
      * switchDisplayMode(String mode) sets the display to the mode given
      */
-    public void switchDisplay(String mode)
+    
+    public void switchDisplay()
     {
         int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
         // try catch for int vs double or other input
@@ -40,7 +41,7 @@ public class SwitchDisplay
                          + "\nHexadecimal"
                          + "\nCancel: returns to Main Menu");
         // Accepts next input to display mode.
-        mode = Console.getStringInput("Enter the base option to display.").toLowerCase();
+        String mode = Console.getStringInput("Enter the base option to display.").toLowerCase();
         
         if (mode.equals("binary") == true) {
             Console.println(baseInput + "in binary: " + toBinary(baseInput));

package.bluej

@@ -11,16 +11,16 @@ dependency3.type=UsesDependency
 dependency4.from=SciCalc
 dependency4.to=Trig
 dependency4.type=UsesDependency
-dependency5.from=SwitchDisplay
+dependency5.from=MemoryFunc
 dependency5.to=Console
 dependency5.type=UsesDependency
-dependency6.from=MemoryFunc
+dependency6.from=SwitchDisplay
 dependency6.to=Console
 dependency6.type=UsesDependency
 editor.fx.0.height=722
-editor.fx.0.width=980
+editor.fx.0.width=1120
 editor.fx.0.x=320
-editor.fx.0.y=75
+editor.fx.0.y=140
 objectbench.height=214
 objectbench.width=595
 package.divider.horizontal=0.6
@@ -56,19 +56,19 @@ target2.width=80
 target2.x=10
 target2.y=280
 target3.height=50
-target3.name=Console
+target3.name=MemoryFunc
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=80
-target3.x=70
-target3.y=170
+target3.width=110
+target3.x=150
+target3.y=410
 target4.height=50
-target4.name=MemoryFunc
+target4.name=Console
 target4.showInterface=false
 target4.type=ClassTarget
-target4.width=110
-target4.x=150
-target4.y=410
+target4.width=80
+target4.x=70
+target4.y=170
 target5.height=50
 target5.name=Trig
 target5.showInterface=false