From 620cce318e2efecdba3d71a8b06dd768fe444c83 Mon Sep 17 00:00:00 2001
From: argius <argius.net@gmail.com>
Date: Sun, 8 Dec 2013 21:12:21 +0900
Subject: [PATCH] Fix #32534: change the parameter class for ResourceManager
 from WindowLauncher to Command in CommandProcessor

---
 src/net/argius/stew/Command.u8p           | 4 ++++
 src/net/argius/stew/CommandProcessor.java | 3 +--
 src/net/argius/stew/Command_ja.u8p        | 4 ++++
 src/net/argius/stew/messages.u8p          | 5 -----
 src/net/argius/stew/messages_ja.u8p       | 4 ----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/net/argius/stew/Command.u8p b/src/net/argius/stew/Command.u8p
index 61f6671..b41382c 100644
--- a/src/net/argius/stew/Command.u8p
+++ b/src/net/argius/stew/Command.u8p
@@ -10,6 +10,10 @@ e.file-already-exists=The file[{0}] already exists.
 e.failed-create-new-file=Failed to create the file[{0}].
 e.failed-mkdir-filedir=Failed to create dir of the file[{0}].
 
+usage.cd=<DIRECTORY>
+usage.-f=<FILE>
+usage.-s=<SCRIPT FILE> | .
+usage.unalias=<ALIAS>
 usage.Count=<table-name> [<WHERE-phrase>]
 usage.Download=<root-dir> SELECT <data-column> [, file-path...] FROM ... 
 usage.Export=<file> [ HEADER ] [command(select|find|report)] \n        * except "report -"
diff --git a/src/net/argius/stew/CommandProcessor.java b/src/net/argius/stew/CommandProcessor.java
index 9547df1..8130866 100644
--- a/src/net/argius/stew/CommandProcessor.java
+++ b/src/net/argius/stew/CommandProcessor.java
@@ -8,7 +8,6 @@ import javax.script.*;
 
 import net.argius.stew.io.*;
 import net.argius.stew.ui.*;
-import net.argius.stew.ui.window.*;
 
 /**
  * Command Processor.
@@ -16,7 +15,7 @@ import net.argius.stew.ui.window.*;
 final class CommandProcessor {
 
     private static Logger log = Logger.getLogger(CommandProcessor.class);
-    private static ResourceManager res = ResourceManager.getInstance(WindowLauncher.class);
+    private static ResourceManager res = ResourceManager.getInstance(Command.class);
     private static final String HYPHEN_E = "-e";
 
     private final Environment env;
diff --git a/src/net/argius/stew/Command_ja.u8p b/src/net/argius/stew/Command_ja.u8p
index 608c37c..932750a 100644
--- a/src/net/argius/stew/Command_ja.u8p
+++ b/src/net/argius/stew/Command_ja.u8p
@@ -10,6 +10,10 @@ e.file-already-exists=ファイル[{0}]が存在します。
 e.failed-create-new-file=ファイル[{0}]の作成に失敗しました。
 e.failed-mkdir-filedir=ファイル[{0}]のディレクトリ作成に失敗しました。
 
+usage.cd=<ディレクトリ>
+usage.-f=<ファイル>
+usage.-s=<スクリプトファイル> | .
+usage.unalias=<短縮名>
 usage.Count=<テーブル名> [<WHERE句>]
 usage.Download=<ルートディレクトリ> SELECT <ダウンロードするデータの列> [, ファイルパス...] FROM ... 
 usage.Export=<ファイル> [ HEADER ] [command(select|find|report)] \n        注: "report -"は不可
diff --git a/src/net/argius/stew/messages.u8p b/src/net/argius/stew/messages.u8p
index 504ab69..939112e 100644
--- a/src/net/argius/stew/messages.u8p
+++ b/src/net/argius/stew/messages.u8p
@@ -34,8 +34,3 @@ e.readonly=Error: Connector is read-only.
 e.runtime=Runtime Error: {0}
 e.unsupported=[{0}] is unsupported.
 e.usage=Usage: {0} {1}
-
-usage.cd=<DIRECTORY>
-usage.-f=<FILE>
-usage.-s=<SCRIPT FILE>
-usage.unalias=<ALIAS>
diff --git a/src/net/argius/stew/messages_ja.u8p b/src/net/argius/stew/messages_ja.u8p
index cb4d180..66023d5 100644
--- a/src/net/argius/stew/messages_ja.u8p
+++ b/src/net/argius/stew/messages_ja.u8p
@@ -33,7 +33,3 @@ e.readonly=エラー: コネクタは読取専用です。
 e.runtime=実行時エラー: {0}
 e.unsupported=[{0}]は実装されていません。
 e.usage=使い方: {0} {1}
-
-usage.cd=<ディレクトリ>
-usage.-f=<ファイル>
-usage.unalias=<短縮名>
-- 
2.11.0