Skip to content
Snippets Groups Projects
Commit c1fc5a96 authored by Halvard Forsland's avatar Halvard Forsland
Browse files

Update CalculatorResource.java

parent 41b7ece2
No related branches found
No related tags found
No related merge requests found
Pipeline #119584 failed
......@@ -25,7 +25,7 @@ public class CalculatorResource {
// Removes all whitespaces
String expressionTrimmed = expression.replaceAll("\\s+","");
int result = -1;
float result = -1;
/*
* .matches use regex expression to decide if a String matches a given pattern.
......@@ -40,7 +40,7 @@ public class CalculatorResource {
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 = multiplication(expressionTrimmed);
//else if(expressionTrimmed.matches("[0-9]+[/][0-9]+")) result = division(expressionTrimmed);
else if(expressionTrimmed.matches("[0-9]+[/][0-9]+")) result = division(expressionTrimmed);
return result;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment