diff --git a/plugin.xml b/plugin.xml index 0c61ef388..692a324e4 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,6 +1,5 @@ - @@ -84,6 +83,12 @@ + + + + diff --git a/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java b/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java index d19e97d59..40b4761fc 100644 --- a/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java +++ b/src/main/java/org/codelibs/fess/app/service/SeunjeonService.java @@ -27,8 +27,6 @@ import org.codelibs.fess.dict.DictionaryFile.PagingList; import org.codelibs.fess.dict.DictionaryManager; import org.codelibs.fess.dict.seunjeon.SeunjeonFile; import org.codelibs.fess.dict.seunjeon.SeunjeonItem; -import org.codelibs.fess.dict.synonym.SynonymFile; -import org.codelibs.fess.dict.synonym.SynonymItem; import org.dbflute.optional.OptionalEntity; public class SeunjeonService { diff --git a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonCreator.java b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonCreator.java index 05dc4c59d..9dc1e7d00 100644 --- a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonCreator.java +++ b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonCreator.java @@ -1,3 +1,18 @@ +/* + * Copyright 2012-2016 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package org.codelibs.fess.dict.seunjeon; import java.util.Date; diff --git a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java index a8ab4d1a2..dc75c4437 100644 --- a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java +++ b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonFile.java @@ -1,3 +1,18 @@ +/* + * Copyright 2012-2016 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package org.codelibs.fess.dict.seunjeon; import java.io.BufferedInputStream; diff --git a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonItem.java b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonItem.java index db482649c..44e177f07 100644 --- a/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonItem.java +++ b/src/main/java/org/codelibs/fess/dict/seunjeon/SeunjeonItem.java @@ -1,3 +1,18 @@ +/* + * Copyright 2012-2016 CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ package org.codelibs.fess.dict.seunjeon; import java.util.Arrays; diff --git a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java index 090cad4dd..8d6212c33 100644 --- a/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java +++ b/src/main/java/org/codelibs/fess/mylasta/action/FessHtmlPath.java @@ -92,6 +92,21 @@ public interface FessHtmlPath { /** The path of the HTML: /admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp */ HtmlNext path_AdminDictKuromoji_AdminDictKuromojiUploadJsp = new HtmlNext("/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp"); + /** The path of the HTML: /admin/dict/seunjeon/admin_dict_seunjeon.jsp */ + HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon.jsp"); + + /** The path of the HTML: /admin/dict/seunjeon/admin_dict_seunjeon_details.jsp */ + HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonDetailsJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_details.jsp"); + + /** The path of the HTML: /admin/dict/seunjeon/admin_dict_seunjeon_download.jsp */ + HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonDownloadJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_download.jsp"); + + /** The path of the HTML: /admin/dict/seunjeon/admin_dict_seunjeon_edit.jsp */ + HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonEditJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_edit.jsp"); + + /** The path of the HTML: /admin/dict/seunjeon/admin_dict_seunjeon_upload.jsp */ + HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonUploadJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_upload.jsp"); + /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym.jsp */ HtmlNext path_AdminDictSynonym_AdminDictSynonymJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym.jsp"); @@ -107,21 +122,6 @@ public interface FessHtmlPath { /** The path of the HTML: /admin/dict/synonym/admin_dict_synonym_upload.jsp */ HtmlNext path_AdminDictSynonym_AdminDictSynonymUploadJsp = new HtmlNext("/admin/dict/synonym/admin_dict_synonym_upload.jsp"); - /** The path of the HTML: /admin/dict/seunjeon/admin_dict_seunjeon.jsp */ - HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon.jsp"); - - /** The path of the HTML: /admin/dict/synonym/admin_dict_seunjeon_details.jsp */ - HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonDetailsJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_details.jsp"); - - /** The path of the HTML: /admin/dict/synonym/admin_dict_seunjeon_download.jsp */ - HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonDownloadJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_download.jsp"); - - /** The path of the HTML: /admin/dict/synonym/admin_dict_seunjeon_edit.jsp */ - HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonEditJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_edit.jsp"); - - /** The path of the HTML: /admin/dict/synonym/admin_dict_seunjeon_upload.jsp */ - HtmlNext path_AdminDictSeunjeon_AdminDictSeunjeonUploadJsp = new HtmlNext("/admin/dict/seunjeon/admin_dict_seunjeon_upload.jsp"); - /** The path of the HTML: /admin/duplicatehost/admin_duplicatehost.jsp */ HtmlNext path_AdminDuplicatehost_AdminDuplicatehostJsp = new HtmlNext("/admin/duplicatehost/admin_duplicatehost.jsp"); diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java index 7438a9648..8dd9387a5 100644 --- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java +++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java @@ -595,15 +595,15 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction /** The key of the configuration. e.g. synonym */ String ONLINE_HELP_NAME_DICT_SYNONYM = "online.help.name.dict.synonym"; - /** The key of the configuration. e.g. seunjeon */ - String ONLINE_HELP_NAME_DICT_SEUNJEON = "online.help.name.dict.seunjeon"; - /** The key of the configuration. e.g. dict */ String ONLINE_HELP_NAME_DICT = "online.help.name.dict"; /** The key of the configuration. e.g. kuromoji */ String ONLINE_HELP_NAME_DICT_KUROMOJI = "online.help.name.dict.kuromoji"; + /** The key of the configuration. e.g. seunjeon */ + String ONLINE_HELP_NAME_DICT_SEUNJEON = "online.help.name.dict.seunjeon"; + /** The key of the configuration. e.g. webconfig */ String ONLINE_HELP_NAME_WEBCONFIG = "online.help.name.webconfig"; @@ -2762,13 +2762,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ String getOnlineHelpNameDictSynonym(); - /** - * Get the value for the key 'online.help.name.dict.seunjeon'.
- * The value is, e.g. seunjeon
- * @return The value of found property. (NotNull: if not found, exception but basically no way) - */ - String getOnlineHelpNameDictSeunjeon(); - /** * Get the value for the key 'online.help.name.dict'.
* The value is, e.g. dict
@@ -2783,6 +2776,13 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction */ String getOnlineHelpNameDictKuromoji(); + /** + * Get the value for the key 'online.help.name.dict.seunjeon'.
+ * The value is, e.g. seunjeon
+ * @return The value of found property. (NotNull: if not found, exception but basically no way) + */ + String getOnlineHelpNameDictSeunjeon(); + /** * Get the value for the key 'online.help.name.webconfig'.
* The value is, e.g. webconfig
@@ -4576,10 +4576,6 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction return get(FessConfig.ONLINE_HELP_NAME_DICT_SYNONYM); } - public String getOnlineHelpNameDictSeunjeon() { - return get(FessConfig.ONLINE_HELP_NAME_DICT_SEUNJEON); - } - public String getOnlineHelpNameDict() { return get(FessConfig.ONLINE_HELP_NAME_DICT); } @@ -4588,6 +4584,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction return get(FessConfig.ONLINE_HELP_NAME_DICT_KUROMOJI); } + public String getOnlineHelpNameDictSeunjeon() { + return get(FessConfig.ONLINE_HELP_NAME_DICT_SEUNJEON); + } + public String getOnlineHelpNameWebconfig() { return get(FessConfig.ONLINE_HELP_NAME_WEBCONFIG); } diff --git a/src/main/resources/fess_dict.xml b/src/main/resources/fess_dict.xml index 64aea9227..f4ee4593f 100644 --- a/src/main/resources/fess_dict.xml +++ b/src/main/resources/fess_dict.xml @@ -9,7 +9,7 @@ kuromojiDictCreator - seunjeonCreator + seunjeonDictCreator synonymCreator