diff --git a/src/main/java/istlab/KisoJikken/App.java b/src/main/java/istlab/KisoJikken/App.java index a29172c..c11cdf4 100644 --- a/src/main/java/istlab/KisoJikken/App.java +++ b/src/main/java/istlab/KisoJikken/App.java @@ -15,7 +15,7 @@ */ public class App { public static String userhome; - public static String nwpsrc = "/NWP/src"; + public static String nwpsrc = File.separator+"NWP"+File.separator+"src"; public static String gitrepos = "https://git.istlab.info/git/miura250/NWP.git"; public static void main(String[] args) { diff --git a/src/main/java/istlab/KisoJikken/Editor.java b/src/main/java/istlab/KisoJikken/Editor.java index d6451f4..ba2a2ad 100644 --- a/src/main/java/istlab/KisoJikken/Editor.java +++ b/src/main/java/istlab/KisoJikken/Editor.java @@ -15,6 +15,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import javax.swing.JButton; import javax.swing.JFrame; @@ -124,7 +125,12 @@ } catch (FileNotFoundException e) { e.printStackTrace(); } - BufferedReader br = new BufferedReader(new InputStreamReader(is)); + BufferedReader br=null; + try { + br = new BufferedReader(new InputStreamReader(is,"UTF-8")); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } StringBuilder sb = new StringBuilder(); String line; try { @@ -141,10 +147,10 @@ String src = textArea.getText(); // System.out.println(src); try { - PrintWriter out = new PrintWriter(file.getAbsolutePath()); + PrintWriter out = new PrintWriter(file.getAbsolutePath(), "UTF-8"); out.println(src); out.flush(); - } catch (FileNotFoundException e) { + } catch (FileNotFoundException | UnsupportedEncodingException e) { e.printStackTrace(); } System.out.println("保存しました"); diff --git a/src/main/java/istlab/KisoJikken/JCompiler.java b/src/main/java/istlab/KisoJikken/JCompiler.java index 7bf52af..5bd767f 100644 --- a/src/main/java/istlab/KisoJikken/JCompiler.java +++ b/src/main/java/istlab/KisoJikken/JCompiler.java @@ -14,7 +14,7 @@ public JCompiler(String p) { absolutePath = p; thread = new Thread(this); - String[] ary = absolutePath.split("/"); + String[] ary = absolutePath.split(File.separator); for (int i = 0; i < ary.length; i++) { if (ary[i].equals("src")) { pkgname = ary[i + 1]; diff --git a/src/main/java/istlab/KisoJikken/JExecutor.java b/src/main/java/istlab/KisoJikken/JExecutor.java index c657154..3c34ad6 100644 --- a/src/main/java/istlab/KisoJikken/JExecutor.java +++ b/src/main/java/istlab/KisoJikken/JExecutor.java @@ -14,7 +14,7 @@ public JExecutor(String p) { absolutePath = p; thread = new Thread(this); - String[] ary = absolutePath.split("/"); + String[] ary = absolutePath.split(File.separator); for (int i = 0; i < ary.length; i++) { if (ary[i].equals("src")) { pkgname = ary[i + 1];