Updated methods

MainApplication.java

@@ -12,10 +12,15 @@ public class MainApplication {
         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)) {
+        while (!menuInput.equals("4")) {
             mainMenu.mainMenuDisplay();
             menuInput = Console.getStringInput("Enter the calculator you want to use by key. (ie. 1 for basic, etc.)");
            

MemoryFunc.java

@@ -3,7 +3,7 @@
 
  */
 public class MemoryFunc {
-    private Double memory;
+    public Double memory;
     public static final Double DEFAULT_MEMORY_VALUE = new Double(0);
 
     public MemoryFunc() {
@@ -19,29 +19,29 @@ public class MemoryFunc {
     public void memoryMenu() {
         
         Console.println("Memory Menu"
-                         + "\nM+: Update stored memory value"
-                         + "\nMC: Clear to default memory value"
-                         + "\nMCR: Display stored memory value"
-                         + "\nCancel: Returns to Main Menu");
+                         + "\n1: M+ - Update stored memory value"
+                         + "\n2: nMC - Clear to default memory value"
+                         + "\n3: nMCR - Display stored memory value"
+                         + "\n4: Cancel - Returns to Main Menu");
                          
         String memoryOpt = "";
         
-        while (!memoryOpt.equals("cancel")) {
+        while (!memoryOpt.equals("4")) {
             
-            memoryOpt = Console.getStringInput("Select option by typing the key").toLowerCase();
+            memoryOpt = Console.getStringInput("Select option by typing the key. (ie 1 for M+)").toLowerCase();
             
-            if (memoryOpt.equals("m+")) {
+            if (memoryOpt.equals("1")) {
                 
                 Double newMemory = Console.getDoubleInput("Enter the value to store");
                 updateMemory(newMemory);
                 break;
                 
-            } else if (memoryOpt.equals("mc")) {
+            } else if (memoryOpt.equals("2")) {
                 
                 clearMemory();
                 break;
                 
-            } else if (memoryOpt.equals("mcr")) {
+            } else if (memoryOpt.equals("3")) {
                 
                 displayMemory();
                 break;

package.bluej

@@ -1,29 +1,29 @@
 #BlueJ package file
-dependency1.from=MemoryFunc
+dependency1.from=MainMenu
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=MainMenu
+dependency2.from=SwitchDisplay
 dependency2.to=Console
 dependency2.type=UsesDependency
-dependency3.from=SwitchDisplay
+dependency3.from=SciCalc
 dependency3.to=Console
 dependency3.type=UsesDependency
-dependency4.from=SciCalc
-dependency4.to=Console
+dependency4.from=MainApplication
+dependency4.to=MainMenu
 dependency4.type=UsesDependency
 dependency5.from=MainApplication
-dependency5.to=MainMenu
+dependency5.to=SciCalc
 dependency5.type=UsesDependency
 dependency6.from=MainApplication
-dependency6.to=SciCalc
+dependency6.to=MemoryFunc
 dependency6.type=UsesDependency
 dependency7.from=MainApplication
-dependency7.to=MemoryFunc
+dependency7.to=SwitchDisplay
 dependency7.type=UsesDependency
 dependency8.from=MainApplication
-dependency8.to=SwitchDisplay
+dependency8.to=Console
 dependency8.type=UsesDependency
-dependency9.from=MainApplication
+dependency9.from=MemoryFunc
 dependency9.to=Console
 dependency9.type=UsesDependency
 editor.fx.0.height=722