Updated console and methods connecting to it

Console.java

@@ -32,6 +32,7 @@ public class Console {
             menuInput = Console.getStringInput("Enter the calculator you want to use by key. (ie. 1 for basic, etc.)");
 
             switch (menuInput) {
+                // Basic Calculator
                 case "1":
                 basicCalc.Basic();
 
@@ -62,9 +63,9 @@ public class Console {
                         basicCalc.getQuotient(basicInput1, basicInput2);
                     }
                 } else if (basicMode.equals("5")) {
-                    
+
                     break;
-                    
+
                 } else {
                     //error if wrong input was entered
                     answer = Double.NaN;
@@ -103,11 +104,50 @@ public class Console {
                     memory.memoryMenu();
                 } else if (sciMenuInput.equals("3")) {
                     // To Trig Menu
-                    answer = trigMenu.TrigFunctions();
-                    Console.println(Double.toString(answer));
-                    String response = Console.getStringInput("Would you like to convert your answer from radian to degrees? Y or N").toLowerCase();
+                    trigMenu.trigFunctions();
+                    String mode = Console.getStringInput("Enter trignometric function by key: (ie. 1 for sin)");
+
+                    double trigInput = Console.getDoubleInput("Enter the input for the trignometric function: ");
+
+                    if (mode.equals("1")) {
+                        answer = trigMenu.calcSin(trigInput);
+
+                        //COS
+                    } else if (mode.equals("2")) {
+                        answer = trigMenu.calcCos(trigInput);
+
+                        //TAN
+                    } else if (mode.equals("3")) {
+                        answer = trigMenu.calcTan(trigInput);
+
+                        //ARCSIN
+                    } else if (mode.equals("4")) {
+                        answer = trigMenu.calcArcsin(trigInput);
+
+                        //ARCCOS
+                    } else if (mode.equals("5")) {
+                        answer = trigMenu.calcArccos(trigInput);
+
+                        //ARCTAN
+                    } else if (mode.equals("6")) {
+                        answer = trigMenu.calcArctan(trigInput);
+
+                    } else if (mode.equals("7")) {
+                        break;
+
+                    } else {
+                        //Error message if input does not match options, loops back to the top so they can try again.
+                        answer = Double.NaN;
+
+                    }
+
+                    String trigAnswer = Double.toString(answer);
+                    Console.println(trigAnswer);
+
+                    String trigDefRad =  Console.getStringInput("Do you want to convert your answer from radians to degrees?"
+                            + "\nEnter Y or N").toLowerCase();
 
-                    if (response.equals("y") ) {
+                    if (trigDefRad.equals("y") ) {
                         trigMenu.toDegrees(answer);
                     }
                     break;

Trig.java

@@ -1,5 +1,4 @@
 
-
 /**
  * Trig class to perform trig function for our Graphing Calculator
  * (sin, cos, tan, inverses, degree to radian)
@@ -11,97 +10,57 @@ public class Trig
     double input = 0.0;
     double answer;
     String operation = "";
-    
-    public double TrigFunctions()
+
+    public void trigFunctions()
     {
-        //a check to make sure user input is valid
-        boolean validInput = false;
-        
-        //Get input of type of function
-        operation = Console.getStringInput("Which trignometric function would you like to run? \n sin, cos, tan, arcsin, arccos, arctan");
-        operation = operation.toLowerCase();
-        
-        //Get input of number
-        input = Console.getDoubleInput("What number would you like to find the " + operation + " of?");
-        
-        //Do the math depending on the input.
-        //SIN
-        if (operation.equals("sin")) {
-            calcSin(input);
-        
-            
-        //COS
-        } else if (operation.equals("cos")) {
-            calcCos(input);
-        
-            
-        //TAN
-        } else if (operation.equals("tan")) {
-            calcTan(input);
-        
-            
-        //ARCSIN
-        } else if (operation.equals("arcsin")) {
-            calcArcsin(input);
-        
-            
-        //ARCCOS
-        } else if (operation.equals("arccos")) {
-            calcArccos(input);
-        
-            
-        //ARCTAN
-        } else if (operation.equals("arctan")) {
-            calcArctan(input);
+        Console.println("Trigonometry Calculator Options" 
+            + "\n1: sin"
+            + "\n2: cosin"
+            + "\n3: tan"
+            + "\n4: arcsin"
+            + "\n5: arccosin"
+            + "\n6: arctan"
+            + "\n7: Cancel - returns to Main Menu");   
+
         
-           
-        //Error message if input does not match options, loops back to the top so they can try again.
-        } else {
-            answer = Double.NaN;
-            
     }
-        return answer;
-       
-    
-}
-    
-    
+
     //Sin method
     public double calcSin(double x) {
         answer = Math.sin(x);
         return answer;
     }
-    
+
     //Cos method
     public double calcCos(double x) {
         answer = Math.cos(x);
         return answer;
     }
-    
+
     //Tan method
     public double calcTan(double x) {
         answer = Math.tan(x);
         return answer;
     }
-    
+
     //Arcsin method
     public double calcArcsin(double x) {
         answer = Math.asin(x);
         return answer;
     }
-    
+
     //Arccos method
     public double calcArccos(double x) {
         answer = Math.acos(x);
         return answer;
     }
-    
+
     //Arctan method
     public double calcArctan(double x) {
         answer = Math.atan(x);
         return answer;
     }
-    
+
     //Converting from Radians to Degrees
     public double toDegrees(double answer) 
     {
@@ -112,4 +71,3 @@ public class Trig
     }
 }
 
-