Merge branch 'master' of WJB3003/ZCW-MacroLabs-OOP-ScientificCalculator into master

Memory.java

@@ -0,0 +1,38 @@
+
+/**
+ * Write a description of class Memory here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class Memory
+{
+    // instance variables - replace the example below with your own
+
+    /**
+     * Constructor for objects of class Memory
+     */
+    public Memory()
+    {
+    }
+ 
+    public static double memory[] = new double[1];
+    
+    public static void addMemory(double num){
+        memory[0] = num;
+        System.out.println("Added "+ num + " to memory.");
+    }
+    
+    public static double resetMemory(){
+        memory[0] = 0;
+        simpleOp.currentNumber = 0;
+        return simpleOp.currentNumber;
+    }
+    
+    public static double recallMemory(){
+        //simpleOp.currentNumber = memory[0];
+        //System.out.println(memory[0]);
+        simpleOp.currentNumber = memory[0];
+        return simpleOp.currentNumber;
+    }
+}

opSwitch.java

@@ -28,6 +28,9 @@ public class opSwitch
                 +"quit"+"\n"
                 +"clear"+"\n"
                 +"reset"+"\n"
+                +"M+"+"\n"
+                +"MC"+"\n"
+                +"MRC"+"\n"
                 +"x rooted WIP"+"\n"
                 +"log WIP"+"\n"
                 +"ln WIP"+"\n"
@@ -82,6 +85,15 @@ public class opSwitch
             // default:
                 // System.out.println("You have not provided valid input. Please enter \"?\" for a list of commands.");
                 // break;
+            case "M+":
+                Memory.addMemory(op.currentNumber);
+                break;
+            case "MC":
+                Memory.resetMemory();
+                break;
+            case "MRC":
+                Memory.recallMemory();
+                break;
             case "x rooted":
                 break;
             case "log":

package.bluej

@@ -2,22 +2,22 @@
 dependency1.from=ConsoleTest
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=opSwitch
+dependency2.from=Console
 dependency2.to=simpleOp
 dependency2.type=UsesDependency
-dependency3.from=opSwitch
-dependency3.to=Console
+dependency3.from=Console
+dependency3.to=opSwitch
 dependency3.type=UsesDependency
-dependency4.from=Console
+dependency4.from=MainApplication
 dependency4.to=simpleOp
 dependency4.type=UsesDependency
-dependency5.from=Console
-dependency5.to=opSwitch
+dependency5.from=MainApplication
+dependency5.to=Console
 dependency5.type=UsesDependency
-dependency6.from=MainApplication
+dependency6.from=opSwitch
 dependency6.to=simpleOp
 dependency6.type=UsesDependency
-dependency7.from=MainApplication
+dependency7.from=opSwitch
 dependency7.to=Console
 dependency7.type=UsesDependency
 editor.fx.0.height=711
@@ -30,12 +30,12 @@ package.divider.horizontal=0.6
 package.divider.vertical=0.6845329249617151
 package.editor.height=424
 package.editor.width=342
-package.editor.x=6
-package.editor.y=24
+package.editor.x=0
+package.editor.y=23
 package.frame.height=711
 package.frame.width=468
 package.numDependencies=7
-package.numTargets=5
+package.numTargets=6
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -67,16 +67,23 @@ target3.width=80
 target3.x=30
 target3.y=170
 target4.height=50
-target4.name=ConsoleTest
+target4.name=Trigonometry
 target4.showInterface=false
-target4.type=UnitTestTargetJunit4
-target4.width=80
-target4.x=130
-target4.y=80
+target4.type=ClassTarget
+target4.width=110
+target4.x=40
+target4.y=280
 target5.height=50
-target5.name=MainApplication
+target5.name=ConsoleTest
 target5.showInterface=false
-target5.type=ClassTarget
-target5.width=120
-target5.x=210
-target5.y=10
+target5.type=UnitTestTargetJunit4
+target5.width=80
+target5.x=130
+target5.y=80
+target6.height=50
+target6.name=MainApplication
+target6.showInterface=false
+target6.type=ClassTarget
+target6.width=120
+target6.x=210
+target6.y=10