diff --git a/src/main/java/com/booleanuk/core/Exercise.java b/src/main/java/com/booleanuk/core/Exercise.java index 7ac3cfb..4d4e8eb 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 + " :)"; } /* @@ -65,6 +65,15 @@ public String happilyGreet() { -1, 1 | [-1,0,1] */ + public int[] constructNumberArray(int lower, int upper) { + int[] result = new int[upper - lower + 1]; + for (int i = 0; i < result.length; i++) { + result[i] = lower; + lower += 1; + } + return result; + } + @@ -82,6 +91,15 @@ The method must return the same string in upper case with exclamation marks (!) */ + public String shout(String string, int number) { + String result = ""; + result = string.toUpperCase(); + for (int i = 0; i < number; i++) { + result += "!"; + } + return result; + } + } diff --git a/src/main/java/com/booleanuk/extension/Extension.java b/src/main/java/com/booleanuk/extension/Extension.java index f9de7dd..c53655a 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,7 +22,9 @@ public class Extension extends ExtensionBase { and the result of calling the bakingTime method */ - + public int remainingBakeTime(int minInOven) { + return bakingTime() - minInOven; + } /* @@ -31,7 +35,9 @@ public class Extension extends ExtensionBase { each layer taking 3 minutes to prepare */ - + public int calculatePrepTime(int layers) { + return layers * 3; + } /* @@ -45,6 +51,8 @@ public class Extension extends ExtensionBase { */ - + public int totalTimeSpent(int layers, int minsInOven) { + return calculatePrepTime(layers) + minsInOven; + } }