提交: 81 - Moenizer (svn)

OmegaT の背景に画像を表示します。

Commit MetaInfo

• 修订版: 81 (tree)
• 时间: 2017-05-31 17:38:22
• 作者: yu-tang

Log Message

support OmegaT 4.1.1b

更改概述

• modified: trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeConfig.java
• modified: trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeConfigEditDialog.java
• modified: trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeUtil.java
• modified: trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/gui/ConfigEditDialog.java

差异

--- trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeConfig.java	(revision 80)
+++ trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeConfig.java	(revision 81)
@@ -24,6 +24,7 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -66,7 +67,7 @@
     public MoeConfig(File file) throws IOException {
         this.file = file;
         if (file.isFile()) {
-            String script = FileUtil.readTextFile(file); // as UTF-8
+            String script = MoeUtil.readTextFile(file, StandardCharsets.UTF_8);
             config = createBindedConfigSlurper().parse(script);
             addAll(sortedConfigs, config);
         }

--- trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeConfigEditDialog.java	(revision 80)
+++ trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeConfigEditDialog.java	(revision 81)
@@ -9,7 +9,7 @@
 import groovy.util.ConfigObject;
 import java.util.Set;
 import org.omegat.core.Core;
-import org.omegat.util.StaticUtils;
+import org.omegat.util.StringUtil;
 
 /**
  *
@@ -34,8 +34,8 @@
     }
 
     private void initUI() {
-        this.setTitle(StaticUtils.format(L10n.get(L10n.Key.DIALOG_TITLE),
-                                           L10n.get(L10n.Key.CURRENT_VERSION)));
+        this.setTitle(StringUtil.format(L10n.get(L10n.Key.DIALOG_TITLE),
+                                          L10n.get(L10n.Key.CURRENT_VERSION)));
     }
 
     /**

--- trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeUtil.java	(revision 80)
+++ trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/MoeUtil.java	(revision 81)
@@ -21,9 +21,10 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.net.URISyntaxException;
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.security.CodeSource;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -30,9 +31,7 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.omegat.util.LFileCopy;
 import org.omegat.util.Log;
-import org.omegat.util.OConsts;
 import org.omegat.util.StaticUtils;
 
 /**
@@ -85,7 +84,7 @@
 
             } else if (fileName.endsWith(".webloc")) {
                 // .webloc is Mac OS X Website Location file for safari
-                String text = readTextFile(file, OConsts.UTF8);
+                String text = readTextFile(file, StandardCharsets.UTF_8);
                 Matcher matcher = RE_URL_IN_WEBLOC.matcher(text);
                 if (matcher.find()) {
                     return new URL(matcher.group(1));
@@ -103,14 +102,22 @@
     }
 
     /**
-     * Read file as platform dependent encoding text.
+     * Read file as specified encoding text.
      */
     public static String readTextFile(File file, String encoding) throws IOException {
+        Charset charset = Charset.forName(encoding);
+        return readTextFile(file, charset);
+    }
+
+    /**
+     * Read file as specified encoding text.
+     */
+    public static String readTextFile(File file, Charset encoding) throws IOException {
         BufferedReader rd = new BufferedReader(new InputStreamReader(new FileInputStream(file), encoding));
         try {
-            StringWriter out = new StringWriter();
-            LFileCopy.copy(rd, out);
-            return out.toString();
+            char[] cbuf = new char[(int) file.length()];
+            rd.read(cbuf);
+            return String.valueOf(cbuf);
         } finally {
             rd.close();
         }

--- trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/gui/ConfigEditDialog.java	(revision 80)
+++ trunk/src/jp/osdn/users/yutang/omegat/plugin/moenizer/gui/ConfigEditDialog.java	(revision 81)
@@ -21,7 +21,7 @@
 import jp.osdn.users.yutang.omegat.plugin.moenizer.L10n;
 import jp.osdn.users.yutang.omegat.plugin.moenizer.ThemeChanger;
 import org.omegat.core.Core;
-import org.omegat.util.StaticUtils;
+import org.omegat.util.StringUtil;
 
 /**
  *
@@ -46,8 +46,8 @@
     }
 
     private void initUI() {
-        this.setTitle(StaticUtils.format(L10n.get(L10n.Key.DIALOG_TITLE),
-                                           L10n.get(L10n.Key.CURRENT_VERSION)));
+        this.setTitle(StringUtil.format(L10n.get(L10n.Key.DIALOG_TITLE),
+                                          L10n.get(L10n.Key.CURRENT_VERSION)));
     }
 
     private void initComponents() {