mainエントリのパッケージを変更。

[jindolf/Jindolf.git] / src / main / java / jp / sfjp / jindolf / view / HelpFrame.java

diff --git a/src/main/java/jp/sourceforge/jindolf/HelpFrame.java b/src/main/java/jp/sfjp/jindolf/view/HelpFrame.java
similarity index 81%
rename from src/main/java/jp/sourceforge/jindolf/HelpFrame.java
rename to src/main/java/jp/sfjp/jindolf/view/HelpFrame.java
index 772a0e8..8cfeb06 100644 (file)
--- a/src/main/java/jp/sourceforge/jindolf/HelpFrame.java
+++ b/src/main/java/jp/sfjp/jindolf/view/HelpFrame.java
@@ -5,7 +5,7 @@
  * Copyright(c) 2008 olyutorskii
  */
 
-package jp.sourceforge.jindolf;
+package jp.sfjp.jindolf.view;
 
 import java.awt.Container;
 import java.awt.GridBagConstraints;
@@ -28,6 +28,13 @@ import javax.swing.JTextArea;
 import javax.swing.border.Border;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
+import jp.sfjp.jindolf.ResourceManager;
+import jp.sfjp.jindolf.config.ConfigStore;
+import jp.sfjp.jindolf.config.EnvInfo;
+import jp.sfjp.jindolf.config.OptionInfo;
+import jp.sfjp.jindolf.dxchg.TextPopup;
+import jp.sfjp.jindolf.log.LogWrapper;
+import jp.sfjp.jindolf.util.GUIUtils;
 
 /**
  * ヘルプ画面。
@@ -38,6 +45,9 @@ public class HelpFrame extends JFrame
 
     private static final String HELP_HTML = "resources/html/help.html";
 
+    private static final LogWrapper LOGGER = new LogWrapper();
+
+
     private final JTabbedPane tabPanel = new JTabbedPane();
     private final JEditorPane htmlView = new JEditorPane();
     private final JTextArea vmInfo = new JTextArea();
@@ -45,9 +55,12 @@ public class HelpFrame extends JFrame
 
     /**
      * コンストラクタ。
+     * @param optinfo コマンドラインオプション
+     * @param configStore 設定ディレクトリ情報
      */
-    public HelpFrame(){
-        super(Jindolf.TITLE + " ヘルプ");
+    @SuppressWarnings("LeakingThisInConstructor")
+    public HelpFrame(OptionInfo optinfo, ConfigStore configStore){
+        super();
 
         GUIUtils.modifyWindowAttributes(this, true, false, true);
 
@@ -76,15 +89,22 @@ public class HelpFrame extends JFrame
             }
         });
 
-        URL topUrl = Jindolf.getResource(HELP_HTML);
+        URL topUrl = ResourceManager.getResource(HELP_HTML);
         loadURL(topUrl);
 
         StringBuilder info = new StringBuilder();
+
+        info.append("起動時引数:\n");
+        for(String arg : optinfo.getInvokeArgList()){
+            info.append("\u0020\u0020").append(arg).append('\n');
+        }
+        info.append('\n');
+
         info.append(EnvInfo.getVMInfo());
-        AppSetting setting = Jindolf.getAppSetting();
-        if(setting.useConfigPath()){
-            info.append("設定格納ディレクトリ : "
-                    + setting.getConfigPath().getPath() );
+
+        if(configStore.useStoreFile()){
+            info.append("設定格納ディレクトリ : ")
+                .append(configStore.getConfigPath().getPath());
         }else{
             info.append("※ 設定格納ディレクトリは使っていません。");
         }
@@ -146,7 +166,7 @@ public class HelpFrame extends JFrame
         try{
             this.htmlView.setPage(url);
         }catch(IOException e){
-            Jindolf.logger().warn("ヘルプファイルが読み込めません", e);
+            LOGGER.warn("ヘルプファイルが読み込めません", e);
             assert false;
         }