added the rest of the display mode methods

Calculator.java

@@ -137,19 +137,24 @@ public static double memory = 0;
                     break;
 
                     case "display mode decimal":
-                    calc.printAns(String.valueOf(calc.switchDisplayMode("decimal")));
+                    calc.printAns(String.valueOf(memory));
                     break;
                     
                     case "display mode hexadecimal":
                     calc.printAns(calc.switchDisplayMode("hexadecimal"));
                     
                     case "display mode octal":
-                    calc.printAns(String.valueOf(calc.switchDisplayMode("octal")));
+                    calc.printAns(calc.switchDisplayMode("octal"));
                     break;
                     
                     case "display mode binary":
-                    calc.printAns(String.valueOf(calc.switchDisplayMode("binary")));
+                    calc.printAns(calc.switchDisplayMode("binary"));
                     break;
+                    
+                    case "display mode" :
+                    calc.printAns(calc.switchDisplayMode());
+                    break;
+                    
 
                 }
             }

MathMethods.java

@@ -83,19 +83,19 @@ public class MathMethods
 
     public static String switchDisplayMode(String mode){
         Calculator display = new Calculator();
-        //Double d = new Double(display.memory);
+        
         String answer = "";
         switch (mode) {
             case "binary":
-            answer = "";
+            answer = "0b" + Integer.toBinaryString((int)display.memory);
             break;
 
             case "octal":
-            answer = "";
+            answer = "octal" + Integer.toOctalString((int)display.memory);
             break;
 
             case "decimal":
-            answer = "";
+            answer = String.valueOf(display.memory);
             break;
 
             case "hexadecimal":
@@ -106,30 +106,30 @@ public class MathMethods
         return answer;
     }
 
-    // public static double switchDisplayMode(){
-        // int i = 4;
-        // double answer = 0;
-
-        // if (i%4 == 0){ 
-            // answer = switchDisplayMode("binary");
-            // i++;
-        // } 
-        // else if (i%4 == 1){
-            // answer = switchDisplayMode("octal");
-            // i++;
-        // } 
-        // else if (i%4 == 2) {
-            // answer = switchDisplayMode("hecadecimal");
-            // i++;
-        // } else {
-            // answer = switchDisplayMode("decimal");
-            // i++;
-        // }
-        // return answer;
-    // }
+    public static String switchDisplayMode(){
+        int i = 4;
+        String answer = "";
+
+        if (i%4 == 0){ 
+            answer = switchDisplayMode("binary");
+            i++;
+        } 
+        else if (i%4 == 1){
+            answer = switchDisplayMode("octal");
+            i++;
+        } 
+        else if (i%4 == 2) {
+            answer = switchDisplayMode("hecadecimal");
+            i++;
+        } else {
+            answer = switchDisplayMode("decimal");
+            i++;
+        }
+        return answer;
+    }
 
     public static void printAns(String printAnswer){
-        System.out.println("ANSWER: " + printAnswer);
+        System.out.println("ANSWER: " + printAnswer + "\n \n");
 
     }
 

package.bluej

@@ -1,25 +1,28 @@
 #BlueJ package file
-dependency1.from=Calculator
+dependency1.from=MathMethodsTest
 dependency1.to=MathMethods
 dependency1.type=UsesDependency
-dependency2.from=MathMethodsTest
+dependency2.from=Calculator
 dependency2.to=MathMethods
 dependency2.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=615
-editor.fx.0.y=114
+dependency3.from=MathMethods
+dependency3.to=Calculator
+dependency3.type=UsesDependency
+editor.fx.0.height=813
+editor.fx.0.width=1078
+editor.fx.0.x=294
+editor.fx.0.y=23
 objectbench.height=80
 objectbench.width=480
 package.divider.horizontal=0.5997536945812808
 package.divider.vertical=0.8838451268357811
 package.editor.height=655
 package.editor.width=706
-package.editor.x=100
-package.editor.y=26
+package.editor.x=356
+package.editor.y=23
 package.frame.height=807
 package.frame.width=832
-package.numDependencies=2
+package.numDependencies=3
 package.numTargets=3
 package.showExtends=true
 package.showUses=true
@@ -41,13 +44,13 @@ target2.name=MathMethodsTest
 target2.showInterface=false
 target2.type=UnitTestTargetJunit4
 target2.width=110
-target2.x=230
-target2.y=280
+target2.x=270
+target2.y=310
 target3.association=MathMethodsTest
 target3.height=50
 target3.name=MathMethods
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=110
-target3.x=200
-target3.y=310
+target3.x=240
+target3.y=340