From 07b6b2e8a67a5967ee1eb08fa1c19ba48103a85a Mon Sep 17 00:00:00 2001 From: yato Date: Mon, 10 Nov 2014 14:04:43 +0100 Subject: [PATCH 1/2] simplified toString method --- builder/src/main/java/com/iluwatar/Armor.java | 17 +--------------- .../src/main/java/com/iluwatar/HairColor.java | 20 +------------------ .../src/main/java/com/iluwatar/HairType.java | 20 +------------------ .../main/java/com/iluwatar/Profession.java | 17 +--------------- .../src/main/java/com/iluwatar/Weapon.java | 20 +------------------ 5 files changed, 5 insertions(+), 89 deletions(-) diff --git a/builder/src/main/java/com/iluwatar/Armor.java b/builder/src/main/java/com/iluwatar/Armor.java index d930c8834..5983c08f5 100644 --- a/builder/src/main/java/com/iluwatar/Armor.java +++ b/builder/src/main/java/com/iluwatar/Armor.java @@ -6,22 +6,7 @@ public enum Armor { @Override public String toString() { - String s = ""; - switch (this) { - case CLOTHES: - s = "clothes"; - break; - case LEATHER: - s = "leather armor"; - break; - case CHAIN_MAIL: - s = "chain mail"; - break; - case PLATE_MAIL: - s = "plate mail"; - break; - } - return s; + return name().toLowerCase(); } } diff --git a/builder/src/main/java/com/iluwatar/HairColor.java b/builder/src/main/java/com/iluwatar/HairColor.java index bc1a016d5..db44a3f64 100644 --- a/builder/src/main/java/com/iluwatar/HairColor.java +++ b/builder/src/main/java/com/iluwatar/HairColor.java @@ -6,25 +6,7 @@ public enum HairColor { @Override public String toString() { - String s = ""; - switch (this) { - case WHITE: - s = "white"; - break; - case BLOND: - s = "blond"; - break; - case RED: - s = "red"; - break; - case BROWN: - s = "brown"; - break; - case BLACK: - s = "black"; - break; - } - return s; + return name().toLowerCase(); } } diff --git a/builder/src/main/java/com/iluwatar/HairType.java b/builder/src/main/java/com/iluwatar/HairType.java index b6a350edf..3348b86d1 100644 --- a/builder/src/main/java/com/iluwatar/HairType.java +++ b/builder/src/main/java/com/iluwatar/HairType.java @@ -6,25 +6,7 @@ public enum HairType { @Override public String toString() { - String s = ""; - switch (this) { - case BALD: - s = "bold"; - break; - case SHORT: - s = "short"; - break; - case CURLY: - s = "curly"; - break; - case LONG_STRAIGHT: - s = "long straight"; - break; - case LONG_CURLY: - s = "long curly"; - break; - } - return s; + return name().toLowerCase().replaceAll("_", " "); } } diff --git a/builder/src/main/java/com/iluwatar/Profession.java b/builder/src/main/java/com/iluwatar/Profession.java index ef54fd041..a21d9730c 100644 --- a/builder/src/main/java/com/iluwatar/Profession.java +++ b/builder/src/main/java/com/iluwatar/Profession.java @@ -6,22 +6,7 @@ public enum Profession { @Override public String toString() { - String s = ""; - switch (this) { - case WARRIOR: - s = "Warrior"; - break; - case THIEF: - s = "Thief"; - break; - case MAGE: - s = "Mage"; - break; - case PRIEST: - s = "Priest"; - break; - } - return s; + return name().toLowerCase(); } } diff --git a/builder/src/main/java/com/iluwatar/Weapon.java b/builder/src/main/java/com/iluwatar/Weapon.java index d9a175563..ddc66fb43 100644 --- a/builder/src/main/java/com/iluwatar/Weapon.java +++ b/builder/src/main/java/com/iluwatar/Weapon.java @@ -6,25 +6,7 @@ public enum Weapon { @Override public String toString() { - String s = ""; - switch (this) { - case DAGGER: - s = "dagger"; - break; - case SWORD: - s = "sword"; - break; - case AXE: - s = "axe"; - break; - case WARHAMMER: - s = "warhammer"; - break; - case BOW: - s = "bow"; - break; - } - return s; + return name().toLowerCase(); } } From 4d52ecdaf69509c65dea93ae8dc168f4e69754f9 Mon Sep 17 00:00:00 2001 From: noragami Date: Tue, 11 Nov 2014 19:18:01 +0100 Subject: [PATCH 2/2] accepted suggestion note by @iluwatar --- builder/src/main/java/com/iluwatar/Armor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/src/main/java/com/iluwatar/Armor.java b/builder/src/main/java/com/iluwatar/Armor.java index 5983c08f5..a24f32dbc 100644 --- a/builder/src/main/java/com/iluwatar/Armor.java +++ b/builder/src/main/java/com/iluwatar/Armor.java @@ -6,7 +6,7 @@ public enum Armor { @Override public String toString() { - return name().toLowerCase(); + return name().toLowerCase().replaceAll("_", " "); } }