Profileインタフェースを導入し, 従来のProfileクラスはclassicへ移動

diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java
index e59c24e..c4c2c01 100644 (file)
--- a/frontend/src/saccubus/MainFrame.java
+++ b/frontend/src/saccubus/MainFrame.java
@@ -39,8 +39,8 @@ import javax.swing.SwingUtilities;
 import nicobrowser.entity.NicoContent;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag.State;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.NgSetting;
+import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.converter.classic.profile.NgSetting;
 import saccubus.net.TextProgressListener;
 import saccubus.properties.BasicSetting;
 import saccubus.properties.ConvertSetting;
@@ -58,19 +58,19 @@ import yukihane.nicovideo.NicoDBFinder;
  * <p>
  * タイトル: さきゅばす
  * </p>
- * 
+ *
  * <p>
  * 説明: ニコニコ動画の動画をコメントつきで保存
  * </p>
- * 
+ *
  * <p>
  * 著作権: Copyright (c) 2007 PSI
  * </p>
- * 
+ *
  * <p>
  * 会社名:
  * </p>
- * 
+ *
  * @author 未入力
  * @version 1.0
  */

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index b3ff1da..2e25078 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -1,12 +1,12 @@
 package saccubus.converter;
 
 import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.FfmpegOption;
 import saccubus.converter.filegetter.FileInstanciator;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import saccubus.ConvertStopFlag;
