Skip to content
Snippets Groups Projects
Commit 6a46c839 authored by JacobTheisen's avatar JacobTheisen
Browse files

Kalkulator gange/dele[C

parent bfa9f76d
No related branches found
No related tags found
No related merge requests found
Pipeline #72058 passed
...@@ -39,6 +39,8 @@ public class CalculatorResource { ...@@ -39,6 +39,8 @@ public class CalculatorResource {
*/ */
if(expressionTrimmed.matches("[0-9]+[+][0-9]+")) result = sum(expressionTrimmed); if(expressionTrimmed.matches("[0-9]+[+][0-9]+")) result = sum(expressionTrimmed);
else if(expressionTrimmed.matches("[0-9]+[-][0-9]+")) result = subtraction(expressionTrimmed); else if(expressionTrimmed.matches("[0-9]+[-][0-9]+")) result = subtraction(expressionTrimmed);
else if(expressionTrimmed.matches("[0-9]+[/][0-9]+")) result = division(expressionTrimmed);
else if(expressionTrimmed.matches("[0-9]+[*][0-9]+")) result = multiplication(expressionTrimmed);
return result; return result;
} }
...@@ -70,4 +72,23 @@ public class CalculatorResource { ...@@ -70,4 +72,23 @@ public class CalculatorResource {
return number1 - number2; return number1 - number2;
} }
public int division(String expression){
String[] split = expression.split("[/]");
int number1 = Integer.parseInt(split[0]);
int number2 = Integer.parseInt(split[1]);
return number1 / number2;
}
public int multiplication(String expression){
String[] split = expression.split("[*]");
int number1 = Integer.parseInt(split[0]);
int number2 = Integer.parseInt(split[1]);
return number1 * number2;
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment