diff --git a/pom.xml b/pom.xml index e8224b8..9853b4f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ istlab.KisoJikkenNWP KisoJikkenNWP jar - 0.74 + 0.75 KisoJikkenNWP http://maven.apache.org diff --git a/src/main/java/istlab/KisoJikken/App.java b/src/main/java/istlab/KisoJikken/App.java index 6c2f168..b8c0675 100644 --- a/src/main/java/istlab/KisoJikken/App.java +++ b/src/main/java/istlab/KisoJikken/App.java @@ -28,6 +28,7 @@ */ public class App { public static String userhome; + public static String userhome_escaped; public static String nwpsrc = File.separator + "NWP" + File.separator + "src"; public static String gitrepos = "https://git.istlab.info/git/miura250/NWP.git"; public static String latestVersion; @@ -59,6 +60,8 @@ // ファイルがあるかチェック userhome = System.getProperty("user.home"); + userhome_escaped = App.userhome.replaceAll("\\\\","\\\\\\\\"); //なんじゃこの意味不明なエスケープは https://stackoverflow.com/questions/1701839/string-replaceall-single-backslashes-with-double-backslashes + getNWPifnotexist(false); SwingUtilities.invokeLater(() -> { diff --git a/src/main/java/istlab/KisoJikken/Editor.java b/src/main/java/istlab/KisoJikken/Editor.java index 1860dd5..622a749 100644 --- a/src/main/java/istlab/KisoJikken/Editor.java +++ b/src/main/java/istlab/KisoJikken/Editor.java @@ -59,7 +59,7 @@ textArea.addKeyListener(this); try { - setTitle(file.getCanonicalPath().replaceAll(App.userhome, "~")); + setTitle(file.getCanonicalPath().replaceAll(App.userhome_escaped, "~")); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/main/java/istlab/KisoJikken/FileTreeModel.java b/src/main/java/istlab/KisoJikken/FileTreeModel.java index 790d4d4..65c3e7b 100644 --- a/src/main/java/istlab/KisoJikken/FileTreeModel.java +++ b/src/main/java/istlab/KisoJikken/FileTreeModel.java @@ -8,16 +8,12 @@ import javax.swing.tree.TreePath; class MyFile extends File { - static String userhome_escaped; public MyFile(String pathname) { super(pathname); } public String toString() { - if (userhome_escaped == null){ - userhome_escaped = App.userhome.replaceAll("\\\\","\\\\\\\\"); - } - return super.toString().replaceAll(userhome_escaped, "~"); + return super.toString().replaceAll(App.userhome_escaped, "~"); } } diff --git a/src/main/java/istlab/KisoJikken/Launcher.java b/src/main/java/istlab/KisoJikken/Launcher.java index 26b9d1a..1c402d3 100644 --- a/src/main/java/istlab/KisoJikken/Launcher.java +++ b/src/main/java/istlab/KisoJikken/Launcher.java @@ -29,7 +29,7 @@ public class Launcher extends JFrame implements MouseInputListener, KeyListener { public static Launcher theapp; - public static String version = "0.74"; + public static String version = "0.75"; // JPanel mainP; File root; JTree tree;