From fd2f01eb94ff9caab910dbf8d020226643e41a58 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Mon, 26 Dec 2016 15:36:49 -0500 Subject: [PATCH] Cfg: Remove other old cfg classes --- 400_xowa/src/gplx/xowa/Xowe_wiki.java | 2 +- .../src/gplx/xowa/apps/apis/Xoapi_doc.java | 178 ------------------ .../xowa/apps/apis/xowa/gui/Xoapi_font.java | 2 +- .../apps/cfgs/{gui => }/Xocfg_gui_mgr.java | 2 +- .../xowa/apps/cfgs/{gui => }/Xocfg_win.java | 2 +- 400_xowa/src/gplx/xowa/guis/Xoa_gui_mgr.java | 2 +- .../xowa/guis/views/Xog_launcher_tabs.java | 2 +- .../xowa/guis/views/Xog_startup_tabs_.java | 3 +- 400_xowa/src/gplx/xowa/users/Xou_cfg.java | 31 --- 400_xowa/src/gplx/xowa/users/Xou_log_mgr.java | 29 --- .../src/gplx/xowa/users/Xou_user_mgr.java | 8 +- .../src/gplx/xowa/users/Xou_user_tst.java | 14 +- .../src/gplx/xowa/users/Xouc_pages_mgr.java | 28 --- 400_xowa/src/gplx/xowa/users/Xoue_user.java | 5 +- .../src/gplx/xowa/users/Xouv_cfg_keys.java | 24 --- 15 files changed, 14 insertions(+), 318 deletions(-) delete mode 100644 400_xowa/src/gplx/xowa/apps/apis/Xoapi_doc.java rename 400_xowa/src/gplx/xowa/apps/cfgs/{gui => }/Xocfg_gui_mgr.java (89%) rename 400_xowa/src/gplx/xowa/apps/cfgs/{gui => }/Xocfg_win.java (91%) delete mode 100644 400_xowa/src/gplx/xowa/users/Xou_cfg.java delete mode 100644 400_xowa/src/gplx/xowa/users/Xou_log_mgr.java delete mode 100644 400_xowa/src/gplx/xowa/users/Xouc_pages_mgr.java delete mode 100644 400_xowa/src/gplx/xowa/users/Xouv_cfg_keys.java diff --git a/400_xowa/src/gplx/xowa/Xowe_wiki.java b/400_xowa/src/gplx/xowa/Xowe_wiki.java index 9c1b05a2f..6356c08c8 100644 --- a/400_xowa/src/gplx/xowa/Xowe_wiki.java +++ b/400_xowa/src/gplx/xowa/Xowe_wiki.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ package gplx.xowa; import gplx.*; import gplx.core.brys.*; import gplx.core.primitives.*; import gplx.core.brys.fmtrs.*; import gplx.core.ios.*; -import gplx.xowa.apps.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.apps.cfgs.*; import gplx.xowa.apps.cfgs.gui.*; import gplx.xowa.apps.urls.*; +import gplx.xowa.apps.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.apps.cfgs.*; import gplx.xowa.apps.urls.*; import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.cases.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.pages.*; import gplx.xowa.wikis.metas.*; import gplx.xowa.wikis.data.site_stats.*; import gplx.xowa.wikis.ttls.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.wikis.caches.*; import gplx.xowa.users.*; import gplx.xowa.htmls.*; import gplx.xowa.users.history.*; import gplx.xowa.specials.*; import gplx.xowa.xtns.*; import gplx.xowa.wikis.dbs.*; diff --git a/400_xowa/src/gplx/xowa/apps/apis/Xoapi_doc.java b/400_xowa/src/gplx/xowa/apps/apis/Xoapi_doc.java deleted file mode 100644 index 42afd71d9..000000000 --- a/400_xowa/src/gplx/xowa/apps/apis/Xoapi_doc.java +++ /dev/null @@ -1,178 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012 gnosygnu@gmail.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -package gplx.xowa.apps.apis; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; -class Xoapi_doc {} -/* -xowa { - app { - exit(); - env { - version_previous; - } - fsys { - plat_jar; - plat_url(); - } - startup { - tabs { - type; // [blank,xowa,custom,previous] - previous; - custom; - custom_is_expr; - } - } - } - nav { - go_bwd(); - go_fwd(); - goto(); - wiki { - main_page(); - random(); - sandbox(); - } - } - gui { - browser { - url { - focus(); - exec_by_paste(); - exec_new_tab_by_paste(); - restore(); - exec(); - } - search { - focus(); - exec(); - } - tabs { - new_dflt__at_dflt__focus_y(); - new_link__at_dflt__focus_n(); - new_link__at_dflt__focus_y(); - new_href__at_dflt__focus_y(); - new_dupe__at_dflt__focus_y(); - close_cur(); - select_bwd(); - select_fwd(); - move_bwd(); - move_fwd(); - close_others(); - close_to_bgn(); - close_to_end(); - close_undo(); - pin_toggle(); - select_by_idx_1(); - select_by_idx_2(); - select_by_idx_3(); - select_by_idx_4(); - select_by_idx_5(); - select_by_idx_6(); - select_by_idx_7(); - select_by_idx_8(); - select_by_idx_9(); - } - html { - focus(); - selection_focus_toggle(); - load_tid; // [mem,url] - } - find { - show(); - show_by_paste(); - hide(); - exec(); - type(); - find_bwd(); - find_fwd(); - case_toggle(); - wrap_toggle(); - } - prog { - focus(); - show_short_link; - } - info { - focus(); - clear(); - launch(); - warn_enabled; - note_enabled; - } - prog_log { - show(); - } - } - font { - increase(); - decrease(); - reset(); - } - page { - edit { - copy(); - select_all(); - save(); - save_draft(); - preview(); - focus_edit_box(); - dbg_tmpl(); - dbg_html(); - exec(); - } - selection { - copy(); - select_all(); - save_file_as(); - } - view { - mode_read(); - mode_edit(); - mode_html(); - reload(); - refresh(); - print(); - save_as(); - } - } - } - html { - } - net { - } - usr { - } - special { - } - xtns { - } - bldr { - wikis { - filters { - dansguardians { - } - } - imports { - one_file = 'y'; - schema_is_1 = 'y'; - text_zip_tid = '.gz'; - html_zip_tid = '.gz'; - } - } - } -} -*/ diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java index f77fdf2ae..4c0cf5b37 100644 --- a/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java +++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/gui/Xoapi_font.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ package gplx.xowa.apps.apis.xowa.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.xowa.apps.apis.*; import gplx.xowa.apps.apis.xowa.*; -import gplx.xowa.apps.cfgs.gui.*; import gplx.xowa.htmls.*; +import gplx.xowa.apps.cfgs.*; import gplx.xowa.htmls.*; public class Xoapi_font implements Gfo_invk { private Xoae_app app; public void Init_by_kit(Xoae_app app) { diff --git a/400_xowa/src/gplx/xowa/apps/cfgs/gui/Xocfg_gui_mgr.java b/400_xowa/src/gplx/xowa/apps/cfgs/Xocfg_gui_mgr.java similarity index 89% rename from 400_xowa/src/gplx/xowa/apps/cfgs/gui/Xocfg_gui_mgr.java rename to 400_xowa/src/gplx/xowa/apps/cfgs/Xocfg_gui_mgr.java index a938f6f87..1f2d2daa5 100644 --- a/400_xowa/src/gplx/xowa/apps/cfgs/gui/Xocfg_gui_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/cfgs/Xocfg_gui_mgr.java @@ -15,7 +15,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.apps.cfgs.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.xowa.apps.cfgs.*; +package gplx.xowa.apps.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; public class Xocfg_gui_mgr implements Gfo_invk { public void Init_by_app(Xoae_app app) { win_cfg.Init_by_app(app); diff --git a/400_xowa/src/gplx/xowa/apps/cfgs/gui/Xocfg_win.java b/400_xowa/src/gplx/xowa/apps/cfgs/Xocfg_win.java similarity index 91% rename from 400_xowa/src/gplx/xowa/apps/cfgs/gui/Xocfg_win.java rename to 400_xowa/src/gplx/xowa/apps/cfgs/Xocfg_win.java index 1c46119d2..f4ffb3f43 100644 --- a/400_xowa/src/gplx/xowa/apps/cfgs/gui/Xocfg_win.java +++ b/400_xowa/src/gplx/xowa/apps/cfgs/Xocfg_win.java @@ -15,7 +15,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.apps.cfgs.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.xowa.apps.cfgs.*; +package gplx.xowa.apps.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.core.brys.fmtrs.*; import gplx.gfui.draws.*; import gplx.xowa.guis.langs.*; diff --git a/400_xowa/src/gplx/xowa/guis/Xoa_gui_mgr.java b/400_xowa/src/gplx/xowa/guis/Xoa_gui_mgr.java index d6e0df9a8..24e0524be 100644 --- a/400_xowa/src/gplx/xowa/guis/Xoa_gui_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/Xoa_gui_mgr.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.xowa.guis; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.core.envs.*; import gplx.gfui.*; import gplx.gfui.ipts.*; import gplx.gfui.kits.core.*; import gplx.gfui.controls.windows.*; import gplx.gfui.controls.standards.*; -import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.guis.menus.*; import gplx.xowa.guis.cmds.*; import gplx.xowa.apps.cfgs.gui.*; import gplx.xowa.users.*; +import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.guis.menus.*; import gplx.xowa.guis.cmds.*; import gplx.xowa.apps.cfgs.*; import gplx.xowa.users.*; import gplx.xowa.langs.*; import gplx.xowa.guis.bnds.*; import gplx.xowa.guis.views.*; import gplx.xowa.guis.urls.url_macros.*; import gplx.xowa.addons.wikis.searchs.gui.htmlbars.*; import gplx.xowa.guis.views.boots.*; diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_launcher_tabs.java b/400_xowa/src/gplx/xowa/guis/views/Xog_launcher_tabs.java index 5ebbcbad7..0b39d1f3d 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_launcher_tabs.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_launcher_tabs.java @@ -53,7 +53,7 @@ class Xog_launcher_tabs { } private void Restore_tab_failover(Xoae_app app, Xowe_wiki home_wiki, Xog_win_itm win) { try { - Launch_tab(win, home_wiki, gplx.xowa.users.Xouc_pages_mgr.Page_xowa); + Launch_tab(win, home_wiki, Xog_startup_tabs_.Page_xowa); } catch (Exception e) { app.Usr_dlg().Warn_many("", "", "failed to launch failover tab: err=~{0}", Err_.Message_gplx_full(e)); diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java b/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java index 5e28d4955..0fa739a22 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_startup_tabs_.java @@ -43,10 +43,11 @@ public class Xog_startup_tabs_ { } } } + public static final String Page_xowa = "home/wiki/Main_Page"; public static String[] Calc_startup_strs(Xoae_app app) { List_adp rv = List_adp_.New(); Xocfg_mgr cfg = app.Cfg(); - String xowa_home = gplx.xowa.users.Xouc_pages_mgr.Page_xowa; + String xowa_home = Page_xowa; String type = cfg.Get_str_app_or(Cfg__tabs_type, Opt__tabs_type__previous); if (Manual == null) { if (String_.Eq(type, "blank")) {rv.Add(gplx.xowa.specials.Xow_special_meta_.Itm__default_tab.Ttl_str());} diff --git a/400_xowa/src/gplx/xowa/users/Xou_cfg.java b/400_xowa/src/gplx/xowa/users/Xou_cfg.java deleted file mode 100644 index 362388666..000000000 --- a/400_xowa/src/gplx/xowa/users/Xou_cfg.java +++ /dev/null @@ -1,31 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012 gnosygnu@gmail.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -package gplx.xowa.users; import gplx.*; import gplx.xowa.*; -public class Xou_cfg implements Gfo_invk { - public Xou_cfg(Xoue_user user) { - pages_mgr = new Xouc_pages_mgr(this); - } - public Xouc_pages_mgr Pages_mgr() {return pages_mgr;} private Xouc_pages_mgr pages_mgr; - public Xou_log_mgr Log_mgr() {return log_mgr;} private final Xou_log_mgr log_mgr = new Xou_log_mgr(); - public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk_pages)) return pages_mgr; - else if (ctx.Match(k, Invk_log)) return log_mgr; - return this; - } - public static final String Invk_pages = "pages", Invk_log = "log"; -} diff --git a/400_xowa/src/gplx/xowa/users/Xou_log_mgr.java b/400_xowa/src/gplx/xowa/users/Xou_log_mgr.java deleted file mode 100644 index 0519f091b..000000000 --- a/400_xowa/src/gplx/xowa/users/Xou_log_mgr.java +++ /dev/null @@ -1,29 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012 gnosygnu@gmail.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -package gplx.xowa.users; import gplx.*; import gplx.xowa.*; -public class Xou_log_mgr implements Gfo_invk { - public boolean Log_redlinks() {return log_redlinks;} private boolean log_redlinks; - public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk_log_redlinks)) return Yn.To_str(log_redlinks); - else if (ctx.Match(k, Invk_log_redlinks_)) log_redlinks = m.ReadYn("v"); - return this; - } - public static final String - Invk_log_redlinks = "log_redlinks", Invk_log_redlinks_ = "log_redlinks_" - ; -} diff --git a/400_xowa/src/gplx/xowa/users/Xou_user_mgr.java b/400_xowa/src/gplx/xowa/users/Xou_user_mgr.java index a49bb335e..768e0680a 100644 --- a/400_xowa/src/gplx/xowa/users/Xou_user_mgr.java +++ b/400_xowa/src/gplx/xowa/users/Xou_user_mgr.java @@ -17,10 +17,11 @@ along with this program. If not, see . */ package gplx.xowa.users; import gplx.*; import gplx.xowa.*; public class Xou_user_mgr implements Gfo_invk { - public Xou_user_mgr(Xoae_app app, Xoue_user user) {this.app = app; this.Add(user);} private Xoae_app app; + private final Ordered_hash regy = Ordered_hash_.New(); + private final Xoae_app app; + public Xou_user_mgr(Xoae_app app, Xoue_user user) {this.app = app; this.Add(user);} public void Add(Xoue_user itm) {regy.Add(itm.Key(), itm);} - Xoue_user GetByKey(String key) {return (Xoue_user)regy.Get_by(key);} - Ordered_hash regy = Ordered_hash_.New(); + private Xoue_user GetByKey(String key) {return (Xoue_user)regy.Get_by(key);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_get)) { @@ -33,6 +34,5 @@ public class Xou_user_mgr implements Gfo_invk { return user; } else return Gfo_invk_.Rv_unhandled; -// return this; } private static final String Invk_get = "get"; } diff --git a/400_xowa/src/gplx/xowa/users/Xou_user_tst.java b/400_xowa/src/gplx/xowa/users/Xou_user_tst.java index 8797aa291..17750c1bf 100644 --- a/400_xowa/src/gplx/xowa/users/Xou_user_tst.java +++ b/400_xowa/src/gplx/xowa/users/Xou_user_tst.java @@ -18,16 +18,7 @@ along with this program. If not, see . package gplx.xowa.users; import gplx.*; import gplx.xowa.*; import org.junit.*; import gplx.xowa.wikis.xwikis.*; public class Xou_user_tst { - private Xou_user_fxt fxt = new Xou_user_fxt(); - @Test public void Run() { - Io_url user_system_cfg_url = Io_url_.mem_fil_("mem/xowa/user/test_user/app/data/cfg/user_system_cfg.gfs"); - fxt.Test_fil(user_system_cfg_url, ""); // check that it is blank - fxt.App().Init_by_app(); // run Init_by_app - fxt.Test_fil(user_system_cfg_url, Xou_user_.User_system_cfg_text); // check that it is created - Io_mgr.Instance.SaveFilStr(user_system_cfg_url, ""); // simulate edit by blanking out file - fxt.App().Init_by_app(); // run Init_by_app again - fxt.Test_fil(user_system_cfg_url, ""); // check that it is still blank - } + private final Xou_user_fxt fxt = new Xou_user_fxt(); @Test public void Available_from_fsys() { Io_mgr.Instance.CreateDir(fxt.App().Fsys_mgr().Wiki_dir().GenSubDir("en.wikipedia.org")); fxt.App().Usere().Available_from_fsys(); @@ -40,9 +31,6 @@ public class Xou_user_tst { class Xou_user_fxt { public Xoae_app App() {return app;} private Xoae_app app = Xoa_app_fxt.Make__app__edit(); public String Make_xwiki(boolean offline, String name) {return String_.Concat_with_str("|", Yn.To_str(offline), name);} - public void Test_fil(Io_url url, String expd) { - Tfds.Eq_str_lines(expd, Io_mgr.Instance.LoadFilStr(url)); - } public void Test_xwikis(String... expd) { Xow_xwiki_mgr xwiki_mgr = app.Usere().Wiki().Xwiki_mgr(); int len = xwiki_mgr.Len(); diff --git a/400_xowa/src/gplx/xowa/users/Xouc_pages_mgr.java b/400_xowa/src/gplx/xowa/users/Xouc_pages_mgr.java deleted file mode 100644 index 2e9665c49..000000000 --- a/400_xowa/src/gplx/xowa/users/Xouc_pages_mgr.java +++ /dev/null @@ -1,28 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012 gnosygnu@gmail.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -package gplx.xowa.users; import gplx.*; import gplx.xowa.*; -public class Xouc_pages_mgr implements Gfo_invk { - public Xouc_pages_mgr(Xou_cfg config) {} - public String Home() {return home;} public Xouc_pages_mgr Home_(String v) {home = v; return this;} private String home = Page_xowa; - public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk_home)) return home; - else if (ctx.Match(k, Invk_home_)) home = m.ReadStr("v"); - return this; - } public static final String Invk_home = "home", Invk_home_ = "home_"; - public static final String Page_xowa = "home/wiki/Main_Page"; -} diff --git a/400_xowa/src/gplx/xowa/users/Xoue_user.java b/400_xowa/src/gplx/xowa/users/Xoue_user.java index 94dbfe73c..f2d7e49e9 100644 --- a/400_xowa/src/gplx/xowa/users/Xoue_user.java +++ b/400_xowa/src/gplx/xowa/users/Xoue_user.java @@ -28,7 +28,6 @@ public class Xoue_user implements Xou_user, Gfo_evt_mgr_owner, Gfo_invk { this.ev_mgr = new Gfo_evt_mgr(this); this.fsys_mgr = new Xou_fsys_mgr(user_dir); this.user_db_mgr = new Xou_db_mgr(app); - this.cfg_mgr = new Xou_cfg(this); this.history_mgr = new Xou_history_mgr(fsys_mgr.App_data_history_fil()); } public Gfo_evt_mgr Evt_mgr() {return ev_mgr;} private final Gfo_evt_mgr ev_mgr; @@ -47,7 +46,6 @@ public class Xoue_user implements Xou_user, Gfo_evt_mgr_owner, Gfo_invk { public Xou_fsys_mgr Fsys_mgr() {return fsys_mgr;} private Xou_fsys_mgr fsys_mgr; public Xowe_wiki Wiki() {if (wiki == null) wiki = Xou_user_.new_or_create_(this, app); return wiki;} private Xowe_wiki wiki; public Xou_history_mgr History_mgr() {return history_mgr;} private Xou_history_mgr history_mgr; - public Xou_cfg Cfg_mgr() {return cfg_mgr;} private Xou_cfg cfg_mgr; public Xow_msg_mgr Msg_mgr() { if (msg_mgr == null) msg_mgr = new Xow_msg_mgr(this.Wiki(), this.Lang()); // NOTE: must call this.Lang() not this.lang, else nullRef exception when using "app.shell.fetch_page"; DATE:2013-04-12 @@ -87,13 +85,12 @@ public class Xoue_user implements Xou_user, Gfo_evt_mgr_owner, Gfo_invk { else if (ctx.Match(k, Invk_wiki)) return this.Wiki(); // NOTE: mass parse relies on this being this.Wiki(), not wiki else if (ctx.Match(k, Invk_history)) return history_mgr; else if (ctx.Match(k, Invk_fsys)) return fsys_mgr; - else if (ctx.Match(k, Invk_cfg)) return cfg_mgr; else if (ctx.Match(k, "name")) return key; //throw Err_.new_unhandled(k); // OBSOLETE: used to return key else return Gfo_invk_.Rv_unhandled; return this; } public static final String Invk_available_from_fsys = "available_from_fsys", Invk_available_from_bulk = "available_from_bulk", Invk_bookmarks_add_fmt_ = "bookmarks_add_fmt_" - , Invk_wiki = "wiki", Invk_history = "history", Invk_fsys = "fsys", Invk_lang = "lang", Invk_msgs = "msgs", Invk_cfg = "cfg"; + , Invk_wiki = "wiki", Invk_history = "history", Invk_fsys = "fsys", Invk_lang = "lang", Invk_msgs = "msgs"; public static final String Key_xowa_user = "anonymous"; public static final String Evt_lang_changed = "lang_changed"; public void Available_from_fsys() { diff --git a/400_xowa/src/gplx/xowa/users/Xouv_cfg_keys.java b/400_xowa/src/gplx/xowa/users/Xouv_cfg_keys.java deleted file mode 100644 index 68d3ee3f2..000000000 --- a/400_xowa/src/gplx/xowa/users/Xouv_cfg_keys.java +++ /dev/null @@ -1,24 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012 gnosygnu@gmail.com - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU Affero General Public License as -published by the Free Software Foundation, either version 3 of the -License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Affero General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program. If not, see . -*/ -package gplx.xowa.users; import gplx.*; import gplx.xowa.*; -public class Xouv_cfg_keys { - public static final String - Key_history_stack = "xowa.gui.history_stack" - , Key_history_idx = "xowa.gui.history.idx" - ; -}