Modification Calculator - Lesson_4

DmitryPodkutin · DmitryPodkutin · commit 79080f34845e · 2019-03-31T18:50:33.000+03:00
diff --git a/src/com/startjava/Lesson_2_3/calculator/Calculator.java b/src/com/startjava/Lesson_2_3/calculator/Calculator.java
@@ -1,13 +1,12 @@
 package com.startjava.lesson_2_3.calculator;
 
-import java.util.Scanner;
+import static java.lang.Math.pow;
 
 public class Calculator {
 
     private int firstNumber;
     private int secondNumber;
-    private int result;
-    private char mathOperation;
+    private String mathOperation;
 
     public void setFirstNumber(int firstNumber) {
         this.firstNumber = firstNumber;
@@ -17,28 +16,28 @@ public void setSecondNumber(int secondNumber) {
         this.secondNumber = secondNumber;
     }
 
-    public void setMathOperation(char mathOperation) {
+    public void setMathOperation(String mathOperation) {
         this.mathOperation = mathOperation;
     }
 
     public void calculate() {
         switch (mathOperation) {
-            case '+':
+            case "+":
                 System.out.println(firstNumber + secondNumber);
                 break;
-            case '-':
+            case "-":
                 System.out.println(firstNumber - secondNumber);
                 break;
-            case '*':
+            case "*":
                 System.out.println(firstNumber * secondNumber);
                 break;
-            case '/':
+            case "/":
                 System.out.println(firstNumber / secondNumber);
                 break;
-            case '^':
-                System.out.println(firstNumber ^ secondNumber);
+            case "^":
+                System.out.println(pow(firstNumber, secondNumber));
                 break;
-            case '%':
+            case "%":
                 System.out.println(firstNumber % secondNumber);
                 break;
 
diff --git a/src/com/startjava/Lesson_2_3/calculator/CalculatorTest.java b/src/com/startjava/Lesson_2_3/calculator/CalculatorTest.java
@@ -10,17 +10,14 @@ public static void main(String[] args) {
             Scanner scan = new Scanner(System.in);
             Calculator calculator = new Calculator();
 
-            System.out.print("Введите первое число: ");
-            int firstNumber = scan.nextInt();
+            System.out.print("Введите через пробел матиматическое выражеие: ");
+            String mathematicExpression = scan.nextLine();
+            String[] parts = mathematicExpression.split(" ");
+            int firstNumber = Integer.parseInt(parts[0]);
+            String mathOperation = parts[1];
+            int secondNumber = Integer.parseInt(parts[2]);
             calculator.setFirstNumber(firstNumber);
-
-            System.out.print("Введите операцию: ");
-            ;
-            char mathOperation = scan.next().charAt(0);
             calculator.setMathOperation(mathOperation);
-
-            System.out.print("Введите второе число: ");
-            int secondNumber = scan.nextInt();
             calculator.setSecondNumber(secondNumber);
 
             calculator.calculate();
