Merge pull request biforest#2 from oereo/fix/java-calculator

refactor: delete unused class and fix naming
songpang · Feb 25, 2021 · b6d6340 · b6d6340
2 parents f53fdf9 + 860bcd7
commit b6d6340
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/src/main/java/calculator/Calculator.java b/src/main/java/calculator/Calculator.java
@@ -13,19 +13,19 @@ public void calculation(){
     }
 
     public void OperatorSetting(ArithmeticExpressionStack arithmeticExpressionStack) {
-        ErrorException exception = new ErrorException();
+        ErrorException exceptionCheck = new ErrorException();
         String firstString = arithmeticExpressionStack.pop();
-        int firstNumber = exception.NumericalError(firstString);
+        int cumulativeResult = exceptionCheck.NumericalError(firstString);
 
         for(int i = 0; i<(arithmeticExpressionStack.getStackSize())/2;i++){
             String operator = arithmeticExpressionStack.pop();
             String secondString = arithmeticExpressionStack.pop();
-            int secondNumber = exception.NumericalError(secondString);
-            firstNumber = chooseOperatorAndCalculate(firstNumber, operator, secondNumber);
+            int secondNumber = exceptionCheck.NumericalError(secondString);
+            cumulativeResult = chooseOperatorAndCalculate(cumulativeResult, operator, secondNumber);
         }
 
-        if(firstNumber != 0){
-            message.calculationResult(firstNumber);
+        if(cumulativeResult != 0){
+            message.calculationResult(cumulativeResult);
         }
         init();
     }

diff --git a/src/main/java/calculator/InputUserData.java b/src/main/java/calculator/InputUserData.java