From 3f0d9fb161d96b7aa1cb062c82c98d00a189e7a8 Mon Sep 17 00:00:00 2001
From: Martin Dolmen Helmersen <marthelm@stud.ntnu.no>
Date: Mon, 8 Mar 2021 16:38:18 +0100
Subject: [PATCH] Progress method in CalculatorResource
---
.../java/resources/CalculatorResource.java | 29 +++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 5a49624..c77615f 100644
--- a/src/main/java/resources/CalculatorResource.java
+++ b/src/main/java/resources/CalculatorResource.java
@@ -51,25 +51,36 @@ public int calculate(String expression) {
public int multiplication(String equation) {
String[] split = equation.split("[*]");
- int sum = 0;
- for (int i = 0; i < split.length; i++) {
- sum *= Integer.parseInt(split[i]);
+ int sum = Integer.parseInt(split[0]);
+ try{
+ for (int i = 1; i < split.length; i++) {
+ if(!(split[i]).equals("0")) {
+ sum *= Integer.parseInt(split[i]);
+ }else throw new IllegalArgumentException(" Number can't be zero");
}
- return sum;
+ return sum;
+ }catch(IllegalArgumentException e){
+ e.printStackTrace();
+ }return -1;
+
}
public int division(String equation){
String[] split = equation.split("[/]");
try{
- int sum = 0;
- for (int i = 0; i < split.length; i++) {
- sum = Integer.parseInt(split[i]);
+ int sum = Integer.parseInt(split[0]);
+ for (int i = 1; i < split.length; i++) {
+ if(!(split[i]).equals("0")){
+ sum = Integer.parseInt(split[i]);
+ }else throw new IllegalArgumentException("Number can't be zero");
+
}
return sum;
- }catch (DivisionByZeroExceptionStub e){
- }
+ }catch (IllegalArgumentException e){
+ e.printStackTrace();
+ }return -1;
}
--
GitLab