Pārlūkot izejas kodu

Merge branch 'feat/savedir-env' into feat/tags

* feat/savedir-env:
  Ensure that the save-dir is appropriately set.
Sam Jaffe 4 gadi atpakaļ
vecāks
revīzija
a18c176f4b

+ 16 - 0
src/main/lombok/org/leumasjaffe/recipe/config/Env.java

@@ -0,0 +1,16 @@
+package org.leumasjaffe.recipe.config;
+
+import com.google.common.base.MoreObjects;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class Env {
+	public final String RECIPE_SAVE_DIR;
+
+	static {
+		RECIPE_SAVE_DIR = MoreObjects.firstNonNull(
+				System.getenv("RECIPE_MANAGER_SAVE_DIR"),
+				System.getProperty("user.home") + "/.local/recipe-manager");
+	}
+}

+ 3 - 1
src/main/lombok/org/leumasjaffe/recipe/controller/SwingSaveLoadHandle.java

@@ -13,6 +13,8 @@ import java.util.Optional;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
+import org.leumasjaffe.recipe.config.Env;
+
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
@@ -22,7 +24,7 @@ import lombok.experimental.NonFinal;
 @RequiredArgsConstructor
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
 class SwingSaveLoadHandle implements SaveLoadHandle {
-	JFileChooser chooser = new JFileChooser();
+	JFileChooser chooser = new JFileChooser(Env.RECIPE_SAVE_DIR);
 	Component owner;
 	@NonFinal File filename = null;