Marie Helene Hansen

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,10 +48,20 @@ 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 + " :)";
     }
 
+
+    public int[] constructNumberArray(int lower, int upper) {
+        int[] res = new int[upper-lower+1];
+
+        for (int i = 0; i < res.length; i ++) {
+            res[i] = lower + i;
+        }
+
+        return res;
+    }
     /*
         3. Construct an array of numbers
         Create a method named constructNumberArray that accepts two whole numbers named lower and upper.
@@ -81,6 +91,14 @@ The method must return the same string in upper case with exclamation marks (!)
         error, 10   | ERROR!!!!!!!!!!
      */
 
+    public String shout(String str, int n) {
+        String res = str.toUpperCase();
+        for (int i = 0; i < n; i ++) {
+            res += "!";
+        }
+        return res;
+    }
+
 
 
 

src/main/java/com/booleanuk/extension/Extension.java

@@ -8,7 +8,7 @@ public class Extension extends ExtensionBase {
     /*
         5. Create a method named bakingTime that returns the number 50
      */
-
+    public int bakingTime() { return 50; }
 
 
 
@@ -20,6 +20,9 @@ public class Extension extends ExtensionBase {
         and the result of calling the bakingTime method
      */
 
+    public int remainingBakeTime(int minInOven) {
+        return bakingTime() - minInOven;
+    }
 
 
 
@@ -31,7 +34,9 @@ public class Extension extends ExtensionBase {
         each layer taking 3 minutes to prepare
      */
 
-
+    public int calculatePrepTime(int layers) {
+        return layers*3;
+    }
 
 
     /*
@@ -43,7 +48,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 minInOven) {
+        return calculatePrepTime(layers) + minInOven;
+    }