pchai7-Done

src/main/java/rocks/zipcode/quiz5/arrays/ArrayUtils.java

@@ -13,15 +13,14 @@ public class ArrayUtils {
     }
 
     public static String[] removeMiddleElement(String[] values) {
-//        String[] str = new String[values.length-1];
-//        int j = 0;
-//        for (int i = 0; i < values.length-1; i++) {
-//            str[j] = values[i/2];
-//            j++;
-//        }
-//        return str;
-        values[ values.length/2 ] = values[ values.length - 1 ] ;
-        return values;
+        String[] str = new String[values.length-1];
+        int j = 0;
+        for (int i = 0; i < values.length-1; i++) {
+            str[j] = values[i/2];
+            j++;
+        }
+        return str;
+
     }
 
     public static String getLastElement(String[] values) {

src/main/java/rocks/zipcode/quiz5/fundamentals/StringUtils.java

@@ -1,6 +1,8 @@
 package rocks.zipcode.quiz5.fundamentals;
 
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author leon on 21/12/2018.
@@ -21,6 +23,7 @@ public class StringUtils {
 //        char c = cap.charAt(middle);
 //        return String.valueOf(c);
         return Character.toUpperCase(str.charAt(0)) + str.substring(1);
+
     }
 
     public static String lowerCaseMiddleCharacter(String str) {
@@ -37,22 +40,19 @@ public class StringUtils {
     }
 
     public static Boolean isIsogram(String str) {
-        str = str.toLowerCase();
-        int len = str.length();
-
-        char arr[] = str.toCharArray();
+        String[] ary = str.split("");
+        Set<String> mySet = new HashSet<String>(Arrays.asList(ary));
 
-        Arrays.sort(arr);
-        for (int i = 0; i < len - 1; i++) {
-            if (arr[i] == arr[i + 1])
-                return false;
+        if(str.length() == mySet.size()){
+            return true;
+        }else {
+            return false;
         }
-        return true;
 }
 
     public static Boolean hasDuplicateConsecutiveCharacters(String str) {
-        return (str.matches("(.)\\1"));
-        //return (str.matches(".*(.)\\1.*"));
+       // return (str.matches("(.)\\1"));
+        return (str.matches(".*(.)\\1.*"));
     }
 
     public static String removeConsecutiveDuplicateCharacters(String str) {

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Account.java

@@ -16,19 +16,4 @@ public class Account extends BankAccount implements Transactable{
     public void setId(Long id) {
         this.Id = id;
     }
-
-    @Override
-    public void deposit(Double amountToIncreaseBy) {
-
-    }
-
-    @Override
-    public void withdrawal(Double amountToDecreaseBy) {
-
-    }
-
-    @Override
-    public Double getBalance() {
-        return null;
-    }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/BankAccount.java

@@ -5,32 +5,34 @@ package rocks.zipcode.quiz5.objectorientation.account;
  */
 
 public class BankAccount implements Transactable {
-    private  int initialBalance;
-    private  int depositeBalance;
+    private  Double Balance = 0.0;
+    private  Double initialBalance = 0.0;
+    private  Double depositeBalance = 0.0;
 
     public BankAccount() {
     }
 
-    public BankAccount(int initialBalance, int depositeBalance) {
+    public BankAccount(Double initialBalance, Double depositeBalance) {
         this.initialBalance = initialBalance;
         this.depositeBalance = depositeBalance;
     }
 
     public void setBalance(Double val) {
+        Balance = val;
     }
 
     @Override
     public void deposit(Double amountToIncreaseBy) {
-        depositeBalance += amountToIncreaseBy;
+        initialBalance = amountToIncreaseBy;
     }
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
-
+        initialBalance = amountToDecreaseBy;
     }
 
     @Override
     public Double getBalance() {
-        return null;
+        return this.Balance;
     }
 }

src/main/java/rocks/zipcode/quiz5/objectorientation/account/Employee.java

@@ -5,8 +5,10 @@ package rocks.zipcode.quiz5.objectorientation.account;
  */
 public class Employee extends Account implements Worker,Transactable {
     private BankAccount bankAccount;
-    private double numberOfHoursWorkedSoFar;
-    private Double hourlyWage;
+    private Double numberOfHoursWorkedSoFar = 0.0;
+    private Double hourlyWage = 0.0;
+    private Double BankAccountBalance = 0.0;
+    Double InitialAmount = 0.0;
 
     public Employee() {
     }
@@ -14,6 +16,13 @@ public class Employee extends Account implements Worker,Transactable {
     public Employee(BankAccount bankAccount) {
     }
 
+    public Employee( Worker workerEmployee, Transactable transactableEmployee, Transactable bankAccount) {
+        super();
+        workerEmployee = workerEmployee;
+        transactableEmployee = transactableEmployee;
+        bankAccount = bankAccount;
+    }
+
     public BankAccount getBankAccount() {
         return bankAccount;
     }
@@ -43,22 +52,22 @@ public class Employee extends Account implements Worker,Transactable {
 
     @Override
     public Double getMoneyEarned() {
-        Double earned = hourlyWage * numberOfHoursWorkedSoFar;
-        return earned;
+        BankAccountBalance = hourlyWage * numberOfHoursWorkedSoFar;
+        return BankAccountBalance;
     }
 
     @Override
     public void deposit(Double amountToIncreaseBy) {
-        getMoneyEarned();
+        BankAccountBalance = amountToIncreaseBy;
     }
 
     @Override
     public void withdrawal(Double amountToDecreaseBy) {
-
+        BankAccountBalance = amountToDecreaseBy;
     }
 
     @Override
     public Double getBalance() {
-        return null;
+        return this.BankAccountBalance;
     }
 }