mpierse 5 年 前
コミット
47d48002a7

+ 12
- 1
src/main/java/rocks/zipcode/quiz5/collections/WordCounter.java ファイルの表示

@@ -1,12 +1,23 @@
1 1
 package rocks.zipcode.quiz5.collections;
2 2
 
3
+import java.util.HashMap;
3 4
 import java.util.Map;
4 5
 
5 6
 public class WordCounter {
7
+
8
+    private Map<String, Integer> wordMap = new HashMap<>();
9
+
6 10
     public WordCounter(String... strings) {
11
+        for (String str : strings) {
12
+            if(wordMap.containsKey(str)){
13
+                wordMap.replace(str, wordMap.get(str)+1);
14
+            } else {
15
+                wordMap.put(str, 1);
16
+            }
17
+        }
7 18
     }
8 19
 
9 20
     public Map<String, Integer> getWordCountMap() {
10
-        return null;
21
+       return wordMap;
11 22
     }
12 23
 }

+ 5
- 2
src/main/java/rocks/zipcode/quiz5/objectorientation/account/Account.java ファイルの表示

@@ -3,11 +3,14 @@ package rocks.zipcode.quiz5.objectorientation.account;
3 3
 /**
4 4
  * @author leon on 30/12/2018.
5 5
  */
6
-public class Account extends BankAccount {
6
+public class Account {
7
+    private Long id;
8
+
7 9
     public Long getId() {
8
-        return null;
10
+        return id;
9 11
     }
10 12
 
11 13
     public void setId(Long id) {
14
+        this.id=id;
12 15
     }
13 16
 }

+ 29
- 1
src/main/java/rocks/zipcode/quiz5/objectorientation/account/BankAccount.java ファイルの表示

@@ -3,7 +3,35 @@ package rocks.zipcode.quiz5.objectorientation.account;
3 3
 /**
4 4
  * @author leon on 27/12/2018.
5 5
  */
6
-public class BankAccount {
6
+public class BankAccount extends Account implements Transactable{
7
+
8
+    private Double balance;
9
+
10
+
7 11
     public void setBalance(Double val) {
12
+        this.balance=val;
13
+    }
14
+
15
+    @Override
16
+    public void deposit(Double amountToIncreaseBy) {
17
+        if(amountToIncreaseBy>=0) {
18
+            balance += amountToIncreaseBy;
19
+        } else{
20
+            throw new IllegalArgumentException();
21
+        }
22
+    }
23
+
24
+    @Override
25
+    public void withdrawal(Double amountToDecreaseBy) {
26
+        if(amountToDecreaseBy>=0 && (balance-amountToDecreaseBy)>=0) {
27
+            balance -= amountToDecreaseBy;
28
+        } else{
29
+            throw new IllegalArgumentException();
30
+        }
31
+    }
32
+
33
+    @Override
34
+    public Double getBalance() {
35
+        return balance;
8 36
     }
9 37
 }

+ 38
- 1
src/main/java/rocks/zipcode/quiz5/objectorientation/account/Employee.java ファイルの表示

@@ -3,7 +3,9 @@ package rocks.zipcode.quiz5.objectorientation.account;
3 3
 /**
4 4
  * @author leon on 30/12/2018.
5 5
  */
6
-public class Employee {
6
+public class Employee implements Transactable, Worker{
7
+
8
+
7 9
     public Employee() {
8 10
     }
9 11
 
@@ -17,4 +19,39 @@ public class Employee {
17 19
     public void setBankAccount(BankAccount bankAccount) {
18 20
 
19 21
     }
22
+
23
+    @Override
24
+    public void deposit(Double amountToIncreaseBy) {
25
+
26
+    }
27
+
28
+    @Override
29
+    public void withdrawal(Double amountToDecreaseBy) {
30
+
31
+    }
32
+
33
+    @Override
34
+    public Double getBalance() {
35
+        return null;
36
+    }
37
+
38
+    @Override
39
+    public void increaseHoursWorked(Double numberOfHours) {
40
+
41
+    }
42
+
43
+    @Override
44
+    public Double getHoursWorked() {
45
+        return null;
46
+    }
47
+
48
+    @Override
49
+    public Double getHourlyWage() {
50
+        return null;
51
+    }
52
+
53
+    @Override
54
+    public Double getMoneyEarned() {
55
+        return null;
56
+    }
20 57
 }