From 003f796136d7eac37ed005fa94448a4983508f4c Mon Sep 17 00:00:00 2001 From: yukihane Date: Wed, 24 Aug 2011 15:55:19 +0900 Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0?= =?utf8?q?=E5=8F=96=E5=BE=97=E5=80=A4=E3=81=AE=E5=9E=8B=E3=82=92=E4=BF=AE?= =?utf8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- frontend/src/yukihane/inqubus/Config.java | 54 +++++++++++++------------- frontend/test/yukihane/inqubus/ConfigTest.java | 4 +- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/frontend/src/yukihane/inqubus/Config.java b/frontend/src/yukihane/inqubus/Config.java index 891024b..d6963d0 100644 --- a/frontend/src/yukihane/inqubus/Config.java +++ b/frontend/src/yukihane/inqubus/Config.java @@ -42,7 +42,7 @@ public enum Config { */ private static final String PROXY_USE = "network.proxy.use"; - public boolean getUseProxy() { + public boolean getProxyUse() { return config.getBoolean(PROXY_USE, false); } @@ -192,11 +192,11 @@ public enum Config { } private static final String COMMENT_SIZE_MANUAL = "comment.size.manual"; - public Integer getCommentSizeManual() { - return config.getInteger(COMMENT_SIZE_MANUAL, null); + public String getCommentSizeManual() { + return config.getString(COMMENT_SIZE_MANUAL, ""); } - public void setCommentSizeManual(Integer s) { + public void setCommentSizeManual(String s) { config.setProperty(COMMENT_SIZE_MANUAL, s); } private static final String COMMENT_MIN_SIZE_AUTOSIZE = "comment.minutesize.autosize"; @@ -210,29 +210,29 @@ public enum Config { } private static final String COMMENT_MIN_SIZE_MANUAL = "comment.minutesize.manual"; - public Integer getCommentMinSizeManual() { - return config.getInteger(COMMENT_MIN_SIZE_MANUAL, null); + public String getCommentMinSizeManual() { + return config.getString(COMMENT_MIN_SIZE_MANUAL, ""); } - public void setCommentMinSizeManual(Integer s) { + public void setCommentMinSizeManual(String s) { config.setProperty(COMMENT_MIN_SIZE_MANUAL, s); } private static final String COMMENT_FONTPATH = "comment.fontpath"; - public File getFontPath() { - return new File(config.getString(COMMENT_FONTPATH, "C:/Windows/Fonts/msgothic.ttc")); + public String getFontPath() { + return config.getString(COMMENT_FONTPATH, "C:/Windows/Fonts/msgothic.ttc"); } - public void setFontPath(File s) { + public void setFontPath(String s) { config.setProperty(COMMENT_FONTPATH, s); } private static final String COMMENT_FONT_INDEX = "comment.fontindex"; - public Integer getFontIndex() { - return config.getInteger(COMMENT_FONT_INDEX, Integer.valueOf(1)); + public String getFontIndex() { + return config.getString(COMMENT_FONT_INDEX, ""); } - public void setFontIndex(Integer s) { + public void setFontIndex(String s) { config.setProperty(COMMENT_FONT_INDEX, s); } private static final String COMMENT_FONT_SHADOW = "comment.fontshadow"; @@ -264,21 +264,21 @@ public enum Config { } private static final String FFMPEG_PATH = "ffmpeg.path"; - public File getFfmpegPath() { - return new File(config.getString(FFMPEG_PATH, "bin/ffmpeg.exe")); + public String getFfmpegPath() { + return config.getString(FFMPEG_PATH, "bin/ffmpeg.exe"); } - public void setFfmpegPath(File s) { - config.setProperty(FFMPEG_PATH, s.toString()); + public void setFfmpegPath(String s) { + config.setProperty(FFMPEG_PATH, s); } private static final String FFMPEG_DLLPATH = "ffmpeg.dllpath"; - public File getFfmpegDllPath() { - return new File(config.getString(FFMPEG_DLLPATH, "bin/nicovideo.dll")); + public String getFfmpegDllPath() { + return config.getString(FFMPEG_DLLPATH, "bin/nicovideo.dll"); } - public void setFfmpegDllPath(File s) { - config.setProperty(FFMPEG_DLLPATH, s.toString()); + public void setFfmpegDllPath(String s) { + config.setProperty(FFMPEG_DLLPATH, s); } private static final String FFMPEG_PARAM_DIRECT = "ffmpeg.param.direct"; @@ -354,20 +354,20 @@ public enum Config { } private static final String FFMPEG_PARAM_RESIZE_WIDTH = "ffmpeg.param.resize_width"; - public Integer getFfmpegResizeWidth() { - return config.getInteger(FFMPEG_PARAM_RESIZE_WIDTH, Integer.valueOf(480)); + public String getFfmpegResizeWidth() { + return config.getString(FFMPEG_PARAM_RESIZE_WIDTH, "480"); } - public void getFfmpegResizeWidth(Integer s) { + public void getFfmpegResizeWidth(String s) { config.setProperty(FFMPEG_PARAM_RESIZE_WIDTH, s); } private static final String FFMPEG_PARAM_RESIZE_HEIGHT = "ffmpeg.param.resize_height"; - public Integer getFfmpegResizeHeight() { - return config.getInteger(FFMPEG_PARAM_RESIZE_HEIGHT, Integer.valueOf(480)); + public String getFfmpegResizeHeight() { + return config.getString(FFMPEG_PARAM_RESIZE_HEIGHT, "480"); } - public void getFfmpegResizeHeight(Integer s) { + public void getFfmpegResizeHeight(String s) { config.setProperty(FFMPEG_PARAM_RESIZE_HEIGHT, s); } private static final String FFMPEG_PARAM_KEEP_ASPECT = "ffmpeg.param.keep_aspect"; diff --git a/frontend/test/yukihane/inqubus/ConfigTest.java b/frontend/test/yukihane/inqubus/ConfigTest.java index 3720a69..189edc3 100644 --- a/frontend/test/yukihane/inqubus/ConfigTest.java +++ b/frontend/test/yukihane/inqubus/ConfigTest.java @@ -84,9 +84,9 @@ public class ConfigTest { /* * ネットワーク - プロキシ */ - assertEquals(false, p.getUseProxy()); + assertEquals(false, p.getProxyUse()); p.setUseProxy(true); - assertEquals(true, p.getUseProxy()); + assertEquals(true, p.getProxyUse()); assertEquals("localhost", p.getProxyHost()); p.setProxyHost("proxyhost"); -- 2.11.0