From 9392b4f2abd79b587b4f3b0b801661d68b81d50b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Ha=C3=9Flinger?= Date: Thu, 23 Sep 2021 22:40:38 +0200 Subject: [PATCH] Fix npe if path prefix is undefined. Resolves #57 --- .../marhali/easyi18n/model/SettingsState.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/de/marhali/easyi18n/model/SettingsState.java b/src/main/java/de/marhali/easyi18n/model/SettingsState.java index 5119119..2638c7d 100644 --- a/src/main/java/de/marhali/easyi18n/model/SettingsState.java +++ b/src/main/java/de/marhali/easyi18n/model/SettingsState.java @@ -11,6 +11,7 @@ public class SettingsState { public static final String DEFAULT_PREVIEW_LOCALE = "en"; public static final String DEFAULT_FILE_PATTERN = ".*"; + public static final String DEFAULT_PATH_PREFIX = ""; public static final boolean DEFAULT_CODE_ASSISTANCE = true; private String localesPath; @@ -45,6 +46,14 @@ public class SettingsState { this.previewLocale = previewLocale; } + public @NotNull String getPathPrefix() { + return pathPrefix != null ? pathPrefix : DEFAULT_PATH_PREFIX; + } + + public void setPathPrefix(String pathPrefix) { + this.pathPrefix = pathPrefix; + } + public boolean isCodeAssistance() { return codeAssistance == null ? DEFAULT_CODE_ASSISTANCE : codeAssistance; } @@ -52,12 +61,4 @@ public class SettingsState { public void setCodeAssistance(boolean codeAssistance) { this.codeAssistance = codeAssistance; } - - public void setPathPrefix(String pathPrefix) { - this.pathPrefix = pathPrefix; - } - - public String getPathPrefix() { - return pathPrefix; - } } \ No newline at end of file