Added Basic Functions

Basic.java

@@ -0,0 +1,65 @@
+import java.util.Scanner;
+
+/**
+ * Basic class to perform basic functions for our Graphing Calculator
+ * (+, -, *, /)
+ * Lauren Green
+ * 10/19/18
+ */
+public class Basic
+{
+    int input1 = 0;
+    int input2 = 0;
+    int answer;
+    
+    public Basic()
+    {
+        boolean validInput = false;
+        
+        while(!validInput) {
+        //Get input of first number
+        Scanner in2 = new Scanner(System.in);
+        System.out.println("What is the first number?");
+        input1 = in2.nextInt();
+            
+        //Get input of type of function
+        Scanner in1 = new Scanner(System.in);
+        System.out.println("Which operation would you like to perform? \n +, -, *, /");
+        String operation = in1.nextLine(); 
+  
+        //Get input of second number
+        Scanner in3 = new Scanner(System.in);
+        System.out.println("What is the second number?");
+        input2 = in3.nextInt();
+        
+        //Do the math depending on the input.
+        if (operation.equals("+")) {
+            answer = input1 + input2;
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("-")) {
+            answer = input1 - input2;
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("*")) {
+            answer = input1 * input2;
+            System.out.println(answer);
+            validInput = true;
+            
+        } else if (operation.equals("/")) {
+            answer = input1 / input2;
+            System.out.println(answer);
+            validInput = true;
+            
+        } else {
+            System.out.println("Error, try again \n");
+            
+    }
+}
+    //Insert return to main menu.
+}
+}
+
+        

Trig.java

@@ -73,7 +73,7 @@ public class Trig
             toDegrees(answer);
     } else {
         System.out.println("Have a nice day!");
-        ///Return to Main Application
+        //Insert Return to Main Menu
 }
     }
 
@@ -81,7 +81,7 @@ public class Trig
     {
         double conversion = Math.toDegrees(answer);
         System.out.println(conversion);
-        ///Return to Main Application
+        //Insert Return to Main Menu
     }
 }
 

package.bluej

@@ -17,7 +17,7 @@ package.editor.y=60
 package.frame.height=759
 package.frame.width=619
 package.numDependencies=1
-package.numTargets=3
+package.numTargets=4
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,23 +27,30 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=Basic
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=80
-target1.y=200
+target1.x=320
+target1.y=180
 target2.height=50
-target2.name=Trig
+target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=320
-target2.y=70
+target2.x=80
+target2.y=200
 target3.height=50
-target3.name=MainApplication
+target3.name=Trig
 target3.showInterface=false
 target3.type=ClassTarget
-target3.width=120
-target3.x=70
+target3.width=80
+target3.x=320
 target3.y=70
+target4.height=50
+target4.name=MainApplication
+target4.showInterface=false
+target4.type=ClassTarget
+target4.width=120
+target4.x=70
+target4.y=70