From faf9df355609f6705f8e78f2173649b9fbe94766 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Fri, 11 Oct 2019 15:56:22 +0200
Subject: [PATCH] [Major] Fixed and renamed I18n* classes

---
 .../main/java/li/strolch/agent/I18nAgent.java | 21 +++++++++++++++++++
 .../li/strolch/agent/I18nAgentBundle.java     |  7 -------
 .../StartActivityExecutionService.java        |  4 ++--
 .../java/li/strolch/service/I18nService.java  | 21 +++++++++++++++++++
 .../li/strolch/service/I18nServiceBundle.java |  7 -------
 .../strolch/utils/I18nStrolchUtilsBundle.java | 14 -------------
 .../main/java/li/strolch/utils/I18nUtils.java | 21 +++++++++++++++++++
 .../utils/time/PeriodDurationFormatter.java   |  2 +-
 8 files changed, 66 insertions(+), 31 deletions(-)
 create mode 100644 li.strolch.agent/src/main/java/li/strolch/agent/I18nAgent.java
 delete mode 100644 li.strolch.agent/src/main/java/li/strolch/agent/I18nAgentBundle.java
 create mode 100644 li.strolch.service/src/main/java/li/strolch/service/I18nService.java
 delete mode 100644 li.strolch.service/src/main/java/li/strolch/service/I18nServiceBundle.java
 delete mode 100644 li.strolch.utils/src/main/java/li/strolch/utils/I18nStrolchUtilsBundle.java
 create mode 100644 li.strolch.utils/src/main/java/li/strolch/utils/I18nUtils.java

diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgent.java b/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgent.java
new file mode 100644
index 000000000..54abbf258
--- /dev/null
+++ b/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgent.java
@@ -0,0 +1,21 @@
+package li.strolch.agent;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class I18nAgent {
+	private static final String BUNDLE = "strolch-agent";
+
+	public static final ResourceBundle i18nAgent = ResourceBundle.getBundle(BUNDLE);
+
+	public static ResourceBundle getBundle(Locale locale) {
+		return ResourceBundle.getBundle(BUNDLE, locale);
+	}
+
+	public static String i18n(Locale locale, String key) {
+		ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE, locale);
+		if (bundle.containsKey(key))
+			return bundle.getString(key);
+		return key;
+	}
+}
diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgentBundle.java b/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgentBundle.java
deleted file mode 100644
index 52edcd1f1..000000000
--- a/li.strolch.agent/src/main/java/li/strolch/agent/I18nAgentBundle.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package li.strolch.agent;
-
-import java.util.ResourceBundle;
-
-public class I18nAgentBundle {
-	public static final ResourceBundle i18nAgentBundle = ResourceBundle.getBundle("strolch-agent");
-}
diff --git a/li.strolch.service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java b/li.strolch.service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java
index c12daa0da..fb3b9f133 100644
--- a/li.strolch.service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java
+++ b/li.strolch.service/src/main/java/li/strolch/execution/service/StartActivityExecutionService.java
@@ -1,6 +1,6 @@
 package li.strolch.execution.service;
 
-import static li.strolch.service.I18nServiceBundle.i18nServiceBundle;
+import static li.strolch.service.I18nService.i18nService;
 
 import li.strolch.execution.ExecutionHandler;
 import li.strolch.execution.ExecutionHandlerState;
@@ -34,7 +34,7 @@ public class StartActivityExecutionService extends AbstractService<LocatorArgume
 		if (executionHandlerState != ExecutionHandlerState.Running)
 			return new StrolchRootElementResult(ServiceResultState.WARNING,
 					"ExecutionHandler is not running, can not start new jobs!")
-					.i18n(i18nServiceBundle, "execution.handler.invalidState", "state", executionHandlerState);
+					.i18n(i18nService, "execution.handler.invalidState", "state", executionHandlerState);
 
 		executionHandler.addForExecution(realm, arg.locator);
 
diff --git a/li.strolch.service/src/main/java/li/strolch/service/I18nService.java b/li.strolch.service/src/main/java/li/strolch/service/I18nService.java
new file mode 100644
index 000000000..4c9ca0eae
--- /dev/null
+++ b/li.strolch.service/src/main/java/li/strolch/service/I18nService.java
@@ -0,0 +1,21 @@
+package li.strolch.service;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class I18nService {
+	private static final String BUNDLE = "strolch-service";
+
+	public static final ResourceBundle i18nService = ResourceBundle.getBundle(BUNDLE);
+
+	public static ResourceBundle getBundle(Locale locale) {
+		return ResourceBundle.getBundle(BUNDLE, locale);
+	}
+
+	public static String i18n(Locale locale, String key) {
+		ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE, locale);
+		if (bundle.containsKey(key))
+			return bundle.getString(key);
+		return key;
+	}
+}
diff --git a/li.strolch.service/src/main/java/li/strolch/service/I18nServiceBundle.java b/li.strolch.service/src/main/java/li/strolch/service/I18nServiceBundle.java
deleted file mode 100644
index e96aed296..000000000
--- a/li.strolch.service/src/main/java/li/strolch/service/I18nServiceBundle.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package li.strolch.service;
-
-import java.util.ResourceBundle;
-
-public class I18nServiceBundle {
-	public static final ResourceBundle i18nServiceBundle = ResourceBundle.getBundle("strolch-service");
-}
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/I18nStrolchUtilsBundle.java b/li.strolch.utils/src/main/java/li/strolch/utils/I18nStrolchUtilsBundle.java
deleted file mode 100644
index 7e781fa83..000000000
--- a/li.strolch.utils/src/main/java/li/strolch/utils/I18nStrolchUtilsBundle.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package li.strolch.utils;
-
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-public class I18nStrolchUtilsBundle {
-
-	public static String i18n(Locale locale, String key) {
-		ResourceBundle bundle = ResourceBundle.getBundle("strolch-utils", locale);
-		if (bundle.containsKey(key))
-			return bundle.getString(key);
-		return key;
-	}
-}
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/I18nUtils.java b/li.strolch.utils/src/main/java/li/strolch/utils/I18nUtils.java
new file mode 100644
index 000000000..18cba355d
--- /dev/null
+++ b/li.strolch.utils/src/main/java/li/strolch/utils/I18nUtils.java
@@ -0,0 +1,21 @@
+package li.strolch.utils;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class I18nUtils {
+	private static final String BUNDLE = "strolch-utils";
+
+	public static final ResourceBundle i18nUtils = ResourceBundle.getBundle(BUNDLE);
+
+	public static ResourceBundle getBundle(Locale locale) {
+		return ResourceBundle.getBundle(BUNDLE, locale);
+	}
+
+	public static String i18n(Locale locale, String key) {
+		ResourceBundle bundle = ResourceBundle.getBundle(BUNDLE, locale);
+		if (bundle.containsKey(key))
+			return bundle.getString(key);
+		return key;
+	}
+}
diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java b/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java
index d55f8ae73..a2e5a5798 100644
--- a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java
+++ b/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodDurationFormatter.java
@@ -1,6 +1,6 @@
 package li.strolch.utils.time;
 
-import static li.strolch.utils.I18nStrolchUtilsBundle.i18n;
+import static li.strolch.utils.I18nUtils.i18n;
 
 import java.time.Duration;
 import java.time.Period;