Skip to content

Commit 07b6b2e

Browse files
committed
simplified toString method
1 parent 86abc41 commit 07b6b2e

File tree

5 files changed

+5
-89
lines changed

5 files changed

+5
-89
lines changed

builder/src/main/java/com/iluwatar/Armor.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,7 @@ public enum Armor {
66

77
@Override
88
public String toString() {
9-
String s = "";
10-
switch (this) {
11-
case CLOTHES:
12-
s = "clothes";
13-
break;
14-
case LEATHER:
15-
s = "leather armor";
16-
break;
17-
case CHAIN_MAIL:
18-
s = "chain mail";
19-
break;
20-
case PLATE_MAIL:
21-
s = "plate mail";
22-
break;
23-
}
24-
return s;
9+
return name().toLowerCase();
2510
}
2611

2712
}

builder/src/main/java/com/iluwatar/HairColor.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,7 @@ public enum HairColor {
66

77
@Override
88
public String toString() {
9-
String s = "";
10-
switch (this) {
11-
case WHITE:
12-
s = "white";
13-
break;
14-
case BLOND:
15-
s = "blond";
16-
break;
17-
case RED:
18-
s = "red";
19-
break;
20-
case BROWN:
21-
s = "brown";
22-
break;
23-
case BLACK:
24-
s = "black";
25-
break;
26-
}
27-
return s;
9+
return name().toLowerCase();
2810
}
2911

3012
}

builder/src/main/java/com/iluwatar/HairType.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,7 @@ public enum HairType {
66

77
@Override
88
public String toString() {
9-
String s = "";
10-
switch (this) {
11-
case BALD:
12-
s = "bold";
13-
break;
14-
case SHORT:
15-
s = "short";
16-
break;
17-
case CURLY:
18-
s = "curly";
19-
break;
20-
case LONG_STRAIGHT:
21-
s = "long straight";
22-
break;
23-
case LONG_CURLY:
24-
s = "long curly";
25-
break;
26-
}
27-
return s;
9+
return name().toLowerCase().replaceAll("_", " ");
2810
}
2911

3012
}

builder/src/main/java/com/iluwatar/Profession.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,7 @@ public enum Profession {
66

77
@Override
88
public String toString() {
9-
String s = "";
10-
switch (this) {
11-
case WARRIOR:
12-
s = "Warrior";
13-
break;
14-
case THIEF:
15-
s = "Thief";
16-
break;
17-
case MAGE:
18-
s = "Mage";
19-
break;
20-
case PRIEST:
21-
s = "Priest";
22-
break;
23-
}
24-
return s;
9+
return name().toLowerCase();
2510
}
2611

2712
}

builder/src/main/java/com/iluwatar/Weapon.java

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,7 @@ public enum Weapon {
66

77
@Override
88
public String toString() {
9-
String s = "";
10-
switch (this) {
11-
case DAGGER:
12-
s = "dagger";
13-
break;
14-
case SWORD:
15-
s = "sword";
16-
break;
17-
case AXE:
18-
s = "axe";
19-
break;
20-
case WARHAMMER:
21-
s = "warhammer";
22-
break;
23-
case BOW:
24-
s = "bow";
25-
break;
26-
}
27-
return s;
9+
return name().toLowerCase();
2810
}
2911

3012
}

0 commit comments

Comments
 (0)