start of a calculator

Calculator.java

@@ -0,0 +1,32 @@
+
+/**
+ * Write a description of class Calculator here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class Calculator
+
+{
+    public static double add(double x, double y) {
+    double result = x+y;
+    return result;
+    }
+    
+    public static double subtract(double x, double y) {
+    double result = x-y;
+    return result;
+    }
+    
+    public static double multiply(double x, double y) {
+    double result = x*y;
+    return result;
+    }
+    
+    public static double divide(double x, double y) {
+    double result = x/y;
+    return result;
+    }
+
+  
+}

Console.java

@@ -1,11 +1,10 @@
- 
 
 import java.util.Scanner;
-
 /**
  * Created by leon on 2/9/18.
  */
 public class Console {
+    Calculator calc = new Calculator();
 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);
@@ -15,7 +14,62 @@ public class Console {
         print(output + "\n", args);
     }
 
-    public static String getStringInput(String prompt) {
+    public static String getMethod() {
+        Scanner scanner = new Scanner(System.in);
+        String userInput = scanner.nextLine();
+        return userInput;
+    }
+
+    public static String switchStatment() {
+        Scanner scanner = new Scanner(System.in);
+        String ultimateAnswer = "";
+        Boolean turnOff = false;
+        switch (getMethod()) {
+            case "add" :
+                System.out.println("Enter your numbers:");
+                double userInput = scanner.nextDouble();
+                double nextInput = scanner.nextDouble();
+                
+                double answer = Calculator.add(userInput, nextInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
+                
+            case "subtract" :
+                System.out.println("Enter your numbers:");
+                userInput = scanner.nextDouble();
+                nextInput = scanner.nextDouble();
+                
+                answer = Calculator.subtract(userInput, nextInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
+                
+            case "multiply" :
+                System.out.println("Enter your numbers:");
+                userInput = scanner.nextDouble();
+                nextInput = scanner.nextDouble();
+                
+                answer = Calculator.multiply(userInput, nextInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
+                
+            case "divide" :
+                System.out.println("Enter your numbers:");
+                userInput = scanner.nextDouble();
+                nextInput = scanner.nextDouble();
+                
+                answer = Calculator.divide(userInput, nextInput);
+                ultimateAnswer = Double.toString(answer);
+                return ultimateAnswer;
+                
+            case "quit" :
+                    return "quit";
+           
+
+        }
+        return ultimateAnswer;
+    }
+
+    /*public static String getStringInput(String prompt) {
         Scanner scanner = new Scanner(System.in);
         println(prompt);
         String userInput = scanner.nextLine();
@@ -23,10 +77,19 @@ public class Console {
     }
 
     public static Integer getIntegerInput(String prompt) {
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        int userInput = scanner.nextInt();
         return null;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
-    }
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double userInput = scanner.nextDouble();
+        double nextInput = scanner.nextDouble();
+        double answer = Calculator.add(userInput, nextInput);
+        return answer;
+    }*/
+
 }

MainApplication.java

@@ -4,14 +4,21 @@
  * Created by leon on 2/9/18.
  */
 public class MainApplication {
+    
     public static void main(String[] args) {
-        Console.println("Welcome to my calculator!");
-        String s = Console.getStringInput("Enter a string");
-        Integer i = Console.getIntegerInput("Enter an integer");
-        Double d = Console.getDoubleInput("Enter a double.");
+        String d = "";
+        while (d != "quit") {
+        Console.println("Welcome to my calculator! What would you like to do?");
+        d = Console.switchStatment();
+        //String s = Console.getStringInput("Enter a string");
+        //Integer i = Console.getIntegerInput("Enter an integer");
+        //Double d = Console.getDoubleInput("Enter a double.");
 
-        Console.println("The user input %s as a string", s);
-        Console.println("The user input %s as a integer", i);
-        Console.println("The user input %s as a d", d);
+        //Console.println("The user input %s as a string", s);
+        //Console.println("The user input %s as a integer", i);
+        Console.println("Your answer is %s", d);
     }
 }
+    
+    
+}

package.bluej

@@ -2,22 +2,25 @@
 dependency1.from=MainApplication
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
-editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
-package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
+dependency2.from=Console
+dependency2.to=Calculator
+dependency2.type=UsesDependency
+editor.fx.0.height=1020
+editor.fx.0.width=1247
+editor.fx.0.x=2093
+editor.fx.0.y=165
+objectbench.height=80
+objectbench.width=352
+package.divider.horizontal=0.5993322203672788
+package.divider.vertical=0.8465608465608465
 package.editor.height=473
 package.editor.width=493
-package.editor.x=35
-package.editor.y=60
-package.frame.height=759
+package.editor.x=1446
+package.editor.y=445
+package.frame.height=625
 package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.numDependencies=2
+package.numTargets=3
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +30,23 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=Calculator
 target1.showInterface=false
 target1.type=ClassTarget
-target1.width=80
-target1.x=80
-target1.y=200
+target1.width=90
+target1.x=200
+target1.y=310
 target2.height=50
-target2.name=MainApplication
+target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=80
+target2.x=80
+target2.y=200
+target3.height=50
+target3.name=MainApplication
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=120
+target3.x=70
+target3.y=70