Perform string computations once at enum instantiation

PyvesB · Apr 26, 2020 · 8474e08 · 8474e08
1 parent ae16983
commit 8474e08
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...nced-achievements-api/src/main/java/com/hm/achievement/category/MultipleAchievements.java b/...nced-achievements-api/src/main/java/com/hm/achievement/category/MultipleAchievements.java
@@ -30,12 +30,18 @@ public enum MultipleAchievements implements Category {
 	private final String langDefault;
 	private final String configComment;
 	private final String subcategoryDBName;
+	private final String dbName;
+	private final String permName;
+	private final String langKey;
 
-	MultipleAchievements(String categoryName, String langDefault, String configComment, String subcategoryName) {
+	MultipleAchievements(String categoryName, String langDefault, String configComment, String subcategoryDBName) {
 		this.categoryName = categoryName;
 		this.langDefault = langDefault;
 		this.configComment = configComment;
-		subcategoryDBName = subcategoryName;
+		this.subcategoryDBName = subcategoryDBName;
+		this.dbName = name().toLowerCase();
+		this.permName = "achievement.count." + categoryName.toLowerCase();
+		this.langKey = "list-" + name().toLowerCase();
 	}
 
 	/**
@@ -58,23 +64,23 @@ public String toString() {
 	 */
 	@Override
 	public String toDBName() {
-		return name().toLowerCase();
+		return dbName;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public String toPermName() {
-		return "achievement.count." + categoryName.toLowerCase();
+		return permName;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public String toLangKey() {
-		return "list-" + name().toLowerCase();
+		return langKey;
 	}
 
 	/**

diff --git a/advanced-achievements-api/src/main/java/com/hm/achievement/category/NormalAchievements.java b/advanced-achievements-api/src/main/java/com/hm/achievement/category/NormalAchievements.java
@@ -64,12 +64,16 @@ public enum NormalAchievements implements Category {
 	private final String langName;
 	private final String langDefault;
 	private final String configComment;
+	private final String dbName;
+	private final String permName;
 
 	NormalAchievements(String categoryName, String langName, String langDefault, String configComment) {
 		this.categoryName = categoryName;
 		this.langName = langName;
 		this.langDefault = langDefault;
 		this.configComment = configComment;
+		this.dbName = name().toLowerCase();
+		this.permName = "achievement.count." + categoryName.toLowerCase();
 	}
 
 	/**
@@ -92,15 +96,15 @@ public String toString() {
 	 */
 	@Override
 	public String toDBName() {
-		return name().toLowerCase();
+		return dbName;
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
 	public String toPermName() {
-		return "achievement.count." + categoryName.toLowerCase();
+		return permName;
 	}
 
 	/**