From 9249598d9bcc6796eaad3727ae6d9e279b042106 Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Mon, 13 May 2024 19:08:59 +0200 Subject: [PATCH 1/2] replace hard-coded file path separators --- dspace-api/src/main/java/org/dspace/core/I18nUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java index afec0b95f69b..eeb930a50a09 100644 --- a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java +++ b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java @@ -234,7 +234,7 @@ public static String getControlledVocabularyFileName(Locale locale, String vocab String fileName = ""; final String FILE_TYPE = ".xml"; String defsFilename = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("dspace.dir") - + File.separator + "config/controlled-vocabularies/" + File.separator + vocabularyName; + + File.separator + "config" + File.separator + "controlled-vocabularies" + File.separator + vocabularyName; fileName = getFilename(locale, defsFilename, FILE_TYPE); return fileName; } From 12503843422314c85b10b4e11b061b0ce51e11cd Mon Sep 17 00:00:00 2001 From: Sascha Szott Date: Mon, 13 May 2024 20:15:16 +0200 Subject: [PATCH 2/2] fixed line length --- dspace-api/src/main/java/org/dspace/core/I18nUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java index eeb930a50a09..b0cb69b3bfb0 100644 --- a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java +++ b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java @@ -234,7 +234,8 @@ public static String getControlledVocabularyFileName(Locale locale, String vocab String fileName = ""; final String FILE_TYPE = ".xml"; String defsFilename = DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("dspace.dir") - + File.separator + "config" + File.separator + "controlled-vocabularies" + File.separator + vocabularyName; + + File.separator + "config" + File.separator + "controlled-vocabularies" + + File.separator + vocabularyName; fileName = getFilename(locale, defsFilename, FILE_TYPE); return fileName; }