diff --git a/src/main/java/xyz/mrmelon54/codesize/callback/PresetCallback.java b/src/main/java/xyz/mrmelon54/codesize/callback/PresetCallback.java index 9b692b9..332218f 100644 --- a/src/main/java/xyz/mrmelon54/codesize/callback/PresetCallback.java +++ b/src/main/java/xyz/mrmelon54/codesize/callback/PresetCallback.java @@ -1,6 +1,6 @@ package xyz.mrmelon54.codesize.callback; -import xyz.mrmelon54.codesize.utils.Preset; +import xyz.mrmelon54.codesize.process.Preset; public interface PresetCallback { void changePreset(Preset preset); diff --git a/src/main/java/xyz/mrmelon54/codesize/utils/BuiltinPresets.java b/src/main/java/xyz/mrmelon54/codesize/process/BuiltinPresets.java similarity index 86% rename from src/main/java/xyz/mrmelon54/codesize/utils/BuiltinPresets.java rename to src/main/java/xyz/mrmelon54/codesize/process/BuiltinPresets.java index 79434ce..ed3381b 100644 --- a/src/main/java/xyz/mrmelon54/codesize/utils/BuiltinPresets.java +++ b/src/main/java/xyz/mrmelon54/codesize/process/BuiltinPresets.java @@ -1,6 +1,7 @@ -package xyz.mrmelon54.codesize.utils; +package xyz.mrmelon54.codesize.process; import com.google.gson.Gson; +import xyz.mrmelon54.codesize.process.Preset; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/src/main/java/xyz/mrmelon54/codesize/utils/Preset.java b/src/main/java/xyz/mrmelon54/codesize/process/Preset.java similarity index 96% rename from src/main/java/xyz/mrmelon54/codesize/utils/Preset.java rename to src/main/java/xyz/mrmelon54/codesize/process/Preset.java index fbd24c4..56e57d7 100644 --- a/src/main/java/xyz/mrmelon54/codesize/utils/Preset.java +++ b/src/main/java/xyz/mrmelon54/codesize/process/Preset.java @@ -1,4 +1,4 @@ -package xyz.mrmelon54.codesize.utils; +package xyz.mrmelon54.codesize.process; import java.util.Objects; import java.util.UUID; diff --git a/src/main/java/xyz/mrmelon54/codesize/ui/PresetEditor.java b/src/main/java/xyz/mrmelon54/codesize/ui/PresetEditor.java index b3747de..85bf578 100644 --- a/src/main/java/xyz/mrmelon54/codesize/ui/PresetEditor.java +++ b/src/main/java/xyz/mrmelon54/codesize/ui/PresetEditor.java @@ -2,7 +2,7 @@ package xyz.mrmelon54.codesize.ui; import xyz.mrmelon54.codesize.CodeSize; import xyz.mrmelon54.codesize.utils.ComponentUtils; -import xyz.mrmelon54.codesize.utils.Preset; +import xyz.mrmelon54.codesize.process.Preset; import javax.swing.*; import javax.swing.border.EmptyBorder; diff --git a/src/main/java/xyz/mrmelon54/codesize/ui/PresetSelector.java b/src/main/java/xyz/mrmelon54/codesize/ui/PresetSelector.java index 4e69e92..359f0b3 100644 --- a/src/main/java/xyz/mrmelon54/codesize/ui/PresetSelector.java +++ b/src/main/java/xyz/mrmelon54/codesize/ui/PresetSelector.java @@ -5,7 +5,7 @@ import xyz.mrmelon54.codesize.CodeSize; import xyz.mrmelon54.codesize.callback.PresetCallback; import xyz.mrmelon54.codesize.components.JIconButton; import xyz.mrmelon54.codesize.utils.Pair; -import xyz.mrmelon54.codesize.utils.Preset; +import xyz.mrmelon54.codesize.process.Preset; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/xyz/mrmelon54/codesize/utils/DirUtils.java b/src/main/java/xyz/mrmelon54/codesize/utils/DirUtils.java index 77add20..a85577a 100644 --- a/src/main/java/xyz/mrmelon54/codesize/utils/DirUtils.java +++ b/src/main/java/xyz/mrmelon54/codesize/utils/DirUtils.java @@ -7,6 +7,6 @@ import java.util.Properties; public class DirUtils { public static String getConfigDir() { Properties buildProps = BuildInfoUtils.getBuildProps(); - return AppDirsFactory.getInstance().getUserConfigDir(buildProps.getProperty("appId"), buildProps.getProperty("appVersion"), buildProps.getProperty("appAuthor")); + return AppDirsFactory.getInstance().getUserConfigDir(buildProps.getProperty("appId"), "", buildProps.getProperty("appAuthor")); } } diff --git a/src/main/java/xyz/mrmelon54/codesize/utils/Settings.java b/src/main/java/xyz/mrmelon54/codesize/utils/Settings.java index de03d82..2068ce8 100644 --- a/src/main/java/xyz/mrmelon54/codesize/utils/Settings.java +++ b/src/main/java/xyz/mrmelon54/codesize/utils/Settings.java @@ -4,6 +4,8 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import xyz.mrmelon54.codesize.enums.Theme; import xyz.mrmelon54.codesize.ex.CannotCreateConfigFolderException; +import xyz.mrmelon54.codesize.process.BuiltinPresets; +import xyz.mrmelon54.codesize.process.Preset; import java.io.*; import java.util.*;