diff --git a/java_console/autoupdate/src/com/rusefi/ui/storage/PersistentConfiguration.java b/java_console/autoupdate/src/com/rusefi/ui/storage/PersistentConfiguration.java index ef8a0603cb..2556803283 100644 --- a/java_console/autoupdate/src/com/rusefi/ui/storage/PersistentConfiguration.java +++ b/java_console/autoupdate/src/com/rusefi/ui/storage/PersistentConfiguration.java @@ -1,5 +1,7 @@ package com.rusefi.ui.storage; +import com.rusefi.shared.FileUtil; + import java.beans.XMLDecoder; import java.beans.XMLEncoder; import java.io.*; @@ -9,14 +11,13 @@ import java.util.Map; public class PersistentConfiguration { private static final PersistentConfiguration INSTANCE = new PersistentConfiguration(); - public static final String RUSEFI_SETTINGS_FOLDER = System.getProperty("user.home") + File.separator + ".rusEFI"; private static boolean hookRegistered; static { - new File(RUSEFI_SETTINGS_FOLDER).mkdirs(); + new File(FileUtil.RUSEFI_SETTINGS_FOLDER).mkdirs(); } - private static final String CONFIG_FILE_NAME = RUSEFI_SETTINGS_FOLDER + File.separator + "console_properties.xml"; + private static final String CONFIG_FILE_NAME = FileUtil.RUSEFI_SETTINGS_FOLDER + File.separator + "console_properties.xml"; private Map config = new HashMap<>(); private boolean isLoaded; diff --git a/java_console/inifile/src/com/rusefi/tune/xml/Msq.java b/java_console/inifile/src/com/rusefi/tune/xml/Msq.java index b4fce510bf..0f8908d310 100644 --- a/java_console/inifile/src/com/rusefi/tune/xml/Msq.java +++ b/java_console/inifile/src/com/rusefi/tune/xml/Msq.java @@ -4,7 +4,6 @@ import com.opensr5.ConfigurationImage; import com.opensr5.ini.IniFileModel; import com.opensr5.ini.field.IniField; import com.rusefi.config.generated.Fields; -import com.rusefi.ui.storage.PersistentConfiguration; import com.rusefi.xml.XmlUtil; import org.jetbrains.annotations.NotNull; @@ -18,7 +17,7 @@ import java.util.Objects; @XmlRootElement public class Msq { - public static final String outputXmlFileName = PersistentConfiguration.RUSEFI_SETTINGS_FOLDER + File.separator + "output.msq"; + public static final String outputXmlFileName = FileUtil.RUSEFI_SETTINGS_FOLDER + File.separator + "output.msq"; public List page = new ArrayList<>(); diff --git a/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java b/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java index 973a69e647..d9ed7222c4 100644 --- a/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java +++ b/java_console/shared_io/src/main/java/com/rusefi/shared/FileUtil.java @@ -13,6 +13,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; public class FileUtil { + public static final String RUSEFI_SETTINGS_FOLDER = System.getProperty("user.home") + File.separator + ".rusEFI"; + public static void unzip(String zipFileName, String destPath) throws IOException { File destDir = new File(destPath); byte[] buffer = new byte[1024]; diff --git a/java_tools/ts_plugin_launcher/.idea/modules.xml b/java_tools/ts_plugin_launcher/.idea/modules.xml index 528d7cce98..7a1a732c0d 100644 --- a/java_tools/ts_plugin_launcher/.idea/modules.xml +++ b/java_tools/ts_plugin_launcher/.idea/modules.xml @@ -6,6 +6,7 @@ + diff --git a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Updater.java b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Updater.java index cd00e12e28..81a386a95b 100644 --- a/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Updater.java +++ b/java_tools/ts_plugin_launcher/src/com/rusefi/ts_plugin/Updater.java @@ -2,7 +2,7 @@ package com.rusefi.ts_plugin; import com.rusefi.autoupdate.AutoupdateUtil; import com.rusefi.shared.ConnectionAndMeta; -import com.rusefi.ui.storage.PersistentConfiguration; +import com.rusefi.shared.FileUtil; import org.putgemin.VerticalFlowLayout; import javax.swing.*; @@ -21,7 +21,7 @@ import static com.rusefi.ts_plugin.TsPluginLauncher.VERSION; public class Updater { private static final String PLUGIN_BODY_JAR = "rusefi_plugin_body.jar"; - public static final String LOCAL_JAR_FILE_NAME = PersistentConfiguration.RUSEFI_SETTINGS_FOLDER + File.separator + PLUGIN_BODY_JAR; + public static final String LOCAL_JAR_FILE_NAME = FileUtil.RUSEFI_SETTINGS_FOLDER + File.separator + PLUGIN_BODY_JAR; private static final String TITLE = "rusEFI plugin installer " + VERSION; private final JPanel content = new JPanel(new VerticalFlowLayout()); diff --git a/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml b/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml index cc7f3b8758..34649b59d1 100644 --- a/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml +++ b/java_tools/ts_plugin_launcher/ts_plugin_launcher.iml @@ -10,5 +10,6 @@ + \ No newline at end of file