From 6faa4d4570a8153f54159a88a5844af2994ac1f9 Mon Sep 17 00:00:00 2001
From: snegard <stiande@stud.ntnu.no>
Date: Tue, 3 Mar 2020 12:36:07 +0100
Subject: [PATCH] Actual fix
---
src/main/java/resources/CalculatorResource.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 8abfbc2..fa9cb68 100644
--- a/src/main/java/resources/CalculatorResource.java
+++ b/src/main/java/resources/CalculatorResource.java
@@ -39,6 +39,8 @@ 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);
return result;
}
--
GitLab