+import saccubus.converter.classic.profile.FfmpegOption;
 import saccubus.net.TextProgressListener;
 
 /**
@@ -34,7 +34,7 @@ public class Converter extends AbstractCommand implements Runnable, Callable<Boo
      * @param time
      * @param profile
      * @param listener
-     * @param flag 
+     * @param flag
      */
     public Converter(String url, String time, Profile profile,
             TextProgressListener listener, ConvertStopFlag flag) {

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index d45a39c..076314e 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -12,10 +12,10 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
-import saccubus.converter.profile.Ffmpeg;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.GeneralSetting;
-import saccubus.converter.profile.NgSetting;
+import saccubus.converter.classic.profile.Ffmpeg;
+import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.converter.classic.profile.GeneralSetting;
+import saccubus.converter.classic.profile.NgSetting;
 import saccubus.net.TextProgressListener;
 import yukihane.swf.Cws2Fws;
 

diff --git a/frontend/src/saccubus/converter/profile/CommentGetInfo.java b/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
similarity index 92%
rename from frontend/src/saccubus/converter/profile/CommentGetInfo.java
rename to frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
index c17634b..ffe5a57 100644 (file)
--- a/frontend/src/saccubus/converter/profile/CommentGetInfo.java
+++ b/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 /**
  *

diff --git a/frontend/src/saccubus/converter/profile/Ffmpeg.java b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
similarity index 98%
rename from frontend/src/saccubus/converter/profile/Ffmpeg.java
rename to frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
index 2195992..ef20422 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Ffmpeg.java
+++ b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/saccubus/converter/profile/FfmpegOption.java b/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
similarity index 97%
rename from frontend/src/saccubus/converter/profile/FfmpegOption.java
rename to frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
index e0933a7..ff1b014 100644 (file)
--- a/frontend/src/saccubus/converter/profile/FfmpegOption.java
+++ b/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/frontend/src/saccubus/converter/profile/GeneralSetting.java b/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
similarity index 84%
rename from frontend/src/saccubus/converter/profile/GeneralSetting.java
rename to frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
index bd4dbbc..f10c4df 100644 (file)
--- a/frontend/src/saccubus/converter/profile/GeneralSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/saccubus/converter/profile/InputFileSetting.java b/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
similarity index 95%
rename from frontend/src/saccubus/converter/profile/InputFileSetting.java
rename to frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
index 696c574..ab3ad85 100644 (file)
--- a/frontend/src/saccubus/converter/profile/InputFileSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 /**
  *

diff --git a/frontend/src/saccubus/converter/profile/NgSetting.java b/frontend/src/saccubus/converter/classic/profile/NgSetting.java
similarity index 88%
rename from frontend/src/saccubus/converter/profile/NgSetting.java
rename to frontend/src/saccubus/converter/classic/profile/NgSetting.java
index 31bc8c6..70954dd 100644 (file)
--- a/frontend/src/saccubus/converter/profile/NgSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/NgSetting.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 /**
  * NG設定.

diff --git a/frontend/src/saccubus/converter/profile/OutputFileSetting.java b/frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
similarity index 95%
rename from frontend/src/saccubus/converter/profile/OutputFileSetting.java
rename to frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
index 9a00850..0ae17e6 100644 (file)
--- a/frontend/src/saccubus/converter/profile/OutputFileSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 /**
  *

diff --git a/frontend/src/saccubus/converter/classic/profile/Profile.java b/frontend/src/saccubus/converter/classic/profile/Profile.java
new file mode 100644 (file)
index 0000000..4f76fac
--- /dev/null
+++ b/frontend/src/saccubus/converter/classic/profile/Profile.java
@@ -0,0 +1,96 @@
+/* $Id$ */
+package saccubus.converter.classic.profile;
+
+import saccubus.converter.filegetter.LoginInfo;
+
+/**
+ * Converterに処理させるための設定.
+ * @author yuki
+ */
+public class Profile implements saccubus.converter.profile.Profile {
+
+    private final GeneralSetting generalSetting;
+    private final LoginInfo loginInfo;
+    private final InputFileSetting videoSetting;
+    private final InputFileSetting commentSetting;
+    private final CommentGetInfo commentGetInfo;
+    private final InputFileSetting tcommentSetting;
+    private final OutputFileSetting outputFileSetting;
+    private final Ffmpeg ffmpeg;
+
+    public Profile(
+            GeneralSetting generalSetting,
+            LoginInfo loginInfo,
+            InputFileSetting videoSetting,
+            InputFileSetting commentSetting,
+            CommentGetInfo commentGetInfo,
+            InputFileSetting tcommentSetting,
+            OutputFileSetting outputFileSetting,
+            Ffmpeg ffmpeg) {
+        this.generalSetting = generalSetting;
+        this.loginInfo = loginInfo;
+        this.videoSetting = videoSetting;
+        this.commentSetting = commentSetting;
+        this.commentGetInfo = commentGetInfo;
+        this.tcommentSetting = tcommentSetting;
+        this.outputFileSetting = outputFileSetting;
+        this.ffmpeg = ffmpeg;
+    }
+
+    @Override
+    public LoginInfo getLoginInfo() {
+        return loginInfo;
+    }
+
+    /** @return 何か実行すべき処理があればtrue. */
+    @Override
+    public boolean shouldRun() {
+        return getOutputFileSetting().isConvert() || needsDownload();
+    }
+
+    /** @return 何かダウンロードするものがあればtrue. */
+    @Override
+    public boolean needsDownload() {
+        return (videoSetting.isDownload() || commentSetting.isDownload() || tcommentSetting.isDownload());
+    }
+
+    @Override
+    public InputFileSetting getVideoSetting() {
+        return videoSetting;
+    }
+
+    @Override
+    public InputFileSetting getCommentSetting() {
+        return commentSetting;
+    }
+
+    @Override
+    public InputFileSetting getTcommentSetting() {
+        return tcommentSetting;
+    }
+
+    @Override
+    public OutputFileSetting getOutputFileSetting() {
+        return outputFileSetting;
+    }
+
+    @Override
+    public CommentGetInfo getCommentGetInfo() {
+        return commentGetInfo;
+    }
+
+    @Override
+    public boolean needsConvert() {
+        return getOutputFileSetting().isConvert();
+    }
+
+    @Override
+    public Ffmpeg getFfmpeg() {
+        return ffmpeg;
+    }
+
+    @Override
+    public GeneralSetting getGeneralSetting() {
+        return generalSetting;
+    }
+}

diff --git a/frontend/src/saccubus/converter/profile/Proxy.java b/frontend/src/saccubus/converter/classic/profile/Proxy.java
similarity index 93%
rename from frontend/src/saccubus/converter/profile/Proxy.java
rename to frontend/src/saccubus/converter/classic/profile/Proxy.java
index 443cf4f..9472ce9 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Proxy.java
+++ b/frontend/src/saccubus/converter/classic/profile/Proxy.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 import org.apache.commons.lang.StringUtils;
 

diff --git a/frontend/src/saccubus/converter/profile/SFile.java b/frontend/src/saccubus/converter/classic/profile/SFile.java
similarity index 96%
rename from frontend/src/saccubus/converter/profile/SFile.java
rename to frontend/src/saccubus/converter/classic/profile/SFile.java
index e1b019a..25b4c77 100644 (file)
--- a/frontend/src/saccubus/converter/profile/SFile.java
+++ b/frontend/src/saccubus/converter/classic/profile/SFile.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/saccubus/converter/profile/User.java b/frontend/src/saccubus/converter/classic/profile/User.java
similarity index 90%
rename from frontend/src/saccubus/converter/profile/User.java
rename to frontend/src/saccubus/converter/classic/profile/User.java
index 3e19b1b..2297540 100644 (file)
--- a/frontend/src/saccubus/converter/profile/User.java
+++ b/frontend/src/saccubus/converter/classic/profile/User.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.profile;
+package saccubus.converter.classic.profile;
 
 /**
  * ニコニコ動画ユーザ設定.

diff --git a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
index 3543d81..3c92cb6 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
@@ -6,7 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import org.apache.commons.io.FilenameUtils;
 import saccubus.ConvertStopFlag;
-import saccubus.converter.profile.InputFileSetting;
+import saccubus.converter.classic.profile.InputFileSetting;
 import saccubus.net.TextProgressListener;
 
 /**

diff --git a/frontend/src/saccubus/converter/filegetter/LoginInfo.java b/frontend/src/saccubus/converter/filegetter/LoginInfo.java
index 53c8f75..ca65565 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/LoginInfo.java
+++ b/frontend/src/saccubus/converter/filegetter/LoginInfo.java
@@ -4,7 +4,7 @@
  */
 package saccubus.converter.filegetter;
 
-import saccubus.converter.profile.Proxy;
+import saccubus.converter.classic.profile.Proxy;
 
 /**
  *

diff --git a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
index a2cd758..4cd4dfe 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
@@ -4,7 +4,7 @@ package saccubus.converter.filegetter;
 import java.io.IOException;
 import java.text.Normalizer;
 import saccubus.ConvertStopFlag;
-import saccubus.converter.profile.Proxy;
+import saccubus.converter.classic.profile.Proxy;
 import saccubus.net.NicoClient;
 import saccubus.net.VideoInfo;
 

diff --git a/frontend/src/saccubus/converter/profile/Profile.java b/frontend/src/saccubus/converter/profile/Profile.java
index 9e52571..a2507cb 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Profile.java
+++ b/frontend/src/saccubus/converter/profile/Profile.java
@@ -1,85 +1,39 @@
-/* $Id$ */
 package saccubus.converter.profile;
 
+import saccubus.converter.classic.profile.CommentGetInfo;
+import saccubus.converter.classic.profile.Ffmpeg;
+import saccubus.converter.classic.profile.GeneralSetting;
+import saccubus.converter.classic.profile.InputFileSetting;
+import saccubus.converter.classic.profile.OutputFileSetting;
 import saccubus.converter.filegetter.LoginInfo;
 
 /**
- * Converterに処理させるための設定.
+ *
  * @author yuki
  */
-public class Profile {
+public interface Profile {
 
-    private final GeneralSetting generalSetting;
-    private final LoginInfo loginInfo;
-    private final InputFileSetting videoSetting;
-    private final InputFileSetting commentSetting;
-    private final CommentGetInfo commentGetInfo;
-    private final InputFileSetting tcommentSetting;
-    private final OutputFileSetting outputFileSetting;
-    private final Ffmpeg ffmpeg;
-
-    public Profile(
-            GeneralSetting generalSetting,
-            LoginInfo loginInfo,
-            InputFileSetting videoSetting,
-            InputFileSetting commentSetting,
-            CommentGetInfo commentGetInfo,
-            InputFileSetting tcommentSetting,
-            OutputFileSetting outputFileSetting,
-            Ffmpeg ffmpeg) {
-        this.generalSetting = generalSetting;
-        this.loginInfo = loginInfo;
-        this.videoSetting = videoSetting;
-        this.commentSetting = commentSetting;
-        this.commentGetInfo = commentGetInfo;
-        this.tcommentSetting = tcommentSetting;
-        this.outputFileSetting = outputFileSetting;
-        this.ffmpeg = ffmpeg;
-    }
-
-    public LoginInfo getLoginInfo() {
-        return loginInfo;
-    }
+    LoginInfo getLoginInfo();
 
     /** @return 何か実行すべき処理があればtrue. */
-    public boolean shouldRun() {
-        return getOutputFileSetting().isConvert() || needsDownload();
-    }
+    boolean shouldRun();
 
     /** @return 何かダウンロードするものがあればtrue. */
-    public boolean needsDownload() {
-        return (videoSetting.isDownload() || commentSetting.isDownload() || tcommentSetting.isDownload());
-    }
+    boolean needsDownload();
 
-    public InputFileSetting getVideoSetting() {
-        return videoSetting;
-    }
+    InputFileSetting getVideoSetting();
 
-    public InputFileSetting getCommentSetting() {
-        return commentSetting;
-    }
+    InputFileSetting getCommentSetting();
 
-    public InputFileSetting getTcommentSetting() {
-        return tcommentSetting;
-    }
+    InputFileSetting getTcommentSetting();
 
-    public OutputFileSetting getOutputFileSetting() {
-        return outputFileSetting;
-    }
+    OutputFileSetting getOutputFileSetting();
 
-    public CommentGetInfo getCommentGetInfo() {
-        return commentGetInfo;
-    }
+    CommentGetInfo getCommentGetInfo();
 
-    public boolean needsConvert() {
-        return getOutputFileSetting().isConvert();
-    }
+    public boolean needsConvert();
 
-    public Ffmpeg getFfmpeg() {
-        return ffmpeg;
-    }
+    public Ffmpeg getFfmpeg();
 
-    public GeneralSetting getGeneralSetting() {
-        return generalSetting;
-    }
+    public GeneralSetting getGeneralSetting();
 }

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 433c769..254ab1d 100644 (file)
--- a/frontend/src/saccubus/prompt/Prompt.java
+++ b/frontend/src/saccubus/prompt/Prompt.java
@@ -17,14 +17,14 @@ import saccubus.ConvertStopFlag;
 import saccubus.ConvertStopFlag.State;
 import saccubus.converter.Converter;
 import saccubus.converter.filegetter.LoginInfo;
-import saccubus.converter.profile.CommentGetInfo;
-import saccubus.converter.profile.Ffmpeg;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.GeneralSetting;
-import saccubus.converter.profile.InputFileSetting;
-import saccubus.converter.profile.OutputFileSetting;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.SFile;
+import saccubus.converter.classic.profile.CommentGetInfo;
+import saccubus.converter.classic.profile.Ffmpeg;
+import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.converter.classic.profile.GeneralSetting;
+import saccubus.converter.classic.profile.InputFileSetting;
+import saccubus.converter.classic.profile.OutputFileSetting;
+import saccubus.converter.classic.profile.Profile;
+import saccubus.converter.classic.profile.SFile;
 import saccubus.properties.SProperties;
 import saccubus.net.TextProgressListener;
 
@@ -32,19 +32,19 @@ import saccubus.net.TextProgressListener;
  * <p>
  * タイトル: さきゅばす
  * </p>
- * 
+ *
  * <p>
  * 説明: ニコニコ動画の動画をコメントつきで保存
  * </p>
- * 
+ *
  * <p>
  * 著作権: Copyright (c) 2007 PSI
  * </p>
- * 
+ *
  * <p>
  * 会社名:
  * </p>
- * 
+ *
  * @author 未入力
  * @version 1.0
  */

diff --git a/frontend/src/saccubus/properties/BasicSetting.java b/frontend/src/saccubus/properties/BasicSetting.java
index 9582d9f..c5728ed 100644 (file)
--- a/frontend/src/saccubus/properties/BasicSetting.java
+++ b/frontend/src/saccubus/properties/BasicSetting.java
@@ -3,7 +3,7 @@ package saccubus.properties;
 
 import java.io.File;
 import java.util.Properties;
-import saccubus.converter.profile.User;
+import saccubus.converter.classic.profile.User;
 
 /**
  * 基本設定.

diff --git a/frontend/src/saccubus/properties/ConvertSetting.java b/frontend/src/saccubus/properties/ConvertSetting.java
index 7b61f59..e8657ef 100644 (file)
--- a/frontend/src/saccubus/properties/ConvertSetting.java
+++ b/frontend/src/saccubus/properties/ConvertSetting.java
@@ -3,7 +3,7 @@ package saccubus.properties;
 
 import java.io.File;
 import java.util.Properties;
-import saccubus.converter.profile.NgSetting;
+import saccubus.converter.classic.profile.NgSetting;
 
 /**
  * 変換設定.

diff --git a/frontend/src/saccubus/properties/MovieSetting.java b/frontend/src/saccubus/properties/MovieSetting.java
index 8363e05..c14e658 100644 (file)
--- a/frontend/src/saccubus/properties/MovieSetting.java
+++ b/frontend/src/saccubus/properties/MovieSetting.java
@@ -3,7 +3,7 @@ package saccubus.properties;
 
 import java.io.File;
 import java.util.Properties;
-import saccubus.converter.profile.FfmpegOption;
+import saccubus.converter.classic.profile.FfmpegOption;
 
 /**
  * 動画設定.

diff --git a/frontend/src/saccubus/properties/SProperties.java b/frontend/src/saccubus/properties/SProperties.java
index 5d43a72..57da7eb 100644 (file)
--- a/frontend/src/saccubus/properties/SProperties.java
+++ b/frontend/src/saccubus/properties/SProperties.java
@@ -7,33 +7,33 @@ import java.io.FileOutputStream;
 import java.io.FileInputStream;
 import saccubus.VideoSaveKind;
 import saccubus.converter.filegetter.LoginInfo;
-import saccubus.converter.profile.CommentGetInfo;
-import saccubus.converter.profile.Ffmpeg;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.GeneralSetting;
-import saccubus.converter.profile.InputFileSetting;
-import saccubus.converter.profile.OutputFileSetting;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.Proxy;
-import saccubus.converter.profile.SFile;
+import saccubus.converter.classic.profile.CommentGetInfo;
+import saccubus.converter.classic.profile.Ffmpeg;
+import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.converter.classic.profile.GeneralSetting;
+import saccubus.converter.classic.profile.InputFileSetting;
+import saccubus.converter.classic.profile.OutputFileSetting;
+import saccubus.converter.classic.profile.Profile;
+import saccubus.converter.classic.profile.Proxy;
+import saccubus.converter.classic.profile.SFile;
 
 /**
  * <p>
  * タイトル: さきゅばす
  * </p>
- * 
+ *
  * <p>
  * 説明: ニコニコ動画の動画をコメントつきで保存
  * </p>
- * 
+ *
  * <p>
  * 著作権: Copyright (c) 2007 PSI
  * </p>
- * 
+ *
  * <p>
  * 会社名:
  * </p>
- * 
+ *
  * @author 未入力
  * @version 1.0
  */