updated print to console and added error for div by 0

Basic.java

@@ -1,4 +1,4 @@
-import java.util.Scanner;
+
 
 /**
  * Basic class to perform basic functions for our Graphing Calculator
@@ -14,45 +14,57 @@ public class Basic
     
     public Basic()
     {
+        //a check to make sure user input is valid.
         boolean validInput = false;
         
         while(!validInput) {
         //Get input of first number
         input1 = Console.getIntegerInput("What is the first number?");
             
-        //Get input of type of function
+        //Get input of operation
         String operation = Console.getStringInput("Which operation would you like to perform? \n +, -, *, /");
   
         //Get input of second number
         input2 = Console.getIntegerInput("What is the second number?");
         
-        //Do the math depending on the input.
+        //Do the math depending on the inputs.
+        //addition
         if (operation.equals("+")) {
             answer = input1 + input2;
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
-            
+        
+        //subtraction    
         } else if (operation.equals("-")) {
             answer = input1 - input2;
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
-            
+        
+        //multiplication
         } else if (operation.equals("*")) {
             answer = input1 * input2;
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
             
+        //division    
         } else if (operation.equals("/")) {
+            //error message when trying to divide by 0.
+            if (input2 == 0) {
+                Console.println("undefined");
+                //Insert return to main menu.
+            } else {
             answer = input1 / input2;
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
-            
+        }
         } else {
-            System.out.println("Error, try again \n");
+            //error if wrong input was entered
+            Console.println("Error, try again \n");
             
     }
+    
 }
-    //Insert return to main menu.
+         //Insert return to main menu.
 }
 }
 

Trig.java

@@ -1,5 +1,4 @@
 
-import java.util.Scanner;
 
 /**
  * Trig class to perform trig function for our Graphing Calculator
@@ -14,6 +13,7 @@ public class Trig
     
     public Trig()
     {
+        //a check to make sure user input is valid
         boolean validInput = false;
         
         while(!validInput) {
@@ -25,58 +25,63 @@ public class Trig
         int input = Console.getIntegerInput("What number would you like to find the " + operation + " of?");
         
         //Do the math depending on the input.
+        //SIN
         if (operation.equals("sin")) {
             answer = Math.sin(input);
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
             
+        //COS
         } else if (operation.equals("cos")) {
             answer = Math.cos(input);
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
             
+        //TAN
         } else if (operation.equals("tan")) {
             answer = Math.tan(input);
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
             
+        //ARCSIN
         } else if (operation.equals("arcsin")) {
             answer = Math.asin(input);
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
             
+        //ARCCOS
         } else if (operation.equals("arccos")) {
             answer = Math.acos(input);
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
             
+        //ARCTAN
         } else if (operation.equals("arctan")) {
             answer = Math.atan(input);
-            System.out.println(answer);
+            Console.println(Double.toString(answer));
             validInput = true;
-            
+           
+        //Error message if input does not match options, loops back to the top so they can try again.
         } else {
-            System.out.println("Error, try again \n");
+            Console.println("Error, try again \n");
             
     }
 }
         //Ask if they would like to convert.
-        System.out.println("Would you like to convert your answer from radian to degrees?  Y or N");
-        Scanner in3 = new Scanner(System.in);
-        String response = in3.nextLine();
+        String response = Console.getStringInput("Would you like to convert your answer from radian to degrees?  Y or N");
         response = response.toLowerCase();
         if (response.equals("y")) {
             toDegrees(answer);
     } else {
-        System.out.println("Have a nice day!");
+        Console.println("Have a nice day!");
         //Insert Return to Main Menu
 }
     }
-
+    //Converting from Radians to Degrees
     public void toDegrees(double answer) 
     {
         double conversion = Math.toDegrees(answer);
-        System.out.println(conversion);
+        Console.println(Double.toString(conversion));
         //Insert Return to Main Menu
     }
 }

package.bluej

@@ -2,21 +2,21 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-dependency2.from=Trig
+dependency2.from=AdvCalc
 dependency2.to=Console
 dependency2.type=UsesDependency
-dependency3.from=Basic
+dependency3.from=Adv
 dependency3.to=Console
 dependency3.type=UsesDependency
-dependency4.from=AdvCalc
+dependency4.from=Basic
 dependency4.to=Console
 dependency4.type=UsesDependency
-dependency5.from=Adv
+dependency5.from=Trig
 dependency5.to=Console
 dependency5.type=UsesDependency
 editor.fx.0.height=958
 editor.fx.0.width=904
-editor.fx.0.x=201
+editor.fx.0.x=759
 editor.fx.0.y=23
 objectbench.height=214
 objectbench.width=706