From 0e9ef5626c9eeb4b00b98cb1cb7bc82b1fb56939 Mon Sep 17 00:00:00 2001 From: Michael Fuchs Date: Fri, 16 Apr 2021 16:32:54 +0200 Subject: [PATCH] Reorganized property files and message bundle to reduce classpath conflicts. --- lib/src/main/java/de/fumix/holidays/config/Config.java | 8 ++++---- .../resources/{ => de/fumix/holidays}/holiday.properties | 0 .../fumix/holidays/messages_de.properties} | 0 .../{ => de/fumix/holidays}/region_AT.properties | 0 .../{ => de/fumix/holidays}/region_DE.properties | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename lib/src/main/resources/{ => de/fumix/holidays}/holiday.properties (100%) rename lib/src/main/resources/{holidays/holidays_de.properties => de/fumix/holidays/messages_de.properties} (100%) rename lib/src/main/resources/{ => de/fumix/holidays}/region_AT.properties (100%) rename lib/src/main/resources/{ => de/fumix/holidays}/region_DE.properties (100%) diff --git a/lib/src/main/java/de/fumix/holidays/config/Config.java b/lib/src/main/java/de/fumix/holidays/config/Config.java index f606e88..3b041d4 100644 --- a/lib/src/main/java/de/fumix/holidays/config/Config.java +++ b/lib/src/main/java/de/fumix/holidays/config/Config.java @@ -14,9 +14,9 @@ public class Config { private static final Logger LOG = LoggerFactory.getLogger(Config.class); // Resource paths to the configuration. - final static String HOLIDAY_PROPERTIES = "/holiday.properties"; - final static String REGION_DE_PROPERTIES = "/region_DE.properties"; - final static String REGION_AT_PROPERTIES = "/region_AT.properties"; + final static String HOLIDAY_PROPERTIES = "/de/fumix/holidays/holiday.properties"; + final static String REGION_DE_PROPERTIES = "/de/fumix/holidays/region_DE.properties"; + final static String REGION_AT_PROPERTIES = "/de/fumix/holidays/region_AT.properties"; final LinkedHashMap holidays; @@ -29,7 +29,7 @@ public Optional regionOf(String abbrev) { public static ResourceBundle getHolidaysBundle(Locale locale) { - return ResourceBundle.getBundle("holidays.holidays"); + return ResourceBundle.getBundle("de.fumix.holidays.messages"); } public static Config fromResources() { diff --git a/lib/src/main/resources/holiday.properties b/lib/src/main/resources/de/fumix/holidays/holiday.properties similarity index 100% rename from lib/src/main/resources/holiday.properties rename to lib/src/main/resources/de/fumix/holidays/holiday.properties diff --git a/lib/src/main/resources/holidays/holidays_de.properties b/lib/src/main/resources/de/fumix/holidays/messages_de.properties similarity index 100% rename from lib/src/main/resources/holidays/holidays_de.properties rename to lib/src/main/resources/de/fumix/holidays/messages_de.properties diff --git a/lib/src/main/resources/region_AT.properties b/lib/src/main/resources/de/fumix/holidays/region_AT.properties similarity index 100% rename from lib/src/main/resources/region_AT.properties rename to lib/src/main/resources/de/fumix/holidays/region_AT.properties diff --git a/lib/src/main/resources/region_DE.properties b/lib/src/main/resources/de/fumix/holidays/region_DE.properties similarity index 100% rename from lib/src/main/resources/region_DE.properties rename to lib/src/main/resources/de/fumix/holidays/region_DE.properties