From 78ed2b61f0929f0c5b6d51d9527d2b1259c69cce Mon Sep 17 00:00:00 2001
From: Jonas Finborud Nyman <jonas.nyman@no.experis.com>
Date: Wed, 8 Jan 2025 09:27:52 +0100
Subject: [PATCH] Completed Exercise and Extensions

---
 .../java/com/booleanuk/core/Exercise.java     | 24 +++++++++++++++----
 .../com/booleanuk/extension/Extension.java    | 16 ++++++++-----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java
index 7ac3cfb..a7eea36 100644
--- a/src/main/java/com/booleanuk/core/Exercise.java
+++ b/src/main/java/com/booleanuk/core/Exercise.java
@@ -35,7 +35,7 @@ public String greet(String name) {
         Complete this method so that it increases the number given by 1 and returns the result
      */
     public int increment(int number) {
-        return 0;
+        return number + 1;
     }
 
     /*
@@ -48,8 +48,8 @@ public int increment(int number) {
         Nathan | Hi, Nathan :)
         Edward | Hi, Edward :)
      */
-    public String happilyGreet() {
-        return "Not implemented yet";
+    public String happilyGreet(String name) {
+        return "Hi, " + name + " :)";
     }
 
     /*
@@ -64,7 +64,15 @@ public String happilyGreet() {
         10, 13 | [10,11,12,13]
         -1, 1  | [-1,0,1]
      */
-
+    public int[] constructNumberArray(int lower, int upper) {
+        int[] arr = new int[upper - lower + 1];
+        int i = lower;
+        for(int j = 0; j < arr.length; j++) {
+            arr[j] = i;
+            i++;
+        }
+        return arr;
+    }
 
 
 
@@ -80,7 +88,13 @@ The method must return the same string in upper case with exclamation marks (!)
         disaster, 5 | DISASTER!!!!!
         error, 10   | ERROR!!!!!!!!!!
      */
-
+    public String shout(String str, int num) {
+        String newStr = str.toUpperCase();
+        for(int i = 0; i < num; i++) {
+            newStr += "!";
+        }
+        return newStr;
+    }
 
 
 
diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java
index f9de7dd..bd7417a 100644
--- a/src/main/java/com/booleanuk/extension/Extension.java
+++ b/src/main/java/com/booleanuk/extension/Extension.java
@@ -8,8 +8,7 @@ public class Extension extends ExtensionBase {
     /*
         5. Create a method named bakingTime that returns the number 50
      */
-
-
+    public int bakingTime() { return 50; }
 
 
     /*
@@ -19,8 +18,9 @@ public class Extension extends ExtensionBase {
         It must return how many minutes are left to bake based on the input
         and the result of calling the bakingTime method
      */
-
-
+    public int remainingBakeTime(int time) {
+        return bakingTime() - time;
+    }
 
 
     /*
@@ -30,7 +30,9 @@ public class Extension extends ExtensionBase {
         It must return how many minutes it will take to prepare the cake based on
         each layer taking 3 minutes to prepare
      */
-
+    public int calculatePrepTime(int layers) {
+        return layers * 3;
+    }
 
 
 
@@ -43,7 +45,9 @@ public class Extension extends ExtensionBase {
         which is the sum of the preparation time and the number of minutes it's been
         in the oven. Use your calculatePrepTime method in the calculation
      */
-
+    public int totalTimeSpent(int layers, int minsInOven) {
+        return calculatePrepTime(layers) + minsInOven;
+    }