From 8023f6ca89604a978a59c664781e5c1dc8f9666a Mon Sep 17 00:00:00 2001
From: Petter Karstensen <petterkarstensen@gmail.com>
Date: Wed, 10 Jan 2024 15:16:34 +0100
Subject: [PATCH 1/2] 2/4

---
 src/main/java/com/booleanuk/core/Exercise.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java
index 7ac3cfb..6129ad5 100644
--- a/src/main/java/com/booleanuk/core/Exercise.java
+++ b/src/main/java/com/booleanuk/core/Exercise.java
@@ -35,7 +35,8 @@ 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;
+        number = number + 1;
+        return number ;
     }
 
     /*
@@ -48,8 +49,9 @@ public int increment(int number) {
         Nathan | Hi, Nathan :)
         Edward | Hi, Edward :)
      */
-    public String happilyGreet() {
-        return "Not implemented yet";
+    public String happilyGreet(String name) {
+        name = "Hi, " + name + " :)";
+        return name;
     }
 
     /*

From eb8c141523379854c89ef88be2eef22ea937e6aa Mon Sep 17 00:00:00 2001
From: Petter Karstensen <petterkarstensen@gmail.com>
Date: Wed, 10 Jan 2024 16:16:07 +0100
Subject: [PATCH 2/2] Exercise and Externsion done

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

diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java
index 6129ad5..6ddcf16 100644
--- a/src/main/java/com/booleanuk/core/Exercise.java
+++ b/src/main/java/com/booleanuk/core/Exercise.java
@@ -2,6 +2,9 @@
 
 import com.booleanuk.helpers.ExerciseBase;
 
+import java.util.Arrays;
+import java.util.Locale;
+
 public class Exercise extends ExerciseBase {
     /*
         A method is a function, a single piece of logic that can run. In Java, a class is a convenient
@@ -35,8 +38,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) {
-        number = number + 1;
-        return number ;
+        return number+1 ;
     }
 
     /*
@@ -50,8 +52,7 @@ public int increment(int number) {
         Edward | Hi, Edward :)
      */
     public String happilyGreet(String name) {
-        name = "Hi, " + name + " :)";
-        return name;
+        return "Hi, " + name + " :)";
     }
 
     /*
@@ -66,9 +67,16 @@ public String happilyGreet(String name) {
         10, 13 | [10,11,12,13]
         -1, 1  | [-1,0,1]
      */
-
-
-
+    public int[] constructNumberArray(int lower, int upper) {
+        int difference = upper - lower + 1;
+        int[] result = new int[difference];
+
+        for (int i = 0; i < difference; i++) {
+            result[i] = lower;
+            lower++;
+        }
+        return result;
+    }
 
     /*
         4. Shout at a dev
@@ -82,7 +90,14 @@ The method must return the same string in upper case with exclamation marks (!)
         disaster, 5 | DISASTER!!!!!
         error, 10   | ERROR!!!!!!!!!!
      */
+    public String shout(String word, int number) {
+        word = word.toUpperCase();
+        String symbol = "";
+        for (int i = 0; i < number; i++)
+            symbol += "!";
 
+    return word + symbol;
+    }
 
 
 
diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java
index f9de7dd..1759449 100644
--- a/src/main/java/com/booleanuk/extension/Extension.java
+++ b/src/main/java/com/booleanuk/extension/Extension.java
@@ -9,7 +9,9 @@ public class Extension extends ExtensionBase {
         5. Create a method named bakingTime that returns the number 50
      */
 
-
+    public int bakingTime() {
+        return 50;
+    }
 
 
     /*
@@ -20,6 +22,10 @@ public class Extension extends ExtensionBase {
         and the result of calling the bakingTime method
      */
 
+    public int remainingBakeTime(int timeInOven) {
+        return bakingTime() - timeInOven;
+    }
+
 
 
 
@@ -30,7 +36,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 +51,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 minutes) {
+        return minutes + calculatePrepTime(layers);
+    }