added display modes to switch statement and wrote some of display mode methods

Calculator.java

@@ -1,13 +1,14 @@
 import java.util.*;
-class Calculator{
+public class Calculator{
+public static double memory = 0;
     public static void main(String args[]){
-
+        
         String toDo;                //what the user wants to do
         double num1 = 0;                //The user's first input
         double num2 = 0;            //The user's second input
         double result = 0;          //The user's answer
         boolean off = false;        //The user typed quit, becomes true
-        double memory;
+
         boolean error = false;
         MathMethods calc = new MathMethods();
 
@@ -21,13 +22,25 @@ class Calculator{
                 System.out.println("Goodbye!!");
 
             } else {
-
+                switch (toDo) {
                 //System.out.println("toDO is: " + toDo);
-
+                    case "add":
+                    case "subtract":
+                    case "multiply":
+                    case "divide":
+                    case "exponent":
+                    case "cosine" :
+                    case "inverse cosine" :
+                    case "square root" :
+                    case "invert" :
+                    case "sine" :
+                    case "inverse sine" :
+                    case "degree to radian" :
+                    case "radian to degree" :
                 System.out.println(toDo + " -- Enter first number:");
                 num1 = input1.nextDouble();
                 //System.out.println("num1 is: " + num1);
-
+            }
                 switch (toDo){
                     case "add":
                     case "subtract":
@@ -118,9 +131,26 @@ class Calculator{
                     memory = result;
                     calc.printAns(String.valueOf(result));
                     break;
-                    
+
                     case "fortune cookie":
+                    calc.printAns(calc.fortuneCookie());
+                    break;
+
+                    case "display mode decimal":
+                    calc.printAns(String.valueOf(calc.switchDisplayMode("decimal")));
+                    break;
                     
+                    case "display mode hexadecimal":
+                    calc.printAns(calc.switchDisplayMode("hexadecimal"));
+                    
+                    case "display mode octal":
+                    calc.printAns(String.valueOf(calc.switchDisplayMode("octal")));
+                    break;
+                    
+                    case "display mode binary":
+                    calc.printAns(String.valueOf(calc.switchDisplayMode("binary")));
+                    break;
+
                 }
             }
 

MathMethods.java

@@ -1,4 +1,5 @@
 import java.util.*;
+import java.lang.*;
 /**
  * Write a description of class Calculator here.
  *
@@ -70,15 +71,63 @@ public class MathMethods
     }
 
     public static String fortuneCookie() {
-     Random rand = new Random();
+        Random rand = new Random();
         String[] wiseWords = new String[] {"You're a hard worker and you will do great on all the labs!", 
-         "Look how much java you learned this week! That's awesome!", "Keep up the good work!" ,
-        "You're cushing it!", "You're a coding rockstar!", 
-        "Keep coding!"};  
-        int arrIndex = rand.nextInt(6)+1;
+                "Look how much java you learned this week! That's awesome!", 
+                "Keep up the good work!" ,
+                "You're cushing it!", "You're a coding rockstar!", 
+                "Keep coding!"};  
+        int arrIndex = rand.nextInt(6);
         return wiseWords[arrIndex];
     }
-    
+
+    public static String switchDisplayMode(String mode){
+        Calculator display = new Calculator();
+        //Double d = new Double(display.memory);
+        String answer = "";
+        switch (mode) {
+            case "binary":
+            answer = "";
+            break;
+
+            case "octal":
+            answer = "";
+            break;
+
+            case "decimal":
+            answer = "";
+            break;
+
+            case "hexadecimal":
+            answer = Double.toHexString(display.memory);
+            break;
+
+        }
+        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 void printAns(String printAnswer){
         System.out.println("ANSWER: " + printAnswer);
 
@@ -87,7 +136,3 @@ public class MathMethods
 }
 
 
-    
-    
-    
-