Updated baseOption methods

AdvCalc.java

@@ -1,12 +1,12 @@
-
+    
 /**
- * 4.2 Scientific Calculator Group Project
- * Trinh Tong, Lauren Green, Michelle Dimarino
- * Advanced Calculator Menu
- */
-public class AdvCalc
+* 4.2 Scientific Calculator Group Project
+* Trinh Tong, Lauren Green, Michelle Dimarino
+* Advanced Calculator Menu
+*/
+public class AdvCalc 
 {
-    // instance variables - replace the example below with your own
+
     private double memory = 0;
 
     /**
@@ -15,13 +15,36 @@ public class AdvCalc
      * switchDisplayMode() rotates through the options
      * switchDisplayMode(String mode) sets the display to the mode given
      */
-    public void switchDisplay(int y)
+    public void switchDisplay(String mode)
     {
-        // put your code here
+        int baseInput = Console.getIntegerInput("Enter an integer to see the base conversions.");
+        
+        Console.println("Display Options" 
+                         + "\nBinary: " + null
+                         + "\nOctal: " + null
+                         + "\nDecimal: " + null
+                         + "\nHexadecimal: " + null
+                         + "\n");
+        
+        mode = Console.getStringInput("Enter the base option to display.");
+        if (mode.toLowerCase().equals("binary") == true) {
+            
+        } else if (mode.toLowerCase().equals("octal") == true) {
+            
+        }
+        
 
     }
     
     /**
+     * Converts the user input into octal and returns a string of that octal.
+     */
+    public String toOctal(int userInput) {
+        
+        return Integer.toOctalString(userInput);
+        
+    }
+    /**
      * Store 1 numeric value in memory for recall later
      * M+ = add currently displayed value to the value in memorie (default = 0)
      * MC = reset memory
@@ -65,7 +88,7 @@ public class AdvCalc
      */
     public void toTrig(int y)
     {
-        // put your code here
+        // calls the trig menu
         
     }
 }