Notes are in the code

Console.java

@@ -1,4 +1,7 @@
 import java.util.Scanner;
+//Changed all int to double. If a decimal was entered first, it would
+    //create an error.
+
 
 public class Console {
 
@@ -23,8 +26,17 @@ public class Console {
         int userInput = scanner.nextInt();
         return userInput;
     }
-
+    //Created a new user input for the doubles.
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double userInput = scanner.nextDouble();
+        return userInput;
     }
+    
+    
+    
+    
+    
+    
 }

CoreFunctions.java

@@ -1,26 +1,27 @@
-
-public class CoreFunctions
+//Changed all int to double. If a decimal was entered first, it would
+    //create an error.
+public class CoreFunctions 
 {
     int display = 0;
     int memory = 0;
 
-    public static int add(int display, int entered) {
+    public static double add(double display, double entered) {
         System.out.println(display + entered);
         return display = display + entered;
 
     }
 
-    public static int subtract(int display, int entered) {
+    public static double subtract(double display, double entered) {
         System.out.println( display - entered);
         return display = display - entered;
     }
 
-    public static int multiply(int display, int entered) {
+    public static double multiply(double display, double entered) {
         System.out.println( display * entered);
         return display = display * entered;
     }
 
-    public static int divide(int display, int entered) {
+    public static double divide(double display, double entered) {
         if(entered != 0){
             System.out.println( display / entered);
             return display = display / entered;
@@ -31,9 +32,11 @@ public class CoreFunctions
         }
     }
 
-    public static int exp(int display, int entered) {
+    public static double exp(double display, double entered) {
         System.out.println( Math.pow(display,entered));
-        return display = (int)Math.pow(display,entered);
+        return display = (double)Math.pow(display,entered);
     }
 
+    
+
 }

MainApplication.java

@@ -1,81 +1,119 @@
 
 public class MainApplication  {
-    int display = 0;
-    int memory = 0;
+    double display = 0;
+    //Changed all int to double. If a decimal was entered first, it would
+    //create an error.
    
+    
+    
+
     public static void main(String[] args) {
         Console.println("Welcome to Vince and Ray's Calculator!");
-        Integer display = Console.getIntegerInput("Enter your first integer: ");
         while(true){
-            String operator = Console.getStringInput("Enter the operation you'd like to perform or type\n'help' to see a list of commands.");
-            if(operator.equalsIgnoreCase("Add")){
-                Integer entered = Console.getIntegerInput("Enter your second integer: ");
-                CoreFunctions.add(display, entered);
-                display = display + entered;
-            }
-            if(operator.equalsIgnoreCase("Subtract")){
-                Integer entered = Console.getIntegerInput("Enter your second integer: ");
-                CoreFunctions.subtract(display, entered);
-                display = display - entered;
-            }
-            if(operator.equalsIgnoreCase("Multiply")){
-                Integer entered = Console.getIntegerInput("Enter your second integer: ");
-                CoreFunctions.multiply(display, entered);
-                display = display * entered;
-            }
-            if(operator.equalsIgnoreCase("Divide")){
-                Integer entered = Console.getIntegerInput("Enter your second integer: ");
-                if(entered != 0){
-                    CoreFunctions.divide(display, entered);
-                    display = display / entered;
-                }else { 
-                    System.out.println("Err");
+            //Created a try catch methtod to catch all errors of the loop.
+            //and tell you where the error origin.
+            try{
+                Double display = Console.getDoubleInput("Enter your first number: ");
+                String operator = Console.getStringInput("Enter the operation you'd like to perform or type\n'help' to see a list of commands.");
+                if(operator.equalsIgnoreCase("Add")){
+                    Integer entered = Console.getIntegerInput("Enter your second integer: ");
+                    CoreFunctions.add(display, entered);
+                    display = display + entered;
                 }
+                if(operator.equalsIgnoreCase("Subtract")){
+                    
+                    Integer entered = Console.getIntegerInput("Enter your second integer: ");
+                    CoreFunctions.subtract(display, entered);
+                    display = display - entered;
+                }
+                if(operator.equalsIgnoreCase("Multiply")){
+                    Integer entered = Console.getIntegerInput("Enter your second integer: ");
+                    CoreFunctions.multiply(display, entered);
+                    display = display * entered;
+                }
+                if(operator.equalsIgnoreCase("Divide")){
+                    Double entered = Console.getDoubleInput("Enter your second integer: ");
+                    if(entered != 0){
+                        CoreFunctions.divide(display, entered);
+                        display = display / entered;
+                    }else { 
+                        System.out.println("Err");
+                    }
+                }
+                if(operator.equalsIgnoreCase("Exponent")){ 
+                    Double entered = Console.getDoubleInput("Enter your second integer: ");
+                    CoreFunctions.exp(display, entered);
+                    display = (double) Math.pow(display,entered);
+                }
+                if(operator.equalsIgnoreCase("squared")){
+                    ScientificFunctions.sqr(display);
+                    display = display*display;
+                }
+                if(operator.equalsIgnoreCase("square root")){
+                    ScientificFunctions.sqRoot(display);
+                    display = ((double)Math.sqrt(display));
+                }
+                if(operator.equalsIgnoreCase("Inverse Fraction")){
+                    ScientificFunctions.invFraction(display);
+                    display = 1/display;
+                }
+                if(operator.equalsIgnoreCase("Inverse Sign")){
+                    ScientificFunctions.invSign(display);
+                    display = -1/display;
+                }
+                if(operator.equalsIgnoreCase("sine")){
+                    ScientificFunctions.sine(display);
+                    display = (double)Math.sin(display);
+                }
+                if(operator.equalsIgnoreCase("cosine")){
+                    ScientificFunctions.cosine(display);
+                    display = (double)Math.cos(display);
+                }
+                if(operator.equalsIgnoreCase("tangent")){
+                    ScientificFunctions.tan(display);
+                    display = (double)Math.tan(display);
+                }
+                if(operator.equalsIgnoreCase("inverse tangent")){
+                    ScientificFunctions.atan(display);
+                    display = (double)Math.atan(display);
+                }
+                if(operator.equalsIgnoreCase("inverse sin")){
+                    ScientificFunctions.asin(display);
+                    display = (double)Math.asin(display);
+                }
+                if(operator.equalsIgnoreCase("inverse cosine")){
+                    ScientificFunctions.acosin(display);
+                    display = (double)Math.acos(display);
+                }
+                if(operator.equalsIgnoreCase("M+")){
+                    ScientificFunctions.setMem(display);
+                }
+                if(operator.equalsIgnoreCase("MC")){
+                    ScientificFunctions.resetMem(display);
+                }
+                if(operator.equalsIgnoreCase("MRC")){
+                    ScientificFunctions.recallMem(display);
+                }
+                if(operator.equalsIgnoreCase("clear")){
+                    System.out.print('\u000C');
+                }
+                if(operator.equalsIgnoreCase("exit")){
+                    System.out.println("Thanks for using our Calculator!");    
+                    break;
+                }
+
+            }catch(Exception e){
+                System.err.println(e);
+                System.err.println("System Error: Try again");
+                continue;
+
             }
-            if(operator.equalsIgnoreCase("Exponent")){
-                Integer entered = Console.getIntegerInput("Enter your second integer: ");
-                CoreFunctions.exp(display, entered);
-                display = (int)Math.pow(display,entered);
-            }
-            if(operator.equalsIgnoreCase("squared")){
-                ScientificFunctions.sqr(display);
-                display = display*display;
-            }
-            if(operator.equalsIgnoreCase("square root")){
-                ScientificFunctions.sqRoot(display);
-                display = ((int)Math.sqrt(display));
-            }
-            if(operator.equalsIgnoreCase("Inverse Fraction")){
-                ScientificFunctions.invFraction(display);
-                display = 1/display;
-            }
-            if(operator.equalsIgnoreCase("Inverse Sign")){
-                ScientificFunctions.invSign(display);
-                display = -1/display;
-            }
-            if(operator.equalsIgnoreCase("sine")){
-                ScientificFunctions.sine(display);
-                display = (int)Math.sin(display);
-            }
-            if(operator.equalsIgnoreCase("cosine")){
-                ScientificFunctions.cosine(display);
-                display = (int)Math.cos(display);
-            }
-            if(operator.equalsIgnoreCase("tangent")){
-                ScientificFunctions.tan(display);
-                display = (int)Math.tan(display);
-            }
-            if(operator.equalsIgnoreCase("exit")){
-                System.out.println("Thanks for using our Calculator!");    
-                break;
-            }
-        }
 
+        }
     }
 
 }
 
-
 //Integer i = Console.getIntegerInput("Enter an integer");
 //Double d = Console.getDoubleInput("Enter a double.");
 

ScientificFunctions.java

@@ -1,72 +1,98 @@
-
-public class ScientificFunctions
+//Changed all int to double. If a decimal was entered first, it would
+    //create an error.
+public class ScientificFunctions 
 {
     
     int display = 0;
-    int memory = 0;
+    private static double memory = 0;
+    
     
-    public static int sqr(int display) {
+    public static double sqr(double display) {
         System.out.println( display*display);
         return display = display*display;
     }
 
-    public static int sqRoot(int display) {
+    public static double sqRoot(double display) {
         System.out.println( Math.sqrt(display));
-        return display = ((int)Math.sqrt(display));
+        return display = ((double)Math.sqrt(display));
     }
 
-    public static int invFraction(int display) {
+    public static double invFraction(double display) {
         System.out.println( 1/display);
         return display = 1/display;
     }
 
-    public static int invSign(int display) {
+    public static double invSign(double display) {
         System.out.println( -1*display);
         return display = -1/display;
     }
 
-    public void setMem(int display) {
+    public static void setMem(double display) {
+        memory = display;
         System.out.println("Set to memory!");
-        display = memory;
+        
     }
 
-    public void resetMem(int display) {
+    public static void resetMem(double display) {
+        int memory;
         System.out.println("Reset memory!");
         memory = 0;
     }
 
-    public void recallMem(int display) {
-        System.out.println("Memory recalled!");
-        memory = display;
+    public static double recallMem(double display) {
+        return (double)memory;
+        //System.out.println("Memory recalled!");
+        
     }
-
-    public static int cosine(int display) {
-        System.out.println(Math.cos(display));
-        return display = (int)Math.cos(display);
+    //Fixed trig functions to convert to radians before printing the equation.
+    
+    public static double cosine(double display) {
+        double degrees = display;
+        double radians = Math.toRadians(degrees);
+        double cosValue = Math.sin(radians);
+        System.out.println("cos(" + degrees + ") = " + cosValue);
+        return display = (double)Math.cos(display);
     }
 
-    public static int sine(int display) {
-        System.out.println(sine(display));
-        return display = (int)Math.sin(display);
+    public static double sine(double display) {
+        double degrees = display;
+        double radians = Math.toRadians(degrees);
+        double sineValue = Math.sin(radians);
+        System.out.println("sin(" + degrees + ") = " + sineValue);
+        return display = (double)Math.sin(display);
     }
 
-    public static int tan(int display) {
-        System.out.println(tan(display));
-        return display = (int)Math.tan(display);
+    public static double tan(double display) {
+        double degrees = display;
+        double radians = Math.toRadians(degrees);
+        double tanValue = Math.sin(radians);
+        System.out.println("tan(" + degrees + ") = " + tanValue);
+        return display = (double)Math.tan(display);
     }
     
-    public static int acosine(int display) {
-        System.out.println(Math.acos(display));
-        return display = (int)Math.acos(display);
+    public static double acosin(double display) {
+        double degrees = display;
+        double radians = Math.toRadians(degrees);
+        double acosValue = Math.sin(radians);
+        System.out.println("acos(" + degrees + ") = " + acosValue);
+        return display = (double)Math.acos(display);
     }
     
-    public static int asin(int display) {
-        System.out.println(asin(display));
-        return display = (int)Math.asin(display);
+    public static double asin(double display) {
+        double degrees = display;
+        double radians = Math.toRadians(degrees);
+        double asinValue = Math.sin(radians);
+        System.out.println("asin(" + degrees + ") = " + asinValue);
+        return display = (double)Math.asin(display);
     }
     
-    public static int atan(int display) {
-        System.out.println(atan(display));
-        return display = (int)Math.atan(display);
+    public static double atan(double display) {
+        double degrees = display;
+        double radians = Math.toRadians(degrees);
+        double atanValue = Math.sin(radians);
+        System.out.println("atan(" + degrees + ") = " + atanValue);
+        return display = (double)Math.atan(display);
     }
+    
+    
 }

package.bluej

@@ -10,18 +10,18 @@ dependency3.to=ScientificFunctions
 dependency3.type=UsesDependency
 editor.fx.0.height=709
 editor.fx.0.width=800
-editor.fx.0.x=307
-editor.fx.0.y=23
+editor.fx.0.x=375
+editor.fx.0.y=29
 objectbench.height=198
-objectbench.width=352
-package.divider.horizontal=0.5993322203672788
+objectbench.width=510
+package.divider.horizontal=0.5675082327113062
 package.divider.vertical=0.685099846390169
 package.editor.height=439
-package.editor.width=493
-package.editor.x=35
-package.editor.y=23
+package.editor.width=805
+package.editor.x=192
+package.editor.y=38
 package.frame.height=709
-package.frame.width=619
+package.frame.width=931
 package.numDependencies=3
 package.numTargets=4
 package.showExtends=true
@@ -37,26 +37,26 @@ target1.name=ScientificFunctions
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=140
-target1.x=160
-target1.y=170
+target1.x=560
+target1.y=110
 target2.height=50
 target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=310
-target2.y=50
+target2.x=560
+target2.y=0
 target3.height=50
 target3.name=MainApplication
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=120
-target3.x=70
-target3.y=70
+target3.x=190
+target3.y=50
 target4.height=50
 target4.name=CoreFunctions
 target4.showInterface=false
 target4.type=ClassTarget
 target4.width=120
-target4.x=20
-target4.y=170
+target4.x=560
+target4.y=220