• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revision15 (tree)
Time2014-05-10 07:54:50
Authoryu-tang

Log Message

ConfigSet を groovy.util.ConfigSlurper ベースに移行

Change Summary

Incremental Difference

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/config/ConfigSet.java (revision 14)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/config/ConfigSet.java (revision 15)
@@ -16,16 +16,14 @@
1616
1717 package jp.sourceforge.users.yutang.omegat.plugin.moenizer.config;
1818
19-import java.io.BufferedReader;
19+import groovy.util.ConfigObject;
20+import groovy.util.ConfigSlurper;
2021 import java.io.BufferedWriter;
2122 import java.io.File;
22-import java.io.FileInputStream;
2323 import java.io.FileWriter;
2424 import java.io.IOException;
25-import java.io.InputStreamReader;
2625 import java.io.Writer;
2726 import java.util.Properties;
28-import org.omegat.util.OConsts;
2927
3028 /**
3129 * Manage config collection
@@ -35,7 +33,7 @@
3533 public class ConfigSet {
3634
3735 private final File file;
38- private final Properties properties;
36+ private ConfigObject config = null;
3937
4038 public static Properties getDefaultProperties() {
4139 Properties p = new Properties();
@@ -46,23 +44,10 @@
4644 return p;
4745 }
4846
49- public ConfigSet(Properties defaultProperties, File file) throws IOException {
47+ public ConfigSet(File file) throws IOException {
5048 this.file = file;
51- properties = new Properties(defaultProperties);
52-
5349 if (file.isFile()) {
54- BufferedReader reader = null;
55- try {
56- FileInputStream in = new FileInputStream(file);
57- reader = new BufferedReader(new InputStreamReader(in, OConsts.UTF8));
58- properties.load(reader);
59- } finally {
60- try {
61- if (reader != null) {
62- reader.close();
63- }
64- } catch(IOException ex) { /* ignore */ }
65- }
50+ config = new ConfigSlurper().parse(file.toURI().toURL());
6651 }
6752 }
6853
@@ -70,7 +55,7 @@
7055 Writer writer = null;
7156 try {
7257 writer = new BufferedWriter(new FileWriter(file));
73- properties.store(writer, null);
58+ config.writeTo(writer);
7459 } finally {
7560 try {
7661 if (writer != null) {
--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/config/Config.java (revision 14)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/config/Config.java (revision 15)
@@ -24,7 +24,7 @@
2424 public abstract class Config {
2525
2626 enum ProviderType {
27- Color, Image
27+ Color, SimpleImage
2828 }
2929
3030 private final String name;