diff --git a/100_core/src/gplx/Bry_split_.java b/100_core/src/gplx/Bry_split_.java index ac5f3da47..557674cfe 100644 --- a/100_core/src/gplx/Bry_split_.java +++ b/100_core/src/gplx/Bry_split_.java @@ -86,7 +86,7 @@ public class Bry_split_ { cur_pos = find_pos + dlm_len; if (cur_pos >= src_end) break; } - return (byte[][])rv.To_ary(byte[].class); + return (byte[][])rv.ToAry(byte[].class); } public static byte[][] Split_lines(byte[] src) { if (Bry_.Len_eq_0(src)) return Bry_.Ary_empty; @@ -112,7 +112,7 @@ public class Bry_split_ { if (last) break; src_pos = nxt_bgn; } - return (byte[][])rv.To_ary(byte[].class); + return (byte[][])rv.ToAry(byte[].class); } public static byte[][] Split_w_max(byte[] src, byte dlm, int max) { byte[][] rv = new byte[max][]; @@ -149,7 +149,7 @@ public class Bry_split_ { pos = end + 1; if (pos >= len) break; } - return (byte[][])list.To_ary_and_clear(byte[].class); + return (byte[][])list.ToAryAndClear(byte[].class); } @@ -166,7 +166,7 @@ class Bry_split_wkr__to_ary implements gplx.core.brys.Bry_split_wkr { } public byte[][] To_ary() { synchronized (list) { - return (byte[][])list.To_ary_and_clear(byte[].class); + return (byte[][])list.ToAryAndClear(byte[].class); } } public static final Bry_split_wkr__to_ary Instance = new Bry_split_wkr__to_ary(); Bry_split_wkr__to_ary() {} diff --git a/100_core/src/gplx/Bry_split__tst.java b/100_core/src/gplx/Bry_split__tst.java index 472ddbd03..40164b9e8 100644 --- a/100_core/src/gplx/Bry_split__tst.java +++ b/100_core/src/gplx/Bry_split__tst.java @@ -84,6 +84,6 @@ class Bry_split_wkr__example implements gplx.core.brys.Bry_split_wkr { return Bry_split_.Rv__ok; } public byte[][] To_ary() { - return (byte[][])list.To_ary_and_clear(byte[].class); + return (byte[][])list.ToAryAndClear(byte[].class); } } diff --git a/100_core/src/gplx/GfoMsg_.java b/100_core/src/gplx/GfoMsg_.java index 3edd7232c..7ba9ee523 100644 --- a/100_core/src/gplx/GfoMsg_.java +++ b/100_core/src/gplx/GfoMsg_.java @@ -14,7 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx; -import gplx.core.primitives.*; import gplx.core.strings.*; import gplx.core.brys.*; import gplx.core.interfaces.*; +import gplx.core.primitives.*; import gplx.core.strings.*; +import gplx.core.interfaces.*; public class GfoMsg_ { public static GfoMsg as_(Object obj) {return obj instanceof GfoMsg ? (GfoMsg)obj : null;} public static final GfoMsg Null = new GfoMsg_base().ctor_("<>", false); @@ -55,7 +56,7 @@ public class GfoMsg_ { GfoMsg root = GfoMsg_.new_parse_((String)list.Get_at(0)); GfoMsg cur = root; - for (int i = 1; i < list.Count(); i++) { + for (int i = 1; i < list.Len(); i++) { String k = (String)list.Get_at(i); GfoMsg mm = GfoMsg_.new_parse_(k); cur.Subs_add(mm); @@ -78,7 +79,7 @@ public class GfoMsg_ { if (ary_len == 0) return Hash_adp_.Noop; Hash_adp rv = Hash_adp_.New(); for (int i = 0; i < ary_len; i++) { - rv.Add_if_dupe_use_1st(ary[i], ary[i]); + rv.AddIfDupeUse1st(ary[i], ary[i]); } return rv; } @@ -99,11 +100,11 @@ class GfoMsg_rdr extends GfoMsg_base { } class GfoMsg_base implements GfoMsg { public String Key() {return key;} private String key; - public int Subs_count() {return subs == null ? 0 : subs.Count();} + public int Subs_count() {return subs == null ? 0 : subs.Len();} public GfoMsg Subs_getAt(int i) {return subs == null ? null : (GfoMsg)subs.Get_at(i);} public GfoMsg Subs_add(GfoMsg m) {if (subs == null) subs = List_adp_.New(); subs.Add(m); return this;} public GfoMsg Subs_(GfoMsg... ary) {for (GfoMsg m : ary) Subs_add(m); return this;} - public int Args_count() {return args == null ? 0 : args.Count();} + public int Args_count() {return args == null ? 0 : args.Len();} public void Args_reset() { counter = 0; Args_reset(this); @@ -124,7 +125,7 @@ class GfoMsg_base implements GfoMsg { public Keyval Args_getAt(int i) {return args == null ? null : (Keyval)args.Get_at(i);} public GfoMsg Args_ovr(String k, Object v) { if (args == null) args = List_adp_.New(); - for (int i = 0; i < args.Count(); i++) { + for (int i = 0; i < args.Len(); i++) { Keyval kv = (Keyval)args.Get_at(i); if (String_.Eq(k, kv.Key())) { kv.Val_(v); @@ -184,13 +185,13 @@ class GfoMsg_base implements GfoMsg { protected Object ReadOr(String k, Object defaultOr) { if (args == null) return Nil; // WORKAROUND.gfui: args null for DataBndr_whenEvt_execCmd if (!String_.Eq(k, "")) { - for (int i = 0; i < args.Count(); i++) { + for (int i = 0; i < args.Len(); i++) { Keyval kv = (Keyval)args.Get_at(i); if (String_.Eq(k, kv.Key())) return kv.Val(); } } - if (counter >= args.Count()) return Nil; - for (int i = 0; i < args.Count(); i++) { + if (counter >= args.Len()) return Nil; + for (int i = 0; i < args.Len(); i++) { Keyval kv = (Keyval)args.Get_at(i); if (String_.Eq(kv.Key(), "") && i >= counter) { counter++; @@ -213,12 +214,12 @@ class GfoMsg_base implements GfoMsg { GfoMsg_base rv = new GfoMsg_base().ctor_(key, parse); if (args != null) { rv.args = List_adp_.New(); - for (int i = 0; i < args.Count(); i++) + for (int i = 0; i < args.Len(); i++) rv.args.Add(args.Get_at(i)); } if (subs != null) { rv.subs = List_adp_.New(); - for (int i = 0; i < args.Count(); i++) { + for (int i = 0; i < args.Len(); i++) { GfoMsg sub = (GfoMsg)args.Get_at(i); rv.subs.Add(sub.CloneNew()); // NOTE: recursion } diff --git a/100_core/src/gplx/GfoTemplateFactory.java b/100_core/src/gplx/GfoTemplateFactory.java index 4233adf85..ee9fcfea8 100644 --- a/100_core/src/gplx/GfoTemplateFactory.java +++ b/100_core/src/gplx/GfoTemplateFactory.java @@ -17,12 +17,12 @@ package gplx; public class GfoTemplateFactory implements Gfo_invk { public void Reg(String key, GfoTemplate template) {hash.Add(key, template);} public Object Make(String key) { - GfoTemplate template = (GfoTemplate)hash.Get_by(key); + GfoTemplate template = (GfoTemplate)hash.GetByOrNull(key); return template.NewCopy(template); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { ctx.Match(k, k); - Object o = hash.Get_by(k); + Object o = hash.GetByOrNull(k); return o == null ? Gfo_invk_.Rv_unhandled : o; } public static final GfoTemplateFactory Instance = new GfoTemplateFactory(); GfoTemplateFactory() {} diff --git a/100_core/src/gplx/Gfo_evt_mgr.java b/100_core/src/gplx/Gfo_evt_mgr.java index 75dcd353a..307e6f096 100644 --- a/100_core/src/gplx/Gfo_evt_mgr.java +++ b/100_core/src/gplx/Gfo_evt_mgr.java @@ -14,7 +14,6 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx; -import gplx.core.lists.*; public class Gfo_evt_mgr { private final Gfo_evt_mgr_owner sender; private Ordered_hash subsRegy, pubsRegy; public Gfo_evt_mgr(Gfo_evt_mgr_owner sender) {this.sender = sender;} @@ -29,7 +28,7 @@ public class Gfo_evt_mgr { pub.Evt_mgr().lnks.Add(this); } List_adp lnks; void AddInList(Ordered_hash regy, String key, GfoEvLnk lnk) { - GfoEvLnkList list = (GfoEvLnkList)regy.Get_by(key); + GfoEvLnkList list = (GfoEvLnkList)regy.GetByOrNull(key); if (list == null) { list = new GfoEvLnkList(key); regy.Add(key, list); @@ -42,7 +41,7 @@ public class Gfo_evt_mgr { } @gplx.Internal protected void Pub(GfsCtx ctx, String evt, GfoMsg m) { ctx.MsgSrc_(sender); - GfoEvLnkList subs = subsRegy == null ? null : (GfoEvLnkList)subsRegy.Get_by(evt); + GfoEvLnkList subs = subsRegy == null ? null : (GfoEvLnkList)subsRegy.GetByOrNull(evt); if (subs != null) { for (int i = 0; i < subs.Count(); i++) { GfoEvLnk lnk = (GfoEvLnk)subs.Get_at(i); @@ -50,7 +49,7 @@ public class Gfo_evt_mgr { } } if (lnks != null) { - for (int i = 0; i < lnks.Count(); i++) { + for (int i = 0; i < lnks.Len(); i++) { Gfo_evt_mgr lnk = (Gfo_evt_mgr)lnks.Get_at(i); lnk.Pub(ctx, evt, m); } @@ -67,14 +66,14 @@ public class Gfo_evt_mgr { @gplx.Internal protected void RlsRegyObj(Ordered_hash regy, Gfo_evt_mgr_owner eobj, boolean pub) { if (regy == null) return; List_adp delList = List_adp_.New(); - for (int i = 0; i < regy.Count(); i++) { + for (int i = 0; i < regy.Len(); i++) { GfoEvLnkList pubsList = (GfoEvLnkList)regy.Get_at(i); delList.Clear(); for (int j = 0; j < pubsList.Count(); j++) { GfoEvLnk lnk = (GfoEvLnk)pubsList.Get_at(j); if (lnk.End(!pub) == eobj) delList.Add(lnk); } - for (int j = 0; j < delList.Count(); j++) { + for (int j = 0; j < delList.Len(); j++) { GfoEvLnk del = (GfoEvLnk)delList.Get_at(j); del.End(pub).Evt_mgr().RlsLnk(!pub, pubsList.Key(), del.End(!pub)); pubsList.Del(del); @@ -83,13 +82,13 @@ public class Gfo_evt_mgr { } @gplx.Internal protected void RlsLnk(boolean pubEnd, String key, Gfo_evt_mgr_owner endObj) { Ordered_hash regy = pubEnd ? pubsRegy : subsRegy; - GfoEvLnkList list = (GfoEvLnkList)regy.Get_by(key); + GfoEvLnkList list = (GfoEvLnkList)regy.GetByOrNull(key); List_adp delList = List_adp_.New(); for (int i = 0; i < list.Count(); i++) { GfoEvLnk lnk = (GfoEvLnk)list.Get_at(i); if (lnk.End(pubEnd) == endObj) delList.Add(lnk); } - for (int i = 0; i < delList.Count(); i++) { + for (int i = 0; i < delList.Len(); i++) { GfoEvLnk lnk = (GfoEvLnk)delList.Get_at(i); list.Del(lnk); } @@ -98,7 +97,7 @@ public class Gfo_evt_mgr { } class GfoEvLnkList { public String Key() {return key;} private String key; - public int Count() {return list.Count();} + public int Count() {return list.Len();} public void Add(GfoEvLnk lnk) {list.Add(lnk);} public void Del(GfoEvLnk lnk) {list.Del(lnk);} public GfoEvLnk Get_at(int i) {return (GfoEvLnk)list.Get_at(i);} diff --git a/100_core/src/gplx/Gfo_evt_mgr_tst.java b/100_core/src/gplx/Gfo_evt_mgr_tst.java index c2cee2f05..12451baa0 100644 --- a/100_core/src/gplx/Gfo_evt_mgr_tst.java +++ b/100_core/src/gplx/Gfo_evt_mgr_tst.java @@ -60,7 +60,7 @@ class MockEvObj implements Gfo_evt_itm { } List_adp handled = List_adp_.New(); public void tst_Handled(String... expd) { - Tfds.Eq_ary_str(expd, handled.To_str_ary()); + Tfds.Eq_ary_str(expd, handled.ToStrAry()); handled.Clear(); } public MockEvObj(){eventMgr = new Gfo_evt_mgr(this);} diff --git a/100_core/src/gplx/Gfo_invk_cmd_mgr.java b/100_core/src/gplx/Gfo_invk_cmd_mgr.java index a7ba66da8..5d3805217 100644 --- a/100_core/src/gplx/Gfo_invk_cmd_mgr.java +++ b/100_core/src/gplx/Gfo_invk_cmd_mgr.java @@ -34,7 +34,7 @@ public class Gfo_invk_cmd_mgr { return this; } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m, Object host) { - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { GfoInvkCmdItm itm = (GfoInvkCmdItm)list.Get_at(i); if (itm.Type_isXtn()) { Object invkVal = itm.Invk().Invk(ctx, ikey, k, m); diff --git a/100_core/src/gplx/Gfo_usr_dlg_.java b/100_core/src/gplx/Gfo_usr_dlg_.java index d38ba8f58..f5919cd5a 100644 --- a/100_core/src/gplx/Gfo_usr_dlg_.java +++ b/100_core/src/gplx/Gfo_usr_dlg_.java @@ -27,7 +27,7 @@ public class Gfo_usr_dlg_ { } public static String Test__list__term__get_1st() { Instance = Noop; - String[] rv = ((Gfo_usr_dlg__gui_mock)test__list.Gui_wkr()).Warns().To_str_ary_and_clear(); + String[] rv = ((Gfo_usr_dlg__gui_mock)test__list.Gui_wkr()).Warns().ToStrAryAndClear(); return rv.length == 0 ? "" : rv[0]; } public static void Test__show__init() { diff --git a/100_core/src/gplx/Gfo_usr_dlg__log_base.java b/100_core/src/gplx/Gfo_usr_dlg__log_base.java index ee1701bba..78e1606c9 100644 --- a/100_core/src/gplx/Gfo_usr_dlg__log_base.java +++ b/100_core/src/gplx/Gfo_usr_dlg__log_base.java @@ -27,7 +27,7 @@ public class Gfo_usr_dlg__log_base implements Gfo_usr_dlg__log { public Io_url Session_dir() {return session_dir;} private Io_url session_dir; public Io_url Session_fil() {return session_fil;} private Io_url session_fil; private void Flush() { - int queued_len = queued_list.Count(); + int queued_len = queued_list.Len(); for (int i = 0; i < queued_len; i++) { Usr_log_fil fil = (Usr_log_fil)queued_list.Get_at(i); if (fil.Url() == null) { @@ -95,7 +95,7 @@ public class Gfo_usr_dlg__log_base implements Gfo_usr_dlg__log { synchronized (thread_lock) { // THREAD:synchronized neded b/c queued_list can be accessible by multiple threads; ISSUE#:646; DATE:2020-01-09 if (queue_enabled) { String url_raw = url == null ? "mem" : url.Raw(); - Usr_log_fil fil = (Usr_log_fil)queued_list.Get_by(url_raw); + Usr_log_fil fil = (Usr_log_fil)queued_list.GetByOrNull(url_raw); if (fil == null) { fil = new Usr_log_fil(url); queued_list.Add(url_raw, fil); diff --git a/100_core/src/gplx/Hash_adp.java b/100_core/src/gplx/Hash_adp.java index 1808f4b1d..14e32d5e9 100644 --- a/100_core/src/gplx/Hash_adp.java +++ b/100_core/src/gplx/Hash_adp.java @@ -1,6 +1,6 @@ /* XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com +Copyright (C) 2012-2021 gnosygnu@gmail.com XOWA is licensed under the terms of the General Public License (GPL) Version 3, or alternatively under the terms of the Apache License Version 2.0. @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx; +package gplx; public interface Hash_adp extends gplx.core.lists.EnumerAble { - int Count(); - boolean Has(Object key); - Object Get_by(Object key); - Object Get_by_or_fail(Object key); - void Add(Object key, Object val); - Hash_adp Add_and_more(Object key, Object val); - Hash_adp Add_many_as_key_and_val(Object... ary); - void Add_as_key_and_val(Object val); - boolean Add_if_dupe_use_1st(Object key, Object val); - void Add_if_dupe_use_nth(Object key, Object val); - void Del(Object key); - void Clear(); -} + int Len(); + boolean Has(Object key); + Object GetByOrNull(Object key); + Object GetByOrFail(Object key); + void Add(Object key, Object val); + Hash_adp AddAndMore(Object key, Object val); + Hash_adp AddManyAsKeyAndVal(Object... ary); + void AddAsKeyAndVal(Object val); + boolean AddIfDupeUse1st(Object key, Object val); + void AddIfDupeUseNth(Object key, Object val); + void Del(Object key); + void Clear(); +} diff --git a/100_core/src/gplx/Hash_adp_.java b/100_core/src/gplx/Hash_adp_.java index 129c55b41..4a2f7958d 100644 --- a/100_core/src/gplx/Hash_adp_.java +++ b/100_core/src/gplx/Hash_adp_.java @@ -21,16 +21,16 @@ public class Hash_adp_ { } class Hash_adp_obj extends gplx.core.lists.Hash_adp_base implements Hash_adp {}//_20110428 class Hash_adp_noop implements Hash_adp { - public int Count() {return 0;} + public int Len() {return 0;} public boolean Has(Object key) {return false;} - public Object Get_by(Object key) {return null;} - public Object Get_by_or_fail(Object key) {throw Err_.new_missing_key(Object_.Xto_str_strict_or_null_mark(key));} + public Object GetByOrNull(Object key) {return null;} + public Object GetByOrFail(Object key) {throw Err_.new_missing_key(Object_.Xto_str_strict_or_null_mark(key));} public void Add(Object key, Object val) {} - public Hash_adp Add_and_more(Object key, Object val) {return this;} - public Hash_adp Add_many_as_key_and_val(Object... ary) {return this;} - public void Add_as_key_and_val(Object val) {} - public void Add_if_dupe_use_nth(Object key, Object val) {} - public boolean Add_if_dupe_use_1st(Object key, Object val) {return false;} + public Hash_adp AddAndMore(Object key, Object val) {return this;} + public Hash_adp AddManyAsKeyAndVal(Object... ary) {return this;} + public void AddAsKeyAndVal(Object val) {} + public void AddIfDupeUseNth(Object key, Object val) {} + public boolean AddIfDupeUse1st(Object key, Object val) {return false;} public void Del(Object key) {} public void Clear() {} public java.util.Iterator iterator() {return gplx.core.lists.Iterator_null.Instance;} diff --git a/100_core/src/gplx/Hash_adp_bry_tst.java b/100_core/src/gplx/Hash_adp_bry_tst.java index 6452e9a7e..4e13ee0f5 100644 --- a/100_core/src/gplx/Hash_adp_bry_tst.java +++ b/100_core/src/gplx/Hash_adp_bry_tst.java @@ -49,7 +49,7 @@ class Hash_adp_bry_fxt { public Hash_adp_bry_fxt New_cs() {hash = Hash_adp_bry.cs(); return this;} public Hash_adp_bry_fxt New_ci() {hash = Hash_adp_bry.ci_a7(); return this;} public Hash_adp_bry_fxt Add(String key) {byte[] key_bry = Bry_.new_u8(key); hash.Add(key_bry, key_bry); return this;} - public Hash_adp_bry_fxt Count_tst(int expd) {Tfds.Eq(expd, hash.Count()); return this;} + public Hash_adp_bry_fxt Count_tst(int expd) {Tfds.Eq(expd, hash.Len()); return this;} public Hash_adp_bry_fxt Get_bry_tst(String key) {return Get_bry_tst(key, key);} public Hash_adp_bry_fxt Get_bry_tst(String key, String expd) { byte[] key_bry = Bry_.new_u8(key); diff --git a/100_core/src/gplx/Io_mgr.java b/100_core/src/gplx/Io_mgr.java index 77449a4ca..e599b4132 100644 --- a/100_core/src/gplx/Io_mgr.java +++ b/100_core/src/gplx/Io_mgr.java @@ -162,13 +162,13 @@ public class Io_mgr implements Gfo_evt_mgr_owner { // exists primarily to gather class Io_mgr_ { public static int Delete_dir_empty(Io_url url) { IoItmDir dir = Io_mgr.Instance.QueryDir_args(url).ExecAsDir(); - int sub_dirs_len = dir.SubDirs().Count(); + int sub_dirs_len = dir.SubDirs().Len(); int deleted_dirs = 0; for (int i = 0; i < sub_dirs_len; ++i) { IoItmDir sub_dir = (IoItmDir)dir.SubDirs().Get_at(i); deleted_dirs += Io_mgr.Instance.Delete_dir_empty(sub_dir.Url()); } - if ( dir.SubFils().Count() == 0 + if ( dir.SubFils().Len() == 0 && deleted_dirs == sub_dirs_len ) { Io_mgr.Instance.DeleteDirIfEmpty(url); diff --git a/100_core/src/gplx/Keyval_hash.java b/100_core/src/gplx/Keyval_hash.java index 314d28e10..c6fb1e83a 100644 --- a/100_core/src/gplx/Keyval_hash.java +++ b/100_core/src/gplx/Keyval_hash.java @@ -16,19 +16,19 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx; public class Keyval_hash { private final Ordered_hash hash = Ordered_hash_.New(); - public int Count() {return hash.Count();} - public int Len() {return hash.Count();} + public int Count() {return hash.Len();} + public int Len() {return hash.Len();} public Keyval_hash Clear() {hash.Clear(); return this;} public boolean Has(String key) {return hash.Has(key);} public Keyval Get_at(int i) {return (Keyval)hash.Get_at(i);} public Object Get_val_or(String key, Object or) {Keyval rv = Get_kvp_or_null(key); return rv == null ? or : rv.Val();} public Object Get_val_or_null(String key) {return Get_val_or(key, null);} - public Object Get_val_or_fail(String key) {return Keyval_.as_(hash.Get_by_or_fail(key)).Val();} + public Object Get_val_or_fail(String key) {return Keyval_.as_(hash.GetByOrFail(key)).Val();} public String Get_val_as_str_or_fail(String key) {return (String)Get_val_or_fail(key);} - public Keyval Get_kvp_or_null(String key) {return Keyval_.as_(hash.Get_by(key));} + public Keyval Get_kvp_or_null(String key) {return Keyval_.as_(hash.GetByOrNull(key));} public Keyval_hash Add(Keyval kv) {hash.Add(kv.Key(), kv); return this;} public Keyval_hash Add(String key, Object val) {hash.Add(key, Keyval_.new_(key, val)); return this;} - public Keyval_hash Add_if_dupe_use_nth(String key, Object val) {hash.Add_if_dupe_use_nth(key, Keyval_.new_(key, val)); return this;} + public Keyval_hash Add_if_dupe_use_nth(String key, Object val) {hash.AddIfDupeUseNth(key, Keyval_.new_(key, val)); return this;} public void Del(String key) {hash.Del(key);} public Keyval[] To_ary() { int len = this.Count(); diff --git a/100_core/src/gplx/Keyval_list.java b/100_core/src/gplx/Keyval_list.java index 777472c98..d1ce09f02 100644 --- a/100_core/src/gplx/Keyval_list.java +++ b/100_core/src/gplx/Keyval_list.java @@ -15,14 +15,14 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx; public class Keyval_list { - public int Count() {return list.Count();} private final List_adp list = List_adp_.New(); + public int Count() {return list.Len();} private final List_adp list = List_adp_.New(); public void Clear() {list.Clear();} public Keyval Get_at(int i) {return (Keyval)list.Get_at(i);} public Keyval_list Add(String key, Object val) {list.Add(Keyval_.new_(key, val)); return this;} - public Keyval[] To_ary() {return (Keyval[])list.To_ary(Keyval.class);} + public Keyval[] To_ary() {return (Keyval[])list.ToAry(Keyval.class);} public String To_str() { Bry_bfr bfr = Bry_bfr_.New(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Keyval kv = (Keyval)list.Get_at(i); if (i == 0) bfr.Add_byte_space(); diff --git a/100_core/src/gplx/List_adp.java b/100_core/src/gplx/List_adp.java index 0bebb6494..e742b5871 100644 --- a/100_core/src/gplx/List_adp.java +++ b/100_core/src/gplx/List_adp.java @@ -1,43 +1,43 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx; import gplx.core.lists.*; /*EnumerAble,ComparerAble*/ public interface List_adp extends EnumerAble, List_adp__getable { - int Count(); - Object Get_at_last(); + int Len(); + Object GetAtLast(); void Add(Object o); - void Add_at(int i, Object o); - void Add_many(Object... ary); + void AddAt(int i, Object o); + void AddMany(Object... ary); void Del(Object o); - void Del_at(int i); - void Del_range(int bgn, int end); + void DelAt(int i); + void DelRange(int bgn, int end); void Clear(); - int Idx_of(Object o); - int Idx_last(); - Object To_ary(Class memberType); - Object To_ary_and_clear(Class memberType); - String[] To_str_ary(); - String[] To_str_ary_and_clear(); - String To_str(); - Object[] To_obj_ary(); - void Resize_bounds(int i); - void Move_to(int src, int trg); + int IdxOf(Object o); + int IdxLast(); + Object ToAry(Class memberType); + Object ToAryAndClear(Class memberType); + String[] ToStrAry(); + String[] ToStrAryAndClear(); + String ToStr(); + Object[] ToObjAry(); + void ResizeBounds(int i); + void MoveTo(int src, int trg); void Reverse(); void Sort(); - void Sort_by(ComparerAble comparer); + void SortBy(ComparerAble comparer); void Shuffle(); } class List_adp_obj extends List_adp_base implements List_adp { @@ -45,31 +45,30 @@ class List_adp_obj extends List_adp_base implements List_adp { public List_adp_obj(int v) {super(v);} } class List_adp_noop implements List_adp { - public int Count() {return 0;} public int Len() {return 0;} public Object Get_at(int i) {return null;} - public Object Get_at_last() {return null;} + public Object GetAtLast() {return null;} public Object PopLast() {return null;} public void Add(Object o) {} - public void Add_at(int i, Object o) {} - public void Add_many(Object... ary) {} + public void AddAt(int i, Object o) {} + public void AddMany(Object... ary) {} public void Del(Object o) {} - public void Del_at(int i) {} - public void Del_range(int bgn, int end) {} + public void DelAt(int i) {} + public void DelRange(int bgn, int end) {} public void Clear() {} - public int Idx_last() {return -1;} - public int Idx_of(Object o) {return List_adp_.Not_found;} - public void Move_to(int elemPos, int newPos) {} - public void Resize_bounds(int i) {} - public Object To_ary(Class memberType) {return Object_.Ary_empty;} - public Object To_ary_and_clear(Class memberType) {return Object_.Ary_empty;} - public String[] To_str_ary() {return String_.Ary_empty;} - public String[] To_str_ary_and_clear() {return To_str_ary();} - public String To_str() {return "";} - public Object[] To_obj_ary() {return Object_.Ary_empty;} + public int IdxLast() {return -1;} + public int IdxOf(Object o) {return List_adp_.Not_found;} + public void MoveTo(int elemPos, int newPos) {} + public void ResizeBounds(int i) {} + public Object ToAry(Class memberType) {return Object_.Ary_empty;} + public Object ToAryAndClear(Class memberType) {return Object_.Ary_empty;} + public String[] ToStrAry() {return String_.Ary_empty;} + public String[] ToStrAryAndClear() {return ToStrAry();} + public String ToStr() {return "";} + public Object[] ToObjAry() {return Object_.Ary_empty;} public java.util.Iterator iterator() {return Iterator_null.Instance;} public void Reverse() {} public void Sort() {} - public void Sort_by(ComparerAble comparer) {} + public void SortBy(ComparerAble comparer) {} public void Shuffle() {} } diff --git a/100_core/src/gplx/List_adp_.java b/100_core/src/gplx/List_adp_.java index 5a96a50bf..393a0c6c7 100644 --- a/100_core/src/gplx/List_adp_.java +++ b/100_core/src/gplx/List_adp_.java @@ -14,39 +14,38 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx; -import gplx.core.lists.*; public class List_adp_ { public static final List_adp Noop = new List_adp_noop(); public static List_adp New() {return new List_adp_obj();} public static List_adp New_w_size(int v) {return new List_adp_obj(v);} public static List_adp New_by_many(Object... ary) { List_adp rv = new List_adp_obj(); - rv.Add_many(ary); + rv.AddMany(ary); return rv; } - public static void Del_at_last(List_adp list) {list.Del_at(list.Count() - 1);} + public static void Del_at_last(List_adp list) {list.DelAt(list.Len() - 1);} public static Object Pop(List_adp list) { - int lastIdx = list.Count() - 1; + int lastIdx = list.Len() - 1; Object rv = list.Get_at(lastIdx); - list.Del_at(lastIdx); + list.DelAt(lastIdx); return rv; } public static Object Pop_first(List_adp list) { // NOTE: dirty way of implementing FIFO queue; should not be used with lists with many members Object rv = list.Get_at(0); - list.Del_at(0); + list.DelAt(0); return rv; } public static Object Pop_last(List_adp list) { - int last_idx = list.Count() - 1; + int last_idx = list.Len() - 1; Object rv = list.Get_at(last_idx); - list.Del_at(last_idx); + list.DelAt(last_idx); return rv; } public static Object Pop_or(List_adp list, Object or) { - int list_len = list.Count(); if (list_len == 0) return or; + int list_len = list.Len(); if (list_len == 0) return or; int last_idx = list_len - 1; Object rv = list.Get_at(last_idx); - list.Del_at(last_idx); + list.DelAt(last_idx); return rv; } public static final int Not_found = -1, Base1 = 1; diff --git a/100_core/src/gplx/List_adp_base.java b/100_core/src/gplx/List_adp_base.java index 01cb63b77..91f3228ac 100644 --- a/100_core/src/gplx/List_adp_base.java +++ b/100_core/src/gplx/List_adp_base.java @@ -14,7 +14,10 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx; -import gplx.core.strings.*; import gplx.core.lists.*; +import gplx.core.lists.ComparerAble; +import gplx.core.lists.Iterator_null; +import gplx.core.lists.Iterator_objAry; +import gplx.core.lists.List_adp_sorter; public abstract class List_adp_base implements List_adp, Gfo_invk { private Object[] list; private int count; public List_adp_base(int capacity) { @@ -26,10 +29,9 @@ public abstract class List_adp_base implements List_adp, Gfo_invk { else return new Iterator_objAry(list, count); } - public void Add_many(Object... ary) {for (Object o : ary) Add_base(o);} + public void AddMany(Object... ary) {for (Object o : ary) Add_base(o);} public int Len() {return count;} - public int Count() {return count;} - public int Idx_last() {return count - 1;} + public int IdxLast() {return count - 1;} protected Object Get_at_base(int index) {if (index >= count || index < 0) throw Err_.new_missing_idx(index, count); return list[index]; } @@ -40,10 +42,10 @@ public abstract class List_adp_base implements List_adp, Gfo_invk { } protected int Del_base(Object o) { int index = IndexOf_base(o); if (index == List_adp_.Not_found) return List_adp_.Not_found; - this.Del_at(index); + this.DelAt(index); return index; } - public void Del_range(int delBgn, int delEnd) { + public void DelRange(int delBgn, int delEnd) { BoundsChk(delBgn, delEnd, count); if (delBgn == 0 && delEnd == count - 1) { // entire list deleted; call .Clear, else will have 0 elem array this.Clear(); @@ -69,11 +71,11 @@ public abstract class List_adp_base implements List_adp, Gfo_invk { list[i] = null; count = 0; } - public void Del_at(int index) {if (index >= count || index < 0) throw Err_.new_missing_idx(index, count); + public void DelAt(int index) {if (index >= count || index < 0) throw Err_.new_missing_idx(index, count); Collapse(index); count--; } - public void Move_to(int src, int trg) {if (src >= count || src < 0) throw Err_.new_missing_idx(src, count); if (trg >= count || trg < 0) throw Err_.new_missing_idx(trg, count); + public void MoveTo(int src, int trg) {if (src >= count || src < 0) throw Err_.new_missing_idx(src, count); if (trg >= count || trg < 0) throw Err_.new_missing_idx(trg, count); if (src == trg) return; // position not changed Object o = list[src]; int dif = trg > src ? 1 : -1; @@ -88,11 +90,11 @@ public abstract class List_adp_base implements List_adp, Gfo_invk { list[pos] = o; count = count + 1; } - public void Resize_bounds(int i) { + public void ResizeBounds(int i) { Resize_expand(i); } - public void Sort() {Sort_by(null);} - public void Sort_by(ComparerAble comparer) {List_adp_sorter.new_().Sort(list, count, true, comparer);} + public void Sort() {SortBy(null);} + public void SortBy(ComparerAble comparer) {List_adp_sorter.new_().Sort(list, count, true, comparer);} public void Reverse() { int mid = count / 2; // no need to reverse pivot; ex: for 3 elements, only 1 and 3 need to be exchanged; 2 stays inplace for (int lhs = 0; lhs < mid; lhs++) { @@ -112,31 +114,31 @@ public abstract class List_adp_base implements List_adp, Gfo_invk { } } public Object Get_at(int i) {return Get_at_base(i);} - public Object Get_at_last() {if (count == 0) throw Err_.new_invalid_op("cannot call Get_at_last on empty list"); return Get_at_base(count - 1);} + public Object GetAtLast() {if (count == 0) throw Err_.new_invalid_op("cannot call Get_at_last on empty list"); return Get_at_base(count - 1);} public void Add(Object item) {Add_base(item);} - public void Add_at(int i, Object o) {AddAt_base(i, o);} + public void AddAt(int i, Object o) {AddAt_base(i, o);} public void Del(Object item) {Del_base(item);} - public int Idx_of(Object o) {return IndexOf_base(o);} + public int IdxOf(Object o) {return IndexOf_base(o);} public List_adp_base() { list = new Object[Len_initial]; } private static final int Len_initial = 8; - public Object To_ary_and_clear(Class memberType) {Object rv = To_ary(memberType); this.Clear(); return rv;} - public Object To_ary(Class memberType) { + public Object ToAryAndClear(Class memberType) {Object rv = ToAry(memberType); this.Clear(); return rv;} + public Object ToAry(Class memberType) { Object rv = Array_.Create(memberType, count); for (int i = 0; i < count; i++) Array_.Set_at(rv, i, list[i]); return rv; } - public String[] To_str_ary_and_clear() {String[] rv = To_str_ary(); this.Clear(); return rv;} - public String[] To_str_ary() {return (String[])To_ary(String.class);} - public Object[] To_obj_ary() { + public String[] ToStrAryAndClear() {String[] rv = ToStrAry(); this.Clear(); return rv;} + public String[] ToStrAry() {return (String[])ToAry(String.class);} + public Object[] ToObjAry() { Object[] rv = new Object[count]; for (int i = 0; i < count; ++i) rv[i] = list[i]; return rv; } - public String To_str() { + public String ToStr() { Bry_bfr bfr = Bry_bfr_.New(); for (int i = 0; i < count; ++i) bfr.Add_str_u8(Object_.Xto_str_strict_or_null_mark(list[i])).Add_byte_nl(); diff --git a/100_core/src/gplx/List_adp_tst.java b/100_core/src/gplx/List_adp_tst.java index 25783cf72..9f3abfad0 100644 --- a/100_core/src/gplx/List_adp_tst.java +++ b/100_core/src/gplx/List_adp_tst.java @@ -21,20 +21,20 @@ public class List_adp_tst { listBase = (List_adp_base)list; } List_adp list; List_adp_base listBase; @Test public void Add() { - Tfds.Eq(0, list.Count()); + Tfds.Eq(0, list.Len()); list.Add("0"); - Tfds.Eq(1, list.Count()); + Tfds.Eq(1, list.Len()); } @Test public void Add_changeCapacity() { int capacity = 8; for (int i = 0; i < capacity; i++) list.Add("0"); - Tfds.Eq(capacity, list.Count()); + Tfds.Eq(capacity, list.Len()); Tfds.Eq(capacity, listBase.Capacity()); list.Add(capacity); // forces resize - Tfds.Eq(capacity + 1, list.Count()); + Tfds.Eq(capacity + 1, list.Len()); Tfds.Eq(capacity * 2, listBase.Capacity()); } @Test public void Get_at() { @@ -55,42 +55,42 @@ public class List_adp_tst { } @Test public void Del_at() { list.Add("0"); - Tfds.Eq(1, list.Count()); + Tfds.Eq(1, list.Len()); - list.Del_at(0); - Tfds.Eq(0, list.Count()); + list.DelAt(0); + Tfds.Eq(0, list.Len()); } @Test public void DelAt_shiftDown() { list_AddMany("0", "1"); - Tfds.Eq(list.Count(), 2); + Tfds.Eq(list.Len(), 2); - list.Del_at(0); - Tfds.Eq(1, list.Count()); + list.DelAt(0); + Tfds.Eq(1, list.Len()); Tfds.Eq("1", list.Get_at(0)); } @Test public void DelAt_fail() { - try {list.Del_at(0);} + try {list.DelAt(0);} catch (Exception exc) {Err_.Noop(exc); return;} Tfds.Fail("Del_at should fail for out of bound index"); } @Test public void Del() { list.Add("0"); - Tfds.Eq(1, list.Count()); + Tfds.Eq(1, list.Len()); list.Del("0"); - Tfds.Eq(0, list.Count()); + Tfds.Eq(0, list.Len()); } @Test public void Del_matchMember() { list_AddMany("0", "1"); - Tfds.Eq(2, list.Count()); + Tfds.Eq(2, list.Len()); list.Del("1"); - Tfds.Eq(1, list.Count()); + Tfds.Eq(1, list.Len()); Tfds.Eq("0", list.Get_at(0)); } @Test public void Del_matchFirst() { list_AddMany("0", "1", "0"); - Tfds.Eq(3, list.Count()); + Tfds.Eq(3, list.Len()); list.Del("0"); tst_Enumerator("1", "0"); @@ -120,12 +120,12 @@ public class List_adp_tst { Tfds.Eq(capacity * 2, listBase.Capacity()); list.Clear(); - Tfds.Eq(0, list.Count()); + Tfds.Eq(0, list.Len()); Tfds.Eq(16, listBase.Capacity()); // check that capacity has increased } @Test public void Clear_empty() { // confirm no failure list.Clear(); - Tfds.Eq(0, list.Count()); + Tfds.Eq(0, list.Len()); } @Test public void Reverse() { list_AddMany("0", "1", "2"); @@ -143,12 +143,12 @@ public class List_adp_tst { @Test public void Sort_empty() {list.Sort();} @Test public void Xto_bry() { list_AddMany("0", "1"); - String[] ary = (String[])list.To_ary(String.class); + String[] ary = (String[])list.ToAry(String.class); Tfds.Eq_nullNot(ary); Tfds.Eq(2, Array_.Len(ary)); } @Test public void XtoAry_empty() { - String[] ary = (String[])list.To_ary(String.class); + String[] ary = (String[])list.ToAry(String.class); Tfds.Eq_nullNot(ary); Tfds.Eq(0, Array_.Len(ary)); } @@ -158,16 +158,16 @@ public class List_adp_tst { list.Shuffle(); int hasMovedCount = 0; - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { int val = Int_.Cast(list.Get_at(i)); if (val != i) hasMovedCount++; } Tfds.Eq_true(hasMovedCount > 0, "all documents have the same index"); // NOTE: may still fail occasionally (1%) - int count = list.Count(); + int count = list.Len(); for (int i = 0; i < count; i++) list.Del(i); - Tfds.Eq(0, list.Count(), "shuffled list does not have the same contents as original list"); + Tfds.Eq(0, list.Len(), "shuffled list does not have the same contents as original list"); } @Test public void Shuffle_empty() {list.Shuffle();} @Test public void Move_to() { @@ -185,8 +185,8 @@ public class List_adp_tst { run_ClearAndAdd("0", "1", "2", "3").tst_DelRange(0, 0, "1", "2", "3"); } void tst_DelRange(int bgn, int end, String... expd) { - list.Del_range(bgn, end); - Tfds.Eq_ary_str(expd, list.To_str_ary()); + list.DelRange(bgn, end); + Tfds.Eq_ary_str(expd, list.ToStrAry()); } List_adp_tst run_ClearAndAdd(String... ary) { list.Clear(); @@ -196,9 +196,9 @@ public class List_adp_tst { } return this; } - List_adp_tst run_MoveTo(int elemPos, int newPos) {list.Move_to(elemPos, newPos); return this;} + List_adp_tst run_MoveTo(int elemPos, int newPos) {list.MoveTo(elemPos, newPos); return this;} List_adp_tst tst_Order(String... expd) { - String[] actl = (String[])list.To_ary(String.class); + String[] actl = (String[])list.ToAry(String.class); Tfds.Eq_ary(expd, actl); return this; } diff --git a/100_core/src/gplx/Ordered_hash_base.java b/100_core/src/gplx/Ordered_hash_base.java index 7aaf30665..9b3bf61b3 100644 --- a/100_core/src/gplx/Ordered_hash_base.java +++ b/100_core/src/gplx/Ordered_hash_base.java @@ -31,25 +31,25 @@ public class Ordered_hash_base extends Hash_adp_base implements Ordered_hash, Gf AssertCounts("Del", key); } protected Object Get_at_base(int index) {return ordered.Get_at(index);} - protected int IndexOf_base(Object obj) {return ordered.Idx_of(obj);} + protected int IndexOf_base(Object obj) {return ordered.IdxOf(obj);} @Override public void Clear() { if (locked) Lock_fail(); super.Clear(); ordered.Clear(); } - public Object To_ary(Class type) {return ordered.To_ary(type);} + public Object To_ary(Class type) {return ordered.ToAry(type);} public Object To_ary_and_clear(Class t) { Object rv = To_ary(t); this.Clear(); return rv; } public void Sort() {if (locked) Lock_fail(); ordered.Sort();} // NOTE: uses item's .compareTo - public void Sort_by(ComparerAble comparer) {if (locked) Lock_fail(); ordered.Sort_by(comparer);} + public void Sort_by(ComparerAble comparer) {if (locked) Lock_fail(); ordered.SortBy(comparer);} @Override public java.util.Iterator iterator() {return ordered.iterator();} public void Add_at(int i, Object key, Object val) { if (locked) Lock_fail(); super.Add_base(key, val); - ordered.Add_at(i, val); + ordered.AddAt(i, val); AssertCounts("Add_at", key); } public Ordered_hash Add_many_str(String... ary) { @@ -62,19 +62,19 @@ public class Ordered_hash_base extends Hash_adp_base implements Ordered_hash, Gf return this; } private void AssertCounts(String proc, Object key) { - if (super.Count() != ordered.Count()) throw Err_.new_wo_type("counts do not match; same key is either added twice, or delete failed", "proc", proc, "key", Object_.Xto_str_strict_or_null_mark(key), "hash", super.Count(), "list", ordered.Count()); + if (super.Len() != ordered.Len()) throw Err_.new_wo_type("counts do not match; same key is either added twice, or delete failed", "proc", proc, "key", Object_.Xto_str_strict_or_null_mark(key), "hash", super.Len(), "list", ordered.Len()); } - public void Resize_bounds(int i) {if (locked) Lock_fail(); ordered.Resize_bounds(i);} + public void Resize_bounds(int i) {if (locked) Lock_fail(); ordered.ResizeBounds(i);} public void Lock() {locked = true;} private boolean locked = false; void Lock_fail() {throw Err_.new_wo_type("collection is locked");} static final String GRP_KEY = "gplx.core.lists.ordered_hash"; - public void Add_at(int i, Object o) {if (locked) Lock_fail(); ordered.Add_at(i, o);} + public void Add_at(int i, Object o) {if (locked) Lock_fail(); ordered.AddAt(i, o);} public Object Get_at(int i) {return Get_at_base(i);} public int Idx_of(Object obj) {return this.IndexOf_base(obj);} - public void Move_to(int src, int trg) {if (locked) Lock_fail(); ordered.Move_to(src, trg);} + public void Move_to(int src, int trg) {if (locked) Lock_fail(); ordered.MoveTo(src, trg);} private String To_str_ui() { String_bldr sb = String_bldr_.new_(); - int count = ordered.Count(); + int count = ordered.Len(); int pad = String_.Len(Int_.To_str(count)); for (int i = 0; i < count; i++) { sb .Add(Int_.To_str_pad_bgn_zero(i, pad)) @@ -96,6 +96,6 @@ public class Ordered_hash_base extends Hash_adp_base implements Ordered_hash, Gf else return Gfo_invk_.Rv_unhandled; return this; } static final String Invk_SetKeyOnly = "SetKeyOnly", Invk_Print = "Print"; - @Override public int Count() {return ordered.Count();} + @Override public int Len() {return ordered.Len();} public Ordered_hash_base() {} } diff --git a/100_core/src/gplx/String_.java b/100_core/src/gplx/String_.java index 81e69acce..a5be6ca21 100644 --- a/100_core/src/gplx/String_.java +++ b/100_core/src/gplx/String_.java @@ -407,7 +407,7 @@ public class String_ { if (itm == null) continue; list.Add(itm); } - return list.To_str_ary(); + return list.ToStrAry(); } public static String AryXtoStr(String... ary) { String_bldr sb = String_bldr_.new_(); @@ -431,7 +431,7 @@ public class String_ { } if (sb.Count() > 0) list.Add(sb.To_str_and_clear()); - return list.To_str_ary(); + return list.ToStrAry(); } public static String[] Split(String s, String separator) {return Split_do(s, separator, false);} public static String[] SplitLines_crlf(String s) {return Split(s, Op_sys.Wnt.Nl_str());} @@ -476,7 +476,7 @@ public class String_ { i++; } } - return (String[])list.To_ary(String.class); + return (String[])list.ToAry(String.class); } static String Mid_lang(String s, int bgn, int len) {return s.substring(bgn, bgn + len);} public static String Extract_after_bwd(String src, String dlm) { @@ -508,7 +508,7 @@ public class String_ { int len = filter.length; for (int i = 0; i < len; i++) { String itm = filter[i]; - hash.Add_if_dupe_use_nth(itm, itm); + hash.AddIfDupeUseNth(itm, itm); } List_adp rv = List_adp_.New(); len = src.length; @@ -516,7 +516,7 @@ public class String_ { String itm = src[i]; if (hash.Has(itm)) rv.Add(itm); } - return rv.To_str_ary(); + return rv.ToStrAry(); } public static String[] Ary_flatten(String[][] src_ary) { int trg_len = 0; diff --git a/100_core/src/gplx/Tfds.java b/100_core/src/gplx/Tfds.java index d2f15840d..6d416dc29 100644 --- a/100_core/src/gplx/Tfds.java +++ b/100_core/src/gplx/Tfds.java @@ -103,7 +103,7 @@ public class Tfds { // URL:doc/gplx.tfds/Tfds.txt } static void Eq_list_wkr(List_adp lhsList, List_adp rhsList, TfdsEqListItmStr xtoStr, String customMsg) { List_adp list = List_adp_.New(); boolean pass = true; - int lhsLen = lhsList.Count(), rhsLen = rhsList.Count(); + int lhsLen = lhsList.Len(), rhsLen = rhsList.Len(); for (int i = 0; i < lhsLen; i++) { Object lhs = lhsList.Get_at(i); Object rhs = i >= rhsLen ? null : rhsList.Get_at(i); @@ -180,13 +180,13 @@ class TfdsMsgBldr { if (lhsAryLen != rhsAryLen) sb.Add_fmt_line("{0}element counts differ: {1} {2}", "\t\t", lhsAryLen, rhsAryLen); int lhsLenMax = 0, rhsLenMax = 0; - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { TfdsEqAryItm itm = (TfdsEqAryItm)list.Get_at(i); int lhsLen = String_.Len(itm.Lhs()), rhsLen = String_.Len(itm.Rhs()); if (lhsLen > lhsLenMax) lhsLenMax = lhsLen; if (rhsLen > rhsLenMax) rhsLenMax = rhsLen; } - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { TfdsEqAryItm itm = (TfdsEqAryItm)list.Get_at(i); String eq_str = itm.Eq() ? "==" : ""; if (!itm.Eq()) { diff --git a/100_core/src/gplx/TfdsTstr_fxt.java b/100_core/src/gplx/TfdsTstr_fxt.java index c47574c5d..ca49217dd 100644 --- a/100_core/src/gplx/TfdsTstr_fxt.java +++ b/100_core/src/gplx/TfdsTstr_fxt.java @@ -33,15 +33,15 @@ public class TfdsTstr_fxt { public void Fail() { manualFail = true; }boolean manualFail = false; - public int List_Max(List_adp expd, List_adp actl) {return Math_.Max(expd.Count(), actl.Count());} + public int List_Max(List_adp expd, List_adp actl) {return Math_.Max(expd.Len(), actl.Len());} public int List_Max(String[] expd, String[] actl) {return Math_.Max(expd.length, actl.length);} - public Object List_FetchAtOrNull(List_adp l, int i) {return (i >= l.Count()) ? null : l.Get_at(i);} + public Object List_FetchAtOrNull(List_adp l, int i) {return (i >= l.Len()) ? null : l.Get_at(i);} public void SubName_pop() {stack.Pop();} int nameLenMax = 0; public void tst_Equal(String hdr) { boolean pass = true; - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { TfdsTstrItm itm = (TfdsTstrItm)list.Get_at(i); if (!itm.Compare()) pass = false; // don't break early; Compare all vals } @@ -49,7 +49,7 @@ public class TfdsTstr_fxt { String_bldr sb = String_bldr_.new_(); sb.Add_char_crlf(); sb.Add_str_w_crlf(hdr); - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { TfdsTstrItm itm = (TfdsTstrItm)list.Get_at(i); if (itm.TypeOf == 1) { sb.Add_fmt_line(" /{0}", itm.SubName()); @@ -77,7 +77,7 @@ class TfdsTstrItm { if (stack.Count() == 0) return; List_adp list = stack.XtoList(); String_bldr sb = String_bldr_.new_(); - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { if (i != 0) sb.Add("."); sb.Add((String)list.Get_at(i)); } diff --git a/100_core/src/gplx/UsrMsg.java b/100_core/src/gplx/UsrMsg.java index 08fa021e9..fdb75b013 100644 --- a/100_core/src/gplx/UsrMsg.java +++ b/100_core/src/gplx/UsrMsg.java @@ -1,21 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx; import gplx.core.strings.*; import gplx.core.envs.*; -public class UsrMsg { +public class UsrMsg { public int VisibilityDuration() {return visibilityDuration;} public UsrMsg VisibilityDuration_(int v) {visibilityDuration = v; return this;} int visibilityDuration = 3000; public String Hdr() {return hdr;} public UsrMsg Hdr_(String val) {hdr = val; return this;} private String hdr; public Ordered_hash Args() {return args;} Ordered_hash args = Ordered_hash_.New(); @@ -24,7 +24,7 @@ public class UsrMsg { return this; } public UsrMsg Add_if_dupe_use_nth(String k, Object v) { - args.Add_if_dupe_use_nth(k, Keyval_.new_(k, v)); + args.AddIfDupeUseNth(k, Keyval_.new_(k, v)); return this; } public String XtoStrSingleLine() {return To_str(" ");} @@ -32,7 +32,7 @@ public class UsrMsg { String To_str(String spr) { if (hdr == null) { GfoMsg m = GfoMsg_.new_cast_(cmd); - for (int i = 0; i < args.Count(); i++) { + for (int i = 0; i < args.Len(); i++) { Keyval kv = (Keyval)args.Get_at(i); m.Add(kv.Key(), kv.Val()); } @@ -40,7 +40,7 @@ public class UsrMsg { } String_bldr sb = String_bldr_.new_(); sb.Add(hdr).Add(spr); - for (int i = 0; i < args.Count(); i++) { + for (int i = 0; i < args.Len(); i++) { Keyval kv = (Keyval)args.Get_at(i); sb.Add_spr_unless_first("", " ", i); sb.Add_fmt("{0}={1}", kv.Key(), kv.Val(), spr); diff --git a/100_core/src/gplx/UsrMsgWkr_mock.java b/100_core/src/gplx/UsrMsgWkr_mock.java index f15981f32..3c5891e27 100644 --- a/100_core/src/gplx/UsrMsgWkr_mock.java +++ b/100_core/src/gplx/UsrMsgWkr_mock.java @@ -1,25 +1,25 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx; public class UsrMsgWkr_mock implements UsrMsgWkr { public void ExecUsrMsg(int type, UsrMsg m) { msgs.Add(m); } public boolean HasWarn(UsrMsg um) { - for (int i = 0; i < msgs.Count(); i++) { + for (int i = 0; i < msgs.Len(); i++) { UsrMsg found = (UsrMsg)msgs.Get_at(i); if (String_.Eq(um.To_str(), found.To_str())) return true; } diff --git a/100_core/src/gplx/core/brys/fmtrs/Bry_fmtr.java b/100_core/src/gplx/core/brys/fmtrs/Bry_fmtr.java index f2be60e7c..25ef8e29b 100644 --- a/100_core/src/gplx/core/brys/fmtrs/Bry_fmtr.java +++ b/100_core/src/gplx/core/brys/fmtrs/Bry_fmtr.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.brys.fmtrs; import gplx.*; import gplx.core.*; import gplx.core.brys.*; -import gplx.core.brys.*; import gplx.core.primitives.*; import gplx.core.strings.*; +package gplx.core.brys.fmtrs; import gplx.*; +import gplx.core.brys.*; +import gplx.core.primitives.*; import gplx.core.strings.*; public class Bry_fmtr { public byte[] Fmt() {return fmt;} private byte[] fmt = Bry_.Empty; public boolean Fmt_null() {return fmt.length == 0;} @@ -136,7 +137,7 @@ public class Bry_fmtr { list.Add(Bry_fmtr_itm.arg_(lkp_bfr.To_int(0) - baseInt)); else { byte[] key_fmt = lkp_bfr.To_bry(); - Object idx_ref = keys.Get_by(Bry_obj_ref.New(key_fmt)); + Object idx_ref = keys.GetByOrNull(Bry_obj_ref.New(key_fmt)); if (idx_ref == null) { int lkp_bfr_len = lkp_bfr.Len(); byte[] lkp_bry = lkp_bfr.Bfr(); @@ -210,7 +211,7 @@ public class Bry_fmtr { } if (lkp_is_active) throw Err_.new_wo_type("idx mode not closed"); if (trg_pos > 0) {list.Add(Bry_fmtr_itm.dat_(trg_bry, trg_pos)); trg_pos = 0;} - itms = (Bry_fmtr_itm[])list.To_ary(Bry_fmtr_itm.class); + itms = (Bry_fmtr_itm[])list.ToAry(Bry_fmtr_itm.class); itms_len = itms.length; if (dirty_disable) dirty = false; // ISSUE#:575; DATE:2019-09-16 diff --git a/100_core/src/gplx/core/brys/fmts/Bry_fmt_parser_.java b/100_core/src/gplx/core/brys/fmts/Bry_fmt_parser_.java index 67b83cdf5..9a2422056 100644 --- a/100_core/src/gplx/core/brys/fmts/Bry_fmt_parser_.java +++ b/100_core/src/gplx/core/brys/fmts/Bry_fmt_parser_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.brys.fmts; import gplx.*; import gplx.core.*; import gplx.core.brys.*; +package gplx.core.brys.fmts; import gplx.*; public class Bry_fmt_parser_ { public static Bry_fmt_itm[] Parse(byte escape, byte grp_bgn, byte grp_end, Bfr_fmt_arg[] args, byte[][] keys, byte[] src) { int src_len = src.length; @@ -56,18 +56,18 @@ public class Bry_fmt_parser_ { ++pos; } } - Bry_fmt_itm[] rv = (Bry_fmt_itm[])list.To_ary_and_clear(Bry_fmt_itm.class); + Bry_fmt_itm[] rv = (Bry_fmt_itm[])list.ToAryAndClear(Bry_fmt_itm.class); int len = args.length; for (int i = 0; i < len; ++i) { Bfr_fmt_arg arg = args[i]; - Bry_fmt_itm key_itm = (Bry_fmt_itm)keys_hash.Get_by(arg.Key); if (key_itm == null) continue; + Bry_fmt_itm key_itm = (Bry_fmt_itm)keys_hash.GetByOrNull(arg.Key); if (key_itm == null) continue; key_itm.Tid = Bry_fmt_itm.Tid__arg; key_itm.Arg = arg.Arg; } len = keys.length; for (int i = 0; i < len; ++i) { byte[] key = keys[i]; - Bry_fmt_itm key_itm = (Bry_fmt_itm)keys_hash.Get_by(key); if (key_itm == null) continue; // NOTE: ignore missing keys; EX: fmt=a~{b}c keys=b,d; do not fail b/c ~{d} is not in fmt; allows redefining from tests + Bry_fmt_itm key_itm = (Bry_fmt_itm)keys_hash.GetByOrNull(key); if (key_itm == null) continue; // NOTE: ignore missing keys; EX: fmt=a~{b}c keys=b,d; do not fail b/c ~{d} is not in fmt; allows redefining from tests key_itm.Key_idx = i; } return rv; diff --git a/100_core/src/gplx/core/caches/Lru_cache.java b/100_core/src/gplx/core/caches/Lru_cache.java index bfb400154..f1bd745d1 100644 --- a/100_core/src/gplx/core/caches/Lru_cache.java +++ b/100_core/src/gplx/core/caches/Lru_cache.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.caches; import gplx.*; import gplx.core.*; +package gplx.core.caches; import gplx.*; public class Lru_cache { private final Hash_adp map = Hash_adp_.New(); private Lru_node head, tail; @@ -32,7 +32,7 @@ public class Lru_cache { this.max = max; } public Object Get_or_null(Object key) { - Lru_node nde = (Lru_node)map.Get_by(key); + Lru_node nde = (Lru_node)map.GetByOrNull(key); if (nde == null) { return null; } @@ -43,7 +43,7 @@ public class Lru_cache { return nde.Val(); } public void Set(Object key, Object val, long size) { - Lru_node nde = (Lru_node)map.Get_by(key); + Lru_node nde = (Lru_node)map.GetByOrNull(key); if (nde != null) { nde.Val_(val); @@ -60,7 +60,7 @@ public class Lru_cache { } } public void Del(Object key) { - Lru_node nde = (Lru_node)map.Get_by(key); + Lru_node nde = (Lru_node)map.GetByOrNull(key); if (nde != null) { Del_node_from_this(nde); } diff --git a/100_core/src/gplx/core/caches/Lru_cache_root.java b/100_core/src/gplx/core/caches/Lru_cache_root.java index dd4e5a989..fb0324bb0 100644 --- a/100_core/src/gplx/core/caches/Lru_cache_root.java +++ b/100_core/src/gplx/core/caches/Lru_cache_root.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.caches; import gplx.*; import gplx.core.*; +package gplx.core.caches; import gplx.*; public class Lru_cache_root { private final Ordered_hash hash = Ordered_hash_.New(); - public Lru_cache Get_by_key(String key) {return (Lru_cache)hash.Get_by(key);} + public Lru_cache Get_by_key(String key) {return (Lru_cache)hash.GetByOrNull(key);} public void Add(Lru_cache grp) { hash.Add(grp.Key(), grp); } diff --git a/100_core/src/gplx/core/consoles/Console_adp__mem.java b/100_core/src/gplx/core/consoles/Console_adp__mem.java index dfd7b9607..f3de5bc0c 100644 --- a/100_core/src/gplx/core/consoles/Console_adp__mem.java +++ b/100_core/src/gplx/core/consoles/Console_adp__mem.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.consoles; import gplx.*; import gplx.core.*; +package gplx.core.consoles; import gplx.*; public class Console_adp__mem implements Console_adp { private final List_adp written = List_adp_.New(); private final Hash_adp ignored = Hash_adp_.New(); public boolean Enabled() {return true;} public boolean Canceled_chk() {return false;} public int Chars_per_line_max() {return 80;} public void Chars_per_line_max_(int v) {} - public Console_adp__mem Ignore_add(String s) {ignored.Add_as_key_and_val(s); return this;} + public Console_adp__mem Ignore_add(String s) {ignored.AddAsKeyAndVal(s); return this;} public void Write_str(String s) {WriteString(s);} public void Write_fmt_w_nl(String s, Object... args) {WriteString(String_.Format(s, args) + String_.CrLf);} public void Write_tmp(String s) {WriteString(s);} @@ -39,7 +39,7 @@ public class Console_adp__mem implements Console_adp { public List_adp Written() {return written;} public void tst_WrittenStr(String... expd) { - String[] actl = new String[written.Count()]; + String[] actl = new String[written.Len()]; int actlLength = Array_.Len(actl); for (int i = 0; i < actlLength; i++) actl[i] = written.Get_at(i).toString(); diff --git a/100_core/src/gplx/core/criterias/Criteria_fld.java b/100_core/src/gplx/core/criterias/Criteria_fld.java index 97938f351..6e18a9b7e 100644 --- a/100_core/src/gplx/core/criterias/Criteria_fld.java +++ b/100_core/src/gplx/core/criterias/Criteria_fld.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.criterias; import gplx.*; import gplx.core.*; +package gplx.core.criterias; import gplx.*; public class Criteria_fld implements Criteria { Criteria_fld(String pre, String key, Criteria crt) {this.pre = pre; this.key = key; this.crt = crt;} public byte Tid() {return Criteria_.Tid_wrapper;} @@ -23,7 +23,7 @@ public class Criteria_fld implements Criteria { public String Pre_w_key() {return pre == Pre_null ? key : String_.Concat(pre, ".", key);} public void Val_as_obj_(Object v) {throw Err_.new_unimplemented();} public void Val_from_args(Hash_adp args) { - List_adp list = (List_adp)args.Get_by(key); if (list == null) throw Err_.new_wo_type("criteria.fld key not found", "key", key); + List_adp list = (List_adp)args.GetByOrNull(key); if (list == null) throw Err_.new_wo_type("criteria.fld key not found", "key", key); Object o = Fill_val(key, crt.Tid(), list); crt.Val_as_obj_(o); } @@ -40,7 +40,7 @@ public class Criteria_fld implements Criteria { public static Criteria_fld new_(String pre, String key, Criteria crt) {return new Criteria_fld(pre, key, crt);} public static Criteria_fld new_(String key, Criteria crt) {return new Criteria_fld(Pre_null, key, crt);} public static Object Fill_val(String key, byte tid, List_adp list) { - int len = list.Count(); + int len = list.Len(); switch (tid) { case Criteria_.Tid_eq: case Criteria_.Tid_comp: @@ -53,7 +53,7 @@ public class Criteria_fld implements Criteria { return new Object[] {list.Get_at(0), list.Get_at(1)}; case Criteria_.Tid_in: if (len == 0) throw Err_.new_wo_type("list.len should be > 0", "key", key, "tid", tid, "len", len); - return list.To_obj_ary(); + return list.ToObjAry(); case Criteria_.Tid_const: case Criteria_.Tid_not: case Criteria_.Tid_and: diff --git a/100_core/src/gplx/core/envs/Process_adp.java b/100_core/src/gplx/core/envs/Process_adp.java index fdac85cca..b22130cf2 100644 --- a/100_core/src/gplx/core/envs/Process_adp.java +++ b/100_core/src/gplx/core/envs/Process_adp.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.envs; import gplx.*; import gplx.core.*; +package gplx.core.envs; import gplx.Bool_; import gplx.Bry_; import gplx.Bry_bfr; @@ -33,17 +33,13 @@ import gplx.List_adp_; import gplx.Rls_able; import gplx.String_; import gplx.Tfds; -import gplx.Virtual; import gplx.core.threads.*; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; - -import javax.management.RuntimeErrorException; import gplx.core.brys.fmtrs.*; import gplx.core.strings.*; -import gplx.langs.gfs.*; public class Process_adp implements Gfo_invk, Rls_able { public boolean Enabled() {return enabled;} public Process_adp Enabled_(boolean v) {enabled = v; return this;} private boolean enabled = true; public byte Exe_exists() {return exe_exists;} public Process_adp Exe_exists_(byte v) {exe_exists = v; return this;} private byte exe_exists = Bool_.__byte; @@ -324,7 +320,7 @@ public class Process_adp implements Gfo_invk, Rls_able { sb.Add(c); } if (sb.Has_some()) list.Add(sb.To_str()); - return list.To_str_ary(); + return list.ToStrAry(); } } class Thread_ProcessAdp_async extends Thread { diff --git a/100_core/src/gplx/core/gfo_ndes/GfoFldList_.java b/100_core/src/gplx/core/gfo_ndes/GfoFldList_.java index e0fa589c7..926a842d8 100644 --- a/100_core/src/gplx/core/gfo_ndes/GfoFldList_.java +++ b/100_core/src/gplx/core/gfo_ndes/GfoFldList_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.gfo_ndes; import gplx.*; import gplx.core.*; +package gplx.core.gfo_ndes; import gplx.*; import gplx.core.strings.*; import gplx.core.type_xtns.*; public class GfoFldList_ { public static final GfoFldList Null = new GfoFldList_null(); @@ -26,23 +26,23 @@ public class GfoFldList_ { } } class GfoFldList_base implements GfoFldList { - public int Count() {return hash.Count();} + public int Count() {return hash.Len();} public boolean Has(String key) {return hash.Has(key);} public int Idx_of(String key) { - Object rv = idxs.Get_by(key); + Object rv = idxs.GetByOrNull(key); return rv == null ? List_adp_.Not_found : Int_.Cast(rv); } public GfoFld Get_at(int i) {return (GfoFld)hash.Get_at(i);} - public GfoFld FetchOrNull(String key) {return (GfoFld)hash.Get_by(key);} + public GfoFld FetchOrNull(String key) {return (GfoFld)hash.GetByOrNull(key);} public GfoFldList Add(String key, ClassXtn c) { GfoFld fld = GfoFld.new_(key, c); hash.Add(key, fld); - idxs.Add(key, idxs.Count()); + idxs.Add(key, idxs.Len()); return this; } public String To_str() { String_bldr sb = String_bldr_.new_(); - for (int i = 0; i < hash.Count(); i++) { + for (int i = 0; i < hash.Len(); i++) { GfoFld fld = this.Get_at(i); sb.Add(fld.Key()).Add("|"); } diff --git a/100_core/src/gplx/core/gfo_ndes/GfoNdeList_.java b/100_core/src/gplx/core/gfo_ndes/GfoNdeList_.java index 11149e0e7..c0a06d655 100644 --- a/100_core/src/gplx/core/gfo_ndes/GfoNdeList_.java +++ b/100_core/src/gplx/core/gfo_ndes/GfoNdeList_.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.gfo_ndes; import gplx.*; import gplx.core.*; +package gplx.core.gfo_ndes; import gplx.*; import gplx.core.lists.*; /*ComparerAble*/ public class GfoNdeList_ { public static final GfoNdeList Null = new GfoNdeList_null(); public static GfoNdeList new_() {return new GfoNdeList_base();} } class GfoNdeList_base implements GfoNdeList { - public int Count() {return list.Count();} + public int Count() {return list.Len();} public GfoNde FetchAt_asGfoNde(int i) {return (GfoNde)list.Get_at(i);} public void Add(GfoNde rcd) {list.Add(rcd);} public void Del(GfoNde rcd) {list.Del(rcd);} public void Clear() {list.Clear();} - public void Sort_by(ComparerAble comparer) {list.Sort_by(comparer);} + public void Sort_by(ComparerAble comparer) {list.SortBy(comparer);} List_adp list = List_adp_.New(); } class GfoNdeList_null implements GfoNdeList { diff --git a/100_core/src/gplx/core/gfo_ndes/GfoNde_.java b/100_core/src/gplx/core/gfo_ndes/GfoNde_.java index a013cf0eb..f6c0d2e42 100644 --- a/100_core/src/gplx/core/gfo_ndes/GfoNde_.java +++ b/100_core/src/gplx/core/gfo_ndes/GfoNde_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.gfo_ndes; import gplx.*; import gplx.core.*; +package gplx.core.gfo_ndes; import gplx.*; import gplx.core.type_xtns.*; import gplx.core.stores.*; public class GfoNde_ { public static final GfoNde[] Ary_empty = new GfoNde[0]; @@ -37,7 +37,7 @@ public class GfoNde_ { valAry[i] = rdr.ReadAt(i); rows.Add(GfoNde_.vals_(flds, valAry)); } - return GfoNde_.tbl_("", flds, (GfoNde[])rows.To_ary(GfoNde.class)); + return GfoNde_.tbl_("", flds, (GfoNde[])rows.ToAry(GfoNde.class)); } finally {rdr.Rls();} } diff --git a/100_core/src/gplx/core/gfo_regys/GfoRegy.java b/100_core/src/gplx/core/gfo_regys/GfoRegy.java index 2c822856d..c08f50bc7 100644 --- a/100_core/src/gplx/core/gfo_regys/GfoRegy.java +++ b/100_core/src/gplx/core/gfo_regys/GfoRegy.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.gfo_regys; import gplx.*; import gplx.core.*; -import gplx.langs.gfs.*; import gplx.core.type_xtns.*; import gplx.core.interfaces.*; +package gplx.core.gfo_regys; import gplx.*; +import gplx.core.type_xtns.*; import gplx.core.interfaces.*; public class GfoRegy implements Gfo_invk { - public int Count() {return hash.Count();} + public int Count() {return hash.Len();} public Hash_adp Parsers() {return parsers;} Hash_adp parsers = Hash_adp_.New(); - public GfoRegyItm FetchOrNull(String key) {return (GfoRegyItm)hash.Get_by(key);} + public GfoRegyItm FetchOrNull(String key) {return (GfoRegyItm)hash.GetByOrNull(key);} public Object FetchValOrFail(String key) { - GfoRegyItm rv = (GfoRegyItm)hash.Get_by(key); if (rv == null) throw Err_.new_wo_type("regy does not have key", "key", key); + GfoRegyItm rv = (GfoRegyItm)hash.GetByOrNull(key); if (rv == null) throw Err_.new_wo_type("regy does not have key", "key", key); return rv.Val(); } public Object FetchValOrNull(String key) {return FetchValOr(key, null);} @@ -57,7 +57,7 @@ public class GfoRegy implements Gfo_invk { public void RegObjByType(String key, String val, String type) { Object o = val; if (String_.EqNot(type, StringClassXtn.Key_const)) { - ParseAble parser = (ParseAble)parsers.Get_by(type); + ParseAble parser = (ParseAble)parsers.GetByOrNull(type); if (parser == null) throw Err_.new_wo_type("could not find parser", "type", type, "key", key, "val", val); o = parser.ParseAsObj(val); } @@ -84,7 +84,7 @@ public class GfoRegy implements Gfo_invk { return this; } public static final String Invk_RegDir = "RegDir", Invk_RegObj = "RegObj"; void RegItm(String key, Object val, int valType, Io_url url) { - hash.Add_if_dupe_use_nth(key, new GfoRegyItm(key, val, valType, url)); + hash.AddIfDupeUseNth(key, new GfoRegyItm(key, val, valType, url)); } Hash_adp hash = Hash_adp_.New(); public static final String Err_ChopBgn = "chopBgn results in null key", Err_ChopEnd = "chopEnd results in null key", Err_Dupe = "key already registered"; diff --git a/100_core/src/gplx/core/ios/IoEngineFxt.java b/100_core/src/gplx/core/ios/IoEngineFxt.java index 74cfa7f5c..052ebb5f5 100644 --- a/100_core/src/gplx/core/ios/IoEngineFxt.java +++ b/100_core/src/gplx/core/ios/IoEngineFxt.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios; import gplx.*; public class IoEngineFxt { IoEngine EngineOf(Io_url url) {return IoEnginePool.Instance.Get_by(url.Info().EngineKey());} public void tst_ExistsPaths(boolean expd, Io_url... ary) { @@ -32,14 +32,14 @@ public class IoEngineFxt { public IoEngineFxt tst_QueryFil_modifiedTime(Io_url fil, DateAdp expd) {Tfds.Eq_date(expd, EngineOf(fil).QueryFil(fil).ModifiedTime()); return this;} public IoItmDir tst_ScanDir(Io_url dir, Io_url... expd) { IoItmDir dirItem = EngineOf(dir).QueryDir(dir); - Io_url[] actl = new Io_url[dirItem.SubDirs().Count() + dirItem.SubFils().Count()]; - for (int i = 0; i < dirItem.SubDirs().Count(); i++) { + Io_url[] actl = new Io_url[dirItem.SubDirs().Len() + dirItem.SubFils().Len()]; + for (int i = 0; i < dirItem.SubDirs().Len(); i++) { IoItmDir subDir = IoItmDir_.as_(dirItem.SubDirs().Get_at(i)); actl[i] = subDir.Url(); } - for (int i = 0; i < dirItem.SubFils().Count(); i++) { + for (int i = 0; i < dirItem.SubFils().Len(); i++) { IoItmFil subFil = IoItmFil_.as_(dirItem.SubFils().Get_at(i)); - actl[i + dirItem.SubDirs().Count()] = subFil.Url(); + actl[i + dirItem.SubDirs().Len()] = subFil.Url(); } Tfds.Eq_ary_str(expd, actl); return dirItem; diff --git a/100_core/src/gplx/core/ios/IoEnginePool.java b/100_core/src/gplx/core/ios/IoEnginePool.java index 897ae543d..19dc3ca09 100644 --- a/100_core/src/gplx/core/ios/IoEnginePool.java +++ b/100_core/src/gplx/core/ios/IoEnginePool.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; public class IoEnginePool { private final Hash_adp hash = Hash_adp_.New(); public void Add_if_dupe_use_nth(IoEngine engine) { @@ -21,7 +21,7 @@ public class IoEnginePool { hash.Add(engine.Key(), engine); } public IoEngine Get_by(String key) { - IoEngine rv = (IoEngine)hash.Get_by(key); + IoEngine rv = (IoEngine)hash.GetByOrNull(key); return rv == null ? IoEngine_.Mem : rv; // rv == null when url is null or empty; return Mem which should be a noop; DATE:2013-06-04 } public static final IoEnginePool Instance = new IoEnginePool(); diff --git a/100_core/src/gplx/core/ios/IoEngine_memory.java b/100_core/src/gplx/core/ios/IoEngine_memory.java index ee7df1f94..bd1c39f7f 100644 --- a/100_core/src/gplx/core/ios/IoEngine_memory.java +++ b/100_core/src/gplx/core/ios/IoEngine_memory.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios; import gplx.*; import gplx.core.ios.streams.*; import gplx.core.ios.atrs.*; public class IoEngine_memory extends IoEngine_base { @Override public String Key() {return key;} private String key = IoEngine_.MemKey; @@ -21,7 +21,7 @@ public class IoEngine_memory extends IoEngine_base { @Override public void DeleteFil_api(IoEngine_xrg_deleteFil args) { Io_url url = args.Url(); IoItmDir dir = FetchDir(url.OwnerDir()); if (dir == null) return; // url doesn't exist; just exit - IoItmFil fil = IoItmFil_.as_(dir.SubFils().Get_by(url.NameAndExt())); + IoItmFil fil = IoItmFil_.as_(dir.SubFils().GetByOrNull(url.NameAndExt())); if (fil != null && fil.ReadOnly() && args.ReadOnlyFails()) throw IoErr.FileIsReadOnly(url); dir.SubFils().Del(url); } @@ -52,7 +52,7 @@ public class IoEngine_memory extends IoEngine_base { Io_url url = args.Url(); IoItmDir dir = FetchDir(url.OwnerDir()); if (dir != null) { - IoItmFil fil = IoItmFil_.as_(dir.SubFils().Get_by(url.NameAndExt())); + IoItmFil fil = IoItmFil_.as_(dir.SubFils().GetByOrNull(url.NameAndExt())); if (fil != null && fil.ReadOnly()) throw IoErr.FileIsReadOnly(url); } @@ -163,7 +163,7 @@ public class IoEngine_memory extends IoEngine_base { IoItmFil_mem FetchFil(Io_url url) { IoItmDir ownerDir = FetchDir(url.OwnerDir()); if (ownerDir == null) return IoItmFil_mem.Null; - IoItmFil_mem rv = IoItmFil_mem.as_(ownerDir.SubFils().Get_by(url.NameAndExt())); + IoItmFil_mem rv = IoItmFil_mem.as_(ownerDir.SubFils().GetByOrNull(url.NameAndExt())); if (rv == null) rv = IoItmFil_mem.Null; return rv; } diff --git a/100_core/src/gplx/core/ios/IoEngine_xrg_recycleFil.java b/100_core/src/gplx/core/ios/IoEngine_xrg_recycleFil.java index 95a88a959..e5a9c7a4e 100644 --- a/100_core/src/gplx/core/ios/IoEngine_xrg_recycleFil.java +++ b/100_core/src/gplx/core/ios/IoEngine_xrg_recycleFil.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import gplx.core.strings.*; public class IoEngine_xrg_recycleFil extends IoEngine_xrg_fil_affects1_base { public IoEngine_xrg_recycleFil MissingFails_off() {return MissingFails_(false);} public IoEngine_xrg_recycleFil MissingFails_(boolean v) {MissingFails_set(v); return this;} @@ -33,7 +33,7 @@ public class IoEngine_xrg_recycleFil extends IoEngine_xrg_fil_affects1_base { } String ConcatWith_ary(String separator, List_adp ary) { String_bldr sb = String_bldr_.new_(); - int aryLen = ary.Count(); + int aryLen = ary.Len(); for (int i = 0; i < aryLen; i++) { if (i != 0) sb.Add(separator); Object val = ary.Get_at(i); diff --git a/100_core/src/gplx/core/ios/IoItmDir.java b/100_core/src/gplx/core/ios/IoItmDir.java index 55b7c6cfe..867306d6b 100644 --- a/100_core/src/gplx/core/ios/IoItmDir.java +++ b/100_core/src/gplx/core/ios/IoItmDir.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import gplx.core.criterias.*; public class IoItmDir extends IoItm_base { public boolean Exists() {return exists;} public void Exists_set(boolean v) {exists = v;} private boolean exists = true; @@ -30,7 +30,7 @@ public class IoItmDir extends IoItm_base { Io_url[] XtoIoUrlAry() { IoItmHash list = this.XtoIoItmList(Criteria_.All); //#plat_wce list.Sort(); // NOTE: on wce, subFils retrieved in unexpected order; createTime vs pathString - int count = list.Count(); + int count = list.Len(); Io_url[] rv = new Io_url[count]; for (int i = 0; i < count; i++) rv[i] = list.Get_at(i).Url(); @@ -48,7 +48,7 @@ public class IoItmDir extends IoItm_base { int nextDirSprPos = String_.FindFwd(findDirStr, dirSpr); if (nextDirSprPos == String_.Find_none) nextDirSprPos = String_.Len(findDirStr); findName = String_.MidByLen(findDirStr, 0, nextDirSprPos); if (String_.Eq(findDirStr, "")) return curDir; // findDirStr completely removed; all parts match; return curDir - curDir = IoItmDir_.as_(curDir.subDirs.Get_by(findName)); // try to find dir + curDir = IoItmDir_.as_(curDir.subDirs.GetByOrNull(findName)); // try to find dir if (curDir == null) return null; // dir not found; exit; NOTE: if dir found, loop restarts; with curDir as either findDir, or owner of findDir } } diff --git a/100_core/src/gplx/core/ios/IoItmDir_.java b/100_core/src/gplx/core/ios/IoItmDir_.java index 03d32e85a..33cf7bbde 100644 --- a/100_core/src/gplx/core/ios/IoItmDir_.java +++ b/100_core/src/gplx/core/ios/IoItmDir_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; public class IoItmDir_ { public static IoItmDir as_(Object obj) {return obj instanceof IoItmDir ? (IoItmDir)obj : null;} public static final IoItmDir Null = null_(); @@ -36,12 +36,12 @@ public class IoItmDir_ { } public static void Make(IoItmDir dir) { Io_mgr.Instance.CreateDir(dir.Url()); - int len = dir.SubDirs().Count(); + int len = dir.SubDirs().Len(); for (int i = 0; i < len; ++i) { IoItmDir sub_dir = (IoItmDir)dir.SubDirs().Get_at(i); Make(sub_dir); } - len = dir.SubFils().Count(); + len = dir.SubFils().Len(); for (int i = 0; i < len; ++i) { IoItmFil sub_fil = (IoItmFil)dir.SubFils().Get_at(i); String text = String_.Repeat("a", (int)sub_fil.Size()); diff --git a/100_core/src/gplx/core/ios/IoItmHash.java b/100_core/src/gplx/core/ios/IoItmHash.java index e22b0c495..24fb8fbad 100644 --- a/100_core/src/gplx/core/ios/IoItmHash.java +++ b/100_core/src/gplx/core/ios/IoItmHash.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios; import gplx.*; public class IoItmHash extends Ordered_hash_base { public Io_url Url() {return url;} Io_url url; public void Add(IoItm_base itm) {Add_base(MakeKey(itm.Url()), itm);} @@ -21,7 +21,7 @@ public class IoItmHash extends Ordered_hash_base { public IoItm_base Get_by(Io_url url) {return IoItm_base_.as_(Fetch_base(MakeKey(url)));} @gplx.New public IoItm_base Get_at(int i) {return IoItm_base_.as_(Get_at_base(i));} public Io_url[] XtoIoUrlAry() { - int count = this.Count(); + int count = this.Len(); Io_url[] rv = new Io_url[count]; for (int i = 0; i < count; i++) rv[i] = this.Get_at(i).Url(); diff --git a/100_core/src/gplx/core/ios/IoItmList.java b/100_core/src/gplx/core/ios/IoItmList.java index 102dcdd85..244648bbc 100644 --- a/100_core/src/gplx/core/ios/IoItmList.java +++ b/100_core/src/gplx/core/ios/IoItmList.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios; import gplx.*; import gplx.core.lists.*; /*Ordered_hash_base*/ public class IoItmList extends Ordered_hash_base { public boolean Has(Io_url url) {return Has_base(MakeKey(url));} @@ -28,7 +28,7 @@ public class IoItmList extends Ordered_hash_base { super.Del(key); } public Io_url[] XtoIoUrlAry() { - int count = this.Count(); + int count = this.Len(); Io_url[] rv = new Io_url[count]; for (int i = 0; i < count; i++) rv[i] = IoItm_base_.as_(i).Url(); diff --git a/100_core/src/gplx/core/ios/IoItm_base.java b/100_core/src/gplx/core/ios/IoItm_base.java index 61fec22ee..d269728bd 100644 --- a/100_core/src/gplx/core/ios/IoItm_base.java +++ b/100_core/src/gplx/core/ios/IoItm_base.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; -import gplx.langs.gfs.*; +package gplx.core.ios; import gplx.*; public abstract class IoItm_base implements Gfo_invk, CompareAble { public abstract int TypeId(); public abstract boolean Type_dir(); public abstract boolean Type_fil(); public Io_url Url() {return ownerDir == null ? url : ownerDir.Url().GenSubFil(name); /*NOTE: must call .Url*/} Io_url url; @@ -31,7 +30,7 @@ public abstract class IoItm_base implements Gfo_invk, CompareAble { if (ownerDir == null) url = url.OwnerDir().GenSubFil(name); return this; } - public Object XtnProps_get(String key) {return props.Get_by(key);} Hash_adp props = Hash_adp_.Noop; + public Object XtnProps_get(String key) {return props.GetByOrNull(key);} Hash_adp props = Hash_adp_.Noop; public IoItm_base XtnProps_set(String key, Object val) { if (props == Hash_adp_.Noop) props = Hash_adp_.New(); props.Del(key); diff --git a/100_core/src/gplx/core/ios/IoRecycleBin.java b/100_core/src/gplx/core/ios/IoRecycleBin.java index 6a177a7dc..2460f6fa0 100644 --- a/100_core/src/gplx/core/ios/IoRecycleBin.java +++ b/100_core/src/gplx/core/ios/IoRecycleBin.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import gplx.core.strings.*; public class IoRecycleBin { public void Send(Io_url url) {Send_xrg(url).Exec();} @@ -21,7 +21,7 @@ public class IoRecycleBin { public void Recover(Io_url url) { String_bldr sb = String_bldr_.new_(); List_adp list = Regy_search(url, sb); - int listCount = list.Count(); if (listCount > 1) throw Err_.new_wo_type("found more than 1 url", "count", list.Count()); + int listCount = list.Len(); if (listCount > 1) throw Err_.new_wo_type("found more than 1 url", "count", list.Len()); Io_url trgUrl = (Io_url)list.Get_at(0); IoEngine_xrg_xferFil.move_(url, trgUrl).ReadOnlyFails_(true).Overwrite_(false).Exec(); IoEngine_xrg_saveFilStr.new_(FetchRegistryUrl(url), sb.To_str()).Exec(); diff --git a/100_core/src/gplx/core/ios/IoUrlInfoRegy.java b/100_core/src/gplx/core/ios/IoUrlInfoRegy.java index cf98509ec..ea4e259c6 100644 --- a/100_core/src/gplx/core/ios/IoUrlInfoRegy.java +++ b/100_core/src/gplx/core/ios/IoUrlInfoRegy.java @@ -13,18 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import gplx.core.envs.*; -import gplx.langs.gfs.*; public class IoUrlInfoRegy implements Gfo_invk { - public void Reg(IoUrlInfo info) {hash.Add_if_dupe_use_nth(info.Key(), info);} + public void Reg(IoUrlInfo info) {hash.AddIfDupeUseNth(info.Key(), info);} public IoUrlInfo Match(String raw) { if (String_.Len(raw) == 0) return IoUrlInfo_.Nil; - for (int i = hash.Count(); i > 0; i--) { + for (int i = hash.Len(); i > 0; i--) { IoUrlInfo info = (IoUrlInfo)hash.Get_at(i - 1); if (info.Match(raw)) return info; } - throw Err_.new_wo_type("could not match ioPathInfo", "raw", raw, "count", hash.Count()); + throw Err_.new_wo_type("could not match ioPathInfo", "raw", raw, "count", hash.Len()); } public void Reset() { hash.Clear(); diff --git a/100_core/src/gplx/core/ios/IoUrlTypeRegy.java b/100_core/src/gplx/core/ios/IoUrlTypeRegy.java index 2d3609008..f76324171 100644 --- a/100_core/src/gplx/core/ios/IoUrlTypeRegy.java +++ b/100_core/src/gplx/core/ios/IoUrlTypeRegy.java @@ -25,14 +25,14 @@ import gplx.core.strings.String_bldr; import gplx.core.strings.String_bldr_; public class IoUrlTypeRegy implements Gfo_invk { public String[] FetchAryOr(String key, String... or) { - IoUrlTypeGrp itm = (IoUrlTypeGrp)hash.Get_by(key); + IoUrlTypeGrp itm = (IoUrlTypeGrp)hash.GetByOrNull(key); return itm == null ? or : itm.AsAry(); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_Get)) { String key = m.ReadStr(k); if (ctx.Deny()) return this; - IoUrlTypeGrp itm = (IoUrlTypeGrp)hash.Get_by(key); + IoUrlTypeGrp itm = (IoUrlTypeGrp)hash.GetByOrNull(key); if (itm == null) { itm = new IoUrlTypeGrp(key); hash.Add(key, itm); @@ -47,8 +47,8 @@ public class IoUrlTypeRegy implements Gfo_invk { } class IoUrlTypeGrp implements Gfo_invk { public String[] AsAry() { - String[] rv = new String[list.Count()]; - for (int i = 0; i < list.Count(); i++) + String[] rv = new String[list.Len()]; + for (int i = 0; i < list.Len(); i++) rv[i] = (String)list.Get_at(i); return rv; } @@ -70,7 +70,7 @@ class IoUrlTypeGrp implements Gfo_invk { if (ctx.Deny()) return this; String_bldr sb = String_bldr_.new_(); sb.Add(key).Add("{"); - for (int i = 0; i < list.Count(); i++) + for (int i = 0; i < list.Len(); i++) sb.Add_spr_unless_first((String)list.Get_at(i), " ", i); sb.Add("}"); return sb.To_str(); diff --git a/100_core/src/gplx/core/ios/Io_fil_mkr.java b/100_core/src/gplx/core/ios/Io_fil_mkr.java index ec821b65c..344f8b1bf 100644 --- a/100_core/src/gplx/core/ios/Io_fil_mkr.java +++ b/100_core/src/gplx/core/ios/Io_fil_mkr.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; public class Io_fil_mkr { private final List_adp list = List_adp_.New(); public Io_fil_mkr Add(String url, String data) {return Add(Io_url_.mem_fil_(url), data);} public Io_fil_mkr Add(Io_url url, String data) {list.Add(new Io_fil(url, data)); return this;} - public Io_fil[] To_ary() {return (Io_fil[])list.To_ary(Io_fil.class);} + public Io_fil[] To_ary() {return (Io_fil[])list.ToAry(Io_fil.class);} } diff --git a/100_core/src/gplx/core/ios/atrs/Io_itm_atr_wkr__acl.java b/100_core/src/gplx/core/ios/atrs/Io_itm_atr_wkr__acl.java index 95dff2f8a..881926deb 100644 --- a/100_core/src/gplx/core/ios/atrs/Io_itm_atr_wkr__acl.java +++ b/100_core/src/gplx/core/ios/atrs/Io_itm_atr_wkr__acl.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios.atrs; import gplx.*; import gplx.core.*; import gplx.core.ios.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios.atrs; import gplx.*; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.attribute.AclEntry; @@ -55,7 +55,7 @@ class Io_itm_atr_wkr__acl extends Io_itm_atr_wkr { private final AclFileAttribu // * for diff principals, return true if any of them does have permissions case ALLOW: { // if current principal is forbidden, ignore entry; want to skip lists like Everyone:Forbidden:C:/folder;Everyone:Allowed;C:/ - Bool_obj_val forbidden = (Bool_obj_val)principals.Get_by(itm.Principal()); + Bool_obj_val forbidden = (Bool_obj_val)principals.GetByOrNull(itm.Principal()); if (forbidden != null) { continue; } diff --git a/100_core/src/gplx/core/ios/zips/Io_zip_decompress_cmd__jre.java b/100_core/src/gplx/core/ios/zips/Io_zip_decompress_cmd__jre.java index a30ad3865..fd906fdc2 100644 --- a/100_core/src/gplx/core/ios/zips/Io_zip_decompress_cmd__jre.java +++ b/100_core/src/gplx/core/ios/zips/Io_zip_decompress_cmd__jre.java @@ -1,22 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios.zips; import gplx.*; import gplx.core.*; import gplx.core.ios.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios.zips; import gplx.*; import java.io.*; import java.util.zip.*; -import gplx.core.envs.*; import gplx.core.threads.*; import gplx.core.progs.*; +import gplx.core.envs.*; +import gplx.core.progs.*; class Io_zip_decompress_cmd__jre extends Io_zip_decompress_cmd__base { @Override public Io_zip_decompress_cmd Make_new() {return new Io_zip_decompress_cmd__jre();} @Override protected byte Exec_hook(gplx.core.progs.Gfo_prog_ui prog_ui, Io_url src_fil, Io_url trg_dir, List_adp trg_fils, String resume_name, long resume_file, long resume_item) { @@ -90,7 +91,7 @@ class Io_zip_decompress_cmd__jre extends Io_zip_decompress_cmd__base { Io_mgr.Instance.CreateDir(trg_fil_url); } } - Gfo_evt_mgr_.Pub_val(Io_mgr.Instance, Io_mgr.Evt__fil_created, trg_fils.To_ary(Io_url.class)); + Gfo_evt_mgr_.Pub_val(Io_mgr.Instance, Io_mgr.Evt__fil_created, trg_fils.ToAry(Io_url.class)); } catch(IOException e) {throw Err_.new_exc(e, "ios.zip", "error duing unzip", "src", src_fil.Raw(), "trg", trg_dir.Raw());} finally { diff --git a/100_core/src/gplx/core/lists/Hash_adp_base.java b/100_core/src/gplx/core/lists/Hash_adp_base.java index 0244eafb2..08f100360 100644 --- a/100_core/src/gplx/core/lists/Hash_adp_base.java +++ b/100_core/src/gplx/core/lists/Hash_adp_base.java @@ -13,24 +13,25 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists; import gplx.*; import gplx.core.*; +package gplx.core.lists; import gplx.Err_; +import gplx.Hash_adp; public abstract class Hash_adp_base implements Hash_adp { public boolean Has(Object key) {return Has_base(key);} - public Object Get_by(Object key) {return Fetch_base(key);} - public Object Get_by_or_fail(Object key) {return Get_by_or_fail_base(key);} + public Object GetByOrNull(Object key) {return Fetch_base(key);} + public Object GetByOrFail(Object key) {return Get_by_or_fail_base(key);} public void Add(Object key, Object val) {Add_base(key, val);} - public Hash_adp Add_and_more(Object key, Object val) {Add_base(key, val); return this;} - public Hash_adp Add_many_as_key_and_val(Object... ary) { + public Hash_adp AddAndMore(Object key, Object val) {Add_base(key, val); return this;} + public Hash_adp AddManyAsKeyAndVal(Object... ary) { for (Object itm : ary) Add_base(itm, itm); return this; } - public void Add_as_key_and_val(Object val) {Add_base(val, val);} - public void Add_if_dupe_use_nth(Object key, Object val) { + public void AddAsKeyAndVal(Object val) {Add_base(val, val);} + public void AddIfDupeUseNth(Object key, Object val) { Object existing = Fetch_base(key); if (existing != null) Del(key); // overwrite if exists Add(key, val); } - public boolean Add_if_dupe_use_1st(Object key, Object val) { + public boolean AddIfDupeUse1st(Object key, Object val) { if (Has(key)) return false; Add(key, val); return true; @@ -45,7 +46,6 @@ public abstract class Hash_adp_base implements Hash_adp { // private final java.util.HashMap hash = new java.util.HashMap(); private final java.util.Hashtable hash = new java.util.Hashtable(); public int Len() {return hash.size();} - public int Count() {return hash.size();} public void Clear() {hash.clear();} protected void Add_base(Object key, Object val) {hash.put(key, val);} protected void Del_base(Object key) {hash.remove(key);} diff --git a/100_core/src/gplx/core/lists/Hash_adp_list.java b/100_core/src/gplx/core/lists/Hash_adp_list.java index b8ef24046..cc858599c 100644 --- a/100_core/src/gplx/core/lists/Hash_adp_list.java +++ b/100_core/src/gplx/core/lists/Hash_adp_list.java @@ -1,23 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.lists; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.lists; import gplx.*; public class Hash_adp_list extends Hash_adp_base { - @gplx.New public List_adp Get_by(Object key) {return ((List_adp)Fetch_base(key));} + @gplx.New public List_adp GetByOrNull(Object key) {return ((List_adp)Fetch_base(key));} public List_adp Get_by_or_new(Object key) { - List_adp rv = Get_by(key); + List_adp rv = GetByOrNull(key); if (rv == null) { rv = List_adp_.New(); Add_base(key, rv); @@ -29,10 +29,10 @@ public class Hash_adp_list extends Hash_adp_base { list.Add(val); } public void DelInList(Object key, Object val) { - List_adp list = Get_by(key); + List_adp list = GetByOrNull(key); if (list == null) return; list.Del(val); - if (list.Count() == 0) Del(key); + if (list.Len() == 0) Del(key); } public static Hash_adp_list new_() {return new Hash_adp_list();} Hash_adp_list() {} } diff --git a/100_core/src/gplx/core/lists/List_adp__getable.java b/100_core/src/gplx/core/lists/List_adp__getable.java index 29c7b00b3..11901b0dd 100644 --- a/100_core/src/gplx/core/lists/List_adp__getable.java +++ b/100_core/src/gplx/core/lists/List_adp__getable.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists; import gplx.*; import gplx.core.*; -public interface List_adp__getable { - int Len(); - Object Get_at(int i); -} +package gplx.core.lists; +public interface List_adp__getable { + Object Get_at(int i); +} diff --git a/100_core/src/gplx/core/lists/Sorted_hash.java b/100_core/src/gplx/core/lists/Sorted_hash.java index 6c246d2d2..c2f974822 100644 --- a/100_core/src/gplx/core/lists/Sorted_hash.java +++ b/100_core/src/gplx/core/lists/Sorted_hash.java @@ -13,26 +13,27 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists; import gplx.*; import gplx.core.*; +package gplx.core.lists; import gplx.Err_; +import gplx.Hash_adp; public class Sorted_hash implements Hash_adp { public Sorted_hash() {this.hash = new java.util.TreeMap();} public Sorted_hash(ComparerAble comparer) {this.hash = new java.util.TreeMap(comparer);} public boolean Has(Object key) {return Has_base(key);} - public Object Get_by(Object key) {return Fetch_base(key);} - public Object Get_by_or_fail(Object key) {return Get_by_or_fail_base(key);} + public Object GetByOrNull(Object key) {return Fetch_base(key);} + public Object GetByOrFail(Object key) {return Get_by_or_fail_base(key);} public void Add(Object key, Object val) {Add_base(key, val);} - public Hash_adp Add_and_more(Object key, Object val) {Add_base(key, val); return this;} - public Hash_adp Add_many_as_key_and_val(Object... ary) { + public Hash_adp AddAndMore(Object key, Object val) {Add_base(key, val); return this;} + public Hash_adp AddManyAsKeyAndVal(Object... ary) { for (Object itm : ary) Add_base(itm, itm); return this; } - public void Add_as_key_and_val(Object val) {Add_base(val, val);} - public void Add_if_dupe_use_nth(Object key, Object val) { + public void AddAsKeyAndVal(Object val) {Add_base(val, val);} + public void AddIfDupeUseNth(Object key, Object val) { Object existing = Fetch_base(key); if (existing != null) Del(key); // overwrite if exists Add(key, val); } - public boolean Add_if_dupe_use_1st(Object key, Object val) { + public boolean AddIfDupeUse1st(Object key, Object val) { if (Has(key)) return false; Add(key, val); return true; @@ -51,8 +52,7 @@ public class Sorted_hash implements Hash_adp { } private final java.util.TreeMap hash; - public int Len() {return hash.size();} - public int Count() {return hash.size();} + public int Len() {return hash.size();} public void Clear() {hash.clear();} private void Add_base(Object key, Object val) {hash.put(key, val);} private void Del_base(Object key) {hash.remove(key);} diff --git a/100_core/src/gplx/core/lists/StackAdp_tst.java b/100_core/src/gplx/core/lists/StackAdp_tst.java index c3a82e5f9..b6518ec3d 100644 --- a/100_core/src/gplx/core/lists/StackAdp_tst.java +++ b/100_core/src/gplx/core/lists/StackAdp_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists; import gplx.*; import gplx.core.*; +package gplx.core.lists; import gplx.*; import org.junit.*; public class StackAdp_tst { @Test public void XtoList() { @@ -24,7 +24,7 @@ public class StackAdp_tst { for (int i : ary) stack.Push(i); List_adp list = stack.XtoList(); - int[] actl = (int[])list.To_ary(int.class); + int[] actl = (int[])list.ToAry(int.class); for (int i = 0; i < ary.length; i++) Tfds.Eq(ary[i], actl[i]); } diff --git a/100_core/src/gplx/core/lists/hashs/Hash_adp__int.java b/100_core/src/gplx/core/lists/hashs/Hash_adp__int.java index b61e47406..1f9aae846 100644 --- a/100_core/src/gplx/core/lists/hashs/Hash_adp__int.java +++ b/100_core/src/gplx/core/lists/hashs/Hash_adp__int.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists.hashs; import gplx.*; import gplx.core.*; import gplx.core.lists.*; +package gplx.core.lists.hashs; import gplx.*; import gplx.core.primitives.*; public class Hash_adp__int { private final Hash_adp hash = Hash_adp_.New(); private final Int_obj_ref tmp_key = Int_obj_ref.New_neg1(); public void Clear() {hash.Clear();} - public int Len() {return hash.Count();} - public Object Get_by_or_fail(int key) {synchronized (tmp_key) {return hash.Get_by_or_fail(tmp_key.Val_(key));}} // LOCK:used by Xomp_ns_ord_mgr in xomp; DATE:2016-10-18 - public Object Get_by_or_null(int key) {synchronized (tmp_key) {return hash.Get_by(tmp_key.Val_(key));}} // LOCK:used by Xomp_ns_ord_mgr in xomp; DATE:2016-10-18 + public int Len() {return hash.Len();} + public Object Get_by_or_fail(int key) {synchronized (tmp_key) {return hash.GetByOrFail(tmp_key.Val_(key));}} // LOCK:used by Xomp_ns_ord_mgr in xomp; DATE:2016-10-18 + public Object Get_by_or_null(int key) {synchronized (tmp_key) {return hash.GetByOrNull(tmp_key.Val_(key));}} // LOCK:used by Xomp_ns_ord_mgr in xomp; DATE:2016-10-18 public void Add(int key, Object obj) {hash.Add(Int_obj_ref.New(key), obj);} public void Add(Int_obj_ref key, Object obj) {hash.Add(key, obj);} - public void Add_if_dupe_use_1st(int key, Object obj) {hash.Add_if_dupe_use_1st(Int_obj_ref.New(key), obj);} - public void Add_if_dupe_use_nth(Int_obj_ref key, Object obj) {hash.Add_if_dupe_use_nth(key, obj);} + public void Add_if_dupe_use_1st(int key, Object obj) {hash.AddIfDupeUse1st(Int_obj_ref.New(key), obj);} + public void Add_if_dupe_use_nth(Int_obj_ref key, Object obj) {hash.AddIfDupeUseNth(key, obj);} public Hash_adp__int Add_as_bry(int key, String val) {hash.Add(Int_obj_ref.New(key), Bry_.new_u8(val)); return this;} } diff --git a/100_core/src/gplx/core/log_msgs/Gfo_msg_grp.java b/100_core/src/gplx/core/log_msgs/Gfo_msg_grp.java index c2b9c4603..e970afcb0 100644 --- a/100_core/src/gplx/core/log_msgs/Gfo_msg_grp.java +++ b/100_core/src/gplx/core/log_msgs/Gfo_msg_grp.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.log_msgs; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.log_msgs; import gplx.*; public class Gfo_msg_grp implements Gfo_msg_obj { public Gfo_msg_grp(Gfo_msg_grp owner, int uid, byte[] key) { this.owner = owner; this.uid = uid; this.key = key; this.key_str = String_.new_a7(key); @@ -32,7 +32,7 @@ public class Gfo_msg_grp implements Gfo_msg_obj { public byte[] Path() {return path;} private byte[] path; public String Path_str() {return String_.new_a7(path);} public Gfo_msg_obj Subs_get_by_key(String sub_key) { - int subs_len = subs.Count(); + int subs_len = subs.Len(); for (int i = 0; i < subs_len; i++) { Gfo_msg_obj sub = (Gfo_msg_obj)subs.Get_at(i); if (String_.Eq(sub_key, sub.Key_str())) return sub; diff --git a/100_core/src/gplx/core/log_msgs/Gfo_msg_root.java b/100_core/src/gplx/core/log_msgs/Gfo_msg_root.java index bbafe271c..657dc6d61 100644 --- a/100_core/src/gplx/core/log_msgs/Gfo_msg_root.java +++ b/100_core/src/gplx/core/log_msgs/Gfo_msg_root.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.log_msgs; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.log_msgs; import gplx.*; public class Gfo_msg_root { public Gfo_msg_root(String root_key) { this.root_key = root_key; @@ -40,7 +40,7 @@ public class Gfo_msg_root { public Gfo_msg_data Data_new_note_many(String owner_key, String key, String fmt, Object... vals) {return Data_new_many(Gfo_msg_itm_.Cmd_note, Bry_.Empty, -1, -1, owner_key, key, fmt, vals);} public Gfo_msg_data Data_new_many(byte cmd, String owner_key, String key, String fmt, Object[] vals) {return Data_new_many(cmd, Bry_.Empty, -1, -1, owner_key, key, fmt, vals);} public Gfo_msg_data Data_new_many(byte cmd, byte[] src, int bgn, int end, String owner_key, String key, String fmt, Object[] vals) { - Object owner_obj = owners.Get_by(owner_key); + Object owner_obj = owners.GetByOrNull(owner_key); Gfo_msg_grp owner = null; if (owner_obj == null) { owner = New_list_by_key(owner_key); diff --git a/100_core/src/gplx/core/primitives/EnmMgr.java b/100_core/src/gplx/core/primitives/EnmMgr.java index cda0e19cc..d3663f4f2 100644 --- a/100_core/src/gplx/core/primitives/EnmMgr.java +++ b/100_core/src/gplx/core/primitives/EnmMgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.primitives; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.primitives; import gplx.*; import gplx.core.strings.*; public class EnmMgr { public String BitRngSpr() {return bitRngSpr;} public EnmMgr BitRngSpr_(String val) {bitRngSpr = val; return this;} private String bitRngSpr = "+"; @@ -25,7 +25,7 @@ public class EnmMgr { valRegy.Add(val, raw); objRegy.Add(val, o); } - public Object Get(int val) {return objRegy.Get_by(val);} + public Object Get(int val) {return objRegy.GetByOrNull(val);} public int GetVal(String raw) { String[] ary = String_.Split(raw, bitRngSpr); int rv = 0; @@ -36,7 +36,7 @@ public class EnmMgr { if (String_.Has_at_bgn(term, "#")) cur = Int_.Parse(String_.Mid(term, 1)); else - cur = Int_.Cast(rawRegy.Get_by(term)); + cur = Int_.Cast(rawRegy.GetByOrNull(term)); rv |= cur; } return rv; @@ -60,7 +60,7 @@ public class EnmMgr { return sb.To_str(); } void AppendRaw(String_bldr sb, int key) { - String raw = (String)valRegy.Get_by(key); + String raw = (String)valRegy.GetByOrNull(key); if (sb.Count() > 0) sb.Add(bitRngSpr); if (prefix != null) sb.Add(prefix); sb.Add(raw); diff --git a/100_core/src/gplx/core/security/algos/Hash_algo_factory__composite.java b/100_core/src/gplx/core/security/algos/Hash_algo_factory__composite.java index d887f9d71..c14e104b5 100644 --- a/100_core/src/gplx/core/security/algos/Hash_algo_factory__composite.java +++ b/100_core/src/gplx/core/security/algos/Hash_algo_factory__composite.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.security.algos; import gplx.*; import gplx.core.*; import gplx.core.security.*; +package gplx.core.security.algos; import gplx.*; public class Hash_algo_factory__composite implements Hash_algo_factory { private boolean dirty = true; private final Ordered_hash hash = Ordered_hash_.New(); @@ -30,7 +30,7 @@ public class Hash_algo_factory__composite implements Hash_algo_factory { return algo_keys; } public Hash_algo New_hash_algo(String key) { - Hash_algo rv = (Hash_algo)hash.Get_by(key); + Hash_algo rv = (Hash_algo)hash.GetByOrNull(key); if (rv == null) { throw Err_.new_wo_type("hash_algo unknown; key=" + key); } diff --git a/100_core/src/gplx/core/security/algos/gplx_crypto/Hash_console_wtr_tst.java b/100_core/src/gplx/core/security/algos/gplx_crypto/Hash_console_wtr_tst.java index df5fd3806..bb1415e8d 100644 --- a/100_core/src/gplx/core/security/algos/gplx_crypto/Hash_console_wtr_tst.java +++ b/100_core/src/gplx/core/security/algos/gplx_crypto/Hash_console_wtr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.security.algos.gplx_crypto; import gplx.*; import gplx.core.*; import gplx.core.security.*; import gplx.core.security.algos.*; +package gplx.core.security.algos.gplx_crypto; import gplx.*; import org.junit.*; import gplx.core.consoles.*; import gplx.core.ios.streams.*; /*IoStream*/ public class Hash_console_wtr_tst { private final Hash_console_wtr_fxt fxt = new Hash_console_wtr_fxt(); @@ -39,7 +39,7 @@ class Hash_console_wtr_fxt { algo.Calc_hash_w_prog_as_str(stream, console); // test - String[] actl = console.Written().To_str_ary(); + String[] actl = console.Written().ToStrAry(); Tfds.Eq_ary(actl, expd); } } diff --git a/100_core/src/gplx/core/stores/xmls/XmlDataWtr_.java b/100_core/src/gplx/core/stores/xmls/XmlDataWtr_.java index 7b249286b..c6ebaa0c7 100644 --- a/100_core/src/gplx/core/stores/xmls/XmlDataWtr_.java +++ b/100_core/src/gplx/core/stores/xmls/XmlDataWtr_.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.stores.xmls; import gplx.*; import gplx.core.*; import gplx.core.stores.*; +package gplx.core.stores.xmls; import gplx.*; +import gplx.core.stores.*; import gplx.core.strings.*; import gplx.core.gfo_ndes.*; public class XmlDataWtr_ { public static DataWtr new_() {return XmlDataWtr.new_();} @@ -44,7 +45,7 @@ class XmlDataWtr extends DataWtr_base implements DataWtr { @Override public void WriteNodeBgn(String nodeName) {this.WriteXmlNodeBegin(nodeName);} @Override public void WriteNodeEnd() {this.WriteXmlNodeEnd();} public String To_str() { - while (names.Count() > 0) { + while (names.Len() > 0) { WriteXmlNodeEnd(); } return sb.To_str(); @@ -83,10 +84,10 @@ class XmlDataWtr extends DataWtr_base implements DataWtr { ndeOpened = false; } else { - String name = (String)names.Get_at_last(); + String name = (String)names.GetAtLast(); sb.Add("" + String_.CrLf); } - names.Del_at(names.Count() - 1); + names.DelAt(names.Len() - 1); // if (nde.ParentNode == null) throw Err_.new_wo_type("WriteXmlNodeEnd() called on root node"); // nde = nde.ParentNode; // WriteLineFeed(doc, nde); diff --git a/100_core/src/gplx/core/tests/Gfo_test_err_mgr.java b/100_core/src/gplx/core/tests/Gfo_test_err_mgr.java index 75ed93ce9..492ad5c12 100644 --- a/100_core/src/gplx/core/tests/Gfo_test_err_mgr.java +++ b/100_core/src/gplx/core/tests/Gfo_test_err_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.tests; import gplx.*; import gplx.core.*; +package gplx.core.tests; import gplx.*; public class Gfo_test_err_mgr { private final List_adp expd = List_adp_.New(); public void Init() { @@ -33,10 +33,10 @@ public class Gfo_test_err_mgr { int actl_len = actl.Len(); if (expd_len == 0 && actl_len == 0) {} else if (actl_len == 0) { - Gftest.Fail("expected some errors; got zero; expd={0}", expd.To_str()); + Gftest.Fail("expected some errors; got zero; expd={0}", expd.ToStr()); } else if (expd_len == 0) { - Gftest.Fail("expected zero errors; got some; actl={0}", actl.To_str()); + Gftest.Fail("expected zero errors; got some; actl={0}", actl.ToStr()); } else { for (int i = 0; i < actl_len; i++) { diff --git a/100_core/src/gplx/core/tests/Gfo_test_itm.java b/100_core/src/gplx/core/tests/Gfo_test_itm.java index b41debd6c..1b3f1a904 100644 --- a/100_core/src/gplx/core/tests/Gfo_test_itm.java +++ b/100_core/src/gplx/core/tests/Gfo_test_itm.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.tests; import gplx.*; import gplx.core.*; +package gplx.core.tests; import gplx.*; import gplx.core.strings.*; public class Gfo_test_itm { private final boolean is_expd; @@ -23,7 +23,7 @@ public class Gfo_test_itm { } public int Len() {return hash.Len();} public Gfo_test_itm Add(String key, Object val) {hash.Add(key, Keyval_.new_(key, val)); return this;} - private Object Get_by_val(String key) {return ((Keyval)hash.Get_by_or_fail(key)).Val();} + private Object Get_by_val(String key) {return ((Keyval)hash.GetByOrFail(key)).Val();} public String Get_str(String key) { Object val_obj = Get_by_val(key); if (Type_.Eq_by_obj(val_obj, byte[].class)) { @@ -77,7 +77,7 @@ public class Gfo_test_itm { String key = expd_kv.Key(); expd_ary[i] = Object_.Xto_str_strict_or_null(expd_kv.Val()); - Keyval actl_kv = (Keyval)actl.hash.Get_by(key); + Keyval actl_kv = (Keyval)actl.hash.GetByOrNull(key); actl_ary[i] = actl_kv == null ? "MISSING" : Object_.Xto_str_strict_or_null(actl_kv.Val()); } Gftest.Eq__ary(expd_ary, actl_ary); diff --git a/100_core/src/gplx/core/tests/Gfo_test_lnr_base.java b/100_core/src/gplx/core/tests/Gfo_test_lnr_base.java index 78da0fd79..05d2d44f7 100644 --- a/100_core/src/gplx/core/tests/Gfo_test_lnr_base.java +++ b/100_core/src/gplx/core/tests/Gfo_test_lnr_base.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.tests; import gplx.*; import gplx.core.*; +package gplx.core.tests; import gplx.*; import gplx.core.strings.*; public class Gfo_test_lnr_base { private String[] keys; @@ -37,10 +37,10 @@ public class Gfo_test_lnr_base { int actl_len = actl_list.Len(); if (expd_len == 0 && actl_len == 0) {} else if (actl_len == 0) { - Gftest.Fail("expected some itms; got zero; expd={0}", expd_list.To_str()); + Gftest.Fail("expected some itms; got zero; expd={0}", expd_list.ToStr()); } else if (expd_len == 0) { - Gftest.Fail("expected zero itms; got some; actl={0}", actl_list.To_str()); + Gftest.Fail("expected zero itms; got some; actl={0}", actl_list.ToStr()); } else { for (int i = 0; i < actl_len; i++) { diff --git a/100_core/src/gplx/core/tests/PerfLogMgr_fxt.java b/100_core/src/gplx/core/tests/PerfLogMgr_fxt.java index 2362a368e..e3c826385 100644 --- a/100_core/src/gplx/core/tests/PerfLogMgr_fxt.java +++ b/100_core/src/gplx/core/tests/PerfLogMgr_fxt.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.tests; import gplx.*; import gplx.core.*; +package gplx.core.tests; import gplx.*; import gplx.core.strings.*; import gplx.core.envs.*; public class PerfLogMgr_fxt { public void Init(Io_url url, String text) { this.url = url; - entries.Resize_bounds(1000); + entries.ResizeBounds(1000); entries.Add(new PerfLogItm(0, text + "|" + Datetime_now.Get().XtoStr_gplx())); tmr.Bgn(); } diff --git a/100_core/src/gplx/core/texts/StringTableBldr.java b/100_core/src/gplx/core/texts/StringTableBldr.java index 7eecbf241..52b9fc4f8 100644 --- a/100_core/src/gplx/core/texts/StringTableBldr.java +++ b/100_core/src/gplx/core/texts/StringTableBldr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.texts; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.texts; import gplx.*; import gplx.core.strings.*; public class StringTableBldr { public void ClearRows() {rows.Clear();} @@ -28,7 +28,7 @@ public class StringTableBldr { return this; } public StringTableCol FetchAtOrNew(int i) { - if (i < cols.Count()) return StringTableCol.as_(cols.Get_at(i)); + if (i < cols.Len()) return StringTableCol.as_(cols.Get_at(i)); StringTableCol col = StringTableCol.new_(); col.Halign_(defaultHalign); cols.Add(i, col); @@ -36,11 +36,11 @@ public class StringTableBldr { } public String To_str() { sb.Clear(); - for (int rowI = 0; rowI < rows.Count(); rowI++) { + for (int rowI = 0; rowI < rows.Len(); rowI++) { String[] row = (String[])rows.Get_at(rowI); for (int colI = 0; colI < row.length; colI++) { if (colI != 0) sb.Add(" "); - StringTableCol col = StringTableCol.as_(cols.Get_at(colI)); if (col == null) throw Err_.new_missing_idx(colI, cols.Count()); + StringTableCol col = StringTableCol.as_(cols.Get_at(colI)); if (col == null) throw Err_.new_missing_idx(colI, cols.Len()); sb.Add(col.PadCell(row[colI])); } sb.Add(String_.CrLf); diff --git a/100_core/src/gplx/core/threads/Thread_adp_mgr.java b/100_core/src/gplx/core/threads/Thread_adp_mgr.java index 48727157f..d17f8e84f 100644 --- a/100_core/src/gplx/core/threads/Thread_adp_mgr.java +++ b/100_core/src/gplx/core/threads/Thread_adp_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.threads; import gplx.*; import gplx.core.*; +package gplx.core.threads; import gplx.*; public class Thread_adp_mgr { private final Ordered_hash hash = Ordered_hash_.New(); private final int sleep_time, quit_time; @@ -21,7 +21,7 @@ public class Thread_adp_mgr { public void Add(String key, Thread_adp thread) { Thread_halt_itm itm = null; synchronized (hash) { - itm = (Thread_halt_itm)hash.Get_by(key); + itm = (Thread_halt_itm)hash.GetByOrNull(key); if (itm != null && !itm.Thread.Thread__is_alive()) hash.Del(key); } @@ -29,7 +29,7 @@ public class Thread_adp_mgr { hash.Add(key, itm); } public void Halt(String uid, Thread_halt_cbk cbk) { - Thread_halt_itm itm = (Thread_halt_itm)hash.Get_by(uid); + Thread_halt_itm itm = (Thread_halt_itm)hash.GetByOrNull(uid); Halt_by_wkr(itm, cbk); } public void Halt_all(Thread_halt_cbk cbk) { diff --git a/100_core/src/gplx/langs/dsvs/DsvDataRdr_.java b/100_core/src/gplx/langs/dsvs/DsvDataRdr_.java index 8f626a597..de62c81bf 100644 --- a/100_core/src/gplx/langs/dsvs/DsvDataRdr_.java +++ b/100_core/src/gplx/langs/dsvs/DsvDataRdr_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.dsvs; import gplx.*; import gplx.langs.*; +package gplx.langs.dsvs; import gplx.*; import gplx.core.strings.*; import gplx.core.gfo_ndes.*; import gplx.core.stores.*; import gplx.core.type_xtns.*; import gplx.core.texts.*; /*CharStream*/ public class DsvDataRdr_ { @@ -104,7 +104,7 @@ class DsvParser { throw Err_.new_wo_type("unable to process field value", "value", val); } void ProcessLine(CharStream strm, boolean cleanup) { - if (sb.Count() == 0 && tkns.Count() == 0) + if (sb.Count() == 0 && tkns.Len() == 0) if (csvOn) { // csvOn b/c csvMode allows blank lines as empty data if (cleanup) // cleanup b/c blankLine should not be added when called by cleanup, else will always add extra row at end return; // cleanup, so no further action needed; return; @@ -186,7 +186,7 @@ class DsvTblBldr { tkns.Clear(); else { // comments in HDR String_bldr sb = String_bldr_.new_(); - for (int i = 0; i < tkns.Count(); i++) + for (int i = 0; i < tkns.Len(); i++) sb.Add((String)tkns.Get_at(i)); layout.HeaderList().Add_Comment(sb.To_str()); tkns.Clear(); @@ -198,18 +198,18 @@ class DsvTblBldr { stage = Stage_Init; // NOTE: mark stage as INIT; } public void MakeVals(List_adp tkns) { - if (stage != Stage_Row) CreateFlds(tkns.Count()); // stage != Stage_Row means if (noRowsCreated) + if (stage != Stage_Row) CreateFlds(tkns.Len()); // stage != Stage_Row means if (noRowsCreated) GfoNde row = GfoNde_.vals_(tbl.SubFlds(), MakeValsAry(tkns)); tbl.Subs().Add(row); stage = Stage_Row; tkns.Clear(); } Object[] MakeValsAry(List_adp tkns) { GfoFldList subFlds = tbl.SubFlds(); int subFldsCount = subFlds.Count(); - if (tkns.Count() > subFldsCount) throw Err_.new_wo_type("values.Count cannot be greater than fields.Count", "values.Count", tkns.Count(), "fields.Count", subFldsCount); + if (tkns.Len() > subFldsCount) throw Err_.new_wo_type("values.Count cannot be greater than fields.Count", "values.Count", tkns.Len(), "fields.Count", subFldsCount); Object[] rv = new Object[subFldsCount]; for (int i = 0; i < subFldsCount; i++) { ClassXtn typx = subFlds.Get_at(i).Type(); - String val = i < tkns.Count() ? (String)tkns.Get_at(i) : null; + String val = i < tkns.Len() ? (String)tkns.Get_at(i) : null; rv[i] = typx.ParseOrNull(val); } return rv; @@ -223,7 +223,7 @@ class DsvTblBldr { stage = Stage_Hdr; } void CreateFlds(int valCount) { - int fldNamesCount = fldNames.Count(), fldTypesCount = fldTypes.Count(); + int fldNamesCount = fldNames.Len(), fldTypesCount = fldTypes.Len(); if (fldNamesCount == 0 && fldTypesCount == 0) { // csv tbls where no names or types, just values for (int i = 0; i < valCount; i++) tbl.SubFlds().Add("fld" + i, StringClassXtn.Instance); diff --git a/100_core/src/gplx/langs/dsvs/DsvDataRdr_csv_dat_tst.java b/100_core/src/gplx/langs/dsvs/DsvDataRdr_csv_dat_tst.java index 8b7b50a0b..0c3947c14 100644 --- a/100_core/src/gplx/langs/dsvs/DsvDataRdr_csv_dat_tst.java +++ b/100_core/src/gplx/langs/dsvs/DsvDataRdr_csv_dat_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.dsvs; import gplx.*; import gplx.langs.*; +package gplx.langs.dsvs; import gplx.*; import org.junit.*; import gplx.core.strings.*; import gplx.core.gfo_ndes.*; public class DsvDataRdr_csv_dat_tst { @Before public void setup() { @@ -171,7 +171,7 @@ class DsvDataRdr_fxt { GfoNde tbl = root.Subs().FetchAt_asGfoNde(i); actlList.Add(tbl.Name()); } - Tfds.Eq_ary(expdNames, actlList.To_str_ary()); + Tfds.Eq_ary(expdNames, actlList.ToStrAry()); return this; } public DsvDataRdr_fxt tst_DatNull() { diff --git a/100_core/src/gplx/langs/dsvs/DsvDataRdr_layout_tst.java b/100_core/src/gplx/langs/dsvs/DsvDataRdr_layout_tst.java index 912475d60..af917ae4e 100644 --- a/100_core/src/gplx/langs/dsvs/DsvDataRdr_layout_tst.java +++ b/100_core/src/gplx/langs/dsvs/DsvDataRdr_layout_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.dsvs; import gplx.*; import gplx.langs.*; +package gplx.langs.dsvs; import gplx.*; import org.junit.*; import gplx.core.gfo_ndes.*; import gplx.core.type_xtns.*; public class DsvDataRdr_layout_tst { @Test public void TableName() { @@ -119,7 +119,7 @@ public class DsvDataRdr_layout_tst { } void tst_Layout(int subIdx, int... expd) { GfoNde tbl = root.Subs().FetchAt_asGfoNde(subIdx); - DsvStoreLayout layout = (DsvStoreLayout)tbl.EnvVars().Get_by(DsvStoreLayout.Key_const); + DsvStoreLayout layout = (DsvStoreLayout)tbl.EnvVars().GetByOrNull(DsvStoreLayout.Key_const); int[] actl = new int[layout.HeaderList().Count()]; for (int i = 0; i < actl.length; i++) actl[i] = layout.HeaderList().Get_at(i).Id(); diff --git a/100_core/src/gplx/langs/dsvs/DsvHeaderList.java b/100_core/src/gplx/langs/dsvs/DsvHeaderList.java index c63f079ea..c2dcbfdfe 100644 --- a/100_core/src/gplx/langs/dsvs/DsvHeaderList.java +++ b/100_core/src/gplx/langs/dsvs/DsvHeaderList.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.dsvs; import gplx.*; import gplx.langs.*; +package gplx.langs.dsvs; import gplx.*; public class DsvHeaderList { - @gplx.Internal protected int Count() {return list.Count();} + @gplx.Internal protected int Count() {return list.Len();} @gplx.Internal protected DsvHeaderItm Get_at(int i) {return (DsvHeaderItm)list.Get_at(i);} public DsvHeaderList Add_LeafTypes() {this.Add(new DsvHeaderItm(DsvHeaderItm.Id_LeafTypes, null)); return this;} public DsvHeaderList Add_LeafNames() {this.Add(new DsvHeaderItm(DsvHeaderItm.Id_LeafNames, null)); return this;} diff --git a/100_core/src/gplx/langs/gfs/GfsRegy.java b/100_core/src/gplx/langs/gfs/GfsRegy.java index 8718fd634..6d5c206b2 100644 --- a/100_core/src/gplx/langs/gfs/GfsRegy.java +++ b/100_core/src/gplx/langs/gfs/GfsRegy.java @@ -1,28 +1,28 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.langs.gfs; import gplx.*; import gplx.langs.*; -class GfsRegy implements Gfo_invk { - public int Count() {return hash.Count();} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.langs.gfs; import gplx.*; +class GfsRegy implements Gfo_invk { + public int Count() {return hash.Len();} public void Clear() {hash.Clear(); typeHash.Clear();} public boolean Has(String k) {return hash.Has(k);} public GfsRegyItm Get_at(int i) {return (GfsRegyItm)hash.Get_at(i);} - public GfsRegyItm Get_by(String key) {return (GfsRegyItm)hash.Get_by(key);} - public GfsRegyItm FetchByType(Gfo_invk invk) {return (GfsRegyItm)typeHash.Get_by(Type_.Canonical_name_by_obj(invk));} + public GfsRegyItm Get_by(String key) {return (GfsRegyItm)hash.GetByOrNull(key);} + public GfsRegyItm FetchByType(Gfo_invk invk) {return (GfsRegyItm)typeHash.GetByOrNull(Type_.Canonical_name_by_obj(invk));} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - Object rv = (GfsRegyItm)hash.Get_by(k); if (rv == null) throw Err_.new_missing_key(k); + Object rv = (GfsRegyItm)hash.GetByOrNull(k); if (rv == null) throw Err_.new_missing_key(k); return rv; } public void AddObj(Gfo_invk invk, String key) {Add(key, invk, false);} @@ -31,10 +31,10 @@ class GfsRegy implements Gfo_invk { if (hash.Has(key)) return; GfsRegyItm regyItm = new GfsRegyItm().Key_(key).InvkAble_(invk).IsCmd_(typeCmd).TypeKey_(Type_.Canonical_name_by_obj(invk)); hash.Add(key, regyItm); - typeHash.Add_if_dupe_use_1st(regyItm.TypeKey(), regyItm); // NOTE: changed to allow same Object to be added under different aliases (app, xowa) DATE:2014-06-09; + typeHash.AddIfDupeUse1st(regyItm.TypeKey(), regyItm); // NOTE: changed to allow same Object to be added under different aliases (app, xowa) DATE:2014-06-09; } public void Del(String k) { - GfsRegyItm itm =(GfsRegyItm)hash.Get_by(k); + GfsRegyItm itm =(GfsRegyItm)hash.GetByOrNull(k); if (itm != null) typeHash.Del(itm.TypeKey()); hash.Del(k); } @@ -42,7 +42,7 @@ class GfsRegy implements Gfo_invk { Ordered_hash hash = Ordered_hash_.New(); public static GfsRegy new_() {return new GfsRegy();} GfsRegy() {} } -class GfsRegyItm implements Gfo_invk { +class GfsRegyItm implements Gfo_invk { public String Key() {return key;} public GfsRegyItm Key_(String v) {key = v; return this;} private String key; public String TypeKey() {return typeKey;} public GfsRegyItm TypeKey_(String v) {typeKey = v; return this;} private String typeKey; public boolean IsCmd() {return isCmd;} public GfsRegyItm IsCmd_(boolean v) {isCmd = v; return this;} private boolean isCmd; diff --git a/100_core/src/gplx/langs/regxs/Regx_adp.java b/100_core/src/gplx/langs/regxs/Regx_adp.java index af902f13e..9d3bc55d1 100644 --- a/100_core/src/gplx/langs/regxs/Regx_adp.java +++ b/100_core/src/gplx/langs/regxs/Regx_adp.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.regxs; import gplx.*; import gplx.langs.*; +package gplx.langs.regxs; import gplx.*; import java.util.regex.Matcher; import java.util.regex.Pattern; public class Regx_adp { @@ -39,7 +39,7 @@ public class Regx_adp { : find_bgn + find_len // otherwise search after find_end ; } - return (Regx_match[])rv.To_ary(Regx_match.class); + return (Regx_match[])rv.ToAry(Regx_match.class); } private int flags = FLAG__DOTALL | FLAG__UNICODE_CHARACTER_CLASS;// JRE.7:UNICODE_CHARACTER_CLASS; added during %w fix for en.w:A#; DATE:2015-06-10 private Pattern under; diff --git a/100_core/src/gplx/langs/regxs/Regx_adp__tst.java b/100_core/src/gplx/langs/regxs/Regx_adp__tst.java index d4ef0ea27..c6d7a7113 100644 --- a/100_core/src/gplx/langs/regxs/Regx_adp__tst.java +++ b/100_core/src/gplx/langs/regxs/Regx_adp__tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.regxs; import gplx.*; import gplx.langs.*; +package gplx.langs.regxs; import gplx.*; import org.junit.*; import gplx.core.tests.*; public class Regx_adp__tst implements TfdsEqListItmStr { @Test public void Match() { @@ -82,7 +82,7 @@ public class Regx_adp__tst implements TfdsEqListItmStr { rv.Add(itm.Groups()[j].Val()); } } - return rv.To_str_ary(); + return rv.ToStrAry(); } public String To_str(Object curObj, Object expdObj) { Regx_match cur = (Regx_match)curObj, expd = (Regx_match)expdObj; diff --git a/100_core/src/gplx/langs/xmls/XmlNdeList.java b/100_core/src/gplx/langs/xmls/XmlNdeList.java index 8c2a77223..53db50d92 100644 --- a/100_core/src/gplx/langs/xmls/XmlNdeList.java +++ b/100_core/src/gplx/langs/xmls/XmlNdeList.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.langs.xmls; import gplx.*; import gplx.langs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.langs.xmls; import gplx.*; import org.w3c.dom.NodeList; public interface XmlNdeList { int Count(); @@ -25,9 +25,9 @@ class XmlNdeList_cls_xml implements XmlNdeList { @gplx.Internal protected XmlNdeList_cls_xml(NodeList list) {this.list = list;} NodeList list; } class XmlNdeList_cls_list implements XmlNdeList { - public int Count() {return list.Count();} + public int Count() {return list.Len();} public XmlNde Get_at(int i) {return (XmlNde)list.Get_at(i);} public void Add(XmlNde xnde) {list.Add(xnde);} - @gplx.Internal protected XmlNdeList_cls_list(int count) {list = List_adp_.New(); list.Resize_bounds(count);} List_adp list; + @gplx.Internal protected XmlNdeList_cls_list(int count) {list = List_adp_.New(); list.ResizeBounds(count);} List_adp list; } //#} \ No newline at end of file diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java index 351321ae2..810cc02e8 100644 --- a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java +++ b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_memory_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import org.junit.*; public class IoEngine_fil_basic_memory_tst extends IoEngine_fil_basic_base_tst { @Override protected IoEngine engine_() {return IoEngine_.Mem_init_();} @@ -40,7 +40,7 @@ public class IoEngine_fil_basic_memory_tst extends IoEngine_fil_basic_base_tst { List_adp list = Tfds.RscDir.XtoNames(); // foreach (String s in list) // Tfds.Write(s); - list.Del_at(0); // remove drive + list.DelAt(0); // remove drive IoEngine_xrg_recycleFil recycleXrg = bin.Send_xrg(fil) .RootDirNames_(list) .AppName_("gplx.test").Time_(DateAdp_.parse_gplx("20100102_115559123")).Uuid_(Guid_adp_.Parse("467ffb41-cdfe-402f-b22b-be855425784b")); diff --git a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java index b316e7dd3..b86f218cd 100644 --- a/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java +++ b/100_core/tst/gplx/core/ios/IoEngine_fil_basic_system_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import org.junit.*; public class IoEngine_fil_basic_system_tst extends IoEngine_fil_basic_base_tst { @Override protected void setup_hook() { @@ -32,7 +32,7 @@ public class IoEngine_fil_basic_system_tst extends IoEngine_fil_basic_base_tst { fx.tst_ExistsPaths(true, fil); IoRecycleBin bin = IoRecycleBin.Instance; - List_adp list = root.XtoNames(); list.Del_at(0); // remove drive + List_adp list = root.XtoNames(); list.DelAt(0); // remove drive IoEngine_xrg_recycleFil recycleXrg = bin.Send_xrg(fil) .RootDirNames_(list) .AppName_("gplx.test").Time_(DateAdp_.parse_gplx("20100102_115559123")).Uuid_(Guid_adp_.Parse("467ffb41-cdfe-402f-b22b-be855425784b")); diff --git a/100_core/tst/gplx/core/ios/IoUrl_wnt_tst.java b/100_core/tst/gplx/core/ios/IoUrl_wnt_tst.java index 2e6fd01c1..797b2f0bb 100644 --- a/100_core/tst/gplx/core/ios/IoUrl_wnt_tst.java +++ b/100_core/tst/gplx/core/ios/IoUrl_wnt_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import org.junit.*; public class IoUrl_wnt_tst { IoUrlFxt fx = IoUrlFxt.new_(); @@ -79,7 +79,7 @@ public class IoUrl_wnt_tst { class IoUrlFxt { public void tst_Xto_api(Io_url url, String expd) {Tfds.Eq(expd, url.Xto_api());} public void tst_OwnerRoot(Io_url url, String expd) {Tfds.Eq(expd, url.OwnerRoot().Raw());} - public void tst_XtoNames(Io_url url, String... expdAry) {Tfds.Eq_ary(expdAry, url.XtoNames().To_str_ary());} + public void tst_XtoNames(Io_url url, String... expdAry) {Tfds.Eq_ary(expdAry, url.XtoNames().ToStrAry());} public void tst_NameAndExt(Io_url url, String expd) {Tfds.Eq(expd, url.NameAndExt());} public void tst_Xto_gplx(Io_url url, String expd) {Tfds.Eq(expd, url.Raw());} public void tst_IsDir(Io_url url, boolean expd) {Tfds.Eq(expd, url.Type_dir());} diff --git a/100_core/tst/gplx/core/stores/xmls/XmlDataRdr_tst.java b/100_core/tst/gplx/core/stores/xmls/XmlDataRdr_tst.java index 95f0b0684..bc2ad6bfe 100644 --- a/100_core/tst/gplx/core/stores/xmls/XmlDataRdr_tst.java +++ b/100_core/tst/gplx/core/stores/xmls/XmlDataRdr_tst.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.stores.xmls; import gplx.*; import gplx.core.*; import gplx.core.stores.*; +package gplx.core.stores.xmls; import gplx.*; +import gplx.core.stores.*; import org.junit.*; public class XmlDataRdr_tst { @Test public void Read() { @@ -93,7 +94,7 @@ class XmlDataRdr_fxt { while (subRdr.MoveNextPeer()) list.Add(subRdr.Read(key)); - String[] actlAry = list.To_str_ary(); + String[] actlAry = list.ToStrAry(); Tfds.Eq_ary(actlAry, expdAry); } public static XmlDataRdr_fxt new_() {return new XmlDataRdr_fxt();} XmlDataRdr_fxt() {} diff --git a/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr.java b/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr.java index 864b0d55b..cd47545c5 100644 --- a/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr.java +++ b/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfml; import gplx.*; -import gplx.core.texts.*; /*CharStream*/ +package gplx.gfml; import gplx.*; +import gplx.core.texts.*; /*CharStream*/ public interface GfmlLxr extends Gfo_evt_itm { - String Key(); - String[] Hooks(); - GfmlTkn CmdTkn(); - void CmdTkn_set(GfmlTkn val); // needed for lxr pragma - GfmlTkn MakeTkn(CharStream stream, int hookLength); - GfmlLxr SubLxr(); - void SubLxr_Add(GfmlLxr... lexer); -} -class GfmlLxrRegy { - public int Count() {return hash.Count();} - public void Add(GfmlLxr lxr) {hash.Add(lxr.Key(), lxr);} - public GfmlLxr Get_by(String key) {return (GfmlLxr)hash.Get_by(key);} - Hash_adp hash = Hash_adp_.New(); -} + String Key(); + String[] Hooks(); + GfmlTkn CmdTkn(); + void CmdTkn_set(GfmlTkn val); // needed for lxr pragma + GfmlTkn MakeTkn(CharStream stream, int hookLength); + GfmlLxr SubLxr(); + void SubLxr_Add(GfmlLxr... lexer); +} +class GfmlLxrRegy { + public int Count() {return hash.Len();} + public void Add(GfmlLxr lxr) {hash.Add(lxr.Key(), lxr);} + public GfmlLxr Get_by(String key) {return (GfmlLxr)hash.GetByOrNull(key);} + Hash_adp hash = Hash_adp_.New(); +} diff --git a/110_gfml/src_100_tkn/gplx/gfml/GfmlTkn_.java b/110_gfml/src_100_tkn/gplx/gfml/GfmlTkn_.java index 016ae104a..28b724efe 100644 --- a/110_gfml/src_100_tkn/gplx/gfml/GfmlTkn_.java +++ b/110_gfml/src_100_tkn/gplx/gfml/GfmlTkn_.java @@ -29,8 +29,8 @@ public class GfmlTkn_ { @gplx.Internal protected static GfmlTkn singleton_(String tknType, String raw, String val, GfmlBldrCmd cmd) {return new GfmlTkn_singleton().ctor_GfmlTkn_base(tknType, raw, val, cmd);} @gplx.Internal protected static GfmlTkn composite_(String tknType, GfmlTkn[] ary) {return new GfmlTkn_composite(tknType, ary);} @gplx.Internal protected static GfmlTkn composite_list_(String tknType, GfmlObjList list) { - GfmlTkn[] ary = new GfmlTkn[list.Count()]; - for (int i = 0; i < list.Count(); i++) + GfmlTkn[] ary = new GfmlTkn[list.Len()]; + for (int i = 0; i < list.Len(); i++) ary[i] = (GfmlTkn)list.Get_at(i); return GfmlTkn_.composite_(tknType, ary); } diff --git a/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java b/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java index 01c4cf450..93cc7aa37 100644 --- a/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java +++ b/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java @@ -1,23 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; import gplx.core.texts.*; /*CharStream*/ public class GfmlTrie { public String[] Symbols() { - String[] rv = new String[symbols.Count()]; + String[] rv = new String[symbols.Len()]; for (int i = 0; i < rv.length; i++) rv[i] = String_.cast(symbols.Get_at(i)); return rv; @@ -77,7 +77,7 @@ public class GfmlTrie { curLink = foundAsLink; } } - symbols.Add_if_dupe_use_nth(symbol, symbol); + symbols.AddIfDupeUseNth(symbol, symbol); } public void Del(String symbol) { char[] ary = String_.XtoCharAry(symbol); int lastIndex = ary.length - 1; diff --git a/110_gfml/src_200_type/gplx/gfml/GfmlFldList.java b/110_gfml/src_200_type/gplx/gfml/GfmlFldList.java index 4d6d578ad..cb75a29ba 100644 --- a/110_gfml/src_200_type/gplx/gfml/GfmlFldList.java +++ b/110_gfml/src_200_type/gplx/gfml/GfmlFldList.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfml; import gplx.*; +package gplx.gfml; import gplx.*; public class GfmlFldList { - public int Count() {return hash.Count();} - public GfmlFld Get_at(int index) {return (GfmlFld)hash.Get_at(index);} - public GfmlFld Get_by(String id) {return (GfmlFld)hash.Get_by(id);} - public void Add(GfmlFld fld) { - if (String_.Len_eq_0(fld.Name())) throw Err_.new_wo_type("fld name cannot be null"); - if (hash.Has(fld.Name())) throw Err_.new_wo_type("key already exists", "key", fld.Name()); // FIXME: commented out to allow multiple types with same name; need "_type:invk" - hash.Add_if_dupe_use_nth(fld.Name(), fld); - } - public void Del(GfmlFld fld) { - hash.Del(fld); - hash.Del(fld.Name()); - } - Ordered_hash hash = Ordered_hash_.New(); - public static GfmlFldList new_() {return new GfmlFldList();} GfmlFldList() {} -} + public int Count() {return hash.Len();} + public GfmlFld Get_at(int index) {return (GfmlFld)hash.Get_at(index);} + public GfmlFld Get_by(String id) {return (GfmlFld)hash.GetByOrNull(id);} + public void Add(GfmlFld fld) { + if (String_.Len_eq_0(fld.Name())) throw Err_.new_wo_type("fld name cannot be null"); + if (hash.Has(fld.Name())) throw Err_.new_wo_type("key already exists", "key", fld.Name()); // FIXME: commented out to allow multiple types with same name; need "_type:invk" + hash.AddIfDupeUseNth(fld.Name(), fld); + } + public void Del(GfmlFld fld) { + hash.Del(fld); + hash.Del(fld.Name()); + } + Ordered_hash hash = Ordered_hash_.New(); + public static GfmlFldList new_() {return new GfmlFldList();} GfmlFldList() {} +} diff --git a/110_gfml/src_200_type/gplx/gfml/GfmlTypeCompiler.java b/110_gfml/src_200_type/gplx/gfml/GfmlTypeCompiler.java index 55cca323c..cdce5c578 100644 --- a/110_gfml/src_200_type/gplx/gfml/GfmlTypeCompiler.java +++ b/110_gfml/src_200_type/gplx/gfml/GfmlTypeCompiler.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlTypeCompiler { @gplx.Internal protected static GfmlType Compile(GfmlNde nde, GfmlType owner, GfmlTypRegy typeRegy, Ordered_hash results) {return Compile(nde, owner, true, typeRegy, results);} @@ -63,7 +63,7 @@ class GfmlTypeCompiler { static GfmlType FetchTypeOrNew(String name, String typeKey, GfmlTypRegy typeRegy, Ordered_hash results) { GfmlType rv = typeRegy.FetchOrNull(typeKey); // look for type in regy to see if it was declared earlier if (rv == GfmlType_.Null) { - rv = (GfmlType)results.Get_by(rv.Key()); // look for type in current pragma's results + rv = (GfmlType)results.GetByOrNull(rv.Key()); // look for type in current pragma's results if (rv == null) { // nothing found; create and add rv = GfmlType_.new_(typeKey, name); results.Add(typeKey, rv); diff --git a/110_gfml/src_200_type/gplx/gfml/GfmlTypeHash.java b/110_gfml/src_200_type/gplx/gfml/GfmlTypeHash.java index 03079d0a5..8313f15b9 100644 --- a/110_gfml/src_200_type/gplx/gfml/GfmlTypeHash.java +++ b/110_gfml/src_200_type/gplx/gfml/GfmlTypeHash.java @@ -1,21 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; -class GfmlTypeHash { - public GfmlType Get_by(String key) {return (GfmlType)hash.Get_by(key);} +class GfmlTypeHash { + public GfmlType Get_by(String key) {return (GfmlType)hash.GetByOrNull(key);} public void Add(GfmlType type) { if (type.IsTypeNull()) throw Err_.new_wo_type("cannot add null type to GfmlTypeHash"); if (hash.Has(type.Key())) throw Err_.new_wo_type("type key already exists", "key", type.Key()); @@ -24,7 +24,7 @@ class GfmlTypeHash { Hash_adp hash = Hash_adp_.New(); public static GfmlTypeHash new_() {return new GfmlTypeHash();} GfmlTypeHash() {} } -class GfmlTypRegy { +class GfmlTypRegy { public boolean Has(String typeKey) {return hash.Has(typeKey);} public GfmlType FetchOrNull(String typeKey) {return FetchOrNull(typeKey, GfmlDocPos_.Root);} public GfmlType FetchOrNull(String typeKey, GfmlDocPos pos) { diff --git a/110_gfml/src_200_type/gplx/gfml/GfmlTypeMakr.java b/110_gfml/src_200_type/gplx/gfml/GfmlTypeMakr.java index 9fc808514..8e1bb80ae 100644 --- a/110_gfml/src_200_type/gplx/gfml/GfmlTypeMakr.java +++ b/110_gfml/src_200_type/gplx/gfml/GfmlTypeMakr.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlTypeMakr { public GfmlType Owner() {return owner;} @@ -37,7 +37,7 @@ class GfmlTypeMakr { } public void AddSubFld(GfmlFld subFld) {AddSubFld_imp(owner, subFld);} public GfmlType[] Xto_bry() { - GfmlType[] rv = (GfmlType[])list.To_ary(GfmlType.class); + GfmlType[] rv = (GfmlType[])list.ToAry(GfmlType.class); list.Clear(); owner = null; return rv; diff --git a/110_gfml/src_200_type/gplx/gfml/GfmlTypeMgr.java b/110_gfml/src_200_type/gplx/gfml/GfmlTypeMgr.java index dbcceaa40..969049471 100644 --- a/110_gfml/src_200_type/gplx/gfml/GfmlTypeMgr.java +++ b/110_gfml/src_200_type/gplx/gfml/GfmlTypeMgr.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; import gplx.core.lists.*;/*StackAdp*/ class GfmlTypeMgr { @@ -101,20 +101,20 @@ class GfmlTypeMgr { StackAdp stack = StackAdp_.new_(), ownerNdeStack = StackAdp_.new_(); public static GfmlTypeMgr new_() {return new GfmlTypeMgr();} GfmlTypeMgr() {} } -class GfmlFldPool { +class GfmlFldPool { public GfmlTkn Keyed_PopNextAsTkn() {return GfmlTkn_.val_(Keyed_PopNext().Name());} // helper method for GfmlFrame_nde public GfmlFld Keyed_PopNext() { - if (keyedRegy.Count() == 0) return GfmlFld.Null; + if (keyedRegy.Len() == 0) return GfmlFld.Null; GfmlFld rv = (GfmlFld)keyedRegy.Get_at(0); keyedRegy.Del(rv.Name()); return rv; } public GfmlFld Keyed_PopByKey(String key) { - GfmlFld rv = (GfmlFld)keyedRegy.Get_by(key); if (rv == null) return GfmlFld.Null; + GfmlFld rv = (GfmlFld)keyedRegy.GetByOrNull(key); if (rv == null) return GfmlFld.Null; keyedRegy.Del(rv.Name()); return rv; } - @gplx.Internal protected int Keyd_Count() {return keyedRegy.Count();} + @gplx.Internal protected int Keyd_Count() {return keyedRegy.Len();} @gplx.Internal protected GfmlFld Keyd_FetchAt(int i) {return (GfmlFld)keyedRegy.Get_at(i);} public GfmlFld DefaultMember() {return defaultMember;} GfmlFld defaultMember = GfmlFld.Null; @gplx.Internal protected GfmlType Type() {return type;} GfmlType type = GfmlType_.Null; diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlAtr.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlAtr.java index 2bbddc5f5..237523d6f 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlAtr.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlAtr.java @@ -1,26 +1,26 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; -public class GfmlAtr implements GfmlItm { +public class GfmlAtr implements GfmlItm { public int ObjType() {return GfmlObj_.Type_atr;} public GfmlTkn KeyTkn() {return keyTkn;} GfmlTkn keyTkn; public String Key() {return keyTkn.Val();} public GfmlTkn DatTkn() {return datTkn;} GfmlTkn datTkn; public GfmlType Type() {return type;} GfmlType type; public boolean KeyedSubObj() {return true;} - public int SubObjs_Count() {return subObjs.Count();} + public int SubObjs_Count() {return subObjs.Len();} public GfmlObj SubObjs_GetAt(int i) {return (GfmlObj)subObjs.Get_at(i);} GfmlObjList subObjs = GfmlObjList.new_(); // PERF?: make capacity 3 instead of 8 public void SubObjs_Add(GfmlObj o) {subObjs.Add(o);} public String To_str() {return String_.Concat(this.Key(), "=", this.DatTkn().Val());} @@ -41,13 +41,13 @@ public class GfmlAtr implements GfmlItm { int idx = GetTknIdx(oldTkn); GfmlTkn tkn = MakeTkn(oldTkn, s); if (idx != -1) - subObjs.Del_at(idx); + subObjs.DelAt(idx); if (idx == -1) idx = 0; subObjs.Add_at(tkn, idx); return tkn; } int GetTknIdx(GfmlTkn t) { - for (int i = 0; i < subObjs.Count(); i++) { + for (int i = 0; i < subObjs.Len(); i++) { GfmlObj obj = (GfmlObj)subObjs.Get_at(i); if (obj == t) return i; } diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java index cbd5374d9..9e7a94533 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; public class GfmlDoc_ { public static GfmlDoc parse_any_eol_(String raw) {return parse(String_.Replace(raw, String_.CrLf, String_.Lf));} @@ -35,7 +35,7 @@ class GfmlUsrMsgs { } public static Err gfmlParseError(GfmlBldr bldr) { Err rv = Err_.new_wo_type("gfml parse error"); - for (int i = 0; i < bldr.Doc().UsrMsgs().Count(); i++) { + for (int i = 0; i < bldr.Doc().UsrMsgs().Len(); i++) { UsrMsg um = (UsrMsg)bldr.Doc().UsrMsgs().Get_at(i); rv.Args_add("err" + Int_.To_str(i), um.To_str()); } diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmHnds.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmHnds.java index 8991f896d..fa72398af 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmHnds.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmHnds.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfml; import gplx.*; +package gplx.gfml; import gplx.*; public class GfmlItmHnds { - public int Count() {return list.Count();} List_adp list = List_adp_.New(); - public GfmlNde Get_at(int idx) {return (GfmlNde)list.Get_at(idx);} - public void Add(GfmlNde nde) {list.Add(nde);} - public static GfmlItmHnds new_() {return new GfmlItmHnds();} GfmlItmHnds() {} -} + public int Count() {return list.Len();} List_adp list = List_adp_.New(); + public GfmlNde Get_at(int idx) {return (GfmlNde)list.Get_at(idx);} + public void Add(GfmlNde nde) {list.Add(nde);} + public static GfmlItmHnds new_() {return new GfmlItmHnds();} GfmlItmHnds() {} +} diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmKeys.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmKeys.java index 8b713dad7..38917222d 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmKeys.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlItmKeys.java @@ -15,10 +15,10 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.gfml; import gplx.*; public class GfmlItmKeys { - public int Count() {return list.Count();} + public int Count() {return list.Len();} public boolean Has(String key) {return hash.Has(key);} public GfmlItm Get_at(int i) {return (GfmlItm)list.Get_at(i);} - public GfmlItm Get_by(String key) {return (GfmlItm)hash.Get_by(key);} + public GfmlItm Get_by(String key) {return (GfmlItm)hash.GetByOrNull(key);} public String FetchDataOr(String key, String or) { GfmlAtr atr = FetchAtr(key); return (atr == null) ? or : atr.DatTkn().Val(); @@ -52,7 +52,7 @@ public class GfmlItmKeys { } if (toDel != null) list.Del(toDel); } - GfmlAtr FetchAtr(String key) {return GfmlAtr.as_(hash.Get_by(key));} + GfmlAtr FetchAtr(String key) {return GfmlAtr.as_(hash.GetByOrNull(key));} List_adp list = List_adp_.New(); Hash_adp hash = Hash_adp_.New(); public static GfmlItmKeys new_() {return new GfmlItmKeys();} GfmlItmKeys() {} @gplx.Internal protected static final String NullKey = ""; diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlNde.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlNde.java index 7a743d5f6..f0ac43a5e 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlNde.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlNde.java @@ -1,27 +1,27 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; -public class GfmlNde implements GfmlItm { +public class GfmlNde implements GfmlItm { public static final int OBJ_TYPE = GfmlObj_.Type_nde; public int ObjType() {return objType;} int objType = GfmlObj_.Type_nde; public GfmlTkn KeyTkn() {return keyTkn;} public String Key() {return keyTkn.Val();} GfmlTkn keyTkn = GfmlTkn_.Null; public GfmlType Type() {return type;} GfmlType type; public boolean KeyedSubObj() {return keyedSubObj;} public GfmlNde KeyedSubObj_(boolean v) {keyedSubObj = v; return this;} private boolean keyedSubObj; public int ChainId() {return chainId;} public GfmlNde ChainId_(int v) {chainId = v; return this;} int chainId; // can use boolean chainHead, but this is easier for debugging - public int SubObjs_Count() {return subObjs.Count();} GfmlObjList subObjs = GfmlObjList.new_(); + public int SubObjs_Count() {return subObjs.Len();} GfmlObjList subObjs = GfmlObjList.new_(); public GfmlObj SubObjs_GetAt(int i) {return (GfmlObj)subObjs.Get_at(i);} public void SubObjs_Add(GfmlObj gobj) { subObjs.Add(gobj); @@ -61,8 +61,8 @@ public class GfmlNde implements GfmlItm { // a:{} -> a:{b:{}} } int PosOf(boolean fwd, String... find) { - int bgn = fwd ? 0 : subObjs.Count() - 1; - int end = fwd ? subObjs.Count() : 0; + int bgn = fwd ? 0 : subObjs.Len() - 1; + int end = fwd ? subObjs.Len() : 0; int dif = fwd ? 1 : -1; for (int i = bgn; i != end; i+=dif) { GfmlObj subObj = (GfmlObj)subObjs.Get_at(i); diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlScopeItm.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlScopeItm.java index 67fa9f51e..58bbd17d6 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlScopeItm.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlScopeItm.java @@ -1,26 +1,26 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; -interface GfmlScopeItm { +interface GfmlScopeItm { String Key(); GfmlDocPos DocPos(); } class GfmlScopeRegy { public boolean Has(String key) { - GfmlScopeList list = (GfmlScopeList)hash.Get_by(key); if (list == null) return false; + GfmlScopeList list = (GfmlScopeList)hash.GetByOrNull(key); if (list == null) return false; return list.Count() > 0; } public void Add(GfmlScopeItm itm) { @@ -28,16 +28,16 @@ class GfmlScopeRegy { list.Add(itm); } public void Del(GfmlScopeItm itm) { - GfmlScopeList list = (GfmlScopeList)hash.Get_by(itm.Key()); if (list == null) return; + GfmlScopeList list = (GfmlScopeList)hash.GetByOrNull(itm.Key()); if (list == null) return; list.Del(itm); if (list.Count() == 0) hash.Del(itm.Key()); } public GfmlScopeItm Get_by(String key, GfmlDocPos pos) { - GfmlScopeList list = (GfmlScopeList)hash.Get_by(key); if (list == null) return null; + GfmlScopeList list = (GfmlScopeList)hash.GetByOrNull(key); if (list == null) return null; return list.Get_by(pos); } GfmlScopeList ItmOrNew(String key) { - GfmlScopeList rv = (GfmlScopeList)hash.Get_by(key); + GfmlScopeList rv = (GfmlScopeList)hash.GetByOrNull(key); if (rv == null) { rv = GfmlScopeList.new_(key); hash.Add(key, rv); @@ -49,11 +49,11 @@ class GfmlScopeRegy { } class GfmlScopeList { public String Key() {return key;} private String key; - public int Count() {return list.Count();} + public int Count() {return list.Len();} public void Add(GfmlScopeItm itm) {list.Add(itm);} public void Del(GfmlScopeItm itm) {list.Del(itm);} public GfmlScopeItm Get_by(GfmlDocPos pos) { - if (list.Count() == 0) return null; + if (list.Len() == 0) return null; GfmlScopeItm rv = null; for (Object itemObj : list) { GfmlScopeItm itm = (GfmlScopeItm)itemObj; diff --git a/110_gfml/src_400_pragma/gplx/gfml/GfmlPragma.java b/110_gfml/src_400_pragma/gplx/gfml/GfmlPragma.java index f2772cc65..7dfea1670 100644 --- a/110_gfml/src_400_pragma/gplx/gfml/GfmlPragma.java +++ b/110_gfml/src_400_pragma/gplx/gfml/GfmlPragma.java @@ -1,30 +1,30 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; import gplx.core.lists.*;/*Hash_adp_list*/ -interface GfmlPragma { +interface GfmlPragma { String KeyOfPragma(); void Exec(GfmlBldr bldr, GfmlNde pragmaNde); GfmlType[] MakePragmaTypes(GfmlTypeMakr typeMakr); } -class GfmlPragmaMgr { +class GfmlPragmaMgr { public void Pragmas_add(GfmlPragma cmd) {pragmas.Add(cmd.KeyOfPragma(), cmd);} public boolean Pragmas_compile(String ndeName, GfmlBldr bldr) { - if (pragmas.Count() == 0) return false; - GfmlPragma cmd = (GfmlPragma)pragmas.Get_by(ndeName); if (cmd == null) return false; + if (pragmas.Len() == 0) return false; + GfmlPragma cmd = (GfmlPragma)pragmas.GetByOrNull(ndeName); if (cmd == null) return false; GfmlNde pragmaNde = bldr.CurNde(); pragmaNde.ObjType_set_pragma(); cmd.Exec(bldr, pragmaNde); @@ -37,8 +37,8 @@ class GfmlPragmaMgr { public void EndCmds_del(GfmlDocPos pos, GfmlBldrCmd cmd) {endCmds.DelInList(pos.Path(), cmd);} public void EndCmds_exec(GfmlDocPos pos, GfmlBldr bldr) {Exec(pos, bldr, endCmds);} static void Exec(GfmlDocPos pos, GfmlBldr bldr, Hash_adp_list cmds) { - List_adp list = cmds.Get_by(pos.Path()); if (list == null) return; - for (int i = 0; i < list.Count(); i++) { + List_adp list = cmds.GetByOrNull(pos.Path()); if (list == null) return; + for (int i = 0; i < list.Len(); i++) { GfmlBldrCmd cmd = (GfmlBldrCmd)list.Get_at(i); cmd.Exec(bldr, GfmlTkn_.Null); } diff --git a/110_gfml/src_400_pragma/gplx/gfml/GfmlVarCtx.java b/110_gfml/src_400_pragma/gplx/gfml/GfmlVarCtx.java index 620cffdf1..dd97e383a 100644 --- a/110_gfml/src_400_pragma/gplx/gfml/GfmlVarCtx.java +++ b/110_gfml/src_400_pragma/gplx/gfml/GfmlVarCtx.java @@ -16,10 +16,10 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.gfml; import gplx.*; class GfmlVarCtx { public String Key() {return key;} private String key; - public void Add_if_dupe_use_nth(GfmlVarItm itm) {hash.Add_if_dupe_use_nth(itm.Key(), itm);} + public void Add_if_dupe_use_nth(GfmlVarItm itm) {hash.AddIfDupeUseNth(itm.Key(), itm);} public void Del(String key) {hash.Del(key);} public String Fetch_Val(String key) { - GfmlVarItm itm = (GfmlVarItm)hash.Get_by(key); if (itm == null) return null; + GfmlVarItm itm = (GfmlVarItm)hash.GetByOrNull(key); if (itm == null) return null; return itm.TknVal(); } Hash_adp hash = Hash_adp_.New(); @@ -32,7 +32,7 @@ class GfmlVarCtx { class GfmlVarCtx_ { public static GfmlVarCtx FetchFromCacheOrNew(Hash_adp cache, String ctxKey) { Hash_adp ctxRegy = FetchRegyOrNew(cache); - GfmlVarCtx rv = (GfmlVarCtx)ctxRegy.Get_by(ctxKey); + GfmlVarCtx rv = (GfmlVarCtx)ctxRegy.GetByOrNull(ctxKey); if (rv == null) { rv = (String_.Eq(ctxKey, DefaultKey)) ? default_(ctxKey) @@ -49,7 +49,7 @@ class GfmlVarCtx_ { } static Hash_adp FetchRegyOrNew(Hash_adp cache) { String key = "gfml.cacheKeys.ctxRegy"; - Hash_adp rv = (Hash_adp)cache.Get_by(key); + Hash_adp rv = (Hash_adp)cache.GetByOrNull(key); if (rv == null) { rv = Hash_adp_.New(); cache.Add(key, rv); diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlBldr.java b/110_gfml/src_500_build/gplx/gfml/GfmlBldr.java index 8427d464a..29662f093 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlBldr.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlBldr.java @@ -1,21 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; import gplx.core.texts.*; /*CharStream*/ -public class GfmlBldr { +public class GfmlBldr { @gplx.Internal protected GfmlDoc Doc() {return gdoc;} GfmlDoc gdoc = GfmlDoc.new_(); @gplx.Internal protected GfmlFrame CurFrame() {return curFrame;} GfmlFrame curFrame; @gplx.Internal protected GfmlFrame_nde CurNdeFrame() {return curNdeFrame;} GfmlFrame_nde curNdeFrame; @@ -39,7 +39,7 @@ public class GfmlBldr { curNdeFrame.Build_end(this, GfmlFrame_nde_.OwnerRoot_); if (frameStack.Count() > 0) UsrMsgs_fail(GfmlUsrMsgs.fail_Frame_danglingBgn()); } - if (throwErrors && gdoc.UsrMsgs().Count() > 0) throw GfmlUsrMsgs.gfmlParseError(this); + if (throwErrors && gdoc.UsrMsgs().Len() > 0) throw GfmlUsrMsgs.gfmlParseError(this); raw = ""; return gdoc; } diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmd.java b/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmd.java index 3b76d7a4d..65fd6ba09 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmd.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmd.java @@ -27,7 +27,7 @@ class GfmlBldrCmd_null implements GfmlBldrCmd { } class GfmlBldrCmdRegy { public void Add(GfmlBldrCmd cmd) {hash.Add(cmd.Key(), cmd);} - public GfmlBldrCmd GetOrFail(String key) {return (GfmlBldrCmd)hash.Get_by_or_fail(key);} + public GfmlBldrCmd GetOrFail(String key) {return (GfmlBldrCmd)hash.GetByOrFail(key);} Hash_adp hash = Hash_adp_.New(); public static GfmlBldrCmdRegy new_() { GfmlBldrCmdRegy rv = new GfmlBldrCmdRegy(); diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmds.java b/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmds.java index 3be8fb1d7..c0f41c842 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmds.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlBldrCmds.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlBldrCmd_pendingTkns_add implements GfmlBldrCmd { public String Key() {return "gfml.pendingTkns_add";} @@ -111,12 +111,12 @@ class GfmlBldrCmd_frameEnd implements GfmlBldrCmd { class GfmlBldrCmd_whitespace implements GfmlBldrCmd { public String Key() {return "gfml.whitespace_exec";} public void Exec(GfmlBldr bldr, GfmlTkn tkn) { - if (bldr.CurNdeFrame().waitingTkns.Count() > 0) { - GfmlObj t = (GfmlObj)bldr.CurNdeFrame().waitingTkns.Get_at(bldr.CurNdeFrame().waitingTkns.Count() - 1); + if (bldr.CurNdeFrame().waitingTkns.Len() > 0) { + GfmlObj t = (GfmlObj)bldr.CurNdeFrame().waitingTkns.Get_at(bldr.CurNdeFrame().waitingTkns.Len() - 1); if (t.ObjType() == GfmlObj_.Type_nde) - bldr.CurNdeFrame().IdxNdeBgn_set(bldr.CurNdeFrame().WaitingTkns().Count() + 1); + bldr.CurNdeFrame().IdxNdeBgn_set(bldr.CurNdeFrame().WaitingTkns().Len() + 1); } - if (bldr.CurFrame().WaitingTkns().Count() == 0) { + if (bldr.CurFrame().WaitingTkns().Len() == 0) { bldr.CurNde().SubObjs_Add(tkn); // if curFrame begins with whitespace, add directly to node (whitespace should not belong to atr) } else diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlFrame_nde.java b/110_gfml/src_500_build/gplx/gfml/GfmlFrame_nde.java index 57b0ba490..6659943dc 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlFrame_nde.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlFrame_nde.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfml; import gplx.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfml; class GfmlFrame_nde extends GfmlFrame_base { @Override public int FrameType() {return GfmlFrame_.Type_nde;} public GfmlNde CurNde() {return nde;} GfmlNde nde; @@ -105,7 +105,7 @@ class GfmlFrame_nde extends GfmlFrame_base { if (!frmHasParens) { bldr.Frames_end(); GfmlFrame_nde frm = bldr.CurNdeFrame(); // get the current frm after all popped - int idx = frm.waitingTkns.Count(); // NOTE: reset idxs b/c endFrame will automatically set to 0, and should be objCount + int idx = frm.waitingTkns.Len(); // NOTE: reset idxs b/c endFrame will automatically set to 0, and should be objCount frm.tknMgr.IdxAtrBgn_setHack(idx); frm.tknMgr.IdxNdeBgn_set(idx); frm.nullArea = false; // NOTE: endFrame automatically sets nullArea to true; set to false @@ -114,7 +114,7 @@ class GfmlFrame_nde extends GfmlFrame_base { public void NdeProp_bgn(GfmlTkn symTkn) { // EX: < [ > int oldNdeBgn = tknMgr.IdxNdeBgn(); // get oldNdeBgn; needed for header atrs; EX: < a:b [d] > ndeBgn = 0 (a pos), but will start keyNde at 5 ([ pos) GfmlTkn keyTkn = tknMgr.KeyTkn_pop(); boolean keyTknExists = keyTkn != GfmlTkn_.Null; - int newNdeBgn = keyTknExists ? tknMgr.IdxAtrBgn() : waitingTkns.Count(); // if there is a key, set ndeBgn end atrBgn (EX: a=[); else set end curIdx + int newNdeBgn = keyTknExists ? tknMgr.IdxAtrBgn() : waitingTkns.Len(); // if there is a key, set ndeBgn end atrBgn (EX: a=[); else set end curIdx tknMgr.IdxNdeBgn_set(newNdeBgn); WaitingTkns_AddSym(symTkn, GfmlNdeSymType.PrpBgn); tknMgr.ConsumeWaitingDatTkn(nde);// NEEDED for KeydDefault @@ -156,7 +156,7 @@ class GfmlFrame_nde extends GfmlFrame_base { } else if (ndeType == GfmlNdeStartType.Prop) {} else { - ownerNdeFrame.tknMgr.IdxNdeBgn_set(ownerNdeFrame.waitingTkns.Count()); + ownerNdeFrame.tknMgr.IdxNdeBgn_set(ownerNdeFrame.waitingTkns.Len()); ownerNdeFrame.nullArea = true; // reset } } @@ -204,20 +204,20 @@ class GfmlFrame_nde_ { @gplx.Internal protected static GfmlFrame_nde root_(GfmlBldr bldr, GfmlNde newNde, GfmlLxr newLxr) {return GfmlFrame_nde.new_(bldr, newNde, newLxr);} @gplx.Internal protected static final GfmlFrame_nde OwnerRoot_ = null; @gplx.Internal protected static void TransferToNde(GfmlObjList waitingTkns, GfmlNde nde, int bgn) { - int end = waitingTkns.Count(); + int end = waitingTkns.Len(); for (int i = bgn; i < end; i++) { GfmlObj tkn = waitingTkns.Get_at(i); nde.SubObjs_Add(tkn); } if (bgn != end) // ignore if bgn == end - waitingTkns.Del_range(bgn, end - 1); + waitingTkns.DelRange(bgn, end - 1); } @gplx.Internal protected static void TransferToAtr(GfmlObjList src, GfmlAtr trg, int bgn, int end) { int len = end - bgn; if (len <= 0 || end == -1) return; // -1 b/c calling proc passes end - 1, and end may be 0 for (int i = 0; i < len; i++) trg.SubObjs_Add(src.Get_at(i + bgn)); - src.Del_range(bgn, end - 1); + src.DelRange(bgn, end - 1); } } class GfmlNdeStartType { diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlFrame_ndeTknMgr.java b/110_gfml/src_500_build/gplx/gfml/GfmlFrame_ndeTknMgr.java index 2a100922b..33a94848b 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlFrame_ndeTknMgr.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlFrame_ndeTknMgr.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlFrame_ndeTknMgr { public int IdxAtrBgn() {return idxAtrBgn;} int idxAtrBgn, idxAtrEnd; @@ -47,14 +47,14 @@ class GfmlFrame_ndeTknMgr { @gplx.Internal protected GfmlTkn DatTkn_pop() {GfmlTkn rv = datTkn; datTkn = GfmlTkn_.Null; return rv;} GfmlTkn datTkn = GfmlTkn_.Null; @gplx.Internal protected void DatTkn_set(GfmlTkn tkn) { this.ConsumeWaitingDatTkn(frame.CurNde()); - idxAtrBgn = frame.waitingTkns.Count(); + idxAtrBgn = frame.waitingTkns.Len(); idxAtrEnd = idxAtrBgn + 1; frame.waitingTkns.Add(tkn); datTkn = tkn; } @gplx.Internal protected void ExecMakeAtr(GfmlTkn itmKeyTkn, GfmlTkn valTkn) { frame.waitingTkns.Add(valTkn); - idxAtrEnd = frame.waitingTkns.Count(); + idxAtrEnd = frame.waitingTkns.Len(); this.MakeAtr(itmKeyTkn, valTkn); } @gplx.Internal protected void ExecXferTkns_ndeAll(GfmlNde nde) {ExecXferTkns(nde, 0);} diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java b/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java index 413b8a0f3..7ae553605 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java @@ -32,8 +32,8 @@ class GfmlStringHighlighter { List_adp symList = List_adp_.New(); int bgnPos = 0, endPos = 0; int rawLen = String_.Len(raw); int rawLenDigits = Int_.DigitCount(rawLen); - int rawBfrBgn = -1, marksLastIdx = marks.Idx_last(); - for (int i = 0; i < marks.Count(); i++) { + int rawBfrBgn = -1, marksLastIdx = marks.IdxLast(); + for (int i = 0; i < marks.Len(); i++) { GfmlStringHighlighterMarker curMark = (GfmlStringHighlighterMarker)marks.Get_at(i); GfmlStringHighlighterMarker nxtMark = i == marksLastIdx ? GfmlStringHighlighterMarker.Null : (GfmlStringHighlighterMarker)marks.Get_at(i + 1); // bgnPos @@ -81,11 +81,11 @@ class GfmlStringHighlighter { rv.Add(posBfr.To_str()); rv.Add(rawBfr.To_str()); rv.Add(symBfr.To_str()); - if (symList.Count() > 0) + if (symList.Len() > 0) rv.Add(""); - for (int i = 0; i < symList.Count(); i++) + for (int i = 0; i < symList.Len(); i++) rv.Add((String)symList.Get_at(i)); - return rv.To_str_ary(); + return rv.ToStrAry(); } List_adp marks = List_adp_.New(); public static GfmlStringHighlighter new_() { diff --git a/110_gfml/src_600_rdrWtr/gplx/gfml/SqlDoc.java b/110_gfml/src_600_rdrWtr/gplx/gfml/SqlDoc.java index b23cd6fd4..c1988a9be 100644 --- a/110_gfml/src_600_rdrWtr/gplx/gfml/SqlDoc.java +++ b/110_gfml/src_600_rdrWtr/gplx/gfml/SqlDoc.java @@ -1,20 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; -import gplx.core.strings.*; import gplx.core.criterias.*; +import gplx.core.strings.*; public class SqlDoc { public static GfmlDoc XtoDoc(String raw) { GfmlBldr bldr = GfmlBldr_.new_(); @@ -76,7 +76,7 @@ class SqlCmd_quote_end implements GfmlBldrCmd { public void Exec(GfmlBldr bldr, GfmlTkn tkn) { String_bldr sb = String_bldr_.new_(); GfmlObjList list = bldr.CurFrame().WaitingTkns(); - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { GfmlTkn pnd = (GfmlTkn)list.Get_at(i); sb.Add(pnd.Val()); } diff --git a/110_gfml/tst/gplx/gfml/yfxts_GfmlParse_fxt.java b/110_gfml/tst/gplx/gfml/yfxts_GfmlParse_fxt.java index a6a56e8b3..445f72b6a 100644 --- a/110_gfml/tst/gplx/gfml/yfxts_GfmlParse_fxt.java +++ b/110_gfml/tst/gplx/gfml/yfxts_GfmlParse_fxt.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlParse_fxt { public GfmlNde_mok nde_() {return GfmlNde_mok.new_();} @@ -49,7 +49,7 @@ class GfmlParse_fxt { bldr.ThrowErrors_set(false); GfmlDoc actlDoc = bldr.XtoGfmlDoc(raw); List_adp expd = List_adp_.New(), actl = actlDoc.UsrMsgs(); - expd.Add_many((Object[])expdErrs); + expd.AddMany((Object[])expdErrs); TfdsTstr_fxt tstr = TfdsTstr_fxt.new_(); int max = tstr.List_Max(expd, actl); for (int i = 0; i < max; i++) { @@ -57,15 +57,15 @@ class GfmlParse_fxt { UsrMsg actlUm = (UsrMsg)tstr.List_FetchAtOrNull(actl, i); UsrMsg_mok actlUmm = UsrMsg_mok.new_(actlUm); tstr.Eq_str(expdUm.Main(), actlUmm.Main(), "main"); - for (int j = 0; j < expdUm.Args().Count(); j++) { + for (int j = 0; j < expdUm.Args().Len(); j++) { Keyval expdKv = (Keyval)expdUm.Args().Get_at(j); - Keyval actlKv = (Keyval)actlUmm.Args().Get_by(expdKv.Key()); + Keyval actlKv = (Keyval)actlUmm.Args().GetByOrNull(expdKv.Key()); Object actlVal = actlKv == null ? String_.Null_mark : actlKv.Val(); tstr.Eq_str(expdKv.Val(), actlVal, expdKv.Key()); } - for (int j = 0; j < expdUm.Required().Count(); j++) { + for (int j = 0; j < expdUm.Required().Len(); j++) { String expdKv = (String)expdUm.Required().Get_at(j); - Keyval actlKv = (Keyval)actlUmm.Args().Get_by(expdKv); + Keyval actlKv = (Keyval)actlUmm.Args().GetByOrNull(expdKv); Object actlVal = actlKv == null ? String_.Null_mark : actlKv.Val(); Object actlValV = actlKv == null ? "<>" : actlKv.Val(); tstr.Eq_str(actlValV, actlVal, expdKv); diff --git a/110_gfml/tst/gplx/gfml/ymoks_GfmlAtr_GfmlNde_mok.java b/110_gfml/tst/gplx/gfml/ymoks_GfmlAtr_GfmlNde_mok.java index fd3f53a26..8cc9c1711 100644 --- a/110_gfml/tst/gplx/gfml/ymoks_GfmlAtr_GfmlNde_mok.java +++ b/110_gfml/tst/gplx/gfml/ymoks_GfmlAtr_GfmlNde_mok.java @@ -51,7 +51,7 @@ class GfmlNde_mok implements GfmlItm_mok { public List_adp Subs() {return subs;} public String XtoStrStub() { String_bldr sb = String_bldr_.new_(); - sb.Add_kv("key=", key).Add_kv("hnd=", hnd).Add_kv("typ=", typ).Add_kv("subs=", Int_.To_str(subs.Count())); + sb.Add_kv("key=", key).Add_kv("hnd=", hnd).Add_kv("typ=", typ).Add_kv("subs=", Int_.To_str(subs.Len())); return sb.To_str(); } public GfmlNde_mok Subs_(GfmlItm_mok... ary) { @@ -75,7 +75,7 @@ class GfmlNde_mok implements GfmlItm_mok { rv.ChainId_(ownerMok.chainId); if (ownerMok.keyed) rv.KeyedSubObj_(ownerMok.keyed); if (ownerMok.key != null) rv.KeyTkn_set(GfmlTkn_.val_(ownerMok.key)); - for (int i = 0; i < ownerMok.subs.Count(); i++) { + for (int i = 0; i < ownerMok.subs.Len(); i++) { GfmlItm_mok itm = (GfmlItm_mok)ownerMok.subs.Get_at(i); if (itm.ObjType() == GfmlObj_.Type_nde) { GfmlNde_mok itmMok = (GfmlNde_mok)itm; diff --git a/110_gfml/tst/gplx/gfml/ymoks_GfmlTyp_GfmlFld_mok.java b/110_gfml/tst/gplx/gfml/ymoks_GfmlTyp_GfmlFld_mok.java index 58fb6521c..f2463b30b 100644 --- a/110_gfml/tst/gplx/gfml/ymoks_GfmlTyp_GfmlFld_mok.java +++ b/110_gfml/tst/gplx/gfml/ymoks_GfmlTyp_GfmlFld_mok.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlFld_mok { public String Name() {return name;} public GfmlFld_mok Name_(String v) {name = v; return this;} private String name; @@ -54,7 +54,7 @@ class GfmlTyp_mok { } public GfmlType XtoGfmlType() { GfmlType rv = GfmlType_.new_(key, name); // all types in tests are top-level - for (int i = 0; i < subFlds.Count(); i++) { + for (int i = 0; i < subFlds.Len(); i++) { GfmlFld_mok fld = (GfmlFld_mok)subFlds.Get_at(i); rv.SubFlds().Add(fld.XtoGfmlFld()); } diff --git a/110_gfml/tst/gplx/gfml/ymoks_UsrMsg_mok.java b/110_gfml/tst/gplx/gfml/ymoks_UsrMsg_mok.java index c6a42335b..e5d3bfe66 100644 --- a/110_gfml/tst/gplx/gfml/ymoks_UsrMsg_mok.java +++ b/110_gfml/tst/gplx/gfml/ymoks_UsrMsg_mok.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class UsrMsg_mok { public String Main() {return main;} public UsrMsg_mok Main_(String v) {main = v; return this;} private String main; @@ -24,7 +24,7 @@ class UsrMsg_mok { UsrMsg_mok rv = new UsrMsg_mok(); if (um != null) { rv.main = um.Hdr(); - for (int i = 0; i < um.Args().Count(); i++) { + for (int i = 0; i < um.Args().Len(); i++) { Keyval kv = (Keyval)um.Args().Get_at(i); rv.Add_(kv.Key(), kv.Val()); } diff --git a/110_gfml/tst/gplx/gfml/z091_GfmlLxr_basic_tst.java b/110_gfml/tst/gplx/gfml/z091_GfmlLxr_basic_tst.java index e4b3c4e82..4e69951ea 100644 --- a/110_gfml/tst/gplx/gfml/z091_GfmlLxr_basic_tst.java +++ b/110_gfml/tst/gplx/gfml/z091_GfmlLxr_basic_tst.java @@ -59,7 +59,7 @@ public class z091_GfmlLxr_basic_tst { if (tkn == GfmlTkn_.EndOfStream) break; list.Add(tkn.Raw()); } - String[] actl = (String[])list.To_ary(String.class); + String[] actl = (String[])list.ToAry(String.class); Tfds.Eq_ary(expd, actl); return tkn; } diff --git a/110_gfml/tst/gplx/gfml/z450_fx_GfmlDefaultItem_fxt.java b/110_gfml/tst/gplx/gfml/z450_fx_GfmlDefaultItem_fxt.java index 659de09a0..b82f09a46 100644 --- a/110_gfml/tst/gplx/gfml/z450_fx_GfmlDefaultItem_fxt.java +++ b/110_gfml/tst/gplx/gfml/z450_fx_GfmlDefaultItem_fxt.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfml; import gplx.*; class GfmlDefaultItem_fxt { @gplx.Internal protected GfmlDefaultItem make_(String typeKey, String key, GfmlTkn val) {return GfmlDefaultItem.new_(typeKey, key, val);} @@ -29,7 +29,7 @@ class GfmlDefaultItem_fxt { GfmlDefaultItem expd = expdAry[i]; tst_Item(actl, expd); } - Tfds.Eq(expdAry.length, list.Count()); + Tfds.Eq(expdAry.length, list.Len()); } String Val_to_str_or_null(GfmlObj gobj) { GfmlTkn tkn = GfmlTkn_.as_(gobj); diff --git a/110_gfml/tst/gplx/gfml/z601_edit_atr_tst.java b/110_gfml/tst/gplx/gfml/z601_edit_atr_tst.java index 545063f14..f40d8faed 100644 --- a/110_gfml/tst/gplx/gfml/z601_edit_atr_tst.java +++ b/110_gfml/tst/gplx/gfml/z601_edit_atr_tst.java @@ -115,7 +115,7 @@ class GfmlUpdateFx { public GfmlUpdateFx Update_(GfmlUpdateCmd cmd) {cmds.Add(cmd); return this;} List_adp cmds = List_adp_.New(); public GfmlUpdateFx tst_(String expd) { GfmlDoc actlDoc = GfmlDataNde.new_any_eol_(raw).Doc(); - for (int i = 0; i < cmds.Count(); i++) { + for (int i = 0; i < cmds.Len(); i++) { GfmlUpdateCmd cmd = (GfmlUpdateCmd)cmds.Get_at(i); cmd.Exec(actlDoc); } diff --git a/110_gfml/tst/gplx/gfml/z811_useCase_GfmlIoSql_tst.java b/110_gfml/tst/gplx/gfml/z811_useCase_GfmlIoSql_tst.java index 2cec1d592..cc04f2a47 100644 --- a/110_gfml/tst/gplx/gfml/z811_useCase_GfmlIoSql_tst.java +++ b/110_gfml/tst/gplx/gfml/z811_useCase_GfmlIoSql_tst.java @@ -42,7 +42,7 @@ public class z811_useCase_GfmlIoSql_tst { GfmlAtr atr = (GfmlAtr)nde.SubObjs_GetAt(i); list.Add(atr.Key() + "=" + atr.DatTkn().Raw()); } - return list.To_str_ary(); + return list.ToStrAry(); } GfmlNdeWrapper nde_(String name) {return GfmlNdeWrapper.new_().Name_(name);} } diff --git a/140_dbs/src/gplx/core/srls/Dbmeta_dat_mgr.java b/140_dbs/src/gplx/core/srls/Dbmeta_dat_mgr.java index e98b457ef..446a01dfe 100644 --- a/140_dbs/src/gplx/core/srls/Dbmeta_dat_mgr.java +++ b/140_dbs/src/gplx/core/srls/Dbmeta_dat_mgr.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.srls; import gplx.*; import gplx.core.*; -import gplx.dbs.*; import gplx.dbs.metas.*; -public class Dbmeta_dat_mgr { - private final Ordered_hash hash = Ordered_hash_.New(); - public Dbmeta_dat_mgr Clear() {hash.Clear(); return this;} - public int Len() {return hash.Count();} - public Dbmeta_dat_itm Get_at(int idx) {return (Dbmeta_dat_itm)hash.Get_at(idx);} - public Dbmeta_dat_mgr Add_int(String key, int val) { - Dbmeta_dat_itm itm = new Dbmeta_dat_itm(Dbmeta_fld_tid.Tid__int, key, val); - hash.Add(key, itm); - return this; - } -} +package gplx.core.srls; import gplx.*; +import gplx.dbs.*; +public class Dbmeta_dat_mgr { + private final Ordered_hash hash = Ordered_hash_.New(); + public Dbmeta_dat_mgr Clear() {hash.Clear(); return this;} + public int Len() {return hash.Len();} + public Dbmeta_dat_itm Get_at(int idx) {return (Dbmeta_dat_itm)hash.Get_at(idx);} + public Dbmeta_dat_mgr Add_int(String key, int val) { + Dbmeta_dat_itm itm = new Dbmeta_dat_itm(DbmetaFldType.TidInt, key, val); + hash.Add(key, itm); + return this; + } +} diff --git a/140_dbs/src/gplx/core/stores/DbMaprItm.java b/140_dbs/src/gplx/core/stores/DbMaprItm.java index fb8d09aa4..f528bec1d 100644 --- a/140_dbs/src/gplx/core/stores/DbMaprItm.java +++ b/140_dbs/src/gplx/core/stores/DbMaprItm.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.stores; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.stores; import gplx.*; public class DbMaprItm { public String TableName() {return tableName;} public DbMaprItm TableName_(String val) {tableName = val; return this;} private String tableName; public Ordered_hash Flds() {return flds;} Ordered_hash flds = Ordered_hash_.New(); @@ -23,7 +23,7 @@ public class DbMaprItm { public DbMaprItm Flds_add(String objProp, String dbFld) {flds.Add(objProp, DbMaprArg.new_(objProp, dbFld)); return this;} public DbMaprItm ContextFlds_add(String s) { - DbMaprArg arg = (DbMaprArg)flds.Get_by(s); + DbMaprArg arg = (DbMaprArg)flds.GetByOrNull(s); contextFlds.Add(arg.ObjProp(), arg); return this; } @@ -40,7 +40,7 @@ public class DbMaprItm { } throw Err_.new_missing_key(find); } - public DbMaprArg Flds_get(String key) {return (DbMaprArg)flds.Get_by(key);} + public DbMaprArg Flds_get(String key) {return (DbMaprArg)flds.GetByOrNull(key);} SrlObj proto; String key; List_adp subs = List_adp_.New(); public static DbMaprItm proto_(SrlObj proto, String key, String tableName) { DbMaprItm rv = new DbMaprItm(); diff --git a/140_dbs/src/gplx/core/stores/DbMaprMgr.java b/140_dbs/src/gplx/core/stores/DbMaprMgr.java index 78932d1e6..b47d55828 100644 --- a/140_dbs/src/gplx/core/stores/DbMaprMgr.java +++ b/140_dbs/src/gplx/core/stores/DbMaprMgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.stores; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.stores; import gplx.*; public class DbMaprMgr { public DbMaprArg[] RootIndexFlds() {return rootIndexFlds;} public DbMaprMgr RootIndexFlds_(DbMaprArg... val) {rootIndexFlds = val; return this;} DbMaprArg[] rootIndexFlds; public DbMaprItm Root() {return root;} public DbMaprMgr Root_(DbMaprItm v) {root = v; return this;} DbMaprItm root; @@ -24,7 +24,7 @@ public class DbMaprMgr { for (Object argObj : mapr.ContextFlds()) { DbMaprArg arg = (DbMaprArg)argObj; Object contextVal = Gfo_invk_.Invk_by_key((Gfo_invk)gobj, arg.ObjProp()); - this.ContextVars().Add_if_dupe_use_nth(arg.DbFld(), contextVal); + this.ContextVars().AddIfDupeUseNth(arg.DbFld(), contextVal); } this.OwnerStack().Add(gobj); this.MaprStack().Add(mapr); diff --git a/140_dbs/src/gplx/core/stores/DbMaprRdr.java b/140_dbs/src/gplx/core/stores/DbMaprRdr.java index 52fc6a2b4..99800b5f4 100644 --- a/140_dbs/src/gplx/core/stores/DbMaprRdr.java +++ b/140_dbs/src/gplx/core/stores/DbMaprRdr.java @@ -1,24 +1,24 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.stores; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.stores; import gplx.*; import gplx.core.criterias.*; import gplx.dbs.*; import gplx.core.gfo_ndes.*; public class DbMaprRdr extends DataRdr_base implements SrlMgr { @Override public String NameOfNode() {return "DbMaprRdr";} @Override public Object StoreRoot(SrlObj subProto, String key) { - mgr = (DbMaprMgr)this.EnvVars().Get_by_or_fail(DbMaprWtr.Key_Mgr); + mgr = (DbMaprMgr)this.EnvVars().GetByOrFail(DbMaprWtr.Key_Mgr); DbMaprItm rootMapr = mgr.Root(); GfoNde tbl = GetTbl(rootMapr, rootCrt); int subsCount = tbl.Subs().Count(); if (subsCount == 0) return null; if (subsCount > 1) throw Err_.new_wo_type("criteria returned > 1 row", "criteria", rootCrt.To_str(), "subsCount", subsCount); @@ -29,7 +29,7 @@ public class DbMaprRdr extends DataRdr_base implements SrlMgr { return root; } @Override public void SrlList(String subPropKey, List_adp list, SrlObj subProto, String itmKey) { - DbMaprItm curMapr = (DbMaprItm)mgr.MaprStack().Get_at_last(); + DbMaprItm curMapr = (DbMaprItm)mgr.MaprStack().GetAtLast(); DbMaprItm subMapr = curMapr.Subs_get(subPropKey); list.Clear(); @@ -56,7 +56,7 @@ public class DbMaprRdr extends DataRdr_base implements SrlMgr { } List_adp GetIdxFlds(DbMaprMgr mgr, DbMaprItm curMapr) { List_adp rv = List_adp_.New(); - int maprStackCount = mgr.MaprStack().Count() - 0; // -1 b/c current is added to stack + int maprStackCount = mgr.MaprStack().Len() - 0; // -1 b/c current is added to stack for (int i = 0; i < maprStackCount; i ++) { DbMaprItm mapr = (DbMaprItm)mgr.MaprStack().Get_at(i); SrlObj gobj = (SrlObj)mgr.OwnerStack().Get_at(i); @@ -74,7 +74,7 @@ public class DbMaprRdr extends DataRdr_base implements SrlMgr { } GfoNde GetTbl(DbMaprItm mapr, Criteria crit) { String key = mapr.TableName(); - GfoNde tblByRootCrt = GfoNde_.as_(tables.Get_by(key)); + GfoNde tblByRootCrt = GfoNde_.as_(tables.GetByOrNull(key)); if (tblByRootCrt == null) { DataRdr dbRdr = null; try { @@ -96,8 +96,8 @@ public class DbMaprRdr extends DataRdr_base implements SrlMgr { rowStack.Add(tbl.Subs().FetchAt_asGfoNde(i)); } @Override public Object Read(String key) { - DbMaprItm mapr = (DbMaprItm)mgr.MaprStack().Get_at_last(); - GfoNde row = (GfoNde)rowStack.Get_at_last(); + DbMaprItm mapr = (DbMaprItm)mgr.MaprStack().GetAtLast(); + GfoNde row = (GfoNde)rowStack.GetAtLast(); DbMaprArg arg = mapr.Flds_get(key); Object dbVal = null; try {dbVal = row.Read(arg.DbFld());} catch (Exception e) {throw Err_.new_exc(e, "db", "failed to read dbVal from row", "key", key, "fld", arg.DbFld());} return dbVal; diff --git a/140_dbs/src/gplx/core/stores/DbMaprWtr.java b/140_dbs/src/gplx/core/stores/DbMaprWtr.java index acd4f8cbf..d12fec5ba 100644 --- a/140_dbs/src/gplx/core/stores/DbMaprWtr.java +++ b/140_dbs/src/gplx/core/stores/DbMaprWtr.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.stores; import gplx.*; import gplx.core.*; +package gplx.core.stores; import gplx.*; import gplx.core.criterias.*; import gplx.core.gfo_ndes.*; import gplx.dbs.*; import gplx.dbs.qrys.*; public class DbMaprWtr extends DataWtr_base implements DataWtr { public void InitWtr(String key, Object val) {} @Override public Object StoreRoot(SrlObj root, String key) { - mgr = (DbMaprMgr)this.EnvVars().Get_by_or_fail(DbMaprWtr.Key_Mgr); + mgr = (DbMaprMgr)this.EnvVars().GetByOrFail(DbMaprWtr.Key_Mgr); DbMaprWtrUtl.PurgeObjTree(root, mgr, conn); WriteGfoObj(root, mgr.Root()); mgr.Clear(); return null; } @Override public void SrlList(String subPropKey, List_adp list, SrlObj subProto, String itmKey) { - DbMaprItm ownerMapr = (DbMaprItm)mgr.MaprStack().Get_at_last(); + DbMaprItm ownerMapr = (DbMaprItm)mgr.MaprStack().GetAtLast(); DbMaprItm subMapr = ownerMapr.Subs_get(subPropKey); for (Object subObj : list) { @@ -43,7 +43,7 @@ public class DbMaprWtr extends DataWtr_base implements DataWtr { mgr.EnvStack_del(mapr, gobj); } void WriteContextFlds() { - int maprStackCount = mgr.MaprStack().Count() - 1; // -1 b/c current is added to stack + int maprStackCount = mgr.MaprStack().Len() - 1; // -1 b/c current is added to stack for (int i = 0; i < maprStackCount; i ++) { DbMaprItm mapr = (DbMaprItm)mgr.MaprStack().Get_at(i); SrlObj gobj = (SrlObj)mgr.OwnerStack().Get_at(i); @@ -60,7 +60,7 @@ public class DbMaprWtr extends DataWtr_base implements DataWtr { insertCmd = null; } @Override public void WriteData(String name, Object val) { - DbMaprItm ownerMapr = (DbMaprItm)mgr.MaprStack().Get_at_last(); + DbMaprItm ownerMapr = (DbMaprItm)mgr.MaprStack().GetAtLast(); String fld = ""; try {fld = ownerMapr.Flds_get(name).DbFld();} catch (Exception e) {throw Err_.new_exc(e, "db", "failed to fetch fld from mapr", "key", name);} WriteDataVal(fld, val); } diff --git a/140_dbs/src/gplx/dbs/Db_attach_mgr.java b/140_dbs/src/gplx/dbs/Db_attach_mgr.java index 8689ed19d..0156d4f6a 100644 --- a/140_dbs/src/gplx/dbs/Db_attach_mgr.java +++ b/140_dbs/src/gplx/dbs/Db_attach_mgr.java @@ -55,7 +55,7 @@ public class Db_attach_mgr { } public String Resolve_sql(String sql) { attach_list.Clear(); - int hash_len = links_hash.Count(); + int hash_len = links_hash.Len(); for (int i = 0; i < hash_len; ++i) { Db_attach_itm attach_itm = (Db_attach_itm)links_hash.Get_at(i); String tkn = "<" + attach_itm.Key + ">"; @@ -86,7 +86,7 @@ public class Db_attach_mgr { } public String Test__attach_sql() {return attached_sql;} private String attached_sql; public String[] Test__attach_list_keys() { - int rv_len = attach_list.Count(); + int rv_len = attach_list.Len(); String[] rv = new String[rv_len]; for (int i = 0; i < rv_len; ++i) { Db_attach_itm itm = (Db_attach_itm)attach_list.Get_at(i); @@ -98,12 +98,12 @@ public class Db_attach_mgr { attach_list.Clear(); SqlQryWtr sql_wtr = main_conn.Engine().Sql_wtr(); List_adp from_tbls = from_itm.Tbls; - int from_tbls_len = from_tbls.Count(); + int from_tbls_len = from_tbls.Len(); for (int i = 0; i < from_tbls_len; ++i) { Sql_tbl_itm from_tbl = (Sql_tbl_itm)from_tbls.Get_at(i); String from_tbl_db = from_tbl.Db; if (String_.Eq(Sql_tbl_itm.Db__null, from_tbl_db)) continue; // tbl does not have db defined; only "tbl" not "db.tbl"; skip - Db_attach_itm attach_itm = (Db_attach_itm)links_hash.Get_by(from_tbl_db); if (attach_itm == null) throw Err_.new_("dbs", "qry defines an unknown database for attach_wkr", "from_tbl_db", from_tbl_db, "sql", qry.To_sql__exec(sql_wtr)); + Db_attach_itm attach_itm = (Db_attach_itm)links_hash.GetByOrNull(from_tbl_db); if (attach_itm == null) throw Err_.new_("dbs", "qry defines an unknown database for attach_wkr", "from_tbl_db", from_tbl_db, "sql", qry.ToSqlExec(sql_wtr)); if (attach_itm.Url.Eq(main_conn_url)) // attach_db same as conn; blank db, so "tbl", not "db.tbl" from_tbl.Db_enabled = false; else diff --git a/140_dbs/src/gplx/dbs/Db_conn.java b/140_dbs/src/gplx/dbs/Db_conn.java index 28d247eb2..9c44f67e7 100644 --- a/140_dbs/src/gplx/dbs/Db_conn.java +++ b/140_dbs/src/gplx/dbs/Db_conn.java @@ -78,8 +78,8 @@ public class Db_conn { public void Meta_idx_create(Gfo_usr_dlg usr_dlg, Dbmeta_idx_itm... idxs) {engine.Meta_idx_create(usr_dlg, idxs);} public void Meta_idx_delete(String idx) {engine.Meta_idx_delete(idx);} public void Meta_idx_delete(String tbl, String suffix) {engine.Meta_idx_delete(tbl + "__" + suffix);} - public void Meta_fld_append(String tbl, Dbmeta_fld_itm fld) {engine.Meta_fld_append(tbl, fld);} - public void Meta_fld_assert(String tbl, String fld, Dbmeta_fld_tid tid, Object dflt) {if (!Meta_fld_exists(tbl, fld)) this.Meta_fld_append(tbl, new Dbmeta_fld_itm(fld, tid).Default_(dflt));} + public void Meta_fld_append(String tbl, DbmetaFldItm fld) {engine.Meta_fld_append(tbl, fld);} + public void Meta_fld_assert(String tbl, String fld, DbmetaFldType tid, Object dflt) {if (!Meta_fld_exists(tbl, fld)) this.Meta_fld_append(tbl, new DbmetaFldItm(fld, tid).DefaultValSet(dflt));} public boolean Meta_tbl_exists(String tbl) {return engine.Meta_tbl_exists(tbl);} public boolean Meta_fld_exists(String tbl, String fld) {return engine.Meta_fld_exists(tbl, fld);} public boolean Meta_idx_exists(String idx) {return engine.Meta_idx_exists(idx);} @@ -94,7 +94,7 @@ public class Db_conn { } if (dirty) this.Meta_mgr().Load_all(); } - public String Meta_fld_append_if_missing(String tbl_name, Dbmeta_fld_list flds, Dbmeta_fld_itm fld) { + public String Meta_fld_append_if_missing(String tbl_name, DbmetaFldList flds, DbmetaFldItm fld) { String fld_name = fld.Name(); // if fld doesn't exist, add it; NOTE: need to check if tbl exists first else meta_fld not available if ( this.Meta_tbl_exists(tbl_name) @@ -102,7 +102,7 @@ public class Db_conn { try {this.Meta_fld_append(tbl_name, fld);} catch (Exception e) { Gfo_log_.Instance.Warn("failed to append fld", "conn", this.Conn_info().Db_api(), "tbl", tbl_name, "fld", fld_name, "err", Err_.Message_gplx_log(e)); - fld_name = Dbmeta_fld_itm.Key_null; + fld_name = DbmetaFldItm.KeyNull; } } // if fld does exist, or tbl doesn't exist, just add fld to collection @@ -113,15 +113,15 @@ public class Db_conn { return fld_name; } public Dbmeta_tbl_mgr Meta_mgr() {return engine.Meta_mgr();} - public Db_stmt Stmt_insert(String tbl, Dbmeta_fld_list flds) {return engine.Stmt_by_qry(Db_qry_insert.new_(tbl, flds.To_str_ary_wo_autonum()));} + public Db_stmt Stmt_insert(String tbl, DbmetaFldList flds) {return engine.Stmt_by_qry(Db_qry_insert.new_(tbl, flds.ToStrAryWoAutonum()));} public Db_stmt Stmt_insert(String tbl, String... cols) {return engine.Stmt_by_qry(Db_qry_insert.new_(tbl, cols));} public Db_stmt Stmt_update(String tbl, String[] where, String... cols) {return engine.Stmt_by_qry(Db_qry_update.New(tbl, where, cols));} - public Db_stmt Stmt_update_exclude(String tbl, Dbmeta_fld_list flds, String... where) {return engine.Stmt_by_qry(Db_qry_update.New(tbl, where, flds.To_str_ary_exclude(where)));} + public Db_stmt Stmt_update_exclude(String tbl, DbmetaFldList flds, String... where) {return engine.Stmt_by_qry(Db_qry_update.New(tbl, where, flds.ToStrAryExclude(where)));} public Db_stmt Stmt_delete(String tbl, String... where) {return engine.Stmt_by_qry(Db_qry_delete.new_(tbl, where));} - public Db_stmt Stmt_select_all(String tbl, Dbmeta_fld_list flds) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, String_.Ary_empty, flds.To_str_ary(), null));} + public Db_stmt Stmt_select_all(String tbl, DbmetaFldList flds) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, String_.Ary_empty, flds.ToStrAry(), null));} public Db_stmt Stmt_select(String tbl, String[] cols, String... where) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, where, cols, null));} - public Db_stmt Stmt_select(String tbl, Dbmeta_fld_list flds, String... where) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, where, flds.To_str_ary(), null));} - public Db_stmt Stmt_select_order(String tbl, Dbmeta_fld_list flds, String[] where, String... orderbys) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, where, flds.To_str_ary(), orderbys));} + public Db_stmt Stmt_select(String tbl, DbmetaFldList flds, String... where) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, where, flds.ToStrAry(), null));} + public Db_stmt Stmt_select_order(String tbl, DbmetaFldList flds, String[] where, String... orderbys) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, where, flds.ToStrAry(), orderbys));} public Db_stmt Stmt_select_order(String tbl, String[] flds, String[] where, String... orderbys) {return engine.Stmt_by_qry(Db_qry__select_in_tbl.new_(tbl, where, flds, orderbys));} public Db_stmt Stmt_new(Db_qry qry) {return engine.Stmt_by_qry(qry);} public Db_stmt Stmt_sql(String sql) {return engine.Stmt_by_qry(Db_qry_sql.sql_(sql));} @@ -163,7 +163,7 @@ public class Db_conn { rls_list.Add(rls); } public void Rls_conn() { - int len = rls_list.Count(); + int len = rls_list.Len(); for (int i = 0; i < len; ++i) { Rls_able itm = (Rls_able)rls_list.Get_at(i); itm.Rls(); diff --git a/140_dbs/src/gplx/dbs/Db_conn_bldr_wkr.java b/140_dbs/src/gplx/dbs/Db_conn_bldr_wkr.java index 2d9ed11bd..efcaf8f35 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_bldr_wkr.java +++ b/140_dbs/src/gplx/dbs/Db_conn_bldr_wkr.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.dbs; import gplx.*; -import gplx.dbs.engines.sqlite.*; import gplx.dbs.qrys.bats.*; +import gplx.dbs.engines.sqlite.*; public interface Db_conn_bldr_wkr { void Clear_for_tests(); boolean Exists(Io_url url); @@ -53,7 +53,7 @@ class Db_conn_bldr_wkr__mem implements Db_conn_bldr_wkr { } public Db_conn New(Io_url url) { String io_url_str = url.Xto_api(); - hash.Add_if_dupe_use_nth(io_url_str, io_url_str); // NOTE: tests can call New multiple times; don't fail if exists; just overwrite existing entry; DATE:2016-04-21 + hash.AddIfDupeUseNth(io_url_str, io_url_str); // NOTE: tests can call New multiple times; don't fail if exists; just overwrite existing entry; DATE:2016-04-21 return Get_or_new(url); } private Db_conn Get_or_new(Io_url url) { diff --git a/140_dbs/src/gplx/dbs/Db_conn_info_.java b/140_dbs/src/gplx/dbs/Db_conn_info_.java index 997ca299b..ebcd3d92a 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_info_.java +++ b/140_dbs/src/gplx/dbs/Db_conn_info_.java @@ -36,7 +36,7 @@ class Db_conn_info_pool { this.Add(Noop_conn_info.Instance).Add(Tdb_conn_info.Instance).Add(Mysql_conn_info.Instance).Add(Postgres_conn_info.Instance).Add(Sqlite_conn_info.Instance); this.Add(Mem_conn_info.Instance); } - public Db_conn_info_pool Add(Db_conn_info itm) {regy.Add_if_dupe_use_nth(itm.Key(), itm); return this;} + public Db_conn_info_pool Add(Db_conn_info itm) {regy.AddIfDupeUseNth(itm.Key(), itm); return this;} public Db_conn_info Parse(String raw) {// assume each pair has format of: name=val; try { Keyval_hash hash = new Keyval_hash(); @@ -50,7 +50,7 @@ class Db_conn_info_pool { else hash.Add(kv[0], kv[1]); } - Db_conn_info prototype = (Db_conn_info)regy.Get_by(url_tid); + Db_conn_info prototype = (Db_conn_info)regy.GetByOrNull(url_tid); return prototype.New_self(raw, hash); } catch(Exception exc) {throw Err_.new_parse_exc(exc, Db_conn_info.class, raw);} @@ -79,7 +79,7 @@ class Db_conn_info_pool { hash.Add(Sqlite_conn_info.Cs__data_source, sqlite_url.Raw()); hash.Add(Sqlite_conn_info.Cs__version , Sqlite_conn_info.Cs__version__3); } - Db_conn_info prototype = (Db_conn_info)regy.Get_by(cs_tid); + Db_conn_info prototype = (Db_conn_info)regy.GetByOrNull(cs_tid); return prototype.New_self(raw, hash); } public static final Db_conn_info_pool Instance = new Db_conn_info_pool(); diff --git a/140_dbs/src/gplx/dbs/Db_conn_pool.java b/140_dbs/src/gplx/dbs/Db_conn_pool.java index dca568f85..abe6921a5 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_pool.java +++ b/140_dbs/src/gplx/dbs/Db_conn_pool.java @@ -22,9 +22,9 @@ public class Db_conn_pool { // PURPOSE: cache one connection per connection_stri public void Del(Db_conn_info url) {hash.Del(url.Db_api());} public Db_conn Get_or_new(String s) {return Get_or_new(Db_conn_info_.parse(s));} public Db_conn Get_or_new(Db_conn_info url) { - Db_conn rv = (Db_conn)hash.Get_by(url.Db_api()); + Db_conn rv = (Db_conn)hash.GetByOrNull(url.Db_api()); if (rv == null) { - Db_engine prime = (Db_engine)prime_hash.Get_by(url.Key()); if (prime == null) Err_.new_wo_type("db engine prototype not found", "key", url.Key()); + Db_engine prime = (Db_engine)prime_hash.GetByOrNull(url.Key()); if (prime == null) Err_.new_wo_type("db engine prototype not found", "key", url.Key()); Db_engine clone = prime.New_clone(url); rv = new Db_conn(clone); clone.Batch_mgr().Copy(clone.Tid(), batch_mgr); diff --git a/140_dbs/src/gplx/dbs/Db_conn_utl.java b/140_dbs/src/gplx/dbs/Db_conn_utl.java index 3f054aaa9..2d03cbf5b 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_utl.java +++ b/140_dbs/src/gplx/dbs/Db_conn_utl.java @@ -1,46 +1,45 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs; import gplx.*; -import gplx.dbs.metas.*; public class Db_conn_utl { public static Db_conn Conn__new(String url_rel) { Db_conn_bldr.Instance.Reg_default_mem(); return Db_conn_bldr.Instance.Get_or_new(Io_url_.mem_fil_("mem/" + url_rel)).Conn(); } - public static void Tbl__new(Db_conn conn, String tbl, Dbmeta_fld_itm[] flds, Object[]... rows) { + public static void Tbl__new(Db_conn conn, String tbl, DbmetaFldItm[] flds, Object[]... rows) { conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl, flds)); int rows_len = rows.length; - Db_stmt stmt = conn.Stmt_insert(tbl, Dbmeta_fld_itm.To_str_ary(flds)); + Db_stmt stmt = conn.Stmt_insert(tbl, DbmetaFldItm.ToStrAry(flds)); for (int i = 0; i < rows_len; ++i) { Object[] row = rows[i]; int dat_len = row.length; stmt.Clear(); for (int j = 0; j < dat_len; ++j) { - Dbmeta_fld_itm fld = flds[j]; + DbmetaFldItm fld = flds[j]; String fld_name = fld.Name(); Object val = row[j]; - switch (fld.Type().Tid_ansi()) { - case Dbmeta_fld_tid.Tid__bool: stmt.Val_bool_as_byte (fld_name, Bool_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__byte: stmt.Val_byte (fld_name, Byte_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__int: stmt.Val_int (fld_name, Int_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__long: stmt.Val_long (fld_name, Long_.cast(val)); break; - case Dbmeta_fld_tid.Tid__float: stmt.Val_float (fld_name, Float_.cast(val)); break; - case Dbmeta_fld_tid.Tid__double: stmt.Val_double (fld_name, Double_.cast(val)); break; - case Dbmeta_fld_tid.Tid__str: stmt.Val_str (fld_name, String_.cast(val)); break; - case Dbmeta_fld_tid.Tid__bry: stmt.Val_bry (fld_name, Bry_.cast(val)); break; + switch (fld.Type().Tid()) { + case DbmetaFldType.TidBool: stmt.Val_bool_as_byte (fld_name, Bool_.Cast(val)); break; + case DbmetaFldType.TidByte: stmt.Val_byte (fld_name, Byte_.Cast(val)); break; + case DbmetaFldType.TidInt: stmt.Val_int (fld_name, Int_.Cast(val)); break; + case DbmetaFldType.TidLong: stmt.Val_long (fld_name, Long_.cast(val)); break; + case DbmetaFldType.TidFloat: stmt.Val_float (fld_name, Float_.cast(val)); break; + case DbmetaFldType.TidDouble: stmt.Val_double (fld_name, Double_.cast(val)); break; + case DbmetaFldType.TidStr: stmt.Val_str (fld_name, String_.cast(val)); break; + case DbmetaFldType.TidBry: stmt.Val_bry (fld_name, Bry_.cast(val)); break; } } stmt.Exec_insert(); @@ -70,6 +69,6 @@ public class Db_conn_utl { rv.Add(row); } } finally {rdr.Rls();} - return (Object[][])rv.To_ary_and_clear(Object[].class); + return (Object[][])rv.ToAryAndClear(Object[].class); } } diff --git a/140_dbs/src/gplx/dbs/Db_crt_.java b/140_dbs/src/gplx/dbs/Db_crt_.java index fdec0876d..de63c5ab6 100644 --- a/140_dbs/src/gplx/dbs/Db_crt_.java +++ b/140_dbs/src/gplx/dbs/Db_crt_.java @@ -45,7 +45,7 @@ public class Db_crt_ { int len = ary.length; int crt_idx = 0; for (int i = 0; i < len; i++) { - String itm = ary[i]; if (itm == Dbmeta_fld_itm.Key_null) continue; + String itm = ary[i]; if (itm == DbmetaFldItm.KeyNull) continue; Criteria crt = Db_crt_.New_eq(itm, null); rv = (crt_idx == 0) ? crt : Criteria_.And(rv, crt); ++crt_idx; diff --git a/140_dbs/src/gplx/dbs/Db_qry.java b/140_dbs/src/gplx/dbs/Db_qry.java index 47d20a879..c414e88a8 100644 --- a/140_dbs/src/gplx/dbs/Db_qry.java +++ b/140_dbs/src/gplx/dbs/Db_qry.java @@ -1,6 +1,6 @@ /* XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com +Copyright (C) 2012-2021 gnosygnu@gmail.com XOWA is licensed under the terms of the General Public License (GPL) Version 3, or alternatively under the terms of the Apache License Version 2.0. @@ -16,8 +16,8 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.dbs; import gplx.dbs.sqls.SqlQryWtr; public interface Db_qry { - int Tid(); - boolean Exec_is_rdr(); - String Base_table(); - String To_sql__exec(SqlQryWtr wtr); + int Tid(); + boolean ReturnsRdr(); + String BaseTable(); + String ToSqlExec(SqlQryWtr wtr); } diff --git a/140_dbs/src/gplx/dbs/Db_qry_.java b/140_dbs/src/gplx/dbs/Db_qry_.java index 9f8b5beca..62c3140c3 100644 --- a/140_dbs/src/gplx/dbs/Db_qry_.java +++ b/140_dbs/src/gplx/dbs/Db_qry_.java @@ -1,6 +1,6 @@ /* XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com +Copyright (C) 2012-2021 gnosygnu@gmail.com XOWA is licensed under the terms of the General Public License (GPL) Version 3, or alternatively under the terms of the Apache License Version 2.0. @@ -22,14 +22,14 @@ import gplx.dbs.qrys.Db_qry_insert; import gplx.dbs.qrys.Db_qry_update; import gplx.dbs.sqls.itms.Sql_join_fld; public class Db_qry_ { - public static Db_qry__select_cmd select_cols_(String tbl, Criteria crt, String... cols){return select_().From_(tbl).Where_(crt).Cols_(cols);} - public static Db_qry__select_cmd select_val_(String tbl, String col, Criteria crt) {return select_().From_(tbl).Where_(crt).Cols_(col);} + public static Db_qry__select_cmd select_cols_(String tbl, Criteria crt, String... cols) {return select_().From_(tbl).Where_(crt).Cols_(cols);} + public static Db_qry__select_cmd select_val_(String tbl, String col, Criteria crt) {return select_().From_(tbl).Where_(crt).Cols_(col);} public static Db_qry__select_cmd select_tbl_(String tbl) {return select_().From_(tbl).Cols_all_();} - public static Db_qry__select_cmd select_() {return new Db_qry__select_cmd();} - public static Db_qry__select_cmd select_(String tbl, String... cols) {return new Db_qry__select_cmd().From_(tbl).Cols_(cols);} - public static Db_qry_delete delete_(String tbl, Criteria crt) {return Db_qry_delete.new_(tbl, crt);} - public static Db_qry_delete delete_tbl_(String tbl) {return Db_qry_delete.new_(tbl);} - public static Db_qry_insert insert_(String tbl) {return new Db_qry_insert(tbl);} + public static Db_qry__select_cmd select_() {return new Db_qry__select_cmd();} + public static Db_qry__select_cmd select_(String tbl, String... cols) {return new Db_qry__select_cmd().From_(tbl).Cols_(cols);} + public static Db_qry_delete delete_(String tbl, Criteria crt) {return Db_qry_delete.new_(tbl, crt);} + public static Db_qry_delete delete_tbl_(String tbl) {return Db_qry_delete.new_(tbl);} + public static Db_qry_insert insert_(String tbl) {return new Db_qry_insert(tbl);} public static Db_qry_insert insert_common_(String tbl, Keyval... pairs) { Db_qry_insert cmd = new Db_qry_insert(tbl); for (Keyval pair : pairs) @@ -58,9 +58,17 @@ public class Db_qry_ { gplx.core.stores.DataRdr rdr = conn.Exec_qry_as_old_rdr(qry); try { return rdr.MoveNextPeer() ? rdr.Read(qry.Cols().Flds.Get_at(0).Fld) : null; // NOTE: need to access from flds for tdb - } finally {rdr.Rls();} + } + finally {rdr.Rls();} } - public static Db_qry as_(Object obj) {return obj instanceof Db_qry ? (Db_qry)obj : null;} - public static final int Tid_insert = 0, Tid_delete = 1, Tid_update = 2, Tid_select = 3, Tid_sql = 4, Tid_select_in_tbl = 5, Tid_flush = 6, Tid_noop = 7, Tid_pragma = 8; + public static final int + Tid_insert = 0, + Tid_delete = 1, + Tid_update = 2, + Tid_select = 3, + Tid_sql = 4, + Tid_select_in_tbl = 5, + Tid_flush = 6, + Tid_pragma = 8; } diff --git a/140_dbs/src/gplx/dbs/Db_sql_select.java b/140_dbs/src/gplx/dbs/Db_sql_select.java index b0814ce30..4584f46ed 100644 --- a/140_dbs/src/gplx/dbs/Db_sql_select.java +++ b/140_dbs/src/gplx/dbs/Db_sql_select.java @@ -1,76 +1,77 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs; import gplx.*; -import gplx.core.criterias.*; -interface Db_sql_qry { - String Tbl_main(); -} -class Db_sql_qry__select { - public Db_sql_qry__select(String from) {this.from = from;} - public String From() {return from;} private final String from; - public Db_sql_col[] Select() {return select;} private Db_sql_col[] select; -// public Criteria Where() {return where;} private Criteria where; -// public Db_sql_col[] Group_bys() {return group_bys;} private Db_sql_col[] group_bys; -// public Db_sql_col[] Order_bys() {return order_bys;} private Db_sql_col[] order_bys; -// public int Limit() {return limit;} private int limit; -// public int Offset() {return offset;} private int offset; - public Db_sql_qry__select Select_all_() {this.select = Db_sql_col_.Ary(new Db_sql_col__all(0, from)); return this;} - public Db_sql_qry__select Select_flds_(String... ary) {this.select = Db_sql_col_bldr.Instance.new_fld_many(ary); return this;} - public static Db_sql_qry__select new_(String from) {return new Db_sql_qry__select(from);} -} -class Db_sql_bldr { - public void Test() { -// Db_sql_qry__select qry = null; -// qry = Db_sql_qry__select.new_("tbl").Select_all_(); -// qry = Db_sql_qry__select.new_("tbl").Select_flds_("fld1", "fld2"); -// qry = Db_sql_qry__select.new_("tbl").Select_flds_("fld1", "fld2").Where_("fld3"); -// , String_.Ary("col1", "col2"), String_.Ary("col3")).Limit_(10).; -// Db_sql_qry__select qry = Db_sql_qry__select_.new_("tbl").Cols_("col1", "col2").Where_eq_one("col3").Limit_(10); - } -} -interface Db_sql_col { - int Ord(); - String Alias(); -} -class Db_sql_col_ { - public static Db_sql_col[] Ary(Db_sql_col... v) {return v;} -} -class Db_sql_col_bldr { - private final List_adp tmp_list = List_adp_.New(); - public Db_sql_col[] new_fld_many(String[] ary) { - tmp_list.Clear(); - int ord = -1; - for (int i = 0; i < ary.length; ++i) { - String fld_key = ary[i]; - if (fld_key == Dbmeta_fld_itm.Key_null) continue; - Db_sql_col__name fld = new Db_sql_col__name(++ord, fld_key); - tmp_list.Add(fld); - } - return (Db_sql_col[])tmp_list.To_ary_and_clear(Db_sql_col.class); - } - public static final Db_sql_col_bldr Instance = new Db_sql_col_bldr(); Db_sql_col_bldr() {} -} -class Db_sql_col__name { - public Db_sql_col__name(int ord, String key) {this.ord = ord; this.key = key;} - public int Ord() {return ord;} private final int ord; - public String Key() {return key;} private final String key; -} -class Db_sql_col__all implements Db_sql_col { - public Db_sql_col__all(int ord, String tbl) {this.ord = ord; this.tbl = tbl;} - public int Ord() {return ord;} private final int ord; - public String Tbl() {return tbl;} private final String tbl; - public String Alias() {return "*";} -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2021 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs; +import gplx.List_adp; +import gplx.List_adp_; +interface Db_sql_qry { + String Tbl_main(); +} +class Db_sql_qry__select { + public Db_sql_qry__select(String from) {this.from = from;} + public String From() {return from;} private final String from; + public Db_sql_col[] Select() {return select;} private Db_sql_col[] select; +// public Criteria Where() {return where;} private Criteria where; +// public Db_sql_col[] Group_bys() {return group_bys;} private Db_sql_col[] group_bys; +// public Db_sql_col[] Order_bys() {return order_bys;} private Db_sql_col[] order_bys; +// public int Limit() {return limit;} private int limit; +// public int Offset() {return offset;} private int offset; + public Db_sql_qry__select Select_all_() {this.select = Db_sql_col_.Ary(new Db_sql_col__all(0, from)); return this;} + public Db_sql_qry__select Select_flds_(String... ary) {this.select = Db_sql_col_bldr.Instance.new_fld_many(ary); return this;} + public static Db_sql_qry__select new_(String from) {return new Db_sql_qry__select(from);} +} +class Db_sql_bldr { + public void Test() { +// Db_sql_qry__select qry = null; +// qry = Db_sql_qry__select.new_("tbl").Select_all_(); +// qry = Db_sql_qry__select.new_("tbl").Select_flds_("fld1", "fld2"); +// qry = Db_sql_qry__select.new_("tbl").Select_flds_("fld1", "fld2").Where_("fld3"); +// , String_.Ary("col1", "col2"), String_.Ary("col3")).Limit_(10).; +// Db_sql_qry__select qry = Db_sql_qry__select_.new_("tbl").Cols_("col1", "col2").Where_eq_one("col3").Limit_(10); + } +} +interface Db_sql_col { + int Ord(); + String Alias(); +} +class Db_sql_col_ { + public static Db_sql_col[] Ary(Db_sql_col... v) {return v;} +} +class Db_sql_col_bldr { + private final List_adp tmp_list = List_adp_.New(); + public Db_sql_col[] new_fld_many(String[] ary) { + tmp_list.Clear(); + int ord = -1; + for (int i = 0; i < ary.length; ++i) { + String fld_key = ary[i]; + if (fld_key == DbmetaFldItm.KeyNull) continue; + Db_sql_col__name fld = new Db_sql_col__name(++ord, fld_key); + tmp_list.Add(fld); + } + return (Db_sql_col[])tmp_list.ToAryAndClear(Db_sql_col.class); + } + public static final Db_sql_col_bldr Instance = new Db_sql_col_bldr(); Db_sql_col_bldr() {} +} +class Db_sql_col__name { + public Db_sql_col__name(int ord, String key) {this.ord = ord; this.key = key;} + public int Ord() {return ord;} private final int ord; + public String Key() {return key;} private final String key; +} +class Db_sql_col__all implements Db_sql_col { + public Db_sql_col__all(int ord, String tbl) {this.ord = ord; this.tbl = tbl;} + public int Ord() {return ord;} private final int ord; + public String Tbl() {return tbl;} private final String tbl; + public String Alias() {return "*";} +} diff --git a/140_dbs/src/gplx/dbs/Db_stmt_.java b/140_dbs/src/gplx/dbs/Db_stmt_.java index f74b733fe..d6e4b014f 100644 --- a/140_dbs/src/gplx/dbs/Db_stmt_.java +++ b/140_dbs/src/gplx/dbs/Db_stmt_.java @@ -71,27 +71,27 @@ public class Db_stmt_ { default: throw Err_.new_unhandled_default(tid); } } - public static void Insert_by_rdr(Dbmeta_fld_list flds, Db_rdr rdr, Db_stmt stmt) { + public static void Insert_by_rdr(DbmetaFldList flds, Db_rdr rdr, Db_stmt stmt) { stmt.Clear(); Fill_by_rdr(flds, rdr, stmt); stmt.Exec_insert(); } - private static void Fill_by_rdr(Dbmeta_fld_list flds, Db_rdr rdr, Db_stmt stmt) { + private static void Fill_by_rdr(DbmetaFldList flds, Db_rdr rdr, Db_stmt stmt) { int flds_len = flds.Len(); for (int i = 0; i < flds_len; i++) { - Dbmeta_fld_itm fld = (Dbmeta_fld_itm)flds.Get_at(i); + DbmetaFldItm fld = (DbmetaFldItm)flds.GetAt(i); String fld_name = fld.Name(); - int fld_tid = fld.Type().Tid_ansi(); + int fld_tid = fld.Type().Tid(); if (fld.Autonum()) continue; switch (fld_tid) { - case Dbmeta_fld_tid.Tid__bool: stmt.Val_bool_as_byte (fld_name, rdr.Read_bool_by_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__byte: stmt.Val_byte (fld_name, rdr.Read_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__int: stmt.Val_int (fld_name, rdr.Read_int(fld_name)); break; - case Dbmeta_fld_tid.Tid__long: stmt.Val_long (fld_name, rdr.Read_long(fld_name)); break; - case Dbmeta_fld_tid.Tid__float: stmt.Val_float (fld_name, rdr.Read_float(fld_name)); break; - case Dbmeta_fld_tid.Tid__double: stmt.Val_double (fld_name, rdr.Read_double(fld_name)); break; - case Dbmeta_fld_tid.Tid__str: stmt.Val_str (fld_name, rdr.Read_str(fld_name)); break; - case Dbmeta_fld_tid.Tid__bry: stmt.Val_bry (fld_name, rdr.Read_bry(fld_name)); break; + case DbmetaFldType.TidBool: stmt.Val_bool_as_byte (fld_name, rdr.Read_bool_by_byte(fld_name)); break; + case DbmetaFldType.TidByte: stmt.Val_byte (fld_name, rdr.Read_byte(fld_name)); break; + case DbmetaFldType.TidInt: stmt.Val_int (fld_name, rdr.Read_int(fld_name)); break; + case DbmetaFldType.TidLong: stmt.Val_long (fld_name, rdr.Read_long(fld_name)); break; + case DbmetaFldType.TidFloat: stmt.Val_float (fld_name, rdr.Read_float(fld_name)); break; + case DbmetaFldType.TidDouble: stmt.Val_double (fld_name, rdr.Read_double(fld_name)); break; + case DbmetaFldType.TidStr: stmt.Val_str (fld_name, rdr.Read_str(fld_name)); break; + case DbmetaFldType.TidBry: stmt.Val_bry (fld_name, rdr.Read_bry(fld_name)); break; default: throw Err_.new_unhandled_default_w_msg(fld_tid, fld_name); } } diff --git a/140_dbs/src/gplx/dbs/Db_stmt_bldr.java b/140_dbs/src/gplx/dbs/Db_stmt_bldr.java index d15ca149e..edbf05ad5 100644 --- a/140_dbs/src/gplx/dbs/Db_stmt_bldr.java +++ b/140_dbs/src/gplx/dbs/Db_stmt_bldr.java @@ -1,24 +1,24 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs; import gplx.*; public class Db_stmt_bldr { private Db_conn conn; private Db_stmt create, update, delete; private String tbl_name; private String[] flds_keys, flds_vals, flds_all; - public void Conn_(Db_conn v, String tbl_name, Dbmeta_fld_list flds, String... flds_keys) { - Conn_(v, tbl_name, flds.To_str_ary(), flds.To_str_ary_exclude(flds_keys), flds_keys); + public void Conn_(Db_conn v, String tbl_name, DbmetaFldList flds, String... flds_keys) { + Conn_(v, tbl_name, flds.ToStrAry(), flds.ToStrAryExclude(flds_keys), flds_keys); } public void Conn_(Db_conn v, String tbl_name, String[] flds_vals, String... flds_keys) { Conn_(v, tbl_name, String_.Ary_add(flds_keys, flds_vals), flds_vals, flds_keys); diff --git a/140_dbs/src/gplx/dbs/DbmetaFldItm.java b/140_dbs/src/gplx/dbs/DbmetaFldItm.java new file mode 100644 index 000000000..571cc1e5b --- /dev/null +++ b/140_dbs/src/gplx/dbs/DbmetaFldItm.java @@ -0,0 +1,83 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2021 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs; +import gplx.Int_; +import gplx.Object_; +import gplx.String_; +public class DbmetaFldItm { + public DbmetaFldItm(String name, DbmetaFldType type) { + this.name = name; + this.type = type; + this.primary = false; + this.autonum = false; + this.defaultVal = DefaultValNull; + } + public String Name() {return name;} private final String name; + public DbmetaFldType Type() {return type;} private final DbmetaFldType type; + public int Nullable() {return nullable;} public DbmetaFldItm NullableSet(int v) {nullable = v; return this;} private int nullable; + public DbmetaFldItm NullableSetNull() {return NullableSet(NullableNull);} + public boolean Primary() {return primary;} public DbmetaFldItm PrimarySetY() {primary = true; return this;} private boolean primary; public DbmetaFldItm PrimarySetN() {primary = false; return this;} + public boolean Autonum() {return autonum;} public DbmetaFldItm AutonumSetY() {autonum = true; return this;} private boolean autonum; + public Object DefaultVal() {return defaultVal;} public DbmetaFldItm DefaultValSet(Object v) {defaultVal = v; return this;} private Object defaultVal; + public boolean Eq(DbmetaFldItm comp) { + return String_.Eq(name, comp.name) + && type.Eq(comp.type) + && nullable == comp.nullable + && primary == comp.primary + && autonum == comp.autonum + && Object_.Eq(defaultVal, comp.defaultVal); + } + public static final int NullableUnspecified = 0, NullableNull = 1, NullableNotNull = 2; + public static final Object DefaultValNull = null; + public static final String KeyNull = null; + public static final DbmetaFldItm[] AryEmpty = new DbmetaFldItm[0]; + + public static DbmetaFldItm NewBool(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmBool);} + public static DbmetaFldItm NewByte(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmByte);} + public static DbmetaFldItm NewShort(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmShort);} + public static DbmetaFldItm NewInt(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmInt);} + public static DbmetaFldItm NewLong(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmLong);} + public static DbmetaFldItm NewFloat(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmFloat);} + public static DbmetaFldItm NewDouble(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmDouble);} + public static DbmetaFldItm NewText(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmText);} + public static DbmetaFldItm NewBry(String name) {return new DbmetaFldItm(name, DbmetaFldType.ItmBry);} + public static DbmetaFldItm NewStr(String name, int len) {return new DbmetaFldItm(name, DbmetaFldType.ItmStr(len));} + public static String[] ToStrAry(DbmetaFldItm[] ary) { + int len = ary.length; + String[] rv = new String[len]; + for (int i = 0; i < len; ++i) + rv[i] = ary[i].name; + return rv; + } + + public static final String[] StrAryEmpty = String_.Ary_empty; // marker constant; should add overrides + public static String Make_or_null(Db_conn conn, DbmetaFldList flds, String tbl_name, int fld_type, Object fld_dflt, String fld_name) { + boolean tbl_exists = conn.Meta_tbl_exists(tbl_name); + boolean fld_exists = true; + if (tbl_exists) { + fld_exists = conn.Meta_fld_exists(tbl_name, fld_name); + if (!fld_exists) return DbmetaFldItm.KeyNull; + } + DbmetaFldItm fld = null; + switch (fld_type) { + case DbmetaFldType.TidInt: fld = DbmetaFldItm.NewInt(fld_name); break; + } + if (fld_dflt != null) fld.DefaultValSet(fld_dflt); + flds.Add(fld); + return fld.name; + } + public static String ToDoubleStrByInt(int v) {return Int_.To_str(v) + ".0";} // move +} diff --git a/140_dbs/src/gplx/dbs/DbmetaFldList.java b/140_dbs/src/gplx/dbs/DbmetaFldList.java new file mode 100644 index 000000000..dc654dcd8 --- /dev/null +++ b/140_dbs/src/gplx/dbs/DbmetaFldList.java @@ -0,0 +1,102 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2021 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs; +import gplx.Hash_adp; +import gplx.Hash_adp_; +import gplx.List_adp; +import gplx.List_adp_; +import gplx.objects.lists.GfoIndexedList; +public class DbmetaFldList { + private final GfoIndexedList flds = new GfoIndexedList<>(); + public void Clear() {flds.Clear();} + public int Len() {return flds.Len();} + public boolean Has(String key) {return flds.Has(key);} + public DbmetaFldItm GetByOrNull(String name) {return flds.GetByOrNull(name);} + public DbmetaFldItm GetAt(int idx) {return flds.GetAt(idx);} + public void Del(String key) {flds.DelBy(key);} + public void AddAt(int pos, DbmetaFldItm fld) {flds.AddAt(pos, fld.Name(), fld);} + public String AddBool(String name) {return Add(DbmetaFldItm.NewBool(name));} + public String AddByte(String name) {return Add(DbmetaFldItm.NewByte(name));} + public String AddShort(String name) {return Add(DbmetaFldItm.NewShort(name));} + public String AddInt(String name) {return Add(DbmetaFldItm.NewInt(name));} + public String AddIntPkey(String name) {return Add(DbmetaFldItm.NewInt(name).PrimarySetY());} + public String AddIntPkeyAutonum(String name) {return Add(DbmetaFldItm.NewInt(name).PrimarySetY().AutonumSetY());} + public String AddIntDflt(String name, int dflt) {return Add(DbmetaFldItm.NewInt(name).DefaultValSet(dflt));} + public String AddLong(String name) {return Add(DbmetaFldItm.NewLong(name));} + public String AddLongNull(String name) {return Add(DbmetaFldItm.NewLong(name).NullableSetNull());} + public String AddFloat(String name) {return Add(DbmetaFldItm.NewFloat(name));} + public String AddDouble(String name) {return Add(DbmetaFldItm.NewDouble(name));} + public String AddText(String name) {return Add(DbmetaFldItm.NewText(name));} + public String AddBry(String name) {return Add(DbmetaFldItm.NewBry(name));} + public String AddStr(String name, int len) {return Add(DbmetaFldItm.NewStr(name, len));} + public String AddDate(String name) {return Add(DbmetaFldItm.NewStr(name, 32));} + public String AddStrPkey(String name, int len) {return Add(DbmetaFldItm.NewStr(name, len).PrimarySetY());} + public String AddStrNull(String name, int len) {return Add(DbmetaFldItm.NewStr(name, len).NullableSetNull());} + public String AddStrDflt(String name, int len, String dflt) {return Add(DbmetaFldItm.NewStr(name, len).DefaultValSet(dflt));} + public DbmetaFldList BldInt(String name) {AddInt(name); return this;} + public DbmetaFldList BldStr(String name) {return BldStr(name, 255);} + public DbmetaFldList BldStr(String name, int len) {AddStr(name, len); return this;} + public String Add(DbmetaFldItm fld) { + String name = fld.Name(); + flds.Add(name, fld); + return name; + } + + public DbmetaFldList Clone() { + DbmetaFldList rv = new DbmetaFldList(); + int len = this.Len(); + for (int i = 0; i < len; ++i) + rv.Add(this.GetAt(i)); + return rv; + } + public DbmetaFldItm[] ToFldAry() {return flds.ToAry(DbmetaFldItm.class);} + public String[] ToStrAry() { + int len = flds.Len(); + String[] strAry = new String[len]; + for (int i = 0; i < len; ++i) { + DbmetaFldItm fld = (DbmetaFldItm)flds.GetAt(i); + strAry[i] = fld.Name(); + } + return strAry; + } + public String[] ToStrAryWoAutonum() { + int len = flds.Len(); + List_adp rv = List_adp_.New(); + for (int i = 0; i < len; ++i) { + DbmetaFldItm fld = (DbmetaFldItm)flds.GetAt(i); + if (fld.Autonum()) continue; + rv.Add(fld.Name()); + } + return (String[])rv.ToAry(String.class); + } + public String[] ToStrAryExclude(String[] ary) { + Hash_adp ary_hash = Hash_adp_.New(); + List_adp rv = List_adp_.New(); + int ary_len = ary.length; + for (int i = 0; i < ary_len; ++i) { + String ary_itm = ary[i]; + ary_hash.Add(ary_itm, ary_itm); + } + int fld_len = flds.Len(); + for (int i = 0; i < fld_len; ++i) { + DbmetaFldItm fld = (DbmetaFldItm)flds.GetAt(i); + String fld_key = fld.Name(); + if (ary_hash.Has(fld_key)) continue; + rv.Add(fld_key); + } + return rv.ToStrAry(); + } +} diff --git a/140_dbs/src/gplx/dbs/DbmetaFldType.java b/140_dbs/src/gplx/dbs/DbmetaFldType.java new file mode 100644 index 000000000..97ae1343c --- /dev/null +++ b/140_dbs/src/gplx/dbs/DbmetaFldType.java @@ -0,0 +1,97 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2021 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs; +import gplx.Err_; +import gplx.Type_ids_; +import gplx.objects.strings.String_; +public class DbmetaFldType { + public DbmetaFldType(int tid, String name, int len1, int len2) { + this.tid = tid; + this.name = name; + this.len1 = len1; + this.len2 = len2; + } + public int Tid() {return tid;} private final int tid; + public String Name() {return name;} private final String name; + public int Len1() {return len1;} private final int len1; // length in bytes or precision + public int Len2() {return len2;} private final int len2; // scaling + public boolean Eq(DbmetaFldType comp) { + return tid == comp.tid + && String_.Eq(name, comp.name) + && len1 == comp.len1 + && len2 == comp.len2; + } + public static final int + TidBool = 0, + TidByte = 1, + TidShort = 2, + TidInt = 3, + TidLong = 4, + TidFloat = 5, + TidDouble = 6, + TidStr = 7, + TidText = 8, + TidBry = 9, + TidDecimal = 10, + TidDate = 11; + public static final DbmetaFldType + ItmBool = new DbmetaFldType(DbmetaFldType.TidBool, "bit", -1, -1), + ItmByte = new DbmetaFldType(DbmetaFldType.TidByte, "tinyint", -1, -1), + ItmShort = new DbmetaFldType(DbmetaFldType.TidShort, "smallint", -1, -1), + ItmInt = new DbmetaFldType(DbmetaFldType.TidInt, "integer", -1, -1), + ItmLong = new DbmetaFldType(DbmetaFldType.TidLong, "bigint", -1, -1), + ItmFloat = new DbmetaFldType(DbmetaFldType.TidFloat, "float", -1, -1), + ItmDouble = new DbmetaFldType(DbmetaFldType.TidDouble, "double", -1, -1), + ItmText = new DbmetaFldType(DbmetaFldType.TidText, "text", -1, -1), + ItmBry = new DbmetaFldType(DbmetaFldType.TidBry, "blob", -1, -1), + ItmDate = new DbmetaFldType(DbmetaFldType.TidDate, "date", -1, -1); + public static DbmetaFldType ItmStr(int len) {return new DbmetaFldType(DbmetaFldType.TidStr, "varchar", len, -1);} + public static DbmetaFldType ItmDecimal(int len_1, int len_2) {return new DbmetaFldType(DbmetaFldType.TidDecimal, "decimal", len_1, len_2);} + public static DbmetaFldType New(int tid, int len1) { + switch (tid) { + case DbmetaFldType.TidBool: return ItmBool; + case DbmetaFldType.TidByte: return ItmByte; + case DbmetaFldType.TidShort: return ItmShort; + case DbmetaFldType.TidInt: return ItmInt; + case DbmetaFldType.TidLong: return ItmLong; + case DbmetaFldType.TidFloat: return ItmFloat; + case DbmetaFldType.TidDouble: return ItmDouble; + case DbmetaFldType.TidStr: return ItmStr(len1); + case DbmetaFldType.TidText: return ItmText; + case DbmetaFldType.TidBry: return ItmBry; + case DbmetaFldType.TidDate: return ItmDate; + case DbmetaFldType.TidDecimal: // return Itm__decimal(len1); + default: throw Err_.new_unhandled(tid); + } + } + public static int GetTypeIdByObj(Object o) { + int type_id = Type_ids_.To_id_by_obj(o); + switch (type_id) { + case Type_ids_.Id__bool: return DbmetaFldType.TidBool; + case Type_ids_.Id__byte: return DbmetaFldType.TidByte; + case Type_ids_.Id__short: return DbmetaFldType.TidShort; + case Type_ids_.Id__int: return DbmetaFldType.TidInt; + case Type_ids_.Id__long: return DbmetaFldType.TidLong; + case Type_ids_.Id__float: return DbmetaFldType.TidFloat; + case Type_ids_.Id__double: return DbmetaFldType.TidDouble; + case Type_ids_.Id__str: return DbmetaFldType.TidStr; + case Type_ids_.Id__bry: return DbmetaFldType.TidBry; + case Type_ids_.Id__date: return DbmetaFldType.TidDate; + case Type_ids_.Id__decimal: return DbmetaFldType.TidDecimal; + default: throw Err_.new_unhandled_default(type_id); + } + } +} diff --git a/140_dbs/src/gplx/dbs/Dbmeta_fld_itm.java b/140_dbs/src/gplx/dbs/Dbmeta_fld_itm.java deleted file mode 100644 index 06f3663d1..000000000 --- a/140_dbs/src/gplx/dbs/Dbmeta_fld_itm.java +++ /dev/null @@ -1,79 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs; import gplx.*; -import gplx.dbs.metas.*; -public class Dbmeta_fld_itm { - public Dbmeta_fld_itm(String name, Dbmeta_fld_tid type) { - this.name = name; this.type = type; - this.primary = false; this.autonum = false; this.default_val = Default_value_null; - } - public String Name() {return name;} private final String name; - public Dbmeta_fld_tid Type() {return type;} private final Dbmeta_fld_tid type; - public int Nullable_tid() {return nullable_tid;} public Dbmeta_fld_itm Nullable_tid_(int v) {nullable_tid = v; return this;} private int nullable_tid; - public Dbmeta_fld_itm Nullable_y_() {return Nullable_tid_(Nullable_null);} - public boolean Primary() {return primary;} public Dbmeta_fld_itm Primary_y_() {primary = true; return this;} private boolean primary; public Dbmeta_fld_itm Primary_n_() {primary = false; return this;} - public boolean Autonum() {return autonum;} public Dbmeta_fld_itm Autonum_y_() {autonum = true; return this;} private boolean autonum; - public Object Default() {return default_val;} public Dbmeta_fld_itm Default_(Object v) {default_val = v; return this;} private Object default_val; - public boolean Eq(Dbmeta_fld_itm comp) { - return String_.Eq(name, comp.name) - && type.Eq(comp.type) - && nullable_tid == comp.nullable_tid - && primary == comp.primary - && autonum == comp.autonum - && Object_.Eq(default_val, comp.default_val); - } - - public static final int Nullable_unknown = 0, Nullable_null = 1, Nullable_not_null = 2; - public static final Object Default_value_null = null; - public static final String Key_null = null; - public static final String[] Str_ary_empty = String_.Ary_empty; - public static final Dbmeta_fld_itm[] Ary_empty = new Dbmeta_fld_itm[0]; - - public static Dbmeta_fld_itm new_bool(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__bool);} - public static Dbmeta_fld_itm new_byte(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__byte);} - public static Dbmeta_fld_itm new_short(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__short);} - public static Dbmeta_fld_itm new_int(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__int);} - public static Dbmeta_fld_itm new_long(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__long);} - public static Dbmeta_fld_itm new_float(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__float);} - public static Dbmeta_fld_itm new_double(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__double);} - public static Dbmeta_fld_itm new_text(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__text);} - public static Dbmeta_fld_itm new_bry(String name) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__bry);} - public static Dbmeta_fld_itm new_str(String name, int len) {return new Dbmeta_fld_itm(name, Dbmeta_fld_tid.Itm__str(len));} - public static String[] To_str_ary(Dbmeta_fld_itm[] ary) { - int len = ary.length; - String[] rv = new String[len]; - for (int i = 0; i < len; ++i) - rv[i] = ary[i].name; - return rv; - } - - public static String Make_or_null(Db_conn conn, Dbmeta_fld_list flds, String tbl_name, int fld_type, Object fld_dflt, String fld_name) { - boolean tbl_exists = conn.Meta_tbl_exists(tbl_name); - boolean fld_exists = true; - if (tbl_exists) { - fld_exists = conn.Meta_fld_exists(tbl_name, fld_name); - if (!fld_exists) return Dbmeta_fld_itm.Key_null; - } - Dbmeta_fld_itm fld = null; - switch (fld_type) { - case Dbmeta_fld_tid.Tid__int: fld = Dbmeta_fld_itm.new_int(fld_name); break; - } - if (fld_dflt != null) fld.Default_(fld_dflt); - flds.Add(fld); - return fld.name; - } - public static String To_double_str_by_int(int v) {return Int_.To_str(v) + ".0";} -} diff --git a/140_dbs/src/gplx/dbs/Dbmeta_fld_list.java b/140_dbs/src/gplx/dbs/Dbmeta_fld_list.java deleted file mode 100644 index c23cc248c..000000000 --- a/140_dbs/src/gplx/dbs/Dbmeta_fld_list.java +++ /dev/null @@ -1,112 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs; import gplx.*; -public class Dbmeta_fld_list { - private final Ordered_hash flds = Ordered_hash_.New(); - public void Clear() {flds.Clear(); str_ary = null; fld_ary = null;} - public int Len() {return flds.Len();} - public boolean Has(String key) {return flds.Has(key);} - public Dbmeta_fld_itm Get_by(String name) {return (Dbmeta_fld_itm)flds.Get_by(name);} - public Dbmeta_fld_itm Get_at(int idx) {return (Dbmeta_fld_itm)flds.Get_at(idx);} - public String Add_bool(String name) {return Add(Dbmeta_fld_itm.new_bool(name));} - public String Add_byte(String name) {return Add(Dbmeta_fld_itm.new_byte(name));} - public String Add_short(String name) {return Add(Dbmeta_fld_itm.new_short(name));} - public String Add_int(String name) {return Add(Dbmeta_fld_itm.new_int(name));} - public String Add_int_pkey(String name) {return Add(Dbmeta_fld_itm.new_int(name).Primary_y_());} - public String Add_int_pkey_autonum(String name) {return Add(Dbmeta_fld_itm.new_int(name).Primary_y_().Autonum_y_());} - public String Add_int_autonum(String name) {return Add(Dbmeta_fld_itm.new_int(name).Autonum_y_());} - public String Add_int_dflt(String name, int dflt) {return Add(Dbmeta_fld_itm.new_int(name).Default_(dflt));} - public String Add_int_null(String name) {return Add(Dbmeta_fld_itm.new_int(name).Nullable_y_());} - public String Add_long(String name) {return Add(Dbmeta_fld_itm.new_long(name));} - public String Add_long_null(String name) {return Add(Dbmeta_fld_itm.new_long(name).Nullable_y_());} - public String Add_float(String name) {return Add(Dbmeta_fld_itm.new_float(name));} - public String Add_double(String name) {return Add(Dbmeta_fld_itm.new_double(name));} - public String Add_text(String name) {return Add(Dbmeta_fld_itm.new_text(name));} - public String Add_bry(String name) {return Add(Dbmeta_fld_itm.new_bry(name));} - public String Add_str(String name, int len) {return Add(Dbmeta_fld_itm.new_str(name, len));} - public String Add_date(String name) {return Add(Dbmeta_fld_itm.new_str(name, 32));} - public String Add_str_pkey(String name, int len) {return Add(Dbmeta_fld_itm.new_str(name, len).Primary_y_());} - public String Add_str_null(String name, int len) {return Add(Dbmeta_fld_itm.new_str(name, len).Nullable_y_());} - public String Add_str_dflt(String name, int len, String dflt) - {return Add(Dbmeta_fld_itm.new_str(name, len).Default_(dflt));} - public Dbmeta_fld_list Bld_int(String name) {Add_int(name); return this;} - public Dbmeta_fld_list Bld_str(String name) {return Bld_str(name, 255);} - public Dbmeta_fld_list Bld_str(String name, int len){Add_str(name, len); return this;} - - public String Add(Dbmeta_fld_itm fld) { - fld_ary = null; str_ary = null; - String name = fld.Name(); - flds.Add(name, fld); - return name; - } - public void Del(String key) { - fld_ary = null; str_ary = null; - flds.Del(key); - } - public void Insert(int pos, Dbmeta_fld_itm fld) { - fld_ary = null; str_ary = null; - flds.Add_at(pos, fld); - } - - public Dbmeta_fld_list New_int(String name) {Add(Dbmeta_fld_itm.new_int(name)); return this;} - public Dbmeta_fld_list New_fld(Dbmeta_fld_itm fld) {Add(fld); return this;} - public Dbmeta_fld_list Clone() { - Dbmeta_fld_list rv = new Dbmeta_fld_list(); - int len = this.Len(); - for (int i = 0; i < len; ++i) - rv.Add(this.Get_at(i)); - return rv; - } - public Dbmeta_fld_itm[] To_fld_ary() {if (fld_ary == null) fld_ary = (Dbmeta_fld_itm[])flds.To_ary(Dbmeta_fld_itm.class); return fld_ary;} private Dbmeta_fld_itm[] fld_ary; - public String[] To_str_ary() { - if (str_ary == null) { - int len = flds.Len(); - this.str_ary = new String[len]; - for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm fld = (Dbmeta_fld_itm)flds.Get_at(i); - str_ary[i] = fld.Name(); - } - } - return str_ary; - } private String[] str_ary; - public String[] To_str_ary_wo_autonum() { - int len = flds.Count(); - List_adp rv = List_adp_.New(); - for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm fld = (Dbmeta_fld_itm)flds.Get_at(i); - if (fld.Autonum()) continue; - rv.Add(fld.Name()); - } - return (String[])rv.To_ary(String.class); - } - public String[] To_str_ary_exclude(String[] ary) { - Hash_adp ary_hash = Hash_adp_.New(); - List_adp rv = List_adp_.New(); - int ary_len = ary.length; - for (int i = 0; i < ary_len; ++i) { - String ary_itm = ary[i]; - ary_hash.Add(ary_itm, ary_itm); - } - int fld_len = flds.Count(); - for (int i = 0; i < fld_len; ++i) { - Dbmeta_fld_itm fld = (Dbmeta_fld_itm)flds.Get_at(i); - String fld_key = fld.Name(); - if (ary_hash.Has(fld_key)) continue; - rv.Add(fld_key); - } - return rv.To_str_ary(); - } -} diff --git a/140_dbs/src/gplx/dbs/Dbmeta_fld_tid.java b/140_dbs/src/gplx/dbs/Dbmeta_fld_tid.java deleted file mode 100644 index e1eef8252..000000000 --- a/140_dbs/src/gplx/dbs/Dbmeta_fld_tid.java +++ /dev/null @@ -1,85 +0,0 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs; import gplx.*; -import gplx.dbs.engines.sqlite.*; // for Tid_sqlite; note that Tid_sqlite is not used, and only exists for doc purposes -public class Dbmeta_fld_tid { - public Dbmeta_fld_tid(int tid_ansi, int tid_sqlite, byte[] name, int len_1, int len_2) { - this.tid_ansi = tid_ansi; this.tid_sqlite = tid_sqlite; this.name = name; this.len_1 = len_1; this.len_2 = len_2; - } - public int Tid_ansi() {return tid_ansi;} private final int tid_ansi; - public int Tid_sqlite() {return tid_sqlite;} private final int tid_sqlite; - public byte[] Name() {return name;} private final byte[] name; - public int Len_1() {return len_1;} private final int len_1; - public int Len_2() {return len_2;} private final int len_2; - public boolean Eq(Dbmeta_fld_tid comp) { - return tid_ansi == comp.tid_ansi - && tid_sqlite == comp.tid_sqlite - && Bry_.Eq(name, comp.name) - && len_1 == comp.len_1 - && len_2 == comp.len_2; - } - - public static final int Tid__bool = 0, Tid__byte = 1, Tid__short = 2, Tid__int = 3, Tid__long = 4, Tid__float = 5, Tid__double = 6, Tid__str = 7, Tid__text = 8, Tid__bry = 9, Tid__decimal = 10, Tid__date = 11; - public static final Dbmeta_fld_tid - Itm__byte = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__byte , Sqlite_tid.Tid_int , Bry_.new_a7("tinyint") , -1, -1) - , Itm__short = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__short , Sqlite_tid.Tid_int , Bry_.new_a7("smallint") , -1, -1) - , Itm__int = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__int , Sqlite_tid.Tid_int , Bry_.new_a7("integer") , -1, -1) - , Itm__long = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__long , Sqlite_tid.Tid_int , Bry_.new_a7("bigint") , -1, -1) - , Itm__text = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__text , Sqlite_tid.Tid_text , Bry_.new_a7("text") , -1, -1) - , Itm__bry = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__bry , Sqlite_tid.Tid_none , Bry_.new_a7("blob") , -1, -1) - , Itm__float = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__float , Sqlite_tid.Tid_real , Bry_.new_a7("float") , -1, -1) - , Itm__double = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__double , Sqlite_tid.Tid_real , Bry_.new_a7("double") , -1, -1) - , Itm__numeric = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__decimal , Sqlite_tid.Tid_numeric , Bry_.new_a7("numeric") , -1, -1) - , Itm__bool = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__bool , Sqlite_tid.Tid_numeric , Bry_.new_a7("bit") , -1, -1) // "bit" is not SQLITE - , Itm__date = new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__date , Sqlite_tid.Tid_numeric , Bry_.new_a7("date") , -1, -1) - ; - public static Dbmeta_fld_tid Itm__str (int len) {return new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__str , Sqlite_tid.Tid_text , Bry_.new_a7("varchar") , len, -1);} - public static Dbmeta_fld_tid Itm__decimal (int len_1, int len_2) {return new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__decimal , Sqlite_tid.Tid_numeric , Bry_.new_a7("decimal") , len_1, len_2);} - public static Dbmeta_fld_tid New(int tid, int len1) { - switch (tid) { - case Dbmeta_fld_tid.Tid__bool: return Itm__bool; - case Dbmeta_fld_tid.Tid__byte: return Itm__byte; - case Dbmeta_fld_tid.Tid__short: return Itm__short; - case Dbmeta_fld_tid.Tid__int: return Itm__int; - case Dbmeta_fld_tid.Tid__long: return Itm__long; - case Dbmeta_fld_tid.Tid__float: return Itm__float; - case Dbmeta_fld_tid.Tid__double: return Itm__double; - case Dbmeta_fld_tid.Tid__str: return Itm__str(len1); - case Dbmeta_fld_tid.Tid__text: return Itm__text; - case Dbmeta_fld_tid.Tid__bry: return Itm__bry; - case Dbmeta_fld_tid.Tid__date: return Itm__date; - case Dbmeta_fld_tid.Tid__decimal: // return Itm__decimal(len1); - default: throw Err_.new_unhandled(tid); - } - } - public static int Get_by_obj(Object o) { - int type_id = Type_ids_.To_id_by_obj(o); - switch (type_id) { - case Type_ids_.Id__bool: return Dbmeta_fld_tid.Tid__bool; - case Type_ids_.Id__byte: return Dbmeta_fld_tid.Tid__byte; - case Type_ids_.Id__short: return Dbmeta_fld_tid.Tid__short; - case Type_ids_.Id__int: return Dbmeta_fld_tid.Tid__int; - case Type_ids_.Id__long: return Dbmeta_fld_tid.Tid__long; - case Type_ids_.Id__float: return Dbmeta_fld_tid.Tid__float; - case Type_ids_.Id__double: return Dbmeta_fld_tid.Tid__double; - case Type_ids_.Id__str: return Dbmeta_fld_tid.Tid__str; - case Type_ids_.Id__bry: return Dbmeta_fld_tid.Tid__bry; - case Type_ids_.Id__date: return Dbmeta_fld_tid.Tid__date; - case Type_ids_.Id__decimal: return Dbmeta_fld_tid.Tid__decimal; - default: throw Err_.new_unhandled_default(type_id); - } - } -} diff --git a/140_dbs/src/gplx/dbs/Dbmeta_tbl_itm.java b/140_dbs/src/gplx/dbs/Dbmeta_tbl_itm.java index 5e1155d1e..5dab99ae5 100644 --- a/140_dbs/src/gplx/dbs/Dbmeta_tbl_itm.java +++ b/140_dbs/src/gplx/dbs/Dbmeta_tbl_itm.java @@ -21,9 +21,9 @@ public class Dbmeta_tbl_itm { public Dbmeta_fld_mgr Flds() {return flds;} private final Dbmeta_fld_mgr flds = new Dbmeta_fld_mgr(); public String To_sql_create(SqlQryWtr sql_wtr) {return sql_wtr.Schema_wtr().Bld_create_tbl(this);} - public static Dbmeta_tbl_itm New(String name, Dbmeta_fld_list flds, Dbmeta_idx_itm... idxs) {return New(name, flds.To_fld_ary(), idxs);} - public static Dbmeta_tbl_itm New(String name, Dbmeta_fld_itm... flds) {return New(name, flds, Dbmeta_idx_itm.Ary_empty);} - public static Dbmeta_tbl_itm New(String name, Dbmeta_fld_itm[] flds, Dbmeta_idx_itm... idxs) { + public static Dbmeta_tbl_itm New(String name, DbmetaFldList flds, Dbmeta_idx_itm... idxs) {return New(name, flds.ToFldAry(), idxs);} + public static Dbmeta_tbl_itm New(String name, DbmetaFldItm... flds) {return New(name, flds, Dbmeta_idx_itm.Ary_empty);} + public static Dbmeta_tbl_itm New(String name, DbmetaFldItm[] flds, Dbmeta_idx_itm... idxs) { Dbmeta_tbl_itm rv = new Dbmeta_tbl_itm(); rv.name = name; if (flds != null) { diff --git a/140_dbs/src/gplx/dbs/conn_props/Db_conn_props_mgr.java b/140_dbs/src/gplx/dbs/conn_props/Db_conn_props_mgr.java index 56837ebc5..d46de12b9 100644 --- a/140_dbs/src/gplx/dbs/conn_props/Db_conn_props_mgr.java +++ b/140_dbs/src/gplx/dbs/conn_props/Db_conn_props_mgr.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.conn_props; import gplx.*; import gplx.dbs.*; +package gplx.dbs.conn_props; import gplx.*; public class Db_conn_props_mgr { private final Ordered_hash hash = Ordered_hash_.New(); public boolean Has(String key) {return hash.Has(key);} public boolean Match(String key, String expd_val) { - String actl_val = (String)hash.Get_by(key); + String actl_val = (String)hash.GetByOrNull(key); return actl_val == null ? false : String_.Eq(expd_val,actl_val); } public void Add(String key, String val) {hash.Add(key, val);} diff --git a/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl.java b/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl.java index 0a3acb79c..93697aad6 100644 --- a/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl.java +++ b/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl.java @@ -1,30 +1,30 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.diffs; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; public class Gfdb_diff_tbl { - public Gfdb_diff_tbl(String name, Dbmeta_fld_itm[] flds, Dbmeta_fld_itm[] keys, Dbmeta_fld_itm[] vals) { + public Gfdb_diff_tbl(String name, DbmetaFldItm[] flds, DbmetaFldItm[] keys, DbmetaFldItm[] vals) { this.Name = name; this.Flds = flds; this.Keys = keys; this.Vals = vals; } public final String Name; - public final Dbmeta_fld_itm[] Flds; - public final Dbmeta_fld_itm[] Keys; - public final Dbmeta_fld_itm[] Vals; + public final DbmetaFldItm[] Flds; + public final DbmetaFldItm[] Keys; + public final DbmetaFldItm[] Vals; public Db_rdr Make_rdr(Db_conn conn) { - Db_stmt stmt = conn.Stmt_select_order(Name, Dbmeta_fld_itm.To_str_ary(Flds), Dbmeta_fld_itm.Str_ary_empty, Dbmeta_fld_itm.To_str_ary(Keys)); + Db_stmt stmt = conn.Stmt_select_order(Name, DbmetaFldItm.ToStrAry(Flds), DbmetaFldItm.StrAryEmpty, DbmetaFldItm.ToStrAry(Keys)); return stmt.Exec_select__rls_auto(); } @@ -40,7 +40,7 @@ public class Gfdb_diff_tbl { Dbmeta_fld_mgr flds = tbl.Flds(); int flds_len = flds.Len(); for (int i = 0; i < flds_len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); if (fld.Primary()) { rv.Add(fld); return rv; @@ -67,7 +67,7 @@ public class Gfdb_diff_tbl { } // just add all for (int i = 0; i < flds_len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); rv.Add(fld); } return rv; @@ -76,7 +76,7 @@ public class Gfdb_diff_tbl { Dbmeta_fld_mgr rv = new Dbmeta_fld_mgr(); int flds_len = flds.Len(); for (int i = 0; i < flds_len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); if (!keys.Has(fld.Name())) rv.Add(fld); } return rv; diff --git a/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl_mgr.java b/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl_mgr.java index 1b1ce6da8..4efebd4d4 100644 --- a/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl_mgr.java +++ b/140_dbs/src/gplx/dbs/diffs/Gfdb_diff_tbl_mgr.java @@ -1,24 +1,24 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.diffs; import gplx.*; import gplx.dbs.*; class Gfdb_diff_tbl_mgr { private final Ordered_hash hash = Ordered_hash_.New(); - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Gfdb_diff_tbl Get_at(int idx) {return (Gfdb_diff_tbl)hash.Get_at(idx);} - public Gfdb_diff_tbl Get_by(String key) {return (Gfdb_diff_tbl)hash.Get_by(key);} + public Gfdb_diff_tbl Get_by(String key) {return (Gfdb_diff_tbl)hash.GetByOrNull(key);} } class Gfdb_diff_tbl_mgr__sqlite { public void Fill(Gfdb_diff_tbl_mgr tbl_mgr, Db_conn conn) { diff --git a/140_dbs/src/gplx/dbs/diffs/Gfdb_rdr_utl_.java b/140_dbs/src/gplx/dbs/diffs/Gfdb_rdr_utl_.java index b39985f80..e45746e2f 100644 --- a/140_dbs/src/gplx/dbs/diffs/Gfdb_rdr_utl_.java +++ b/140_dbs/src/gplx/dbs/diffs/Gfdb_rdr_utl_.java @@ -1,74 +1,73 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.diffs; import gplx.*; import gplx.dbs.*; -import gplx.dbs.metas.*; public class Gfdb_rdr_utl_ { - public static int Compare(Dbmeta_fld_itm[] flds, int len, Db_rdr lhs_rdr, Db_rdr rhs_rdr) { + public static int Compare(DbmetaFldItm[] flds, int len, Db_rdr lhs_rdr, Db_rdr rhs_rdr) { int comp = CompareAble_.Same; for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm fld = flds[i]; + DbmetaFldItm fld = flds[i]; String fld_name = fld.Name(); - int tid = fld.Type().Tid_ansi(); + int tid = fld.Type().Tid(); switch (tid) { - case Dbmeta_fld_tid.Tid__bool: comp = Bool_.Compare (lhs_rdr.Read_bool_by_byte(fld_name), rhs_rdr.Read_bool_by_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__byte: comp = Byte_.Compare (lhs_rdr.Read_byte(fld_name) , rhs_rdr.Read_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__int: comp = Int_.Compare (lhs_rdr.Read_int(fld_name) , rhs_rdr.Read_int(fld_name)); break; - case Dbmeta_fld_tid.Tid__long: comp = Long_.Compare (lhs_rdr.Read_long(fld_name) , rhs_rdr.Read_long(fld_name)); break; - case Dbmeta_fld_tid.Tid__float: comp = Float_.Compare (lhs_rdr.Read_float(fld_name) , rhs_rdr.Read_float(fld_name)); break; - case Dbmeta_fld_tid.Tid__double: comp = Double_.Compare (lhs_rdr.Read_double(fld_name) , rhs_rdr.Read_double(fld_name)); break; - case Dbmeta_fld_tid.Tid__str: comp = String_.Compare (lhs_rdr.Read_str(fld_name) , rhs_rdr.Read_str(fld_name)); break; - case Dbmeta_fld_tid.Tid__bry: comp = Bry_.Compare (lhs_rdr.Read_bry(fld_name) , rhs_rdr.Read_bry(fld_name)); break; + case DbmetaFldType.TidBool: comp = Bool_.Compare (lhs_rdr.Read_bool_by_byte(fld_name), rhs_rdr.Read_bool_by_byte(fld_name)); break; + case DbmetaFldType.TidByte: comp = Byte_.Compare (lhs_rdr.Read_byte(fld_name) , rhs_rdr.Read_byte(fld_name)); break; + case DbmetaFldType.TidInt: comp = Int_.Compare (lhs_rdr.Read_int(fld_name) , rhs_rdr.Read_int(fld_name)); break; + case DbmetaFldType.TidLong: comp = Long_.Compare (lhs_rdr.Read_long(fld_name) , rhs_rdr.Read_long(fld_name)); break; + case DbmetaFldType.TidFloat: comp = Float_.Compare (lhs_rdr.Read_float(fld_name) , rhs_rdr.Read_float(fld_name)); break; + case DbmetaFldType.TidDouble: comp = Double_.Compare (lhs_rdr.Read_double(fld_name) , rhs_rdr.Read_double(fld_name)); break; + case DbmetaFldType.TidStr: comp = String_.Compare (lhs_rdr.Read_str(fld_name) , rhs_rdr.Read_str(fld_name)); break; + case DbmetaFldType.TidBry: comp = Bry_.Compare (lhs_rdr.Read_bry(fld_name) , rhs_rdr.Read_bry(fld_name)); break; default: throw Err_.new_unhandled(tid); } if (comp != CompareAble_.Same) return comp; } return CompareAble_.Same; } - public static void Stmt_args(Db_stmt stmt, Dbmeta_fld_itm[] flds, int bgn, int end, Db_rdr rdr) { + public static void Stmt_args(Db_stmt stmt, DbmetaFldItm[] flds, int bgn, int end, Db_rdr rdr) { for (int i = bgn; i < end; ++i) { - Dbmeta_fld_itm fld = flds[i]; + DbmetaFldItm fld = flds[i]; String fld_name = fld.Name(); - int tid = fld.Type().Tid_ansi(); + int tid = fld.Type().Tid(); switch (tid) { - case Dbmeta_fld_tid.Tid__bool: stmt.Val_bool_as_byte (fld_name, rdr.Read_bool_by_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__byte: stmt.Val_byte (fld_name, rdr.Read_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__int: stmt.Val_int (fld_name, rdr.Read_int(fld_name)); break; - case Dbmeta_fld_tid.Tid__long: stmt.Val_long (fld_name, rdr.Read_long(fld_name)); break; - case Dbmeta_fld_tid.Tid__float: stmt.Val_float (fld_name, rdr.Read_float(fld_name)); break; - case Dbmeta_fld_tid.Tid__double: stmt.Val_double (fld_name, rdr.Read_double(fld_name)); break; - case Dbmeta_fld_tid.Tid__str: stmt.Val_str (fld_name, rdr.Read_str(fld_name)); break; - case Dbmeta_fld_tid.Tid__bry: stmt.Val_bry (fld_name, rdr.Read_bry(fld_name)); break; + case DbmetaFldType.TidBool: stmt.Val_bool_as_byte (fld_name, rdr.Read_bool_by_byte(fld_name)); break; + case DbmetaFldType.TidByte: stmt.Val_byte (fld_name, rdr.Read_byte(fld_name)); break; + case DbmetaFldType.TidInt: stmt.Val_int (fld_name, rdr.Read_int(fld_name)); break; + case DbmetaFldType.TidLong: stmt.Val_long (fld_name, rdr.Read_long(fld_name)); break; + case DbmetaFldType.TidFloat: stmt.Val_float (fld_name, rdr.Read_float(fld_name)); break; + case DbmetaFldType.TidDouble: stmt.Val_double (fld_name, rdr.Read_double(fld_name)); break; + case DbmetaFldType.TidStr: stmt.Val_str (fld_name, rdr.Read_str(fld_name)); break; + case DbmetaFldType.TidBry: stmt.Val_bry (fld_name, rdr.Read_bry(fld_name)); break; default: throw Err_.new_unhandled(tid); } } } - public static void Stmt_args(Db_stmt stmt, Dbmeta_fld_list flds, int bgn, int end, Db_rdr rdr) { + public static void Stmt_args(Db_stmt stmt, DbmetaFldList flds, int bgn, int end, Db_rdr rdr) { for (int i = bgn; i < end; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.GetAt(i); String fld_name = fld.Name(); - int tid = fld.Type().Tid_ansi(); + int tid = fld.Type().Tid(); switch (tid) { - case Dbmeta_fld_tid.Tid__bool: stmt.Val_bool_as_byte (fld_name, rdr.Read_bool_by_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__byte: stmt.Val_byte (fld_name, rdr.Read_byte(fld_name)); break; - case Dbmeta_fld_tid.Tid__int: stmt.Val_int (fld_name, rdr.Read_int(fld_name)); break; - case Dbmeta_fld_tid.Tid__long: stmt.Val_long (fld_name, rdr.Read_long(fld_name)); break; - case Dbmeta_fld_tid.Tid__float: stmt.Val_float (fld_name, rdr.Read_float(fld_name)); break; - case Dbmeta_fld_tid.Tid__double: stmt.Val_double (fld_name, rdr.Read_double(fld_name)); break; - case Dbmeta_fld_tid.Tid__str: stmt.Val_str (fld_name, rdr.Read_str(fld_name)); break; - case Dbmeta_fld_tid.Tid__bry: stmt.Val_bry (fld_name, rdr.Read_bry(fld_name)); break; + case DbmetaFldType.TidBool: stmt.Val_bool_as_byte (fld_name, rdr.Read_bool_by_byte(fld_name)); break; + case DbmetaFldType.TidByte: stmt.Val_byte (fld_name, rdr.Read_byte(fld_name)); break; + case DbmetaFldType.TidInt: stmt.Val_int (fld_name, rdr.Read_int(fld_name)); break; + case DbmetaFldType.TidLong: stmt.Val_long (fld_name, rdr.Read_long(fld_name)); break; + case DbmetaFldType.TidFloat: stmt.Val_float (fld_name, rdr.Read_float(fld_name)); break; + case DbmetaFldType.TidDouble: stmt.Val_double (fld_name, rdr.Read_double(fld_name)); break; + case DbmetaFldType.TidStr: stmt.Val_str (fld_name, rdr.Read_str(fld_name)); break; + case DbmetaFldType.TidBry: stmt.Val_bry (fld_name, rdr.Read_bry(fld_name)); break; default: throw Err_.new_unhandled(tid); } } diff --git a/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_bldr_tst.java b/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_bldr_tst.java index 0073fd1c2..6caa14631 100644 --- a/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_bldr_tst.java +++ b/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_bldr_tst.java @@ -15,7 +15,6 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.dbs.diffs.builds; import gplx.*; import gplx.dbs.*; import gplx.dbs.diffs.*; import org.junit.*; -import gplx.dbs.*; import gplx.dbs.metas.*; import gplx.dbs.engines.mems.*; public class Gfdb_diff_bldr_tst { private final Gfdb_diff_bldr_fxt fxt = new Gfdb_diff_bldr_fxt(); @Before public void init() {fxt.Clear();} @@ -58,13 +57,13 @@ class Gfdb_diff_bldr_fxt { private final Db_conn old_conn, new_conn; private final Gfdb_diff_tbl tbl; private final Gfdb_diff_wkr__test wkr = new Gfdb_diff_wkr__test(); - private final Dbmeta_fld_itm[] flds_ary; + private final DbmetaFldItm[] flds_ary; private final String tbl_name = "tbl"; private final Gdif_bldr_ctx ctx = new Gdif_bldr_ctx(); public Gfdb_diff_bldr_fxt() { old_conn = Db_conn_utl.Conn__new("old_db"); new_conn = Db_conn_utl.Conn__new("new_db"); - this.flds_ary = new Dbmeta_fld_itm[] {Dbmeta_fld_itm.new_int("id").Primary_y_(), Dbmeta_fld_itm.new_str("val", 255)}; + this.flds_ary = new DbmetaFldItm[] {DbmetaFldItm.NewInt("id").PrimarySetY(), DbmetaFldItm.NewStr("val", 255)}; tbl = Gfdb_diff_tbl.New(Dbmeta_tbl_itm.New(tbl_name, flds_ary)); bldr.Init(wkr); } @@ -101,5 +100,5 @@ class Gfdb_diff_wkr__test implements Gfdb_diff_wkr { public void Handle_new_missing() { list.Add(bfr.Add_str_a7("D").Add_byte_pipe().Add_obj(old_rdr.Read_obj("id")).To_str_and_clear()); } - public String[] To_str_ary() {return list.To_str_ary_and_clear();} + public String[] To_str_ary() {return list.ToStrAryAndClear();} } diff --git a/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_rdr_comparer.java b/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_rdr_comparer.java index 9793e49dd..37f24be01 100644 --- a/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_rdr_comparer.java +++ b/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_rdr_comparer.java @@ -1,24 +1,24 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.diffs.builds; import gplx.*; import gplx.dbs.*; import gplx.dbs.diffs.*; class Gfdb_diff_rdr_comparer { private Db_rdr old_rdr, new_rdr; private boolean old_rdr_move, new_rdr_move; private boolean old_rdr_done, new_rdr_done; - private Dbmeta_fld_itm[] key_flds; private int key_flds_len; + private DbmetaFldItm[] key_flds; private int key_flds_len; public void Init_rdrs(Gfdb_diff_tbl tbl, Db_rdr old_rdr, Db_rdr new_rdr) { this.old_rdr = old_rdr; this.new_rdr = new_rdr; this.old_rdr_move = new_rdr_move = Bool_.Y; diff --git a/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_wkr__db.java b/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_wkr__db.java index 52b7cbeb2..1aae11aa0 100644 --- a/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_wkr__db.java +++ b/140_dbs/src/gplx/dbs/diffs/builds/Gfdb_diff_wkr__db.java @@ -1,22 +1,22 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.diffs.builds; import gplx.*; import gplx.dbs.*; import gplx.dbs.diffs.*; -import gplx.dbs.metas.*; import gplx.dbs.diffs.itms.*; +import gplx.dbs.diffs.itms.*; public class Gfdb_diff_wkr__db implements Gfdb_diff_wkr { - private Dbmeta_fld_itm[] val_flds; private int val_flds_len; + private DbmetaFldItm[] val_flds; private int val_flds_len; private Gfdb_diff_tbl tbl; private Db_rdr old_rdr, new_rdr; private Gdif_bldr_ctx ctx; private Db_conn dif_conn; private Db_stmt stmt; @@ -28,7 +28,7 @@ public class Gfdb_diff_wkr__db implements Gfdb_diff_wkr { this.val_flds = tbl.Vals; val_flds_len = val_flds.length; this.uid = 0; this.prog_count = 0; - String dif_tbl = tbl.Name; Dbmeta_fld_itm[] dif_flds = Gfdb_diff_wkr__db_.New_dif_flds(tbl.Flds); + String dif_tbl = tbl.Name; DbmetaFldItm[] dif_flds = Gfdb_diff_wkr__db_.New_dif_flds(tbl.Flds); if (!dif_conn.Meta_tbl_exists(dif_tbl)) dif_conn.Meta_tbl_create(Dbmeta_tbl_itm.New(dif_tbl, dif_flds)); this.stmt = dif_conn.Stmt_insert(dif_tbl, Gfdb_diff_wkr__db_.To_str_ary(dif_flds)); dif_conn.Txn_bgn("dif_db_tbl_" + dif_tbl); @@ -43,7 +43,7 @@ public class Gfdb_diff_wkr__db implements Gfdb_diff_wkr { if (Gfdb_rdr_utl_.Compare(val_flds, val_flds_len, old_rdr, new_rdr) != CompareAble_.Same) Insert(Gdif_db_.Tid__update, ++uid, new_rdr, tbl.Flds); } - private void Insert(byte dif_type, int uid, Db_rdr rdr, Dbmeta_fld_itm[] flds) { + private void Insert(byte dif_type, int uid, Db_rdr rdr, DbmetaFldItm[] flds) { if (cmd_create) { cmd_create = false; ctx.Cur_cmd = ctx.Core.New_cmd(ctx, Gdif_cmd_itm.Tid__data); @@ -61,23 +61,23 @@ public class Gfdb_diff_wkr__db implements Gfdb_diff_wkr { } } class Gfdb_diff_wkr__db_ { - public static Dbmeta_fld_itm[] New_dif_flds(Dbmeta_fld_itm[] cur_flds) { + public static DbmetaFldItm[] New_dif_flds(DbmetaFldItm[] cur_flds) { int len = cur_flds.length; int sys_flds = 5; - Dbmeta_fld_itm[] rv = new Dbmeta_fld_itm[len + sys_flds]; - rv[0] = Dbmeta_fld_itm.new_int (Gdif_db_.Fld__dif_txn); - rv[1] = Dbmeta_fld_itm.new_int (Gdif_db_.Fld__dif_uid); - rv[2] = Dbmeta_fld_itm.new_byte (Gdif_db_.Fld__dif_type); - rv[3] = Dbmeta_fld_itm.new_int (Gdif_db_.Fld__dif_db_trg); - rv[4] = Dbmeta_fld_itm.new_int (Gdif_db_.Fld__dif_db_src); + DbmetaFldItm[] rv = new DbmetaFldItm[len + sys_flds]; + rv[0] = DbmetaFldItm.NewInt(Gdif_db_.Fld__dif_txn); + rv[1] = DbmetaFldItm.NewInt(Gdif_db_.Fld__dif_uid); + rv[2] = DbmetaFldItm.NewByte(Gdif_db_.Fld__dif_type); + rv[3] = DbmetaFldItm.NewInt(Gdif_db_.Fld__dif_db_trg); + rv[4] = DbmetaFldItm.NewInt(Gdif_db_.Fld__dif_db_src); for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm cur_fld = cur_flds[i]; - Dbmeta_fld_itm dif_fld = new Dbmeta_fld_itm(cur_fld.Name(), cur_fld.Type()); + DbmetaFldItm cur_fld = cur_flds[i]; + DbmetaFldItm dif_fld = new DbmetaFldItm(cur_fld.Name(), cur_fld.Type()); rv[i + sys_flds] = dif_fld; } return rv; } - public static String[] To_str_ary(Dbmeta_fld_itm[] ary) { + public static String[] To_str_ary(DbmetaFldItm[] ary) { int len = ary.length; String[] rv = new String[len]; for (int i = 0; i < len; ++i) diff --git a/140_dbs/src/gplx/dbs/diffs/cmds/Gfdb_diff_cmd.java b/140_dbs/src/gplx/dbs/diffs/cmds/Gfdb_diff_cmd.java index 1c31ec58b..672b45687 100644 --- a/140_dbs/src/gplx/dbs/diffs/cmds/Gfdb_diff_cmd.java +++ b/140_dbs/src/gplx/dbs/diffs/cmds/Gfdb_diff_cmd.java @@ -37,12 +37,12 @@ class Gfo_srl_mgr_rdr__db { Gfo_srl_mgr_rdr__defn defn = new Gfo_srl_mgr_rdr__defn(); // Get(key) Db_conn conn = Db_conn_.Noop; - Db_stmt select = conn.Stmt_select(defn.Tbl, Dbmeta_fld_itm.Str_ary_empty, defn.Select_crt_cols); + Db_stmt select = conn.Stmt_select(defn.Tbl, DbmetaFldItm.StrAryEmpty, defn.Select_crt_cols); int crt_len = crt_mgr.Len(); for (int i = 0; i < crt_len; ++i) { Dbmeta_dat_itm crt = crt_mgr.Get_at(i); switch (crt.Tid) { - case Dbmeta_fld_tid.Tid__int: select.Crt_int(crt.Key, Int_.Cast(crt.Val)); break; + case DbmetaFldType.TidInt: select.Crt_int(crt.Key, Int_.Cast(crt.Val)); break; } } Db_rdr rdr = select.Exec_select__rls_manual(); @@ -53,7 +53,7 @@ class Gfo_srl_mgr_rdr__db { } rdr.Rls(); - return list.To_ary_and_clear(proto.getClass()); + return list.ToAryAndClear(proto.getClass()); } public void Set_subs (Gfo_srl_ctx ctx, Gfo_srl_itm owner, Gfo_srl_itm proto, Gfo_srl_itm[] subs_ary, String defn_key, Dbmeta_dat_mgr crt_mgr) { Gfo_srl_mgr_rdr__defn defn = new Gfo_srl_mgr_rdr__defn(); // Get(key) @@ -63,7 +63,7 @@ class Gfo_srl_mgr_rdr__db { for (int i = 0; i < crt_len; ++i) { Dbmeta_dat_itm crt = crt_mgr.Get_at(i); switch (crt.Tid) { - case Dbmeta_fld_tid.Tid__int: delete.Crt_int(crt.Key, Int_.Cast(crt.Val)); break; + case DbmetaFldType.TidInt: delete.Crt_int(crt.Key, Int_.Cast(crt.Val)); break; } } delete.Exec_delete(); @@ -88,18 +88,18 @@ class Gfdb_diff_txn { public int Id = 0; } class Gfdb_diff_cmd__fld__create { - public Gfdb_diff_cmd__fld__create(Dbmeta_fld_itm cur) {this.cur = cur;} - private Dbmeta_fld_itm cur; + public Gfdb_diff_cmd__fld__create(DbmetaFldItm cur) {this.cur = cur;} + private DbmetaFldItm cur; public void Save(Gfo_srl_ctx ctx, Gfo_srl_itm owner) { Gfo_srl_mgr_wtr wtr = ctx.Wtr_bgn("cmd.fld"); wtr.Set_int ("txn_id" , ((Gfdb_diff_txn)owner).Id); wtr.Set_str ("name" , cur.Name()); - wtr.Set_int ("type_tid" , cur.Type().Tid_ansi()); - wtr.Set_int ("type_len_1" , cur.Type().Len_1()); - wtr.Set_int ("type_len_2" , cur.Type().Len_2()); + wtr.Set_int ("type_tid" , cur.Type().Tid()); + wtr.Set_int ("type_len_1" , cur.Type().Len1()); + wtr.Set_int ("type_len_2" , cur.Type().Len2()); wtr.Set_bool ("primary" , cur.Primary()); - wtr.Set_int ("nullable" , cur.Nullable_tid()); - wtr.Set_str ("dflt" , Object_.Xto_str_or(cur.Default(), null)); + wtr.Set_int ("nullable" , cur.Nullable()); + wtr.Set_str ("dflt" , Object_.Xto_str_or(cur.DefaultVal(), null)); wtr.Itm_end(); } public void Load(Gfo_srl_ctx ctx, Gfo_srl_itm owner) { @@ -111,10 +111,10 @@ class Gfdb_diff_cmd__fld__create { boolean primary = rdr.Get_bool("primary"); int nullable_tid = rdr.Get_int("nullable"); String dflt_str = rdr.Get_str("dflt"); - cur = new Dbmeta_fld_itm(name, Dbmeta_fld_tid.New(type_tid, type_len_1)); - cur.Nullable_tid_(nullable_tid); - if (primary) cur.Primary_y_(); - if (dflt_str != null) cur.Default_(dflt_str); + cur = new DbmetaFldItm(name, DbmetaFldType.New(type_tid, type_len_1)); + cur.NullableSet(nullable_tid); + if (primary) cur.PrimarySetY(); + if (dflt_str != null) cur.DefaultValSet(dflt_str); rdr.Itm_end(); // Gfdb_diff_cmd__idx__create idx = ((Gfdb_diff_cmd__idx__create)owner); // Dbmeta_tbl_itm tbl = ((Gfdb_diff_ctx)ctx).Tbls__get(idx.cur.Tbl()); @@ -122,13 +122,13 @@ class Gfdb_diff_cmd__fld__create { } } class Gfdb_diff_cmd__fld__delete { - public Gfdb_diff_cmd__fld__delete(Dbmeta_fld_itm old) {this.Old = old;} - public final Dbmeta_fld_itm Old; + public Gfdb_diff_cmd__fld__delete(DbmetaFldItm old) {this.Old = old;} + public final DbmetaFldItm Old; } class Gfdb_diff_cmd__fld__modify { - public Gfdb_diff_cmd__fld__modify(Dbmeta_fld_itm old, Dbmeta_fld_itm cur) {this.Old = old; this.Cur = cur;} - public final Dbmeta_fld_itm Old; - public final Dbmeta_fld_itm Cur; + public Gfdb_diff_cmd__fld__modify(DbmetaFldItm old, DbmetaFldItm cur) {this.Old = old; this.Cur = cur;} + public final DbmetaFldItm Old; + public final DbmetaFldItm Cur; } class Gfdb_diff_cmd__tbl__create { public Gfdb_diff_cmd__tbl__create(Dbmeta_tbl_itm cur) {this.Cur = cur;} @@ -184,8 +184,8 @@ class Gfdb_diff_cmd_bldr { Dbmeta_fld_mgr old_flds = old_tbl.Flds(), cur_flds = cur_tbl.Flds(); int cur_flds_len = cur_flds.Len(); for (int i = 0; i < cur_flds_len; ++i) { - Dbmeta_fld_itm cur_fld = cur_flds.Get_at(i); - Dbmeta_fld_itm old_fld = old_flds.Get_by(cur_fld.Name()); + DbmetaFldItm cur_fld = cur_flds.Get_at(i); + DbmetaFldItm old_fld = old_flds.Get_by(cur_fld.Name()); if (old_fld == null) rv.Add(new Gfdb_diff_cmd__fld__create(cur_fld)); else @@ -194,8 +194,8 @@ class Gfdb_diff_cmd_bldr { } int old_flds_len = old_flds.Len(); for (int i = 0; i < old_flds_len; ++i) { - Dbmeta_fld_itm old_fld = old_flds.Get_at(i); - Dbmeta_fld_itm cur_fld = cur_flds.Get_by(old_fld.Name()); + DbmetaFldItm old_fld = old_flds.Get_at(i); + DbmetaFldItm cur_fld = cur_flds.Get_by(old_fld.Name()); if (cur_fld == null) rv.Add(new Gfdb_diff_cmd__fld__delete(old_fld)); } diff --git a/140_dbs/src/gplx/dbs/diffs/itms/Gdif_cmd_tbl.java b/140_dbs/src/gplx/dbs/diffs/itms/Gdif_cmd_tbl.java index 29a467bc0..4a1b710a8 100644 --- a/140_dbs/src/gplx/dbs/diffs/itms/Gdif_cmd_tbl.java +++ b/140_dbs/src/gplx/dbs/diffs/itms/Gdif_cmd_tbl.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.diffs.itms; import gplx.*; import gplx.dbs.*; import gplx.dbs.diffs.*; +package gplx.dbs.diffs.itms; import gplx.*; import gplx.dbs.*; public class Gdif_cmd_tbl implements Rls_able { private String tbl_name = "gdif_cmd"; private String fld_grp_id, fld_cmd_id, fld_tid, fld_data; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final Db_conn conn; private Db_stmt stmt_insert; public Gdif_cmd_tbl(Db_conn conn) { this.conn = conn; - fld_grp_id = flds.Add_int("grp_id"); fld_cmd_id = flds.Add_int("cmd_id"); fld_tid = flds.Add_int("tid"); fld_data = flds.Add_text("data"); + fld_grp_id = flds.AddInt("grp_id"); fld_cmd_id = flds.AddInt("cmd_id"); fld_tid = flds.AddInt("tid"); fld_data = flds.AddText("data"); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_tbl(tbl_name, "main", fld_grp_id, fld_cmd_id)));} diff --git a/140_dbs/src/gplx/dbs/diffs/itms/Gdif_job_tbl.java b/140_dbs/src/gplx/dbs/diffs/itms/Gdif_job_tbl.java index dbe886f3f..b8ea67975 100644 --- a/140_dbs/src/gplx/dbs/diffs/itms/Gdif_job_tbl.java +++ b/140_dbs/src/gplx/dbs/diffs/itms/Gdif_job_tbl.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.diffs.itms; import gplx.*; import gplx.dbs.*; import gplx.dbs.diffs.*; +package gplx.dbs.diffs.itms; import gplx.*; import gplx.dbs.*; public class Gdif_job_tbl implements Rls_able { private String tbl_name = "gdif_job"; private String fld_job_id, fld_name, fld_made_by, fld_made_on, fld_data; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final Db_conn conn; private Db_stmt stmt_insert; public Gdif_job_tbl(Db_conn conn) { this.conn = conn; - fld_job_id = flds.Add_int_pkey("job_id"); fld_name = flds.Add_str("name", 255); fld_made_by = flds.Add_str("made_by", 255); fld_made_on = flds.Add_date("made_on"); fld_data = flds.Add_text("data"); + fld_job_id = flds.AddIntPkey("job_id"); fld_name = flds.AddStr("name", 255); fld_made_by = flds.AddStr("made_by", 255); fld_made_on = flds.AddDate("made_on"); fld_data = flds.AddText("data"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} diff --git a/140_dbs/src/gplx/dbs/diffs/itms/Gdif_txn_tbl.java b/140_dbs/src/gplx/dbs/diffs/itms/Gdif_txn_tbl.java index 2dc4dd597..88e4009f9 100644 --- a/140_dbs/src/gplx/dbs/diffs/itms/Gdif_txn_tbl.java +++ b/140_dbs/src/gplx/dbs/diffs/itms/Gdif_txn_tbl.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.diffs.itms; import gplx.*; import gplx.dbs.*; import gplx.dbs.diffs.*; +package gplx.dbs.diffs.itms; import gplx.*; import gplx.dbs.*; public class Gdif_txn_tbl implements Rls_able { private String tbl_name = "gdif_txn"; private String fld_job_id, fld_txn_id, fld_cmd_id, fld_owner_txn; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final Db_conn conn; private Db_stmt stmt_insert; public Gdif_txn_tbl(Db_conn conn) { this.conn = conn; - fld_job_id = flds.Add_int("job_id"); fld_txn_id = flds.Add_int("txn_id"); fld_cmd_id = flds.Add_int("cmd_id"); fld_owner_txn = flds.Add_int("owner_txn"); + fld_job_id = flds.AddInt("job_id"); fld_txn_id = flds.AddInt("txn_id"); fld_cmd_id = flds.AddInt("cmd_id"); fld_owner_txn = flds.AddInt("owner_txn"); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_tbl(tbl_name, "main", fld_job_id, fld_txn_id)));} diff --git a/140_dbs/src/gplx/dbs/engines/Db_engine.java b/140_dbs/src/gplx/dbs/engines/Db_engine.java index b512071df..b68511b86 100644 --- a/140_dbs/src/gplx/dbs/engines/Db_engine.java +++ b/140_dbs/src/gplx/dbs/engines/Db_engine.java @@ -23,7 +23,7 @@ import gplx.dbs.Db_conn_info; import gplx.dbs.Db_qry; import gplx.dbs.Db_rdr; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_itm; +import gplx.dbs.DbmetaFldItm; import gplx.dbs.Dbmeta_idx_itm; import gplx.dbs.Dbmeta_tbl_itm; import gplx.dbs.conn_props.Db_conn_props_mgr; @@ -48,7 +48,7 @@ public interface Db_engine { void Txn_sav(); void Meta_tbl_create(Dbmeta_tbl_itm meta); void Meta_tbl_delete(String tbl); - void Meta_fld_append(String tbl, Dbmeta_fld_itm fld); + void Meta_fld_append(String tbl, DbmetaFldItm fld); void Meta_idx_create(Gfo_usr_dlg usr_dlg, Dbmeta_idx_itm... ary); void Meta_idx_delete(String idx); Dbmeta_tbl_mgr Meta_mgr(); diff --git a/140_dbs/src/gplx/dbs/engines/Db_engine_sql_base.java b/140_dbs/src/gplx/dbs/engines/Db_engine_sql_base.java index fae8163ef..701c8f8b0 100644 --- a/140_dbs/src/gplx/dbs/engines/Db_engine_sql_base.java +++ b/140_dbs/src/gplx/dbs/engines/Db_engine_sql_base.java @@ -26,7 +26,7 @@ import gplx.dbs.Db_qry_; import gplx.dbs.Db_rdr; import gplx.dbs.Db_rdr__basic; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_itm; +import gplx.dbs.DbmetaFldItm; import gplx.dbs.Dbmeta_idx_itm; import gplx.dbs.Dbmeta_tbl_itm; import gplx.dbs.conn_props.Db_conn_props_mgr; @@ -65,7 +65,7 @@ public abstract class Db_engine_sql_base implements Db_engine { public Object Exec_as_obj(Db_qry qry) { if (qry.Tid() == Db_qry_.Tid_flush) return null; // ignore flush (delete-db) statements String sql = this.Sql_wtr().ToSqlStr(qry, false); // DBG: Tfds.Write(sql); - return qry.Exec_is_rdr() ? (Object)this.Exec_as_rdr(sql) : this.Exec_as_int(sql); + return qry.ReturnsRdr() ? (Object)this.Exec_as_rdr(sql) : this.Exec_as_int(sql); } protected int Exec_as_int(String sql) { try { @@ -97,7 +97,7 @@ public abstract class Db_engine_sql_base implements Db_engine { public void Meta_idx_delete(String idx) { if (Meta_idx_exists(idx)) Exec_as_int("DROP INDEX " + idx); } - public void Meta_fld_append(String tbl, Dbmeta_fld_itm fld) { + public void Meta_fld_append(String tbl, DbmetaFldItm fld) { Gfo_usr_dlg_.Instance.Plog_many("", "", "adding column to table: db=~{0} tbl=~{1} fld=~{2}", conn_info.Database(), tbl, fld.Name()); try { Exec_as_int(this.Sql_wtr().Schema_wtr().Bld_alter_tbl_add(tbl, fld)); diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_db_fxt.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_db_fxt.java index fcf1ac04a..76e7b0d7f 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_db_fxt.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_db_fxt.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; class Mem_db_fxt { public Mem_db_fxt() { Io_mgr.Instance.InitEngine_mem(); @@ -21,10 +21,10 @@ class Mem_db_fxt { } public Db_conn Make_conn(String url) {return Db_conn_bldr.Instance.Get_or_autocreate(Bool_.Y, Io_url_.mem_fil_(url));} public Dbmeta_tbl_itm Exec__create_tbl(Db_conn conn, String tbl, String... fld_names) { - Dbmeta_fld_list flds = new Dbmeta_fld_list(); + DbmetaFldList flds = new DbmetaFldList(); int len = fld_names.length; for (int i = 0; i < len; ++i) - flds.Add_str(fld_names[i], 255); + flds.AddStr(fld_names[i], 255); Dbmeta_tbl_itm rv = Dbmeta_tbl_itm.New(tbl, flds); conn.Meta_tbl_create(rv); return rv; @@ -33,14 +33,14 @@ class Mem_db_fxt { Mem_engine engine = (Mem_engine)conn.Engine(); int rows_len = rows.length; Mem_tbl tbl = engine.Tbls__get(tbl_name); - Dbmeta_fld_list flds_list = tbl.Meta().Flds().To_fld_list(); + DbmetaFldList flds_list = tbl.Meta().Flds().To_fld_list(); int flds_len = flds_list.Len(); Db_stmt stmt = conn.Stmt_insert(tbl_name, flds_list); for (int i = 0; i < rows_len; ++i) { stmt.Clear(); String[] row = rows[i]; for (int j = 0; j < flds_len; ++j) - stmt.Val_str(flds_list.Get_at(j).Name(), row[j]); + stmt.Val_str(flds_list.GetAt(j).Name(), row[j]); stmt.Exec_insert(); } } @@ -67,6 +67,6 @@ class Mem_db_fxt { } actl_list.Add(tmp_bfr.To_str_and_clear()); } - Tfds.Eq_ary(expd_rows, (String[])actl_list.To_ary_and_clear(String.class)); + Tfds.Eq_ary(expd_rows, (String[])actl_list.ToAryAndClear(String.class)); } } diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_engine.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_engine.java index aabbf9e34..7e49a5a65 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_engine.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_engine.java @@ -32,7 +32,7 @@ public class Mem_engine implements Db_engine { @Override public void CtorConn(SqlWkrMgr wkrMgr) {} public Db_engine New_clone(Db_conn_info conn_info) {return new Mem_engine(conn_info);} public Db_stmt Stmt_by_qry(Db_qry qry) {return new Mem_stmt(this, qry);} - public Mem_tbl Tbls__get(String name) {return (Mem_tbl)tbl_hash.Get_by(name);} + public Mem_tbl Tbls__get(String name) {return (Mem_tbl)tbl_hash.GetByOrNull(name);} public void Tbls__del(String name) {tbl_hash.Del(name);} public void Txn_bgn(String name) {}//++txn_count;} private int txn_count = 0; public String Txn_end() {return "";}// --txn_count; return "";} @@ -49,20 +49,20 @@ public class Mem_engine implements Db_engine { public Object Stmt_by_sql(String sql) {throw Err_.new_unimplemented();} public void Meta_tbl_create(Dbmeta_tbl_itm meta) { Mem_tbl mem_tbl = new Mem_tbl(meta); - tbl_hash.Add_if_dupe_use_nth(meta.Name(), mem_tbl); + tbl_hash.AddIfDupeUseNth(meta.Name(), mem_tbl); meta_mgr.Add(meta); } public void Meta_tbl_delete(String tbl_key) { - Mem_tbl tbl = (Mem_tbl)tbl_hash.Get_by(tbl_key); + Mem_tbl tbl = (Mem_tbl)tbl_hash.GetByOrNull(tbl_key); if (tbl != null) tbl.rows.Clear(); } public void Meta_idx_create(Gfo_usr_dlg usr_dlg, Dbmeta_idx_itm... ary) {} // TODO_OLD: implement unique index public void Meta_idx_delete(String idx) {} - public void Meta_fld_append(String tbl, Dbmeta_fld_itm fld) {} + public void Meta_fld_append(String tbl, DbmetaFldItm fld) {} public Dbmeta_tbl_mgr Meta_mgr() {return meta_mgr;} private final Dbmeta_tbl_mgr meta_mgr = new Dbmeta_tbl_mgr(Dbmeta_reload_cmd_.Noop); public boolean Meta_tbl_exists(String tbl) {return tbl_hash.Has(tbl);} public boolean Meta_fld_exists(String tbl, String fld) { - Mem_tbl mem_tbl = (Mem_tbl)tbl_hash.Get_by(tbl); if (mem_tbl == null) return false; + Mem_tbl mem_tbl = (Mem_tbl)tbl_hash.GetByOrNull(tbl); if (mem_tbl == null) return false; return mem_tbl.Meta().Flds().Has(fld); } public boolean Meta_idx_exists(String idx) {return false;} diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_exec_select.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_exec_select.java index d2eff1d6d..28fa06310 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_exec_select.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_exec_select.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.core.criterias.*; import gplx.dbs.qrys.*; import gplx.dbs.sqls.itms.*; public class Mem_exec_select { @@ -22,7 +22,7 @@ public class Mem_exec_select { public Mem_exec_select(Mem_engine engine) {this.engine = engine;} public Db_rdr Select(Mem_stmt stmt) { Db_qry stmt_qry = stmt.Qry(); - Mem_tbl tbl = engine.Tbls__get(stmt_qry.Base_table()); + Mem_tbl tbl = engine.Tbls__get(stmt_qry.BaseTable()); String[] select = null; Criteria where = null; Db_qry__select_in_tbl qry = Db_qry__select_in_tbl.as_(stmt_qry); Db_qry__select_cmd qry2 = null; @@ -36,20 +36,20 @@ public class Mem_exec_select { where = qry.Where(); } Mem_stmt_args_.Fill(stmt.Stmt_args(), where); - Mem_row[] tbl_rows = (Mem_row[])tbl.rows.To_ary(Mem_row.class); + Mem_row[] tbl_rows = (Mem_row[])tbl.rows.ToAry(Mem_row.class); if (qry2 != null) { tbl_rows = Mem_exec_.Rows__alias(tbl_rows, qry2.From().Base_tbl.Alias); List_adp join_tbls = qry2.From().Tbls; int join_tbls_len = join_tbls.Len(); for (int i = 1; i < join_tbls_len; ++i) { Sql_tbl_itm join_tbl = (Sql_tbl_itm)join_tbls.Get_at(i); - Mem_row[] join_rows = (Mem_row[])engine.Tbls__get(join_tbl.Name).rows.To_ary(Mem_row.class); + Mem_row[] join_rows = (Mem_row[])engine.Tbls__get(join_tbl.Name).rows.ToAry(Mem_row.class); join_rows = Mem_exec_.Rows__alias(join_rows, join_tbl.Alias); tbl_rows = Mem_exec_.Rows__join(join_tbl.Join_tid, tbl_rows, join_rows, join_tbl.Alias, join_tbl.Join_flds); } } Mem_exec_.Where__filter(tmp_where_rows, tbl_rows, stmt, where); - Mem_row[] rslt_rows = (Mem_row[])tmp_where_rows.To_ary_and_clear(Mem_row.class); + Mem_row[] rslt_rows = (Mem_row[])tmp_where_rows.ToAryAndClear(Mem_row.class); if (qry2 != null) { if (qry2.Order() != null && qry2.Order().Flds().length > 0) Array_.Sort(rslt_rows, new Mem_sorter(qry2.Order().Flds())); @@ -125,7 +125,7 @@ class Mem_exec_ { rv.Add(merged); } } - return (Mem_row[])rv.To_ary_and_clear(Mem_row.class); + return (Mem_row[])rv.ToAryAndClear(Mem_row.class); } public static Mem_row[] Rows__alias(Mem_row[] src_rows, String tbl_alias) { int src_rows_len = src_rows.length; diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_qry_set.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_qry_set.java index 52aaad5f2..da67d63fa 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_qry_set.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_qry_set.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.mems; import gplx.*; public class Mem_qry_set { private final List_adp rows = List_adp_.New(); - public int Len() {return rows.Count();} + public int Len() {return rows.Len();} public Mem_row Get_at(int i) {return (Mem_row)rows.Get_at(i);} public void Add(Mem_row row) {rows.Add(row);} } diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_row.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_row.java index dd5a1cba2..2fb14e3bb 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_row.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_row.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; public class Mem_row implements Gfo_invk { private final Ordered_hash hash = Ordered_hash_.New(); private final Ordered_hash flds = Ordered_hash_.New(); public int Len() {return hash.Len();} public String Fld_at(int i) {return (String)flds.Get_at(i);} public Object Get_at(int i) {return hash.Get_at(i);} - public Object Get_by(String key) {return hash.Get_by(key);} + public Object Get_by(String key) {return hash.GetByOrNull(key);} public Object Get_by_or_dbnull(String key) { - Object rv = hash.Get_by(key); + Object rv = hash.GetByOrNull(key); return rv == null ? Db_null.Instance : rv; } - public void Set_by(String key, Object val) {hash.Add_if_dupe_use_nth(key, val); flds.Add_if_dupe_use_1st(key, key);} - public void Add(String key, Object val) {hash.Add(key, val); flds.Add_if_dupe_use_1st(key, key);} + public void Set_by(String key, Object val) {hash.AddIfDupeUseNth(key, val); flds.AddIfDupeUse1st(key, key);} + public void Add(String key, Object val) {hash.Add(key, val); flds.AddIfDupeUse1st(key, key);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { Object rv = Get_by(k); if (rv == null) return Gfo_invk_.Rv_unhandled; diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt.java index 9b9c3c5cd..41f8c18f0 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt.java @@ -21,9 +21,9 @@ public class Mem_stmt implements Db_stmt { public Mem_stmt(Mem_engine engine, Db_qry qry) {Ctor_stmt(engine, qry);} private Mem_engine engine; public void Ctor_stmt(Db_engine engine, Db_qry qry) {this.engine = (Mem_engine)engine; this.qry = qry;} public Mem_stmt_args Stmt_args() {return stmt_args;} private final Mem_stmt_args stmt_args = new Mem_stmt_args(); - public int Args_len() {return val_list.Count();} + public int Args_len() {return val_list.Len();} public Object Args_get_at(int i) {return val_list.Get_at(i);} - public Object Args_get_by(String k) {return val_list.Get_by(k);} + public Object Args_get_by(String k) {return val_list.GetByOrNull(k);} public Db_qry Qry() {return qry;} private Db_qry qry; public Db_stmt Reset_stmt() {return this;} public Db_stmt Clear() { @@ -118,16 +118,16 @@ public class Mem_stmt implements Db_stmt { return this; } public boolean Exec_insert() { - Mem_tbl tbl = engine.Tbls__get(qry.Base_table()); - if (tbl == null) throw Err_.new_wo_type("must call Create_tbl", "tbl", qry.Base_table()); + Mem_tbl tbl = engine.Tbls__get(qry.BaseTable()); + if (tbl == null) throw Err_.new_wo_type("must call Create_tbl", "tbl", qry.BaseTable()); return tbl.Insert(this) == 1; } public int Exec_update() { - Mem_tbl tbl = engine.Tbls__get(qry.Base_table()); + Mem_tbl tbl = engine.Tbls__get(qry.BaseTable()); return tbl.Update(this); } public int Exec_delete() { - Mem_tbl tbl = engine.Tbls__get(qry.Base_table()); + Mem_tbl tbl = engine.Tbls__get(qry.BaseTable()); return tbl.Delete(this); } public DataRdr Exec_select() {throw Err_.new_unimplemented();} @@ -139,8 +139,8 @@ public class Mem_stmt implements Db_stmt { } public Object Exec_select_val() {throw Err_.new_unimplemented();} private void Add(String k, boolean where, Object v) { - if (k == Dbmeta_fld_itm.Key_null) return; // key is explicitly null; ignore; allows schema_2+ type definitions - val_list.Add_if_dupe_use_1st(k, v); // NOTE: only add if new; WHERE with IN will call Add many times; fld_ttl IN ('A.png', 'B.png'); + if (k == DbmetaFldItm.KeyNull) return; // key is explicitly null; ignore; allows schema_2+ type definitions + val_list.AddIfDupeUse1st(k, v); // NOTE: only add if new; WHERE with IN will call Add many times; fld_ttl IN ('A.png', 'B.png'); if (where) stmt_args.Add(k, v); } } diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt_args.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt_args.java index 3c0a1db5e..deca86ff1 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt_args.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_stmt_args.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.mems; import gplx.*; import gplx.core.criterias.*; public class Mem_stmt_args { private final List_adp list = List_adp_.New(); @@ -22,7 +22,7 @@ public class Mem_stmt_args { public void Add(String k, Object v) {list.Add(Keyval_.new_(k, v));} public Keyval Get_next() { int idx = ++cur_idx; - return idx == list.Count() ? null: (Keyval)list.Get_at(idx); + return idx == list.Len() ? null: (Keyval)list.Get_at(idx); } } class Mem_stmt_args_ { diff --git a/140_dbs/src/gplx/dbs/engines/mems/Mem_tbl.java b/140_dbs/src/gplx/dbs/engines/mems/Mem_tbl.java index e8a447456..90d4c24cf 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Mem_tbl.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Mem_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.mems; import gplx.*; import gplx.dbs.*; import gplx.core.primitives.*; import gplx.core.criterias.*; import gplx.dbs.qrys.*; import gplx.dbs.sqls.itms.*; import gplx.dbs.metas.*; public class Mem_tbl { @@ -27,7 +27,7 @@ public class Mem_tbl { Dbmeta_fld_mgr flds = meta.Flds(); int len = flds.Len(); for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); String fld_name = fld.Name(); Object val = fld.Autonum() ? Autonum_calc(fld_name) : stmt.Args_get_by(fld_name); if (val == null) continue; // NOTE: allow Bulk_insert from test to skip filds @@ -37,7 +37,7 @@ public class Mem_tbl { return 1; } private int Autonum_calc(String name) { - Int_obj_ref autonum_itm = (Int_obj_ref)autonum_hash.Get_by(name); + Int_obj_ref autonum_itm = (Int_obj_ref)autonum_hash.GetByOrNull(name); if (autonum_itm == null) { autonum_itm = Int_obj_ref.New(0); autonum_hash.Add(name, autonum_itm); @@ -49,7 +49,7 @@ public class Mem_tbl { Criteria where_crt = qry.Where(); if (where_crt == null) where_crt = Criteria_.All; Mem_stmt_args_.Fill(stmt.Stmt_args(), where_crt); Select_rows_where(where_rows, stmt, where_crt); - int where_rows_len = where_rows.Count(); + int where_rows_len = where_rows.Len(); String[] update_cols = qry.Cols_for_update(); int update_cols_len = update_cols.length; for (int i = 0; i < where_rows_len; ++i) { Mem_row itm = (Mem_row)where_rows.Get_at(i); @@ -62,7 +62,7 @@ public class Mem_tbl { Db_qry_delete qry = (Db_qry_delete)stmt.Qry(); Mem_stmt_args_.Fill(stmt.Stmt_args(), qry.Where()); Select_rows_where(where_rows, stmt, qry.Where()); - int where_rows_len = where_rows.Count(); + int where_rows_len = where_rows.Len(); for (int i = 0; i < where_rows_len; ++i) { Mem_row itm = (Mem_row)where_rows.Get_at(i); rows.Del(itm); @@ -83,7 +83,7 @@ public class Mem_tbl { } Mem_stmt_args_.Fill(stmt.Stmt_args(), where); Select_rows_where(where_rows, stmt, where); - return new Mem_rdr(select, (Mem_row[])where_rows.To_ary_and_clear(Mem_row.class)); + return new Mem_rdr(select, (Mem_row[])where_rows.ToAryAndClear(Mem_row.class)); } private String[] To_str_ary(Sql_select_fld_list flds) { int len = flds.Len(); @@ -94,7 +94,7 @@ public class Mem_tbl { } private void Select_rows_where(List_adp rv, Mem_stmt stmt, Criteria crt) { rv.Clear(); - int rows_len = rows.Count(); + int rows_len = rows.Len(); for (int i = 0; i < rows_len; ++i) { Mem_row itm = (Mem_row)rows.Get_at(i); if (crt.Matches(itm)) diff --git a/140_dbs/src/gplx/dbs/engines/noops/Noop_engine.java b/140_dbs/src/gplx/dbs/engines/noops/Noop_engine.java index d65d56cfc..ef5c5e118 100644 --- a/140_dbs/src/gplx/dbs/engines/noops/Noop_engine.java +++ b/140_dbs/src/gplx/dbs/engines/noops/Noop_engine.java @@ -36,12 +36,12 @@ public class Noop_engine implements Db_engine { public String Txn_end() {return "";} public void Txn_cxl() {} public void Txn_sav() {} - public Object Exec_as_obj(Db_qry cmd) {return cmd.Exec_is_rdr() ? (Object)DataRdr_.Null : -1;} + public Object Exec_as_obj(Db_qry cmd) {return cmd.ReturnsRdr() ? (Object)DataRdr_.Null : -1;} public void Meta_tbl_create(Dbmeta_tbl_itm meta) {} public void Meta_tbl_delete(String tbl) {} public void Meta_idx_create(Gfo_usr_dlg usr_dlg, Dbmeta_idx_itm... ary) {} public void Meta_idx_delete(String idx) {} - public void Meta_fld_append(String tbl, Dbmeta_fld_itm fld) {} + public void Meta_fld_append(String tbl, DbmetaFldItm fld) {} public void Env_db_attach(String alias, Db_conn conn) {} public void Env_db_attach(String alias, Io_url db_url) {} public void Env_db_detach(String alias) {} diff --git a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_tid.java b/140_dbs/src/gplx/dbs/engines/sqlite/SqliteType.java similarity index 67% rename from 140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_tid.java rename to 140_dbs/src/gplx/dbs/engines/sqlite/SqliteType.java index 16711f4cf..959c36951 100644 --- a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_tid.java +++ b/140_dbs/src/gplx/dbs/engines/sqlite/SqliteType.java @@ -1,6 +1,6 @@ /* XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com +Copyright (C) 2012-2021 gnosygnu@gmail.com XOWA is licensed under the terms of the General Public License (GPL) Version 3, or alternatively under the terms of the Apache License Version 2.0. @@ -13,7 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.sqlite; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; -public class Sqlite_tid { - public static final int Tid_int = 1, Tid_text = 2, Tid_none = 3, Tid_real = 4, Tid_numeric = 5; -} +package gplx.dbs.engines.sqlite; +public class SqliteType { + public static final int + Int = 1, + Text = 2, + None = 3, + Real = 4, + Numeric = 5; +} diff --git a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java index 722732284..217000f46 100644 --- a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java +++ b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java @@ -39,7 +39,7 @@ import gplx.dbs.Db_qry; import gplx.dbs.Db_rdr; import gplx.dbs.Db_rdr__basic; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_itm; +import gplx.dbs.DbmetaFldItm; import gplx.dbs.engines.Db_engine; import gplx.dbs.engines.Db_engine_sql_base; import gplx.dbs.metas.Dbmeta_tbl_mgr; @@ -214,7 +214,7 @@ class Sqlite_rdr extends Db_data_rdr { @Override public float ReadFloat(String } class Sqlite_stmt extends gplx.dbs.qrys.Db_stmt_cmd { public Sqlite_stmt(Db_engine engine, Db_qry qry) {super(engine, qry);} @Override protected Db_stmt Add_date(boolean where, String k, DateAdp v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions return super.Add_str(where, k, v.XtoStr_fmt_iso_8561()); } } diff --git a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_pragma.java b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_pragma.java index 7fff0c0a0..46d7da257 100644 --- a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_pragma.java +++ b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_pragma.java @@ -22,9 +22,9 @@ public class Sqlite_pragma implements Db_qry { this.sql = String_.Format(fmt, key, val); } public int Tid() {return Db_qry_.Tid_pragma;} - public boolean Exec_is_rdr() {return false;} - public String Base_table() {return "";} - public String To_sql__exec(SqlQryWtr wtr) {return sql;} + public boolean ReturnsRdr() {return false;} + public String BaseTable() {return "";} + public String ToSqlExec(SqlQryWtr wtr) {return sql;} public static final String Const__journal_mode = "journal_mode", Const__journal_mode__wal = "wal", Const__journal_mode__off = "off"; public static Sqlite_pragma New__journal__delete() {return new Sqlite_pragma(Bool_.N, Const__journal_mode , "delete");} // default diff --git a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_txn_mgr.java b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_txn_mgr.java index e6d85c4ca..356e6efc9 100644 --- a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_txn_mgr.java +++ b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_txn_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.sqlite; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.sqlite; import gplx.*; +import gplx.dbs.engines.*; import gplx.dbs.qrys.*; public class Sqlite_txn_mgr { private final List_adp txn_list = List_adp_.New(); @@ -41,9 +42,9 @@ public class Sqlite_txn_mgr { txn_list.Add(name); } public String Txn_end() { - if (txn_list.Count() == 0) {Gfo_usr_dlg_.Instance.Warn_many("", "", "no txns in stack;"); return "";} + if (txn_list.Len() == 0) {Gfo_usr_dlg_.Instance.Warn_many("", "", "no txns in stack;"); return "";} String txn_last = (String)List_adp_.Pop_last(txn_list); - if (txn_list.Count() == 0) {// no txns left; commit it + if (txn_list.Len() == 0) {// no txns left; commit it engine.Exec_as_obj(Db_qry_sql.xtn_("COMMIT TRANSACTION;")); txn_started = false; } @@ -52,9 +53,9 @@ public class Sqlite_txn_mgr { return txn_last; } public void Txn_cxl() { - if (txn_list.Count() == 0) {Gfo_usr_dlg_.Instance.Warn_many("", "", "no txns in stack;"); return;} + if (txn_list.Len() == 0) {Gfo_usr_dlg_.Instance.Warn_many("", "", "no txns in stack;"); return;} String txn_last = (String)List_adp_.Pop_last(txn_list); - if (txn_list.Count() == 0) {// no txns left; rollback + if (txn_list.Len() == 0) {// no txns left; rollback engine.Exec_as_obj(Db_qry_sql.xtn_("ROLLBACK TRANSACTION;")); txn_started = false; } @@ -62,8 +63,8 @@ public class Sqlite_txn_mgr { engine.Exec_as_obj(Db_qry_sql.xtn_(String_.Format("ROLBACK TRANSACTION TO SAVEPOINT {0};", txn_last))); } public void Txn_sav() { - if (txn_list.Count() == 0) {Gfo_usr_dlg_.Instance.Warn_many("", "", "no txns in stack;"); return;} - String name = (String)txn_list.Get_at(txn_list.Count() - 1); + if (txn_list.Len() == 0) {Gfo_usr_dlg_.Instance.Warn_many("", "", "no txns in stack;"); return;} + String name = (String)txn_list.Get_at(txn_list.Len() - 1); this.Txn_end(); this.Txn_bgn(name); } } diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr.java index fd4f12846..21a33f7e2 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs.engines.tdbs; import gplx.*; import gplx.core.stores.*; class TdbDbLoadMgr { public TdbDatabase LoadTbls(Io_url dbInfo) { @@ -38,7 +38,7 @@ class TdbDbLoadMgr { else if (String_.Eq(name, TdbTableList.StoreTableName)) db.Tables().DataObj_Rdr(rdr, db.Files()); else db.Tables().Get_by_or_fail(rdr.NameOfNode()).DataObj_Rdr(rdr); } - if (db.Files().Count() == 0) throw Err_.new_wo_type("fatal error: db has no files", "connectInfo", db.DbUrl()); + if (db.Files().Len() == 0) throw Err_.new_wo_type("fatal error: db has no files", "connectInfo", db.DbUrl()); } DataRdr MakeDataRdr(Io_url fil) { String text = Io_mgr.Instance.LoadFilStr(fil); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr_tst.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr_tst.java index bd5d68123..a3c0f7a09 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr_tst.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDbLoadMgr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.tdbs; import gplx.*; import org.junit.*; import gplx.core.gfo_ndes.*; import gplx.core.type_xtns.*; import gplx.core.stores.*; /*DsvDataRdr*/ import gplx.langs.dsvs.*; /*DsvDataWtr*/ public class TdbDbLoadMgr_tst { @@ -38,7 +38,7 @@ public class TdbDbLoadMgr_tst { rdr = rdr_(raw); db.Files().DataObj_Rdr(rdr); - Tfds.Eq(db.Files().Count(), 2); + Tfds.Eq(db.Files().Len(), 2); TdbFile file2 = db.Files().Get_by_or_fail(2); Tfds.Eq(file2.Path().Raw(), "C:\\file.dsv"); @@ -58,7 +58,7 @@ public class TdbDbLoadMgr_tst { rdr = rdr_(raw); db.Tables().DataObj_Rdr(rdr, db.Files()); - Tfds.Eq(db.Tables().Count(), 1); + Tfds.Eq(db.Tables().Len(), 1); TdbTable table = db.Tables().Get_by_or_fail("tbl1"); Tfds.Eq(table.Name(), "tbl1"); Tfds.Eq(table.File().Id(), 1); @@ -80,7 +80,7 @@ public class TdbDbLoadMgr_tst { db.MakeTbl("tbl0", TdbFile.MainFileId); db.Tables().Get_by_or_fail(rdr.NameOfNode()).DataObj_Rdr(rdr); - Tfds.Eq(db.Tables().Count(), 1); + Tfds.Eq(db.Tables().Len(), 1); TdbTable tbl = db.Tables().Get_by_or_fail("tbl0"); Tfds.Eq(tbl.Rows().Count(), 1); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java index 515b5def7..ff93dd794 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java @@ -1,24 +1,25 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; -import gplx.core.criterias.*; import gplx.core.lists.*; /*GfoNde*/ import gplx.dbs.qrys.*; import gplx.core.gfo_ndes.*; +import gplx.core.criterias.*; +import gplx.dbs.qrys.*; import gplx.core.gfo_ndes.*; class TdbDeleteWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_delete cmd = (Db_qry_delete)cmdObj; - TdbTable tbl = engine.FetchTbl(cmd.Base_table()); + TdbTable tbl = engine.FetchTbl(cmd.BaseTable()); List_adp deleted = List_adp_.New(); int rv = 0; if (cmd.Where() == Db_qry_delete.Where__null) { @@ -32,7 +33,7 @@ class TdbDeleteWkr implements Db_qryWkr { if (crt.Matches(row)) deleted.Add(row); } - for (int i = 0; i < deleted.Count(); i++) { + for (int i = 0; i < deleted.Len(); i++) { GfoNde row = (GfoNde)deleted.Get_at(i); tbl.Rows().Del(row); rv++; diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java index c221e0470..880de0ee8 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java @@ -42,7 +42,7 @@ public class TdbEngine implements Db_engine { return rv; } public Object Exec_as_obj(Db_qry qry) { - Db_qryWkr wkr = (Db_qryWkr)wkrs.Get_by_or_fail(qry.Tid()); + Db_qryWkr wkr = (Db_qryWkr)wkrs.GetByOrFail(qry.Tid()); return wkr.Exec(this, qry); } public Db_stmt Stmt_by_qry(Db_qry qry) {return new Db_stmt_sql().Parse(qry, sql_wtr.ToSqlStr(qry, true));} @@ -64,7 +64,7 @@ public class TdbEngine implements Db_engine { public void Meta_tbl_create(Dbmeta_tbl_itm meta) {throw Err_.new_unimplemented();} public void Meta_idx_create(Gfo_usr_dlg usr_dlg, Dbmeta_idx_itm... ary) {throw Err_.new_unimplemented();} public void Meta_idx_delete(String idx) {throw Err_.new_unimplemented();} - public void Meta_fld_append(String tbl, Dbmeta_fld_itm fld) {throw Err_.new_unimplemented();} + public void Meta_fld_append(String tbl, DbmetaFldItm fld) {throw Err_.new_unimplemented();} public void Meta_tbl_delete(String tbl) {} public boolean Meta_tbl_exists(String name) {return false;} public boolean Meta_fld_exists(String tbl, String fld) {return false;} diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush_tst.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush_tst.java index d15e61092..34c11008d 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush_tst.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; +package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import org.junit.*; import gplx.core.ios.*; /*IoMgrFxt*/ import gplx.dbs.qrys.*; import gplx.core.type_xtns.*; public class TdbFlush_tst { @@ -96,7 +96,7 @@ class TdbEngineFxt { engine.Exec_as_obj(cmd); } - public void tst_FilesCount(TdbEngine engine, int count) {Tfds.Eq(engine.Db().Files().Count(), count);} + public void tst_FilesCount(TdbEngine engine, int count) {Tfds.Eq(engine.Db().Files().Len(), count);} public void tst_File(TdbEngine engine, int index, int id, Io_url url, String format) { TdbFile src = engine.Db().Files().Get_by_or_fail(id); Tfds.Eq(src.Path().Raw(), url.Raw()); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java index a9db647d2..b54e072fa 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java @@ -1,26 +1,27 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; import gplx.core.gfo_ndes.*; import gplx.core.stores.*; -import gplx.core.lists.*; import gplx.dbs.qrys.*; import gplx.dbs.sqls.*; import gplx.dbs.sqls.itms.*; +import gplx.dbs.qrys.*; +import gplx.dbs.sqls.itms.*; class TdbInsertWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_insert cmd = (Db_qry_insert)cmdObj; - TdbTable tbl = engine.FetchTbl(cmd.Base_table()); + TdbTable tbl = engine.FetchTbl(cmd.BaseTable()); tbl.IsDirty_set(true); return cmd.Select() == null ? InsertRowsByVals(engine, tbl, cmd) diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java index b42a34940..411dc82dc 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java @@ -1,25 +1,26 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; -import gplx.core.criterias.*; import gplx.core.gfo_ndes.*; import gplx.dbs.qrys.*; import gplx.dbs.sqls.*; import gplx.dbs.sqls.itms.*; +import gplx.core.criterias.*; import gplx.core.gfo_ndes.*; import gplx.dbs.qrys.*; +import gplx.dbs.sqls.itms.*; import gplx.core.lists.*; /*ComparerAble*/ import gplx.core.stores.*; /*GfoNdeRdr*/ class TdbSelectWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { TdbEngine engine = TdbEngine.cast(engineObj); Db_qry__select_cmd cmd = (Db_qry__select_cmd)cmdObj; - if (cmd.From().Tbls.Count() > 1) throw Err_.new_("gplx.tdbs", "joins not supported for tdbs", "sql", cmd.To_sql__exec(engineObj.Sql_wtr())); + if (cmd.From().Tbls.Len() > 1) throw Err_.new_("gplx.tdbs", "joins not supported for tdbs", "sql", cmd.ToSqlExec(engineObj.Sql_wtr())); TdbTable tbl = engine.FetchTbl(cmd.From().Base_tbl.Name); GfoNdeList rv = (cmd.Where_itm() == Sql_where_clause.Where__null && cmd.Limit() == Db_qry__select_cmd.Limit__disabled) ? rv = tbl.Rows() : FilterRecords(tbl, cmd.Where_itm().Root, cmd.Limit()); @@ -77,14 +78,14 @@ class TdbGroupByWkr { return rv; } static GfoNde FindOrNew(GfoFldList selectFldsForNewRow, List_adp groupByFlds, GfoNde selectRow, Ordered_hash groupByRows, GfoNdeList rslt) { - int len = groupByFlds.Count(); + int len = groupByFlds.Len(); Ordered_hash curHash = groupByRows; GfoNde rv = null; for (int i = 0; i < len; i++) { String fld = (String)groupByFlds.Get_at(i); boolean last = i == len - 1; Object val = selectRow.Read(fld); - Object o = curHash.Get_by(val); + Object o = curHash.GetByOrNull(val); if (last) { if (o == null) { Object[] valAry = new Object[selectFldsForNewRow.Count()]; diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbStores.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbStores.java index 0d9f74906..fe87cb251 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbStores.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbStores.java @@ -13,18 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; -import gplx.core.stores.*; -import gplx.core.stores.xmls.*; /*XmlDataRdr*/ -import gplx.langs.dsvs.*; /*DsvDataWtr*/ -import gplx.core.lists.*; /*GfoNdeRdr*/ -class TdbStores { - public static final String Dsv = "dsv"; - public static final String Xml = "xml"; - public static DataRdr rdr_(String text) {return DsvDataRdr_.dsv_(text);} - public static DataWtr wtr_() {return DsvDataWtr_.new_();} - @gplx.Internal protected static DsvStoreLayout FetchLayout(DataRdr rdr) { - GfoNdeRdr ndeRdr = GfoNdeRdr_.as_(rdr); if (ndeRdr == null) return null; // can happen for non-Dsv Rdrs (ex: Xml) - return DsvStoreLayout.as_(ndeRdr.UnderNde().EnvVars().Get_by(DsvStoreLayout.Key_const)); - } +package gplx.dbs.engines.tdbs; +import gplx.core.stores.*; +import gplx.langs.dsvs.*; /*DsvDataWtr*/ +class TdbStores { + public static final String Dsv = "dsv"; + public static final String Xml = "xml"; + public static DataRdr rdr_(String text) {return DsvDataRdr_.dsv_(text);} + public static DataWtr wtr_() {return DsvDataWtr_.new_();} + @gplx.Internal protected static DsvStoreLayout FetchLayout(DataRdr rdr) { + GfoNdeRdr ndeRdr = GfoNdeRdr_.as_(rdr); if (ndeRdr == null) return null; // can happen for non-Dsv Rdrs (ex: Xml) + return DsvStoreLayout.as_(ndeRdr.UnderNde().EnvVars().GetByOrNull(DsvStoreLayout.Key_const)); + } } \ No newline at end of file diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java index ca5b5aaf9..19ffe08f7 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java @@ -1,27 +1,28 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.engines.*; -import gplx.core.criterias.*; import gplx.core.lists.*; /*GfoNde*/ import gplx.core.gfo_ndes.*; +import gplx.core.criterias.*; +import gplx.core.gfo_ndes.*; import gplx.dbs.qrys.*; class TdbUpdateWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_update cmd = (Db_qry_update)cmdObj; int rv = 0; - TdbTable tbl = engine.FetchTbl(cmd.Base_table()); + TdbTable tbl = engine.FetchTbl(cmd.BaseTable()); Criteria crt = cmd.Where(); for (int i = 0; i < tbl.Rows().Count(); i++) { GfoNde row = (GfoNde)tbl.Rows().FetchAt_asGfoNde(i); diff --git a/140_dbs/src/gplx/dbs/metas/Dbmeta_fld_mgr.java b/140_dbs/src/gplx/dbs/metas/Dbmeta_fld_mgr.java index 959567002..95a7b7a6b 100644 --- a/140_dbs/src/gplx/dbs/metas/Dbmeta_fld_mgr.java +++ b/140_dbs/src/gplx/dbs/metas/Dbmeta_fld_mgr.java @@ -16,16 +16,16 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.dbs.metas; import gplx.*; import gplx.dbs.*; public class Dbmeta_fld_mgr { private final Ordered_hash hash = Ordered_hash_.New(); - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public void Clear() {hash.Clear();} - public void Add(Dbmeta_fld_itm itm) {hash.Add(itm.Name(), itm);} + public void Add(DbmetaFldItm itm) {hash.Add(itm.Name(), itm);} public boolean Has(String name) {return hash.Has(name);} - public Dbmeta_fld_itm Get_at(int idx) {return (Dbmeta_fld_itm)hash.Get_at(idx);} - public Dbmeta_fld_itm Get_by(String name) {return (Dbmeta_fld_itm)hash.Get_by(name);} - public Dbmeta_fld_itm[] To_ary() {return hash.Count() == 0 ? Dbmeta_fld_itm.Ary_empty : (Dbmeta_fld_itm[])hash.To_ary(Dbmeta_fld_itm.class);} - public Dbmeta_fld_list To_fld_list() { - Dbmeta_fld_list rv = new Dbmeta_fld_list(); - int len = hash.Count(); + public DbmetaFldItm Get_at(int idx) {return (DbmetaFldItm)hash.Get_at(idx);} + public DbmetaFldItm Get_by(String name) {return (DbmetaFldItm)hash.GetByOrNull(name);} + public DbmetaFldItm[] To_ary() {return hash.Len() == 0 ? DbmetaFldItm.AryEmpty : (DbmetaFldItm[])hash.To_ary(DbmetaFldItm.class);} + public DbmetaFldList To_fld_list() { + DbmetaFldList rv = new DbmetaFldList(); + int len = hash.Len(); for (int i = 0; i < len; ++i) rv.Add(Get_at(i)); return rv; diff --git a/140_dbs/src/gplx/dbs/metas/Dbmeta_idx_mgr.java b/140_dbs/src/gplx/dbs/metas/Dbmeta_idx_mgr.java index 6bdb644b0..30a07b5f1 100644 --- a/140_dbs/src/gplx/dbs/metas/Dbmeta_idx_mgr.java +++ b/140_dbs/src/gplx/dbs/metas/Dbmeta_idx_mgr.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.metas; import gplx.*; import gplx.dbs.*; -public class Dbmeta_idx_mgr { - private final Ordered_hash hash = Ordered_hash_.New(); - public int Len() {return hash.Count();} - public boolean Has(String name) {return hash.Has(name);} - public Dbmeta_idx_itm Get_at(int idx) {return (Dbmeta_idx_itm)hash.Get_at(idx);} - public Dbmeta_idx_itm Get_by(String name) {return (Dbmeta_idx_itm)hash.Get_by(name);} - public void Add(Dbmeta_idx_itm itm) {hash.Add(itm.Name(), itm);} - public void Clear() {hash.Clear();} - public Dbmeta_idx_itm[] To_ary() {return (Dbmeta_idx_itm[])hash.To_ary(Dbmeta_idx_itm.class);} -} +package gplx.dbs.metas; import gplx.*; import gplx.dbs.*; +public class Dbmeta_idx_mgr { + private final Ordered_hash hash = Ordered_hash_.New(); + public int Len() {return hash.Len();} + public boolean Has(String name) {return hash.Has(name);} + public Dbmeta_idx_itm Get_at(int idx) {return (Dbmeta_idx_itm)hash.Get_at(idx);} + public Dbmeta_idx_itm Get_by(String name) {return (Dbmeta_idx_itm)hash.GetByOrNull(name);} + public void Add(Dbmeta_idx_itm itm) {hash.Add(itm.Name(), itm);} + public void Clear() {hash.Clear();} + public Dbmeta_idx_itm[] To_ary() {return (Dbmeta_idx_itm[])hash.To_ary(Dbmeta_idx_itm.class);} +} diff --git a/140_dbs/src/gplx/dbs/metas/Dbmeta_tbl_mgr.java b/140_dbs/src/gplx/dbs/metas/Dbmeta_tbl_mgr.java index 40a3f4aa1..60e4b15d1 100644 --- a/140_dbs/src/gplx/dbs/metas/Dbmeta_tbl_mgr.java +++ b/140_dbs/src/gplx/dbs/metas/Dbmeta_tbl_mgr.java @@ -18,11 +18,11 @@ public class Dbmeta_tbl_mgr { private final Ordered_hash hash = Ordered_hash_.New(); private final Dbmeta_reload_cmd load_cmd; public Dbmeta_tbl_mgr(Dbmeta_reload_cmd load_cmd) {this.load_cmd = load_cmd;} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public boolean Has(String name) {return hash.Has(name);} public Dbmeta_tbl_itm Get_at(int i) {return (Dbmeta_tbl_itm)hash.Get_at(i);} - public Dbmeta_tbl_itm Get_by(String name) {return (Dbmeta_tbl_itm)hash.Get_by(name);} - public void Add(Dbmeta_tbl_itm itm) {hash.Add_if_dupe_use_nth(itm.Name(), itm);} + public Dbmeta_tbl_itm Get_by(String name) {return (Dbmeta_tbl_itm)hash.GetByOrNull(name);} + public void Add(Dbmeta_tbl_itm itm) {hash.AddIfDupeUseNth(itm.Name(), itm);} public void Clear() {hash.Clear();} public Dbmeta_tbl_mgr Load_all() {load_cmd.Load_all(); return this;} } diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_fld_wkr__base.java b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_fld_wkr__base.java index 6f0be92a9..51545122b 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_fld_wkr__base.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_fld_wkr__base.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; +package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.core.brys.*; import gplx.core.btries.*; abstract class Dbmeta_fld_wkr__base { private byte[] hook; @@ -29,7 +29,7 @@ abstract class Dbmeta_fld_wkr__base { public void Reg(Btrie_slim_mgr trie) { trie.Add_obj(hook, this); } - public void Match(Bry_rdr rdr, Dbmeta_fld_itm fld) { + public void Match(Bry_rdr rdr, DbmetaFldItm fld) { int words_len = words_trie.Count(); for (int i = 0; i < words_len; ++i) { rdr.Skip_ws(); @@ -37,82 +37,82 @@ abstract class Dbmeta_fld_wkr__base { } When_match(fld); } - protected abstract void When_match(Dbmeta_fld_itm fld); + protected abstract void When_match(DbmetaFldItm fld); public static final int Tid_end_comma = 1, Tid_end_paren = 2, Tid_other = 3; } class Dbmeta_fld_wkr__end_comma extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__end_comma() {this.Ctor(Hook);} @Override public int Tid() {return Tid_end_comma;} - @Override protected void When_match(Dbmeta_fld_itm fld) {} + @Override protected void When_match(DbmetaFldItm fld) {} private static final byte[] Hook = Bry_.new_a7(","); public static final Dbmeta_fld_wkr__end_comma Instance = new Dbmeta_fld_wkr__end_comma(); } class Dbmeta_fld_wkr__end_paren extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__end_paren() {this.Ctor(Hook);} @Override public int Tid() {return Tid_end_paren;} - @Override protected void When_match(Dbmeta_fld_itm fld) {} + @Override protected void When_match(DbmetaFldItm fld) {} private static final byte[] Hook = Bry_.new_a7(")"); public static final Dbmeta_fld_wkr__end_paren Instance = new Dbmeta_fld_wkr__end_paren(); } class Dbmeta_fld_wkr__nullable_null extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__nullable_null() {this.Ctor(Hook);} - @Override protected void When_match(Dbmeta_fld_itm fld) { - fld.Nullable_tid_(Dbmeta_fld_itm.Nullable_null); + @Override protected void When_match(DbmetaFldItm fld) { + fld.NullableSet(DbmetaFldItm.NullableNull); } private static final byte[] Hook = Bry_.new_a7("null"); public static final Dbmeta_fld_wkr__nullable_null Instance = new Dbmeta_fld_wkr__nullable_null(); } class Dbmeta_fld_wkr__nullable_not extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__nullable_not() {this.Ctor(Hook, Bry_null);} - @Override protected void When_match(Dbmeta_fld_itm fld) { - fld.Nullable_tid_(Dbmeta_fld_itm.Nullable_not_null); + @Override protected void When_match(DbmetaFldItm fld) { + fld.NullableSet(DbmetaFldItm.NullableNotNull); } private static final byte[] Hook = Bry_.new_a7("not"), Bry_null = Bry_.new_a7("null"); public static final Dbmeta_fld_wkr__nullable_not Instance = new Dbmeta_fld_wkr__nullable_not(); } class Dbmeta_fld_wkr__primary_key extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__primary_key() {this.Ctor(Hook, Bry_key);} - @Override protected void When_match(Dbmeta_fld_itm fld) { - fld.Primary_y_(); + @Override protected void When_match(DbmetaFldItm fld) { + fld.PrimarySetY(); } private static final byte[] Hook = Bry_.new_a7("primary"), Bry_key = Bry_.new_a7("key"); public static final Dbmeta_fld_wkr__primary_key Instance = new Dbmeta_fld_wkr__primary_key(); } class Dbmeta_fld_wkr__autonumber extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__autonumber() {this.Ctor(Hook);} - @Override protected void When_match(Dbmeta_fld_itm fld) { - fld.Autonum_y_(); + @Override protected void When_match(DbmetaFldItm fld) { + fld.AutonumSetY(); } private static final byte[] Hook = Bry_.new_a7("autoincrement"); public static final Dbmeta_fld_wkr__autonumber Instance = new Dbmeta_fld_wkr__autonumber(); } class Dbmeta_fld_wkr__default extends Dbmeta_fld_wkr__base { public Dbmeta_fld_wkr__default() {this.Ctor(Hook);} - @Override public void Match(Bry_rdr rdr, Dbmeta_fld_itm fld) { + @Override public void Match(Bry_rdr rdr, DbmetaFldItm fld) { Object default_val = null; rdr.Skip_ws(); byte[] src = rdr.Src(); - switch (fld.Type().Tid_ansi()) { - case Dbmeta_fld_tid.Tid__bool: - case Dbmeta_fld_tid.Tid__byte: - case Dbmeta_fld_tid.Tid__short: - case Dbmeta_fld_tid.Tid__int: default_val = Int_.Parse(Read_str_to_end_of_num(rdr)); break; - case Dbmeta_fld_tid.Tid__long: default_val = Long_.parse(Read_str_to_end_of_num(rdr)); break; - case Dbmeta_fld_tid.Tid__float: default_val = Float_.parse(Read_str_to_end_of_num(rdr)); break; - case Dbmeta_fld_tid.Tid__double: default_val = Double_.parse(Read_str_to_end_of_num(rdr)); break; - case Dbmeta_fld_tid.Tid__decimal: default_val = Decimal_adp_.parse(Read_str_to_end_of_num(rdr)); break; - case Dbmeta_fld_tid.Tid__str: - case Dbmeta_fld_tid.Tid__text: - case Dbmeta_fld_tid.Tid__bry: + switch (fld.Type().Tid()) { + case DbmetaFldType.TidBool: + case DbmetaFldType.TidByte: + case DbmetaFldType.TidShort: + case DbmetaFldType.TidInt: default_val = Int_.Parse(Read_str_to_end_of_num(rdr)); break; + case DbmetaFldType.TidLong: default_val = Long_.parse(Read_str_to_end_of_num(rdr)); break; + case DbmetaFldType.TidFloat: default_val = Float_.parse(Read_str_to_end_of_num(rdr)); break; + case DbmetaFldType.TidDouble: default_val = Double_.parse(Read_str_to_end_of_num(rdr)); break; + case DbmetaFldType.TidDecimal: default_val = Decimal_adp_.parse(Read_str_to_end_of_num(rdr)); break; + case DbmetaFldType.TidStr: + case DbmetaFldType.TidText: + case DbmetaFldType.TidBry: byte b = src[rdr.Pos()]; int bgn_pos = rdr.Pos() + 1; int end_pos = Bry_find_.Find_fwd(src, b, bgn_pos); if (end_pos == Bry_find_.Not_found) rdr.Err_wkr().Fail("unclosed quote"); default_val = Bry_.Mid(src, bgn_pos, end_pos); rdr.Move_to(end_pos + 1); break; - case Dbmeta_fld_tid.Tid__date: throw Err_.new_unhandled_default(fld.Type().Tid_ansi()); + case DbmetaFldType.TidDate: throw Err_.new_unhandled_default(fld.Type().Tid()); } - fld.Default_(default_val); + fld.DefaultValSet(default_val); } public String Read_str_to_end_of_num(Bry_rdr rdr) { int bgn = rdr.Pos(); @@ -140,7 +140,7 @@ class Dbmeta_fld_wkr__default extends Dbmeta_fld_wkr__base { rdr.Move_to(end); return String_.new_a7(src, bgn, end); } - @Override protected void When_match(Dbmeta_fld_itm fld) {} + @Override protected void When_match(DbmetaFldItm fld) {} private static final byte[] Hook = Bry_.new_a7("default"); public static final Dbmeta_fld_wkr__default Instance = new Dbmeta_fld_wkr__default(); } diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld.java b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld.java index ff63bbba6..7a2062736 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld.java @@ -13,15 +13,24 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; -import gplx.core.brys.*; import gplx.core.btries.*; -import gplx.dbs.engines.sqlite.*; +package gplx.dbs.metas.parsers; import gplx.Bry_; +import gplx.Bry_find_; +import gplx.Byte_ascii; +import gplx.Err_; +import gplx.Int_; +import gplx.String_; +import gplx.core.brys.Bry_rdr; +import gplx.core.btries.Btrie_rv; +import gplx.core.btries.Btrie_slim_mgr; +import gplx.dbs.DbmetaFldItm; +import gplx.dbs.DbmetaFldType; +import gplx.dbs.engines.sqlite.SqliteType; public class Dbmeta_parser__fld { private final Btrie_rv trv = new Btrie_rv(); - public Dbmeta_fld_itm Parse_fld(Sql_bry_rdr rdr) { // starts after "(" or ","; EX: "(fld1 int", ", fld2 int"; ends at ")" + public DbmetaFldItm Parse_fld(Sql_bry_rdr rdr) { // starts after "(" or ","; EX: "(fld1 int", ", fld2 int"; ends at ")" byte[] name = rdr.Read_sql_identifier(); - Dbmeta_fld_tid type = this.Parse_type(rdr); - Dbmeta_fld_itm fld = new Dbmeta_fld_itm(String_.new_u8(name), type); + DbmetaFldType type = this.Parse_type(rdr); + DbmetaFldItm fld = new DbmetaFldItm(String_.new_u8(name), type); byte[] src = rdr.Src(); int src_len = rdr.Src_end(); while (true) { rdr.Skip_ws(); @@ -51,7 +60,7 @@ public class Dbmeta_parser__fld { } } } - @gplx.Internal protected Dbmeta_fld_tid Parse_type(Bry_rdr rdr) { + @gplx.Internal protected DbmetaFldType Parse_type(Bry_rdr rdr) { rdr.Skip_ws(); Dbmeta_parser__fld_itm type_itm = (Dbmeta_parser__fld_itm)rdr.Chk_trie_as_obj(trv, type_trie); rdr.Move_by(type_itm.Word().length); @@ -66,7 +75,7 @@ public class Dbmeta_parser__fld { } rdr.Skip_ws().Chk(Byte_ascii.Paren_end); } - return new Dbmeta_fld_tid(type_itm.Tid_ansi(), type_itm.Tid_sqlite(), type_itm.Word(), len_1, len_2); + return new DbmetaFldType(type_itm.Tid_ansi(), String_.new_u8(type_itm.Word()), len_1, len_2); } private static final Btrie_slim_mgr fld_trie = fld_trie_init ( Dbmeta_fld_wkr__nullable_null.Instance @@ -84,20 +93,20 @@ public class Dbmeta_parser__fld { private static final Btrie_slim_mgr type_trie = type_trie_init(); private static Btrie_slim_mgr type_trie_init() { Btrie_slim_mgr rv = Btrie_slim_mgr.ci_a7(); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__byte , Sqlite_tid.Tid_int , 0, "tinyint", "int2"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__short , Sqlite_tid.Tid_int , 0, "smallint"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__int , Sqlite_tid.Tid_int , 0, "int", "integer", "mediumint"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__long , Sqlite_tid.Tid_int , 0, "bigint", "int8"); // "UNSIGNED BIG INT" - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__str , Sqlite_tid.Tid_text , 1, "character", "varchar", "nchar"); // "varying character", "native character" - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__text , Sqlite_tid.Tid_text , 0, "text", "clob"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__bry , Sqlite_tid.Tid_none , 0, "blob", "mediumblob"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__float , Sqlite_tid.Tid_real , 0, "float"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__double , Sqlite_tid.Tid_real , 0, "real", "double"); // "double precision" - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__decimal , Sqlite_tid.Tid_numeric , 0, "numeric"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__decimal , Sqlite_tid.Tid_numeric , 2, "decimal"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__decimal , Sqlite_tid.Tid_numeric , 2, "decimal"); - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__bool , Sqlite_tid.Tid_numeric , 0, "boolean", "bit"); // "bit" is not SQLITE - Dbmeta_parser__fld_itm.reg_many(rv, Dbmeta_fld_tid.Tid__date , Sqlite_tid.Tid_numeric , 0, "date", "datetime"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidByte, SqliteType.Int, 0, "tinyint", "int2"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidShort, SqliteType.Int, 0, "smallint"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidInt, SqliteType.Int, 0, "int", "integer", "mediumint"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidLong, SqliteType.Int, 0, "bigint", "int8"); // "UNSIGNED BIG INT" + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidStr, SqliteType.Text, 1, "character", "varchar", "nchar"); // "varying character", "native character" + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidText, SqliteType.Text, 0, "text", "clob"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidBry, SqliteType.None, 0, "blob", "mediumblob"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidFloat, SqliteType.Real, 0, "float"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidDouble, SqliteType.Real, 0, "real", "double"); // "double precision" + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidDecimal, SqliteType.Numeric, 0, "numeric"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidDecimal, SqliteType.Numeric, 2, "decimal"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidDecimal, SqliteType.Numeric, 2, "decimal"); + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidBool, SqliteType.Numeric, 0, "boolean", "bit"); // "bit" is not SQLITE + Dbmeta_parser__fld_itm.reg_many(rv, DbmetaFldType.TidDate, SqliteType.Numeric, 0, "date", "datetime"); return rv; } } diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld_tst.java b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld_tst.java index 73e4ff771..7fa29b08d 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld_tst.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__fld_tst.java @@ -13,60 +13,67 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; -import org.junit.*; +package gplx.dbs.metas.parsers; import gplx.Bool_; +import gplx.Bry_; +import gplx.Int_; +import gplx.Object_; +import gplx.Tfds; +import gplx.dbs.DbmetaFldItm; +import gplx.dbs.DbmetaFldType; +import org.junit.Before; +import org.junit.Test; public class Dbmeta_parser__fld_tst { @Before public void init() {fxt.Clear();} private Dbmeta_parser__fld_fxt fxt = new Dbmeta_parser__fld_fxt(); @Test public void Parse_type() { - fxt.Test_parse_type("int" , fxt.Make_type(Dbmeta_fld_tid.Tid__int)); - fxt.Test_parse_type("varchar(255)" , fxt.Make_type(Dbmeta_fld_tid.Tid__str, 255)); - fxt.Test_parse_type("decimal(12,10)" , fxt.Make_type(Dbmeta_fld_tid.Tid__decimal, 12, 10)); - fxt.Test_parse_type(" int" , fxt.Make_type(Dbmeta_fld_tid.Tid__int)); - fxt.Test_parse_type(" decimal ( 12 , 10 )" , fxt.Make_type(Dbmeta_fld_tid.Tid__decimal, 12, 10)); + fxt.Test_parse_type("int" , fxt.Make_type(DbmetaFldType.TidInt)); + fxt.Test_parse_type("varchar(255)" , fxt.Make_type(DbmetaFldType.TidStr, 255)); + fxt.Test_parse_type("decimal(12,10)" , fxt.Make_type(DbmetaFldType.TidDecimal, 12, 10)); + fxt.Test_parse_type(" int" , fxt.Make_type(DbmetaFldType.TidInt)); + fxt.Test_parse_type(" decimal ( 12 , 10 )" , fxt.Make_type(DbmetaFldType.TidDecimal, 12, 10)); } @Test public void Parse_fld() { - fxt.Test_parse_fld("name_1 int" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_unknown)); - fxt.Test_parse_fld("name_1 int null" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_null)); - fxt.Test_parse_fld("name_1 int not null" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_not_null)); - fxt.Test_parse_fld("name_1 int not null autoincrement" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_not_null, Bool_.N, Bool_.Y)); - fxt.Test_parse_fld("name_1 int not null primary key" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_not_null, Bool_.Y, Bool_.N)); - fxt.Test_parse_fld("name_1 int not null default -1" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_not_null, Bool_.Y, Bool_.N, -1)); - fxt.Test_parse_fld("name_1 varchar(3) not null default 'abc'" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__str, Dbmeta_fld_itm.Nullable_not_null, Bool_.Y, Bool_.N, "abc")); + fxt.Test_parse_fld("name_1 int" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableUnspecified)); + fxt.Test_parse_fld("name_1 int null" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableNull)); + fxt.Test_parse_fld("name_1 int not null" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableNotNull)); + fxt.Test_parse_fld("name_1 int not null autoincrement" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableNotNull, Bool_.N, Bool_.Y)); + fxt.Test_parse_fld("name_1 int not null primary key" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableNotNull, Bool_.Y, Bool_.N)); + fxt.Test_parse_fld("name_1 int not null default -1" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableNotNull, Bool_.Y, Bool_.N, -1)); + fxt.Test_parse_fld("name_1 varchar(3) not null default 'abc'" , fxt.Make_fld("name_1", DbmetaFldType.TidStr, DbmetaFldItm.NullableNotNull, Bool_.Y, Bool_.N, "abc")); } @Test public void Comment() { - fxt.Test_parse_fld("name_1 int --a\n" , fxt.Make_fld("name_1", Dbmeta_fld_tid.Tid__int, Dbmeta_fld_itm.Nullable_unknown)); + fxt.Test_parse_fld("name_1 int --a\n" , fxt.Make_fld("name_1", DbmetaFldType.TidInt, DbmetaFldItm.NullableUnspecified)); } } class Dbmeta_parser__fld_fxt { private final Dbmeta_parser__fld fld_parser = new Dbmeta_parser__fld(); private final Sql_bry_rdr rdr = new Sql_bry_rdr(); public void Clear() {} - public Dbmeta_fld_tid Make_type(int tid_ansi) {return new Dbmeta_fld_tid(tid_ansi, -1, null, Int_.Min_value, Int_.Min_value);} - public Dbmeta_fld_tid Make_type(int tid_ansi, int len_1) {return new Dbmeta_fld_tid(tid_ansi, -1, null, len_1, Int_.Min_value);} - public Dbmeta_fld_tid Make_type(int tid_ansi, int len_1, int len_2) {return new Dbmeta_fld_tid(tid_ansi, -1, null, len_1, len_2);} - public Dbmeta_fld_itm Make_fld(String name, int tid_ansi, int nullable) {return Make_fld(name, tid_ansi, nullable, false, false, null);} - public Dbmeta_fld_itm Make_fld(String name, int tid_ansi, int nullable, boolean autonumber, boolean primary_key) {return Make_fld(name, tid_ansi, nullable, false, false, null);} - public Dbmeta_fld_itm Make_fld(String name, int tid_ansi, int nullable, boolean autonumber, boolean primary_key, Object default_val) { - Dbmeta_fld_itm rv = new Dbmeta_fld_itm(name, Make_type(tid_ansi)); - rv.Nullable_tid_(nullable); - if (autonumber) rv.Autonum_y_(); - if (primary_key) rv.Primary_y_(); - rv.Default_(default_val); + public DbmetaFldType Make_type(int tid_ansi) {return new DbmetaFldType(tid_ansi, null, Int_.Min_value, Int_.Min_value);} + public DbmetaFldType Make_type(int tid_ansi, int len_1) {return new DbmetaFldType(tid_ansi, null, len_1, Int_.Min_value);} + public DbmetaFldType Make_type(int tid_ansi, int len_1, int len_2) {return new DbmetaFldType(tid_ansi, null, len_1, len_2);} + public DbmetaFldItm Make_fld(String name, int tid_ansi, int nullable) {return Make_fld(name, tid_ansi, nullable, false, false, null);} + public DbmetaFldItm Make_fld(String name, int tid_ansi, int nullable, boolean autonumber, boolean primary_key) {return Make_fld(name, tid_ansi, nullable, false, false, null);} + public DbmetaFldItm Make_fld(String name, int tid_ansi, int nullable, boolean autonumber, boolean primary_key, Object default_val) { + DbmetaFldItm rv = new DbmetaFldItm(name, Make_type(tid_ansi)); + rv.NullableSet(nullable); + if (autonumber) rv.AutonumSetY(); + if (primary_key) rv.PrimarySetY(); + rv.DefaultValSet(default_val); return rv; } - public void Test_parse_type(String src, Dbmeta_fld_tid expd_type) { + public void Test_parse_type(String src, DbmetaFldType expd_type) { rdr.Init_by_src(Bry_.new_u8(src)); - Dbmeta_fld_tid actl_type = fld_parser.Parse_type(rdr); - Tfds.Eq(expd_type.Tid_ansi() , actl_type.Tid_ansi()); - Tfds.Eq(expd_type.Len_1() , actl_type.Len_1()); - Tfds.Eq(expd_type.Len_2() , actl_type.Len_2()); + DbmetaFldType actl_type = fld_parser.Parse_type(rdr); + Tfds.Eq(expd_type.Tid() , actl_type.Tid()); + Tfds.Eq(expd_type.Len1() , actl_type.Len1()); + Tfds.Eq(expd_type.Len2() , actl_type.Len2()); } - public void Test_parse_fld(String src, Dbmeta_fld_itm expd_fld) { + public void Test_parse_fld(String src, DbmetaFldItm expd_fld) { rdr.Init_by_src(Bry_.new_u8(src)); - Dbmeta_fld_itm actl_fld = fld_parser.Parse_fld(rdr); + DbmetaFldItm actl_fld = fld_parser.Parse_fld(rdr); Tfds.Eq(expd_fld.Name() , actl_fld.Name()); - Tfds.Eq(expd_fld.Type().Tid_ansi() , actl_fld.Type().Tid_ansi()); - Tfds.Eq(expd_fld.Nullable_tid() , actl_fld.Nullable_tid()); - Tfds.Eq(Object_.Xto_str_strict_or_empty(expd_fld.Default()), Object_.Xto_str_strict_or_empty(actl_fld.Default())); + Tfds.Eq(expd_fld.Type().Tid() , actl_fld.Type().Tid()); + Tfds.Eq(expd_fld.Nullable() , actl_fld.Nullable()); + Tfds.Eq(Object_.Xto_str_strict_or_empty(expd_fld.DefaultVal()), Object_.Xto_str_strict_or_empty(actl_fld.DefaultVal())); } } diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__idx.java b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__idx.java index d39839378..942236b26 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__idx.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__idx.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; -import gplx.core.brys.*; import gplx.core.btries.*; +import gplx.core.btries.*; public class Dbmeta_parser__idx { private final Sql_bry_rdr rdr = new Sql_bry_rdr(); private final List_adp tmp_list = List_adp_.New(); @@ -40,7 +40,7 @@ public class Dbmeta_parser__idx { byte sym = rdr.Skip_ws().Read_byte(); if (sym == Byte_ascii.Paren_end) break; } - return new Dbmeta_idx_itm(unique, String_.new_u8(tbl_name), String_.new_u8(idx_name), (Dbmeta_idx_fld[])tmp_list.To_ary_and_clear(Dbmeta_idx_fld.class)); + return new Dbmeta_idx_itm(unique, String_.new_u8(tbl_name), String_.new_u8(idx_name), (Dbmeta_idx_fld[])tmp_list.ToAryAndClear(Dbmeta_idx_fld.class)); } private static final byte Tid__create = 0, Tid__unique = 1, Tid__index = 2, Tid__on = 3; private static final byte[] diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl.java b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl.java index 6aa6af442..8cd9f964f 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl.java @@ -1,20 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; -import gplx.core.brys.*; import gplx.core.btries.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; +import gplx.core.btries.*; public class Dbmeta_parser__tbl { private final Sql_bry_rdr rdr = new Sql_bry_rdr(); private final Dbmeta_parser__fld fld_parser = new Dbmeta_parser__fld(); @@ -27,7 +27,7 @@ public class Dbmeta_parser__tbl { Dbmeta_tbl_itm rv = Dbmeta_tbl_itm.New(String_.new_u8(tbl_name)); boolean loop = true; while (loop) { - Dbmeta_fld_itm fld = fld_parser.Parse_fld(rdr); if (fld == null) rdr.Err_wkr().Fail("unknown field", "src", src); + DbmetaFldItm fld = fld_parser.Parse_fld(rdr); if (fld == null) rdr.Err_wkr().Fail("unknown field", "src", src); rv.Flds().Add(fld); int pos = rdr.Pos(); byte b = pos == rdr.Src_end() ? Byte_ascii.Null : src[pos]; diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl_tst.java b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl_tst.java index bd015ced6..f4c7527f2 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl_tst.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Dbmeta_parser__tbl_tst.java @@ -13,8 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.metas.parsers; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; -import org.junit.*; import gplx.dbs.engines.sqlite.*; +package gplx.dbs.metas.parsers; import gplx.Bry_; +import gplx.String_; +import gplx.Tfds; +import gplx.dbs.DbmetaFldItm; +import gplx.dbs.DbmetaFldType; +import gplx.dbs.Dbmeta_tbl_itm; +import gplx.dbs.metas.Dbmeta_fld_mgr; +import org.junit.Before; +import org.junit.Test; public class Dbmeta_parser__tbl_tst { @Before public void init() {fxt.Clear();} private Dbmeta_parser__tbl_fxt fxt = new Dbmeta_parser__tbl_fxt(); @Test public void Test_parse() { @@ -42,9 +49,9 @@ class Dbmeta_parser__tbl_fxt { public void Clear() {} public Dbmeta_tbl_itm Make_tbl(String tbl_name, String... fld_names) { int len = fld_names.length; - Dbmeta_fld_itm[] flds = new Dbmeta_fld_itm[len]; + DbmetaFldItm[] flds = new DbmetaFldItm[len]; for (int i = 0; i < len; ++i) - flds[i] = new Dbmeta_fld_itm(fld_names[i], new Dbmeta_fld_tid(Dbmeta_fld_tid.Tid__int, Sqlite_tid.Tid_int, Bry_.new_a7("int"), Int_.Min_value, Int_.Min_value)); + flds[i] = new DbmetaFldItm(fld_names[i], DbmetaFldType.ItmInt); return Dbmeta_tbl_itm.New(tbl_name, flds); } public void Test_parse(String src, Dbmeta_tbl_itm expd_tbl) { diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry__select_cmd.java b/140_dbs/src/gplx/dbs/qrys/Db_qry__select_cmd.java index 33d9bbc6d..d250e8c84 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry__select_cmd.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry__select_cmd.java @@ -19,8 +19,8 @@ import gplx.dbs.sqls.SqlQryWtr; import gplx.dbs.sqls.itms.*; public class Db_qry__select_cmd implements Db_qry { public int Tid() {return Db_qry_.Tid_select;} - public boolean Exec_is_rdr() {return Bool_.Y;} - public String Base_table() {return from.Base_tbl.Name;} + public boolean ReturnsRdr() {return Bool_.Y;} + public String BaseTable() {return from.Base_tbl.Name;} public Sql_from_clause From() {return from;} private Sql_from_clause from; public Db_qry__select_cmd From_(String tbl) {return From_(tbl, Sql_tbl_itm.Alias__null);} public Db_qry__select_cmd From_(String name, String alias) {return From_(Sql_tbl_itm.Db__null, name, alias);} @@ -108,6 +108,6 @@ public class Db_qry__select_cmd implements Db_qry { return this; } - public String To_sql__exec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, Bool_.N);} + public String ToSqlExec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, Bool_.N);} public String To_sql__prep(SqlQryWtr wtr) {return wtr.ToSqlStr(this, Bool_.Y);} } diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry__select_in_tbl.java b/140_dbs/src/gplx/dbs/qrys/Db_qry__select_in_tbl.java index fc5d1aba8..f152c8357 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry__select_in_tbl.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry__select_in_tbl.java @@ -21,8 +21,8 @@ public class Db_qry__select_in_tbl implements Db_qry { this.base_table = base_table; this.select_flds = select_flds; this.where_flds = where_flds; this.group_by_sql = group_by_sql; this.having_sql = having_sql; this.order_by_sql = order_by_sql; this.limit_sql = limit_sql; } public int Tid() {return Db_qry_.Tid_select_in_tbl;} - public boolean Exec_is_rdr() {return true;} - public String Base_table() {return base_table;} private final String base_table; + public boolean ReturnsRdr() {return true;} + public String BaseTable() {return base_table;} private final String base_table; public Criteria Where() {return where;} private Criteria where; public void Where_(Criteria v) {this.where = v;} public String[] Select_flds() {return select_flds;} private final String[] select_flds; @@ -40,7 +40,7 @@ public class Db_qry__select_in_tbl implements Db_qry { public String Having_sql() {return having_sql;} private final String having_sql; public String Order_by_sql() {return order_by_sql;} public Db_qry__select_in_tbl Order_by_sql_(String v) {order_by_sql = v; return this;} private String order_by_sql; public String Limit_sql() {return limit_sql;} private final String limit_sql; - public String To_sql__exec(SqlQryWtr wtr) { + public String ToSqlExec(SqlQryWtr wtr) { synchronized (this) { String_bldr sb = String_bldr_.new_(); sb.Add("SELECT "); diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_delete.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_delete.java index a42d35440..34e547d07 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_delete.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_delete.java @@ -18,9 +18,9 @@ import gplx.core.criterias.*; import gplx.dbs.sqls.*; public class Db_qry_delete implements Db_qry { Db_qry_delete(String base_table, Criteria where) {this.base_table = base_table; this.where = where;} public int Tid() {return Db_qry_.Tid_delete;} - public boolean Exec_is_rdr() {return Bool_.N;} - public String Base_table() {return base_table;} private final String base_table; - public String To_sql__exec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} + public boolean ReturnsRdr() {return Bool_.N;} + public String BaseTable() {return base_table;} private final String base_table; + public String ToSqlExec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} public Criteria Where() {return where;} private final Criteria where; public int Exec_qry(Db_conn conn) {return conn.Exec_qry(this);} public static Db_qry_delete new_all_(String tbl) {return new Db_qry_delete(tbl, Criteria_.All);} diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_dml_tst.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_dml_tst.java index 114a23af3..dccda3e75 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_dml_tst.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_dml_tst.java @@ -39,5 +39,5 @@ public class Db_qry_dml_tst { qry.Where_(Criteria_.And(Db_crt_.New_eq("id", 0), Db_crt_.New_mt("startTime", DateAdp_.parse_gplx("2005-01-01")))); tst_XtoSql(qry, "UPDATE tbl0 SET id=1, name='me', startTime='2007-12-23 00:00:00.000' WHERE (id = 0 AND startTime > '2005-01-01 00:00:00.000')"); } - void tst_XtoSql(Db_qry qry, String expd) {Tfds.Eq(expd, qry.To_sql__exec(SqlQryWtrUtl.NewBasic()));} + void tst_XtoSql(Db_qry qry, String expd) {Tfds.Eq(expd, qry.ToSqlExec(SqlQryWtrUtl.NewBasic()));} } diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java index b74e68d3f..cfa39791e 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java @@ -17,9 +17,9 @@ package gplx.dbs.qrys; import gplx.*; import gplx.dbs.*; import gplx.dbs.sqls.*; public class Db_qry_flush implements Db_qry { public int Tid() {return Db_qry_.Tid_flush;} - public boolean Exec_is_rdr() {return false;} - public String Base_table() {return tableNames[0];} - public String To_sql__exec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} + public boolean ReturnsRdr() {return false;} + public String BaseTable() {return tableNames[0];} + public String ToSqlExec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} public int Exec_qry(Db_conn conn) {return conn.Exec_qry(this);} public String[] TableNames() {return tableNames;} private String[] tableNames; diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_insert.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_insert.java index 028277e4b..2b189e7b1 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_insert.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_insert.java @@ -18,10 +18,10 @@ import gplx.dbs.sqls.*; import gplx.dbs.sqls.itms.*; public class Db_qry_insert implements Db_arg_owner { public Db_qry_insert(String base_table) {this.base_table = base_table;} public int Tid() {return Db_qry_.Tid_insert;} - public boolean Exec_is_rdr() {return false;} - public String To_sql__exec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} + public boolean ReturnsRdr() {return false;} + public String ToSqlExec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} public int Exec_qry(Db_conn conn) {return conn.Exec_qry(this);} - public String Base_table() {return base_table;} private String base_table; + public String BaseTable() {return base_table;} private String base_table; public String[] Cols_for_insert() {return cols_for_insert;} private String[] cols_for_insert; public Db_arg_owner From_(String tbl) {base_table = tbl; return this;} public Keyval_hash Args() {return args;} private final Keyval_hash args = new Keyval_hash(); @@ -35,7 +35,7 @@ public class Db_qry_insert implements Db_arg_owner { public Db_arg_owner Val_blob(String k, byte[] v) {return Val_obj_type(k, v, Db_val_type.Tid_bry);} public Db_arg_owner Val_obj(String k, Object v) {return Val_obj_type(k, v, Db_val_type.Tid_null);} public Db_arg_owner Val_obj_type(String key, Object val, byte val_tid) { - if (key == Dbmeta_fld_itm.Key_null) return this; + if (key == DbmetaFldItm.KeyNull) return this; args.Add(key, new Db_arg(key, val, val_tid)); return this; } diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_select_tst.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_select_tst.java index 3379398aa..96fb0ddc9 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_select_tst.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_select_tst.java @@ -83,5 +83,5 @@ public class Db_qry_select_tst { // expd = "SELECT fld0, fld1 FROM tbl0 GROUP BY fld0, fld1 HAVING Count(fld0) > 1"; // Tfds.Eq(cmd.To_str(), expd); // } - void tst_XtoStr(Db_qry qry, String expd) {Tfds.Eq(expd, cmd.To_sql__exec(SqlQryWtrUtl.NewBasic()));} + void tst_XtoStr(Db_qry qry, String expd) {Tfds.Eq(expd, cmd.ToSqlExec(SqlQryWtrUtl.NewBasic()));} } diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java index d4d79bb18..d01072962 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java @@ -17,9 +17,9 @@ package gplx.dbs.qrys; import gplx.*; import gplx.dbs.*; import gplx.dbs.sqls.*; public class Db_qry_sql implements Db_qry { public int Tid() {return Db_qry_.Tid_sql;} - public boolean Exec_is_rdr() {return isReader;} private boolean isReader; - public String Base_table() {throw Err_.new_unimplemented();} - public String To_sql__exec(SqlQryWtr wtr) {return sql;} private String sql; + public boolean ReturnsRdr() {return isReader;} private boolean isReader; + public String BaseTable() {throw Err_.new_unimplemented();} + public String ToSqlExec(SqlQryWtr wtr) {return sql;} private String sql; public int Exec_qry(Db_conn conn) {return conn.Exec_qry(this);} public static Db_qry_sql dml_(String sql) {return sql_(sql);} public static Db_qry_sql ddl_(String sql) {return sql_(sql);} diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_update.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_update.java index e0eea3b50..9fcc2576c 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_update.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_update.java @@ -17,10 +17,10 @@ package gplx.dbs.qrys; import gplx.*; import gplx.dbs.*; import gplx.core.criterias.*; import gplx.dbs.sqls.*; public class Db_qry_update implements Db_arg_owner { public int Tid() {return Db_qry_.Tid_update;} - public boolean Exec_is_rdr() {return false;} - public String To_sql__exec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} + public boolean ReturnsRdr() {return false;} + public String ToSqlExec(SqlQryWtr wtr) {return wtr.ToSqlStr(this, false);} public int Exec_qry(Db_conn conn) {return conn.Exec_qry(this);} - public String Base_table() {return base_table;} private String base_table; + public String BaseTable() {return base_table;} private String base_table; public String[] Cols_for_update() {return cols_for_update;} private String[] cols_for_update; public Criteria Where() {return where;} public Db_qry_update Where_(Criteria crt) {where = crt; return this;} private Criteria where; public Db_arg_owner From_(String tbl) {base_table = tbl; return this;} @@ -35,7 +35,7 @@ public class Db_qry_update implements Db_arg_owner { public Db_arg_owner Val_blob(String k, byte[] v) {return Val_obj_type(k, v, Db_val_type.Tid_bry);} public Db_arg_owner Val_obj(String k, Object v) {return Val_obj_type(k, v, Db_val_type.Tid_null);} public Db_arg_owner Val_obj_type(String key, Object val, byte val_tid) { - if (key == Dbmeta_fld_itm.Key_null) return this; + if (key == DbmetaFldItm.KeyNull) return this; args.Add(key, new Db_arg(key, val, val_tid)); return this; } diff --git a/140_dbs/src/gplx/dbs/qrys/Db_stmt_cmd.java b/140_dbs/src/gplx/dbs/qrys/Db_stmt_cmd.java index c8775262e..0f064b0b0 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_stmt_cmd.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_stmt_cmd.java @@ -26,7 +26,7 @@ import gplx.dbs.Db_qry; import gplx.dbs.Db_qry_; import gplx.dbs.Db_rdr; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_itm; +import gplx.dbs.DbmetaFldItm; import gplx.dbs.engines.Db_engine; import gplx.objects.lists.GfoListBase; @@ -42,7 +42,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt_cmd(Db_engine engine, Db_qry qry) {Ctor_stmt(engine, qry);} public void Ctor_stmt(Db_engine engine, Db_qry qry) { this.engine = engine; - sql = qry.Tid() == Db_qry_.Tid_select_in_tbl ? ((Db_qry__select_in_tbl)qry).To_sql__exec(engine.Sql_wtr()) : engine.Sql_wtr().ToSqlStr(qry, true); + sql = qry.Tid() == Db_qry_.Tid_select_in_tbl ? ((Db_qry__select_in_tbl)qry).ToSqlExec(engine.Sql_wtr()) : engine.Sql_wtr().ToSqlStr(qry, true); Reset_stmt(); } public Db_stmt Reset_stmt() { @@ -57,7 +57,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_byte(String k, byte v) {return Add_byte(Bool_.N, k, v);} public Db_stmt Val_byte(byte v) {return Add_byte(Bool_.N, Key_na, v);} private Db_stmt Add_byte(boolean where, String k, byte v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setByte(++val_idx, v); paramList.Add(v); @@ -72,7 +72,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_int(String k, int v) {return Add_int(Bool_.N, k, v);} public Db_stmt Val_int(int v) {return Add_int(Bool_.N, Key_na, v);} private Db_stmt Add_int(boolean where, String k, int v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setInt(++val_idx, v); paramList.Add(v); @@ -86,7 +86,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_long(String k, long v) {return Add_long(Bool_.N, k, v);} public Db_stmt Val_long(long v) {return Add_long(Bool_.N, Key_na, v);} private Db_stmt Add_long(boolean where, String k, long v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setLong(++val_idx, v); paramList.Add(v); @@ -100,7 +100,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_float(String k, float v) {return Add_float(Bool_.N, k, v);} public Db_stmt Val_float(float v) {return Add_float(Bool_.N, Key_na, v);} private Db_stmt Add_float(boolean where, String k, float v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setFloat(++val_idx, v); paramList.Add(v); @@ -114,7 +114,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_double(String k, double v) {return Add_double(Bool_.N, k, v);} public Db_stmt Val_double(double v) {return Add_double(Bool_.N, Key_na, v);} private Db_stmt Add_double(boolean where, String k, double v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setDouble(++val_idx, v); paramList.Add(v); @@ -128,7 +128,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_decimal(String k, Decimal_adp v) {return Add_decimal(Bool_.N, k, v);} public Db_stmt Val_decimal(Decimal_adp v) {return Add_decimal(Bool_.N, Key_na, v);} private Db_stmt Add_decimal(boolean where, String k, Decimal_adp v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setBigDecimal(++val_idx, v.Under_as_native()); paramList.Add(v); @@ -142,7 +142,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_bry(String k, byte[] v) {return Add_bry(Bool_.N, k, v);} public Db_stmt Val_bry(byte[] v) {return Add_bry(Bool_.N, Key_na, v);} private Db_stmt Add_bry(boolean where, String k, byte[] v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setBytes(++val_idx, v); paramList.Add(v); @@ -160,7 +160,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Val_str(String k, String v) {return Add_str(Bool_.N, k, v);} public Db_stmt Val_str(String v) {return Add_str(Bool_.N, Key_na, v);} protected Db_stmt Add_str(boolean where, String k, String v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setString(++val_idx, v); paramList.Add(v); @@ -173,7 +173,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Crt_date(String k, DateAdp v) {return Add_date(Bool_.Y, k, v);} public Db_stmt Val_date(String k, DateAdp v) {return Add_date(Bool_.N, k, v);} protected Db_stmt Add_date(boolean where, String k, DateAdp v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setTimestamp(++val_idx, new java.sql.Timestamp(v.UnderDateTime().getTime().getTime())); paramList.Add(v); @@ -186,7 +186,7 @@ public class Db_stmt_cmd implements Db_stmt { public Db_stmt Crt_text(String k, String v) {return Add_text(Bool_.Y, k, v);} public Db_stmt Val_text(String k, String v) {return Add_text(Bool_.N, k, v);} private Db_stmt Add_text(boolean where, String k, String v) { - if (k == Dbmeta_fld_itm.Key_null) return this; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return this; // key is explicitly null; ignore; allows version_2+ type definitions try { stmt.setString(++val_idx, v); paramList.Add(v); diff --git a/140_dbs/src/gplx/dbs/qrys/Db_stmt_sql.java b/140_dbs/src/gplx/dbs/qrys/Db_stmt_sql.java index c756eef82..486f968de 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_stmt_sql.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_stmt_sql.java @@ -135,14 +135,14 @@ public class Db_stmt_sql implements Db_stmt {// used for formatting SQL statemen } public void Rls() {this.Clear();} public void Add(String k, String v) { - if (k == Dbmeta_fld_itm.Key_null) return; // key is explicitly null; ignore; allows version_2+ type definitions + if (k == DbmetaFldItm.KeyNull) return; // key is explicitly null; ignore; allows version_2+ type definitions args.Add(v); } public String Xto_sql() { - tmp_fmtr.Bld_bfr_many(tmp_bfr, (Object[])args.To_ary_and_clear(Object.class)); + tmp_fmtr.Bld_bfr_many(tmp_bfr, (Object[])args.ToAryAndClear(Object.class)); return tmp_bfr.To_str_and_clear(); } - public int Args_len() {return args.Count();} + public int Args_len() {return args.Len();} public String Args_get_at(int i) {return (String)args.Get_at(i);} private String sql_orig; public Db_qry Qry() {return qry;} private Db_qry qry; @@ -169,7 +169,7 @@ public class Db_stmt_sql implements Db_stmt {// used for formatting SQL statemen } public static String Xto_str(Bry_bfr tmp_bfr, Bry_fmtr tmp_fmtr, String sql_str, List_adp args) { Init_fmtr(tmp_bfr, tmp_fmtr, sql_str); - Object[] ary = args.To_obj_ary(); + Object[] ary = args.ToObjAry(); int len = ary.length; for (int i = 0; i < len; ++i) { Object obj = ary[i]; diff --git a/140_dbs/src/gplx/dbs/sqls/itms/Db_obj_ary_tst.java b/140_dbs/src/gplx/dbs/sqls/itms/Db_obj_ary_tst.java index fcd6ec2fb..e2a1ea355 100644 --- a/140_dbs/src/gplx/dbs/sqls/itms/Db_obj_ary_tst.java +++ b/140_dbs/src/gplx/dbs/sqls/itms/Db_obj_ary_tst.java @@ -33,8 +33,8 @@ class Db_obj_ary_fxt { public Db_obj_ary_fxt Init_vals(Object... ary) {vals_list.Add(ary); return this;} private List_adp vals_list = List_adp_.New(); public Db_obj_ary_fxt Test_sql(String expd) { Sql_core_wtr cmd_wtr = (Sql_core_wtr)SqlQryWtrUtl.NewBasic(); - crt.Flds_((Db_obj_ary_fld[])flds_list.To_ary_and_clear(Db_obj_ary_fld.class)); - crt.Vals_((Object[][])vals_list.To_ary_and_clear(Object[].class)); + crt.Flds_((Db_obj_ary_fld[])flds_list.ToAryAndClear(Db_obj_ary_fld.class)); + crt.Vals_((Object[][])vals_list.ToAryAndClear(Object[].class)); Bry_bfr bfr = Bry_bfr_.New(); cmd_wtr.Where_wtr().Bld_where__db_obj(bfr, ctx, crt); Tfds.Eq(expd, bfr.To_str_and_clear()); diff --git a/140_dbs/src/gplx/dbs/sqls/itms/Sql_order_clause.java b/140_dbs/src/gplx/dbs/sqls/itms/Sql_order_clause.java index 38b72c12c..e21195279 100644 --- a/140_dbs/src/gplx/dbs/sqls/itms/Sql_order_clause.java +++ b/140_dbs/src/gplx/dbs/sqls/itms/Sql_order_clause.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.sqls.itms; import gplx.*; import gplx.dbs.*; import gplx.dbs.sqls.*; +package gplx.dbs.sqls.itms; import gplx.*; public class Sql_order_clause { private final List_adp list = List_adp_.New(); private Sql_order_fld[] ary; public void Flds__add(Sql_order_fld fld) {list.Add(fld);} public Sql_order_fld[] Flds() { - if (ary == null) ary = (Sql_order_fld[])list.To_ary_and_clear(Sql_order_fld.class); + if (ary == null) ary = (Sql_order_fld[])list.ToAryAndClear(Sql_order_fld.class); return ary; } } diff --git a/140_dbs/src/gplx/dbs/sqls/itms/Sql_select_fld_list.java b/140_dbs/src/gplx/dbs/sqls/itms/Sql_select_fld_list.java index ffc922016..843dccf64 100644 --- a/140_dbs/src/gplx/dbs/sqls/itms/Sql_select_fld_list.java +++ b/140_dbs/src/gplx/dbs/sqls/itms/Sql_select_fld_list.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.sqls.itms; import gplx.*; import gplx.dbs.*; import gplx.dbs.sqls.*; -public class Sql_select_fld_list { - private final Ordered_hash hash = Ordered_hash_.New(); - public int Len() {return hash.Count();} - public Sql_select_fld_list Clear() {hash.Clear();return this;} - public Sql_select_fld Get_at(int i) {return (Sql_select_fld)hash.Get_at(i);} - public void Add(Sql_select_fld fld) {hash.Add(fld.Alias, fld);} -} +package gplx.dbs.sqls.itms; import gplx.*; +public class Sql_select_fld_list { + private final Ordered_hash hash = Ordered_hash_.New(); + public int Len() {return hash.Len();} + public Sql_select_fld_list Clear() {hash.Clear();return this;} + public Sql_select_fld Get_at(int i) {return (Sql_select_fld)hash.Get_at(i);} + public void Add(Sql_select_fld fld) {hash.Add(fld.Alias, fld);} +} diff --git a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_core_wtr.java b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_core_wtr.java index 34731ee4c..6fc079313 100644 --- a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_core_wtr.java +++ b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_core_wtr.java @@ -54,20 +54,20 @@ public class Sql_core_wtr implements SqlQryWtr { case Db_qry_.Tid_update: return Bld_qry_update(ctx, (Db_qry_update)qry); case Db_qry_.Tid_select_in_tbl: case Db_qry_.Tid_select: select_wtr.Bld_qry_select(bfr, ctx, (Db_qry__select_cmd)qry); return bfr.To_str_and_clear(); - case Db_qry_.Tid_pragma: return ((gplx.dbs.engines.sqlite.Sqlite_pragma)qry).To_sql__exec(this); - case Db_qry_.Tid_sql: return ((Db_qry_sql)qry).To_sql__exec(this); + case Db_qry_.Tid_pragma: return ((gplx.dbs.engines.sqlite.Sqlite_pragma)qry).ToSqlExec(this); + case Db_qry_.Tid_sql: return ((Db_qry_sql)qry).ToSqlExec(this); default: throw Err_.new_unhandled(qry.Tid()); } } } private String Bld_qry_delete(Sql_wtr_ctx ctx, Db_qry_delete qry) { - bfr.Add_str_u8_many("DELETE FROM ", qry.Base_table()); + bfr.Add_str_u8_many("DELETE FROM ", qry.BaseTable()); where_wtr.Bld_where(bfr, ctx, qry.Where()); return bfr.To_str_and_clear(); } private String Bld_qry_insert(Sql_wtr_ctx ctx, Db_qry_insert qry) { if (qry.Select() != null) { - bfr.Add_str_u8_many("INSERT INTO ", qry.Base_table(), " ("); + bfr.Add_str_u8_many("INSERT INTO ", qry.BaseTable(), " ("); int cols_len = qry.Cols().Len(); for (int i = 0; i < cols_len; i++) { Sql_select_fld fld = qry.Cols().Get_at(i); @@ -77,9 +77,9 @@ public class Sql_core_wtr implements SqlQryWtr { select_wtr.Bld_qry_select(bfr, ctx, qry.Select()); return bfr.To_str_and_clear(); } - int arg_count = qry.Args().Count(); if (arg_count == 0) throw Err_.new_wo_type("Db_qry_insert has no columns", "base_table", qry.Base_table()); + int arg_count = qry.Args().Count(); if (arg_count == 0) throw Err_.new_wo_type("Db_qry_insert has no columns", "base_table", qry.BaseTable()); int last = arg_count - 1; - bfr.Add_str_u8_many("INSERT INTO ", qry.Base_table(), " ("); + bfr.Add_str_u8_many("INSERT INTO ", qry.BaseTable(), " ("); for (int i = 0; i < arg_count; i++) { Keyval pair = qry.Args().Get_at(i); this.Bld_col_name(bfr, pair.Key()); @@ -95,8 +95,8 @@ public class Sql_core_wtr implements SqlQryWtr { return bfr.To_str_and_clear(); } private String Bld_qry_update(Sql_wtr_ctx ctx, Db_qry_update qry) { - int arg_count = qry.Args().Count(); if (arg_count == 0) throw Err_.new_wo_type("Db_qry_update has no columns", "base_table", qry.Base_table()); - bfr.Add_str_u8_many("UPDATE ", qry.Base_table(), " SET "); + int arg_count = qry.Args().Count(); if (arg_count == 0) throw Err_.new_wo_type("Db_qry_update has no columns", "base_table", qry.BaseTable()); + bfr.Add_str_u8_many("UPDATE ", qry.BaseTable(), " SET "); for (int i = 0; i < arg_count; i++) { Keyval pair = qry.Args().Get_at(i); if (i > 0) bfr.Add_str_a7(", "); diff --git a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_from_wtr.java b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_from_wtr.java index bcc09e18e..e35cc83bf 100644 --- a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_from_wtr.java +++ b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_from_wtr.java @@ -1,23 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.dbs.sqls.wtrs; import gplx.*; import gplx.dbs.*; import gplx.dbs.sqls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.dbs.sqls.wtrs; import gplx.*; import gplx.dbs.sqls.itms.*; public class Sql_from_wtr { public void Bld_clause_from(Bry_bfr bfr, Sql_from_clause from) { - List_adp tbls = from.Tbls; int tbls_len = tbls.Count(); + List_adp tbls = from.Tbls; int tbls_len = tbls.Len(); for (int i = 0; i < tbls_len; ++i) { Sql_tbl_itm tbl = (Sql_tbl_itm)tbls.Get_at(i); bfr.Add_byte_space().Add_str_a7(Bld_join(tbl.Join_tid)).Add_byte_space(); diff --git a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_schema_wtr.java b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_schema_wtr.java index cf45d5c10..b9b3cbd2a 100644 --- a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_schema_wtr.java +++ b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_schema_wtr.java @@ -20,8 +20,8 @@ import gplx.Byte_ascii; import gplx.Err_; import gplx.Object_; import gplx.String_; -import gplx.dbs.Dbmeta_fld_itm; -import gplx.dbs.Dbmeta_fld_tid; +import gplx.dbs.DbmetaFldItm; +import gplx.dbs.DbmetaFldType; import gplx.dbs.Dbmeta_idx_itm; import gplx.dbs.Dbmeta_tbl_itm; import gplx.dbs.metas.Dbmeta_fld_mgr; @@ -55,7 +55,7 @@ public class Sql_schema_wtr { Dbmeta_fld_mgr flds = tbl.Flds(); int len = flds.Len(); for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); tmp_bfr.Add_byte(i == 0 ? Byte_ascii.Paren_bgn : Byte_ascii.Comma).Add_byte_space(); Bld_fld(tmp_bfr, fld); tmp_bfr.Add_byte_nl(); @@ -63,7 +63,7 @@ public class Sql_schema_wtr { tmp_bfr.Add_str_a7(");"); return tmp_bfr.To_str_and_clear(); } - public String Bld_alter_tbl_add(String tbl, Dbmeta_fld_itm fld) { + public String Bld_alter_tbl_add(String tbl, DbmetaFldItm fld) { tmp_bfr.Add_str_a7("ALTER TABLE ").Add_str_a7(tbl).Add_str_a7(" ADD "); Bld_fld(tmp_bfr, fld); tmp_bfr.Add_byte_semic(); @@ -72,22 +72,22 @@ public class Sql_schema_wtr { public String Bld_drop_tbl(String tbl) { return String_.Format("DROP TABLE IF EXISTS {0};", tbl); } - private void Bld_fld(Bry_bfr tmp_bfr, Dbmeta_fld_itm fld) { + private void Bld_fld(Bry_bfr tmp_bfr, DbmetaFldItm fld) { tmp_bfr.Add_str_a7(fld.Name()).Add_byte_space(); - Tid_to_sql(tmp_bfr, fld.Type().Tid_ansi(), fld.Type().Len_1()); tmp_bfr.Add_byte_space(); - switch (fld.Nullable_tid()) { - case Dbmeta_fld_itm.Nullable_unknown: - case Dbmeta_fld_itm.Nullable_not_null: tmp_bfr.Add_str_a7("NOT NULL "); break; - case Dbmeta_fld_itm.Nullable_null: tmp_bfr.Add_str_a7("NULL "); break; + Tid_to_sql(tmp_bfr, fld.Type().Tid(), fld.Type().Len1()); tmp_bfr.Add_byte_space(); + switch (fld.Nullable()) { + case DbmetaFldItm.NullableUnspecified: + case DbmetaFldItm.NullableNotNull: tmp_bfr.Add_str_a7("NOT NULL "); break; + case DbmetaFldItm.NullableNull: tmp_bfr.Add_str_a7("NULL "); break; } - if (fld.Default() != Dbmeta_fld_itm.Default_value_null) { + if (fld.DefaultVal() != DbmetaFldItm.DefaultValNull) { tmp_bfr.Add_str_a7("DEFAULT "); boolean quote = Bool_.N; - switch (fld.Type().Tid_ansi()) { - case Dbmeta_fld_tid.Tid__str: case Dbmeta_fld_tid.Tid__text: quote = Bool_.Y; break; + switch (fld.Type().Tid()) { + case DbmetaFldType.TidStr: case DbmetaFldType.TidText: quote = Bool_.Y; break; } if (quote) tmp_bfr.Add_byte_apos(); - tmp_bfr.Add_str_u8(Object_.Xto_str_strict_or_null(fld.Default())); + tmp_bfr.Add_str_u8(Object_.Xto_str_strict_or_null(fld.DefaultVal())); if (quote) tmp_bfr.Add_byte_apos(); tmp_bfr.Add_byte_space(); } @@ -97,16 +97,16 @@ public class Sql_schema_wtr { } public static void Tid_to_sql(Bry_bfr tmp_bfr, int tid, int len) {// REF: https://www.sqlite.org/datatype3.html switch (tid) { - case Dbmeta_fld_tid.Tid__bool: tmp_bfr.Add_str_a7("boolean"); break; - case Dbmeta_fld_tid.Tid__byte: tmp_bfr.Add_str_a7("tinyint"); break; - case Dbmeta_fld_tid.Tid__short: tmp_bfr.Add_str_a7("smallint"); break; - case Dbmeta_fld_tid.Tid__int: tmp_bfr.Add_str_a7("integer"); break; // NOTE: must be integer, not int, else "int PRIMARY KEY AUTONUMBER" will fail; DATE:2015-02-12 - case Dbmeta_fld_tid.Tid__long: tmp_bfr.Add_str_a7("bigint"); break; - case Dbmeta_fld_tid.Tid__float: tmp_bfr.Add_str_a7("float"); break; - case Dbmeta_fld_tid.Tid__double: tmp_bfr.Add_str_a7("double"); break; - case Dbmeta_fld_tid.Tid__str: tmp_bfr.Add_str_a7("varchar(").Add_int_variable(len).Add_byte(Byte_ascii.Paren_end); break; - case Dbmeta_fld_tid.Tid__text: tmp_bfr.Add_str_a7("text"); break; - case Dbmeta_fld_tid.Tid__bry: tmp_bfr.Add_str_a7("blob"); break; + case DbmetaFldType.TidBool: tmp_bfr.Add_str_a7("boolean"); break; + case DbmetaFldType.TidByte: tmp_bfr.Add_str_a7("tinyint"); break; + case DbmetaFldType.TidShort: tmp_bfr.Add_str_a7("smallint"); break; + case DbmetaFldType.TidInt: tmp_bfr.Add_str_a7("integer"); break; // NOTE: must be integer, not int, else "int PRIMARY KEY AUTONUMBER" will fail; DATE:2015-02-12 + case DbmetaFldType.TidLong: tmp_bfr.Add_str_a7("bigint"); break; + case DbmetaFldType.TidFloat: tmp_bfr.Add_str_a7("float"); break; + case DbmetaFldType.TidDouble: tmp_bfr.Add_str_a7("double"); break; + case DbmetaFldType.TidStr: tmp_bfr.Add_str_a7("varchar(").Add_int_variable(len).Add_byte(Byte_ascii.Paren_end); break; + case DbmetaFldType.TidText: tmp_bfr.Add_str_a7("text"); break; + case DbmetaFldType.TidBry: tmp_bfr.Add_str_a7("blob"); break; default: throw Err_.new_unhandled(tid); } } diff --git a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_select_wtr.java b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_select_wtr.java index fdcea6418..2aa911a60 100644 --- a/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_select_wtr.java +++ b/140_dbs/src/gplx/dbs/sqls/wtrs/Sql_select_wtr.java @@ -46,7 +46,7 @@ public class Sql_select_wtr { private void Bld_select_group_by(Bry_bfr bfr, Sql_wtr_ctx ctx, Db_qry__select_cmd qry, Sql_group_clause groupBy) { if (groupBy == null) return; bfr.Add_str_a7(" GROUP BY "); - for (int i = 0; i < groupBy.Flds().Count(); i++) { + for (int i = 0; i < groupBy.Flds().Len(); i++) { String item = (String)groupBy.Flds().Get_at(i); if (i > 0) bfr.Add_str_a7(", "); bfr.Add_str_a7(item); diff --git a/140_dbs/src/gplx/dbs/stmts/Db_stmt_arg_list.java b/140_dbs/src/gplx/dbs/stmts/Db_stmt_arg_list.java index 089724471..d8dc2d548 100644 --- a/140_dbs/src/gplx/dbs/stmts/Db_stmt_arg_list.java +++ b/140_dbs/src/gplx/dbs/stmts/Db_stmt_arg_list.java @@ -19,9 +19,9 @@ public class Db_stmt_arg_list { public void Clear() {list.Clear();} public int Len() {return list.Len();} public Db_stmt_arg Get_at(int i) {return (Db_stmt_arg)list.Get_at(i);} - public Db_stmt_arg_list Crt_int (String key, int val) {return Add(Bool_.Y, Dbmeta_fld_tid.Tid__int, key, val);} - public Db_stmt_arg_list Crt_str_by_bry (String key, byte[] val) {return Add(Bool_.Y, Dbmeta_fld_tid.Tid__str, key, String_.new_u8(val));} - public Db_stmt_arg_list Crt_str (String key, String val) {return Add(Bool_.Y, Dbmeta_fld_tid.Tid__str, key, val);} + public Db_stmt_arg_list Crt_int (String key, int val) {return Add(Bool_.Y, DbmetaFldType.TidInt, key, val);} + public Db_stmt_arg_list Crt_str_by_bry (String key, byte[] val) {return Add(Bool_.Y, DbmetaFldType.TidStr, key, String_.new_u8(val));} + public Db_stmt_arg_list Crt_str (String key, String val) {return Add(Bool_.Y, DbmetaFldType.TidStr, key, val);} public Db_stmt_arg_list Add(boolean crt, int tid, String key, Object val) {list.Add(new Db_stmt_arg(crt, tid, key, val)); return this;} public void Fill(Db_stmt stmt) { int len = list.Len(); @@ -36,29 +36,29 @@ public class Db_stmt_arg_list { } public static void Fill_crt(Db_stmt stmt, int tid, String key, Object val) { switch (tid) { - case Dbmeta_fld_tid.Tid__bool: stmt.Crt_bool_as_byte (key, Bool_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__byte: stmt.Crt_byte (key, Byte_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__int: stmt.Crt_int (key, Int_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__long: stmt.Crt_long (key, Long_.cast(val)); break; - case Dbmeta_fld_tid.Tid__float: stmt.Crt_float (key, Float_.cast(val)); break; - case Dbmeta_fld_tid.Tid__double: stmt.Crt_double (key, Double_.cast(val)); break; - case Dbmeta_fld_tid.Tid__str: stmt.Crt_str (key, String_.cast(val)); break; - case Dbmeta_fld_tid.Tid__text: stmt.Crt_text (key, String_.cast(val)); break; - case Dbmeta_fld_tid.Tid__bry: stmt.Crt_bry (key, Bry_.cast(val)); break; + case DbmetaFldType.TidBool: stmt.Crt_bool_as_byte (key, Bool_.Cast(val)); break; + case DbmetaFldType.TidByte: stmt.Crt_byte (key, Byte_.Cast(val)); break; + case DbmetaFldType.TidInt: stmt.Crt_int (key, Int_.Cast(val)); break; + case DbmetaFldType.TidLong: stmt.Crt_long (key, Long_.cast(val)); break; + case DbmetaFldType.TidFloat: stmt.Crt_float (key, Float_.cast(val)); break; + case DbmetaFldType.TidDouble: stmt.Crt_double (key, Double_.cast(val)); break; + case DbmetaFldType.TidStr: stmt.Crt_str (key, String_.cast(val)); break; + case DbmetaFldType.TidText: stmt.Crt_text (key, String_.cast(val)); break; + case DbmetaFldType.TidBry: stmt.Crt_bry (key, Bry_.cast(val)); break; default: throw Err_.new_unhandled_default(tid); } } public static void Fill_val(Db_stmt stmt, int tid, String key, Object val) { switch (tid) { - case Dbmeta_fld_tid.Tid__bool: stmt.Val_bool_as_byte (key, Bool_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__byte: stmt.Val_byte (key, Byte_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__int: stmt.Val_int (key, Int_.Cast(val)); break; - case Dbmeta_fld_tid.Tid__long: stmt.Val_long (key, Long_.cast(val)); break; - case Dbmeta_fld_tid.Tid__float: stmt.Val_float (key, Float_.cast(val)); break; - case Dbmeta_fld_tid.Tid__double: stmt.Val_double (key, Double_.cast(val)); break; - case Dbmeta_fld_tid.Tid__str: stmt.Val_str (key, String_.cast(val)); break; - case Dbmeta_fld_tid.Tid__text: stmt.Val_text (key, String_.cast(val)); break; - case Dbmeta_fld_tid.Tid__bry: stmt.Val_bry (key, Bry_.cast(val)); break; + case DbmetaFldType.TidBool: stmt.Val_bool_as_byte (key, Bool_.Cast(val)); break; + case DbmetaFldType.TidByte: stmt.Val_byte (key, Byte_.Cast(val)); break; + case DbmetaFldType.TidInt: stmt.Val_int (key, Int_.Cast(val)); break; + case DbmetaFldType.TidLong: stmt.Val_long (key, Long_.cast(val)); break; + case DbmetaFldType.TidFloat: stmt.Val_float (key, Float_.cast(val)); break; + case DbmetaFldType.TidDouble: stmt.Val_double (key, Double_.cast(val)); break; + case DbmetaFldType.TidStr: stmt.Val_str (key, String_.cast(val)); break; + case DbmetaFldType.TidText: stmt.Val_text (key, String_.cast(val)); break; + case DbmetaFldType.TidBry: stmt.Val_bry (key, Bry_.cast(val)); break; default: throw Err_.new_unhandled_default(tid); } } diff --git a/140_dbs/src/gplx/dbs/stmts/Db_stmt_mgr.java b/140_dbs/src/gplx/dbs/stmts/Db_stmt_mgr.java index b940b2f29..65854dcc3 100644 --- a/140_dbs/src/gplx/dbs/stmts/Db_stmt_mgr.java +++ b/140_dbs/src/gplx/dbs/stmts/Db_stmt_mgr.java @@ -27,14 +27,14 @@ public class Db_stmt_mgr { } public void Add_crt_str(String key, String val) { fmt_list.Add(mode_is_stmt ? stmt_arg_placeholder : SqlQryWtrUtl.QuoteArg(val)); - arg_list.Add(Bool_.Y, Dbmeta_fld_tid.Tid__str, key, val); + arg_list.Add(Bool_.Y, DbmetaFldType.TidStr, key, val); } public void Add_crt_int(String key, int val) { fmt_list.Add(mode_is_stmt ? stmt_arg_placeholder : Int_.To_str(val)); - arg_list.Add(Bool_.Y, Dbmeta_fld_tid.Tid__int, key, val); + arg_list.Add(Bool_.Y, DbmetaFldType.TidInt, key, val); } public void Write_fmt(Bry_fmt fmt) { - fmt.Bld_many(bfr, (Object[])fmt_list.To_ary_and_clear(Object.class)); + fmt.Bld_many(bfr, (Object[])fmt_list.ToAryAndClear(Object.class)); } public String Make_sql(Bry_fmt fmt) { // should only be called publicly for debugging purposes Write_fmt(fmt); diff --git a/140_dbs/src/gplx/dbs/sys/Db_sys_tbl.java b/140_dbs/src/gplx/dbs/sys/Db_sys_tbl.java index daf28b813..1e6d88a21 100644 --- a/140_dbs/src/gplx/dbs/sys/Db_sys_tbl.java +++ b/140_dbs/src/gplx/dbs/sys/Db_sys_tbl.java @@ -17,11 +17,11 @@ package gplx.dbs.sys; import gplx.*; import gplx.dbs.*; class Db_sys_tbl implements Rls_able { private final String tbl_name = "gfdb_sys"; private String fld_key, fld_val; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final Db_conn conn; private Db_stmt stmt_insert, stmt_update, stmt_select; public Db_sys_tbl(Db_conn conn) { this.conn = conn; - fld_key = flds.Add_str_pkey("sys_key", 255); fld_val = flds.Add_text("sys_val"); + fld_key = flds.AddStrPkey("sys_key", 255); fld_val = flds.AddText("sys_val"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} diff --git a/140_dbs/src/gplx/dbs/utls/Db_tbl__crud_.java b/140_dbs/src/gplx/dbs/utls/Db_tbl__crud_.java index c7df5412e..8e56ba56b 100644 --- a/140_dbs/src/gplx/dbs/utls/Db_tbl__crud_.java +++ b/140_dbs/src/gplx/dbs/utls/Db_tbl__crud_.java @@ -1,22 +1,22 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.utls; import gplx.*; import gplx.dbs.*; import gplx.dbs.stmts.*; public class Db_tbl__crud_ { - public static boolean Upsert(Db_conn conn, String tbl_name, Dbmeta_fld_list flds, String[] crt_cols, Object... objs) { + public static boolean Upsert(Db_conn conn, String tbl_name, DbmetaFldList flds, String[] crt_cols, Object... objs) { // init int crt_cols_len = crt_cols.length; String[] val_cols = Find_excepts(flds, crt_cols); @@ -48,33 +48,33 @@ public class Db_tbl__crud_ { return true; } } - private static String[] Find_excepts(Dbmeta_fld_list flds, String[] cols) { + private static String[] Find_excepts(DbmetaFldList flds, String[] cols) { // hash cols Hash_adp hash = Hash_adp_.New(); int cols_len = cols.length; for (int i = 0; i < cols_len; ++i) - hash.Add_as_key_and_val(cols[i]); + hash.AddAsKeyAndVal(cols[i]); // loop flds and get excepts List_adp list = List_adp_.New(); int flds_len = flds.Len(); for (int i = 0; i < flds_len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.GetAt(i); if (!hash.Has(fld.Name())) list.Add(fld.Name()); } - return list.To_str_ary_and_clear(); + return list.ToStrAryAndClear(); } - private static void Add_arg(Db_stmt stmt, Dbmeta_fld_list flds, String[] cols, Object[] objs, boolean mode_is_crt, int objs_bgn) { + private static void Add_arg(Db_stmt stmt, DbmetaFldList flds, String[] cols, Object[] objs, boolean mode_is_crt, int objs_bgn) { int cols_len = cols.length; for (int i = 0; i < cols_len; ++i) { String col = cols[i]; - Dbmeta_fld_itm fld = flds.Get_by(col); + DbmetaFldItm fld = flds.GetByOrNull(col); Object obj = objs[i + objs_bgn]; if (mode_is_crt) - Db_stmt_arg_list.Fill_crt(stmt, fld.Type().Tid_ansi(), col, obj); + Db_stmt_arg_list.Fill_crt(stmt, fld.Type().Tid(), col, obj); else - Db_stmt_arg_list.Fill_val(stmt, fld.Type().Tid_ansi(), col, obj); + Db_stmt_arg_list.Fill_val(stmt, fld.Type().Tid(), col, obj); } } } diff --git a/140_dbs/src/gplx/gfdbs/cores/GfdbMeta.java b/140_dbs/src/gplx/gfdbs/cores/GfdbMeta.java index 0b2c034c9..7f1a3ce3f 100644 --- a/140_dbs/src/gplx/gfdbs/cores/GfdbMeta.java +++ b/140_dbs/src/gplx/gfdbs/cores/GfdbMeta.java @@ -2,11 +2,11 @@ package gplx.gfdbs.cores; import gplx.dbs.Db_rdr; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_list; +import gplx.dbs.DbmetaFldList; public interface GfdbMeta extends GfdbItmFactory { String TblName(); - Dbmeta_fld_list Flds(); + DbmetaFldList Flds(); String[] Pkeys(); void SaveStmtPkeys(Db_stmt stmt, I itm); void SaveStmtVals(GfdbState state, Db_stmt stmt, I itm); diff --git a/140_dbs/src/gplx/gfdbs/cores/GfdbMetaBase.java b/140_dbs/src/gplx/gfdbs/cores/GfdbMetaBase.java index 7420c4e73..c870c8b13 100644 --- a/140_dbs/src/gplx/gfdbs/cores/GfdbMetaBase.java +++ b/140_dbs/src/gplx/gfdbs/cores/GfdbMetaBase.java @@ -1,7 +1,7 @@ package gplx.gfdbs.cores; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_list; +import gplx.dbs.DbmetaFldList; public abstract class GfdbMetaBase implements GfdbMeta { public GfdbMetaBase(String tblName) { @@ -10,7 +10,7 @@ public abstract class GfdbMetaBase implements GfdbMeta { this.pkeys = CtorPkeys(); } @Override public String TblName() {return tblName;} private final String tblName; - @Override public Dbmeta_fld_list Flds() {return flds;} protected final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + @Override public DbmetaFldList Flds() {return flds;} protected final DbmetaFldList flds = new DbmetaFldList(); @Override public String[] Pkeys() {return pkeys;} protected String[] pkeys; @Override public abstract void SaveStmtPkeys(Db_stmt stmt, I itm); @Override public abstract void SaveStmtVals(GfdbState state, Db_stmt stmt, I itm); diff --git a/140_dbs/src/gplx/gfdbs/cores/cfgs/GfdbCfgMeta.java b/140_dbs/src/gplx/gfdbs/cores/cfgs/GfdbCfgMeta.java index 4c2e5b108..adfc4e670 100644 --- a/140_dbs/src/gplx/gfdbs/cores/cfgs/GfdbCfgMeta.java +++ b/140_dbs/src/gplx/gfdbs/cores/cfgs/GfdbCfgMeta.java @@ -10,8 +10,8 @@ public class GfdbCfgMeta extends GfdbMetaBase { public String Key() {return key;} private String key; public String Val() {return val;} private String val; @Override protected void CtorFlds() { - this.key = flds.Add_str_pkey("cfg_key", 1024); - this.val = flds.Add_str("cfg_val", 1024); + this.key = flds.AddStrPkey("cfg_key", 1024); + this.val = flds.AddStr("cfg_val", 1024); } @Override protected String[] CtorPkeys() {return new String[] {key};} @Override public void SaveStmtPkeys(Db_stmt stmt, GfdbCfgItm itm) {stmt.Crt_str(this.Key(), itm.Key());} diff --git a/140_dbs/src/gplx/gfdbs/cores/cmds/GfoDbSelectWkrOne.java b/140_dbs/src/gplx/gfdbs/cores/cmds/GfoDbSelectWkrOne.java index 724a2e963..28b95f92f 100644 --- a/140_dbs/src/gplx/gfdbs/cores/cmds/GfoDbSelectWkrOne.java +++ b/140_dbs/src/gplx/gfdbs/cores/cmds/GfoDbSelectWkrOne.java @@ -4,7 +4,7 @@ import gplx.Err_; import gplx.dbs.Db_conn; import gplx.dbs.Db_rdr; import gplx.dbs.Db_stmt; -import gplx.dbs.Dbmeta_fld_itm; +import gplx.dbs.DbmetaFldItm; import gplx.gfdbs.cores.GfdbMeta; import gplx.dbs.stmts.Db_stmt_arg_list; @@ -20,8 +20,8 @@ public class GfoDbSelectWkrOne> implements GfoDbSelectW if (pkeyCols.length != pkeyVals.length) throw Err_.new_wo_type("pkey lengths don't match"); for (int i = 0; i < pkeyCols.length; i++) { String pkeyCol = pkeyCols[i]; - Dbmeta_fld_itm pkeyFld = meta.Flds().Get_by(pkeyCol); - Db_stmt_arg_list.Fill_crt(stmt, pkeyFld.Type().Tid_ansi(), pkeyCol, pkeyVals[i]); + DbmetaFldItm pkeyFld = meta.Flds().GetByOrNull(pkeyCol); + Db_stmt_arg_list.Fill_crt(stmt, pkeyFld.Type().Tid(), pkeyCol, pkeyVals[i]); } return stmt.Exec_select__rls_auto(); diff --git a/140_dbs/tst/gplx/core/stores/DbMaprMgr_tst.java b/140_dbs/tst/gplx/core/stores/DbMaprMgr_tst.java index 106f5e501..8342ca863 100644 --- a/140_dbs/tst/gplx/core/stores/DbMaprMgr_tst.java +++ b/140_dbs/tst/gplx/core/stores/DbMaprMgr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.stores; import gplx.*; import gplx.core.*; +package gplx.core.stores; import gplx.*; import org.junit.*; import gplx.dbs.*; /*Db_conn_info*/ public class DbMaprMgr_tst { @@ -95,7 +95,7 @@ public class DbMaprMgr_tst { Tfds.Eq(1, disc.Id()); Tfds.Eq("name", disc.Name()); - Tfds.Eq(0, disc.Titles().Count()); + Tfds.Eq(0, disc.Titles().Len()); } @Test public void Load_subs() { rdr = rdr_(); @@ -106,7 +106,7 @@ public class DbMaprMgr_tst { Tfds.Eq(1, disc.Id()); Tfds.Eq("name", disc.Name()); - Tfds.Eq(2, disc.Titles().Count()); + Tfds.Eq(2, disc.Titles().Len()); Tfds.Eq("title1", ((MockTitle)disc.Titles().Get_at(0)).Name()); Tfds.Eq("title2", ((MockTitle)disc.Titles().Get_at(1)).Name()); } @@ -121,12 +121,12 @@ public class DbMaprMgr_tst { Tfds.Eq(1, disc.Id()); Tfds.Eq("name", disc.Name()); - Tfds.Eq(1, disc.Titles().Count()); + Tfds.Eq(1, disc.Titles().Len()); MockTitle t = ((MockTitle)disc.Titles().Get_at(0)); Tfds.Eq("title1", t.Name()); Tfds.Eq("chapter1", ((MockChapter)t.Chapters().Get_at(0)).Name()); - Tfds.Eq(1, t.Audios().Count()); - Tfds.Eq(1, t.Subtitles().Count()); + Tfds.Eq(1, t.Audios().Len()); + Tfds.Eq(1, t.Subtitles().Len()); Tfds.Eq("audio1", ((MockStream)t.Audios().Get_at(0)).Name()); Tfds.Eq("subtitle1", ((MockStream)t.Subtitles().Get_at(0)).Name()); } diff --git a/140_dbs/tst/gplx/dbs/Db_conn_fxt.java b/140_dbs/tst/gplx/dbs/Db_conn_fxt.java index 533b0d896..e01944659 100644 --- a/140_dbs/tst/gplx/dbs/Db_conn_fxt.java +++ b/140_dbs/tst/gplx/dbs/Db_conn_fxt.java @@ -23,7 +23,7 @@ public class Db_conn_fxt implements Rls_able { public void tst_ExecDml(int expd, Db_qry qry) { int actl = conn.Exec_qry(qry); if (dmlAffectedAvailable) - Tfds.Eq(expd, actl, "Exec_qry failed: sql={0}", qry.To_sql__exec(conn.Engine().Sql_wtr())); + Tfds.Eq(expd, actl, "Exec_qry failed: sql={0}", qry.ToSqlExec(conn.Engine().Sql_wtr())); } public void tst_ExecRdrTbl(int expd, String tblName) {tst_ExecRdr(expd, Db_qry_.select_tbl_(tblName));} public void tst_ExecRdr(int expd, Db_qry qry) { @@ -33,7 +33,7 @@ public class Db_conn_fxt implements Rls_able { tbl = GfoNde_.rdr_(rdr); } catch (Exception e) {Err_.Noop(e); rdr.Rls();} - Tfds.Eq(expd, tbl.Subs().Count(), "Exec_qry_as_rdr failed: sql={0}", qry.To_sql__exec(conn.Engine().Sql_wtr())); + Tfds.Eq(expd, tbl.Subs().Count(), "Exec_qry_as_rdr failed: sql={0}", qry.ToSqlExec(conn.Engine().Sql_wtr())); } GfoNde tbl; public GfoNde tst_RowAry(int index, Object... expdValAry) { GfoNde record = tbl.Subs().FetchAt_asGfoNde(index); diff --git a/140_dbs/tst/gplx/dbs/GfoNdeTstr.java b/140_dbs/tst/gplx/dbs/GfoNdeTstr.java index 86688ff24..7f9f33d88 100644 --- a/140_dbs/tst/gplx/dbs/GfoNdeTstr.java +++ b/140_dbs/tst/gplx/dbs/GfoNdeTstr.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs; import gplx.*; -import gplx.core.gfo_ndes.*; -public class GfoNdeTstr { - public static void tst_ValsByCol(GfoNde nde, String fld, Object... expdAry) { - List_adp expd = List_adp_.New(); - for (int i = 0; i < expdAry.length; i++) { - expd.Add(Object_.Xto_str_strict_or_empty(expdAry[i])); - } - List_adp actl = List_adp_.New(); - for (int i = 0; i < nde.Subs().Count(); i++) { - GfoNde sub = nde.Subs().FetchAt_asGfoNde(i); - actl.Add(Object_.Xto_str_strict_or_empty(sub.Read(fld))); - } - Tfds.Eq_ary(expd.To_str_ary(), actl.To_str_ary()); - } +package gplx.dbs; import gplx.*; +import gplx.core.gfo_ndes.*; +public class GfoNdeTstr { + public static void tst_ValsByCol(GfoNde nde, String fld, Object... expdAry) { + List_adp expd = List_adp_.New(); + for (int i = 0; i < expdAry.length; i++) { + expd.Add(Object_.Xto_str_strict_or_empty(expdAry[i])); + } + List_adp actl = List_adp_.New(); + for (int i = 0; i < nde.Subs().Count(); i++) { + GfoNde sub = nde.Subs().FetchAt_asGfoNde(i); + actl.Add(Object_.Xto_str_strict_or_empty(sub.Read(fld))); + } + Tfds.Eq_ary(expd.ToStrAry(), actl.ToStrAry()); + } } \ No newline at end of file diff --git a/140_dbs/tst/gplx/dbs/sqls/wtrs/Sql_schema_wtr_tst.java b/140_dbs/tst/gplx/dbs/sqls/wtrs/Sql_schema_wtr_tst.java index 8235368dd..adb9e8634 100644 --- a/140_dbs/tst/gplx/dbs/sqls/wtrs/Sql_schema_wtr_tst.java +++ b/140_dbs/tst/gplx/dbs/sqls/wtrs/Sql_schema_wtr_tst.java @@ -23,18 +23,18 @@ public class Sql_schema_wtr_tst { ); } @Test public void Tbl_basic() { - Dbmeta_fld_list flds = new Dbmeta_fld_list(); - flds.Add_int_pkey("fld_int_pkey"); - flds.Add_bool("fld_bool"); - flds.Add_short("fld_short"); - flds.Add_int("fld_int"); - flds.Add_long("fld_long"); - flds.Add_float("fld_float"); - flds.Add_double("fld_double"); - flds.Add_str("fld_str", 123); - flds.Add_text("fld_text"); - flds.Add_bry("fld_bry"); - fxt.Test_create_tbl(Dbmeta_tbl_itm.New("tbl_name", flds.To_fld_ary()) + DbmetaFldList flds = new DbmetaFldList(); + flds.AddIntPkey("fld_int_pkey"); + flds.AddBool("fld_bool"); + flds.AddShort("fld_short"); + flds.AddInt("fld_int"); + flds.AddLong("fld_long"); + flds.AddFloat("fld_float"); + flds.AddDouble("fld_double"); + flds.AddStr("fld_str", 123); + flds.AddText("fld_text"); + flds.AddBry("fld_bry"); + fxt.Test_create_tbl(Dbmeta_tbl_itm.New("tbl_name", flds.ToFldAry()) , String_.Concat_lines_nl_skip_last ( "CREATE TABLE IF NOT EXISTS tbl_name" , "( fld_int_pkey integer NOT NULL PRIMARY KEY" @@ -51,16 +51,16 @@ public class Sql_schema_wtr_tst { )); } @Test public void Tbl_alter_tbl_add() { - Dbmeta_fld_list flds = new Dbmeta_fld_list(); - flds.Add_int_dflt("fld_int", -1); - flds.Add_str_dflt("fld_str", 255, "a"); - fxt.Test_alter_tbl_add("tbl_name", flds.Get_by("fld_int"), "ALTER TABLE tbl_name ADD fld_int integer NOT NULL DEFAULT -1;"); - fxt.Test_alter_tbl_add("tbl_name", flds.Get_by("fld_str"), "ALTER TABLE tbl_name ADD fld_str varchar(255) NOT NULL DEFAULT 'a';"); + DbmetaFldList flds = new DbmetaFldList(); + flds.AddIntDflt("fld_int", -1); + flds.AddStrDflt("fld_str", 255, "a"); + fxt.Test_alter_tbl_add("tbl_name", flds.GetByOrNull("fld_int"), "ALTER TABLE tbl_name ADD fld_int integer NOT NULL DEFAULT -1;"); + fxt.Test_alter_tbl_add("tbl_name", flds.GetByOrNull("fld_str"), "ALTER TABLE tbl_name ADD fld_str varchar(255) NOT NULL DEFAULT 'a';"); } } class Sql_schema_wtr_fxt { private Sql_schema_wtr sqlbldr = SqlQryWtrUtl.NewSqlite().Schema_wtr(); public void Test_create_idx(Dbmeta_idx_itm idx, String expd) {Tfds.Eq(expd, sqlbldr.Bld_create_idx(idx));} public void Test_create_tbl(Dbmeta_tbl_itm tbl, String expd) {Tfds.Eq_str_lines(expd, sqlbldr.Bld_create_tbl(tbl));} - public void Test_alter_tbl_add(String tbl, Dbmeta_fld_itm fld, String expd) {Tfds.Eq_str_lines(expd, sqlbldr.Bld_alter_tbl_add(tbl, fld));} + public void Test_alter_tbl_add(String tbl, DbmetaFldItm fld, String expd) {Tfds.Eq_str_lines(expd, sqlbldr.Bld_alter_tbl_add(tbl, fld));} } diff --git a/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBnd.java b/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBnd.java index 49901ea9a..1adcc5975 100644 --- a/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBnd.java +++ b/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBnd.java @@ -73,7 +73,7 @@ public class GfuiMoveElemBnd implements IptBnd, Gfo_invk, InjectAble { } void ExecKeyDown(IptEventData msg) { PointAdp current = targetElem.Pos(); - PointAdp offset = PointAdp_.cast(hash.Get_by(msg.EventArg())); + PointAdp offset = PointAdp_.cast(hash.GetByOrNull(msg.EventArg())); targetElem.Pos_(current.Op_add(offset)); } @gplx.Internal protected void Key_set(String key) {this.key = key;} private String key; @@ -83,7 +83,7 @@ public class GfuiMoveElemBnd implements IptBnd, Gfo_invk, InjectAble { PointAdp anchor = PointAdp_.Zero; Hash_adp hash = Hash_adp_.New(); public static GfuiMoveElemBnd new_() {return new GfuiMoveElemBnd();} GfuiMoveElemBnd() { - args.Add_many(IptMouseBtn_.Left, IptMouseMove.AnyDirection); + args.AddMany(IptMouseBtn_.Left, IptMouseMove.AnyDirection); IptBndArgsBldr.AddWithData(args, hash, IptKey_.MOD_1ST.Add(IptKey_.Up), PointAdp_.new_(0, -10)); IptBndArgsBldr.AddWithData(args, hash, IptKey_.MOD_1ST.Add(IptKey_.Down), PointAdp_.new_(0, 10)); IptBndArgsBldr.AddWithData(args, hash, IptKey_.MOD_1ST.Add(IptKey_.Left), PointAdp_.new_(-10, 0)); diff --git a/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBtn.java b/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBtn.java index f527f969c..fc826a854 100644 --- a/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBtn.java +++ b/150_gfui/src/gplx/gfui/controls/customs/GfuiMoveElemBtn.java @@ -83,7 +83,7 @@ class GfuiResizeFormBnd implements IptBnd { active = false; } void ExecKeyDown(IptEventData iptData) { - SizeAdp deltaSize = (SizeAdp)hash.Get_by(iptData.EventArg()); + SizeAdp deltaSize = (SizeAdp)hash.GetByOrNull(iptData.EventArg()); ResizeForm(iptData.Sender(), deltaSize); } void ResizeForm(GfuiElem elem, SizeAdp deltaSize) { @@ -100,7 +100,7 @@ class GfuiResizeFormBnd implements IptBnd { boolean active = false; PointAdp lastPos = PointAdp_.Zero; Hash_adp hash = Hash_adp_.New(); public static GfuiResizeFormBnd new_() {return new GfuiResizeFormBnd();} GfuiResizeFormBnd() { - args.Add_many(IptMouseBtn_.Right, IptMouseMove.AnyDirection); + args.AddMany(IptMouseBtn_.Right, IptMouseMove.AnyDirection); IptBndArgsBldr.AddWithData(args, hash, IptKey_.MOD_1ST.Add(IptKey_.Shift).Add(IptKey_.Up), SizeAdp_.new_(0, -10)); IptBndArgsBldr.AddWithData(args, hash, IptKey_.MOD_1ST.Add(IptKey_.Shift).Add(IptKey_.Down), SizeAdp_.new_(0, 10)); IptBndArgsBldr.AddWithData(args, hash, IptKey_.MOD_1ST.Add(IptKey_.Shift).Add(IptKey_.Left), SizeAdp_.new_(-10, 0)); diff --git a/150_gfui/src/gplx/gfui/controls/elems/GfuiElemBase.java b/150_gfui/src/gplx/gfui/controls/elems/GfuiElemBase.java index 209fc9e74..5c913d24e 100644 --- a/150_gfui/src/gplx/gfui/controls/elems/GfuiElemBase.java +++ b/150_gfui/src/gplx/gfui/controls/elems/GfuiElemBase.java @@ -303,7 +303,7 @@ public class GfuiElemBase implements GfuiElem { Object rv = this.InvkMgr().Invk(ctx, ikey, k, m, this); if (rv != Gfo_invk_.Rv_unhandled) return rv; - Object findObj = injected.Get_by(k); + Object findObj = injected.GetByOrNull(k); if (findObj == null) findObj = this.subElems.Get_by(k); if (findObj == null) return Gfo_invk_.Rv_unhandled; return findObj; // necessary for gplx.images @@ -339,7 +339,7 @@ public class GfuiElemBase implements GfuiElem { // underMgr.Size_set(SizeAdp_.new_(20, 20)); // NOTE: CS inits to 20,20; JAVA inits to 0,0 } public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.control_();} - public Object SubItms_getObj(String key) {return injected.Get_by(key);} + public Object SubItms_getObj(String key) {return injected.GetByOrNull(key);} public GfuiElemBase SubItms_add(String key, Object v) {injected.Add(key, v); return this;} public Ordered_hash XtnAtrs() {return xtnAtrs;} Ordered_hash xtnAtrs = Ordered_hash_.New(); Hash_adp injected = Hash_adp_.New(); diff --git a/150_gfui/src/gplx/gfui/controls/elems/GfuiElemList.java b/150_gfui/src/gplx/gfui/controls/elems/GfuiElemList.java index e5709068e..912119fce 100644 --- a/150_gfui/src/gplx/gfui/controls/elems/GfuiElemList.java +++ b/150_gfui/src/gplx/gfui/controls/elems/GfuiElemList.java @@ -1,23 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfui.controls.elems; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; -public class GfuiElemList { - public int Count() {return hash.Count();} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfui.controls.elems; import gplx.*; +public class GfuiElemList { + public int Count() {return hash.Len();} public GfuiElem Get_at(int idx) {return (GfuiElem)hash.Get_at(idx);} - public GfuiElem Get_by(String key) {return (GfuiElem)hash.Get_by(key);} + public GfuiElem Get_by(String key) {return (GfuiElem)hash.GetByOrNull(key);} public void Add(GfuiElem box) {Add_exec(box);} public void DelOrFail(GfuiElem box) {Del_exec(box);} public void Del_at(int idx) {Del_exec(Get_at(idx));} diff --git a/150_gfui/src/gplx/gfui/controls/gxws/GxwTextBox_lang.java b/150_gfui/src/gplx/gfui/controls/gxws/GxwTextBox_lang.java index f25e580a8..02f705559 100644 --- a/150_gfui/src/gplx/gfui/controls/gxws/GxwTextBox_lang.java +++ b/150_gfui/src/gplx/gfui/controls/gxws/GxwTextBox_lang.java @@ -183,7 +183,7 @@ class GxwTextFld_cls_lang extends JTextField implements GxwTextFld { class GxwTextBox_overrideKeyCmd extends AbstractAction { public void actionPerformed(ActionEvent e) { if (focus) { - int z = owner.OwnerWin().FocusMgr().SubElems().Idx_of(owner); + int z = owner.OwnerWin().FocusMgr().SubElems().IdxOf(owner); owner.OwnerWin().FocusMgr().Focus(focusDir, z); return; } diff --git a/150_gfui/src/gplx/gfui/controls/gxws/GxwTextHtml_lang.java b/150_gfui/src/gplx/gfui/controls/gxws/GxwTextHtml_lang.java index 66f811137..553d19ec5 100644 --- a/150_gfui/src/gplx/gfui/controls/gxws/GxwTextHtml_lang.java +++ b/150_gfui/src/gplx/gfui/controls/gxws/GxwTextHtml_lang.java @@ -1,64 +1,38 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfui.controls.gxws; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfui.controls.gxws; import gplx.*; import gplx.gfui.*; import gplx.core.strings.*; import java.awt.Color; -import java.awt.Component; -import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseWheelEvent; -import java.io.StringWriter; import java.util.Enumeration; import javax.swing.BorderFactory; import javax.swing.JEditorPane; import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.ScrollPaneConstants; import javax.swing.border.Border; -import javax.swing.plaf.ComponentUI; -import javax.swing.text.AbstractDocument; import javax.swing.text.AttributeSet; -import javax.swing.text.BoxView; -import javax.swing.text.ComponentView; -import javax.swing.text.DefaultEditorKit; -import javax.swing.text.DefaultStyledDocument; import javax.swing.text.Document; -import javax.swing.text.EditorKit; import javax.swing.text.Element; -import javax.swing.text.IconView; -import javax.swing.text.LabelView; -import javax.swing.text.MutableAttributeSet; -import javax.swing.text.ParagraphView; -import javax.swing.text.PlainDocument; -import javax.swing.text.Segment; -import javax.swing.text.SimpleAttributeSet; -import javax.swing.text.StyleConstants; -import javax.swing.text.StyledDocument; import javax.swing.text.StyledEditorKit; -import javax.swing.text.View; -import javax.swing.text.ViewFactory; -import javax.swing.text.html.HTML; import javax.swing.text.html.HTMLDocument; import javax.swing.text.html.HTMLEditorKit; -import javax.swing.text.html.HTMLEditorKit.HTMLFactory; -import javax.swing.text.html.InlineView; import javax.swing.text.html.StyleSheet; import gplx.gfui.draws.*; import gplx.gfui.ipts.*; import gplx.gfui.gfxs.*; @@ -218,7 +192,7 @@ class GxwTextHtml_editor extends JEditorPane implements GxwTextHtml { Element elm = Html_sel_elm(); if (elm == null) return Keyval_.Ary_empty; List_adp sel_atrs_list = List_adp_.New(); Html_sel_atrs(elm.getAttributes(), sel_atrs_list, null, "."); - return (Keyval[])sel_atrs_list.To_ary(Keyval.class); + return (Keyval[])sel_atrs_list.ToAry(Keyval.class); } @Override public void processKeyEvent(KeyEvent e) { diff --git a/150_gfui/src/gplx/gfui/controls/tabs/TabBox.java b/150_gfui/src/gplx/gfui/controls/tabs/TabBox.java index 67b7bbeeb..a606a3041 100644 --- a/150_gfui/src/gplx/gfui/controls/tabs/TabBox.java +++ b/150_gfui/src/gplx/gfui/controls/tabs/TabBox.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfui.controls.tabs; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfui.controls.tabs; import gplx.*; import gplx.gfui.draws.*; import gplx.gfui.layouts.*; import gplx.gfui.controls.elems.*; import gplx.gfui.controls.standards.*; public class TabBox extends GfuiElemBase { public int Tabs_Count() {return mgr.Count();} @@ -129,7 +129,7 @@ class TabPnlAreaMgr { } public static void Del(TabBox tabBox, TabPnlItm itm) { tabBox.PnlBox().SubElems().Del_at(itm.Idx()); - ((GfuiElemBase)tabBox.PnlBox()).Lyt().SubLyts().Del_at(itm.Idx()); + ((GfuiElemBase)tabBox.PnlBox()).Lyt().SubLyts().DelAt(itm.Idx()); } public static void Select(TabBox tabBox, TabPnlItm curTabItm, TabPnlItm newTabItm) { if (curTabItm != null) { diff --git a/150_gfui/src/gplx/gfui/controls/tabs/TabBoxMgr.java b/150_gfui/src/gplx/gfui/controls/tabs/TabBoxMgr.java index c07c5cffe..5be822436 100644 --- a/150_gfui/src/gplx/gfui/controls/tabs/TabBoxMgr.java +++ b/150_gfui/src/gplx/gfui/controls/tabs/TabBoxMgr.java @@ -1,32 +1,32 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfui.controls.tabs; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfui.controls.tabs; import gplx.*; public class TabBoxMgr implements Gfo_evt_mgr_owner { public Gfo_evt_mgr Evt_mgr() {if (evt_mgr == null) evt_mgr = new Gfo_evt_mgr(this); return evt_mgr;} Gfo_evt_mgr evt_mgr; - public int Count() {return itms.Count();} - public TabPnlItm Get_by(String k) {return (TabPnlItm)itms.Get_by(k);} + public int Count() {return itms.Len();} + public TabPnlItm Get_by(String k) {return (TabPnlItm)itms.GetByOrNull(k);} public TabPnlItm Get_at(int i) {return (TabPnlItm)itms.Get_at(i);} public TabPnlItm CurTab() {return curTab;} TabPnlItm curTab; public TabPnlItm Add(String key, String name) { - TabPnlItm itm = TabPnlItm.new_(this, key).Name_(name).Idx_(itms.Count()); + TabPnlItm itm = TabPnlItm.new_(this, key).Name_(name).Idx_(itms.Len()); itms.Add(itm.Key(), itm); return itm; } public void Del_at(int i) { - boolean isCur = i == curTab.Idx(), isLast = i == itms.Count() - 1; + boolean isCur = i == curTab.Idx(), isLast = i == itms.Len() - 1; TabPnlItm itm = this.Get_at(i); itms.Del(itm.Key()); this.Reorder(i); @@ -40,7 +40,7 @@ public class TabBoxMgr implements Gfo_evt_mgr_owner { public void Select(int i) {Select((TabPnlItm)itms.Get_at(i));} @gplx.Internal protected void Move_to(int src, int trg) {itms.Move_to(src, trg);} @gplx.Internal protected void Reorder(int bgn) { - for (int i = bgn; i < itms.Count(); i++) { + for (int i = bgn; i < itms.Len(); i++) { TabPnlItm itm = (TabPnlItm)itms.Get_at(i); itm.Idx_(i); } diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer.java index 8c82cd2e2..1558d6ce0 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +package gplx.gfui.controls.windows; import gplx.*; import gplx.core.lists.*; /*ComparerAble*/ import gplx.gfui.controls.elems.*; public class GfuiFocusOrderer { @@ -26,7 +26,7 @@ public class GfuiFocusOrderer { if (sub.Focus_idx() != NullVal) continue; list.Add(sub); } - list.Sort_by(comparer); + list.SortBy(comparer); for (Object subObj : list) { GfuiElem sub = (GfuiElem)subObj; diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer_tst.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer_tst.java index bdccc89d1..0ade2e5d5 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer_tst.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusOrderer_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.*; import org.junit.*; import gplx.gfui.controls.elems.*; public class GfuiFocusOrderer_tst { @Before public void setup() { @@ -74,7 +74,7 @@ public class GfuiFocusOrderer_tst { } } void tst_FocusIndxs(GfuiElem owner, List_adp list, int... expd) { - int[] actl = new int[list.Count()]; + int[] actl = new int[list.Len()]; for (int i = 0; i < actl.length; i++) { GfuiElem sub = (GfuiElem)list.Get_at(i); actl[i] = sub.UnderElem().Core().Focus_index(); diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusXferBnd.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusXferBnd.java index 1d0bbb159..c1a8e3755 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusXferBnd.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiFocusXferBnd.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +package gplx.gfui.controls.windows; import gplx.*; import gplx.core.interfaces.*; import gplx.gfui.ipts.*; import gplx.gfui.controls.elems.*; import gplx.gfui.controls.tabs.*; public class GfuiFocusXferBnd implements InjectAble, Gfo_invk { @@ -24,10 +24,10 @@ public class GfuiFocusXferBnd implements InjectAble, Gfo_invk { } @gplx.Internal protected void Focus(GfuiElem cur, boolean fwd) { List_adp allElemsInOwnerWin = List_adp_.New(); AddSubs(cur.OwnerWin(), allElemsInOwnerWin); - int curIdx = allElemsInOwnerWin.Idx_of(cur); + int curIdx = allElemsInOwnerWin.IdxOf(cur); GfuiElem target = cur; while (true) { // find next visible elem - int cycle = TabBox_.Cycle(fwd, curIdx, allElemsInOwnerWin.Count()); + int cycle = TabBox_.Cycle(fwd, curIdx, allElemsInOwnerWin.Len()); target = GfuiElem_.cast(allElemsInOwnerWin.Get_at(cycle)); if (target.Visible()) break; if (cycle == curIdx) break; // either (a) one elem in allElemsInOwnerWin or (b) n elems, and cycled back to start; break, else infinite loop diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiMenuBar.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiMenuBar.java index 8267c8a18..e8aeedb4c 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiMenuBar.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiMenuBar.java @@ -252,7 +252,7 @@ class GfuiMenuBarItmType { public String Name() {return name;} private String name; GfuiMenuBarItmType(int v, String n) {val = v; name = n; regy.Add(n, this);} public static GfuiMenuBarItmType parse(String raw) { - try {return (GfuiMenuBarItmType)regy.Get_by(raw);} + try {return (GfuiMenuBarItmType)regy.GetByOrNull(raw);} catch (Exception e) {Err_.Noop(e); throw Err_.new_parse("GfuiMenuBarItmType", raw);} } static Hash_adp regy = Hash_adp_.New(); diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiWinFocusMgr.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiWinFocusMgr.java index 4da1b769c..c808f6a81 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiWinFocusMgr.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiWinFocusMgr.java @@ -42,8 +42,8 @@ public class GfuiWinFocusMgr { } public GfuiElem Focus(boolean fwd, int cur) { int nxt = fwd - ? cur == subElems.Idx_last() ? 0 : ++cur - : cur == 0 ? subElems.Idx_last() : --cur; + ? cur == subElems.IdxLast() ? 0 : ++cur + : cur == 0 ? subElems.IdxLast() : --cur; GfuiElem elm = (GfuiElem)subElems.Get_at(nxt); elm.Focus(); return elm; @@ -61,7 +61,7 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy { this.elems = formFocusMgr.subElems; this.formFocusMgr = formFocusMgr; } - boolean elems_empty() {return elems.Count() == 0;} + boolean elems_empty() {return elems.Len() == 0;} public Component getComponentAfter(Container focusCycleRoot, Component c) { formFocusMgr.InitForm(); if (elems_empty()) return c; @@ -70,7 +70,7 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy { int idx = orig; while (true) { idx++; - if (idx == elems.Count()) + if (idx == elems.Len()) idx = 0; GfuiElem elem = null; try {elem = (GfuiElem)elems.Get_at(idx);} @@ -100,7 +100,7 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy { while (true) { idx--; if (idx == -1) - idx = elems.Count() - List_adp_.Base1; + idx = elems.Len() - List_adp_.Base1; GfuiElem elem = null; try { elem = (GfuiElem)elems.Get_at(idx); @@ -129,7 +129,7 @@ class FocusTraversalPolicy_cls_base extends FocusTraversalPolicy { } public Component getDefaultComponent(Container focusCycleRoot) {return getFirstComponent(focusCycleRoot);} public Component getFirstComponent(Container focusCycleRoot) {return elems_empty() ? focusCycleRoot : (Component)FetchAt(0).UnderElem();} - public Component getLastComponent(Container focusCycleRoot) {return elems_empty() ? focusCycleRoot : (Component)FetchAt(elems.Count() - 1).UnderElem();} + public Component getLastComponent(Container focusCycleRoot) {return elems_empty() ? focusCycleRoot : (Component)FetchAt(elems.Len() - 1).UnderElem();} GfuiElem FetchAt(int idx) {return (GfuiElem)elems.Get_at(idx);} GxwElem GxwElemOf(Component c) { if (GxwElem.class.isAssignableFrom(c.getClass())) return (GxwElem)c; diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiWinKeyCmdMgr.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiWinKeyCmdMgr.java index 9817f2777..98a575c44 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiWinKeyCmdMgr.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiWinKeyCmdMgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; +package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.ipts.*; import gplx.gfui.controls.elems.*; import gplx.gfui.controls.standards.*; import gplx.core.lists.*; import gplx.core.bits.*; public class GfuiWinKeyCmdMgr implements GfuiWinOpenAble, Gfo_invk, Gfo_evt_itm { @@ -31,8 +31,8 @@ public class GfuiWinKeyCmdMgr implements GfuiWinOpenAble, Gfo_invk, Gfo_evt_itm if (GfuiTextBox_.as_(sender) != null // is sender textBox? && !Bitmask_.Has_int(keyVal, IptKey_.Alt.Val()) // does key not have alt ) return false; // ignore keys from textbox if they do not have alt - List_adp elemList = (List_adp)listHash.Get_by(keyVal); if (elemList == null) return false; - for (int i = 0; i < elemList.Count(); i++) { + List_adp elemList = (List_adp)listHash.GetByOrNull(keyVal); if (elemList == null) return false; + for (int i = 0; i < elemList.Len(); i++) { GfuiElem elem = (GfuiElem)elemList.Get_at(i); if (elem.Visible()) elem.Click(); diff --git a/150_gfui/src/gplx/gfui/controls/windows/GfuiWin_toaster.java b/150_gfui/src/gplx/gfui/controls/windows/GfuiWin_toaster.java index 7a0e25173..cea4bbaaf 100644 --- a/150_gfui/src/gplx/gfui/controls/windows/GfuiWin_toaster.java +++ b/150_gfui/src/gplx/gfui/controls/windows/GfuiWin_toaster.java @@ -1,180 +1,198 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfui.controls.windows; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.*; -import gplx.core.envs.*; -import gplx.gfui.draws.*; import gplx.gfui.envs.*; import gplx.gfui.controls.gxws.*; import gplx.gfui.controls.elems.*; import gplx.gfui.controls.standards.*; import gplx.gfui.controls.windows.*; -public class GfuiWin_toaster extends GfuiWin { public void ShowPopup(GfuiWin owner, String text, int interval) { - this.TaskbarParkingWindowFix(owner); - ShowPopup(text, interval); - } - void ShowPopup(String text, int interval) { - if (Env_.Mode_testing()) return; - messageLabel.Text_(text); - messageLabel.SelBgn_set(0); - InitVariables(500, interval * 1000, 500); - BeginPoppingUp(); - } - void InitVariables(int growingArg, int fullyGrownArg, int timeForHidingArg) { - popupState = PopupState.FullyShrunk; - fullyGrownTimerInterval = fullyGrownArg; - int timerEvents = 0; - if (growingArg > 10) { - timerEvents = Math_.Min((growingArg / 10), fullyGrown.Height()); - growingTimerInterval = growingArg / timerEvents; - growingIncrement = fullyGrown.Height() / timerEvents; - } - else { - growingTimerInterval = 10; - growingIncrement = fullyGrown.Height(); - } - - if( timeForHidingArg > 10) { - timerEvents = Math_.Min((timeForHidingArg / 10), fullyGrown.Height()); - shrinkingTimerInterval = timeForHidingArg / timerEvents; - shrinkingIncrement = fullyGrown.Height() / timerEvents; - } - else { - shrinkingTimerInterval = 10; - shrinkingIncrement = fullyGrown.Height(); - } - } - void BeginPoppingUp() { - RectAdp screenRect = ScreenAdp_.Primary.Rect();//WorkingArea - int screenX_max = screenRect.X() + screenRect.Width(); - int val = popupState.Val(); - if (val == PopupState.FullyShrunk.Val()) { - this.Size_(SizeAdp_.new_(this.Width(), 0)); - this.Pos_(screenX_max / 2 - this.Width()/2, PopupAnchorTop); //screenRect.Bottom - 1 - // gplx.gfui.npis.FormNpi.BringToFrontDoNotFocus(gplx.gfui.npis.ControlNpi.Hwnd(this.UnderElem())); - if (!this.Visible()) { -// GfuiElem last = GfuiFocusMgr.Instance.FocusedElem(); - this.Visible_on_(); -// GfuiFocusMgr.Instance.FocusedElem_set(last); - } - timer.Interval_(growingTimerInterval); - popupState = PopupState.Growing; - } - else if (val == PopupState.Growing.Val()) { - this.Redraw(); - } - else if (val == PopupState.FullyGrown.Val()) { - timer.Interval_(fullyGrownTimerInterval); - this.Redraw(); - } - else if (val == PopupState.Shrinking.Val()) { - this.Size_(SizeAdp_.new_(this.Width(), 0)); - this.Pos_(screenX_max / 2 - this.Width()/2, PopupAnchorTop); //screenRect.Bottom - 1 - timer.Interval_(fullyGrownTimerInterval); - popupState = PopupState.FullyGrown; - } - timer.Enabled_on(); - } -// public override boolean FocusGotCbk() { -// GfuiElem last = GfuiFocusMgr.Instance.FocusedElemPrev(); -// GfuiFocusMgr.Instance.FocusedElem_set(last); -// last.Focus(); -// return false; -// } - - void WhenTick() { - int fullHeight = fullyGrown.Height(); - int val = popupState.Val(); - if (val == PopupState.Growing.Val()) { - if (this.Height() < fullHeight) - ChangeBounds(true, growingIncrement); - else { - this.Height_(fullHeight); - timer.Interval_(fullyGrownTimerInterval); - popupState = PopupState.FullyGrown; - } - } - else if (val == PopupState.FullyGrown.Val()) { - timer.Interval_(shrinkingTimerInterval); - // if ((bKeepVisibleOnMouseOver && !bIsMouseOverPopup ) || (!bKeepVisibleOnMouseOver)) { - popupState = PopupState.Shrinking; - } - else if (val == PopupState.Shrinking.Val()) { - // if (bReShowOnMouseOver && bIsMouseOverPopup) {popupState = PopupState.Growing; break;} - if (this.Height() > 2) // NOTE.Val()) { does not shrink less than 2 //this.Top > screenRect.Bottom - ChangeBounds(false, shrinkingIncrement); - else { -// this.Pos_(-500, -500); // WORKAROUND:JAVA: cannot do this.Hide() b/c it will focus ownerForm; EX: typing in textApp when musicApp moves forward - this.Visible_off_(); - popupState = PopupState.FullyShrunk; - timer.Enabled_off(); - } - } - } - static final int PopupAnchorTop = -1; // HACK: wxp1 showed obvious flickering with top edge - void ChangeBounds(boolean isGrowing, int increment) { - increment = isGrowing ? increment : -increment; - this.Pos_(this.X(), PopupAnchorTop); //this.Top - increment - this.Size_(SizeAdp_.new_(this.Width(), this.Height() + increment)); - } - @Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.win_toaster_(ctorArgs);} - - @Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) { - super.ctor_GfuiBox_base(ctorArgs); - this.fullyGrown = SizeAdp_.new_(600, 96); - this.Pos_(-100, -100); this.Size_(fullyGrown); super.Show(); super.Hide();// was 20,20; set to fullyGrown b/c of java - messageLabel = GfuiTextBox_.multi_("messageLabel", this); - messageLabel.Size_(fullyGrown.Width(), fullyGrown.Height()).ForeColor_(ColorAdp_.Green); - messageLabel.TextMgr().Font_(FontAdp.new_("Arial", 8, FontStyleAdp_.Bold)); - messageLabel.Border_on_(true); - messageLabel.Focus_able_(false); -// this.Focus_able_(false); -// this.UnderElem().Core().Focus_able_force_(false); - timer = TimerAdp.new_(this, Tmr_cmd, 3000, false); - - GxwWin formRef = (GxwWin)this.UnderElem(); - if (formRef != null) { // FIXME: nullCheck, needed for MediaPlaylistMgr_tst - formRef.Pin_set(true); - formRef.TaskbarVisible_set(false); - } - } - @Override public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Tmr_cmd)) WhenTick(); - else super.Invk(ctx, ikey, k, m); - return this; - } public static final String Tmr_cmd = "Tmr"; - GfuiTextMemo messageLabel; - TimerAdp timer; - SizeAdp fullyGrown = SizeAdp_.Zero; - int growingIncrement, shrinkingIncrement; - int growingTimerInterval, shrinkingTimerInterval, fullyGrownTimerInterval; - PopupState popupState = PopupState.FullyShrunk; - public static GfuiWin_toaster new_(GfuiWin owner) { - GfuiWin_toaster rv = new GfuiWin_toaster(); -// rv.Icon_(IconAdp.cfg_("popup")); - rv.ctor_GfuiBox_base - (new Keyval_hash() - .Add(GfuiElem_.InitKey_focusAble, false) - .Add(GfuiElem_.InitKey_ownerWin, owner) - .Add(GfuiWin_.InitKey_winType, GfuiWin_.InitKey_winType_toaster) - ); - return rv; - } -} -class PopupState { - public int Val() {return val;} int val; - public PopupState(int v) {this.val = v;} - public static final PopupState - FullyShrunk = new PopupState(1) - , Growing = new PopupState(2) - , FullyGrown = new PopupState(3) - , Shrinking = new PopupState(4) - ; -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2021 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfui.controls.windows; +import gplx.GfoMsg; +import gplx.GfsCtx; +import gplx.Keyval_hash; +import gplx.Math_; +import gplx.core.envs.Env_; +import gplx.gfui.RectAdp; +import gplx.gfui.SizeAdp; +import gplx.gfui.SizeAdp_; +import gplx.gfui.controls.elems.GfuiElem_; +import gplx.gfui.controls.gxws.GxwElem; +import gplx.gfui.controls.gxws.GxwElemFactory_; +import gplx.gfui.controls.gxws.GxwWin; +import gplx.gfui.controls.standards.GfuiTextBox_; +import gplx.gfui.controls.standards.GfuiTextMemo; +import gplx.gfui.draws.ColorAdp_; +import gplx.gfui.draws.FontAdp; +import gplx.gfui.draws.FontStyleAdp_; +import gplx.gfui.envs.ScreenAdp_; +import gplx.gfui.envs.TimerAdp; +public class GfuiWin_toaster extends GfuiWin { + public void ShowPopup(GfuiWin owner, String text, int interval) { + this.TaskbarParkingWindowFix(owner); + ShowPopup(text, interval); + } + void ShowPopup(String text, int interval) { + if (Env_.Mode_testing()) return; + messageLabel.Text_(text); + messageLabel.SelBgn_set(0); + InitVariables(500, interval * 1000, 500); + BeginPoppingUp(); + } + void InitVariables(int growingArg, int fullyGrownArg, int timeForHidingArg) { + popupState = PopupState.FullyShrunk; + fullyGrownTimerInterval = fullyGrownArg; + int timerEvents = 0; + if (growingArg > 10) { + timerEvents = Math_.Min((growingArg / 10), fullyGrown.Height()); + growingTimerInterval = growingArg / timerEvents; + growingIncrement = fullyGrown.Height() / timerEvents; + } + else { + growingTimerInterval = 10; + growingIncrement = fullyGrown.Height(); + } + + if( timeForHidingArg > 10) { + timerEvents = Math_.Min((timeForHidingArg / 10), fullyGrown.Height()); + shrinkingTimerInterval = timeForHidingArg / timerEvents; + shrinkingIncrement = fullyGrown.Height() / timerEvents; + } + else { + shrinkingTimerInterval = 10; + shrinkingIncrement = fullyGrown.Height(); + } + } + void BeginPoppingUp() { + RectAdp screenRect = ScreenAdp_.Primary.Rect();//WorkingArea + int screenX_max = screenRect.X() + screenRect.Width(); + int val = popupState.Val(); + if (val == PopupState.FullyShrunk.Val()) { + this.Size_(SizeAdp_.new_(this.Width(), 0)); + this.Pos_(screenX_max / 2 - this.Width()/2, PopupAnchorTop); //screenRect.Bottom - 1 + // gplx.gfui.npis.FormNpi.BringToFrontDoNotFocus(gplx.gfui.npis.ControlNpi.Hwnd(this.UnderElem())); + if (!this.Visible()) { +// GfuiElem last = GfuiFocusMgr.Instance.FocusedElem(); + this.Visible_on_(); +// GfuiFocusMgr.Instance.FocusedElem_set(last); + } + timer.Interval_(growingTimerInterval); + popupState = PopupState.Growing; + } + else if (val == PopupState.Growing.Val()) { + this.Redraw(); + } + else if (val == PopupState.FullyGrown.Val()) { + timer.Interval_(fullyGrownTimerInterval); + this.Redraw(); + } + else if (val == PopupState.Shrinking.Val()) { + this.Size_(SizeAdp_.new_(this.Width(), 0)); + this.Pos_(screenX_max / 2 - this.Width()/2, PopupAnchorTop); //screenRect.Bottom - 1 + timer.Interval_(fullyGrownTimerInterval); + popupState = PopupState.FullyGrown; + } + timer.Enabled_on(); + } +// public override boolean FocusGotCbk() { +// GfuiElem last = GfuiFocusMgr.Instance.FocusedElemPrev(); +// GfuiFocusMgr.Instance.FocusedElem_set(last); +// last.Focus(); +// return false; +// } + + void WhenTick() { + int fullHeight = fullyGrown.Height(); + int val = popupState.Val(); + if (val == PopupState.Growing.Val()) { + if (this.Height() < fullHeight) + ChangeBounds(true, growingIncrement); + else { + this.Height_(fullHeight); + timer.Interval_(fullyGrownTimerInterval); + popupState = PopupState.FullyGrown; + } + } + else if (val == PopupState.FullyGrown.Val()) { + timer.Interval_(shrinkingTimerInterval); + // if ((bKeepVisibleOnMouseOver && !bIsMouseOverPopup ) || (!bKeepVisibleOnMouseOver)) { + popupState = PopupState.Shrinking; + } + else if (val == PopupState.Shrinking.Val()) { + // if (bReShowOnMouseOver && bIsMouseOverPopup) {popupState = PopupState.Growing; break;} + if (this.Height() > 2) // NOTE.Val()) { does not shrink less than 2 //this.Top > screenRect.Bottom + ChangeBounds(false, shrinkingIncrement); + else { +// this.Pos_(-500, -500); // WORKAROUND:JAVA: cannot do this.Hide() b/c it will focus ownerForm; EX: typing in textApp when musicApp moves forward + this.Visible_off_(); + popupState = PopupState.FullyShrunk; + timer.Enabled_off(); + } + } + } + static final int PopupAnchorTop = -1; // HACK: wxp1 showed obvious flickering with top edge + void ChangeBounds(boolean isGrowing, int increment) { + increment = isGrowing ? increment : -increment; + this.Pos_(this.X(), PopupAnchorTop); //this.Top - increment + this.Size_(SizeAdp_.new_(this.Width(), this.Height() + increment)); + } + @Override public GxwElem UnderElem_make(Keyval_hash ctorArgs) {return GxwElemFactory_.Instance.win_toaster_(ctorArgs);} + + @Override public void ctor_GfuiBox_base(Keyval_hash ctorArgs) { + super.ctor_GfuiBox_base(ctorArgs); + this.fullyGrown = SizeAdp_.new_(600, 96); + this.Pos_(-100, -100); this.Size_(fullyGrown); super.Show(); super.Hide();// was 20,20; set to fullyGrown b/c of java + messageLabel = GfuiTextBox_.multi_("messageLabel", this); + messageLabel.Size_(fullyGrown.Width(), fullyGrown.Height()).ForeColor_(ColorAdp_.Green); + messageLabel.TextMgr().Font_(FontAdp.new_("Arial", 8, FontStyleAdp_.Bold)); + messageLabel.Border_on_(true); + messageLabel.Focus_able_(false); +// this.Focus_able_(false); +// this.UnderElem().Core().Focus_able_force_(false); + timer = TimerAdp.new_(this, Tmr_cmd, 3000, false); + + GxwWin formRef = (GxwWin)this.UnderElem(); + if (formRef != null) { // FIXME: nullCheck, needed for MediaPlaylistMgr_tst + formRef.Pin_set(true); + formRef.TaskbarVisible_set(false); + } + } + @Override public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { + if (ctx.Match(k, Tmr_cmd)) WhenTick(); + else super.Invk(ctx, ikey, k, m); + return this; + } public static final String Tmr_cmd = "Tmr"; + GfuiTextMemo messageLabel; + TimerAdp timer; + SizeAdp fullyGrown = SizeAdp_.Zero; + int growingIncrement, shrinkingIncrement; + int growingTimerInterval, shrinkingTimerInterval, fullyGrownTimerInterval; + PopupState popupState = PopupState.FullyShrunk; + public static GfuiWin_toaster new_(GfuiWin owner) { + GfuiWin_toaster rv = new GfuiWin_toaster(); +// rv.Icon_(IconAdp.cfg_("popup")); + rv.ctor_GfuiBox_base + (new Keyval_hash() + .Add(GfuiElem_.InitKey_focusAble, false) + .Add(GfuiElem_.InitKey_ownerWin, owner) + .Add(GfuiWin_.InitKey_winType, GfuiWin_.InitKey_winType_toaster) + ); + return rv; + } +} +class PopupState { + public int Val() {return val;} int val; + public PopupState(int v) {this.val = v;} + public static final PopupState + FullyShrunk = new PopupState(1) + , Growing = new PopupState(2) + , FullyGrown = new PopupState(3) + , Shrinking = new PopupState(4) + ; +} diff --git a/150_gfui/src/gplx/gfui/draws/ColorAdpCache.java b/150_gfui/src/gplx/gfui/draws/ColorAdpCache.java index 4605cd442..634852c42 100644 --- a/150_gfui/src/gplx/gfui/draws/ColorAdpCache.java +++ b/150_gfui/src/gplx/gfui/draws/ColorAdpCache.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.draws; import gplx.*; import gplx.gfui.*; +package gplx.gfui.draws; import gplx.*; public class ColorAdpCache { public java.awt.Color GetNativeColor(ColorAdp color) { - Object rv = hash.Get_by(color.Value()); if (rv != null) return (java.awt.Color)rv; + Object rv = hash.GetByOrNull(color.Value()); if (rv != null) return (java.awt.Color)rv; rv = new java.awt.Color(color.Red(), color.Green(), color.Blue(), color.Alpha()); hash.Add(color.Value(), rv); return (java.awt.Color)rv; diff --git a/150_gfui/src/gplx/gfui/draws/FontAdpCache.java b/150_gfui/src/gplx/gfui/draws/FontAdpCache.java index eebf1211c..df9d95e7a 100644 --- a/150_gfui/src/gplx/gfui/draws/FontAdpCache.java +++ b/150_gfui/src/gplx/gfui/draws/FontAdpCache.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.draws; import gplx.*; import gplx.gfui.*; +package gplx.gfui.draws; import gplx.*; import java.awt.Font; import java.awt.Toolkit; public class FontAdpCache { public Font GetNativeFont(FontAdp fontAdp) { String key = fontAdp.toString(); - Font rv = (Font)hash.Get_by(key); if (rv != null) return rv; + Font rv = (Font)hash.GetByOrNull(key); if (rv != null) return rv; if (screenResolutionInDpi == -1) ScreenResolution_set(); int fontSize = XtoJavaDpi(fontAdp.Size()); rv = new Font(fontAdp.Name(), fontAdp.Style().Val(), fontSize); diff --git a/150_gfui/src/gplx/gfui/draws/PenAdp.java b/150_gfui/src/gplx/gfui/draws/PenAdp.java index 2639e5190..cc9d318e1 100644 --- a/150_gfui/src/gplx/gfui/draws/PenAdp.java +++ b/150_gfui/src/gplx/gfui/draws/PenAdp.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.draws; import gplx.*; import gplx.gfui.*; +package gplx.gfui.draws; import gplx.*; import java.awt.BasicStroke; -import java.awt.Stroke; import gplx.core.strings.*; public class PenAdp implements Gfo_invk { public float Width() {return width;} public void Width_set(float v) {width = v; InitUnder();} float width; @@ -39,7 +38,7 @@ public class PenAdp implements Gfo_invk { } class PenAdpCache { public BasicStroke Fetch(float width) { - Object rv = hash.Get_by(width); + Object rv = hash.GetByOrNull(width); if (rv == null) { rv = new BasicStroke(width); hash.Add(width, rv); diff --git a/150_gfui/src/gplx/gfui/draws/SolidBrushAdp_.java b/150_gfui/src/gplx/gfui/draws/SolidBrushAdp_.java index 069b3160b..a03f709a1 100644 --- a/150_gfui/src/gplx/gfui/draws/SolidBrushAdp_.java +++ b/150_gfui/src/gplx/gfui/draws/SolidBrushAdp_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.draws; import gplx.*; import gplx.gfui.*; +package gplx.gfui.draws; import gplx.*; public class SolidBrushAdp_ { public static SolidBrushAdp as_(Object obj) {return obj instanceof SolidBrushAdp ? (SolidBrushAdp)obj : null;} public static SolidBrushAdp cast(Object obj) {try {return (SolidBrushAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, SolidBrushAdp.class, obj);}} @@ -24,7 +24,7 @@ public class SolidBrushAdp_ { } class SolidBrushAdpCache { public SolidBrushAdp Get_by(ColorAdp color) { - SolidBrushAdp rv = (SolidBrushAdp)hash.Get_by(color.Value()); + SolidBrushAdp rv = (SolidBrushAdp)hash.GetByOrNull(color.Value()); if (rv == null) { rv = SolidBrushAdp.new_(color); hash.Add(color.Value(), rv); diff --git a/150_gfui/src/gplx/gfui/gfxs/GfxItmList.java b/150_gfui/src/gplx/gfui/gfxs/GfxItmList.java index e294c1fb5..663ead60d 100644 --- a/150_gfui/src/gplx/gfui/gfxs/GfxItmList.java +++ b/150_gfui/src/gplx/gfui/gfxs/GfxItmList.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.gfxs; import gplx.*; import gplx.gfui.*; -public class GfxItmList extends List_adp_base { - @gplx.New public GfxItm Get_at(int i) {return (GfxItm)Get_at_base(i);} - public void Add(GfxItm gfxItm) {Add_base(gfxItm);} -} -class GfxItmListFxt { - public void tst_SubItm_count(GfxAdpMok gfx, int expd) {Tfds.Eq(expd, gfx.SubItms().Count());} - public void tst_SubItm(GfxAdpMok gfx, int i, GfxItm expd) { - GfxItm actl = gfx.SubItms().Get_at(i); - Tfds.Eq(expd, actl); - } - public static GfxItmListFxt new_() {return new GfxItmListFxt();} GfxItmListFxt() {} -} +package gplx.gfui.gfxs; import gplx.*; +public class GfxItmList extends List_adp_base { + @gplx.New public GfxItm Get_at(int i) {return (GfxItm)Get_at_base(i);} + public void Add(GfxItm gfxItm) {Add_base(gfxItm);} +} +class GfxItmListFxt { + public void tst_SubItm_count(GfxAdpMok gfx, int expd) {Tfds.Eq(expd, gfx.SubItms().Len());} + public void tst_SubItm(GfxAdpMok gfx, int i, GfxItm expd) { + GfxItm actl = gfx.SubItms().Get_at(i); + Tfds.Eq(expd, actl); + } + public static GfxItmListFxt new_() {return new GfxItmListFxt();} GfxItmListFxt() {} +} diff --git a/150_gfui/src/gplx/gfui/ipts/IptArg_.java b/150_gfui/src/gplx/gfui/ipts/IptArg_.java index fc3d782ed..47ac738a9 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptArg_.java +++ b/150_gfui/src/gplx/gfui/ipts/IptArg_.java @@ -84,12 +84,12 @@ public class IptArg_ { class IptMacro { public void Reg(String prefix, String alias, IptArg arg) { if (regy == null) Init(); - Ordered_hash list = (Ordered_hash)regy.Get_by(prefix); + Ordered_hash list = (Ordered_hash)regy.GetByOrNull(prefix); if (list == null) { list = Ordered_hash_.New(); regy.Add(prefix, list); } - list.Add_if_dupe_use_nth(alias, arg); + list.AddIfDupeUseNth(alias, arg); } void Init() { regy = Ordered_hash_.New(); @@ -107,9 +107,9 @@ class IptMacro { String[] plusAry = String_.Split(raw, "+"); String[] dotAry = String_.Split(plusAry[0], "."); String bgn = dotAry[0], end = dotAry[1]; - Ordered_hash list = (Ordered_hash)regy.Get_by(bgn); + Ordered_hash list = (Ordered_hash)regy.GetByOrNull(bgn); if (list == null) throw parse_err(raw, "list not found").Args_add("list", bgn); - IptKey rv = (IptKey)list.Get_by(end); + IptKey rv = (IptKey)list.GetByOrNull(end); if (rv == null) throw parse_err(raw, "arg not found").Args_add("arg", end); for (int i = 1; i < plusAry.length; i++) { rv = rv.Add((IptKey)IptKey_.parse(plusAry[i])); diff --git a/150_gfui/src/gplx/gfui/ipts/IptBndMgr.java b/150_gfui/src/gplx/gfui/ipts/IptBndMgr.java index 48049a9b2..6b224d71c 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptBndMgr.java +++ b/150_gfui/src/gplx/gfui/ipts/IptBndMgr.java @@ -37,7 +37,7 @@ public class IptBndMgr implements SrlAble { for (IptBndHash list : regy) if (IptEventType_.Has(bnd.EventTypes(), list.EventType())) list.Add(bnd); - for (int i = 0; i < bnd.Ipts().Count(); i++) { + for (int i = 0; i < bnd.Ipts().Len(); i++) { IptArg arg = (IptArg)bnd.Ipts().Get_at(i); chainMgr.Add(arg); } @@ -45,7 +45,7 @@ public class IptBndMgr implements SrlAble { public List_adp Cfgs() {return cfgs;} List_adp cfgs = List_adp_.New(); public void Cfgs_delAll() { List_adp del = List_adp_.New(); - for (int i = 0; i < cfgs.Count(); i++) { + for (int i = 0; i < cfgs.Len(); i++) { IptCfgPtr ptr = (IptCfgPtr)cfgs.Get_at(i); IptCfg cfg = IptCfgRegy.Instance.GetOrNew(ptr.CfgKey()); cfg.Owners_del(ptr.CfgKey()); @@ -62,7 +62,7 @@ public class IptBndMgr implements SrlAble { } del.Add(cfg); } - for (int i = 0; i < del.Count(); i++) { + for (int i = 0; i < del.Len(); i++) { IptCfg cfg = (IptCfg)del.Get_at(i); cfgs.Del(cfg); } @@ -85,7 +85,7 @@ public class IptBndMgr implements SrlAble { this.Del(old); old.Ipts().Clear(); if (ary == IptArg_.Ary_empty) return; // "unbind"; exit after deleting; DATE:2014-05-13 - old.Ipts().Add_many((Object[])ary); + old.Ipts().AddMany((Object[])ary); this.Add(old); } public void Del_by_key(String key) {Del_by(true, key);} @@ -110,7 +110,7 @@ public class IptBndMgr implements SrlAble { } } else { - if (itm_bnd.Ipts().Count() != 1) continue; // only delete if bnd has 1 ipt; should only be called by xowa which does 1 bnd per ipt + if (itm_bnd.Ipts().Len() != 1) continue; // only delete if bnd has 1 ipt; should only be called by xowa which does 1 bnd per ipt IptArg itm_ipt = (IptArg)itm_bnd.Ipts().Get_at(0); if (String_.Eq(del_key, itm_ipt.Key())) deleted.Add(itm_bnd); @@ -118,7 +118,7 @@ public class IptBndMgr implements SrlAble { } } } - int deleted_len = deleted.Count(); + int deleted_len = deleted.Len(); for (int i = 0; i < deleted_len; i++) { IptBnd bnd = (IptBnd)deleted.Get_at(i); this.Del(bnd); @@ -131,7 +131,7 @@ public class IptBndMgr implements SrlAble { list.Del(bnd); } } - for (int i = 0; i < bnd.Ipts().Count(); i++) { + for (int i = 0; i < bnd.Ipts().Len(); i++) { IptArg arg = (IptArg)bnd.Ipts().Get_at(i); chainMgr.Del(arg); } @@ -154,7 +154,7 @@ public class IptBndMgr implements SrlAble { } public Object Srl(GfoMsg owner) { GfoMsg m = GfoMsg_.srl_(owner, "mgr"); - for (int i = 0; i < hash.Count(); i++) + for (int i = 0; i < hash.Len(); i++) ((IptBnd)hash.Get_at(i)).Srl(m); return this; } @@ -183,11 +183,11 @@ public class IptBndMgr implements SrlAble { class IptBndHash implements SrlAble { private IptBndListItm wildcard_list; public IptEventType EventType() {return eventType;} IptEventType eventType; - public int Count() {return hash.Count();} - public IptBndListItm Get_by(String key) {return wildcard_list == null ? (IptBndListItm)hash.Get_by(key) : wildcard_list;} + public int Count() {return hash.Len();} + public IptBndListItm Get_by(String key) {return wildcard_list == null ? (IptBndListItm)hash.GetByOrNull(key) : wildcard_list;} public IptBndListItm Get_at(int i) {return (IptBndListItm)hash.Get_at(i);} public void Add(IptBnd bnd) { - for (int i = 0; i < bnd.Ipts().Count(); i++) { + for (int i = 0; i < bnd.Ipts().Len(); i++) { IptArg arg = (IptArg)bnd.Ipts().Get_at(i); if (!IptArg_.EventType_match(arg, eventType)) continue; // bnd may have multiple ipts of different evTypes; only add bnd if evType matches if (String_.Eq(arg.Key(), IptArg_.Wildcard_key)) { @@ -195,7 +195,7 @@ class IptBndHash implements SrlAble { wildcard_list.Add(bnd); } else { - IptBndListItm itm = (IptBndListItm)hash.Get_by(arg.Key()); + IptBndListItm itm = (IptBndListItm)hash.GetByOrNull(arg.Key()); if (itm == null) { itm = new IptBndListItm(arg.Key()); hash.Add(arg.Key(), itm); @@ -205,7 +205,7 @@ class IptBndHash implements SrlAble { } } public void Del(IptBnd bnd) { - for (int i = 0; i < bnd.Ipts().Count(); i++) { + for (int i = 0; i < bnd.Ipts().Len(); i++) { IptArg arg = (IptArg)bnd.Ipts().Get_at(i); if (!IptArg_.EventType_match(arg, eventType)) continue; // bnd may have multiple ipts of different evTypes; only add bnd if evType matches hash.Del(arg.Key()); @@ -213,7 +213,7 @@ class IptBndHash implements SrlAble { } public Object Srl(GfoMsg owner) { GfoMsg m = GfoMsg_.srl_(owner, "list").Add("eventType", eventType.Name()); - for (int i = 0; i < hash.Count(); i++) + for (int i = 0; i < hash.Len(); i++) ((IptBndListItm)hash.Get_at(i)).Srl(m); return this; } @@ -222,11 +222,11 @@ class IptBndHash implements SrlAble { } class IptBndListItm implements SrlAble { public String IptKey() {return iptKey;} private String iptKey; - public int Count() {return list.Count();} + public int Count() {return list.Len();} public IptBnd Get_at(int i) {return (IptBnd)list.Get_at(i);} - public void Add(IptBnd bnd) {list.Add_at(0, bnd);} + public void Add(IptBnd bnd) {list.AddAt(0, bnd);} public boolean Exec(IptEventData evData) { - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { IptBnd bnd = (IptBnd)list.Get_at(i); try {bnd.Exec(evData);} catch (Exception exc) { @@ -239,7 +239,7 @@ class IptBndListItm implements SrlAble { } public Object Srl(GfoMsg owner) { GfoMsg m = GfoMsg_.srl_(owner, "itm").Add("iptKey", iptKey); - for (int i = 0; i < list.Count(); i++) + for (int i = 0; i < list.Len(); i++) ((IptBnd)list.Get_at(i)).Srl(m); return this; } @@ -250,7 +250,7 @@ class IptArgChainMgr { public void Clear() {regy.Clear();} public String Process(IptArg arg) { // if (String_.Eq(arg.Key(), "key_7")) return ""; - Hash_adp hash = (Hash_adp)active.Get_by(arg.Key()); + Hash_adp hash = (Hash_adp)active.GetByOrNull(arg.Key()); if (hash == null) { active = regy; String r = activeKey; @@ -279,7 +279,7 @@ class IptArgChainMgr { void Add_recur(Hash_adp cur, IptArg[] ary, int i) { if (i == ary.length - 1) return; // -1 b/c last should not be registered; ex: key.a,key.b should register key.a only IptArg ipt = ary[i]; - Hash_adp next = (Hash_adp)cur.Get_by(ipt.Key()); + Hash_adp next = (Hash_adp)cur.GetByOrNull(ipt.Key()); if (next == null) { next = Hash_adp_.New(); cur.Add(ipt.Key(), next); @@ -292,12 +292,12 @@ class IptArgChainMgr { cur.Del(ipt.Key()); return; // -1 b/c last should not be registered; ex: key.a,key.b should register key.a only } - Hash_adp next = (Hash_adp)cur.Get_by(ipt.Key()); + Hash_adp next = (Hash_adp)cur.GetByOrNull(ipt.Key()); if (next == null) { return; } Del_recur(next, ary, i + 1); - if (cur.Count() == 1) + if (cur.Len() == 1) cur.Clear(); } Hash_adp regy = Hash_adp_.New(); diff --git a/150_gfui/src/gplx/gfui/ipts/IptBnd_.java b/150_gfui/src/gplx/gfui/ipts/IptBnd_.java index 8f069dc9b..fa837fa90 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptBnd_.java +++ b/150_gfui/src/gplx/gfui/ipts/IptBnd_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.ipts; import gplx.*; import gplx.gfui.*; +package gplx.gfui.ipts; import gplx.*; import gplx.core.strings.*; public class IptBnd_ { public static void msg_(IptCfg cfg, IptBndsOwner box, String bndKey, GfoMsg m, IptArg... ipt) {bld_(cfg, box, (Gfo_invk)box, bndKey, m, ipt);} @@ -34,7 +34,7 @@ public class IptBnd_ { public static Object Srl(GfoMsg owner, IptBnd bnd) {GfoMsg_.srl_(owner, "bnd").Add("key", bnd.Key()).Add("ipt", AryXtoStr(bnd.Ipts())); return bnd;} static String AryXtoStr(List_adp ary) { String_bldr sb = String_bldr_.new_(); - for (int i = 0; i < ary.Count(); i++) + for (int i = 0; i < ary.Len(); i++) sb.Add_spr_unless_first(((IptArg)ary.Get_at(i)).Key(), "|", i); return sb.To_str(); } diff --git a/150_gfui/src/gplx/gfui/ipts/IptCfg.java b/150_gfui/src/gplx/gfui/ipts/IptCfg.java index c3432465e..dc0a9ea2e 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptCfg.java +++ b/150_gfui/src/gplx/gfui/ipts/IptCfg.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.ipts; import gplx.*; import gplx.gfui.*; +package gplx.gfui.ipts; import gplx.*; public interface IptCfg extends Gfo_invk { String CfgKey(); Object NewByKey(Object o); @@ -24,7 +24,7 @@ public interface IptCfg extends Gfo_invk { class IptCfg_base implements IptCfg { public String CfgKey() {return cfgKey;} private String cfgKey; public IptCfgItm GetOrDefaultArgs(String bndKey, GfoMsg defaultMsg, IptArg[] defaultArgs) { - IptCfgItm rv = (IptCfgItm)hash.Get_by(bndKey); + IptCfgItm rv = (IptCfgItm)hash.GetByOrNull(bndKey); if (rv == null) { // no cfg rv = IptCfgItm.new_().Key_(bndKey).Ipt_(List_adp_.New_by_many((Object[])defaultArgs)).Msg_(defaultMsg); hash.Add(bndKey, rv); @@ -44,7 +44,7 @@ class IptCfg_base implements IptCfg { return rv; } boolean Dif(List_adp lhs, IptArg[] rhs) { - if (lhs.Count() != rhs.length) return true; + if (lhs.Len() != rhs.length) return true; for (int i = 0; i < rhs.length; i++) { IptArg lhsArg = (IptArg)lhs.Get_at(i); IptArg rhsArg = rhs[i]; @@ -53,16 +53,16 @@ class IptCfg_base implements IptCfg { return false; } void Change(String bndKey, IptArg[] ary) { - List_adp list = (List_adp)owners.Get_by(bndKey); + List_adp list = (List_adp)owners.GetByOrNull(bndKey); if (list == null) return; - for (int i = 0; i < list.Count(); i++) { + for (int i = 0; i < list.Len(); i++) { IptBndsOwner owner = (IptBndsOwner)list.Get_at(i); owner.IptBnds().Change(bndKey, ary); } } public void Owners_del(String bndKey) {owners.Del(bndKey);} public void Owners_add(String bndKey, IptBndsOwner owner) { - List_adp list = (List_adp)owners.Get_by(bndKey); + List_adp list = (List_adp)owners.GetByOrNull(bndKey); if (list == null) { list = List_adp_.New(); owners.Add(bndKey, list); diff --git a/150_gfui/src/gplx/gfui/ipts/IptCfgRegy.java b/150_gfui/src/gplx/gfui/ipts/IptCfgRegy.java index 51a6c10fe..ff167c744 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptCfgRegy.java +++ b/150_gfui/src/gplx/gfui/ipts/IptCfgRegy.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.ipts; import gplx.*; import gplx.gfui.*; +package gplx.gfui.ipts; import gplx.*; public class IptCfgRegy implements Gfo_invk { public void Clear() {hash.Clear();} public IptCfg GetOrNew(String k) { - IptCfg rv = (IptCfg)hash.Get_by(k); + IptCfg rv = (IptCfg)hash.GetByOrNull(k); if (rv == null) { rv = (IptCfg)IptCfg_base.HashProto.NewByKey(k); hash.Add(k, rv); diff --git a/150_gfui/src/gplx/gfui/ipts/IptKeyStrMgr.java b/150_gfui/src/gplx/gfui/ipts/IptKeyStrMgr.java index f290b7298..1ba039183 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptKeyStrMgr.java +++ b/150_gfui/src/gplx/gfui/ipts/IptKeyStrMgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.gfui.ipts; import gplx.*; import gplx.gfui.*; +package gplx.gfui.ipts; import gplx.*; class IptKeyStrMgr { public IptKey FetchByKeyPress(int charVal) { if (literals == null) Init(); @@ -22,12 +22,12 @@ class IptKeyStrMgr { } public String To_str(IptKey key) { if (literals == null) Init(); - Object rv = literals.Get_by(key.Val()); + Object rv = literals.GetByOrNull(key.Val()); return rv == null ? String_.Empty : (String)rv; } public void XtoIptKeyAry(List_adp list) { if (literals == null) Init(); - for (int i = 0; i < keys.Count(); i++) + for (int i = 0; i < keys.Len(); i++) list.Add((IptKey)keys.Get_at(i)); } void Init() {// default to US style keyboard diff --git a/150_gfui/src/gplx/gfui/ipts/IptKey_.java b/150_gfui/src/gplx/gfui/ipts/IptKey_.java index a2a1d2f9a..ce992aa2a 100644 --- a/150_gfui/src/gplx/gfui/ipts/IptKey_.java +++ b/150_gfui/src/gplx/gfui/ipts/IptKey_.java @@ -57,8 +57,8 @@ public class IptKey_ { list.Add(key); // add keypad numbers - list.Add_many(IptKey_.Numpad_0, IptKey_.Numpad_1, IptKey_.Numpad_2, IptKey_.Numpad_3, IptKey_.Numpad_4); - list.Add_many(IptKey_.Numpad_5, IptKey_.Numpad_6, IptKey_.Numpad_7, IptKey_.Numpad_8, IptKey_.Numpad_9); + list.AddMany(IptKey_.Numpad_0, IptKey_.Numpad_1, IptKey_.Numpad_2, IptKey_.Numpad_3, IptKey_.Numpad_4); + list.AddMany(IptKey_.Numpad_5, IptKey_.Numpad_6, IptKey_.Numpad_7, IptKey_.Numpad_8, IptKey_.Numpad_9); IptKeyStrMgr.Instance.XtoIptKeyAry(list); for (IptKey key : del) @@ -69,15 +69,15 @@ public class IptKey_ { List_adp list = List_adp_.New(); // add keypad numbers - list.Add_many(IptKey_.Numpad_0, IptKey_.Numpad_1, IptKey_.Numpad_2, IptKey_.Numpad_3, IptKey_.Numpad_4); - list.Add_many(IptKey_.Numpad_5, IptKey_.Numpad_6, IptKey_.Numpad_7, IptKey_.Numpad_8, IptKey_.Numpad_9); + list.AddMany(IptKey_.Numpad_0, IptKey_.Numpad_1, IptKey_.Numpad_2, IptKey_.Numpad_3, IptKey_.Numpad_4); + list.AddMany(IptKey_.Numpad_5, IptKey_.Numpad_6, IptKey_.Numpad_7, IptKey_.Numpad_8, IptKey_.Numpad_9); for (IptKey key : add) list.Add(key); IptKeyStrMgr.Instance.XtoIptKeyAry(list); for (IptKey key : del) list.Del(key); - return (IptKey[])list.To_ary(IptKey.class); + return (IptKey[])list.ToAry(IptKey.class); } private static IptKey get_or_new_(int val) { IptKey rv = (IptKey)enm_mgr.Get(val); @@ -235,7 +235,7 @@ public class IptKey_ { int len = ary.length; for (int i = 0; i < len; ++i) { IptKey key = ary[i]; - hash.Add_if_dupe_use_nth(Int_obj_ref.New(key.Val()), key); + hash.AddIfDupeUseNth(Int_obj_ref.New(key.Val()), key); } } public static String To_str(int orig_val) { @@ -251,7 +251,7 @@ public class IptKey_ { if (temp_val == 0) return rv; rv += "+"; } - IptKey key = (IptKey)IptKey_.Ui_str_hash().Get_by(Int_obj_ref.New(temp_val)); + IptKey key = (IptKey)IptKey_.Ui_str_hash().GetByOrNull(Int_obj_ref.New(temp_val)); String key_str = key == null ? "key.#" + Int_.To_str(temp_val) : key.Key(); // Tfds.Write(rv + key_str, orig_val, temp_val, mod_c, mod_a, mod_s); return rv + key_str; diff --git a/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java b/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java index ef1fac8bd..be7ae3eb4 100644 --- a/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java +++ b/150_gfui/src/gplx/gfui/kits/core/Swt_kit.java @@ -1,21 +1,22 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.gfui.kits.core; import gplx.*; import gplx.gfui.*; import gplx.gfui.kits.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.gfui.kits.core; import gplx.*; import gplx.core.brys.fmtrs.*; -import gplx.gfui.imgs.*; import gplx.gfui.controls.elems.*; import gplx.gfui.controls.standards.*; import gplx.gfui.controls.customs.*; import gplx.gfui.controls.windows.*; +import gplx.gfui.imgs.*; +import gplx.gfui.controls.standards.*; import gplx.gfui.kits.swts.*; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; @@ -23,38 +24,19 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.MessageBox; -import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.ToolItem; -import org.eclipse.swt.browser.Browser; -import org.eclipse.swt.dnd.Clipboard; -import org.eclipse.swt.dnd.TextTransfer; -import org.eclipse.swt.dnd.Transfer; -import org.eclipse.swt.events.DisposeEvent; -import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Cursor; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.FontData; -import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Button; - import gplx.core.threads.*; import gplx.gfui.controls.customs.GfuiStatusBox; import gplx.gfui.controls.customs.GfuiStatusBox_; import gplx.gfui.controls.elems.GfuiElem; -import gplx.gfui.controls.gxws.GxwCore_base; import gplx.gfui.controls.gxws.GxwTextFld; -import gplx.gfui.controls.standards.*; import gplx.gfui.controls.windows.GfoConsoleWin; import gplx.gfui.controls.windows.GfuiWin; import gplx.gfui.controls.windows.GfuiWin_; import gplx.gfui.draws.*; -import gplx.gfui.imgs.*; public class Swt_kit implements Gfui_kit { private final Keyval_hash ctor_args = new Keyval_hash(); private final Keyval_hash ctor_args_null = new Keyval_hash(); private final Hash_adp kit_args = Hash_adp_.New(); private Swt_msg_wkr_stop msg_wkr_stop; @@ -71,7 +53,7 @@ public class Swt_kit implements Gfui_kit { public void Kit_mode_(int v) {synchronized (thread_lock) {mode = v;}} public boolean Kit_mode__ready() {return Kit_mode() == Swt_kit_mode.Tid_ready;} public boolean Kit_mode__term() {return Kit_mode() == Swt_kit_mode.Tid_term;} - public boolean Kit_sync_cmd_exists() {synchronized (thread_lock) {return sync_cmd_list.Count() != 0;}} private final List_adp sync_cmd_list = List_adp_.New(); + public boolean Kit_sync_cmd_exists() {synchronized (thread_lock) {return sync_cmd_list.Len() != 0;}} private final List_adp sync_cmd_list = List_adp_.New(); public void Kit_sync_cmd_add(Swt_gui_cmd cmd) {synchronized (thread_lock) {sync_cmd_list.Add(cmd);}} public void Kit_sync_cmd_del(Swt_gui_cmd cmd) {synchronized (thread_lock) {sync_cmd_list.Del(cmd);}} public Gfo_invk_cmd Kit_term_cbk() {return term_cbk;} public void Kit_term_cbk_(Gfo_invk_cmd v) {this.term_cbk = v;} private Gfo_invk_cmd term_cbk = Gfo_invk_cmd.Noop; @@ -117,7 +99,7 @@ public class Swt_kit implements Gfui_kit { return; } // add kv to widget_cfg_hash; new controls will get properties from cfg_hash - Keyval_hash widget_cfg_hash = (Keyval_hash)kit_args.Get_by(type); + Keyval_hash widget_cfg_hash = (Keyval_hash)kit_args.GetByOrNull(type); if (widget_cfg_hash == null) { widget_cfg_hash = new Keyval_hash(); kit_args.Add(type, widget_cfg_hash); @@ -169,7 +151,7 @@ public class Swt_kit implements Gfui_kit { public Gfui_html New_html(String key, GfuiElem owner, Keyval... args) { ctor_args.Clear(); // check cfg for browser type - Keyval_hash html_cfg_args = (Keyval_hash)kit_args.Get_by(Gfui_kit_.Cfg_HtmlBox); + Keyval_hash html_cfg_args = (Keyval_hash)kit_args.GetByOrNull(Gfui_kit_.Cfg_HtmlBox); if (html_cfg_args != null) { Keyval browser_type = html_cfg_args.Get_kvp_or_null(Cfg_Html_BrowserType); if (browser_type != null) ctor_args.Add(browser_type); diff --git a/150_gfui/src/gplx/gfui/layouts/GftBand.java b/150_gfui/src/gplx/gfui/layouts/GftBand.java index eac1c520d..eab3f6b70 100644 --- a/150_gfui/src/gplx/gfui/layouts/GftBand.java +++ b/150_gfui/src/gplx/gfui/layouts/GftBand.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfui.layouts; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.elems.*; public class GftBand { @@ -42,22 +42,22 @@ public class GftBand { int x = 0; y = grid.Bands_dir().GetValByDir(y - h, y); int availX = owner.Gft_w(); - for (int i = 0; i < cells.Count(); i++) { + for (int i = 0; i < cells.Len(); i++) { GftCell cell = (GftCell)cells.Get_at(i); if (cell.Len0().Key() == GftSizeCalc_abs.KEY) { GftSizeCalc_abs calc = (GftSizeCalc_abs)cell.Len0(); availX -= calc.Val(); } else if (cell.Len0().Key() == GftSizeCalc_var.KEY) { - if (i >= items.Count()) continue; + if (i >= items.Len()) continue; GftItem item = (GftItem)items.Get_at(i); GfuiElem elem = GfuiElem_.as_(item); availX -= elem == null ? item.Gft_w() : elem.Width(); } } - for (int i = 0; i < items.Count(); i++) { + for (int i = 0; i < items.Len(); i++) { GftItem item = (GftItem)items.Get_at(i); - GftCell cell = i >= cells.Count() ? cell_dfl : (GftCell)cells.Get_at(i); + GftCell cell = i >= cells.Len() ? cell_dfl : (GftCell)cells.Get_at(i); int w = cell.Len0().Calc(grid, this, owner, item, availX); item.Gft_rect_(RectAdp_.new_(x, y, w, h)); // Tfds.Write(item.Key_of_GfuiElem(), w, h, x, y); @@ -69,7 +69,7 @@ public class GftBand { GftBand rv = new GftBand(); rv.grid = grid; rv.key = key; rv.idx = idx; rv.cell_dfl = cell_dfl.Clone(); rv.len1 = this.len1.Clone(); - for (int i = 0; i < cells.Count(); i++) { + for (int i = 0; i < cells.Len(); i++) { GftCell cell = (GftCell)cells.Get_at(i); rv.cells.Add(cell.Clone()); } diff --git a/150_gfui/src/gplx/gfui/layouts/GftGrid.java b/150_gfui/src/gplx/gfui/layouts/GftGrid.java index ed8290212..775f9cbd6 100644 --- a/150_gfui/src/gplx/gfui/layouts/GftGrid.java +++ b/150_gfui/src/gplx/gfui/layouts/GftGrid.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfui.layouts; import gplx.*; import gplx.gfui.*; import gplx.gfui.controls.elems.*; public class GftGrid { @@ -22,39 +22,39 @@ public class GftGrid { public void Clear() {bands.Clear(); subLyts.Clear(); bandDir = DirInt.Fwd;} public DirInt Bands_dir() {return bandDir;} public GftGrid Bands_dir_(DirInt v) {bandDir = v; return this;} DirInt bandDir = DirInt.Fwd; public GftGrid SubLyts_get(String key) { - for (int i = 0; i < subLyts.Count(); i++) { + for (int i = 0; i < subLyts.Len(); i++) { GftGrid grid = (GftGrid)subLyts.Get_at(i); if (String_.Eq(key, grid.Key())) return grid; } return null; } public GftBand Bands_get(String key) { - for (int i = 0; i < bands.Count(); i++) { + for (int i = 0; i < bands.Len(); i++) { GftBand band = (GftBand)bands.Get_at(i); if (String_.Eq(key, band.Key())) return band; } return null; } public GftGrid Bands_add(GftBand band) { - bands.Add(band.Clone(this, bands.Count())); + bands.Add(band.Clone(this, bands.Len())); return this; } public GftGrid Bands_add(int count, GftBand band) { for (int i = 0; i < count; i++) { - GftBand copy = band.Clone(this, bands.Count() + i); + GftBand copy = band.Clone(this, bands.Len() + i); bands.Add(copy); } return this; } - @gplx.Internal protected void Bands_delAt(int i) {bands.Del_at(i);} + @gplx.Internal protected void Bands_delAt(int i) {bands.DelAt(i);} public boolean Bands_has(String key) {return Bands_indexOf(key) != List_adp_.Not_found;} public void Bands_del(String key) { int idx = Bands_indexOf(key); - if (idx != List_adp_.Not_found) bands.Del_at(idx); + if (idx != List_adp_.Not_found) bands.DelAt(idx); } int Bands_indexOf(String key) { int curIdx = List_adp_.Not_found; - for (int i = 0; i < bands.Count(); i++) { + for (int i = 0; i < bands.Len(); i++) { GftBand band = (GftBand)bands.Get_at(i); if (String_.Eq(key, band.Key())) { curIdx = i; @@ -78,7 +78,7 @@ public class GftGrid { } void ExecLyts(GftItem owner, GftItem[] ary) { int idx = 0; - for (int i = 0; i < subLyts.Count(); i++) { + for (int i = 0; i < subLyts.Len(); i++) { GftGrid subGrid = (GftGrid)subLyts.Get_at(i); GftItem[] subAry = new GftItem[subGrid.Bands_cellCount()]; for (int j = 0; j < subAry.length; j++) { @@ -88,11 +88,11 @@ public class GftGrid { } } void ExecBands(GftItem owner, GftItem[] ary) { - if (bands.Count() == 0) return; + if (bands.Len() == 0) return; int availY = owner.Gft_h(); GftBand band = null; - int bgn = bandDir.GetValByDir(bands.Idx_last(), 0); - int end = bandDir.GetValByDir(-1, bands.Count()); + int bgn = bandDir.GetValByDir(bands.IdxLast(), 0); + int end = bandDir.GetValByDir(-1, bands.Len()); for (int i = bgn; i != end; i += bandDir.Val()) { band = (GftBand)bands.Get_at(i); if (band.Len1().Key() == GftSizeCalc_abs.KEY) { @@ -106,11 +106,11 @@ public class GftGrid { int y = bandDir.GetValByDir(owner.Gft_h(), 0); for (int itmIdx = 0; itmIdx < ary.length; itmIdx++) { GftItem itm = ary[itmIdx]; - if (band.Items().Count() >= band.Cells().Count()) { + if (band.Items().Len() >= band.Cells().Len()) { int h = band.Len1().Calc(this, band, owner, itm, availY); band.Calc(owner, y, h); y += h * bandDir.Val(); - if (bandIdx + 1 >= bands.Count()) throw Err_.new_wo_type("error retrieving band", "owner", owner.Key_of_GfuiElem(), "item", itm.Key_of_GfuiElem(), "bandIdx", bandIdx + 1, "count", bands.Count()); + if (bandIdx + 1 >= bands.Len()) throw Err_.new_wo_type("error retrieving band", "owner", owner.Key_of_GfuiElem(), "item", itm.Key_of_GfuiElem(), "bandIdx", bandIdx + 1, "count", bands.Len()); band = (GftBand)bands.Get_at(++bandIdx); band.Items().Clear(); } @@ -120,9 +120,9 @@ public class GftGrid { } int Bands_cellCount() { int rv = 0; - for (int i = 0; i < bands.Count(); i++) { + for (int i = 0; i < bands.Len(); i++) { GftBand band = (GftBand)bands.Get_at(i); - rv += band.Cells().Count(); + rv += band.Cells().Len(); } return rv; } diff --git a/150_gfui/src/gplx/gfui/layouts/GftGrid_fx.java b/150_gfui/src/gplx/gfui/layouts/GftGrid_fx.java index 3b4ca6bac..dba52f19b 100644 --- a/150_gfui/src/gplx/gfui/layouts/GftGrid_fx.java +++ b/150_gfui/src/gplx/gfui/layouts/GftGrid_fx.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.gfui.layouts; import gplx.*; import gplx.gfui.*; class GftGrid_fx { public GftItem Owner() {return owner;} GftItem owner; @@ -49,7 +49,7 @@ class GftGrid_fx { public GftGrid_fx ini_Set(int idx, GftBand orig) {return ini_Set(idx, idx, orig);} public GftGrid_fx ini_Set(int bgn, int end, GftBand orig) {curGrid.Bands_set(bgn, end, orig); return this;} public GftGrid_fx run() { - GftItem[] ary = (GftItem[])itms.To_ary(GftItem.class); + GftItem[] ary = (GftItem[])itms.ToAry(GftItem.class); grid.Exec(owner, ary); return this; } diff --git a/400_xowa/src/gplx/core/caches/Gfo_cache_mgr.java b/400_xowa/src/gplx/core/caches/Gfo_cache_mgr.java index e475680bc..f9f4d8601 100644 --- a/400_xowa/src/gplx/core/caches/Gfo_cache_mgr.java +++ b/400_xowa/src/gplx/core/caches/Gfo_cache_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.caches; import gplx.*; import gplx.core.*; +package gplx.core.caches; import gplx.*; public class Gfo_cache_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); private final List_adp tmp_delete = List_adp_.New(); @@ -27,11 +27,11 @@ public class Gfo_cache_mgr { } } public Object Get_by_key(byte[] key) { - Object o = hash.Get_by(key); + Object o = hash.GetByOrNull(key); return o == null ? null : ((Gfo_cache_data)o).Val_and_update(); } public void Add_replace(byte[] key, Rls_able val, int size) { - Object o = hash.Get_by(key); + Object o = hash.GetByOrNull(key); if (o == null) Add(key, val, size); else { diff --git a/400_xowa/src/gplx/core/caches/Gfo_cache_mgr_base.java b/400_xowa/src/gplx/core/caches/Gfo_cache_mgr_base.java index 5adbdd3f4..1e63c48b4 100644 --- a/400_xowa/src/gplx/core/caches/Gfo_cache_mgr_base.java +++ b/400_xowa/src/gplx/core/caches/Gfo_cache_mgr_base.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.caches; import gplx.*; import gplx.core.*; +package gplx.core.caches; import gplx.*; public class Gfo_cache_mgr_base { private final Ordered_hash hash = Ordered_hash_.New_bry(); public int Compress_max() {return compress_max;} public void Compress_max_(int v) {compress_max = v;} private int compress_max = 16; public int Compress_to() {return compress_to;} public void Compress_to_(int v) {compress_to = v;} private int compress_to = 8; protected Object Base_get_or_null(byte[] key) { - Object rv_obj = hash.Get_by(key); + Object rv_obj = hash.GetByOrNull(key); return rv_obj == null ? null : ((Gfo_cache_itm_bry)rv_obj).Val(); } protected void Base_add(byte[] key, Object val) { - if (hash.Count() >= compress_max) Compress(); + if (hash.Len() >= compress_max) Compress(); Gfo_cache_itm_bry itm = new Gfo_cache_itm_bry(key, val); hash.Add(key, itm); } @@ -32,7 +32,7 @@ public class Gfo_cache_mgr_base { } public void Compress() { hash.Sort_by(Gfo_cache_itm_comparer.Touched_asc); - int del_len = hash.Count() - compress_to; + int del_len = hash.Len() - compress_to; List_adp del_list = List_adp_.New(); for (int i = 0; i < del_len; i++) { Gfo_cache_itm_bry itm = (Gfo_cache_itm_bry)hash.Get_at(i); diff --git a/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr.java b/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr.java index f1141a868..4ec7dbb12 100644 --- a/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr.java +++ b/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.consoles; import gplx.*; import gplx.core.*; +package gplx.core.consoles; import gplx.*; public class Gfo_cmd_arg_mgr { private final Ordered_hash hash = Ordered_hash_.New(); private final List_adp err_list = List_adp_.New(), tmp_vals = List_adp_.New(); @@ -23,7 +23,7 @@ public class Gfo_cmd_arg_mgr { this.Clear(); } public void Clear() { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Gfo_cmd_arg_itm itm = (Gfo_cmd_arg_itm)hash.Get_at(i); itm.Clear(); @@ -31,17 +31,17 @@ public class Gfo_cmd_arg_mgr { err_list.Clear(); } public Gfo_cmd_arg_mgr Reg_many(Gfo_cmd_arg_itm... ary) {for (Gfo_cmd_arg_itm itm : ary) Reg(itm); return this;} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public boolean Has(String k) { - Gfo_cmd_arg_itm arg = (Gfo_cmd_arg_itm)hash.Get_by(k); + Gfo_cmd_arg_itm arg = (Gfo_cmd_arg_itm)hash.GetByOrNull(k); return arg != null && arg.Dirty(); } public boolean Get_by_as_bool(String k) { - Gfo_cmd_arg_itm arg = (Gfo_cmd_arg_itm)hash.Get_by(k); + Gfo_cmd_arg_itm arg = (Gfo_cmd_arg_itm)hash.GetByOrNull(k); return arg != null && arg.Val() != null && arg.Val_as_bool(); } public Gfo_cmd_arg_itm Get_at(int i) {return (Gfo_cmd_arg_itm)hash.Get_at(i);} - public Gfo_cmd_arg_itm Get_by(String key) {return (Gfo_cmd_arg_itm)hash.Get_by(key);} + public Gfo_cmd_arg_itm Get_by(String key) {return (Gfo_cmd_arg_itm)hash.GetByOrNull(key);} public void Parse(String[] orig_ary) { this.Clear(); this.orig_ary = orig_ary; int orig_len = orig_ary.length; @@ -53,13 +53,13 @@ public class Gfo_cmd_arg_mgr { boolean itm_is_key = String_.Has_at_bgn(itm, Key_prefix); // has "--" -> is key if ( cur_itm != null // pending itm && (itm_is_key || done)) { // cur arg is key ("--key2"), or all done - cur_itm.Val_(Gfo_cmd_arg_mgr_.Parse_ary_to_str(this, cur_itm.Val_tid(), tmp_vals.To_str_ary_and_clear())); + cur_itm.Val_(Gfo_cmd_arg_mgr_.Parse_ary_to_str(this, cur_itm.Val_tid(), tmp_vals.ToStrAryAndClear())); cur_itm = null; } if (done) break; if (itm_is_key) { String key = String_.Mid(itm, prefix_len); - Object o = hash.Get_by(key); if (o == null) {Errs__add(Gfo_cmd_arg_mgr_.Err__key__unknown , key); continue;} + Object o = hash.GetByOrNull(key); if (o == null) {Errs__add(Gfo_cmd_arg_mgr_.Err__key__unknown , key); continue;} cur_itm = (Gfo_cmd_arg_itm)o; if (cur_itm.Dirty()) {Errs__add(Gfo_cmd_arg_mgr_.Err__key__duplicate , key); continue;} } else { @@ -69,7 +69,7 @@ public class Gfo_cmd_arg_mgr { } // calc .Reqd and .Dflt - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { cur_itm = (Gfo_cmd_arg_itm)hash.Get_at(i); if (!cur_itm.Dirty()) { // arg not passed @@ -80,9 +80,9 @@ public class Gfo_cmd_arg_mgr { } } } - public boolean Errs__exist() {return err_list.Count() > 0;} + public boolean Errs__exist() {return err_list.Len() > 0;} public void Errs__add(String key, String val) {err_list.Add(key + ": " + val);} - public String[] Errs__to_str_ary() {return err_list.To_str_ary();} + public String[] Errs__to_str_ary() {return err_list.ToStrAry();} public Gfo_cmd_arg_itm[] To_ary() {return (Gfo_cmd_arg_itm[])hash.To_ary(Gfo_cmd_arg_itm.class);} private void Reg(Gfo_cmd_arg_itm defn) {hash.Add(defn.Key(), defn);} public static final String Key_prefix = "--"; private static final int prefix_len = 2; diff --git a/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java b/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java index bf1201cbb..fdf343260 100644 --- a/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java +++ b/400_xowa/src/gplx/core/consoles/Gfo_cmd_arg_mgr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.consoles; import gplx.*; import gplx.core.*; +package gplx.core.consoles; import gplx.*; import org.junit.*; import gplx.core.tests.*; import gplx.core.envs.*; public class Gfo_cmd_arg_mgr_tst { @Before public void init() {fxt.Clear();} private final Gfo_cmd_arg_mgr_fxt fxt = new Gfo_cmd_arg_mgr_fxt(); @@ -100,7 +100,7 @@ class Gfo_cmd_arg_mgr_fxt { return this; } public Gfo_cmd_arg_mgr_fxt Test_write(String... expd) { - Tfds.Eq_ary_str(expd, ((Gfo_usr_dlg__gui_mock)usr_dlg.Gui_wkr()).Msgs().To_str_ary_and_clear()); + Tfds.Eq_ary_str(expd, ((Gfo_usr_dlg__gui_mock)usr_dlg.Gui_wkr()).Msgs().ToStrAryAndClear()); return this; } public void Test_val_as_url_rel_dir_or(String root_dir, String dir_spr, String val, String expd) { diff --git a/400_xowa/src/gplx/core/data_stores/Gfo_data_store.java b/400_xowa/src/gplx/core/data_stores/Gfo_data_store.java index a3f57f8c0..52a106b80 100644 --- a/400_xowa/src/gplx/core/data_stores/Gfo_data_store.java +++ b/400_xowa/src/gplx/core/data_stores/Gfo_data_store.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.data_stores; import gplx.*; import gplx.core.*; +package gplx.core.data_stores; import gplx.*; public class Gfo_data_store { private final Hash_adp hash = Hash_adp_.New(); public Gfo_data_itm Get_or_null(String key) { - return (Gfo_data_itm)hash.Get_by(key); + return (Gfo_data_itm)hash.GetByOrNull(key); } public void Set(Gfo_data_itm itm) { - hash.Add_if_dupe_use_nth(itm.Key(), itm); + hash.AddIfDupeUseNth(itm.Key(), itm); } public void Clear() { hash.Clear(); diff --git a/400_xowa/src/gplx/core/gfobjs/Gfobj_nde.java b/400_xowa/src/gplx/core/gfobjs/Gfobj_nde.java index 4a0b053fc..27ac08f85 100644 --- a/400_xowa/src/gplx/core/gfobjs/Gfobj_nde.java +++ b/400_xowa/src/gplx/core/gfobjs/Gfobj_nde.java @@ -1,25 +1,25 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.gfobjs; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.gfobjs; import gplx.*; public class Gfobj_nde implements Gfobj_grp { private Ordered_hash subs; public byte Grp_tid() {return Gfobj_grp_.Grp_tid__nde;} public int Len() {return subs == null ? 0 : subs.Len();} public Gfobj_fld Get_at(int i) {return subs == null ? null : (Gfobj_fld)subs.Get_at(i);} - public Gfobj_fld Get_by(String k) {return subs == null ? null : (Gfobj_fld)subs.Get_by(k);} + public Gfobj_fld Get_by(String k) {return subs == null ? null : (Gfobj_fld)subs.GetByOrNull(k);} public Gfobj_ary Get_ary(String k) {return ((Gfobj_fld_ary)Get_by(k)).As_ary();} public Gfobj_nde Get_nde(int i) {return ((Gfobj_fld_nde)Get_at(i)).As_nde();} public Gfobj_nde Get_nde(String k) {return ((Gfobj_fld_nde)Get_by(k)).As_nde();} diff --git a/400_xowa/src/gplx/core/ios/Io_line_rdr_tst.java b/400_xowa/src/gplx/core/ios/Io_line_rdr_tst.java index 2d6276222..36a94f357 100644 --- a/400_xowa/src/gplx/core/ios/Io_line_rdr_tst.java +++ b/400_xowa/src/gplx/core/ios/Io_line_rdr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import org.junit.*; import gplx.core.envs.*; public class Io_line_rdr_tst { Io_line_rdr_fxt fxt; @@ -88,7 +88,7 @@ class Io_line_rdr_fxt { else break; } - Tfds.Eq_ary_str(expd, lines.To_str_ary()); + Tfds.Eq_ary_str(expd, lines.ToStrAry()); return this; } } diff --git a/400_xowa/src/gplx/core/ios/Io_sort.java b/400_xowa/src/gplx/core/ios/Io_sort.java index 8e09372b4..a540ef743 100644 --- a/400_xowa/src/gplx/core/ios/Io_sort.java +++ b/400_xowa/src/gplx/core/ios/Io_sort.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.ios; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.ios; import gplx.*; import gplx.core.envs.*; import gplx.core.lists.*; public class Io_sort { @@ -30,11 +30,11 @@ public class Io_sort { int size_new = size_cur + size_row; if (size_new > memory_max || !reading) { usr_dlg.Prog_none(GRP_KEY, "sort", "sorting chunk"); - row_list.Sort_by(row_comparer); + row_list.SortBy(row_comparer); Io_url trg_url = trg_fil_gen.Nxt_url(); usr_dlg.Prog_one(GRP_KEY, "write", "writing chunk: ~{0}", trg_url.Raw()); Split_flush(trg_url, row_list, memory_max, bfr, rv); - row_list.Resize_bounds(16); // MEM: resize bounds manually; note that each Flush-set may have widely disparately #of rows (EX: 1 row with a million pages vs. 1 million rows with 1 page) + row_list.ResizeBounds(16); // MEM: resize bounds manually; note that each Flush-set may have widely disparately #of rows (EX: 1 row with a million pages vs. 1 million rows with 1 page) size_new = size_row; System_.Garbage_collect(); if (!reading) break; } @@ -42,7 +42,7 @@ public class Io_sort { size_cur = size_new; } rdr.Rls(); bfr.Rls(); System_.Garbage_collect(); - return (Io_url[])rv.To_ary(Io_url.class); + return (Io_url[])rv.ToAry(Io_url.class); } public void Merge(Gfo_usr_dlg usr_dlg, Io_url[] src_ary, ComparerAble comparer, Io_line_rdr_key_gen key_gen, Io_sort_cmd cmd) { BinaryHeap_Io_line_rdr heap = load_(usr_dlg, src_ary, comparer, key_gen, memory_max); if (heap.Len() == 0) return;//throw Err_.new_wo_type(Array_.To_str(src_ary)); @@ -65,7 +65,7 @@ public class Io_sort { heap.Rls(); } private static void Split_flush(Io_url url, List_adp list, int max, Bry_bfr tmp, List_adp url_list) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Io_sort_split_itm itm = (Io_sort_split_itm)list.Get_at(i); int add_len = itm.Row_end() - itm.Row_bgn(); diff --git a/400_xowa/src/gplx/core/ios/Io_sort_misc_tst.java b/400_xowa/src/gplx/core/ios/Io_sort_misc_tst.java index 086c98913..c0c132781 100644 --- a/400_xowa/src/gplx/core/ios/Io_sort_misc_tst.java +++ b/400_xowa/src/gplx/core/ios/Io_sort_misc_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.ios; import gplx.*; import gplx.core.*; +package gplx.core.ios; import gplx.*; import org.junit.*; public class Io_sort_misc_tst { @Before public void init() { @@ -27,7 +27,7 @@ public class Io_sort_misc_tst { Io_url_gen wkr = Io_url_gen_.dir_(dir, fmt, digits); for (int i = 0; i < calls; i++) actl_list.Add(wkr.Nxt_url().Raw()); - String[] actl = actl_list.To_str_ary(); + String[] actl = actl_list.ToStrAry(); for (int i = 0; i < expd.length; i++) expd[i] = dir_str + expd[i]; Tfds.Eq_ary_str(expd, actl); diff --git a/400_xowa/src/gplx/core/lists/HashByInt.java b/400_xowa/src/gplx/core/lists/HashByInt.java index cd536f3d6..c38b60ca0 100644 --- a/400_xowa/src/gplx/core/lists/HashByInt.java +++ b/400_xowa/src/gplx/core/lists/HashByInt.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists; import gplx.*; import gplx.core.*; +package gplx.core.lists; import gplx.*; import gplx.core.primitives.*; public class HashByInt { private final Ordered_hash hash = Ordered_hash_.New(); @@ -30,13 +30,13 @@ public class HashByInt { } public Object Get_by_or_fail(int key) { synchronized (tmp_key) { - HashByIntItem item = (HashByIntItem)hash.Get_by_or_fail(tmp_key.Val_(key)); + HashByIntItem item = (HashByIntItem)hash.GetByOrFail(tmp_key.Val_(key)); return item.val; } } public Object Get_by_or_null(int key) { synchronized (tmp_key) { - HashByIntItem item = (HashByIntItem)hash.Get_by(tmp_key.Val_(key)); + HashByIntItem item = (HashByIntItem)hash.GetByOrNull(tmp_key.Val_(key)); return item == null ? null : item.val; } } diff --git a/400_xowa/src/gplx/core/lists/caches/Mru_cache_mgr.java b/400_xowa/src/gplx/core/lists/caches/Mru_cache_mgr.java index b20c14817..d7ccf6f24 100644 --- a/400_xowa/src/gplx/core/lists/caches/Mru_cache_mgr.java +++ b/400_xowa/src/gplx/core/lists/caches/Mru_cache_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.lists.caches; import gplx.*; import gplx.core.*; import gplx.core.lists.*; +package gplx.core.lists.caches; import gplx.*; +import gplx.core.lists.*; import gplx.core.logs.*; public class Mru_cache_mgr { private final Mru_cache_time_mgr time_mgr; @@ -34,10 +35,10 @@ public class Mru_cache_mgr { } public long Cache_max() {return cache_max;} public void Cache_max_(long v) {this.cache_max = v;} public Object Get_or_null(String key) { - Object itm_obj = key_hash.Get_by(key); + Object itm_obj = key_hash.GetByOrNull(key); if (itm_obj == null) return null; Mru_cache_itm itm = (Mru_cache_itm)itm_obj; - dirty.Add_if_dupe_use_1st(key, itm); + dirty.AddIfDupeUse1st(key, itm); itm.Dirty(time_mgr.Now()); return itm.Val(); } diff --git a/400_xowa/src/gplx/core/net/Gfo_inet_conn_.java b/400_xowa/src/gplx/core/net/Gfo_inet_conn_.java index 5f681c035..0e1749e6a 100644 --- a/400_xowa/src/gplx/core/net/Gfo_inet_conn_.java +++ b/400_xowa/src/gplx/core/net/Gfo_inet_conn_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.net; import gplx.*; import gplx.core.*; +package gplx.core.net; import gplx.*; public class Gfo_inet_conn_ { public static final int Tid__http = 1, Tid__mem__hash = 2, Tid__mem__pile = 3; public static Gfo_inet_conn new_http() {return new Gfo_inet_conn__http();} @@ -34,7 +34,7 @@ class Gfo_inet_conn__mem__hash implements Gfo_inet_conn { public int Tid() {return Gfo_inet_conn_.Tid__mem__hash;} public void Clear() {hash.Clear();} public void Upload_by_bytes(String url, byte[] data) {hash.Add(url, data);} - public byte[] Download_as_bytes_or_null(String url) {return (byte[])hash.Get_by(url);} + public byte[] Download_as_bytes_or_null(String url) {return (byte[])hash.GetByOrNull(url);} } class Gfo_inet_conn__mem__pile implements Gfo_inet_conn { private final List_adp pile = List_adp_.New(); diff --git a/400_xowa/src/gplx/core/net/Gfo_protocol_itm.java b/400_xowa/src/gplx/core/net/Gfo_protocol_itm.java index c23c0036d..42883da93 100644 --- a/400_xowa/src/gplx/core/net/Gfo_protocol_itm.java +++ b/400_xowa/src/gplx/core/net/Gfo_protocol_itm.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.net; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.net; import gplx.*; public class Gfo_protocol_itm { public Gfo_protocol_itm(byte tid, String text) { this.tid = tid; @@ -113,7 +113,7 @@ public class Gfo_protocol_itm { } public static Gfo_protocol_itm[] Ary() { if (protocol_itm_ary == null) { - int len = Regy.Count(); + int len = Regy.Len(); protocol_itm_ary = new Gfo_protocol_itm[len]; for (int i = 0; i < len; i++) protocol_itm_ary[i] = (Gfo_protocol_itm)Regy.Get_at(i); @@ -122,7 +122,7 @@ public class Gfo_protocol_itm { } private static Gfo_protocol_itm[] protocol_itm_ary; public static String[] Protocol_str_ary() { if (protocol_str_ary == null) { - int len = Regy.Count(); + int len = Regy.Len(); protocol_str_ary = new String[len]; for (int i = 0; i < len; i++) protocol_str_ary[i] = ((Gfo_protocol_itm)Regy.Get_at(i)).Text_str(); diff --git a/400_xowa/src/gplx/core/net/Gfo_url_parser.java b/400_xowa/src/gplx/core/net/Gfo_url_parser.java index 1108f608f..3893824cb 100644 --- a/400_xowa/src/gplx/core/net/Gfo_url_parser.java +++ b/400_xowa/src/gplx/core/net/Gfo_url_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.net; import gplx.*; import gplx.core.*; +package gplx.core.net; import gplx.*; import gplx.core.btries.*; import gplx.core.net.qargs.*; import gplx.langs.htmls.encoders.*; @@ -122,7 +122,7 @@ public class Gfo_url_parser { segs_list.Add(Make_bry(encoded, src, seg_bgn, seg_end)); // build url and return it - return new Gfo_url(src, protocol_tid, protocol_bry, (byte[][])segs_list.To_ary_and_clear(byte[].class), qarg_ary, anch); + return new Gfo_url(src, protocol_tid, protocol_bry, (byte[][])segs_list.ToAryAndClear(byte[].class), qarg_ary, anch); } private Gfo_qarg_itm[] Make_qarg_ary(byte[] src, int qarg_bgn, int qarg_end) { // init @@ -143,7 +143,7 @@ public class Gfo_url_parser { break; case Byte_ascii.Null: // "EOS" makes qarg as long as "=" seen or at least one qarg; specifically, "A?B" shouldn't make qarg if ( val_bgn != -1 // "=" seen; EX: "?A=B" - || qargs_list.Count() > 0) // at least one qarg exists; EX: "?A=B&C" + || qargs_list.Len() > 0) // at least one qarg exists; EX: "?A=B&C" make_qarg = true; break; case Byte_ascii.Eq: @@ -174,7 +174,7 @@ public class Gfo_url_parser { if (b_is_last) break; ++qarg_pos; } - return (Gfo_qarg_itm[])qargs_list.To_ary_and_clear(Gfo_qarg_itm.class); + return (Gfo_qarg_itm[])qargs_list.ToAryAndClear(Gfo_qarg_itm.class); } private byte[] Make_bry(boolean encoded, byte[] src, int bgn, int end) { return encoded ? Gfo_url_encoder_.Xourl.Decode(tmp_bfr, Bool_.N, src, bgn, end).To_bry_and_clear() : Bry_.Mid(src, bgn, end); diff --git a/400_xowa/src/gplx/core/net/Http_post_data_hash.java b/400_xowa/src/gplx/core/net/Http_post_data_hash.java index 372dc450d..934a1f84b 100644 --- a/400_xowa/src/gplx/core/net/Http_post_data_hash.java +++ b/400_xowa/src/gplx/core/net/Http_post_data_hash.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.net; import gplx.*; import gplx.core.*; -public class Http_post_data_hash { - private final Ordered_hash hash = Ordered_hash_.New_bry(); - public int Len() {return hash.Count();} - public Http_post_data_itm Get_at(int i) {return (Http_post_data_itm)hash.Get_at(i);} - public Http_post_data_itm Get_by(byte[] k) {return (Http_post_data_itm)hash.Get_by(k);} - public void Add(byte[] key, byte[] val) { - hash.Add(key, new Http_post_data_itm(key, val)); - } -} +package gplx.core.net; import gplx.*; +public class Http_post_data_hash { + private final Ordered_hash hash = Ordered_hash_.New_bry(); + public int Len() {return hash.Len();} + public Http_post_data_itm Get_at(int i) {return (Http_post_data_itm)hash.Get_at(i);} + public Http_post_data_itm Get_by(byte[] k) {return (Http_post_data_itm)hash.GetByOrNull(k);} + public void Add(byte[] key, byte[] val) { + hash.Add(key, new Http_post_data_itm(key, val)); + } +} diff --git a/400_xowa/src/gplx/core/net/qargs/Gfo_qarg_mgr_old.java b/400_xowa/src/gplx/core/net/qargs/Gfo_qarg_mgr_old.java index 2c3163925..867ae5707 100644 --- a/400_xowa/src/gplx/core/net/qargs/Gfo_qarg_mgr_old.java +++ b/400_xowa/src/gplx/core/net/qargs/Gfo_qarg_mgr_old.java @@ -13,33 +13,33 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.net.qargs; import gplx.*; import gplx.core.*; import gplx.core.net.*; +package gplx.core.net.qargs; import gplx.*; import gplx.langs.htmls.encoders.*; public class Gfo_qarg_mgr_old { private final List_adp list = List_adp_.New(); private final Hash_adp hash = Hash_adp_bry.cs(); - public int Len() {return list.Count();} + public int Len() {return list.Len();} public boolean Match(byte[] key, byte[] val) { - Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.Get_by(key); + Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.GetByOrNull(key); return arg == null ? false : Bry_.Eq(val, arg.Val_bry()); } public Gfo_qarg_itm Get_at(int i) {return (Gfo_qarg_itm)list.Get_at(i);} - public Gfo_qarg_itm Get_arg(byte[] key) {return (Gfo_qarg_itm)hash.Get_by(key);} + public Gfo_qarg_itm Get_arg(byte[] key) {return (Gfo_qarg_itm)hash.GetByOrNull(key);} public int Get_val_int_or(byte[] key, int or) { byte[] val_bry = Get_val_bry_or(key, null); if (val_bry == null) return or; return Bry_.To_int_or(val_bry, or); } public byte[] Get_val_bry_or(byte[] key, byte[] or) { - Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.Get_by(key); + Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.GetByOrNull(key); return arg == null ? or : arg.Val_bry(); } public String Get_val_str_or(byte[] key, String or) { - Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.Get_by(key); + Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.GetByOrNull(key); return arg == null ? or : String_.new_u8(arg.Val_bry()); } public void Set_val_by_int(byte[] key, int val) {Set_val_by_bry(key, Bry_.new_a7(Int_.To_str(val)));} public void Set_val_by_bry(byte[] key, byte[] val) { - Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.Get_by(key); + Gfo_qarg_itm arg = (Gfo_qarg_itm)hash.GetByOrNull(key); if (arg == null) { arg = new Gfo_qarg_itm(key, Bry_.Empty); list.Add(arg); @@ -54,11 +54,11 @@ public class Gfo_qarg_mgr_old { for (int i = 0; i < len; ++i) { Gfo_qarg_itm itm = ary[i]; list.Add(itm); - hash.Add_if_dupe_use_nth(itm.Key_bry(), itm); + hash.AddIfDupeUseNth(itm.Key_bry(), itm); } return this; } - public Gfo_qarg_itm[] To_ary() {return (Gfo_qarg_itm[])list.To_ary(Gfo_qarg_itm.class);} + public Gfo_qarg_itm[] To_ary() {return (Gfo_qarg_itm[])list.ToAry(Gfo_qarg_itm.class);} public byte[] Concat(Bry_bfr bfr, byte[]... ary) { int ary_len = ary.length; for (int i = 0; i < ary_len; i++) { @@ -69,13 +69,13 @@ public class Gfo_qarg_mgr_old { return bfr.To_bry_and_clear(); } public byte[] To_bry() { - int len = list.Count(); if (len == 0) return Bry_.Empty; + int len = list.Len(); if (len == 0) return Bry_.Empty; Bry_bfr bfr = Bry_bfr_.New(); To_bry(bfr, gplx.langs.htmls.encoders.Gfo_url_encoder_.Href, false); return bfr.To_bry_and_clear(); } public void To_bry(Bry_bfr bfr, Gfo_url_encoder href_encoder, boolean encode) { - int len = list.Count(); if (len == 0) return; + int len = list.Len(); if (len == 0) return; for (int i = 0; i < len; ++i) { Gfo_qarg_itm itm = (Gfo_qarg_itm)list.Get_at(i); bfr.Add_byte(i == 0 ? Byte_ascii.Question : Byte_ascii.Amp); diff --git a/400_xowa/src/gplx/core/primitives/Bry_cache.java b/400_xowa/src/gplx/core/primitives/Bry_cache.java index 9d05c1e6e..e0031b62e 100644 --- a/400_xowa/src/gplx/core/primitives/Bry_cache.java +++ b/400_xowa/src/gplx/core/primitives/Bry_cache.java @@ -13,17 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.primitives; import gplx.*; import gplx.core.*; -import gplx.core.brys.*; +package gplx.core.primitives; import gplx.*; public class Bry_cache { private final Hash_adp hash = Hash_adp_.New(); private final Bry_obj_ref hash_ref = Bry_obj_ref.New_empty(); public byte[] Get_or_new(String v) {return Get_or_new(Bry_.new_u8(v));} public byte[] Get_or_new(byte[] v) { if (v.length == 0) return Bry_.Empty; - Object rv = hash.Get_by(hash_ref.Val_(v)); + Object rv = hash.GetByOrNull(hash_ref.Val_(v)); if (rv == null) { Bry_obj_ref bry = Bry_obj_ref.New(v); - hash.Add_as_key_and_val(bry); + hash.AddAsKeyAndVal(bry); return v; } else diff --git a/400_xowa/src/gplx/core/primitives/Hash_adp__primitive.java b/400_xowa/src/gplx/core/primitives/Hash_adp__primitive.java index 72f4c98e4..b70dc760d 100644 --- a/400_xowa/src/gplx/core/primitives/Hash_adp__primitive.java +++ b/400_xowa/src/gplx/core/primitives/Hash_adp__primitive.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.primitives; import gplx.*; import gplx.core.*; +package gplx.core.primitives; import gplx.*; public class Hash_adp__primitive { private final Hash_adp hash = Hash_adp_.New(); public byte Get_by_str_or_max(String key) { - Byte_obj_val rv = (Byte_obj_val)hash.Get_by(key); + Byte_obj_val rv = (Byte_obj_val)hash.GetByOrNull(key); return rv == null ? Byte_.Max_value_127 : rv.Val(); } public Hash_adp__primitive Add_byte(String key, byte val) { diff --git a/400_xowa/src/gplx/core/primitives/Int_pool.java b/400_xowa/src/gplx/core/primitives/Int_pool.java index 0e385eaa0..fbc88d775 100644 --- a/400_xowa/src/gplx/core/primitives/Int_pool.java +++ b/400_xowa/src/gplx/core/primitives/Int_pool.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.primitives; import gplx.*; import gplx.core.*; +package gplx.core.primitives; import gplx.*; public class Int_pool { private final List_adp available_list = List_adp_.New(); private int available_len; // private final Bry_bfr dbg_bfr = Bry_bfr_.New(); @@ -53,7 +53,7 @@ public class Int_pool { for (int i = 0; i < available_len; ++i) { Int_obj_val itm = (Int_obj_val)available_list.Get_at(i); if (i != itm.Val()) - throw Err_.new_("core", "available_list out of order", "contents", available_list.To_str()); + throw Err_.new_("core", "available_list out of order", "contents", available_list.ToStr()); } // dbg_bfr.Add_str("-:c:").Add_int_variable(v).Add_byte_nl(); this.Clear(); diff --git a/400_xowa/src/gplx/core/progs/rates/Gfo_rate_mgr.java b/400_xowa/src/gplx/core/progs/rates/Gfo_rate_mgr.java index ae951a1b7..15dee1f0d 100644 --- a/400_xowa/src/gplx/core/progs/rates/Gfo_rate_mgr.java +++ b/400_xowa/src/gplx/core/progs/rates/Gfo_rate_mgr.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.progs.rates; import gplx.*; import gplx.core.*; import gplx.core.progs.*; +package gplx.core.progs.rates; import gplx.*; public class Gfo_rate_mgr { private final Hash_adp hash = Hash_adp_.New(); private final int dflt_size; public Gfo_rate_mgr(int dflt_size) {this.dflt_size = dflt_size;} public void Clear() {hash.Clear();} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Gfo_rate_list Get_or_new(String k) { - Gfo_rate_list rv = (Gfo_rate_list)hash.Get_by(k); + Gfo_rate_list rv = (Gfo_rate_list)hash.GetByOrNull(k); if (rv == null) { rv = new Gfo_rate_list(dflt_size); rv.Add(1024 * 1024, 1); // add default rate of 1 MB per second diff --git a/400_xowa/src/gplx/core/security/files/Cksum_list.java b/400_xowa/src/gplx/core/security/files/Cksum_list.java index 8cbfc4f18..59455f06c 100644 --- a/400_xowa/src/gplx/core/security/files/Cksum_list.java +++ b/400_xowa/src/gplx/core/security/files/Cksum_list.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.security.files; import gplx.*; import gplx.core.*; import gplx.core.security.*; +package gplx.core.security.files; import gplx.*; import gplx.core.security.algos.*; public class Cksum_list { public Cksum_list(byte type, Cksum_itm[] itms, long itms_size) { @@ -60,7 +60,7 @@ public class Cksum_list { Cksum_itm itm = new Cksum_itm(hash, file_url, file_size); list.Add(itm); } - return new Cksum_list(type, (Cksum_itm[])list.To_ary_and_clear(Cksum_itm.class), itms_size); + return new Cksum_list(type, (Cksum_itm[])list.ToAryAndClear(Cksum_itm.class), itms_size); } private static Io_url GenSubFil_nest(Io_url dir, byte[] src) { // split "a/b/c" or "a\b\c" -> [a, b, c] byte dir_spr = gplx.core.envs.Op_sys.Lnx.Fsys_dir_spr_byte(); diff --git a/400_xowa/src/gplx/core/tests/Tst_mgr.java b/400_xowa/src/gplx/core/tests/Tst_mgr.java index e28fff9d9..04c5dcca1 100644 --- a/400_xowa/src/gplx/core/tests/Tst_mgr.java +++ b/400_xowa/src/gplx/core/tests/Tst_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.tests; import gplx.*; import gplx.core.*; +package gplx.core.tests; import gplx.*; import gplx.core.strings.*; public class Tst_mgr { public Tst_mgr ThrowError_n_() {throwError = false; return this;} private boolean throwError = true; @@ -89,7 +89,7 @@ public class Tst_mgr { String Build() { String_bldr sb = String_bldr_.new_(); int comp_max = 0, path_max =0, name_max = 0; - int len = results.Count(); + int len = results.Len(); for (int i = 0; i < len; i++) { Tst_itm itm = (Tst_itm)results.Get_at(i); comp_max = Max(comp_max, itm.Comp()); diff --git a/400_xowa/src/gplx/core/threads/Gfo_async_mgr.java b/400_xowa/src/gplx/core/threads/Gfo_async_mgr.java index dca7ca086..7e80c8978 100644 --- a/400_xowa/src/gplx/core/threads/Gfo_async_mgr.java +++ b/400_xowa/src/gplx/core/threads/Gfo_async_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.threads; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.threads; import gplx.*; import gplx.core.primitives.*; public class Gfo_async_mgr implements Gfo_invk { private List_adp queue = List_adp_.New(); @@ -36,7 +36,7 @@ public class Gfo_async_mgr implements Gfo_invk { try { while (true) { synchronized (queue) { - if (queue.Count() == 0) break; + if (queue.Len() == 0) break; cmd = (Gfo_async_cmd_itm)List_adp_.Pop(queue); cmd.Exec(); } diff --git a/400_xowa/src/gplx/core/threads/Gfo_thread_cmd_replace.java b/400_xowa/src/gplx/core/threads/Gfo_thread_cmd_replace.java index 295761b77..0a35b6d78 100644 --- a/400_xowa/src/gplx/core/threads/Gfo_thread_cmd_replace.java +++ b/400_xowa/src/gplx/core/threads/Gfo_thread_cmd_replace.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.threads; import gplx.*; import gplx.core.*; +package gplx.core.threads; import gplx.*; import gplx.core.brys.fmtrs.*; -import gplx.gfui.*; import gplx.gfui.kits.core.*; +import gplx.gfui.kits.core.*; public class Gfo_thread_cmd_replace implements Gfo_thread_cmd { public Gfo_thread_cmd Init(Gfo_usr_dlg usr_dlg, Gfui_kit kit, Io_url fil) { this.usr_dlg = usr_dlg; this.kit = kit; this.fil = fil; @@ -38,7 +38,7 @@ public class Gfo_thread_cmd_replace implements Gfo_thread_cmd { public void Async_run() {Exec_find_replace();} // NOTE: do not run async; if multiple commands for same file then they will not always work public void Exec_find_replace() { String raw = Io_mgr.Instance.LoadFilStr(fil); - int pairs_len = pairs.Count(); + int pairs_len = pairs.Len(); for (int i = 0; i < pairs_len; i++) { Keyval kv = (Keyval)pairs.Get_at(i); raw = String_.Replace(raw, kv.Key(), kv.Val_to_str_or_null()); diff --git a/400_xowa/src/gplx/core/threads/Gfo_thread_grp.java b/400_xowa/src/gplx/core/threads/Gfo_thread_grp.java index 4ddaa47ee..a96f5067d 100644 --- a/400_xowa/src/gplx/core/threads/Gfo_thread_grp.java +++ b/400_xowa/src/gplx/core/threads/Gfo_thread_grp.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.threads; import gplx.*; import gplx.core.*; +package gplx.core.threads; import gplx.*; public class Gfo_thread_grp implements Gfo_invk { private final Object thread_lock = new Object(); private final List_adp list = List_adp_.New(); @@ -24,7 +24,7 @@ public class Gfo_thread_grp implements Gfo_invk { public int Active_max() {return active_max;} public Gfo_thread_grp Active_max_(int v) {active_max = v; return this;} private int active_max = 1; public void Add(Gfo_thread_itm... ary) { synchronized (thread_lock) { - list.Add_many((Object[])ary); + list.AddMany((Object[])ary); } if (autorun) this.Run(); diff --git a/400_xowa/src/gplx/core/threads/Gfo_thread_mgr.java b/400_xowa/src/gplx/core/threads/Gfo_thread_mgr.java index f56422cc9..cc99cd9a6 100644 --- a/400_xowa/src/gplx/core/threads/Gfo_thread_mgr.java +++ b/400_xowa/src/gplx/core/threads/Gfo_thread_mgr.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.core.threads; import gplx.*; import gplx.core.*; +package gplx.core.threads; import gplx.*; public class Gfo_thread_mgr { private final Ordered_hash hash = Ordered_hash_.New(); public Gfo_thread_grp Get_by_or_new(String k) { - Gfo_thread_grp rv = (Gfo_thread_grp)hash.Get_by(k); + Gfo_thread_grp rv = (Gfo_thread_grp)hash.GetByOrNull(k); if (rv == null) { rv = new Gfo_thread_grp(k); hash.Add(k, rv); diff --git a/400_xowa/src/gplx/core/threads/Gfo_thread_pool.java b/400_xowa/src/gplx/core/threads/Gfo_thread_pool.java index 898b4bfc5..a7445dfc3 100644 --- a/400_xowa/src/gplx/core/threads/Gfo_thread_pool.java +++ b/400_xowa/src/gplx/core/threads/Gfo_thread_pool.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.core.threads; import gplx.*; import gplx.core.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.core.threads; import gplx.*; public class Gfo_thread_pool implements Gfo_invk { private Object thread_lock = new Object(); private List_adp queue = List_adp_.New(); @@ -35,7 +35,7 @@ public class Gfo_thread_pool implements Gfo_invk { Gfo_thread_wkr wkr = null; synchronized (thread_lock) { if (running) return; // already running; discard run request and rely on running-wkr to call Run when done - int len = queue.Count(); if (len == 0) return; // nothing in list; occurs when last item calls Run when done + int len = queue.Len(); if (len == 0) return; // nothing in list; occurs when last item calls Run when done running = true; wkr = (Gfo_thread_wkr)List_adp_.Pop_first(queue); } diff --git a/400_xowa/src/gplx/dbs/bulks/Db_bulk_exec_.java b/400_xowa/src/gplx/dbs/bulks/Db_bulk_exec_.java index 31e58c7b6..f88a06f9a 100644 --- a/400_xowa/src/gplx/dbs/bulks/Db_bulk_exec_.java +++ b/400_xowa/src/gplx/dbs/bulks/Db_bulk_exec_.java @@ -1,22 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.dbs.bulks; import gplx.*; import gplx.dbs.*; -import gplx.dbs.metas.*; public class Db_bulk_exec_ { - public static void Insert(Db_bulk_prog prog_wkr, String msg, Dbmeta_fld_itm[] flds, Db_rdr src, Db_stmt trg, Db_conn trg_conn) { + public static void Insert(Db_bulk_prog prog_wkr, String msg, DbmetaFldItm[] flds, Db_rdr src, Db_stmt trg, Db_conn trg_conn) { // init int flds_len = flds.length; String[] fld_names = Db_bulk_exec_utl_.To_fld_names(flds, flds_len); @@ -33,14 +32,14 @@ public class Db_bulk_exec_ { for (int i = 0; i < flds_len; ++i) { String fld_name = fld_names[i]; switch (fld_types[i]) { - case Dbmeta_fld_tid.Tid__bool : trg.Val_bool_as_byte (fld_name, src.Read_bool_by_byte (fld_name)); row_size += 1; break; - case Dbmeta_fld_tid.Tid__byte : trg.Val_byte (fld_name, src.Read_byte (fld_name)); row_size += 1; break; - case Dbmeta_fld_tid.Tid__int : trg.Val_int (fld_name, src.Read_int (fld_name)); row_size += 4; break; - case Dbmeta_fld_tid.Tid__long : trg.Val_long (fld_name, src.Read_long (fld_name)); row_size += 8; break; - case Dbmeta_fld_tid.Tid__float : trg.Val_float (fld_name, src.Read_float (fld_name)); row_size += 4; break; - case Dbmeta_fld_tid.Tid__double : trg.Val_double (fld_name, src.Read_double (fld_name)); row_size += 8; break; - case Dbmeta_fld_tid.Tid__str : String src_str = src.Read_str(fld_name); trg.Val_str(fld_name, src_str); row_size += src_str == null ? 0 : String_.Len(src_str); break; - case Dbmeta_fld_tid.Tid__bry : byte[] src_bry = src.Read_bry(fld_name); trg.Val_bry(fld_name, src_bry); row_size += src_bry == null ? 0 : src_bry.length; break; + case DbmetaFldType.TidBool: trg.Val_bool_as_byte (fld_name, src.Read_bool_by_byte (fld_name)); row_size += 1; break; + case DbmetaFldType.TidByte: trg.Val_byte (fld_name, src.Read_byte (fld_name)); row_size += 1; break; + case DbmetaFldType.TidInt: trg.Val_int (fld_name, src.Read_int (fld_name)); row_size += 4; break; + case DbmetaFldType.TidLong: trg.Val_long (fld_name, src.Read_long (fld_name)); row_size += 8; break; + case DbmetaFldType.TidFloat: trg.Val_float (fld_name, src.Read_float (fld_name)); row_size += 4; break; + case DbmetaFldType.TidDouble: trg.Val_double (fld_name, src.Read_double (fld_name)); row_size += 8; break; + case DbmetaFldType.TidStr: String src_str = src.Read_str(fld_name); trg.Val_str(fld_name, src_str); row_size += src_str == null ? 0 : String_.Len(src_str); break; + case DbmetaFldType.TidBry: byte[] src_bry = src.Read_bry(fld_name); trg.Val_bry(fld_name, src_bry); row_size += src_bry == null ? 0 : src_bry.length; break; default : throw Err_.new_unhandled_default(fld_types[i]); } } @@ -61,16 +60,16 @@ public class Db_bulk_exec_ { public static final String Invk__bulk_insert_err = "bulk.insert.err", Invk__bulk_insert_prog = "bulk.insert.prog"; } class Db_bulk_exec_utl_ { - public static String[] To_fld_names(Dbmeta_fld_itm[] flds, int flds_len) { + public static String[] To_fld_names(DbmetaFldItm[] flds, int flds_len) { String[] rv = new String[flds_len]; for (int i = 0; i < flds_len; ++i) rv[i] = flds[i].Name(); return rv; } - public static int[] To_fld_types(Dbmeta_fld_itm[] flds, int flds_len) { + public static int[] To_fld_types(DbmetaFldItm[] flds, int flds_len) { int[] rv = new int[flds_len]; for (int i = 0; i < flds_len; ++i) - rv[i] = flds[i].Type().Tid_ansi(); + rv[i] = flds[i].Type().Tid(); return rv; } public static Err New_err(Exception e, Db_rdr rdr, int flds_len, String[] fld_names, int[] fld_types) { diff --git a/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy.java b/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy.java index 597f619ef..24c0bba71 100644 --- a/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy.java +++ b/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.dbs.bulks; import gplx.*; import gplx.dbs.*; -import gplx.dbs.*; import gplx.dbs.metas.*; +import gplx.dbs.metas.*; public class Db_tbl_copy { private final Bry_bfr bfr = Bry_bfr_.New(); private final Db_attach_mgr attach_mgr = new Db_attach_mgr(); @@ -36,14 +36,14 @@ public class Db_tbl_copy { bfr.Add_str_a7("INSERT INTO ").Add_str_a7(trg_tbl).Add_byte_nl(); bfr.Add_byte(Byte_ascii.Paren_bgn); for (int i = 0; i < flds_len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); if (i != 0) bfr.Add_str_a7(", "); bfr.Add_str_a7(fld.Name()); } bfr.Add_byte(Byte_ascii.Paren_end).Add_byte_nl(); bfr.Add_str_a7("SELECT").Add_byte_nl().Add_byte_space(); for (int i = 0; i < flds_len; ++i) { - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.Get_at(i); if (i != 0) bfr.Add_str_a7(", "); bfr.Add_str_a7(fld.Name()); } diff --git a/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy_tst.java b/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy_tst.java index 47d543355..9e24f4a68 100644 --- a/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy_tst.java +++ b/400_xowa/src/gplx/dbs/bulks/Db_tbl_copy_tst.java @@ -14,11 +14,11 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.dbs.bulks; import gplx.*; import gplx.dbs.*; -import org.junit.*; import gplx.core.tests.*; import gplx.dbs.metas.*; +import org.junit.*; import gplx.core.tests.*; public class Db_tbl_copy_tst { private final Db_tbl_copy_fxt fxt = new Db_tbl_copy_fxt(); @Test public void Basic() { - fxt.Test__bld_sql(fxt.Make_tbl("tbl_1", Dbmeta_fld_itm.new_int("fld_1"), Dbmeta_fld_itm.new_int("fld_2")), + fxt.Test__bld_sql(fxt.Make_tbl("tbl_1", DbmetaFldItm.NewInt("fld_1"), DbmetaFldItm.NewInt("fld_2")), String_.Concat_lines_nl_skip_last ( "INSERT INTO trg" , "(fld_1, fld_2)" @@ -30,7 +30,7 @@ public class Db_tbl_copy_tst { } class Db_tbl_copy_fxt { private final Db_tbl_copy mgr = new Db_tbl_copy(); - public Dbmeta_tbl_itm Make_tbl(String name, Dbmeta_fld_itm... flds) {return Dbmeta_tbl_itm.New(name, flds);} + public Dbmeta_tbl_itm Make_tbl(String name, DbmetaFldItm... flds) {return Dbmeta_tbl_itm.New(name, flds);} public void Test__bld_sql(Dbmeta_tbl_itm tbl, String expd) { Gftest.Eq__ary__lines(expd, mgr.Bld_sql(tbl, "src", "trg"), "sql"); } diff --git a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_hash.java b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_hash.java index 6c94e7285..be6150375 100644 --- a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_hash.java +++ b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_hash.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.cfgs; import gplx.*; import gplx.dbs.*; +package gplx.dbs.cfgs; import gplx.*; public class Db_cfg_hash { private final String grp; private final Ordered_hash hash = Ordered_hash_.New(); public Db_cfg_hash(String grp) {this.grp = grp;} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Db_cfg_itm Get_at(int i) {return (Db_cfg_itm)hash.Get_at(i);} public Db_cfg_itm Get_by(String key) { - Db_cfg_itm rv = (Db_cfg_itm)hash.Get_by(key); + Db_cfg_itm rv = (Db_cfg_itm)hash.GetByOrNull(key); return rv == null ? Db_cfg_itm.Empty : rv; } public void Set(String key, String val) {hash.Del(key); Add(key, val);} diff --git a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java index dd88fd416..37cae1003 100644 --- a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java +++ b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java @@ -14,17 +14,16 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.dbs.cfgs; import gplx.*; import gplx.dbs.*; -import gplx.core.primitives.*; public class Db_cfg_tbl implements Db_tbl { - private final String tbl_name; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_grp, fld_key, fld_val; private Db_stmt stmt_insert, stmt_update, stmt_select; public Db_conn Conn() {return conn;} private final Db_conn conn; public Db_cfg_tbl(Db_conn conn, String tbl_name) { this.conn = conn; this.tbl_name = tbl_name; - this.fld_grp = flds.Add_str("cfg_grp", 255); - this.fld_key = flds.Add_str("cfg_key", 255); - this.fld_val = flds.Add_str("cfg_val", 1024); + this.fld_grp = flds.AddStr("cfg_grp", 255); + this.fld_key = flds.AddStr("cfg_key", 255); + this.fld_val = flds.AddStr("cfg_val", 1024); conn.Rls_reg(this); } public void Rls() { @@ -36,7 +35,7 @@ public class Db_cfg_tbl implements Db_tbl { public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_tbl(tbl_name, "main", fld_grp, fld_key, fld_val)));} public void Delete_val(String grp, String key) {conn.Stmt_delete(tbl_name, fld_grp, fld_key).Crt_str(fld_grp, grp).Crt_str(fld_key, key).Exec_delete();} public void Delete_grp(String grp) {conn.Stmt_delete(tbl_name, fld_grp).Crt_str(fld_grp, grp).Exec_delete();} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Insert_yn (String grp, String key, boolean val) {Insert_str(grp, key, val ? "y" : "n");} public void Insert_byte (String grp, String key, byte val) {Insert_str(grp, key, Byte_.To_str(val));} public void Insert_int (String grp, String key, int val) {Insert_str(grp, key, Int_.To_str(val));} diff --git a/400_xowa/src/gplx/dbs/metas/updates/Schema_update_mgr.java b/400_xowa/src/gplx/dbs/metas/updates/Schema_update_mgr.java index 661b5637c..a399cc18b 100644 --- a/400_xowa/src/gplx/dbs/metas/updates/Schema_update_mgr.java +++ b/400_xowa/src/gplx/dbs/metas/updates/Schema_update_mgr.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.metas.updates; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; -public class Schema_update_mgr { - private List_adp cmds = List_adp_.New(); - public void Add(Schema_update_cmd cmd) {cmds.Add(cmd);} - public void Update(Schema_db_mgr schema_mgr, Db_conn conn) { - int cmds_len = cmds.Count(); - for (int i = 0; i < cmds_len; ++i) { - Schema_update_cmd cmd = (Schema_update_cmd)cmds.Get_at(i); - try {cmd.Exec(schema_mgr, conn);} - catch (Exception e) { - Gfo_usr_dlg_.Instance.Warn_many("", "", "failed to run update cmd; name=~{0} err=~{1}", cmd.Name(), Err_.Message_gplx_full(e)); - } - } - } -} +package gplx.dbs.metas.updates; import gplx.*; import gplx.dbs.*; import gplx.dbs.metas.*; +public class Schema_update_mgr { + private List_adp cmds = List_adp_.New(); + public void Add(Schema_update_cmd cmd) {cmds.Add(cmd);} + public void Update(Schema_db_mgr schema_mgr, Db_conn conn) { + int cmds_len = cmds.Len(); + for (int i = 0; i < cmds_len; ++i) { + Schema_update_cmd cmd = (Schema_update_cmd)cmds.Get_at(i); + try {cmd.Exec(schema_mgr, conn);} + catch (Exception e) { + Gfo_usr_dlg_.Instance.Warn_many("", "", "failed to run update cmd; name=~{0} err=~{1}", cmd.Name(), Err_.Message_gplx_full(e)); + } + } + } +} diff --git a/400_xowa/src/gplx/dbs/percentiles/Log_tbl_fmtr.java b/400_xowa/src/gplx/dbs/percentiles/Log_tbl_fmtr.java index a76b14e00..eaf5db709 100644 --- a/400_xowa/src/gplx/dbs/percentiles/Log_tbl_fmtr.java +++ b/400_xowa/src/gplx/dbs/percentiles/Log_tbl_fmtr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.dbs.percentiles; import gplx.*; import gplx.dbs.*; +package gplx.dbs.percentiles; import gplx.*; class Log_tbl_fmtr { private final Bry_bfr bfr = Bry_bfr_.New(); private final List_adp itms = List_adp_.New(); @@ -22,7 +22,7 @@ class Log_tbl_fmtr { public Log_tbl_fmtr Add_int(String key, int bgn, int end) {ary = null; itms.Add(new Log_fld_itm__int(Type_ids_.Id__int, key, bgn, end)); return this;} public void Log(Object... vals) { if (ary == null) - ary = (Log_fld_itm[])itms.To_ary_and_clear(Log_fld_itm.class); + ary = (Log_fld_itm[])itms.ToAryAndClear(Log_fld_itm.class); int len = ary.length; for (int i = 0; i < len; ++i) { Log_fld_itm itm = ary[i]; diff --git a/400_xowa/src/gplx/fsdb/data/Fsd_bin_tbl.java b/400_xowa/src/gplx/fsdb/data/Fsd_bin_tbl.java index 05c6392f8..58b65b877 100644 --- a/400_xowa/src/gplx/fsdb/data/Fsd_bin_tbl.java +++ b/400_xowa/src/gplx/fsdb/data/Fsd_bin_tbl.java @@ -24,15 +24,15 @@ public class Fsd_bin_tbl implements Rls_able { private final Bool_obj_ref saved_in_parts = Bool_obj_ref.n_(); public Fsd_bin_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; - fld__owner_id = flds.Add_int_pkey ("bin_owner_id"); - fld__owner_tid = flds.Add_byte ("bin_owner_tid"); - fld__part_id = flds.Add_int ("bin_part_id"); - fld__data_url = flds.Add_str ("bin_data_url", 255); // for items which are > 2 GB, just store it on disc, with a path to it; EX: 120 GB file - fld__data = flds.Add_bry ("bin_data"); // mediumblob + fld__owner_id = flds.AddIntPkey("bin_owner_id"); + fld__owner_tid = flds.AddByte("bin_owner_tid"); + fld__part_id = flds.AddInt("bin_part_id"); + fld__data_url = flds.AddStr("bin_data_url", 255); // for items which are > 2 GB, just store it on disc, with a path to it; EX: 120 GB file + fld__data = flds.AddBry("bin_data"); // mediumblob conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = "fsdb_bin"; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public void Rls() { stmt_insert = Db_stmt_.Rls(stmt_insert); stmt_select = Db_stmt_.Rls(stmt_select); diff --git a/400_xowa/src/gplx/fsdb/data/Fsd_dir_tbl.java b/400_xowa/src/gplx/fsdb/data/Fsd_dir_tbl.java index 75670a2ff..6ae893195 100644 --- a/400_xowa/src/gplx/fsdb/data/Fsd_dir_tbl.java +++ b/400_xowa/src/gplx/fsdb/data/Fsd_dir_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.fsdb.data; import gplx.*; import gplx.fsdb.*; +package gplx.fsdb.data; import gplx.dbs.*; public class Fsd_dir_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_owner_id, fld_name; private final Db_conn conn; private Db_stmt stmt_select_by_name; public Fsd_dir_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; - this.fld_id = flds.Add_int_pkey ("dir_id"); - this.fld_owner_id = flds.Add_int ("dir_owner_id"); - this.fld_name = flds.Add_str ("dir_name", 255); + this.fld_id = flds.AddIntPkey("dir_id"); + this.fld_owner_id = flds.AddInt("dir_owner_id"); + this.fld_name = flds.AddStr("dir_name", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = "fsdb_dir"; diff --git a/400_xowa/src/gplx/fsdb/data/Fsd_fil_tbl.java b/400_xowa/src/gplx/fsdb/data/Fsd_fil_tbl.java index 9329b23bc..1dc5c999a 100644 --- a/400_xowa/src/gplx/fsdb/data/Fsd_fil_tbl.java +++ b/400_xowa/src/gplx/fsdb/data/Fsd_fil_tbl.java @@ -13,24 +13,24 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.fsdb.data; import gplx.*; import gplx.fsdb.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.dbs.engines.sqlite.*; +package gplx.fsdb.data; import gplx.*; +import gplx.dbs.*; import gplx.dbs.qrys.*; public class Fsd_fil_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld_id, fld_owner_id, fld_name, fld_xtn_id, fld_ext_id, fld_size, fld_modified, fld_hash, fld_bin_db_id; private final String idx_owner; public final Db_conn conn; private Db_stmt stmt_insert, stmt_update, stmt_select_by_name; private int mnt_id; public Fsd_fil_tbl(Db_conn conn, boolean schema_is_1, int mnt_id) { this.conn = conn; this.mnt_id = mnt_id; - this.fld_id = flds.Add_int_pkey ("fil_id"); - this.fld_owner_id = flds.Add_int ("fil_owner_id"); - this.fld_xtn_id = flds.Add_int ("fil_xtn_id"); - this.fld_ext_id = flds.Add_int ("fil_ext_id"); - this.fld_bin_db_id = flds.Add_int ("fil_bin_db_id"); // group ints at beginning of table - this.fld_name = flds.Add_str ("fil_name", 255); - this.fld_size = flds.Add_long ("fil_size"); - this.fld_modified = flds.Add_str ("fil_modified", 14); // stored as yyyyMMddHHmmss - this.fld_hash = flds.Add_str ("fil_hash", 40); + this.fld_id = flds.AddIntPkey("fil_id"); + this.fld_owner_id = flds.AddInt("fil_owner_id"); + this.fld_xtn_id = flds.AddInt("fil_xtn_id"); + this.fld_ext_id = flds.AddInt("fil_ext_id"); + this.fld_bin_db_id = flds.AddInt("fil_bin_db_id"); // group ints at beginning of table + this.fld_name = flds.AddStr("fil_name", 255); + this.fld_size = flds.AddLong("fil_size"); + this.fld_modified = flds.AddStr("fil_modified", 14); // stored as yyyyMMddHHmmss + this.fld_hash = flds.AddStr("fil_hash", 40); this.idx_owner = Dbmeta_idx_itm.Bld_idx_name(tbl_name, "owner"); conn.Rls_reg(this); } @@ -78,7 +78,7 @@ public class Fsd_fil_tbl implements Db_tbl { } public Fsd_fil_itm Select_or_null(int dir_id, byte[] fil_name) { if (stmt_select_by_name == null) { - Db_qry__select_cmd qry = new Db_qry__select_cmd().From_(tbl_name).Cols_(flds.To_str_ary()).Where_(Db_crt_.eq_many_(fld_owner_id, fld_name)).Indexed_by_(idx_owner); + Db_qry__select_cmd qry = new Db_qry__select_cmd().From_(tbl_name).Cols_(flds.ToStrAry()).Where_(Db_crt_.eq_many_(fld_owner_id, fld_name)).Indexed_by_(idx_owner); stmt_select_by_name = conn.Stmt_new(qry); } Db_rdr rdr = stmt_select_by_name.Clear() @@ -91,7 +91,7 @@ public class Fsd_fil_tbl implements Db_tbl { finally {rdr.Rls();} } public void Select_all(Bry_bfr key_bfr, gplx.core.caches.Gfo_cache_mgr_bry cache) { - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); try { while (rdr.Move_next()) { Fsd_fil_itm fil = New_by_rdr(mnt_id, rdr); diff --git a/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl.java b/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl.java index d2e863d63..c83ff999b 100644 --- a/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl.java +++ b/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl.java @@ -13,31 +13,32 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.fsdb.data; import gplx.*; import gplx.fsdb.*; -import gplx.dbs.*; import gplx.fsdb.meta.*; import gplx.xowa.files.*; +package gplx.fsdb.data; import gplx.*; +import gplx.dbs.*; +import gplx.xowa.files.*; public class Fsd_thm_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld_id, fld_owner_id, fld_w, fld_h, fld_time, fld_page, fld_bin_db_id, fld_size, fld_modified, fld_hash; public final Db_conn conn; private Db_stmt stmt_insert, stmt_select_by_fil_exact, stmt_select_by_fil_near; private int mnt_id; private boolean schema_thm_page; public Fsd_thm_tbl(Db_conn conn, boolean schema_is_1, int mnt_id, boolean schema_thm_page) { this.conn = conn; this.mnt_id = mnt_id; this.schema_thm_page = schema_thm_page; this.tbl_name = schema_is_1 ? "fsdb_xtn_thm" : "fsdb_thm"; - this.fld_id = flds.Add_int_pkey ("thm_id"); - this.fld_owner_id = flds.Add_int ("thm_owner_id"); - this.fld_w = flds.Add_int ("thm_w"); - this.fld_h = flds.Add_int ("thm_h"); + this.fld_id = flds.AddIntPkey("thm_id"); + this.fld_owner_id = flds.AddInt("thm_owner_id"); + this.fld_w = flds.AddInt("thm_w"); + this.fld_h = flds.AddInt("thm_h"); if (schema_thm_page) { - this.fld_time = flds.Add_double ("thm_time"); - this.fld_page = flds.Add_int ("thm_page"); + this.fld_time = flds.AddDouble("thm_time"); + this.fld_page = flds.AddInt("thm_page"); } else { - this.fld_time = flds.Add_int ("thm_thumbtime"); - this.fld_page = Dbmeta_fld_itm.Key_null; + this.fld_time = flds.AddInt("thm_thumbtime"); + this.fld_page = DbmetaFldItm.KeyNull; } - this.fld_bin_db_id = flds.Add_int ("thm_bin_db_id"); - this.fld_size = flds.Add_long ("thm_size"); - this.fld_modified = flds.Add_str ("thm_modified", 14); // stored as yyyyMMddHHmmss - this.fld_hash = flds.Add_str ("thm_hash", 40); + this.fld_bin_db_id = flds.AddInt("thm_bin_db_id"); + this.fld_size = flds.AddLong("thm_size"); + this.fld_modified = flds.AddStr("thm_modified", 14); // stored as yyyyMMddHHmmss + this.fld_hash = flds.AddStr("thm_hash", 40); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -126,8 +127,8 @@ public class Fsd_thm_tbl implements Db_tbl { public static final DateAdp Modified_null = null; public static final String Hash_null = "", Modified_null_str = ""; public static boolean Match_nearest(List_adp list, Fsd_thm_itm thm, boolean schema_thm_page) { - int len = list.Count(); if (len == 0) return Bool_.N; - list.Sort_by(Fsdb_thm_itm_sorter.Instance); + int len = list.Len(); if (len == 0) return Bool_.N; + list.SortBy(Fsdb_thm_itm_sorter.Instance); int thm_w = thm.W(), thm_page = thm.Page(); double thm_time = thm.Time(); Fsd_thm_itm max = null; for (int i = 0; i < len; ++i) { diff --git a/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl_tst.java b/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl_tst.java index 30ca5cc54..721c60fc8 100644 --- a/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl_tst.java +++ b/400_xowa/src/gplx/fsdb/data/Fsd_thm_tbl_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.fsdb.data; import gplx.*; import gplx.fsdb.*; +package gplx.fsdb.data; import gplx.*; import org.junit.*; public class Fsd_thm_tbl_tst { @Before public void init() {fxt.Clear();} private Fsd_thm_tbl_fxt fxt = new Fsd_thm_tbl_fxt(); @@ -41,7 +41,7 @@ class Fsd_thm_tbl_fxt { rv.Init_by_req(w, time, page); return rv; } - public void Init_list(Fsd_thm_itm... ary) {list.Add_many((Object[])ary);} + public void Init_list(Fsd_thm_itm... ary) {list.AddMany((Object[])ary);} public void Test_match_nearest_itm(Fsd_thm_itm req, Fsd_thm_itm expd) { Fsd_thm_tbl.Match_nearest(list, req, Bool_.Y); if (expd == Fsd_thm_itm.Null) { diff --git a/400_xowa/src/gplx/fsdb/meta/Fsm_atr_tbl.java b/400_xowa/src/gplx/fsdb/meta/Fsm_atr_tbl.java index 5eefe2fab..cd521d069 100644 --- a/400_xowa/src/gplx/fsdb/meta/Fsm_atr_tbl.java +++ b/400_xowa/src/gplx/fsdb/meta/Fsm_atr_tbl.java @@ -14,9 +14,9 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.fsdb.meta; import gplx.*; import gplx.fsdb.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; +import gplx.dbs.*; public class Fsm_atr_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); private final String fld_uid, fld_url; private final Db_conn conn; public Fsm_atr_tbl(Db_conn conn, boolean schema_is_1) { @@ -24,13 +24,13 @@ public class Fsm_atr_tbl implements Db_tbl { String fld_prefix = ""; if (schema_is_1) {tbl_name = "fsdb_db_atr";} else {tbl_name = "fsdb_dba"; fld_prefix = "dba_";} - this.fld_uid = flds.Add_int_pkey (fld_prefix + "uid"); - this.fld_url = flds.Add_str (fld_prefix + "url", 255); + this.fld_uid = flds.AddIntPkey(fld_prefix + "uid"); + this.fld_url = flds.AddStr(fld_prefix + "url", 255); } public String Tbl_name() {return tbl_name;} private final String tbl_name; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public Fsm_atr_fil Select_1st_or_fail(Fsm_mnt_itm mnt_itm, Fsdb_db_mgr core_mgr, int mnt_id, boolean schema_thm_page) { - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); boolean schema_is_1 = core_mgr.File__schema_is_1(); try { if (rdr.Move_next()) { diff --git a/400_xowa/src/gplx/fsdb/meta/Fsm_bin_mgr.java b/400_xowa/src/gplx/fsdb/meta/Fsm_bin_mgr.java index 10193cd32..6cd48aa09 100644 --- a/400_xowa/src/gplx/fsdb/meta/Fsm_bin_mgr.java +++ b/400_xowa/src/gplx/fsdb/meta/Fsm_bin_mgr.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.fsdb.meta; import gplx.*; import gplx.fsdb.*; -import gplx.core.ios.*; import gplx.core.ios.streams.*; import gplx.dbs.*; +import gplx.core.ios.streams.*; import gplx.dbs.*; public class Fsm_bin_mgr { private final Fsdb_db_mgr core_mgr; private final int mnt_id; private final Fsm_bin_tbl tbl; private final Ordered_hash db_hash = Ordered_hash_.New(); @@ -35,7 +35,7 @@ public class Fsm_bin_mgr { public int Dbs__len() {return db_hash.Len();} public Fsm_bin_fil Dbs__get_nth() {return nth_db;} public Fsm_bin_fil Dbs__get_at(int i) {return (Fsm_bin_fil)db_hash.Get_at(i);} - public Fsm_bin_fil Dbs__get_by_or_null(int i) {return (Fsm_bin_fil)db_hash.Get_by(i);} + public Fsm_bin_fil Dbs__get_by_or_null(int i) {return (Fsm_bin_fil)db_hash.GetByOrNull(i);} public Fsm_bin_fil Dbs__make(String file_name) {return Dbs__make(db_hash.Len(), file_name);} public Fsm_bin_fil Dbs__make(int id, String file_name) { Fsdb_db_file db = core_mgr.File__bin_file__new(mnt_id, file_name); @@ -46,7 +46,7 @@ public class Fsm_bin_mgr { return rv; } public void Insert(int db_id, int bin_id, byte owner_tid, long bin_len, Io_stream_rdr bin_rdr) { - Fsm_bin_fil fil = (Fsm_bin_fil)db_hash.Get_by(db_id); + Fsm_bin_fil fil = (Fsm_bin_fil)db_hash.GetByOrNull(db_id); fil.Insert(bin_id, owner_tid, bin_len, bin_rdr); fil.Insert(bin_id, owner_tid, bin_len, bin_rdr); } diff --git a/400_xowa/src/gplx/fsdb/meta/Fsm_bin_tbl.java b/400_xowa/src/gplx/fsdb/meta/Fsm_bin_tbl.java index 2c2ce5cfc..631539a80 100644 --- a/400_xowa/src/gplx/fsdb/meta/Fsm_bin_tbl.java +++ b/400_xowa/src/gplx/fsdb/meta/Fsm_bin_tbl.java @@ -14,9 +14,9 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.fsdb.meta; import gplx.*; import gplx.fsdb.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; +import gplx.dbs.*; public class Fsm_bin_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_uid, fld_url, fld_bin_len, fld_bin_max; private final Db_conn conn; private int mnt_id; public Fsm_bin_tbl(Db_conn conn, boolean schema_is_1, int mnt_id) { @@ -24,15 +24,15 @@ public class Fsm_bin_tbl implements Db_tbl { String fld_prefix = ""; if (schema_is_1) {tbl_name = "fsdb_db_bin";} else {tbl_name = "fsdb_dbb"; fld_prefix = "dbb_";} - fld_uid = flds.Add_int_pkey (fld_prefix + "uid"); - fld_url = flds.Add_str (fld_prefix + "url", 255); + fld_uid = flds.AddIntPkey(fld_prefix + "uid"); + fld_url = flds.AddStr(fld_prefix + "url", 255); if (schema_is_1) { - fld_bin_len = flds.Add_long("bin_len"); - fld_bin_max = flds.Add_long("bin_max"); + fld_bin_len = flds.AddLong("bin_len"); + fld_bin_max = flds.AddLong("bin_max"); } else { - fld_bin_len = Dbmeta_fld_itm.Key_null; - fld_bin_max = Dbmeta_fld_itm.Key_null; + fld_bin_len = DbmetaFldItm.KeyNull; + fld_bin_max = DbmetaFldItm.KeyNull; } } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -42,7 +42,7 @@ public class Fsm_bin_tbl implements Db_tbl { } public Fsm_bin_fil[] Select_all(Fsdb_db_mgr db_conn_mgr) { List_adp rv = List_adp_.New(); - Db_rdr rdr = conn.Stmt_select_order(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty, fld_uid).Clear().Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select_order(tbl_name, flds, DbmetaFldItm.StrAryEmpty, fld_uid).Clear().Exec_select__rls_auto(); try { while (rdr.Move_next()) { int bin_id = rdr.Read_int(fld_uid); @@ -52,7 +52,7 @@ public class Fsm_bin_tbl implements Db_tbl { rv.Add(itm); } } finally {rdr.Rls();} - return (Fsm_bin_fil[])rv.To_ary(Fsm_bin_fil.class); + return (Fsm_bin_fil[])rv.ToAry(Fsm_bin_fil.class); } public void Rls() {} } diff --git a/400_xowa/src/gplx/fsdb/meta/Fsm_cfg_mgr.java b/400_xowa/src/gplx/fsdb/meta/Fsm_cfg_mgr.java index b3b66fbea..2a67fcdbf 100644 --- a/400_xowa/src/gplx/fsdb/meta/Fsm_cfg_mgr.java +++ b/400_xowa/src/gplx/fsdb/meta/Fsm_cfg_mgr.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.fsdb.meta; import gplx.*; import gplx.fsdb.*; -import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.fsdb.meta.*; +import gplx.dbs.*; import gplx.dbs.cfgs.*; public class Fsm_cfg_mgr { private final Db_cfg_tbl tbl; private final Hash_adp grp_hash = Hash_adp_.New(); public Fsm_cfg_mgr(Fsdb_db_mgr db_conn_mgr, Db_conn conn) { @@ -40,7 +40,7 @@ public class Fsm_cfg_mgr { public boolean Patch__page_gt_1() {return patch__page_gt_1;} private boolean patch__page_gt_1 = false; public void Patch__save(String cfg_key) {tbl.Insert_yn(Fsm_cfg_mgr.Grp_core, cfg_key, Bool_.Y);} public Db_cfg_hash Grps_get_or_load(String grp_key) { - Db_cfg_hash rv = (Db_cfg_hash)grp_hash.Get_by(grp_key); + Db_cfg_hash rv = (Db_cfg_hash)grp_hash.GetByOrNull(grp_key); if (rv == null) { rv = tbl.Select_as_hash(grp_key); grp_hash.Add(grp_key, rv); diff --git a/400_xowa/src/gplx/fsdb/meta/Fsm_mnt_tbl.java b/400_xowa/src/gplx/fsdb/meta/Fsm_mnt_tbl.java index d88e63f79..fadc5d43c 100644 --- a/400_xowa/src/gplx/fsdb/meta/Fsm_mnt_tbl.java +++ b/400_xowa/src/gplx/fsdb/meta/Fsm_mnt_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.fsdb.meta; import gplx.*; import gplx.fsdb.*; +package gplx.fsdb.meta; import gplx.*; import gplx.dbs.*; public class Fsm_mnt_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_name, fld_url; private final Db_conn conn; public Fsm_mnt_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; - fld_id = flds.Add_int_pkey ("mnt_id"); - fld_name = flds.Add_str ("mnt_name", 255); - fld_url = flds.Add_str ("mnt_url", 255); + fld_id = flds.AddIntPkey("mnt_id"); + fld_name = flds.AddStr("mnt_name", 255); + fld_url = flds.AddStr("mnt_url", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = "fsdb_mnt"; @@ -44,7 +44,7 @@ public class Fsm_mnt_tbl implements Db_tbl { } public Fsm_mnt_itm[] Select_all() { List_adp list = List_adp_.New(); - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Clear().Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Clear().Exec_select__rls_auto(); try { while (rdr.Move_next()) { Fsm_mnt_itm itm = new Fsm_mnt_itm(rdr.Read_int(fld_id), rdr.Read_str(fld_name), rdr.Read_str(fld_url)); @@ -52,7 +52,7 @@ public class Fsm_mnt_tbl implements Db_tbl { } } finally {rdr.Rls();} - return (Fsm_mnt_itm[])list.To_ary_and_clear(Fsm_mnt_itm.class); + return (Fsm_mnt_itm[])list.ToAryAndClear(Fsm_mnt_itm.class); } public static final String Mnt_name_main = "fsdb.main", Mnt_name_user = "fsdb.user"; } diff --git a/400_xowa/src/gplx/gfui/Gfui_bnd_parser.java b/400_xowa/src/gplx/gfui/Gfui_bnd_parser.java index 294e6c9de..f6bbb3337 100644 --- a/400_xowa/src/gplx/gfui/Gfui_bnd_parser.java +++ b/400_xowa/src/gplx/gfui/Gfui_bnd_parser.java @@ -88,7 +88,7 @@ public class Gfui_bnd_parser { ++pos; itm_bgn = itm_end = -1; } - int tkns_len = tkns.Count(); + int tkns_len = tkns.Len(); for (int i = 0; i < tkns_len; i++) { Gfui_bnd_tkn tkn = (Gfui_bnd_tkn)tkns.Get_at(i); tkn.Write(tmp_bfr, !src_is_gfui); @@ -267,7 +267,7 @@ public class Gfui_bnd_parser { byte[] norm_bry = Bry_.new_u8(norm); Gfui_bnd_tkn itm = new Gfui_bnd_tkn(tid, Gfui_bnd_tkn.Keycode_null, gfui_bry, norm_bry); gfui_regy.Add(gfui_bry, itm); - norm_regy.Add_if_dupe_use_1st(norm_bry, itm); + norm_regy.AddIfDupeUse1st(norm_bry, itm); } private static final int Mod_val_null = 0; public static Gfui_bnd_parser new_en_() {return new Gfui_bnd_parser().Init_en();} Gfui_bnd_parser() {} diff --git a/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_int_tst.java b/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_int_tst.java index 0de1f5120..8377b8164 100644 --- a/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_int_tst.java +++ b/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_int_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.dsvs; import gplx.*; import gplx.langs.*; +package gplx.langs.dsvs; import gplx.*; import org.junit.*; public class Dsv_tbl_parser_int_tst { private Dsv_mok_fxt fxt = new Dsv_mok_fxt(); @@ -36,7 +36,7 @@ class Mok_int_itm implements To_str_able { } class Mok_int_mgr extends Mok_mgr_base { public void Clear() {itms.Clear();} - @Override public To_str_able[] Itms() {return (To_str_able[])itms.To_ary(To_str_able.class);} private List_adp itms = List_adp_.New(); + @Override public To_str_able[] Itms() {return (To_str_able[])itms.ToAry(To_str_able.class);} private List_adp itms = List_adp_.New(); private String fld_0; private int fld_1, fld_2; @Override public Dsv_fld_parser[] Fld_parsers() { diff --git a/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_str_tst.java b/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_str_tst.java index 7296b8d3d..7abc6b1d7 100644 --- a/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_str_tst.java +++ b/400_xowa/src/gplx/langs/dsvs/Dsv_tbl_parser_str_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.dsvs; import gplx.*; import gplx.langs.*; +package gplx.langs.dsvs; import gplx.*; import org.junit.*; public class Dsv_tbl_parser_str_tst { private Dsv_mok_fxt fxt = new Dsv_mok_fxt(); @@ -88,7 +88,7 @@ class Mok_str_mgr extends Mok_mgr_base { this.flds_len = flds_len; } public void Clear() {itms.Clear();} - @Override public To_str_able[] Itms() {return (To_str_able[])itms.To_ary(To_str_able.class);} private List_adp itms = List_adp_.New(); + @Override public To_str_able[] Itms() {return (To_str_able[])itms.ToAry(To_str_able.class);} private List_adp itms = List_adp_.New(); private List_adp flds = List_adp_.New(); @Override public boolean Write_bry(Dsv_tbl_parser parser, int fld_idx, byte[] src, int bgn, int end) { flds.Add(String_.new_u8(src, bgn, end)); @@ -101,7 +101,7 @@ class Mok_str_mgr extends Mok_mgr_base { return rv; } @Override public void Commit_itm(Dsv_tbl_parser parser, int pos) { - Mok_str_itm itm = new Mok_str_itm((String[])flds.To_ary_and_clear(String.class)); + Mok_str_itm itm = new Mok_str_itm((String[])flds.ToAryAndClear(String.class)); itms.Add(itm); } } diff --git a/400_xowa/src/gplx/langs/gfs/Gfs_parser_ctx.java b/400_xowa/src/gplx/langs/gfs/Gfs_parser_ctx.java index e41d7550a..b71e3332d 100644 --- a/400_xowa/src/gplx/langs/gfs/Gfs_parser_ctx.java +++ b/400_xowa/src/gplx/langs/gfs/Gfs_parser_ctx.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.gfs; import gplx.*; import gplx.langs.*; +package gplx.langs.gfs; import gplx.*; import gplx.core.btries.*; class Gfs_parser_ctx { public Btrie_fast_mgr Trie() {return trie;} Btrie_fast_mgr trie; @@ -53,10 +53,10 @@ class Gfs_parser_ctx { cur_nde.Atrs_add(nde); return nde; } - public void Cur_nde_from_stack() {cur_nde = (Gfs_nde)nodes.Get_at_last();} + public void Cur_nde_from_stack() {cur_nde = (Gfs_nde)nodes.GetAtLast();} public void Stack_add() {nodes.Add(cur_nde);} List_adp nodes = List_adp_.New(); public void Stack_pop(int pos) { - if (nodes.Count() < 2) err_mgr.Fail_nde_stack_empty(this, pos); // NOTE: need at least 2 items; 1 to pop and 1 to set as current + if (nodes.Len() < 2) err_mgr.Fail_nde_stack_empty(this, pos); // NOTE: need at least 2 items; 1 to pop and 1 to set as current List_adp_.Del_at_last(nodes); Cur_nde_from_stack(); } diff --git a/400_xowa/src/gplx/langs/htmls/Gfh_parser.java b/400_xowa/src/gplx/langs/htmls/Gfh_parser.java index 28fedb2f0..70157e55b 100644 --- a/400_xowa/src/gplx/langs/htmls/Gfh_parser.java +++ b/400_xowa/src/gplx/langs/htmls/Gfh_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.htmls; import gplx.*; import gplx.langs.*; +package gplx.langs.htmls; import gplx.*; import gplx.core.brys.*; public class Gfh_parser { public Gfh_parser() { @@ -51,7 +51,7 @@ public class Gfh_parser { break; } } - return (Gfh_nde[])rv.To_ary(Gfh_nde.class); + return (Gfh_nde[])rv.ToAry(Gfh_nde.class); } int cur_lhs_bgn, cur_lhs_end, cur_name_bgn, cur_name_end, cur_rhs_bgn; boolean xnde_init = true, tag_tid_is_inline = false; private boolean Parse_xnde_rhs() { diff --git a/400_xowa/src/gplx/langs/htmls/Gfh_selecter.java b/400_xowa/src/gplx/langs/htmls/Gfh_selecter.java index 6e64bc116..94eb6715d 100644 --- a/400_xowa/src/gplx/langs/htmls/Gfh_selecter.java +++ b/400_xowa/src/gplx/langs/htmls/Gfh_selecter.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.langs.htmls; import gplx.*; import gplx.langs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.langs.htmls; import gplx.*; public class Gfh_selecter { public static Gfh_nde[] Select(byte[] src, Gfh_nde[] ary, Hash_adp_bry hash) { List_adp list = List_adp_.New(); @@ -31,7 +31,7 @@ public class Gfh_selecter { } } } - Gfh_nde[] rv = (Gfh_nde[])list.To_ary(Gfh_nde.class); + Gfh_nde[] rv = (Gfh_nde[])list.ToAry(Gfh_nde.class); list.Clear(); return rv; } diff --git a/400_xowa/src/gplx/langs/htmls/clses/Gfh_class_parser__tst.java b/400_xowa/src/gplx/langs/htmls/clses/Gfh_class_parser__tst.java index 1cdf763a8..e4f2acc34 100644 --- a/400_xowa/src/gplx/langs/htmls/clses/Gfh_class_parser__tst.java +++ b/400_xowa/src/gplx/langs/htmls/clses/Gfh_class_parser__tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.htmls.clses; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*; +package gplx.langs.htmls.clses; import gplx.*; import org.junit.*; public class Gfh_class_parser__tst { private final Gfh_class_parser__fxt fxt = new Gfh_class_parser__fxt(); @@ -37,6 +37,6 @@ class Gfh_class_wkr__list implements Gfh_class_parser_wkr { } public String[] Parse(byte[] src, int src_bgn, int src_end) { Gfh_class_parser_.Parse(src, src_bgn, src_end, this); - return (String[])list.To_ary_and_clear(String.class); + return (String[])list.ToAryAndClear(String.class); } } diff --git a/400_xowa/src/gplx/langs/htmls/docs/Gfh_tag.java b/400_xowa/src/gplx/langs/htmls/docs/Gfh_tag.java index d826a3384..3051346e0 100644 --- a/400_xowa/src/gplx/langs/htmls/docs/Gfh_tag.java +++ b/400_xowa/src/gplx/langs/htmls/docs/Gfh_tag.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.htmls.docs; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*; +package gplx.langs.htmls.docs; import gplx.*; +import gplx.langs.htmls.*; import gplx.xowa.parsers.htmls.*; import gplx.langs.htmls.styles.*; import gplx.langs.htmls.clses.*; public class Gfh_tag implements Mwh_atr_wkr { private Gfh_tag_rdr tag_rdr; @@ -51,21 +52,21 @@ public class Gfh_tag implements Mwh_atr_wkr { public boolean Tag_is_tail() {return tag_is_tail;} private boolean tag_is_tail; public boolean Tag_is_inline() {return tag_is_inline;} private boolean tag_is_inline; public Ordered_hash Atrs__hash() {if (atrs_null) Atrs__make(); return atrs_hash;} - public int Atrs__len() {if (atrs_null) Atrs__make(); return atrs_hash.Count();} + public int Atrs__len() {if (atrs_null) Atrs__make(); return atrs_hash.Len();} public boolean Atrs__match_pair(byte[] key, byte[] val) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(key); + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(key); return rv == null ? false : Bry_.Eq(val, rv.Val()); } public boolean Atrs__cls_has(byte[] val) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(Gfh_atr_.Bry__class); if (rv == null) return false; + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(Gfh_atr_.Bry__class); if (rv == null) return false; byte[] rv_val = rv.Val(); return Gfh_class_.Has(rv_val, 0, rv_val.length, val); } public boolean Atrs__cls_eq(byte[] val) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(Gfh_atr_.Bry__class); if (rv == null) return false; + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(Gfh_atr_.Bry__class); if (rv == null) return false; return Bry_.Eq(val, rv.Val()); } public byte Atrs__cls_find_or_fail(Hash_adp_bry hash) { @@ -74,23 +75,23 @@ public class Gfh_tag implements Mwh_atr_wkr { } public byte Atrs__cls_find_or(Hash_adp_bry hash, byte or) { if (atrs_null) Atrs__make(); - Gfh_atr cls_atr = (Gfh_atr)atrs_hash.Get_by(Gfh_atr_.Bry__class); if (cls_atr == null) return or; + Gfh_atr cls_atr = (Gfh_atr)atrs_hash.GetByOrNull(Gfh_atr_.Bry__class); if (cls_atr == null) return or; byte rv = Gfh_class_.Find_1st(src, cls_atr.Val_bgn(), cls_atr.Val_end(), hash); if (rv == Byte_.Max_value_127) return or; return rv; } public int Atrs__style_get_as_int(byte[] key) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(Gfh_atr_.Bry__style); if (rv == null) return -1; + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(Gfh_atr_.Bry__style); if (rv == null) return -1; byte[] rv_val = rv.Val(); return style_wkr.Parse(rv_val, 0, rv_val.length, key); } public boolean Atrs__has(byte[] key) { if (atrs_null) Atrs__make(); - return atrs_hash.Get_by(key) != null; + return atrs_hash.GetByOrNull(key) != null; } public byte[] Atrs__get_as_bry(byte[] key) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(key); + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(key); return rv == null ? Bry_.Empty : rv.Val(); } public int Atrs__get_as_int(byte[] key) { @@ -99,12 +100,12 @@ public class Gfh_tag implements Mwh_atr_wkr { } public int Atrs__get_as_int_or(byte[] key, int or) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(key); if (rv == null) return or; + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(key); if (rv == null) return or; return Bry_.To_int_or(src, rv.Val_bgn(), rv.Val_end(), or); } public double Atrs__get_as_double_or(byte[] key, double or) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(key); if (rv == null) return or; + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(key); if (rv == null) return or; return Bry_.To_double_or(src, rv.Val_bgn(), rv.Val_end(), or); } public Gfh_atr Atrs__get_at(int i) {return (Gfh_atr)atrs_hash.Get_at(i);} @@ -112,7 +113,7 @@ public class Gfh_tag implements Mwh_atr_wkr { public Gfh_atr Atrs__get_by_or_empty(byte[] key) {return Atrs__get_by_or_fail(key, Bool_.N);} public Gfh_atr Atrs__get_by_or_fail(byte[] key, boolean fail_if_null) { if (atrs_null) Atrs__make(); - Gfh_atr rv = (Gfh_atr)atrs_hash.Get_by(key); + Gfh_atr rv = (Gfh_atr)atrs_hash.GetByOrNull(key); if (rv == null) { if (fail_if_null) tag_rdr.Err_wkr().Fail("atr missing", "key", key); else return Gfh_atr.Noop; @@ -122,7 +123,7 @@ public class Gfh_tag implements Mwh_atr_wkr { public String Atrs__print() { if (atrs_null) Atrs__make(); Bry_bfr bfr = Bry_bfr_.New(); - int len = atrs_hash.Count(); + int len = atrs_hash.Len(); for (int i = 0; i < len; ++i) { Gfh_atr atr = (Gfh_atr)atrs_hash.Get_at(i); bfr.Add(atr.Key()).Add_byte_eq().Add(atr.Val()).Add_byte_nl(); @@ -147,7 +148,7 @@ public class Gfh_tag implements Mwh_atr_wkr { } else val_bry = key_bry; - Gfh_atr atr = new Gfh_atr(atrs_hash.Count(), atr_bgn, atr_end, key_bry, val_bry, src, val_bgn, val_end); + Gfh_atr atr = new Gfh_atr(atrs_hash.Len(), atr_bgn, atr_end, key_bry, val_bry, src, val_bgn, val_end); atrs_hash.Add(key_bry, atr); } public String To_str() { @@ -157,7 +158,7 @@ public class Gfh_tag implements Mwh_atr_wkr { } private static Ordered_hash Copy(Ordered_hash src) { Ordered_hash rv = Ordered_hash_.New(); - int len = src.Count(); + int len = src.Len(); for (int i = 0; i < len; ++i) { Gfh_atr atr = (Gfh_atr)src.Get_at(i); rv.Add(atr.Key(), atr); diff --git a/400_xowa/src/gplx/langs/htmls/styles/Gfh_style_wkr__ary.java b/400_xowa/src/gplx/langs/htmls/styles/Gfh_style_wkr__ary.java index 4569cea04..ce4b200bd 100644 --- a/400_xowa/src/gplx/langs/htmls/styles/Gfh_style_wkr__ary.java +++ b/400_xowa/src/gplx/langs/htmls/styles/Gfh_style_wkr__ary.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.htmls.styles; import gplx.*; import gplx.langs.*; import gplx.langs.htmls.*; +package gplx.langs.htmls.styles; import gplx.*; public class Gfh_style_wkr__ary implements Gfh_style_wkr { private final List_adp list = List_adp_.New(); public boolean On_atr(byte[] src, int atr_idx, int atr_val_bgn, int atr_val_end, int itm_bgn, int itm_End, int key_bgn, int key_end, int val_bgn, int val_end) { byte[] key = Bry_.Mid(src, key_bgn, key_end); byte[] val = Bry_.Mid(src, val_bgn, val_end); - list.Add(new Gfh_style_itm(list.Count(), key, val)); + list.Add(new Gfh_style_itm(list.Len(), key, val)); return true; } public Gfh_style_itm[] Parse(byte[] src, int src_bgn, int src_end) { Gfh_style_parser_.Parse(src, src_bgn, src_end, this); - return (Gfh_style_itm[])list.To_ary_and_clear(Gfh_style_itm.class); + return (Gfh_style_itm[])list.ToAryAndClear(Gfh_style_itm.class); } } diff --git a/400_xowa/src/gplx/langs/mustaches/Mustache_itm_render_tst.java b/400_xowa/src/gplx/langs/mustaches/Mustache_itm_render_tst.java index 5fc76201c..c4917489c 100644 --- a/400_xowa/src/gplx/langs/mustaches/Mustache_itm_render_tst.java +++ b/400_xowa/src/gplx/langs/mustaches/Mustache_itm_render_tst.java @@ -173,17 +173,17 @@ class Mustache_doc_itm__mock implements Mustache_doc_itm { public Mustache_doc_itm__mock Add_bool_n(String key) {hash_bool.Add(key, Bool_obj_ref.n_()); return this;} public Mustache_doc_itm__mock Add_subs(String key, Mustache_doc_itm__mock... ary) {hash_subs.Add(key, ary); return this;} public boolean Mustache__write(String key, Mustache_bfr bfr) { - byte[] rv = (byte[])hash_prop.Get_by(key); + byte[] rv = (byte[])hash_prop.GetByOrNull(key); if (rv == null) return false; bfr.Add_bry(rv); return true; } public Mustache_doc_itm[] Mustache__subs(String key) { - Object rv = hash_bool.Get_by(key); + Object rv = hash_bool.GetByOrNull(key); if (rv != null) { boolean bool_val = ((Bool_obj_ref)rv).Val(); return bool_val ? Mustache_doc_itm_.Ary__bool__y : Mustache_doc_itm_.Ary__bool__n; } - return (Mustache_doc_itm__mock[])hash_subs.Get_by(key); + return (Mustache_doc_itm__mock[])hash_subs.GetByOrNull(key); } } diff --git a/400_xowa/src/gplx/langs/mustaches/Mustache_tkn_parser.java b/400_xowa/src/gplx/langs/mustaches/Mustache_tkn_parser.java index 372ecc71a..f7f2b4495 100644 --- a/400_xowa/src/gplx/langs/mustaches/Mustache_tkn_parser.java +++ b/400_xowa/src/gplx/langs/mustaches/Mustache_tkn_parser.java @@ -1,174 +1,174 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.langs.mustaches; - -import gplx.Bry_; -import gplx.Bry_find_; -import gplx.Byte_ascii; -import gplx.Err; -import gplx.Err_; -import gplx.Io_mgr; -import gplx.Io_url; -import gplx.List_adp; -import gplx.List_adp_; - -public class Mustache_tkn_parser { - private byte[] src; private int src_end; - private Io_url template_root; - private final Mustache_tkn_def tkn_def = new Mustache_tkn_def(); - public Mustache_tkn_parser() { - } - public Mustache_tkn_parser(Io_url template_root) { - this.template_root = template_root; - } - public Mustache_tkn_itm Parse(String template) { return Parse(template, Bry_.Empty); } - public Mustache_tkn_itm Parse(String template, byte[] default_text) { - byte[] template_data = Io_mgr.Instance.LoadFilBryOr(template_root.GenSubFil_nest(template + ".mustache"), default_text); - return Parse(template_data, 0, template_data.length); - } - public Mustache_tkn_itm Parse(byte[] src) {return Parse(src, 0, src.length);} - public Mustache_tkn_itm Parse(byte[] src, int src_bgn, int src_end) { - this.src = src; this.src_end = src_end; - Mustache_tkn_root root = new Mustache_tkn_root(); - Parse_grp(root, src_bgn); - return root; - } - private int Parse_grp(Mustache_tkn_itm owner, int src_bgn) { - List_adp subs_list = List_adp_.New(); - int txt_bgn = src_bgn; - boolean end_grp = false; - while (true) {// loop for "{{" - int lhs_bgn = Bry_find_.Find_fwd(src, tkn_def.Variable_lhs, txt_bgn, src_end); // next "{{" - if (lhs_bgn == Bry_find_.Not_found) { // no more "{{" - subs_list.Add(new Mustache_tkn_text(src, txt_bgn, src_end)); // add everything between prv "}}" and cur "{{" - break; - } - int lhs_end = lhs_bgn + tkn_def.Variable_lhs_len; - - Mustache_tkn_data tkn_data = new Mustache_tkn_data(src[lhs_end]); // preview tkn - lhs_end += tkn_data.lhs_end_adj; - - int rhs_bgn = Bry_find_.Find_fwd(src, tkn_def.Variable_rhs, lhs_end, src_end); // next "}}" - if (rhs_bgn == Bry_find_.Not_found) throw Fail(lhs_bgn, "unclosed tag"); // fail if no "}}" - int rhs_end = rhs_bgn + tkn_def.Variable_rhs_len; - if (tkn_data.rhs_bgn_chk != Byte_ascii.Null) { - if (src[rhs_bgn] != tkn_data.rhs_bgn_chk) throw Fail(lhs_end, "invalid check byte"); - ++rhs_end; // skip the chk_byte; note that bottom of function will skip "}}" by adding +2 - } - - - int txt_end = lhs_bgn; // get text tkn - if (tkn_data.ws_ignore) { - int new_txt_bgn = Trim_bwd_to_nl(src, txt_bgn, txt_end); - if (new_txt_bgn != -1) { - int new_txt_end = Trim_fwd_to_nl(src, rhs_end, src_end); - if (new_txt_end != -1) { - txt_end = new_txt_bgn; - rhs_end = new_txt_end == src_end ? src_end : new_txt_end + 1; - } - } - } - if (txt_end > txt_bgn) // ignore 0-byte text tkns; occurs when consecutive tkns; EX: {{v1}}{{v2}} will try to create text tkn between "}}{{" - subs_list.Add(new Mustache_tkn_text(src, txt_bgn, txt_end)); // add everything between prv "}}" and cur "{{" - - txt_bgn = Parse_itm(tkn_data, subs_list, lhs_end, rhs_bgn, rhs_end); // do parse - if (txt_bgn < 0) { // NOTE: txt_bgn < 0 means end grp - txt_bgn *= -1; - end_grp = true; - } - if (end_grp) break; - } - if (subs_list.Count() > 0) // don't create subs if no members - owner.Subs_ary_((Mustache_tkn_itm[])subs_list.To_ary_and_clear(Mustache_tkn_itm.class)); - return txt_bgn; - } - private int Parse_itm(Mustache_tkn_data tkn_data, List_adp subs_list, int lhs_end, int rhs_bgn, int rhs_end) { - byte[] val_bry = Bry_.Mid(src, lhs_end, rhs_bgn); - Mustache_tkn_base tkn = null; - switch (tkn_data.tid) { - default: throw Err_.new_unhandled(tkn_data.tid); - case Mustache_tkn_def.Variable: tkn = new Mustache_tkn_variable(val_bry); break; - case Mustache_tkn_def.Comment: tkn = new Mustache_tkn_comment(); break; - case Mustache_tkn_def.Partial: tkn = new Mustache_tkn_partial(val_bry, template_root); break; - case Mustache_tkn_def.Delimiter_bgn: tkn = new Mustache_tkn_delimiter(val_bry); break; // TODO_OLD: implement delimiter; EX: {{=<% %>=}} - case Mustache_tkn_def.Escape_bgn: tkn = new Mustache_tkn_escape(val_bry); break; - case Mustache_tkn_def.Section: tkn = new Mustache_tkn_section(val_bry); break; - case Mustache_tkn_def.Inverted: tkn = new Mustache_tkn_inverted(val_bry); break; - case Mustache_tkn_def.Grp_end: { - return -(rhs_end); // pop the stack - } - } - subs_list.Add(tkn); - if (tkn_data.parse_grp) { - return Parse_grp(tkn, rhs_end); - } - else - return rhs_end; - } - private Err Fail(int pos, String fmt, Object... args) { - return Err_.new_("mustache", fmt, "excerpt", Bry_.Mid_by_len_safe(src, pos, 32)); - } - private static int Trim_bwd_to_nl(byte[] src, int txt_bgn, int txt_end) { - int stop = txt_bgn - 1; - int pos = txt_end - 1; - while (pos > stop) { - byte b = src[pos]; - switch (b) { - case Byte_ascii.Tab: - case Byte_ascii.Space: --pos; break; - case Byte_ascii.Nl: return pos + 1; // 1 char after \n - default: return -1; - } - } - return -1; - } - private static int Trim_fwd_to_nl(byte[] src, int txt_bgn, int txt_end) { - int pos = txt_bgn; - while (pos < txt_end) { - byte b = src[pos]; - switch (b) { - case Byte_ascii.Tab: - case Byte_ascii.Space: ++pos; break; - case Byte_ascii.Nl: return pos; - default: return -1; - } - } - return -1; - } -} -class Mustache_tkn_data { - public int tid; - public int lhs_end_adj; - public byte rhs_bgn_chk; - public boolean parse_grp; - public boolean ws_ignore; - public Mustache_tkn_data(byte b) { - tid = b; - parse_grp = ws_ignore = false; - lhs_end_adj = 1; - rhs_bgn_chk = Byte_ascii.Null; - switch (b) { - default: lhs_end_adj = 0; tid = Mustache_tkn_def.Variable; break; - case Mustache_tkn_def.Comment: - case Mustache_tkn_def.Partial: - case Mustache_tkn_def.Grp_end: ws_ignore = true; break; - case Mustache_tkn_def.Delimiter_bgn: rhs_bgn_chk = Mustache_tkn_def.Delimiter_end; break; // check for "=}}"; TODO_OLD: implement delimiter; EX: {{=<% %>=}} - case Mustache_tkn_def.Escape_bgn: rhs_bgn_chk = Mustache_tkn_def.Escape_end; break; // check for "" - case Mustache_tkn_def.Section: - case Mustache_tkn_def.Inverted: ws_ignore = true; parse_grp = true; break; - } - } -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.langs.mustaches; + +import gplx.Bry_; +import gplx.Bry_find_; +import gplx.Byte_ascii; +import gplx.Err; +import gplx.Err_; +import gplx.Io_mgr; +import gplx.Io_url; +import gplx.List_adp; +import gplx.List_adp_; + +public class Mustache_tkn_parser { + private byte[] src; private int src_end; + private Io_url template_root; + private final Mustache_tkn_def tkn_def = new Mustache_tkn_def(); + public Mustache_tkn_parser() { + } + public Mustache_tkn_parser(Io_url template_root) { + this.template_root = template_root; + } + public Mustache_tkn_itm Parse(String template) { return Parse(template, Bry_.Empty); } + public Mustache_tkn_itm Parse(String template, byte[] default_text) { + byte[] template_data = Io_mgr.Instance.LoadFilBryOr(template_root.GenSubFil_nest(template + ".mustache"), default_text); + return Parse(template_data, 0, template_data.length); + } + public Mustache_tkn_itm Parse(byte[] src) {return Parse(src, 0, src.length);} + public Mustache_tkn_itm Parse(byte[] src, int src_bgn, int src_end) { + this.src = src; this.src_end = src_end; + Mustache_tkn_root root = new Mustache_tkn_root(); + Parse_grp(root, src_bgn); + return root; + } + private int Parse_grp(Mustache_tkn_itm owner, int src_bgn) { + List_adp subs_list = List_adp_.New(); + int txt_bgn = src_bgn; + boolean end_grp = false; + while (true) {// loop for "{{" + int lhs_bgn = Bry_find_.Find_fwd(src, tkn_def.Variable_lhs, txt_bgn, src_end); // next "{{" + if (lhs_bgn == Bry_find_.Not_found) { // no more "{{" + subs_list.Add(new Mustache_tkn_text(src, txt_bgn, src_end)); // add everything between prv "}}" and cur "{{" + break; + } + int lhs_end = lhs_bgn + tkn_def.Variable_lhs_len; + + Mustache_tkn_data tkn_data = new Mustache_tkn_data(src[lhs_end]); // preview tkn + lhs_end += tkn_data.lhs_end_adj; + + int rhs_bgn = Bry_find_.Find_fwd(src, tkn_def.Variable_rhs, lhs_end, src_end); // next "}}" + if (rhs_bgn == Bry_find_.Not_found) throw Fail(lhs_bgn, "unclosed tag"); // fail if no "}}" + int rhs_end = rhs_bgn + tkn_def.Variable_rhs_len; + if (tkn_data.rhs_bgn_chk != Byte_ascii.Null) { + if (src[rhs_bgn] != tkn_data.rhs_bgn_chk) throw Fail(lhs_end, "invalid check byte"); + ++rhs_end; // skip the chk_byte; note that bottom of function will skip "}}" by adding +2 + } + + + int txt_end = lhs_bgn; // get text tkn + if (tkn_data.ws_ignore) { + int new_txt_bgn = Trim_bwd_to_nl(src, txt_bgn, txt_end); + if (new_txt_bgn != -1) { + int new_txt_end = Trim_fwd_to_nl(src, rhs_end, src_end); + if (new_txt_end != -1) { + txt_end = new_txt_bgn; + rhs_end = new_txt_end == src_end ? src_end : new_txt_end + 1; + } + } + } + if (txt_end > txt_bgn) // ignore 0-byte text tkns; occurs when consecutive tkns; EX: {{v1}}{{v2}} will try to create text tkn between "}}{{" + subs_list.Add(new Mustache_tkn_text(src, txt_bgn, txt_end)); // add everything between prv "}}" and cur "{{" + + txt_bgn = Parse_itm(tkn_data, subs_list, lhs_end, rhs_bgn, rhs_end); // do parse + if (txt_bgn < 0) { // NOTE: txt_bgn < 0 means end grp + txt_bgn *= -1; + end_grp = true; + } + if (end_grp) break; + } + if (subs_list.Len() > 0) // don't create subs if no members + owner.Subs_ary_((Mustache_tkn_itm[])subs_list.ToAryAndClear(Mustache_tkn_itm.class)); + return txt_bgn; + } + private int Parse_itm(Mustache_tkn_data tkn_data, List_adp subs_list, int lhs_end, int rhs_bgn, int rhs_end) { + byte[] val_bry = Bry_.Mid(src, lhs_end, rhs_bgn); + Mustache_tkn_base tkn = null; + switch (tkn_data.tid) { + default: throw Err_.new_unhandled(tkn_data.tid); + case Mustache_tkn_def.Variable: tkn = new Mustache_tkn_variable(val_bry); break; + case Mustache_tkn_def.Comment: tkn = new Mustache_tkn_comment(); break; + case Mustache_tkn_def.Partial: tkn = new Mustache_tkn_partial(val_bry, template_root); break; + case Mustache_tkn_def.Delimiter_bgn: tkn = new Mustache_tkn_delimiter(val_bry); break; // TODO_OLD: implement delimiter; EX: {{=<% %>=}} + case Mustache_tkn_def.Escape_bgn: tkn = new Mustache_tkn_escape(val_bry); break; + case Mustache_tkn_def.Section: tkn = new Mustache_tkn_section(val_bry); break; + case Mustache_tkn_def.Inverted: tkn = new Mustache_tkn_inverted(val_bry); break; + case Mustache_tkn_def.Grp_end: { + return -(rhs_end); // pop the stack + } + } + subs_list.Add(tkn); + if (tkn_data.parse_grp) { + return Parse_grp(tkn, rhs_end); + } + else + return rhs_end; + } + private Err Fail(int pos, String fmt, Object... args) { + return Err_.new_("mustache", fmt, "excerpt", Bry_.Mid_by_len_safe(src, pos, 32)); + } + private static int Trim_bwd_to_nl(byte[] src, int txt_bgn, int txt_end) { + int stop = txt_bgn - 1; + int pos = txt_end - 1; + while (pos > stop) { + byte b = src[pos]; + switch (b) { + case Byte_ascii.Tab: + case Byte_ascii.Space: --pos; break; + case Byte_ascii.Nl: return pos + 1; // 1 char after \n + default: return -1; + } + } + return -1; + } + private static int Trim_fwd_to_nl(byte[] src, int txt_bgn, int txt_end) { + int pos = txt_bgn; + while (pos < txt_end) { + byte b = src[pos]; + switch (b) { + case Byte_ascii.Tab: + case Byte_ascii.Space: ++pos; break; + case Byte_ascii.Nl: return pos; + default: return -1; + } + } + return -1; + } +} +class Mustache_tkn_data { + public int tid; + public int lhs_end_adj; + public byte rhs_bgn_chk; + public boolean parse_grp; + public boolean ws_ignore; + public Mustache_tkn_data(byte b) { + tid = b; + parse_grp = ws_ignore = false; + lhs_end_adj = 1; + rhs_bgn_chk = Byte_ascii.Null; + switch (b) { + default: lhs_end_adj = 0; tid = Mustache_tkn_def.Variable; break; + case Mustache_tkn_def.Comment: + case Mustache_tkn_def.Partial: + case Mustache_tkn_def.Grp_end: ws_ignore = true; break; + case Mustache_tkn_def.Delimiter_bgn: rhs_bgn_chk = Mustache_tkn_def.Delimiter_end; break; // check for "=}}"; TODO_OLD: implement delimiter; EX: {{=<% %>=}} + case Mustache_tkn_def.Escape_bgn: rhs_bgn_chk = Mustache_tkn_def.Escape_end; break; // check for "" + case Mustache_tkn_def.Section: + case Mustache_tkn_def.Inverted: ws_ignore = true; parse_grp = true; break; + } + } +} diff --git a/400_xowa/src/gplx/langs/phps/Php_evaluator.java b/400_xowa/src/gplx/langs/phps/Php_evaluator.java index ea4326aad..27cbd3794 100644 --- a/400_xowa/src/gplx/langs/phps/Php_evaluator.java +++ b/400_xowa/src/gplx/langs/phps/Php_evaluator.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.phps; import gplx.*; import gplx.langs.*; +package gplx.langs.phps; import gplx.*; import gplx.core.log_msgs.*; /* NOTE: naive implementation of PHP parser; intended only for parsing Messages**.php files in MediaWiki. Specifically, it assumes the following: @@ -203,7 +203,7 @@ public class Php_evaluator implements Php_tkn_wkr { case Php_tkn_.Tid_paren_end: case Php_tkn_.Tid_brack_end: mode = Mode_ary_term; - if (frame_stack.Count() == 0) + if (frame_stack.Len() == 0) cur_ary = null; else { Php_scanner_frame frame = (Php_scanner_frame)List_adp_.Pop(frame_stack); @@ -229,7 +229,7 @@ public class Php_evaluator implements Php_tkn_wkr { case Php_tkn_.Tid_paren_end: case Php_tkn_.Tid_brack_end: mode = Mode_ary_term; - if (frame_stack.Count() == 0) + if (frame_stack.Len() == 0) cur_ary = null; else { Php_scanner_frame frame = (Php_scanner_frame)List_adp_.Pop(frame_stack); diff --git a/400_xowa/src/gplx/langs/phps/Php_parser.java b/400_xowa/src/gplx/langs/phps/Php_parser.java index b75c15fa1..64bc0d8fe 100644 --- a/400_xowa/src/gplx/langs/phps/Php_parser.java +++ b/400_xowa/src/gplx/langs/phps/Php_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.phps; import gplx.*; import gplx.langs.*; +package gplx.langs.phps; import gplx.*; import gplx.core.btries.*; import gplx.core.log_msgs.*; public class Php_parser { private final Btrie_slim_mgr trie = Btrie_slim_mgr.ci_a7(); // NOTE:ci:PHP tkns are ASCII @@ -50,8 +50,8 @@ public class Php_parser { Init_lxr(list, new Php_lxr_num()); Init_lxr(list, new Php_lxr_quote(Byte_ascii.Apos)); Init_lxr(list, new Php_lxr_quote(Byte_ascii.Quote)); - lxrs = (Php_lxr[])list.To_ary(Php_lxr.class); - lxrs_len = list.Count(); + lxrs = (Php_lxr[])list.ToAry(Php_lxr.class); + lxrs_len = list.Len(); } private void Init_lxr(List_adp list, Php_lxr lxr) { lxr.Lxr_ini(trie, parser_interrupts); diff --git a/400_xowa/src/gplx/langs/phps/Php_parser_fxt.java b/400_xowa/src/gplx/langs/phps/Php_parser_fxt.java index 3aefab0a6..0888ed948 100644 --- a/400_xowa/src/gplx/langs/phps/Php_parser_fxt.java +++ b/400_xowa/src/gplx/langs/phps/Php_parser_fxt.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.phps; import gplx.*; import gplx.langs.*; +package gplx.langs.phps; import gplx.*; import gplx.core.tests.*; import gplx.core.log_msgs.*; class Php_parser_fxt { Php_tkn_factory tkn_factory = new Php_tkn_factory(); @@ -54,7 +54,7 @@ class Php_parser_fxt { public void tst_tkns(String raw, Php_tkn_chkr_base... expd) { byte[] raw_bry = Bry_.new_u8(raw); parser.Parse_tkns(raw_bry, tkn_wkr); - Php_tkn[] actl = (Php_tkn[])tkn_wkr.List().To_ary(Php_tkn.class); + Php_tkn[] actl = (Php_tkn[])tkn_wkr.List().ToAry(Php_tkn.class); tst_mgr.Vars().Clear().Add("raw_bry", raw_bry); tst_mgr.Tst_ary("", expd, actl); log_mgr_chkr.tst(tst_mgr, tkn_wkr.Msg_log()); @@ -62,7 +62,7 @@ class Php_parser_fxt { public void tst_lines(String raw, Php_line_assign_chkr... expd) { byte[] raw_bry = Bry_.new_u8(raw); parser.Parse_tkns(raw_bry, line_wkr); - Php_line[] actl = (Php_line[])line_wkr.List().To_ary(Php_line.class); + Php_line[] actl = (Php_line[])line_wkr.List().ToAry(Php_line.class); tst_mgr.Vars().Clear().Add("raw_bry", raw_bry); tst_mgr.Tst_ary("", expd, actl); log_mgr_chkr.tst(tst_mgr, line_wkr.Msg_log()); @@ -71,7 +71,7 @@ class Php_parser_fxt { line_wkr.Clear(); byte[] raw_bry = Bry_.new_u8("$var =\"" + raw +"\";"); parser.Parse_tkns(raw_bry, line_wkr); - Php_line[] actl_lines = (Php_line[])line_wkr.List().To_ary(Php_line.class); + Php_line[] actl_lines = (Php_line[])line_wkr.List().ToAry(Php_line.class); Php_line_assign actl_line = (Php_line_assign)actl_lines[0]; Php_itm_quote actl = (Php_itm_quote)actl_line.Val(); Tfds.Eq_str(expd, String_.new_u8(actl.Val_obj_bry())); @@ -280,7 +280,7 @@ class Gfo_msg_log_chkr implements Tst_chkr { Gfo_msg_data[] actl_itms = new Gfo_msg_data[actl_itms_len]; for (int i = 0; i < actl_itms_len; i++) actl_itms[i] = actl.Ary_get(i); - mgr.Tst_ary("itms", (Gfo_msg_data_chkr[])itms.To_ary(Gfo_msg_data_chkr.class), actl_itms); + mgr.Tst_ary("itms", (Gfo_msg_data_chkr[])itms.ToAry(Gfo_msg_data_chkr.class), actl_itms); } } class Gfo_msg_data_chkr implements Tst_chkr { diff --git a/400_xowa/src/gplx/langs/phps/Php_text_itm_parser.java b/400_xowa/src/gplx/langs/phps/Php_text_itm_parser.java index 9c744855b..ffd6b6b4d 100644 --- a/400_xowa/src/gplx/langs/phps/Php_text_itm_parser.java +++ b/400_xowa/src/gplx/langs/phps/Php_text_itm_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.phps; import gplx.*; import gplx.langs.*; +package gplx.langs.phps; import gplx.*; import gplx.core.primitives.*; public class Php_text_itm_parser { public static final byte Rslt_orig = 0, Rslt_dirty = 1, Rslt_fmt = 2; @@ -26,7 +26,7 @@ public class Php_text_itm_parser { case Rslt_dirty: case Rslt_fmt: tmp_bfr.Clear(); - int tmp_list_len = tmp_list.Count(); + int tmp_list_len = tmp_list.Len(); for (int i = 0; i < tmp_list_len; i++) { Php_text_itm itm = (Php_text_itm)tmp_list.Get_at(i); itm.Bld(tmp_bfr, raw); diff --git a/400_xowa/src/gplx/langs/phps/Php_text_itm_tst.java b/400_xowa/src/gplx/langs/phps/Php_text_itm_tst.java index 93ec02500..632951673 100644 --- a/400_xowa/src/gplx/langs/phps/Php_text_itm_tst.java +++ b/400_xowa/src/gplx/langs/phps/Php_text_itm_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.langs.phps; import gplx.*; import gplx.langs.*; +package gplx.langs.phps; import gplx.*; import org.junit.*; public class Php_text_itm_tst { @Before public void init() {fxt.Clear();} private Php_text_itm_fxt fxt = new Php_text_itm_fxt(); @@ -41,7 +41,7 @@ class Php_text_itm_fxt { byte[] raw = Bry_.new_u8(raw_str); parser.Parse(list, raw); Bry_bfr bfr = Bry_bfr_.Reset(255); - int list_len = list.Count(); + int list_len = list.Len(); for (int i = 0; i < list_len; i++) { Php_text_itm itm = (Php_text_itm)list.Get_at(i); itm.Bld(bfr, raw); diff --git a/400_xowa/src/gplx/langs/regxs/Gfo_pattern_itm_.java b/400_xowa/src/gplx/langs/regxs/Gfo_pattern_itm_.java index 4667ab038..eecb00138 100644 --- a/400_xowa/src/gplx/langs/regxs/Gfo_pattern_itm_.java +++ b/400_xowa/src/gplx/langs/regxs/Gfo_pattern_itm_.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.langs.regxs; import gplx.*; import gplx.langs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.langs.regxs; import gplx.*; public class Gfo_pattern_itm_ { public static final byte Tid_text = 0, Tid_wild = 1; public static Gfo_pattern_itm[] Compile(byte[] raw) { @@ -44,6 +44,6 @@ public class Gfo_pattern_itm_ { ++pos; if (last) break; } - return (Gfo_pattern_itm[])rv.To_ary_and_clear(Gfo_pattern_itm.class); + return (Gfo_pattern_itm[])rv.ToAryAndClear(Gfo_pattern_itm.class); } } diff --git a/400_xowa/src/gplx/xowa/Xop_fxt.java b/400_xowa/src/gplx/xowa/Xop_fxt.java index def15cee4..5172475a6 100644 --- a/400_xowa/src/gplx/xowa/Xop_fxt.java +++ b/400_xowa/src/gplx/xowa/Xop_fxt.java @@ -18,7 +18,9 @@ import gplx.core.tests.*; import gplx.core.log_msgs.*; import gplx.xowa.apps.cfgs.*; import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.htmls.*; -import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.lists.*; import gplx.xowa.parsers.paras.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.miscs.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.lnkes.*; import gplx.xowa.parsers.lnkis.*; +import gplx.xowa.parsers.*; +import gplx.xowa.parsers.apos.*; +import gplx.xowa.parsers.lists.*; import gplx.xowa.parsers.paras.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.miscs.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.lnkes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.repos.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.tdbs.hives.*; @@ -352,12 +354,12 @@ public class Xop_fxt { actl_list.Add(String_.new_u8(eny.Item().Path_bry())); } } - String[] actl = actl_list.To_str_ary(); + String[] actl = actl_list.ToStrAry(); msg_log.Clear(); return actl; } public Xop_fxt tst_Log_check() { - int len = log_itms.Count(); + int len = log_itms.Len(); String[] expd = new String[len]; for (int i = 0; i < len; i++) { Gfo_msg_itm itm = (Gfo_msg_itm)log_itms.Get_at(i); @@ -371,7 +373,7 @@ public class Xop_fxt { public void tst_Warn(String... expd) { Gfo_usr_dlg usr_dlg = app.Usr_dlg(); Gfo_usr_dlg__gui_mock ui_wkr = (Gfo_usr_dlg__gui_mock)usr_dlg.Gui_wkr(); - String[] actl = ui_wkr.Warns().To_str_ary(); + String[] actl = ui_wkr.Warns().ToStrAry(); Tfds.Eq_ary_str(expd, actl); } public void Test_parse_page(String ttl, String expd) { diff --git a/400_xowa/src/gplx/xowa/Xowe_wiki.java b/400_xowa/src/gplx/xowa/Xowe_wiki.java index 3f6647ba7..e4a4ec94d 100644 --- a/400_xowa/src/gplx/xowa/Xowe_wiki.java +++ b/400_xowa/src/gplx/xowa/Xowe_wiki.java @@ -15,17 +15,22 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ 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.urls.*; +import gplx.xowa.apps.*; +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.wikis.fsys.*; +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.data.*; +import gplx.xowa.wikis.caches.*; import gplx.xowa.wikis.fsys.*; 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.*; -import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.xowa.files.exts.*; -import gplx.xowa.htmls.heads.*; import gplx.xowa.htmls.core.htmls.utls.*; import gplx.xowa.htmls.core.hzips.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.ns_files.*; import gplx.xowa.htmls.bridges.dbuis.tbls.*; import gplx.xowa.htmls.hrefs.*; import gplx.xowa.htmls.hxtns.pages.*; -import gplx.xowa.bldrs.xmls.*; import gplx.xowa.bldrs.installs.*; import gplx.xowa.bldrs.setups.maints.*; +import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.fsdb.*; import gplx.fsdb.meta.*; +import gplx.xowa.htmls.heads.*; import gplx.xowa.htmls.core.htmls.utls.*; +import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.ns_files.*; +import gplx.xowa.htmls.hrefs.*; import gplx.xowa.htmls.hxtns.pages.*; +import gplx.xowa.bldrs.xmls.*; +import gplx.xowa.bldrs.setups.maints.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.utils.*; -import gplx.xowa.addons.wikis.ctgs.*; -import gplx.xowa.guis.cbks.*; import gplx.xowa.guis.views.*; -import gplx.xowa.xtns.gallery.*; import gplx.xowa.xtns.pfuncs.*; +import gplx.xowa.guis.cbks.*; +import gplx.xowa.xtns.pfuncs.*; import gplx.xowa.wikis.tdbs.*; import gplx.xowa.wikis.tdbs.hives.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.htmls.css.mgrs.*; import gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.*; public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm { @@ -273,7 +278,7 @@ public class Xowe_wiki implements Xow_wiki, Gfo_invk, Gfo_evt_itm { } public void Rls() { if (rls_list != null) { - int len = rls_list.Count(); + int len = rls_list.Len(); for (int i = 0; i < len; i++) { Rls_able rls = (Rls_able)rls_list.Get_at(i); rls.Rls(); diff --git a/400_xowa/src/gplx/xowa/addons/Xoax_addon_mgr.java b/400_xowa/src/gplx/xowa/addons/Xoax_addon_mgr.java index d13236556..4332b7086 100644 --- a/400_xowa/src/gplx/xowa/addons/Xoax_addon_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/Xoax_addon_mgr.java @@ -29,7 +29,7 @@ import gplx.xowa.addons.wikis.searchs.specials.Srch_special_cfg; public class Xoax_addon_mgr { private final Ordered_hash hash = Ordered_hash_.New(); // LOCK: must synchronized else two search tabs will fail on startup - public Xoax_addon_itm Itms__get_or_null(String key) {synchronized (hash) {return (Xoax_addon_itm)hash.Get_by(key);}} + public Xoax_addon_itm Itms__get_or_null(String key) {synchronized (hash) {return (Xoax_addon_itm)hash.GetByOrNull(key);}} public void Itms__add_many(Xoax_addon_itm... ary) { for (Xoax_addon_itm itm : ary) Itms__add(itm); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_grp_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_grp_tbl.java index 35ca3e575..f53e360a2 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_grp_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_grp_tbl.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.dbs.*; +package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; public class Xocfg_grp_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__grp_id, fld__grp_key; private final Db_conn conn; public Xocfg_grp_tbl(Db_conn conn) { this.conn = conn; - this.fld__grp_id = flds.Add_int_pkey("grp_id"); - this.fld__grp_key = flds.Add_str("grp_key", 255); + this.fld__grp_id = flds.AddIntPkey("grp_id"); + this.fld__grp_key = flds.AddStr("grp_key", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = TBL_NAME; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_itm_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_itm_tbl.java index 206732e4f..ba22f21c3 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_itm_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_itm_tbl.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.dbs.*; +package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; public class Xocfg_itm_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__itm_id, fld__itm_key, fld__itm_scope, fld__itm_type, fld__itm_dflt, fld__itm_html_atrs, fld__itm_html_cls; private final Db_conn conn; public Xocfg_itm_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "cfg_itm"; - this.fld__itm_id = flds.Add_int_pkey("itm_id"); // EX: '1' - this.fld__itm_key = flds.Add_str("itm_key", 255); // EX: 'cfg_1' - this.fld__itm_scope = flds.Add_int("itm_scope"); // EX: '1'; ENUM: Xoitm_scope_enum - this.fld__itm_type = flds.Add_str("itm_type", 255); // EX: '1'; ENUM: Xoitm_type_enum - this.fld__itm_dflt = flds.Add_str("itm_dflt", 4096); // EX: 'abc' - this.fld__itm_html_atrs = flds.Add_str("itm_html_atrs", 255); // EX: 'size="5"' - this.fld__itm_html_cls = flds.Add_str("itm_html_cls", 255); // EX: 'xocfg__bool__readonly' + this.fld__itm_id = flds.AddIntPkey("itm_id"); // EX: '1' + this.fld__itm_key = flds.AddStr("itm_key", 255); // EX: 'cfg_1' + this.fld__itm_scope = flds.AddInt("itm_scope"); // EX: '1'; ENUM: Xoitm_scope_enum + this.fld__itm_type = flds.AddStr("itm_type", 255); // EX: '1'; ENUM: Xoitm_type_enum + this.fld__itm_dflt = flds.AddStr("itm_dflt", 4096); // EX: 'abc' + this.fld__itm_html_atrs = flds.AddStr("itm_html_atrs", 255); // EX: 'size="5"' + this.fld__itm_html_cls = flds.AddStr("itm_html_cls", 255); // EX: 'xocfg__bool__readonly' conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_map_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_map_tbl.java index 0ab0c6c8a..1947f9b6e 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_map_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_map_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.dbs.*; +package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; public class Xocfg_map_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__map_src, fld__map_trg, fld__map_sort; private final Db_conn conn; public Xocfg_map_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "cfg_map"; - this.fld__map_src = flds.Add_int("map_src"); - this.fld__map_trg = flds.Add_int("map_trg"); - this.fld__map_sort = flds.Add_int("map_sort"); + this.fld__map_src = flds.AddInt("map_src"); + this.fld__map_trg = flds.AddInt("map_trg"); + this.fld__map_sort = flds.AddInt("map_sort"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_txt_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_txt_tbl.java index a31368bbb..46bd65bab 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_txt_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_txt_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.dbs.*; +package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; public class Xocfg_txt_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__nde_id, fld__nde_lang, fld__nde_name, fld__nde_help; private final Db_conn conn; public Xocfg_txt_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "cfg_txt"; - this.fld__nde_id = flds.Add_int_pkey("nde_id"); // EX: '2' - this.fld__nde_lang = flds.Add_str("nde_lang", 16); // EX: 'en' - this.fld__nde_name = flds.Add_str("nde_name", 255); // EX: 'Cfg Name' - this.fld__nde_help = flds.Add_str("nde_help", 4096); // EX: 'Help text' + this.fld__nde_id = flds.AddIntPkey("nde_id"); // EX: '2' + this.fld__nde_lang = flds.AddStr("nde_lang", 16); // EX: 'en' + this.fld__nde_name = flds.AddStr("nde_name", 255); // EX: 'Cfg Name' + this.fld__nde_help = flds.AddStr("nde_help", 4096); // EX: 'Help text' conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_val_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_val_tbl.java index 3d383eee4..4052dec91 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_val_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/dbs/tbls/Xocfg_val_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.dbs.*; +package gplx.xowa.addons.apps.cfgs.dbs.tbls; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; public class Xocfg_val_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__itm_key, fld__itm_ctx, fld__itm_val, fld__itm_date; private final Db_conn conn; public Xocfg_val_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "cfg_val"; - this.fld__itm_key = flds.Add_str("itm_key", 255); // EX: 'xowa.app.cfg_1' - this.fld__itm_ctx = flds.Add_str("itm_ctx", 255); // EX: 'app'; 'en.w'; 'ns-10' - this.fld__itm_val = flds.Add_str("itm_val", 4096); // EX: 'abc' - this.fld__itm_date = flds.Add_str("itm_date", 16); // EX: '20160901_010203' + this.fld__itm_key = flds.AddStr("itm_key", 255); // EX: 'xowa.app.cfg_1' + this.fld__itm_ctx = flds.AddStr("itm_ctx", 255); // EX: 'app'; 'en.w'; 'ns-10' + this.fld__itm_val = flds.AddStr("itm_val", 4096); // EX: 'abc' + this.fld__itm_date = flds.AddStr("itm_date", 16); // EX: '20160901_010203' conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -54,7 +54,7 @@ public class Xocfg_val_tbl implements Db_tbl { } } finally {rdr.Rls();} - return (Xocfg_val_row[])list.To_ary_and_clear(Xocfg_val_row.class); + return (Xocfg_val_row[])list.ToAryAndClear(Xocfg_val_row.class); } private Xocfg_val_row Load(Db_rdr rdr) { return new Xocfg_val_row diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_grp.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_grp.java index cdc5fd30f..26eaf9bbc 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_grp.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_grp.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.mgrs.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.mgrs.*; +package gplx.xowa.addons.apps.cfgs.mgrs.caches; import gplx.*; +import gplx.xowa.addons.apps.cfgs.*; public class Xocfg_cache_grp { private final Hash_adp vals = Hash_adp_.New(); private final Ordered_hash subs = Ordered_hash_.New(); @@ -28,18 +29,18 @@ public class Xocfg_cache_grp { public void Dflt_(String v) {this.dflt = v;} public String Get(String ctx) { // exact match; EX: "en.w|key_1" - Xocfg_cache_itm rv = (Xocfg_cache_itm)vals.Get_by(ctx); + Xocfg_cache_itm rv = (Xocfg_cache_itm)vals.GetByOrNull(ctx); if (rv != null) return rv.Val(); // global match; EX: "app|key_1" - rv = (Xocfg_cache_itm)vals.Get_by(Xocfg_mgr.Ctx__app); + rv = (Xocfg_cache_itm)vals.GetByOrNull(Xocfg_mgr.Ctx__app); if (rv != null) return rv.Val(); // dflt return dflt; } public void Set(String ctx, String val) { - Xocfg_cache_itm rv = (Xocfg_cache_itm)vals.Get_by(ctx); + Xocfg_cache_itm rv = (Xocfg_cache_itm)vals.GetByOrNull(ctx); if (rv == null) { rv = new Xocfg_cache_itm(ctx, key, val); vals.Add(ctx, rv); @@ -55,7 +56,7 @@ public class Xocfg_cache_grp { vals.Add(ctx, itm); } public void Sub(Gfo_invk sub, String ctx, String evt) { - List_adp list = (List_adp)subs.Get_by(ctx); + List_adp list = (List_adp)subs.GetByOrNull(ctx); if (list == null) { list = List_adp_.New(); subs.Add(ctx, list); @@ -64,7 +65,7 @@ public class Xocfg_cache_grp { } public void Pub(String ctx, String val) { // exact match; EX: "en.w|key_1" - List_adp list = (List_adp)subs.Get_by(ctx); + List_adp list = (List_adp)subs.GetByOrNull(ctx); if (list == null) {// global match; EX: "app|key_1" int len = subs.Len(); for (int i = 0; i < len; i++) { diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_mgr.java index f797722cd..3177b6b94 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/caches/Xocfg_cache_mgr.java @@ -13,9 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.mgrs.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.mgrs.*; +package gplx.xowa.addons.apps.cfgs.mgrs.caches; import gplx.*; +import gplx.xowa.addons.apps.cfgs.*; import gplx.dbs.*; -import gplx.xowa.addons.apps.cfgs.dbs.*; import gplx.xowa.addons.apps.cfgs.dbs.tbls.*; import gplx.xowa.addons.apps.cfgs.enums.*; +import gplx.xowa.addons.apps.cfgs.dbs.*; import gplx.xowa.addons.apps.cfgs.dbs.tbls.*; public class Xocfg_cache_mgr { private final Hash_adp grps = Hash_adp_.New(); public Xocfg_cache_mgr() { @@ -34,7 +35,7 @@ public class Xocfg_cache_mgr { return grp.Get(ctx); } public String Get_or(String ctx, String key, String or) { - Xocfg_cache_grp grp = (Xocfg_cache_grp)grps.Get_by(key); + Xocfg_cache_grp grp = (Xocfg_cache_grp)grps.GetByOrNull(key); if (grp == null) { grp = Load_grp(key, or); grps.Add(key, grp); @@ -74,7 +75,7 @@ public class Xocfg_cache_mgr { grp.Pub(Xocfg_mgr.Ctx__app, val); // need to pub after dflt is changed; for now, just pub at app-level } public Xocfg_cache_grp Grps__get_or_load(String key) { - Xocfg_cache_grp grp = (Xocfg_cache_grp)grps.Get_by(key); + Xocfg_cache_grp grp = (Xocfg_cache_grp)grps.GetByOrNull(key); if (grp == null) { grp = Load_grp(key, ""); grps.Add(key, grp); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java index f9b70d75e..86419f2cf 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/dflts/Xocfg_dflt_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.mgrs.dflts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.mgrs.*; +package gplx.xowa.addons.apps.cfgs.mgrs.dflts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.apps.cfgs.mgrs.caches.*; public class Xocfg_dflt_mgr { private final Xocfg_cache_mgr cache_mgr; @@ -22,7 +22,7 @@ public class Xocfg_dflt_mgr { this.cache_mgr = cache_mgr; } public String Get_or(String key, String or) { - Gfo_invk itm = (Gfo_invk)hash.Get_by(key); + Gfo_invk itm = (Gfo_invk)hash.GetByOrNull(key); return (itm == null) ? or : (String)Gfo_invk_.Invk_by_key(itm, key); } public void Add(String key, String val) { @@ -31,7 +31,7 @@ public class Xocfg_dflt_mgr { } public void Add(Gfo_invk invk, String... keys) { for (String key : keys) { - hash.Add_if_dupe_use_nth(key, invk); + hash.AddIfDupeUseNth(key, invk); } } public static void Run_os_gfs(String user_name, gplx.xowa.apps.gfs.Xoa_gfs_mgr gfs_mgr, gplx.xowa.apps.fsys.Xoa_fsys_mgr fsys_mgr) { diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/execs/Xocfg_exec_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/execs/Xocfg_exec_mgr.java index 9dc2524aa..fc487114d 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/execs/Xocfg_exec_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/execs/Xocfg_exec_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.mgrs.execs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.mgrs.*; +package gplx.xowa.addons.apps.cfgs.mgrs.execs; import gplx.*; public class Xocfg_exec_mgr { private final Ordered_hash hash = Ordered_hash_.New(); public void Add(Gfo_invk invk, String... cmds) { @@ -22,7 +22,7 @@ public class Xocfg_exec_mgr { } } public void Exec(String cmd, Object... args) { - Gfo_invk invk = (Gfo_invk)hash.Get_by(cmd); + Gfo_invk invk = (Gfo_invk)hash.GetByOrNull(cmd); // create msg and add args GfoMsg msg = GfoMsg_.new_parse_(cmd); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java index 1149bc9d1..cec471021 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/mgrs/types/Xocfg_type_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.mgrs.types; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.mgrs.*; +package gplx.xowa.addons.apps.cfgs.mgrs.types; import gplx.*; public class Xocfg_type_mgr { private final Ordered_hash list_hash = Ordered_hash_.New(); public Xocfg_type_mgr() { @@ -42,6 +42,6 @@ public class Xocfg_type_mgr { list_hash.Add(key, itms); } public Keyval[] Lists__get(String key) { - return (Keyval[])list_hash.Get_by_or_fail(key); + return (Keyval[])list_hash.GetByOrFail(key); } } diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_grp.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_grp.java index c94a68bca..324faf9e5 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_grp.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_grp.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.specials.edits.objs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.specials.*; import gplx.xowa.addons.apps.cfgs.specials.edits.*; +package gplx.xowa.addons.apps.cfgs.specials.edits.objs; import gplx.*; import gplx.langs.mustaches.*; import gplx.core.gfobjs.*; public class Xoedit_grp implements Xoedit_nde, Mustache_doc_itm { @@ -49,7 +49,7 @@ public class Xoedit_grp implements Xoedit_nde, Mustache_doc_itm { Xoedit_itm itm = itms[i]; list.Add(itm.To_nde(tmp_bfr)); } - rv.Add_ary("itms", new Gfobj_ary((Gfobj_nde[])list.To_ary_and_clear(Gfobj_nde.class))); + rv.Add_ary("itms", new Gfobj_ary((Gfobj_nde[])list.ToAryAndClear(Gfobj_nde.class))); return rv; } public boolean Mustache__write(String k, Mustache_bfr bfr) { diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_nde_hash.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_nde_hash.java index a3322722b..26545710f 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_nde_hash.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_nde_hash.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.specials.edits.objs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.specials.*; import gplx.xowa.addons.apps.cfgs.specials.edits.*; +package gplx.xowa.addons.apps.cfgs.specials.edits.objs; import gplx.*; public class Xoedit_nde_hash { private final Ordered_hash hash = Ordered_hash_.New(); private final Ordered_hash id_hash = Ordered_hash_.New(); @@ -29,10 +29,10 @@ public class Xoedit_nde_hash { return (Xoedit_nde)hash.Get_at(i); } public Xoedit_nde Get_by_or_fail(String key) { - return (Xoedit_nde)hash.Get_by_or_fail(key); + return (Xoedit_nde)hash.GetByOrFail(key); } public Xoedit_nde Get_by_or_fail(int id) { - return (Xoedit_nde)id_hash.Get_by_or_fail(id); + return (Xoedit_nde)id_hash.GetByOrFail(id); } public Xoedit_grp[] To_grp_ary_and_clear() { Xoedit_grp[] rv = (Xoedit_grp[])hash.To_ary_and_clear(Xoedit_grp.class); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_root.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_root.java index 77af0e5f5..3e04ab30e 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_root.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/objs/Xoedit_root.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.cfgs.specials.edits.objs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.specials.*; import gplx.xowa.addons.apps.cfgs.specials.edits.*; +package gplx.xowa.addons.apps.cfgs.specials.edits.objs; import gplx.*; import gplx.langs.mustaches.*; import gplx.core.gfobjs.*; public class Xoedit_root implements Mustache_doc_itm { @@ -36,7 +36,7 @@ public class Xoedit_root implements Mustache_doc_itm { list.Add(itm.To_nde(tmp_bfr)); } rv.Add_str("page_help", page_help); - rv.Add_ary("grps", new Gfobj_ary((Gfobj_nde[])list.To_ary_and_clear(Gfobj_nde.class))); + rv.Add_ary("grps", new Gfobj_ary((Gfobj_nde[])list.ToAryAndClear(Gfobj_nde.class))); return rv; } public boolean Mustache__write(String k, Mustache_bfr bfr) { diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_loader.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_loader.java index 8e1ca67cc..9aef09977 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_loader.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/edits/services/Xocfg_edit_loader.java @@ -67,7 +67,7 @@ public class Xocfg_edit_loader { grp_list.Add(owner); // load tree by selecting subs until no more grps - while (grp_temp.Count() > 0) { + while (grp_temp.Len() > 0) { owner = (Xoedit_grp)grp_temp.Get_at(0); grp_temp.Del(owner.Id()); Load_subs(grp_list, itm_list, grp_temp, owner); @@ -147,7 +147,7 @@ public class Xocfg_edit_loader { finally { rdr.Rls(); } - return new Xoedit_nav_mgr((Xoedit_nav_itm[])list.To_ary_and_clear(Xoedit_nav_itm.class)); + return new Xoedit_nav_mgr((Xoedit_nav_itm[])list.ToAryAndClear(Xoedit_nav_itm.class)); } private void Load_subs(Xoedit_nde_hash grp_list, Xoedit_nde_hash itm_list, Ordered_hash grp_temp, Xoedit_grp owner) { String sql = Db_sql_.Make_by_fmt(String_.Ary @@ -178,7 +178,7 @@ public class Xocfg_edit_loader { itm_list.Add(gui_itm); } } - owner.Itms_((Xoedit_itm[])itms_list.To_ary_and_clear(Xoedit_itm.class)); + owner.Itms_((Xoedit_itm[])itms_list.ToAryAndClear(Xoedit_itm.class)); } private void Load_itm_meta(Bry_bfr tmp_bfr, Xoedit_nde_hash itm_list) { Xogui_nde_iter iter = Xogui_nde_iter.New_sql(itm_list); diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/maints/services/Xocfg_maint_parser.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/maints/services/Xocfg_maint_parser.java index 6a4c702d9..aea485769 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/maints/services/Xocfg_maint_parser.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/specials/maints/services/Xocfg_maint_parser.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.apps.cfgs.specials.maints.services; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.cfgs.specials.*; import gplx.xowa.addons.apps.cfgs.specials.maints.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.apps.cfgs.specials.maints.services; import gplx.*; import gplx.langs.gfs.*; class Xocfg_maint_parser { public Xocfg_maint_nde[] Parse(String raw) { @@ -66,7 +66,7 @@ class Xocfg_maint_parser { return rv; } private static String Get_atr_as_str_or(Ordered_hash hash, String key, String or) { - String val = (String)hash.Get_by(key); + String val = (String)hash.GetByOrNull(key); return val == null ? or : val; } } diff --git a/400_xowa/src/gplx/xowa/addons/apps/cfgs/upgrades/Xocfg_upgrade_mgr.java b/400_xowa/src/gplx/xowa/addons/apps/cfgs/upgrades/Xocfg_upgrade_mgr.java index e9fc950e8..771998df1 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/cfgs/upgrades/Xocfg_upgrade_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/apps/cfgs/upgrades/Xocfg_upgrade_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.apps.cfgs.upgrades; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.cfgs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.apps.cfgs.upgrades; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.langs.gfs.*; public class Xocfg_upgrade_mgr { @@ -46,7 +46,7 @@ public class Xocfg_upgrade_mgr { // remap for (Keyval kv : kvs) { - Keyval mapping = (Keyval)mappings.Get_by(kv.Key()); + Keyval mapping = (Keyval)mappings.GetByOrNull(kv.Key()); if (mapping == null) { Gfo_usr_dlg_.Instance.Log_many("", "", "cfg.convert:could not find mapping; key=~{0} val=~{1}", kv.Key(), kv.Val()); kv.Key_(""); @@ -92,7 +92,7 @@ public class Xocfg_upgrade_mgr { String args_kv_key = args_kv.Key(); String args_kv_val = args_kv.Val_to_str_or_empty(); if (String_.Has_at_end(args_kv_key, ".args")) { - Keyval cmd_kv = (Keyval)hash.Get_by(String_.Replace(args_kv_key, ".args", ".cmd")); + Keyval cmd_kv = (Keyval)hash.GetByOrNull(String_.Replace(args_kv_key, ".args", ".cmd")); if (cmd_kv == null) { Gfo_usr_dlg_.Instance.Log_many("", "", "cfg.convert:could not find cmd; key=~{0} val=~{1}", args_kv_key, args_kv.Val()); continue; diff --git a/400_xowa/src/gplx/xowa/addons/apps/helps/logs/Xolog_special.java b/400_xowa/src/gplx/xowa/addons/apps/helps/logs/Xolog_special.java index 0baac2075..25bc7629d 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/helps/logs/Xolog_special.java +++ b/400_xowa/src/gplx/xowa/addons/apps/helps/logs/Xolog_special.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.helps.logs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.helps.*; -import gplx.xowa.specials.*; import gplx.core.net.*; import gplx.core.net.qargs.*; import gplx.xowa.wikis.pages.*; +package gplx.xowa.addons.apps.helps.logs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.specials.*; +import gplx.core.net.qargs.*; import gplx.core.net.emails.*; public class Xolog_special implements Xow_special_page { public void Special__gen(Xow_wiki wiki, Xoa_page page, Xoa_url url, Xoa_ttl ttl) { @@ -70,7 +71,7 @@ class Xoa_url_args_bldr { list.Add(Keyval_.new_(key, val)); return this; } - public Keyval[] To_ary() {return (Keyval[])list.To_ary_and_clear(Keyval.class);} + public Keyval[] To_ary() {return (Keyval[])list.ToAryAndClear(Keyval.class);} } class Xolog_file_utl {// yyyyMMdd_HHmmss.log private static final String Gui__date_fmt = "yyyy-MM-dd HH:mm:ss"; diff --git a/400_xowa/src/gplx/xowa/addons/apps/scripts/apis/Xoscript_doc_sect_base.java b/400_xowa/src/gplx/xowa/addons/apps/scripts/apis/Xoscript_doc_sect_base.java index b2a896b7f..4b75fc5bc 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/scripts/apis/Xoscript_doc_sect_base.java +++ b/400_xowa/src/gplx/xowa/addons/apps/scripts/apis/Xoscript_doc_sect_base.java @@ -13,20 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.scripts.apis; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.scripts.*; +package gplx.xowa.addons.apps.scripts.apis; import gplx.*; +import gplx.xowa.addons.apps.scripts.*; public abstract class Xoscript_doc_sect_base { protected final Xoscript_doc doc; private final Hash_adp_bry marker_hash = Hash_adp_bry.cs(); private final Bry_bfr tmp_bfr = Bry_bfr_.New(); public Xoscript_doc_sect_base(Xoscript_doc doc) {this.doc = doc;} private byte[] get_marker_by_pos(byte[] pos_bry) { - return (byte[])marker_hash.Get_by_or_fail(pos_bry); + return (byte[])marker_hash.GetByOrFail(pos_bry); } public void reg_marker(String marker_str, String... pos_ary) { int len = pos_ary.length; byte[] marker_bry = Bry_.new_u8(marker_str); for (int i = 0; i < len; ++i) { - marker_hash.Add_if_dupe_use_nth(Bry_.new_u8(pos_ary[i]), marker_bry); + marker_hash.AddIfDupeUseNth(Bry_.new_u8(pos_ary[i]), marker_bry); } } public void add_html(String html) {add_html(Pos__default, html);} diff --git a/400_xowa/src/gplx/xowa/addons/apps/updates/dbs/Xoa_app_version_tbl.java b/400_xowa/src/gplx/xowa/addons/apps/updates/dbs/Xoa_app_version_tbl.java index 072cf9dec..4ecd9ff67 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/updates/dbs/Xoa_app_version_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/apps/updates/dbs/Xoa_app_version_tbl.java @@ -13,21 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.updates.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.updates.*; -import gplx.dbs.*; import gplx.dbs.utls.*; +package gplx.xowa.addons.apps.updates.dbs; import gplx.*; +import gplx.dbs.*; public class Xoa_app_version_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__version_id, fld__version_name, fld__version_date, fld__version_priority, fld__version_url, fld__version_summary, fld__version_details; private final Db_conn conn; public Xoa_app_version_tbl(Db_conn conn) { this.conn = conn; - this.fld__version_id = flds.Add_int_pkey("version_id"); - this.fld__version_name = flds.Add_str("version_name", 32); - this.fld__version_date = flds.Add_str("version_date", 32); - this.fld__version_priority = flds.Add_int("version_priority"); // 3:trivial; 5:minor; 7:major; - this.fld__version_url = flds.Add_str("version_url", 255); - this.fld__version_summary = flds.Add_str("version_summary", 255); - this.fld__version_details = flds.Add_text("version_details"); + this.fld__version_id = flds.AddIntPkey("version_id"); + this.fld__version_name = flds.AddStr("version_name", 32); + this.fld__version_date = flds.AddStr("version_date", 32); + this.fld__version_priority = flds.AddInt("version_priority"); // 3:trivial; 5:minor; 7:major; + this.fld__version_url = flds.AddStr("version_url", 255); + this.fld__version_summary = flds.AddStr("version_summary", 255); + this.fld__version_details = flds.AddText("version_details"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = TBL_NAME; @@ -48,7 +48,7 @@ public class Xoa_app_version_tbl implements Db_tbl { while (rdr.Move_next()) { list.Add(Load(rdr)); } - return (Xoa_app_version_itm[])list.To_ary_and_clear(Xoa_app_version_itm.class); + return (Xoa_app_version_itm[])list.ToAryAndClear(Xoa_app_version_itm.class); } finally {rdr.Rls();} } public Xoa_app_version_itm Select_by_name_or_null(String name) { diff --git a/400_xowa/src/gplx/xowa/addons/apps/updates/js/Xojs_wkr__replace.java b/400_xowa/src/gplx/xowa/addons/apps/updates/js/Xojs_wkr__replace.java index c815f6c6b..7ce9a03ab 100644 --- a/400_xowa/src/gplx/xowa/addons/apps/updates/js/Xojs_wkr__replace.java +++ b/400_xowa/src/gplx/xowa/addons/apps/updates/js/Xojs_wkr__replace.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.apps.updates.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.apps.*; import gplx.xowa.addons.apps.updates.*; +package gplx.xowa.addons.apps.updates.js; import gplx.*; import gplx.xowa.guis.cbks.*; public class Xojs_wkr__replace extends Xojs_wkr__base { private final Io_url src_dir, trg_dir; @@ -46,6 +46,6 @@ public class Xojs_wkr__replace extends Xojs_wkr__base { } } - this.failed = (Keyval[])failed_list.To_ary_and_clear(Keyval.class); + this.failed = (Keyval[])failed_list.ToAryAndClear(Keyval.class); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xoac_wiki_cfg_bldr_fil.java b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xoac_wiki_cfg_bldr_fil.java index fb5fd5f63..5ef19e1eb 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xoac_wiki_cfg_bldr_fil.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xoac_wiki_cfg_bldr_fil.java @@ -1,23 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.app_cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.app_cfgs; import gplx.*; public class Xoac_wiki_cfg_bldr_fil implements Gfo_invk { public Xoac_wiki_cfg_bldr_fil(String wiki) {this.wiki = wiki;} public String Wiki() {return wiki;} private String wiki; - public int Itms_count() {return list.Count();} + public int Itms_count() {return list.Len();} public Xoac_wiki_cfg_bldr_cmd Itms_get_at(int i) {return (Xoac_wiki_cfg_bldr_cmd)list.Get_at(i);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_new_cmd_)) {Itms_add(m.ReadStr("id"), m.ReadStr("text"));} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr.java b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr.java index 07ae06ae0..03f9113d1 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr.java @@ -1,25 +1,25 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.app_cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.app_cfgs; import gplx.*; import gplx.xowa.*; import gplx.core.strings.*; import gplx.xowa.bldrs.*; public class Xob_wiki_cfg_bldr implements Gfo_invk { public Xob_wiki_cfg_bldr(Xob_bldr bldr) {this.app = bldr.App();} private Xoae_app app; public void Exec() { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Xoac_wiki_cfg_bldr_fil fil = (Xoac_wiki_cfg_bldr_fil)hash.Get_at(i); Exec_fil(fil); @@ -45,7 +45,7 @@ public class Xob_wiki_cfg_bldr implements Gfo_invk { } private static final String Invk_get = "get", Invk_run = "run"; public void Clear() {hash.Clear();} public Xoac_wiki_cfg_bldr_fil Itms_get_or_new(String wiki) { - Xoac_wiki_cfg_bldr_fil rv = (Xoac_wiki_cfg_bldr_fil)hash.Get_by(wiki); + Xoac_wiki_cfg_bldr_fil rv = (Xoac_wiki_cfg_bldr_fil)hash.GetByOrNull(wiki); if (rv == null) { rv = new Xoac_wiki_cfg_bldr_fil(wiki); hash.Add(wiki, rv); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr_tst.java b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr_tst.java index a40860c2b..133829cf4 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr_tst.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/Xob_wiki_cfg_bldr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.app_cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; +package gplx.xowa.addons.bldrs.app_cfgs; import gplx.*; import gplx.xowa.*; import org.junit.*; import gplx.core.strings.*; public class Xob_wiki_cfg_bldr_tst { Xob_wiki_cfg_bldr_fxt fxt = new Xob_wiki_cfg_bldr_fxt(); @@ -165,7 +165,7 @@ class Xob_wiki_cfg_bldr_fxt { } public void Test() { wiki_cfg_bldr.Exec(); - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Keyval kv = (Keyval)hash.Get_at(i); String wiki = kv.Key(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/wm_server_cfgs/Xowm_server_cfg_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/wm_server_cfgs/Xowm_server_cfg_mgr.java index f679d4a06..ce7979f22 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/wm_server_cfgs/Xowm_server_cfg_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/app_cfgs/wm_server_cfgs/Xowm_server_cfg_mgr.java @@ -57,7 +57,7 @@ public class Xowm_server_cfg_mgr { Php_parser php_parser = new Php_parser(); Php_evaluator eval = new Php_evaluator(new gplx.core.log_msgs.Gfo_msg_log("test")); php_parser.Parse_tkns(src, eval); - Php_line[] lines = (Php_line[])eval.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])eval.List().ToAry(Php_line.class); Php_line_assign line = (Php_line_assign)lines[0]; Php_itm_ary root_ary = (Php_itm_ary)line.Val(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/Xobc_task_step_hash.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/Xobc_task_step_hash.java index 04f8ac425..e52d3ad76 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/Xobc_task_step_hash.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/Xobc_task_step_hash.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; +package gplx.xowa.addons.bldrs.centrals.dbs; import gplx.*; public class Xobc_task_step_hash { private final Ordered_hash tasks_hash = Ordered_hash_.New(); private final Ordered_hash steps_hash = Ordered_hash_.New(); @@ -23,7 +23,7 @@ public class Xobc_task_step_hash { public int Steps__get_at(int i) {return Int_.Cast(steps_hash.Get_at(i));} public void Clear() {tasks_hash.Clear(); steps_hash.Clear();} public void Add(int task_id, int step_id) { - tasks_hash.Add_if_dupe_use_nth(task_id, task_id); - steps_hash.Add_if_dupe_use_nth(step_id, step_id); + tasks_hash.AddIfDupeUseNth(task_id, task_id); + steps_hash.AddIfDupeUseNth(step_id, step_id); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_host_regy_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_host_regy_tbl.java index a69babd0d..efef3e13e 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_host_regy_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_host_regy_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.dbs.*; public class Xobc_host_regy_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_host_id, fld_host_domain, fld_host_data_dir, fld_host_update_dir; private final Db_conn conn; public Xobc_host_regy_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "host_regy"; - this.fld_host_id = flds.Add_int_pkey("host_id"); - this.fld_host_domain = flds.Add_str("host_domain", 255); // EX: archive.org - this.fld_host_data_dir = flds.Add_str("host_data_dir", 255); // EX: download/Xowa_~{host_regy|wiki_abrv}_latest - this.fld_host_update_dir = flds.Add_str("host_update_dir", 255); // EX: download/Xowa_app_support + this.fld_host_id = flds.AddIntPkey("host_id"); + this.fld_host_domain = flds.AddStr("host_domain", 255); // EX: archive.org + this.fld_host_data_dir = flds.AddStr("host_data_dir", 255); // EX: download/Xowa_~{host_regy|wiki_abrv}_latest + this.fld_host_update_dir = flds.AddStr("host_update_dir", 255); // EX: download/Xowa_app_support conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_lang_regy_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_lang_regy_tbl.java index fef2b1900..112c29c49 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_lang_regy_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_lang_regy_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.dbs.*; public class Xobc_lang_regy_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__lang_id, fld__lang_key, fld__lang_name; private final Db_conn conn; public Xobc_lang_regy_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "lang_regy"; - this.fld__lang_id = flds.Add_int_pkey("lang_id"); - this.fld__lang_key = flds.Add_str("lang_key", 255); - this.fld__lang_name = flds.Add_str("lang_name", 255); + this.fld__lang_id = flds.AddIntPkey("lang_id"); + this.fld__lang_key = flds.AddStr("lang_key", 255); + this.fld__lang_name = flds.AddStr("lang_name", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -37,7 +37,7 @@ public class Xobc_lang_regy_tbl implements Db_tbl { list.Add(new Xobc_lang_regy_itm(rdr.Read_int(fld__lang_id), rdr.Read_str(fld__lang_key), rdr.Read_str(fld__lang_name))); } finally {rdr.Rls();} - return (Xobc_lang_regy_itm[])list.To_ary_and_clear(Xobc_lang_regy_itm.class); + return (Xobc_lang_regy_itm[])list.ToAryAndClear(Xobc_lang_regy_itm.class); } public void Rls() {} } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_map_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_map_tbl.java index b726d04ac..a49f47030 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_map_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_map_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.dbs.*; public class Xobc_step_map_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_sm_id, fld_step_seqn, fld_task_id, fld_step_id; private final Db_conn conn; private Db_stmt insert_stmt; public Xobc_step_map_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "step_map"; - this.fld_sm_id = flds.Add_int_pkey("sm_id"); - this.fld_task_id = flds.Add_int("task_id"); - this.fld_step_id = flds.Add_int("step_id"); - this.fld_step_seqn = flds.Add_int("step_seqn"); + this.fld_sm_id = flds.AddIntPkey("sm_id"); + this.fld_task_id = flds.AddInt("task_id"); + this.fld_step_id = flds.AddInt("step_id"); + this.fld_step_seqn = flds.AddInt("step_seqn"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_regy_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_regy_tbl.java index 2191591ec..05613c9fd 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_regy_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_step_regy_tbl.java @@ -13,18 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.dbs.*; -import gplx.xowa.addons.bldrs.centrals.cmds.*; import gplx.xowa.addons.bldrs.centrals.tasks.*; public class Xobc_step_regy_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_step_id, fld_step_type; private final Db_conn conn; private Db_stmt insert_stmt; public Xobc_step_regy_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "step_regy"; - this.fld_step_id = flds.Add_int_pkey("step_id"); - this.fld_step_type = flds.Add_int("step_type"); + this.fld_step_id = flds.AddIntPkey("step_id"); + this.fld_step_type = flds.AddInt("step_type"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_task_regy_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_task_regy_tbl.java index 4587e02e4..c44ebaba1 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_task_regy_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_task_regy_tbl.java @@ -13,21 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.dbs.*; -import gplx.xowa.addons.bldrs.centrals.cmds.*; import gplx.xowa.addons.bldrs.centrals.tasks.*; +import gplx.xowa.addons.bldrs.centrals.tasks.*; public class Xobc_task_regy_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_task_id, fld_task_seqn, fld_step_count, fld_task_key, fld_task_name; private final Db_conn conn; private Db_stmt insert_stmt; public Xobc_task_regy_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "task_regy"; - this.fld_task_id = flds.Add_int_pkey("task_id"); - this.fld_task_seqn = flds.Add_int("task_seqn"); - this.fld_step_count = flds.Add_int("step_count"); - this.fld_task_key = flds.Add_str("task_key", 255); - this.fld_task_name = flds.Add_str("task_name", 255); + this.fld_task_id = flds.AddIntPkey("task_id"); + this.fld_task_seqn = flds.AddInt("task_seqn"); + this.fld_step_count = flds.AddInt("step_count"); + this.fld_task_key = flds.AddStr("task_key", 255); + this.fld_task_name = flds.AddStr("task_name", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -87,7 +87,7 @@ public class Xobc_task_regy_tbl implements Db_tbl { )); } } finally {rdr.Rls();} - return (Xobc_task_regy_itm[])list.To_ary_and_clear(Xobc_task_regy_itm.class); + return (Xobc_task_regy_itm[])list.ToAryAndClear(Xobc_task_regy_itm.class); } public void Delete(int task_id) { conn.Stmt_delete(tbl_name, fld_task_id).Crt_int(fld_task_id, task_id).Exec_delete(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_version_regy_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_version_regy_tbl.java index c37c126fb..a53840eaf 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_version_regy_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/Xobc_version_regy_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas; import gplx.*; import gplx.dbs.*; public class Xobc_version_regy_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_version_id, fld_version_date, fld_version_note; private final Db_conn conn; public Xobc_version_regy_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "version_regy"; - this.fld_version_id = flds.Add_int_pkey("version_id"); - this.fld_version_date = flds.Add_str("version_date", 16); - this.fld_version_note = flds.Add_str("version_note", 255); + this.fld_version_id = flds.AddIntPkey("version_id"); + this.fld_version_date = flds.AddStr("version_date", 16); + this.fld_version_note = flds.AddStr("version_note", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/imports/Xobc_import_step_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/imports/Xobc_import_step_tbl.java index b184dbcad..a6ccf111b 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/imports/Xobc_import_step_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/datas/imports/Xobc_import_step_tbl.java @@ -13,27 +13,28 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.datas.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.*; +package gplx.xowa.addons.bldrs.centrals.dbs.datas.imports; import gplx.*; +import gplx.xowa.addons.bldrs.centrals.dbs.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.*; import gplx.dbs.*; public class Xobc_import_step_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_step_id, fld_host_id, fld_wiki_abrv, fld_wiki_date, fld_import_name, fld_import_type, fld_import_zip, fld_import_md5, fld_import_size_zip, fld_import_size_raw, fld_prog_size_end, fld_prog_count_end; public final Db_conn conn; private Db_stmt insert_stmt; public Xobc_import_step_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "import_step"; - this.fld_step_id = flds.Add_int_pkey("step_id"); - this.fld_host_id = flds.Add_int("host_id"); - this.fld_wiki_abrv = flds.Add_str("wiki_abrv", 255); - this.fld_wiki_date = flds.Add_str("wiki_date", 8); - this.fld_import_name = flds.Add_str("import_name", 255); - this.fld_import_type = flds.Add_int("import_type"); - this.fld_import_zip = flds.Add_byte("import_zip"); - this.fld_import_size_zip = flds.Add_long("import_size_zip"); - this.fld_import_size_raw = flds.Add_long("import_size_raw"); - this.fld_import_md5 = flds.Add_str("import_md5", 48); - this.fld_prog_size_end = flds.Add_long("prog_size_end"); - this.fld_prog_count_end = flds.Add_long("prog_count_end"); + this.fld_step_id = flds.AddIntPkey("step_id"); + this.fld_host_id = flds.AddInt("host_id"); + this.fld_wiki_abrv = flds.AddStr("wiki_abrv", 255); + this.fld_wiki_date = flds.AddStr("wiki_date", 8); + this.fld_import_name = flds.AddStr("import_name", 255); + this.fld_import_type = flds.AddInt("import_type"); + this.fld_import_zip = flds.AddByte("import_zip"); + this.fld_import_size_zip = flds.AddLong("import_size_zip"); + this.fld_import_size_raw = flds.AddLong("import_size_raw"); + this.fld_import_md5 = flds.AddStr("import_md5", 48); + this.fld_prog_size_end = flds.AddLong("prog_size_end"); + this.fld_prog_count_end = flds.AddLong("prog_count_end"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -94,7 +95,7 @@ public class Xobc_import_step_tbl implements Db_tbl { list.Add(New_itm(rdr)); } } finally {rdr.Rls();} - return (Xobc_import_step_itm[])list.To_ary_and_clear(Xobc_import_step_itm.class); + return (Xobc_import_step_itm[])list.ToAryAndClear(Xobc_import_step_itm.class); } public void Rls() { insert_stmt = Db_stmt_.Rls(insert_stmt); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_step_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_step_tbl.java index 026da7f5c..1908eadb8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_step_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_step_tbl.java @@ -13,18 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.users; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.users; import gplx.*; import gplx.dbs.*; -import gplx.xowa.addons.bldrs.centrals.cmds.*; import gplx.xowa.addons.bldrs.centrals.tasks.*; public class Xobc_done_step_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_task_id, fld_step_id; private final Db_conn conn; public Xobc_done_step_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xobc_done_step"; - this.fld_task_id = flds.Add_int("task_id"); - this.fld_step_id = flds.Add_int("step_id"); + this.fld_task_id = flds.AddInt("task_id"); + this.fld_step_id = flds.AddInt("step_id"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -43,7 +42,7 @@ public class Xobc_done_step_tbl implements Db_tbl { try { if (rdr.Move_next()) { if (rv == null) rv = Hash_adp_.New(); - rv.Add_as_key_and_val(rdr.Read_int("step_id")); + rv.AddAsKeyAndVal(rdr.Read_int("step_id")); } } finally {rdr.Rls();} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_task_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_task_tbl.java index 288e9434b..961fd9f15 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_task_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_done_task_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.users; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.users; import gplx.*; import gplx.dbs.*; -import gplx.xowa.addons.bldrs.centrals.cmds.*; import gplx.xowa.addons.bldrs.centrals.tasks.*; +import gplx.xowa.addons.bldrs.centrals.tasks.*; public class Xobc_done_task_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_task_id, fld_task_seqn; private final Db_conn conn; public Xobc_done_task_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xobc_done_task"; - this.fld_task_id = flds.Add_int_pkey("task_id"); - this.fld_task_seqn = flds.Add_int("task_seqn"); + this.fld_task_id = flds.AddIntPkey("task_id"); + this.fld_task_seqn = flds.AddInt("task_seqn"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_work_task_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_work_task_tbl.java index 5e7ca2887..353a84cc9 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_work_task_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/dbs/users/Xobc_work_task_tbl.java @@ -13,20 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.dbs.users; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; +package gplx.xowa.addons.bldrs.centrals.dbs.users; import gplx.*; +import gplx.xowa.addons.bldrs.centrals.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.centrals.cmds.*; import gplx.xowa.addons.bldrs.centrals.tasks.*; public class Xobc_work_task_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_task_id, fld_task_seqn, fld_step_id, fld_cmd_id; private final Db_conn conn; public Xobc_work_task_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xobc_work_task"; - this.fld_task_id = flds.Add_int_pkey("task_id"); - this.fld_task_seqn = flds.Add_int("task_seqn"); - this.fld_step_id = flds.Add_int("step_id"); - this.fld_cmd_id = flds.Add_int("cmd_id"); + this.fld_task_id = flds.AddIntPkey("task_id"); + this.fld_task_seqn = flds.AddInt("task_seqn"); + this.fld_step_id = flds.AddInt("step_id"); + this.fld_cmd_id = flds.AddInt("cmd_id"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/hosts/Host_eval_itm.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/hosts/Host_eval_itm.java index 1517fb94d..d798c2280 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/hosts/Host_eval_itm.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/hosts/Host_eval_itm.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.hosts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; +package gplx.xowa.addons.bldrs.centrals.hosts; import gplx.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.*; import gplx.core.brys.evals.*; import gplx.xowa.wikis.domains.*; @@ -32,7 +32,7 @@ public class Host_eval_itm { return Eval_src_dir(data_db, host_id, domain) + file_name; } public String Eval_src_dir(Xobc_data_db data_db, int host_id, Xow_domain_itm domain) { - Xobc_host_regy_itm host_itm = (Xobc_host_regy_itm)host_hash.Get_by(host_id); + Xobc_host_regy_itm host_itm = (Xobc_host_regy_itm)host_hash.GetByOrNull(host_id); if (host_itm == null) { host_itm = data_db.Tbl__host_regy().Select(host_id); host_hash.Add(host_id, host_itm); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_filter_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_filter_mgr.java index 628c6f8e2..2b8c689cf 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_filter_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_filter_mgr.java @@ -1,23 +1,22 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.centrals.mgrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.centrals.mgrs; import gplx.*; import gplx.core.gfobjs.*; import gplx.xowa.addons.bldrs.centrals.tasks.*; import gplx.xowa.wikis.domains.*; -import gplx.xowa.langs.*; public class Xobc_filter_mgr { private String lang_key_str = Xow_domain_itm_.Lang_key__all, type_key_str = Xow_domain_itm_.Type_key__all; public Xobc_task_itm[] Filter(Xobc_task_regy__base task_list) {return Filter(task_list, lang_key_str, type_key_str);} @@ -39,7 +38,7 @@ public class Xobc_filter_mgr { tmp.Add(task); } - return (Xobc_task_itm[])tmp.To_ary_and_clear(Xobc_task_itm.class); + return (Xobc_task_itm[])tmp.ToAryAndClear(Xobc_task_itm.class); } public Gfobj_nde Make_init_msg() { Gfobj_nde root = Gfobj_nde.New(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_lang_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_lang_mgr.java index bcbf26ec5..3250d9fba 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_lang_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/mgrs/Xobc_lang_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.centrals.mgrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.centrals.mgrs; import gplx.*; import gplx.core.gfobjs.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.*; public class Xobc_lang_mgr { @@ -27,6 +27,6 @@ public class Xobc_lang_mgr { itm_nde.Add_str("key", itm.Key()); itm_nde.Add_str("name", itm.Name()); } - return new Gfobj_ary((Gfobj_nde[])list.To_ary_and_clear(Gfobj_nde.class)); + return new Gfobj_ary((Gfobj_nde[])list.ToAryAndClear(Gfobj_nde.class)); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/steps/Xobc_step_factory.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/steps/Xobc_step_factory.java index d4512bdc5..9c2a95be4 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/steps/Xobc_step_factory.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/steps/Xobc_step_factory.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.steps; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; +package gplx.xowa.addons.bldrs.centrals.steps; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.bldrs.centrals.*; import gplx.core.brys.evals.*; import gplx.core.primitives.*; -import gplx.xowa.addons.bldrs.centrals.tasks.*; import gplx.xowa.addons.bldrs.centrals.cmds.*; import gplx.xowa.addons.bldrs.centrals.steps.*; import gplx.xowa.addons.bldrs.centrals.utils.*; -import gplx.xowa.addons.bldrs.centrals.dbs.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.imports.*; import gplx.xowa.addons.bldrs.centrals.hosts.*; -import gplx.xowa.addons.bldrs.exports.merges.*; -import gplx.xowa.addons.bldrs.updates.files.*; +import gplx.xowa.addons.bldrs.centrals.tasks.*; import gplx.xowa.addons.bldrs.centrals.cmds.*; +import gplx.xowa.addons.bldrs.centrals.utils.*; +import gplx.xowa.addons.bldrs.centrals.dbs.*; +import gplx.xowa.addons.bldrs.centrals.dbs.datas.imports.*; import gplx.xowa.addons.bldrs.centrals.hosts.*; import gplx.xowa.addons.bldrs.exports.packs.files.*; -import gplx.xowa.bldrs.*; import gplx.xowa.wikis.domains.*; public class Xobc_step_factory { private final Xobc_task_mgr task_mgr; @@ -79,7 +79,7 @@ public class Xobc_step_factory { case Xobc_import_type.Tid__wiki__core: list.Add(new Xobc_cmd__wiki_reg (task_mgr, task_id, step_id, cmd_idx++, wiki_dir_url, wiki_domain)); break; case Xobc_import_type.Tid__fsdb__delete: list.Add(new Xobc_cmd__fsdb_delete (task_mgr, task_id, step_id, cmd_idx++, Pack_zip_name_bldr.To_wiki_url(wiki_dir_url, zip_file_url.OwnerDir()))); break; } - return (Xobc_cmd_itm[])list.To_ary_and_clear(Xobc_cmd_itm.class); + return (Xobc_cmd_itm[])list.ToAryAndClear(Xobc_cmd_itm.class); } private Io_url Eval_url(String src) {return Io_url_.new_any_(String_.new_u8(eval_mgr.Eval(Bry_.new_u8(src))));} public static Xow_wiki Get_wiki_by_abrv(Xoa_app app, byte[] wiki_abrv) { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__base.java b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__base.java index f323d9eb2..b88d1c98e 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__base.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/centrals/tasks/Xobc_task_regy__base.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.centrals.tasks; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.centrals.*; +package gplx.xowa.addons.bldrs.centrals.tasks; import gplx.*; +import gplx.xowa.addons.bldrs.centrals.*; import gplx.core.gfobjs.*; public abstract class Xobc_task_regy__base { private final Ordered_hash hash = Ordered_hash_.New(); @@ -24,7 +25,7 @@ public abstract class Xobc_task_regy__base { public void Add(Xobc_task_itm t) {hash.Add(t.Task_id(), t);} public void Clear() {hash.Clear();} public Xobc_task_itm Get_at(int i) {return (Xobc_task_itm)hash.Get_at(i);} - public Xobc_task_itm Get_by(int i) {return (Xobc_task_itm)hash.Get_by(i);} + public Xobc_task_itm Get_by(int i) {return (Xobc_task_itm)hash.GetByOrNull(i);} public void Del_by(int i) {hash.Del(i);} public void Sort() {hash.Sort();} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_utl.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_utl.java index b24430e1b..123127655 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_utl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_utl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.dbs.*; public class Merge2_copy_utl { private final Bry_bfr bfr = Bry_bfr_.New(); @@ -60,11 +60,11 @@ public class Merge2_copy_utl { } return bfr.To_bry_and_clear(); } - public String Bld_sql(Dbmeta_fld_list flds, int flds_end, boolean src_is_pack, byte mode, int resume__db_id) { + public String Bld_sql(DbmetaFldList flds, int flds_end, boolean src_is_pack, byte mode, int resume__db_id) { bfr.Add_str_a7("SELECT"); for (int i = 0; i < flds_end; ++i) { bfr.Add_str_a7(i == 0 ? " " : ", "); - bfr.Add_str_u8(flds.Get_at(i).Name()); + bfr.Add_str_u8(flds.GetAt(i).Name()); } bfr.Add_str_u8(Bld_select_fld(mode)); bfr.Add_str_a7("\nFROM ").Add_str_u8(tbl_name); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_wkr__lot.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_wkr__lot.java index cee5efb82..90af8cac0 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_wkr__lot.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_copy_wkr__lot.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.utls.*; class Merge2_copy_wkr__lot { private final Split_tbl tbl; @@ -45,7 +45,7 @@ class Merge2_copy_wkr__lot { } } private void Copy_by_trg_conn(String msg, Merge_prog_wkr prog_wkr, Db_conn src_conn, Merge2_trg_itm trg_db, int trg_db_id, boolean src_is_pack) { - Dbmeta_fld_list src_flds = tbl.Flds().Clone(); // src_flds.Insert(0, Dbmeta_fld_itm.new_int("trg_db_id")); + DbmetaFldList src_flds = tbl.Flds().Clone(); // src_flds.Insert(0, Dbmeta_fld_itm.new_int("trg_db_id")); Merge_wkr_utl.Merge_by_sql(prog_wkr, msg, tbl.Tbl_name(), src_flds, src_conn, trg_db, trg_db_id, !src_is_pack); } private int[] Get_trg_dbs(Db_conn conn, String tbl_name) { @@ -59,7 +59,7 @@ class Merge2_copy_wkr__lot { finally { rdr.Rls(); } - return (int[])list.To_ary_and_clear(int.class); + return (int[])list.ToAryAndClear(int.class); } public void Copy_entire_src(Merge_ctx ctx, Merge_prog_wkr prog_wkr, Db_conn src_conn, Merge2_trg_itm trg_db, Merge2_trg_mgr trg_mgr, boolean src_is_pack) { Xow_wiki wiki = ctx.Wiki(); @@ -73,9 +73,9 @@ class Merge2_copy_wkr__lot { } private void Copy_rows(Merge_ctx ctx, Merge_prog_wkr prog_wkr, Xow_wiki wiki, Split_tbl tbl, Db_conn src_conn, Merge2_trg_itm trg_db, Merge2_trg_mgr trg_mgr, boolean src_is_pack, byte select_mode) { // init src - Dbmeta_fld_list src_flds = tbl.Flds().Clone(); + DbmetaFldList src_flds = tbl.Flds().Clone(); if (src_is_pack) - src_flds.Insert(0, Dbmeta_fld_itm.new_int("trg_db_id")); + src_flds.AddAt(0, DbmetaFldItm.NewInt("trg_db_id")); int flds_nth = src_flds.Len(); if (tbl_has_blob) { Split_tbl_.Flds__add_blob_len(src_flds); @@ -85,7 +85,7 @@ class Merge2_copy_wkr__lot { Db_rdr src_rdr = src_conn.Stmt_sql(src_sql).Exec_select__rls_auto(); copy_utl.Init_conn(src_conn); - Dbmeta_fld_list trg_flds = tbl.Flds().Clone(); + DbmetaFldList trg_flds = tbl.Flds().Clone(); if (tbl_has_blob && src_is_pack) { Split_tbl_.Flds__add_blob_len(trg_flds); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_db.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_db.java index 7d20da428..10527c64c 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_db.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_db.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.utls.*; public class Merge2_heap_db implements Merge2_trg_itm { - public Merge2_heap_db(Split_tbl tbl, Dbmeta_fld_list flds, int idx, Io_url url, Db_conn conn) { + public Merge2_heap_db(Split_tbl tbl, DbmetaFldList flds, int idx, Io_url url, Db_conn conn) { this.tbl = tbl; this.flds = flds; this.idx = idx; this.url = url; this.conn = conn; } public Split_tbl Tbl() {return tbl;} private final Split_tbl tbl; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds; + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds; public int Idx() {return idx;} private final int idx; public Io_url Url() {return url;} private final Io_url url; public Db_conn Conn() {return conn;} private final Db_conn conn; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_mgr.java index 417e22a4a..e24639894 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_heap_mgr.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.utls.*; public class Merge2_heap_mgr {// data tbls will only have 1 itms; blob tbls will have N itms private final Split_tbl tbl; private final List_adp list = List_adp_.New(), deleted = List_adp_.New(); - private Dbmeta_fld_list heap_flds; + private DbmetaFldList heap_flds; public Merge2_heap_mgr(Split_tbl tbl) {this.tbl = tbl;} public Merge2_heap_db Cur() {return cur;} private Merge2_heap_db cur; public Merge2_heap_db Make_itm(Xow_wiki wiki, int trg_db_id) { @@ -26,8 +26,8 @@ public class Merge2_heap_mgr {// data tbls will only have 1 itms; blob tbls will this.heap_flds = tbl.Flds().Clone(); int len = heap_flds.Len(); for (int i = 0; i < len; ++i) { - Dbmeta_fld_itm itm = heap_flds.Get_at(i); - if (itm.Primary()) itm.Primary_n_(); + DbmetaFldItm itm = heap_flds.GetAt(i); + if (itm.Primary()) itm.PrimarySetN(); } // if blob, add "blob_len" in penultimate pos; note that last fld is "blob_fld" @@ -80,7 +80,7 @@ public class Merge2_heap_mgr {// data tbls will only have 1 itms; blob tbls will Split_tbl tbl = wkr.Tbl(); String tbl_name = tbl.Tbl_name(); Db_conn heap_conn = itm.Conn(); - Dbmeta_fld_list tbl_flds = tbl.Flds(); + DbmetaFldList tbl_flds = tbl.Flds(); Db_conn wiki_conn = tbl.Wiki_conn__get_or_new(ctx.Wiki(), itm.Idx()); // index heap table diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_base.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_base.java index 66cd74bb1..a9c3cba54 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_base.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_base.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.merges; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.utls.*; public abstract class Merge2_wkr__heap_base implements Merge2_wkr { public Merge2_wkr__heap_base(Split_tbl tbl) { @@ -28,5 +28,5 @@ public abstract class Merge2_wkr__heap_base implements Merge2_wkr { } protected abstract void Copy_to_heap(Merge_ctx ctx, Merge_prog_wkr prog_wkr, Merge2_heap_mgr heap_mgr, Split_tbl tbl); protected abstract void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, Merge2_heap_mgr heap_mgr, Split_tbl tbl); - public abstract void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, String tbl_name, Dbmeta_fld_list src_flds, Db_conn src_conn, Merge2_trg_itm trg_db, String[] fld_pkeys); + public abstract void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, String tbl_name, DbmetaFldList src_flds, Db_conn src_conn, Merge2_trg_itm trg_db, String[] fld_pkeys); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_lot.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_lot.java index ceba82462..119b4ecb3 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_lot.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_lot.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.utls.*; public class Merge2_wkr__heap_lot extends Merge2_wkr__heap_base { private final Merge2_copy_wkr__lot copy_wkr; @@ -30,7 +30,7 @@ public class Merge2_wkr__heap_lot extends Merge2_wkr__heap_base { if (ctx.Heap__copy_to_wiki()) heap_mgr.Copy_to_wiki(ctx, prog_wkr, this); } - @Override public void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, String tbl_name, Dbmeta_fld_list trg_flds, Db_conn src_conn, Merge2_trg_itm trg_db, String[] fld_pkeys) { + @Override public void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, String tbl_name, DbmetaFldList trg_flds, Db_conn src_conn, Merge2_trg_itm trg_db, String[] fld_pkeys) { copy_wkr.Copy_by_sql("merging " + tbl_name, ctx, prog_wkr, src_conn, trg_db, trg_mgr__heap, Bool_.N); // copy_wkr.Copy_entire_src(ctx, prog_wkr, src_conn, trg_db, trg_mgr__heap, Bool_.N); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_one.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_one.java index 9c24063d6..d8070d752 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_one.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge2_wkr__heap_one.java @@ -1,26 +1,26 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.utls.*; public class Merge2_wkr__heap_one extends Merge2_wkr__heap_base { public Merge2_wkr__heap_one(Split_tbl tbl) {super(tbl);} @Override protected void Copy_to_heap(Merge_ctx ctx, Merge_prog_wkr prog_wkr, Merge2_heap_mgr heap_mgr, Split_tbl tbl) { // init String tbl_name = tbl.Tbl_name(); - Dbmeta_fld_list flds = tbl.Flds(); + DbmetaFldList flds = tbl.Flds(); Merge2_heap_db heap_db = heap_mgr.Cur(); if (heap_db == null) heap_db = heap_mgr.Make_itm(ctx.Wiki(), -1); @@ -31,7 +31,7 @@ public class Merge2_wkr__heap_one extends Merge2_wkr__heap_base { if (ctx.Heap__copy_to_wiki()) heap_mgr.Copy_to_wiki(ctx, prog_wkr, this); } - @Override public void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, String tbl_name, Dbmeta_fld_list trg_flds, Db_conn src_conn, Merge2_trg_itm trg_db, String[] fld_pkeys) { + @Override public void Copy_to_wiki(Merge_ctx ctx, Merge_prog_wkr prog_wkr, String tbl_name, DbmetaFldList trg_flds, Db_conn src_conn, Merge2_trg_itm trg_db, String[] fld_pkeys) { Merge_wkr_utl.Merge_by_sql(prog_wkr, "merging " + tbl_name, tbl_name, trg_flds, src_conn, trg_db, -1, Bool_.Y); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge_wkr_utl.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge_wkr_utl.java index 0f00aba2c..a828730dd 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge_wkr_utl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/merges/Merge_wkr_utl.java @@ -1,23 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.merges; import gplx.*; import gplx.dbs.*; import gplx.dbs.bulks.*; import gplx.dbs.engines.sqlite.*; import gplx.xowa.addons.bldrs.exports.utls.*; class Merge_wkr_utl { - public static void Merge_by_sql(Db_bulk_prog prog_wkr, String msg, String tbl_name, Dbmeta_fld_list flds, Db_conn src_conn, Merge2_trg_itm trg_db, int trg_db_id, boolean disable_synchronous) { + public static void Merge_by_sql(Db_bulk_prog prog_wkr, String msg, String tbl_name, DbmetaFldList flds, Db_conn src_conn, Merge2_trg_itm trg_db, int trg_db_id, boolean disable_synchronous) { Bry_bfr bfr = Bry_bfr_.New(); Db_conn trg_conn = trg_db.Conn(); Db_attach_mgr attach_mgr = new Db_attach_mgr(trg_conn, new Db_attach_itm("src_db", src_conn)); @@ -45,20 +45,20 @@ class Merge_wkr_utl { rdr.Rls(); } } - private static String Bld_insert_into(Bry_bfr bfr, String tbl_name, Dbmeta_fld_list flds, int trg_db_id, boolean disable_synchronous) { + private static String Bld_insert_into(Bry_bfr bfr, String tbl_name, DbmetaFldList flds, int trg_db_id, boolean disable_synchronous) { Split_tbl_.Bld_insert_by_select(bfr, tbl_name, flds); if (trg_db_id != -1 && !disable_synchronous) bfr.Add_str_u8_fmt("WHERE trg_db_id = {0}", trg_db_id); return bfr.To_str_and_clear(); } - public static void Merge_by_rows(Db_bulk_prog prog_wkr, String msg, String tbl_name, Dbmeta_fld_list flds, Db_conn src_conn, Db_conn trg_conn, String[] order_bys) { + public static void Merge_by_rows(Db_bulk_prog prog_wkr, String msg, String tbl_name, DbmetaFldList flds, Db_conn src_conn, Db_conn trg_conn, String[] order_bys) { Db_stmt src_stmt = order_bys == String_.Ary_empty ? src_conn.Stmt_select_all(tbl_name, flds) : src_conn.Stmt_select_order(tbl_name, flds, String_.Ary_empty, order_bys) ; Db_rdr src = src_stmt.Exec_select__rls_auto(); Db_stmt trg = trg_conn.Stmt_insert(tbl_name, flds); - try {Db_bulk_exec_.Insert(prog_wkr, msg, flds.To_fld_ary(), src, trg, trg_conn);} + try {Db_bulk_exec_.Insert(prog_wkr, msg, flds.ToFldAry(), src, trg, trg_conn);} finally { src.Rls(); trg.Rls(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash.java index 2d8b52a53..e4321758f 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.packs.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.packs.*; +package gplx.xowa.addons.bldrs.exports.packs.files; import gplx.*; class Pack_hash { private final Ordered_hash hash = Ordered_hash_.New(); public int Len() {return hash.Len();} public Pack_list Get_at(int i) {return (Pack_list)hash.Get_at(i);} - public Pack_list Get_by(int tid) {return (Pack_list)hash.Get_by(tid);} + public Pack_list Get_by(int tid) {return (Pack_list)hash.GetByOrNull(tid);} public Pack_itm Add(Pack_zip_name_bldr bldr, int list_tid, Io_url file_url) {return Add(list_tid, bldr.Bld(file_url), file_url);} public Pack_itm Add(int list_tid, Io_url pack_url, Io_url... raw_urls) { - Pack_list list = (Pack_list)hash.Get_by(list_tid); + Pack_list list = (Pack_list)hash.GetByOrNull(list_tid); if (list == null) { list = new Pack_list(list_tid); hash.Add(list_tid, list); @@ -37,7 +37,7 @@ class Pack_hash { public void Consolidate(int... tids) { // merge n itms into 1 itm; needed for search-core + search-link -> search int tids_len = tids.length; for (int i = 0; i < tids_len; ++i) { - Pack_list list = (Pack_list)hash.Get_by(tids[i]); + Pack_list list = (Pack_list)hash.GetByOrNull(tids[i]); if (list == null) continue; // tid doesn't exist; EX: search in Tid_few int list_len = list.Len(); Pack_itm itm_0 = (Pack_itm)list.Get_at(0); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash_bldr.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash_bldr.java index dc4960f64..b86afc8ea 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash_bldr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/files/Pack_hash_bldr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.packs.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.packs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.packs.files; import gplx.*; import gplx.xowa.*; import gplx.core.ios.*; import gplx.fsdb.meta.*; import gplx.xowa.wikis.data.*; @@ -116,7 +116,7 @@ class Pack_hash_bldr { // size exceeded; make new pack if (size_new >= size_max) { - rv.Add(Xobc_import_type.Tid__wiki__lucene, zip_name_bldr.Bld_by_suffix("xtn.fulltext_search", pack_num), (Io_url[])url_list.To_ary_and_clear(Io_url.class)); + rv.Add(Xobc_import_type.Tid__wiki__lucene, zip_name_bldr.Bld_by_suffix("xtn.fulltext_search", pack_num), (Io_url[])url_list.ToAryAndClear(Io_url.class)); pack_num++; size_cur = 0; } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/splits/Pack_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/splits/Pack_mgr.java index baaa3f782..6a5a98bc7 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/splits/Pack_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/packs/splits/Pack_mgr.java @@ -1,22 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.packs.splits; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.packs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.packs.splits; import gplx.*; import gplx.xowa.*; import gplx.core.progs.*; import gplx.core.ios.zips.*; import gplx.core.ios.streams.*; import gplx.core.security.algos.*; import gplx.dbs.*; -import gplx.xowa.wikis.data.*; import gplx.xowa.addons.bldrs.centrals.dbs.*; import gplx.xowa.addons.bldrs.centrals.dbs.datas.imports.*; import gplx.xowa.addons.bldrs.centrals.steps.*; import gplx.xowa.addons.bldrs.exports.splits.mgrs.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; // NOTE: used for experimental pack / split approach (html,file,search in one db) @@ -76,7 +75,7 @@ class Pack_mgr { Io_url fil_1st = (Io_url)list.Get_at(0); int ns_id = Split_file_tid_.Get_ns_by_url(fil_1st); Io_url zip_url = pack_root.GenSubFil(Split_file_tid_.Make_file_name(wiki_abrv, wiki_date, rv.Len(), ns_id, ".zip")); - Pack_itm itm = new Pack_itm(pack_idx, Xobc_import_type.Tid__pack, zip_url, (Io_url[])list.To_ary_and_clear(Io_url.class)); + Pack_itm itm = new Pack_itm(pack_idx, Xobc_import_type.Tid__pack, zip_url, (Io_url[])list.ToAryAndClear(Io_url.class)); rv.Add(itm); pack_size_cur = 0; } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/archives/Reindex_html_dbs_cmd.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/archives/Reindex_html_dbs_cmd.java index b59296670..a474e978b 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/archives/Reindex_html_dbs_cmd.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/archives/Reindex_html_dbs_cmd.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.archives; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.archives; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.dbs.metas.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.htmls.core.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.htmls.*; @@ -59,12 +59,12 @@ class Reindex_html_dbs_cmd { } private void Create_repack_tbl() { core_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("repack" - , Dbmeta_fld_itm.new_int("sort_idx").Autonum_y_().Primary_y_() - , Dbmeta_fld_itm.new_int("page_id") - , Dbmeta_fld_itm.new_int("page_ns") - , Dbmeta_fld_itm.new_int("page_score") - , Dbmeta_fld_itm.new_int("page_len") - , Dbmeta_fld_itm.new_int("src_db") + , DbmetaFldItm.NewInt("sort_idx").AutonumSetY().PrimarySetY() + , DbmetaFldItm.NewInt("page_id") + , DbmetaFldItm.NewInt("page_ns") + , DbmetaFldItm.NewInt("page_score") + , DbmetaFldItm.NewInt("page_len") + , DbmetaFldItm.NewInt("src_db") )); } private void Insert_repack_rows() { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_init__file.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_init__file.java index b693b690c..10ebb610b 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_init__file.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_init__file.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.splits.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.splits.files; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.bldrs.exports.splits.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.mgrs.*; class Split_init__file { @@ -22,15 +23,15 @@ class Split_init__file { // get min page for each score Gfo_log_.Instance.Prog("creating fsdb_img_regy"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("fsdb_img_regy" - , Dbmeta_fld_itm.new_int("img_uid").Primary_y_().Autonum_y_() - , Dbmeta_fld_itm.new_byte("img_type") - , Dbmeta_fld_itm.new_int("fil_id") - , Dbmeta_fld_itm.new_int("thm_id") - , Dbmeta_fld_itm.new_int("bin_db_id") - , Dbmeta_fld_itm.new_int("page_uid") - , Dbmeta_fld_itm.new_int("page_ns") - , Dbmeta_fld_itm.new_int("page_score") - , Dbmeta_fld_itm.new_int("page_id") + , DbmetaFldItm.NewInt("img_uid").PrimarySetY().AutonumSetY() + , DbmetaFldItm.NewByte("img_type") + , DbmetaFldItm.NewInt("fil_id") + , DbmetaFldItm.NewInt("thm_id") + , DbmetaFldItm.NewInt("bin_db_id") + , DbmetaFldItm.NewInt("page_uid") + , DbmetaFldItm.NewInt("page_ns") + , DbmetaFldItm.NewInt("page_score") + , DbmetaFldItm.NewInt("page_id") )); Db_attach_mgr attach_mgr = new Db_attach_mgr(wkr_conn , new Db_attach_itm("page_db", wiki.Data__core_mgr().Tbl__page().Conn()) @@ -72,9 +73,9 @@ class Split_init__file { // promote fil if thm shows up earlier; i.e.: if thm_id=11 is score=99 and fil_id=10 is score=80, move fil_id to 99 Gfo_log_.Instance.Prog("creating fsdb_fil_min"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("fsdb_fil_min" - , Dbmeta_fld_itm.new_byte("img_uid") - , Dbmeta_fld_itm.new_int("fil_id") - , Dbmeta_fld_itm.new_int("thm_id") + , DbmetaFldItm.NewByte("img_uid") + , DbmetaFldItm.NewInt("fil_id") + , DbmetaFldItm.NewInt("thm_id") )); // add fils via thms; for thms with multiple fils, use Min(img_uid) @@ -96,8 +97,8 @@ class Split_init__file { // dupes may still exist, so do one more group by Gfo_log_.Instance.Prog("creating fsdb_fil_min_unique"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("fsdb_fil_min_unique" - , Dbmeta_fld_itm.new_byte("img_uid") - , Dbmeta_fld_itm.new_int("fil_id") + , DbmetaFldItm.NewByte("img_uid") + , DbmetaFldItm.NewInt("fil_id") )); wkr_conn.Exec_sql(String_.Concat_lines_nl // ANSI.Y ( "INSERT INTO fsdb_fil_min_unique (img_uid, fil_id)" @@ -109,11 +110,11 @@ class Split_init__file { // create fsdb_fil_regy Gfo_log_.Instance.Prog("creating fsdb_fil_regy"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("fsdb_fil_regy" - , Dbmeta_fld_itm.new_int("img_uid").Primary_y_() - , Dbmeta_fld_itm.new_int("fil_id") - , Dbmeta_fld_itm.new_int("page_ns") - , Dbmeta_fld_itm.new_int("page_score") - , Dbmeta_fld_itm.new_int("page_id") + , DbmetaFldItm.NewInt("img_uid").PrimarySetY() + , DbmetaFldItm.NewInt("fil_id") + , DbmetaFldItm.NewInt("page_ns") + , DbmetaFldItm.NewInt("page_score") + , DbmetaFldItm.NewInt("page_id") )); wkr_conn.Exec_sql(String_.Concat_lines_nl // ANSI.Y ( "INSERT INTO fsdb_fil_regy (img_uid, fil_id, page_ns, page_score, page_id)" diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_meta_wkr__bin.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_meta_wkr__bin.java index 3cd87bba6..f5e40e7f0 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_meta_wkr__bin.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_meta_wkr__bin.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.files; import gplx.*; +import gplx.xowa.addons.bldrs.exports.splits.*; import gplx.dbs.*; import gplx.fsdb.meta.*; import gplx.fsdb.data.*; import gplx.xowa.addons.bldrs.exports.splits.metas.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; @@ -28,7 +29,7 @@ class Split_meta_wkr__bin extends Split_meta_wkr_base { @Override public byte Tid() {return Split_page_list_type_.Tid__fsdb_bin;} @Override public void On_nth_new(Split_ctx ctx, Db_conn trg_conn) { this.tbl = new Fsd_bin_tbl(trg_conn, Bool_.N); - Dbmeta_fld_list trg_flds = Make_flds_for_split(tbl.Flds()); + DbmetaFldList trg_flds = Make_flds_for_split(tbl.Flds()); trg_conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl.Tbl_name(), trg_flds)); this.stmt = trg_conn.Stmt_insert(tbl.Tbl_name(), trg_flds); } @@ -92,15 +93,15 @@ class Split_meta_wkr__bin extends Split_meta_wkr_base { .Exec_insert(); rslt_wkr.On__nth__itm(db_row_size, bin_id); } - private static Dbmeta_fld_list Make_flds_for_split(Dbmeta_fld_list flds) { - Dbmeta_fld_list rv = new Dbmeta_fld_list(); - rv.Add(flds.Get_by("bin_owner_id")); - rv.Add_int("trg_db_id"); - rv.Add_int("blob_len"); - rv.Add(flds.Get_by("bin_owner_tid")); - rv.Add(flds.Get_by("bin_part_id")); - rv.Add(flds.Get_by("bin_data_url")); - rv.Add(flds.Get_by("bin_data")); + private static DbmetaFldList Make_flds_for_split(DbmetaFldList flds) { + DbmetaFldList rv = new DbmetaFldList(); + rv.Add(flds.GetByOrNull("bin_owner_id")); + rv.AddInt("trg_db_id"); + rv.AddInt("blob_len"); + rv.Add(flds.GetByOrNull("bin_owner_tid")); + rv.Add(flds.GetByOrNull("bin_part_id")); + rv.Add(flds.GetByOrNull("bin_data_url")); + rv.Add(flds.GetByOrNull("bin_data")); return rv; } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_rslt_wkr__org.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_rslt_wkr__org.java index 9a9ad3842..4255b8ce7 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_rslt_wkr__org.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/files/Split_rslt_wkr__org.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; -import gplx.dbs.*; -import gplx.xowa.addons.bldrs.exports.splits.rslts.*; -class Split_rslt_wkr__org extends Split_rslt_wkr__objs__base { - @Override public byte Tid() {return Split_rslt_tid_.Tid__fsdb_org;} - @Override public String Tbl_name() {return "rslt_fsdb_org";} - @Override public Dbmeta_fld_itm[] Pkey_flds() { - return new Dbmeta_fld_itm[] {Dbmeta_fld_itm.new_str("orig_ttl", 255), Dbmeta_fld_itm.new_byte("orig_repo")}; - } -} +package gplx.xowa.addons.bldrs.exports.splits.files; +import gplx.dbs.*; +import gplx.xowa.addons.bldrs.exports.splits.rslts.*; +class Split_rslt_wkr__org extends Split_rslt_wkr__objs__base { + @Override public byte Tid() {return Split_rslt_tid_.Tid__fsdb_org;} + @Override public String Tbl_name() {return "rslt_fsdb_org";} + @Override public DbmetaFldItm[] Pkey_flds() { + return new DbmetaFldItm[] {DbmetaFldItm.NewStr("orig_ttl", 255), DbmetaFldItm.NewByte("orig_repo")}; + } +} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Split_wkr__html.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Split_wkr__html.java index be416aae6..307f22531 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Split_wkr__html.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Split_wkr__html.java @@ -13,9 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.htmls; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.bldrs.exports.splits.*; import gplx.dbs.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.addons.bldrs.exports.splits.metas.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; +import gplx.xowa.addons.bldrs.exports.splits.rslts.*; import gplx.xowa.htmls.core.dbs.*; public class Split_wkr__html implements Split_wkr { private Xoh_src_tbl_mgr src_tbl_mgr; @@ -28,7 +29,7 @@ public class Split_wkr__html implements Split_wkr { } public void Split__trg__nth__new(Split_ctx ctx, Db_conn trg_conn) { this.tbl = new Xowd_html_tbl(trg_conn); - Dbmeta_fld_list trg_flds = Make_flds_for_split(tbl.Flds()); + DbmetaFldList trg_flds = Make_flds_for_split(tbl.Flds()); trg_conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl.Tbl_name(), trg_flds)); this.stmt = trg_conn.Stmt_insert(tbl.Tbl_name(), trg_flds); } @@ -64,17 +65,17 @@ public class Split_wkr__html implements Split_wkr { public void Split__trg__1st__new(Split_ctx ctx, Db_conn trg_conn) {} // html_dbs have no core tables public void Split__pages_loaded(Split_ctx ctx, int ns_id, int score_bgn, int score_end) {} // html_wkr has no caching public void Split__term(Split_ctx ctx) {} // html_wkr has no cleanup - private static Dbmeta_fld_list Make_flds_for_split(Dbmeta_fld_list flds) { - Dbmeta_fld_list rv = new Dbmeta_fld_list(); - rv.Add(flds.Get_by("page_id")); - rv.Add_int("trg_db_id"); - rv.Add_int("blob_len"); - rv.Add(flds.Get_by("head_flag")); - rv.Add(flds.Get_by("body_flag")); - rv.Add(flds.Get_by("display_ttl")); - rv.Add(flds.Get_by("content_sub")); - rv.Add(flds.Get_by("sidebar_div")); - rv.Add(flds.Get_by("body")); + private static DbmetaFldList Make_flds_for_split(DbmetaFldList flds) { + DbmetaFldList rv = new DbmetaFldList(); + rv.Add(flds.GetByOrNull("page_id")); + rv.AddInt("trg_db_id"); + rv.AddInt("blob_len"); + rv.Add(flds.GetByOrNull("head_flag")); + rv.Add(flds.GetByOrNull("body_flag")); + rv.Add(flds.GetByOrNull("display_ttl")); + rv.Add(flds.GetByOrNull("content_sub")); + rv.Add(flds.GetByOrNull("sidebar_div")); + rv.Add(flds.GetByOrNull("body")); return rv; } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Xoh_src_tbl_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Xoh_src_tbl_mgr.java index e999fa59e..851de1891 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Xoh_src_tbl_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/htmls/Xoh_src_tbl_mgr.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; -import gplx.dbs.*; -import gplx.xowa.wikis.data.*; import gplx.xowa.htmls.core.dbs.*; +package gplx.xowa.addons.bldrs.exports.splits.htmls; import gplx.*; import gplx.xowa.*; +import gplx.xowa.wikis.data.*; public class Xoh_src_tbl_mgr { private final Xow_wiki wiki; private final Ordered_hash hash = Ordered_hash_.New(); @@ -23,7 +22,7 @@ public class Xoh_src_tbl_mgr { this.wiki = wiki; } public Xoh_page_tbl_itm Get_or_load(int id) { - Xoh_page_tbl_itm rv = (Xoh_page_tbl_itm)hash.Get_by(id); + Xoh_page_tbl_itm rv = (Xoh_page_tbl_itm)hash.GetByOrNull(id); if (rv == null) { Xow_db_file html_db = wiki.Data__core_mgr().Dbs__get_by_id_or_fail(id); rv = new Xoh_page_tbl_itm(Bool_.N, id, html_db.Conn()); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/metas/Split_page_list.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/metas/Split_page_list.java index feec6f207..6e2899398 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/metas/Split_page_list.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/metas/Split_page_list.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.metas; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.metas; import gplx.*; public class Split_page_list { private final List_adp list = List_adp_.New(); public Split_page_list(byte type) {this.type = type;} public byte Type() {return type;} private final byte type; - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Object Get_at(int i) {return list.Get_at(i);} public void Add(Object o) {list.Add(o);} } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_cfg.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_cfg.java index e22385077..a036ae038 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_cfg.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_cfg.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.mgrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.mgrs; import gplx.*; public class Split_cfg implements Gfo_invk { public boolean Force_rebuild() {return force_rebuild;} private boolean force_rebuild; public long Trg_max() {return trg_max;} private long trg_max = 32 * Io_mgr.Len_mb; @@ -28,7 +28,7 @@ public class Split_cfg implements Gfo_invk { for (int i = 0; i < len; ++i) { list.Add(new Split_ns_itm(ary[i])); } - this.ns_itms = (Split_ns_itm[])list.To_ary_and_clear(Split_ns_itm.class); + this.ns_itms = (Split_ns_itm[])list.ToAryAndClear(Split_ns_itm.class); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_mgr_init.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_mgr_init.java index 58f77848e..9e73dca03 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_mgr_init.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/mgrs/Split_mgr_init.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.splits.mgrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.splits.mgrs; import gplx.*; +import gplx.xowa.addons.bldrs.exports.splits.*; import gplx.dbs.*; public class Split_mgr_init { public void Init(Split_ctx ctx, Db_conn wkr_conn, Db_conn page_conn) { @@ -25,8 +26,8 @@ public class Split_mgr_init { if (!(force_rebuild || !wkr_conn.Meta_tbl_exists("ns_regy"))) return; Gfo_log_.Instance.Prog("creating ns_regy"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("ns_regy" - , Dbmeta_fld_itm.new_int("ns_id").Primary_y_() - , Dbmeta_fld_itm.new_int("ns_ord") + , DbmetaFldItm.NewInt("ns_id").PrimarySetY() + , DbmetaFldItm.NewInt("ns_ord") )); int len = ns_itms.length; Db_stmt stmt = wkr_conn.Stmt_insert("ns_regy", "ns_id", "ns_ord"); @@ -39,12 +40,12 @@ public class Split_mgr_init { if (!(force_rebuild || !wkr_conn.Meta_tbl_exists("page_regy"))) return; Gfo_log_.Instance.Prog("creating page_regy"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("page_regy" - , Dbmeta_fld_itm.new_int("page_uid").Primary_y_().Autonum_y_() - , Dbmeta_fld_itm.new_int("page_ns_id") - , Dbmeta_fld_itm.new_int("page_ns_ord") - , Dbmeta_fld_itm.new_int("page_score") - , Dbmeta_fld_itm.new_int("page_len") - , Dbmeta_fld_itm.new_int("page_id") + , DbmetaFldItm.NewInt("page_uid").PrimarySetY().AutonumSetY() + , DbmetaFldItm.NewInt("page_ns_id") + , DbmetaFldItm.NewInt("page_ns_ord") + , DbmetaFldItm.NewInt("page_score") + , DbmetaFldItm.NewInt("page_len") + , DbmetaFldItm.NewInt("page_id") )); page_conn.Meta_idx_create("page", "page_uid", "page_namespace", "page_score", "page_len", "page_id"); // index page table; will drop below Db_attach_mgr attach_mgr = new Db_attach_mgr(wkr_conn, new Db_attach_itm("page_db", page_conn)); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rndms/Split_rslt_wkr__rndm.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rndms/Split_rslt_wkr__rndm.java index fd45e0a0b..152522e5d 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rndms/Split_rslt_wkr__rndm.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rndms/Split_rslt_wkr__rndm.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.rndms; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; -import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; -class Split_rslt_wkr__rndm extends Split_rslt_wkr__objs__base { - @Override public byte Tid() {return Split_rslt_tid_.Tid__rndm;} - @Override public String Tbl_name() {return "rslt_rndm";} - @Override public Dbmeta_fld_itm[] Pkey_flds() { - return new Dbmeta_fld_itm[] {Dbmeta_fld_itm.new_int("mgr_idx"), Dbmeta_fld_itm.new_int("rng_idx"), Dbmeta_fld_itm.new_int("seq_idx")}; - } -} +package gplx.xowa.addons.bldrs.exports.splits.rndms; +import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; +class Split_rslt_wkr__rndm extends Split_rslt_wkr__objs__base { + @Override public byte Tid() {return Split_rslt_tid_.Tid__rndm;} + @Override public String Tbl_name() {return "rslt_rndm";} + @Override public DbmetaFldItm[] Pkey_flds() { + return new DbmetaFldItm[] {DbmetaFldItm.NewInt("mgr_idx"), DbmetaFldItm.NewInt("rng_idx"), DbmetaFldItm.NewInt("seq_idx")}; + } +} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_mgr.java index 731088c82..40e40dba1 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; import gplx.dbs.*; public class Split_rslt_mgr { private final Db_conn wkr_conn; @@ -29,21 +29,21 @@ public class Split_rslt_mgr { public void Init() { // init rslt_db wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("rslt_db" - , Dbmeta_fld_itm.new_int("db_id") - , Dbmeta_fld_itm.new_long("db_size") - , Dbmeta_fld_itm.new_long("obj_size") - , Dbmeta_fld_itm.new_int("ns_id") - , Dbmeta_fld_itm.new_int("score_min") - , Dbmeta_fld_itm.new_int("score_max") + , DbmetaFldItm.NewInt("db_id") + , DbmetaFldItm.NewLong("db_size") + , DbmetaFldItm.NewLong("obj_size") + , DbmetaFldItm.NewInt("ns_id") + , DbmetaFldItm.NewInt("score_min") + , DbmetaFldItm.NewInt("score_max") )); this.rslt_db_stmt = wkr_conn.Stmt_insert("rslt_db", "db_id", "db_size", "obj_size", "ns_id", "score_min", "score_max"); // init rslt_type wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("rslt_type" - , Dbmeta_fld_itm.new_int("db_id") - , Dbmeta_fld_itm.new_byte("tbl_id") - , Dbmeta_fld_itm.new_int("row_count") - , Dbmeta_fld_itm.new_long("obj_size") + , DbmetaFldItm.NewInt("db_id") + , DbmetaFldItm.NewByte("tbl_id") + , DbmetaFldItm.NewInt("row_count") + , DbmetaFldItm.NewLong("obj_size") )); this.rslt_type_stmt = wkr_conn.Stmt_insert("rslt_type", "db_id", "tbl_id", "row_count", "obj_size"); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__int__base.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__int__base.java index 108d76f29..cf9d4b2e8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__int__base.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__int__base.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; -import gplx.core.primitives.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; +package gplx.xowa.addons.bldrs.exports.splits.rslts; +import gplx.core.primitives.*; import gplx.dbs.*; public abstract class Split_rslt_wkr__int__base implements Split_rslt_wkr { private Split_rslt_mgr rslt_mgr; private Db_conn wkr_conn; private Db_stmt stmt; private int db_id; @@ -33,8 +33,8 @@ public abstract class Split_rslt_wkr__int__base implements Split_rslt_wkr { this.rslt_mgr = rslt_mgr; this.wkr_conn = wkr_conn; wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New(tbl_name - , Dbmeta_fld_itm.new_int("db_id") - , Dbmeta_fld_itm.new_int(pkey_name) + , DbmetaFldItm.NewInt("db_id") + , DbmetaFldItm.NewInt(pkey_name) )); this.stmt = wkr_conn.Stmt_insert(tbl_name, "db_id", pkey_name); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__objs__base.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__objs__base.java index 6fcf0935c..98ffd1307 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__objs__base.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Split_rslt_wkr__objs__base.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; -import gplx.core.primitives.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; +package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; +import gplx.dbs.*; public abstract class Split_rslt_wkr__objs__base implements Split_rslt_wkr { private Split_rslt_mgr rslt_mgr; private Db_conn wkr_conn; private Db_stmt stmt; private int db_id; private final List_adp pkey_list = List_adp_.New(); - private final String tbl_name; private final int pkey_flds_len; private final Dbmeta_fld_itm[] pkey_flds; private final String[] pkey_names; + private final String tbl_name; private final int pkey_flds_len; private final DbmetaFldItm[] pkey_flds; private final String[] pkey_names; public Split_rslt_wkr__objs__base() { this.tbl_name = Tbl_name(); this.pkey_flds = Pkey_flds(); @@ -30,14 +30,14 @@ public abstract class Split_rslt_wkr__objs__base implements Split_rslt_wkr { } public abstract byte Tid(); public abstract String Tbl_name(); - public abstract Dbmeta_fld_itm[] Pkey_flds(); + public abstract DbmetaFldItm[] Pkey_flds(); public int Row_count() {return pkey_list.Len();} public long Obj_size() {return obj_size;} private long obj_size; public void On__init(Split_rslt_mgr rslt_mgr, Db_conn wkr_conn) { this.rslt_mgr = rslt_mgr; this.wkr_conn = wkr_conn; - Dbmeta_tbl_itm meta_tbl = Dbmeta_tbl_itm.New(tbl_name, Dbmeta_fld_itm.new_int("db_id")); - for (Dbmeta_fld_itm pkey_fld : pkey_flds ) + Dbmeta_tbl_itm meta_tbl = Dbmeta_tbl_itm.New(tbl_name, DbmetaFldItm.NewInt("db_id")); + for (DbmetaFldItm pkey_fld : pkey_flds ) meta_tbl.Flds().Add(pkey_fld); wkr_conn.Meta_tbl_remake(meta_tbl); this.stmt = wkr_conn.Stmt_insert(tbl_name, String_.Ary_add(String_.Ary("db_id"), pkey_names)); @@ -58,8 +58,8 @@ public abstract class Split_rslt_wkr__objs__base implements Split_rslt_wkr { stmt.Clear().Val_int("db_id", db_id); Object[] pkey_objs = (Object[])pkey_list.Get_at(i); for (int j = 0; j < pkey_flds_len; ++j) { - Dbmeta_fld_itm pkey_fld = pkey_flds[j]; - gplx.dbs.stmts.Db_stmt_arg_list.Fill_val(stmt, pkey_fld.Type().Tid_ansi(), pkey_fld.Name(), pkey_objs[j]); + DbmetaFldItm pkey_fld = pkey_flds[j]; + gplx.dbs.stmts.Db_stmt_arg_list.Fill_val(stmt, pkey_fld.Type().Tid(), pkey_fld.Name(), pkey_objs[j]); } stmt.Exec_insert(); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Wkr_stats_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Wkr_stats_tbl.java index ec6536399..782cea5df 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Wkr_stats_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/rslts/Wkr_stats_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.rslts; import gplx.*; import gplx.dbs.*; public class Wkr_stats_tbl implements Rls_able { private final String tbl_name; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_wkr_id, fld_wkr_count, fld_wkr_size; public final Db_conn conn; public Wkr_stats_tbl(Db_conn conn) { this.conn = conn; conn.Rls_reg(this); this.tbl_name = "wkr_stats"; - this.fld_wkr_id = flds.Add_int_pkey("wkr_id"); - this.fld_wkr_count = flds.Add_int("wkr_count"); - this.fld_wkr_size = flds.Add_long("wkr_size"); + this.fld_wkr_id = flds.AddIntPkey("wkr_id"); + this.fld_wkr_count = flds.AddInt("wkr_count"); + this.fld_wkr_size = flds.AddLong("wkr_size"); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public Db_stmt Insert_stmt() {return conn.Stmt_insert(tbl_name, flds);} @@ -46,7 +46,7 @@ public class Wkr_stats_tbl implements Rls_able { } rdr.Rls(); } finally {rdr.Rls();} - return (Wkr_stats_itm[])list.To_ary_and_clear(Wkr_stats_itm.class); + return (Wkr_stats_itm[])list.ToAryAndClear(Wkr_stats_itm.class); } public Wkr_stats_itm Select_all__summary() { Db_rdr rdr = conn.Stmt_sql(String_.Format("SELECT Sum({0}) AS {0}, Sum({1}) AS {1} FROM {2}", fld_wkr_count, fld_wkr_size, tbl_name)).Exec_select__rls_auto(); // ANSI.Y diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_meta_wkr__link.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_meta_wkr__link.java index 37d9dc383..35dcaa501 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_meta_wkr__link.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_meta_wkr__link.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.srchs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +package gplx.xowa.addons.bldrs.exports.splits.srchs; import gplx.*; +import gplx.xowa.addons.bldrs.exports.splits.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.metas.*; import gplx.xowa.addons.bldrs.exports.splits.rslts.*; -import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.dbs.*; +import gplx.xowa.addons.wikis.searchs.dbs.*; class Split_meta_wkr__link extends Split_meta_wkr_base { private final Srch_db_mgr srch_db_mgr; private Srch_link_tbl tbl; @@ -29,7 +30,7 @@ class Split_meta_wkr__link extends Split_meta_wkr_base { @Override public byte Tid() {return Split_page_list_type_.Tid__srch_link;} @Override public void On_nth_new(Split_ctx ctx, Db_conn trg_conn) { this.tbl = new Srch_link_tbl(trg_conn); - Dbmeta_fld_list trg_flds = tbl.Flds().Clone().New_int("trg_db_id"); + DbmetaFldList trg_flds = tbl.Flds().Clone().BldInt("trg_db_id"); trg_conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl.Tbl_name(), trg_flds)); this.stmt = trg_conn.Stmt_insert(tbl.Tbl_name(), trg_flds); } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_rslt_wkr__link.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_rslt_wkr__link.java index d9a4f9d6a..3e17c5e31 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_rslt_wkr__link.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_rslt_wkr__link.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.splits.srchs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; -import gplx.dbs.*; -import gplx.xowa.addons.bldrs.exports.splits.rslts.*; -class Split_rslt_wkr__link extends Split_rslt_wkr__objs__base { - @Override public byte Tid() {return Split_rslt_tid_.Tid__srch_link;} - @Override public String Tbl_name() {return "rslt_srch_link";} - @Override public Dbmeta_fld_itm[] Pkey_flds() { - return new Dbmeta_fld_itm[] {Dbmeta_fld_itm.new_int("word_id"), Dbmeta_fld_itm.new_int("page_id")}; - } -} +package gplx.xowa.addons.bldrs.exports.splits.srchs; +import gplx.dbs.*; +import gplx.xowa.addons.bldrs.exports.splits.rslts.*; +class Split_rslt_wkr__link extends Split_rslt_wkr__objs__base { + @Override public byte Tid() {return Split_rslt_tid_.Tid__srch_link;} + @Override public String Tbl_name() {return "rslt_srch_link";} + @Override public DbmetaFldItm[] Pkey_flds() { + return new DbmetaFldItm[] {DbmetaFldItm.NewInt("word_id"), DbmetaFldItm.NewInt("page_id")}; + } +} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_srch_init.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_srch_init.java index 87f1c6003..33bb3e567 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_srch_init.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/splits/srchs/Split_srch_init.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.splits.srchs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; import gplx.xowa.addons.bldrs.exports.splits.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.splits.srchs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.bldrs.exports.splits.*; import gplx.dbs.*; import gplx.xowa.addons.wikis.searchs.dbs.*; import gplx.xowa.addons.bldrs.exports.splits.mgrs.*; class Split_srch_init { @@ -22,16 +23,16 @@ class Split_srch_init { if (!(ctx.Cfg().Force_rebuild() || !wkr_conn.Meta_tbl_exists("split_search_word"))) return; Gfo_log_.Instance.Prog("creating split_search_word"); wkr_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("split_search_word" - , Dbmeta_fld_itm.new_int("word_id") - , Dbmeta_fld_itm.new_str("word_text", 255) - , Dbmeta_fld_itm.new_int("link_count") - , Dbmeta_fld_itm.new_int("link_count_score") - , Dbmeta_fld_itm.new_int("link_score_min") - , Dbmeta_fld_itm.new_int("link_score_max") - , Dbmeta_fld_itm.new_int("page_uid") - , Dbmeta_fld_itm.new_int("page_ns") - , Dbmeta_fld_itm.new_int("page_id") - , Dbmeta_fld_itm.new_int("page_score") + , DbmetaFldItm.NewInt("word_id") + , DbmetaFldItm.NewStr("word_text", 255) + , DbmetaFldItm.NewInt("link_count") + , DbmetaFldItm.NewInt("link_count_score") + , DbmetaFldItm.NewInt("link_score_min") + , DbmetaFldItm.NewInt("link_score_max") + , DbmetaFldItm.NewInt("page_uid") + , DbmetaFldItm.NewInt("page_ns") + , DbmetaFldItm.NewInt("page_id") + , DbmetaFldItm.NewInt("page_score") )); // insert search_word w/ Min(pr.page_uid) diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl.java index ab10c5401..b8f53130a 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl.java @@ -1,26 +1,26 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.exports.utls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.exports.utls; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; public interface Split_tbl { String Tbl_name(); boolean Layout_is_lot(); String[] Fld_pkeys(); String Fld_blob(); - Dbmeta_fld_list Flds(); + DbmetaFldList Flds(); Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id); } class Split_tbl__page implements Split_tbl { @@ -28,7 +28,7 @@ class Split_tbl__page implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("page_id");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.xowa.wikis.data.tbls.Xowd_page_tbl(Db_conn_.Noop, Bool_.N).Flds__all(); return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.xowa.wikis.data.tbls.Xowd_page_tbl(Db_conn_.Noop, Bool_.N).Flds__all(); return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return wiki.Data__core_mgr().Db__core().Conn();} } class Split_tbl__fsdb_fil implements Split_tbl { @@ -36,7 +36,7 @@ class Split_tbl__fsdb_fil implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("fil_id");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.fsdb.data.Fsd_fil_tbl(Db_conn_.Noop, Bool_.N, gplx.fsdb.meta.Fsm_mnt_mgr.Mnt_idx_main).flds; return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.fsdb.data.Fsd_fil_tbl(Db_conn_.Noop, Bool_.N, gplx.fsdb.meta.Fsm_mnt_mgr.Mnt_idx_main).flds; return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return wiki.File__mnt_mgr().Mnts__get_main().Atr_mgr().Db__core().Conn();} } class Split_tbl__fsdb_thm implements Split_tbl { @@ -44,7 +44,7 @@ class Split_tbl__fsdb_thm implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("thm_id");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.fsdb.data.Fsd_thm_tbl(Db_conn_.Noop, Bool_.N, gplx.fsdb.meta.Fsm_mnt_mgr.Mnt_idx_main, Bool_.Y).flds; return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.fsdb.data.Fsd_thm_tbl(Db_conn_.Noop, Bool_.N, gplx.fsdb.meta.Fsm_mnt_mgr.Mnt_idx_main, Bool_.Y).flds; return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return wiki.File__mnt_mgr().Mnts__get_main().Atr_mgr().Db__core().Conn();} } class Split_tbl__fsdb_reg implements Split_tbl { @@ -52,7 +52,7 @@ class Split_tbl__fsdb_reg implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("orig_ttl");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.xowa.files.origs.Xof_orig_tbl(Db_conn_.Noop, Bool_.N).flds; return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.xowa.files.origs.Xof_orig_tbl(Db_conn_.Noop, Bool_.N).flds; return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return wiki.File__mnt_mgr().Mnts__get_main().Atr_mgr().Db__core().Conn();} } class Split_tbl__srch_word implements Split_tbl { @@ -60,7 +60,7 @@ class Split_tbl__srch_word implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("word_id");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.xowa.addons.wikis.searchs.dbs.Srch_word_tbl(Db_conn_.Noop).flds; return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.xowa.addons.wikis.searchs.dbs.Srch_word_tbl(Db_conn_.Noop).flds; return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return gplx.xowa.addons.wikis.searchs.Srch_search_addon.Get(wiki).Db_mgr().Tbl__word().conn;} } class Split_tbl__srch_link implements Split_tbl { @@ -68,7 +68,7 @@ class Split_tbl__srch_link implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("word_id", "page_id");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.xowa.addons.wikis.searchs.dbs.Srch_link_tbl(Db_conn_.Noop).Flds(); return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.xowa.addons.wikis.searchs.dbs.Srch_link_tbl(Db_conn_.Noop).Flds(); return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return gplx.xowa.addons.wikis.searchs.Srch_search_addon.Get(wiki).Db_mgr().Tbl__link__get_at(db_id).conn;} } class Split_tbl__rndm_seq implements Split_tbl { @@ -76,7 +76,7 @@ class Split_tbl__rndm_seq implements Split_tbl { public boolean Layout_is_lot() {return Bool_.N;} public String[] Fld_pkeys() {return String_.Ary("mgr_idx", "rng_idx", "seq_idx");} public String Fld_blob() {return String_.Empty;} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.xowa.addons.wikis.pages.randoms.dbs.Rndm_seq_tbl(Db_conn_.Noop).Flds(); return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.xowa.addons.wikis.pages.randoms.dbs.Rndm_seq_tbl(Db_conn_.Noop).Flds(); return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) {return gplx.xowa.addons.wikis.pages.randoms.Rndm_addon.Get(wiki).Mgr().Db_mgr().Tbl__seq().Conn();} } class Split_tbl__html implements Split_tbl { @@ -84,7 +84,7 @@ class Split_tbl__html implements Split_tbl { public boolean Layout_is_lot() {return Bool_.Y;} public String[] Fld_pkeys() {return String_.Ary("page_id");} public String Fld_blob() {return "body";} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.xowa.htmls.core.dbs.Xowd_html_tbl(Db_conn_.Noop).Flds(); return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.xowa.htmls.core.dbs.Xowd_html_tbl(Db_conn_.Noop).Flds(); return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) { if (db_id == -1) // HACK: return core_conn just so that bin_tbl below can be created return wiki.Data__core_mgr().Db__core().Conn(); @@ -103,7 +103,7 @@ class Split_tbl__fsdb_bin implements Split_tbl { public boolean Layout_is_lot() {return Bool_.Y;} public String[] Fld_pkeys() {return String_.Ary("bin_owner_id");} public String Fld_blob() {return "bin_data";} - public Dbmeta_fld_list Flds() {if (flds == null) flds = new gplx.fsdb.data.Fsd_bin_tbl(Db_conn_.Noop, Bool_.N).Flds(); return flds;} private Dbmeta_fld_list flds; + public DbmetaFldList Flds() {if (flds == null) flds = new gplx.fsdb.data.Fsd_bin_tbl(Db_conn_.Noop, Bool_.N).Flds(); return flds;} private DbmetaFldList flds; public Db_conn Wiki_conn__get_or_new(Xow_wiki wiki, int db_id) { if (db_id == -1) // HACK: return core_conn just so that bin_tbl below can be created return wiki.Data__core_mgr().Db__core().Conn(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl_.java b/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl_.java index 950dbd1b5..66732bac4 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl_.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/exports/utls/Split_tbl_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.exports.utls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.exports.*; +package gplx.xowa.addons.bldrs.exports.utls; import gplx.*; import gplx.dbs.*; public class Split_tbl_ { public static final Split_tbl @@ -28,14 +28,14 @@ public class Split_tbl_ { ; public static boolean Tbl_has_blob(Split_tbl tbl) {return String_.Len_gt_0(tbl.Fld_blob());} - public static void Flds__add_blob_len(Dbmeta_fld_list flds) { - flds.Insert(flds.Len() - 1, Dbmeta_fld_itm.new_int("blob_len")); // add "blob_len" in penultimate pos; note that last fld is "blob_fld" + public static void Flds__add_blob_len(DbmetaFldList flds) { + flds.AddAt(flds.Len() - 1, DbmetaFldItm.NewInt("blob_len")); // add "blob_len" in penultimate pos; note that last fld is "blob_fld" } - public static void Bld_insert_by_select(Bry_bfr bfr, String tbl_name, Dbmeta_fld_list flds) { + public static void Bld_insert_by_select(Bry_bfr bfr, String tbl_name, DbmetaFldList flds) { int flds_len = flds.Len(); for (int i = 0; i < flds_len; ++i) { if (i != 0) bfr.Add_str_a7(","); - Dbmeta_fld_itm fld = flds.Get_at(i); + DbmetaFldItm fld = flds.GetAt(i); bfr.Add_str_a7(fld.Name()); } byte[] flds_bry = bfr.To_bry_and_clear(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/cksums/dbs/Xocksum_cksum_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/cksums/dbs/Xocksum_cksum_tbl.java index d4f4518d4..f9a3613f8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/cksums/dbs/Xocksum_cksum_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/cksums/dbs/Xocksum_cksum_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.cksums.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; import gplx.xowa.addons.bldrs.files.cksums.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.addons.wikis.ctgs.*; +package gplx.xowa.addons.bldrs.files.cksums.dbs; import gplx.*; +import gplx.dbs.*; public class Xocksum_cksum_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__fil_id, fld__thm_id, fld__bin_db_id, fld__bin_len, fld__cksum_tid, fld__cksum_count, fld__cksum_val, fld__cksum_date; private Db_stmt stmt__update; public Xocksum_cksum_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "fsdb_cksum"; - this.fld__fil_id = flds.Add_int("fil_id"); - this.fld__thm_id = flds.Add_int("thm_id"); - this.fld__bin_db_id = flds.Add_int("bin_db_id"); - this.fld__bin_len = flds.Add_long("bin_size"); - this.fld__cksum_tid = flds.Add_byte("cksum_tid"); - this.fld__cksum_count = flds.Add_int("cksum_count"); - this.fld__cksum_val = flds.Add_str("cksum_val", 255); - this.fld__cksum_date = flds.Add_str("cksum_date", 16); + this.fld__fil_id = flds.AddInt("fil_id"); + this.fld__thm_id = flds.AddInt("thm_id"); + this.fld__bin_db_id = flds.AddInt("bin_db_id"); + this.fld__bin_len = flds.AddLong("bin_size"); + this.fld__cksum_tid = flds.AddByte("cksum_tid"); + this.fld__cksum_count = flds.AddInt("cksum_count"); + this.fld__cksum_val = flds.AddStr("cksum_val", 255); + this.fld__cksum_date = flds.AddStr("cksum_date", 16); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; @@ -87,7 +87,7 @@ public class Xocksum_cksum_tbl implements Db_tbl { } } finally {rdr.Rls();} - return (Xocksum_cksum_row[])rv.To_ary_and_clear(Xocksum_cksum_row.class); + return (Xocksum_cksum_row[])rv.ToAryAndClear(Xocksum_cksum_row.class); } public void Update(int fil_id, int thm_id, int bin_db_id, long bin_size, byte cksum_tid, int cksum_count, byte[] cksum_val, String cksum_date) { if (stmt__update == null) stmt__update = conn.Stmt_update_exclude(tbl_name, flds, fld__fil_id, fld__thm_id); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__fsdb_db__create_data.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__fsdb_db__create_data.java index 8d05eefe2..bbac2f6c8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__fsdb_db__create_data.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__fsdb_db__create_data.java @@ -13,13 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +package gplx.xowa.addons.bldrs.files.cmds; import gplx.*; import gplx.xowa.*; import gplx.core.stores.*; import gplx.core.envs.*; import gplx.core.ios.streams.*; -import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.dbs.engines.sqlite.*; +import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; -import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.dbs.*; import gplx.fsdb.*; import gplx.core.ios.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.fsdb.*; -import gplx.fsdb.data.*; import gplx.fsdb.meta.*; +import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.data.*; +import gplx.fsdb.*; import gplx.core.ios.*; +import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.bins.*; +import gplx.fsdb.meta.*; import gplx.xowa.addons.bldrs.files.dbs.*; import gplx.xowa.addons.bldrs.files.utls.*; public class Xobldr__fsdb_db__create_data extends Xob_cmd__base implements Xob_cmd { private Db_conn bldr_conn; private Db_cfg_tbl bldr_cfg_tbl; @@ -108,7 +109,7 @@ public class Xobldr__fsdb_db__create_data extends Xob_cmd__base implements Xob_c case Select_rv_process: break; } if (!loop) break; // no more ttls found - int len = list.Count(); + int len = list.Len(); usr_dlg.Prog_many("", "", "fetched pages: ~{0}", len); for (int i = 0; i < len; ++i) { Xodb_tbl_oimg_xfer_itm fsdb = (Xodb_tbl_oimg_xfer_itm)list.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__lnki_temp__create_.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__lnki_temp__create_.java index c01a4e15d..acaa0698b 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__lnki_temp__create_.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__lnki_temp__create_.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.files.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.files.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.nss.*; class Xobldr__lnki_temp__create_ { public static int[] Ns_ids_by_aliases(Xowe_wiki wiki, String[] aliases) { @@ -41,7 +41,7 @@ class Xobldr__lnki_temp__create_ { list.Add(ns); } } - len = list.Count(); + len = list.Len(); int[] rv = new int[len]; for (int i = 0; i < len; i++) { rv[i] = ((Xow_ns)list.Get_at(i)).Id(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__page_file_map__create.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__page_file_map__create.java index b020e5a3f..4aa868cfc 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__page_file_map__create.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/cmds/Xobldr__page_file_map__create.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +package gplx.xowa.addons.bldrs.files.cmds; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.addons.bldrs.files.dbs.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; public class Xobldr__page_file_map__create extends Xob_cmd__base { @@ -31,7 +31,7 @@ public class Xobldr__page_file_map__create extends Xob_cmd__base { String fld = "fsdb_id"; for (String tbl : tbls) { if (!conn.Meta_fld_exists(tbl, fld)) - conn.Meta_fld_append(tbl, Dbmeta_fld_itm.new_int(fld).Default_(-1)); // EX: ALTER TABLE xfer_regy ADD fsdb_id INTEGER DEFAULT -1; + conn.Meta_fld_append(tbl, DbmetaFldItm.NewInt(fld).DefaultValSet(-1)); // EX: ALTER TABLE xfer_regy ADD fsdb_id INTEGER DEFAULT -1; } } private void Create__fsdb_idxs() { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Page_file_map_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Page_file_map_tbl.java index c8fa825a8..ea67d26a9 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Page_file_map_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Page_file_map_tbl.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +package gplx.xowa.addons.bldrs.files.dbs; import gplx.dbs.*; public class Page_file_map_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld_page_id, fld_fil_id, fld_thm_id, fld_sort_id, fld_count_of; public final Db_conn conn; public Page_file_map_tbl(Db_conn conn, String tbl_name) { this.conn = conn; this.tbl_name = tbl_name; - this.fld_page_id = flds.Add_int("page_id"); - this.fld_fil_id = flds.Add_int("fil_id"); - this.fld_thm_id = flds.Add_int("thm_id"); - this.fld_sort_id = flds.Add_int("sort_id"); - this.fld_count_of = flds.Add_int("count_of"); + this.fld_page_id = flds.AddInt("page_id"); + this.fld_fil_id = flds.AddInt("fil_id"); + this.fld_thm_id = flds.AddInt("thm_id"); + this.fld_sort_id = flds.AddInt("sort_id"); + this.fld_count_of = flds.AddInt("count_of"); this.meta = Dbmeta_tbl_itm.New(tbl_name, flds); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_lnki_temp_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_lnki_temp_tbl.java index 1bcc9e9b1..57a3af214 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_lnki_temp_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_lnki_temp_tbl.java @@ -13,26 +13,26 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +package gplx.xowa.addons.bldrs.files.dbs; import gplx.dbs.*; import gplx.xowa.files.*; public class Xob_lnki_temp_tbl implements Db_tbl { - private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final DbmetaFldList flds = new DbmetaFldList(); private static final String tbl_name = "lnki_temp"; public static final String - Fld_lnki_id = flds.Add_int_pkey_autonum("lnki_id"); // NOTE: insertion order index; public b/c not used and want to bypass warning + Fld_lnki_id = flds.AddIntPkeyAutonum("lnki_id"); // NOTE: insertion order index; public b/c not used and want to bypass warning private static final String - Fld_lnki_tier_id = flds.Add_int("lnki_tier_id") - , Fld_lnki_page_id = flds.Add_int("lnki_page_id") - , Fld_lnki_ttl = flds.Add_str("lnki_ttl", 255) - , Fld_lnki_commons_ttl = flds.Add_str_null("lnki_commons_ttl", 255) - , Fld_lnki_ext = flds.Add_int("lnki_ext") - , Fld_lnki_type = flds.Add_int("lnki_type") - , Fld_lnki_src_tid = flds.Add_int("lnki_src_tid") - , Fld_lnki_w = flds.Add_int("lnki_w") - , Fld_lnki_h = flds.Add_int("lnki_h") - , Fld_lnki_upright = flds.Add_double("lnki_upright") - , Fld_lnki_time = flds.Add_double("lnki_time") // NOTE: thumbtime is float; using double b/c upright is double and would like to keep datatypes same; https://bugzilla.wikimedia.org/show_bug.cgi?id=39014 - , Fld_lnki_page = flds.Add_int("lnki_page") + Fld_lnki_tier_id = flds.AddInt("lnki_tier_id") + , Fld_lnki_page_id = flds.AddInt("lnki_page_id") + , Fld_lnki_ttl = flds.AddStr("lnki_ttl", 255) + , Fld_lnki_commons_ttl = flds.AddStrNull("lnki_commons_ttl", 255) + , Fld_lnki_ext = flds.AddInt("lnki_ext") + , Fld_lnki_type = flds.AddInt("lnki_type") + , Fld_lnki_src_tid = flds.AddInt("lnki_src_tid") + , Fld_lnki_w = flds.AddInt("lnki_w") + , Fld_lnki_h = flds.AddInt("lnki_h") + , Fld_lnki_upright = flds.AddDouble("lnki_upright") + , Fld_lnki_time = flds.AddDouble("lnki_time") // NOTE: thumbtime is float; using double b/c upright is double and would like to keep datatypes same; https://bugzilla.wikimedia.org/show_bug.cgi?id=39014 + , Fld_lnki_page = flds.AddInt("lnki_page") ; private Db_stmt stmt_insert; public Xob_lnki_temp_tbl(Db_conn conn) {this.conn = conn;} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_page_dump_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_page_dump_tbl.java index f9e4a91a8..40b5bfdcc 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_page_dump_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/dbs/Xob_page_dump_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +package gplx.xowa.addons.bldrs.files.dbs; import gplx.*; import gplx.dbs.*; public class Xob_page_dump_tbl { public final static String Tbl_name = "page_dump"; private final String fld_id, fld_title, fld_namespace, fld_is_redirect; - private final Db_conn conn; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final Db_conn conn; private final DbmetaFldList flds = new DbmetaFldList(); public Xob_page_dump_tbl(Db_conn conn) { this.conn = conn; - this.fld_id = flds.Add_int_pkey("page_id"); - this.fld_title = flds.Add_str("page_title", 255); - this.fld_namespace = flds.Add_int("page_namespace"); - this.fld_is_redirect = flds.Add_int("page_is_redirect"); + this.fld_id = flds.AddIntPkey("page_id"); + this.fld_title = flds.AddStr("page_title", 255); + this.fld_namespace = flds.AddInt("page_namespace"); + this.fld_is_redirect = flds.AddInt("page_is_redirect"); } public void Create_data(Io_url page_db_url, int text_db_id) { conn.Meta_tbl_create(Dbmeta_tbl_itm.New(Tbl_name, flds)); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_imageinfo_api.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_imageinfo_api.java index 45e7a8de6..210443bb8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_imageinfo_api.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_imageinfo_api.java @@ -13,12 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.missing_origs.apis; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; import gplx.xowa.addons.bldrs.files.missing_origs.*; +package gplx.xowa.addons.bldrs.files.missing_origs.apis; import gplx.*; import gplx.xowa.*; import gplx.langs.htmls.encoders.*; import gplx.langs.jsons.*; -import gplx.xowa.files.repos.*; import gplx.xowa.files.downloads.*; -import gplx.xowa.apps.wms.apis.origs.*; public class Xowmf_imageinfo_api { private final Xof_download_wkr download_wkr; private final Ordered_hash temp_hash = Ordered_hash_.New(); @@ -109,7 +107,7 @@ public class Xowmf_imageinfo_api { byte[] to = redirect.Get_as_bry("to"); // get nde by "to" and copy redirect - Xowmf_imageinfo_item trg_item = (Xowmf_imageinfo_item)temp_hash.Get_by_or_fail(to); + Xowmf_imageinfo_item trg_item = (Xowmf_imageinfo_item)temp_hash.GetByOrFail(to); trg_item.Init_by_api_redirect(from, to); // update temp_hash key @@ -121,7 +119,7 @@ public class Xowmf_imageinfo_api { int temp_hash_len = temp_hash.Len(); for (int i = 0; i < temp_hash_len; i++) { Xowmf_imageinfo_item trg_item = (Xowmf_imageinfo_item)temp_hash.Get_at(i); - Xowmf_imageinfo_item src_item = (Xowmf_imageinfo_item)temp_hash.Get_by(trg_item.Lnki_ttl()); + Xowmf_imageinfo_item src_item = (Xowmf_imageinfo_item)temp_hash.GetByOrNull(trg_item.Lnki_ttl()); src_item.Copy_api_props(trg_item); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_recentchanges_api.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_recentchanges_api.java index aa62774d0..1f75c86da 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_recentchanges_api.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/missing_origs/apis/Xowmf_recentchanges_api.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.files.missing_origs.apis; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; import gplx.xowa.addons.bldrs.files.missing_origs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.files.missing_origs.apis; import gplx.*; import gplx.langs.jsons.*; import gplx.xowa.files.downloads.*; public class Xowmf_recentchanges_api { @@ -66,7 +66,7 @@ public class Xowmf_recentchanges_api { Json_nde nde = ary.Get_as_nde(i); try { byte[] title = Xowmf_imageinfo_item.Normalize_ttl(nde.Get_as_bry("title")); - Xowmf_recentchanges_item item = (Xowmf_recentchanges_item)list.Get_by(title); + Xowmf_recentchanges_item item = (Xowmf_recentchanges_item)list.GetByOrNull(title); // not in list; add it if (item == null) { item = new Xowmf_recentchanges_item(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/files/utls/Xob_bin_db_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/files/utls/Xob_bin_db_mgr.java index 7b6a7d33a..6a8ca94ca 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/files/utls/Xob_bin_db_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/files/utls/Xob_bin_db_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.files.utls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.files.*; +package gplx.xowa.addons.bldrs.files.utls; import gplx.*; import gplx.core.primitives.*; import gplx.core.ios.*; import gplx.fsdb.meta.*; public class Xob_bin_db_mgr { @@ -38,12 +38,12 @@ public class Xob_bin_db_mgr { Fsm_bin_fil fil = bin_db_mgr.Dbs__get_at(i); Xob_bin_db_itm itm = schema_is_1 ? Xob_bin_db_itm.new_v1(fil) : Xob_bin_db_itm.new_v2(fil); int ns_id = itm.Ns_id(); - Xob_bin_db_itm nth = (Xob_bin_db_itm)nth_hash.Get_by(tier_key.Val_(ns_id)); + Xob_bin_db_itm nth = (Xob_bin_db_itm)nth_hash.GetByOrNull(tier_key.Val_(ns_id)); if ( nth != null // occurs when existing fsdb_dbb has "file-ns.014-db.001", but 14 no longer specified in fsdb_make; DATE:2016-09-23 && itm.Pt_id() > nth.Pt_id()) // update max pt_id nth.Set(itm.Id(), itm.Pt_id(), itm.Db_url()); // note that ns_id is same } - len = nth_hash.Count(); + len = nth_hash.Len(); for (int i = 0; i < len; ++i) { // iterated tiers to calculate max_size Xob_bin_db_itm nth = (Xob_bin_db_itm)nth_hash.Get_at(i); if (nth.Id() == -1) continue; // ignore default nth @@ -62,9 +62,9 @@ public class Xob_bin_db_mgr { return schema_is_1 ? Xob_bin_db_itm.Gen_name_v1(pt_id) : Xob_bin_db_itm.Gen_name_v2(domain_str, ns_id, pt_id); } public Xob_bin_db_itm Get_nth_by_tier(int tier_id) { - if (schema_is_1) return (Xob_bin_db_itm)nth_hash.Get_by(tier_key.Val_(0)); // v1 is always in ns_0 + if (schema_is_1) return (Xob_bin_db_itm)nth_hash.GetByOrNull(tier_key.Val_(0)); // v1 is always in ns_0 if (tier_id >= ns_ids_len) throw Err_.new_wo_type("tier out of range", "tier_id", tier_id, "len", ns_ids_len); int ns_id = ns_ids[tier_id]; - return (Xob_bin_db_itm)nth_hash.Get_by(tier_key.Val_(ns_id)); + return (Xob_bin_db_itm)nth_hash.GetByOrNull(tier_key.Val_(ns_id)); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_log_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_log_tbl.java index 2cb544503..a2a91c4a7 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_log_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_log_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.hdumps.diffs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.hdumps.*; +package gplx.xowa.addons.bldrs.hdumps.diffs; import gplx.xowa.*; import gplx.dbs.*; class Dumpdiff_log_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__page_id, fld__cur_snip, fld__prv_snip; private Db_stmt stmt__insert; public Dumpdiff_log_tbl(Db_conn conn) { this.conn = conn; - flds.Add_int_pkey("uid"); - this.fld__page_id = flds.Add_int("page_id"); - this.fld__cur_snip = flds.Add_str("cur_snip", 1024); - this.fld__prv_snip = flds.Add_str("prv_snip", 1024); + flds.AddIntPkey("uid"); + this.fld__page_id = flds.AddInt("page_id"); + this.fld__cur_snip = flds.AddStr("cur_snip", 1024); + this.fld__prv_snip = flds.AddStr("prv_snip", 1024); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = "diff_log"; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_mgr.java index 54a936b68..1f2a0705f 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/hdumps/diffs/Dumpdiff_mgr.java @@ -1,23 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.hdumps.diffs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.hdumps.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.hdumps.diffs; import gplx.*; import gplx.xowa.*; import gplx.core.brys.*; -import gplx.dbs.*; -import gplx.xowa.htmls.*; -import gplx.xowa.wikis.data.tbls.*; class Dumpdiff_mgr { public void Exec(Xoae_app app, Xowe_wiki wiki, Dumpdiff_cfg cfg) { // init log_tbl, wikis @@ -38,7 +35,7 @@ class Dumpdiff_mgr { // loop page_table until no more while (true) { page_loader.Load(list); - int list_len = list.Count(); + int list_len = list.Len(); if (list_len == 0) break; // loop pages, compare, and log diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_req_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_req_tbl.java index 5b886d723..732a9cd53 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_req_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_req_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.dbs.*; public class Xomp_lock_req_tbl implements Db_tbl { private final String fld_machine_name, fld_req_time; @@ -21,12 +21,12 @@ public class Xomp_lock_req_tbl implements Db_tbl { public Xomp_lock_req_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xomp_lock_req"; - this.fld_machine_name = flds.Add_str("machine_name", 255); // EX: "MACHINE1" - this.fld_req_time = flds.Add_str("req_time", 32); // EX: 20160801 010203 + this.fld_machine_name = flds.AddStr("machine_name", 255); // EX: "MACHINE1" + this.fld_req_time = flds.AddStr("req_time", 32); // EX: 20160801 010203 conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public void Create_tbl() { conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds , Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "req_time", fld_req_time) diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_tbl.java index fd6de855d..eb8af8768 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_lock_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.dbs.*; public class Xomp_lock_tbl implements Db_tbl { private final String fld_uid_prv; @@ -21,11 +21,11 @@ public class Xomp_lock_tbl implements Db_tbl { public Xomp_lock_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xomp_lock"; - this.fld_uid_prv = flds.Add_int("uid_prv"); // EX: -1 + this.fld_uid_prv = flds.AddInt("uid_prv"); // EX: -1 conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public void Create_tbl() { conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds)); conn.Stmt_insert(tbl_name, flds).Clear().Val_int(fld_uid_prv, -1).Exec_insert(); // always add default record when creating table diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_page_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_page_tbl.java index cde853448..5ed5265de 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_page_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_page_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.dbs.*; public class Xomp_page_tbl implements Db_tbl { private final Object thread_lock = new Object(); @@ -22,16 +22,16 @@ public class Xomp_page_tbl implements Db_tbl { public Xomp_page_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xomp_page"; - flds.Add_int_pkey("xomp_uid"); - flds.Add_int("page_id"); - flds.Add_int("page_ns"); - flds.Add_byte("page_status"); // 0=wait; 1=done; 2=fail - flds.Add_int_dflt("html_len", -1); - flds.Add_int_dflt("xomp_wkr_id", -1); + flds.AddIntPkey("xomp_uid"); + flds.AddInt("page_id"); + flds.AddInt("page_ns"); + flds.AddByte("page_status"); // 0=wait; 1=done; 2=fail + flds.AddIntDflt("html_len", -1); + flds.AddIntDflt("xomp_wkr_id", -1); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public void Create_tbl() { conn.Meta_tbl_create diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_stat_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_stat_tbl.java index 0eff58e68..edd64810f 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_stat_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_stat_tbl.java @@ -13,22 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; -import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.hzips.*; -import gplx.xowa.wikis.pages.*; +import gplx.xowa.htmls.*; import gplx.xowa.parsers.logs.stats.*; public class Xomp_stat_tbl implements Rls_able { - private static final String tbl_name = "xomp_stats"; private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "xomp_stats"; private static final DbmetaFldList flds = new DbmetaFldList(); private static final String - fld_page_id = flds.Add_int_pkey("page_id"), fld_wkr_uid = flds.Add_int("wkr_uid") - , fld_wtxt_len = flds.Add_int("wtxt_len"), fld_html_len = flds.Add_int("html_len"), fld_zip_len = flds.Add_int("zip_len") - , fld_page_time = flds.Add_long("page_time"), fld_tidy_time = flds.Add_long("tidy_time"), fld_fulltext_time = flds.Add_long("fulltext_time") - , fld_scrib_time = flds.Add_long("scrib_time"), fld_scrib_count = flds.Add_int("scrib_count"), fld_scrib_depth = flds.Add_int("scrib_depth") - , fld_image_count = flds.Add_int("image_count"), fld_audio_count = flds.Add_int("audio_count"), fld_video_count = flds.Add_int("video_count"), fld_media_count = flds.Add_int("media_count") - , fld_lnki_count = flds.Add_int("lnki_count"), fld_lnke_count = flds.Add_int("lnke_count"), fld_hdr_count = flds.Add_int("hdr_count") - , fld_math_count = flds.Add_int("math_count"), fld_imap_count = flds.Add_int("imap_count"), fld_hiero_count = flds.Add_int("hiero_count") - , fld_gallery_count = flds.Add_int("gallery_count"), fld_gallery_packed_count = flds.Add_int("gallery_packed_count") + fld_page_id = flds.AddIntPkey("page_id"), fld_wkr_uid = flds.AddInt("wkr_uid") + , fld_wtxt_len = flds.AddInt("wtxt_len"), fld_html_len = flds.AddInt("html_len"), fld_zip_len = flds.AddInt("zip_len") + , fld_page_time = flds.AddLong("page_time"), fld_tidy_time = flds.AddLong("tidy_time"), fld_fulltext_time = flds.AddLong("fulltext_time") + , fld_scrib_time = flds.AddLong("scrib_time"), fld_scrib_count = flds.AddInt("scrib_count"), fld_scrib_depth = flds.AddInt("scrib_depth") + , fld_image_count = flds.AddInt("image_count"), fld_audio_count = flds.AddInt("audio_count"), fld_video_count = flds.AddInt("video_count"), fld_media_count = flds.AddInt("media_count") + , fld_lnki_count = flds.AddInt("lnki_count"), fld_lnke_count = flds.AddInt("lnke_count"), fld_hdr_count = flds.AddInt("hdr_count") + , fld_math_count = flds.AddInt("math_count"), fld_imap_count = flds.AddInt("imap_count"), fld_hiero_count = flds.AddInt("hiero_count") + , fld_gallery_count = flds.AddInt("gallery_count"), fld_gallery_packed_count = flds.AddInt("gallery_packed_count") ; private final Db_conn conn; private Db_stmt stmt_insert; public Xomp_stat_tbl(Db_conn conn) { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_wkr_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_wkr_tbl.java index e4c8c9f08..b1668030b 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_wkr_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/dbs/Xomp_wkr_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.dbs; import gplx.*; import gplx.dbs.*; public class Xomp_wkr_tbl implements Db_tbl { private final String fld_wkr_uid, fld_wkr_url, fld_wkr_status, fld_wkr_status_time, fld_wkr_exec_count, fld_wkr_exec_time; @@ -22,16 +22,16 @@ public class Xomp_wkr_tbl implements Db_tbl { public Xomp_wkr_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "xomp_wkr"; - fld_wkr_uid = flds.Add_int_pkey("wkr_uid"); // EX: 0 - fld_wkr_url = flds.Add_str("wkr_url", 255); // EX: //MACHINE/C:/xowa/wiki/en.wikipedia.org/tmp/xomp - fld_wkr_status = flds.Add_int("wkr_status"); // EX: running; waiting - fld_wkr_status_time = flds.Add_str("wkr_status_time", 255); // EX: 20160801 010203 - fld_wkr_exec_count = flds.Add_int("wkr_exec_count"); // EX: 1000 - fld_wkr_exec_time = flds.Add_int("wkr_exec_time"); // EX: 123 + fld_wkr_uid = flds.AddIntPkey("wkr_uid"); // EX: 0 + fld_wkr_url = flds.AddStr("wkr_url", 255); // EX: //MACHINE/C:/xowa/wiki/en.wikipedia.org/tmp/xomp + fld_wkr_status = flds.AddInt("wkr_status"); // EX: running; waiting + fld_wkr_status_time = flds.AddStr("wkr_status_time", 255); // EX: 20160801 010203 + fld_wkr_exec_count = flds.AddInt("wkr_exec_count"); // EX: 1000 + fld_wkr_exec_time = flds.AddInt("wkr_exec_time"); // EX: 123 conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public int Init_wkrs(String wkr_url, int wkr_len) { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_cmd_cfg.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_cmd_cfg.java index 05a88a882..a7a310393 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_cmd_cfg.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_cmd_cfg.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; public class Xomp_make_cmd_cfg implements Gfo_invk { - public Hash_adp Mode() {return mode;} private Hash_adp mode = Hash_adp_.New().Add_and_more("html", "html").Add_and_more("lnki", "lnki").Add_and_more("stat", "stat").Add_and_more("hxtn", "hxtn"); + public Hash_adp Mode() {return mode;} private Hash_adp mode = Hash_adp_.New().AddAndMore("html", "html").AddAndMore("lnki", "lnki").AddAndMore("stat", "stat").AddAndMore("hxtn", "hxtn"); public boolean Delete_html_dbs() {return delete_html_dbs;} private boolean delete_html_dbs = true; public Ordered_hash Merger_wkrs() {return merger_wkrs;} private final Ordered_hash merger_wkrs = Ordered_hash_.New(); public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_lnki.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_lnki.java index 12705a0e0..a5fbcbdc2 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_lnki.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_lnki.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.bldrs.mass_parses.dbs.*; class Xomp_make_lnki { public void Exec(Xowe_wiki wiki, Xomp_make_cmd_cfg cfg, int uid_count) { @@ -24,7 +24,7 @@ class Xomp_make_lnki { List_adp merger_list = List_adp_.New(); merger_list.Add(new Xomp_make_merger__lnki_temp()); if (cfg.Merger_wkrs().Has("xnde")) merger_list.Add(new Xomp_make_merger__xnde()); - Xomp_make_merger[] merger_ary = (Xomp_make_merger[])merger_list.To_ary_and_clear(Xomp_make_merger.class); + Xomp_make_merger[] merger_ary = (Xomp_make_merger[])merger_list.ToAryAndClear(Xomp_make_merger.class); // create ary; add index int wkr_count = src_mgr_db.Tbl__wkr().Select_count(); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__base.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__base.java index c468f7b2b..a82f2234f 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__base.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_merger__base.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; +package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.dbs.*; // merges xomp.wkr_dbs into xowa.file.make.sqlite3 @@ -80,7 +80,7 @@ abstract class Xomp_make_merger__base implements Xomp_make_merger, gplx.core.lis protected abstract Object Load__src_row(Db_rdr rdr); public void Merger__save() { - rows.Sort_by(this); + rows.SortBy(this); int len = rows.Len(); for (int i = 0; i < len; ++i) { Save__trg_row(rows.Get_at(i)); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_stat.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_stat.java index a0e45f68c..635bd3ae4 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_stat.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/makes/Xomp_make_stat.java @@ -1,21 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; -import gplx.core.brys.*; -import gplx.dbs.*; import gplx.xowa.htmls.core.dbs.*; import gplx.xowa.addons.bldrs.mass_parses.dbs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.mass_parses.makes; import gplx.*; import gplx.xowa.*; +import gplx.dbs.*; +import gplx.xowa.addons.bldrs.mass_parses.dbs.*; class Xomp_make_stat { public void Exec(Xowe_wiki wiki, Xomp_make_cmd_cfg cfg) { // init mgr_db and mgr_tbl @@ -23,7 +23,7 @@ class Xomp_make_stat { Db_conn mgr_conn = mgr_db.Conn(); Xomp_stat_tbl mgr_tbl = new Xomp_stat_tbl(mgr_conn); mgr_conn.Txn_bgn("xomp_stats"); - mgr_conn.Stmt_delete("xomp_stats", Dbmeta_fld_itm.Str_ary_empty).Exec_delete(); + mgr_conn.Stmt_delete("xomp_stats", DbmetaFldItm.StrAryEmpty).Exec_delete(); mgr_tbl.Stmt_new(); // loop wkrs diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_text_db_loader.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_text_db_loader.java index a4d551c90..c7ee3d127 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_text_db_loader.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_text_db_loader.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.mass_parses.parses.utls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; import gplx.xowa.addons.bldrs.mass_parses.parses.*; +package gplx.xowa.addons.bldrs.mass_parses.parses.utls; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.core.ios.*; import gplx.xowa.wikis.data.tbls.*; @@ -26,7 +26,7 @@ public class Xomp_text_db_loader { this.zip_mgr = wiki.Utl__zip_mgr(); } public void Add(int text_db_id, Xowd_text_bry_owner ppg) { - Xomp_text_db_itm itm = (Xomp_text_db_itm)text_db_hash.Get_by(text_db_id); + Xomp_text_db_itm itm = (Xomp_text_db_itm)text_db_hash.GetByOrNull(text_db_id); if (itm == null) { itm = new Xomp_text_db_itm(text_db_id); text_db_hash.Add(text_db_id, itm); @@ -77,7 +77,7 @@ public class Xomp_text_db_loader { int page_id = rdr.Read_int("page_id"); byte[] text_data = rdr.Read_bry("text_data"); text_data = zip_mgr.Unzip(zip_tid, text_data); - Xowd_text_bry_owner ppg = (Xowd_text_bry_owner)page_hash.Get_by(page_id); + Xowd_text_bry_owner ppg = (Xowd_text_bry_owner)page_hash.GetByOrNull(page_id); ppg.Set_text_bry_by_db(text_data); } } diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_tmpl_cache_bldr.java b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_tmpl_cache_bldr.java index 1f9fc2c36..de7eb7be8 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_tmpl_cache_bldr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/mass_parses/parses/utls/Xomp_tmpl_cache_bldr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.mass_parses.parses.utls; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.mass_parses.*; import gplx.xowa.addons.bldrs.mass_parses.parses.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.mass_parses.parses.utls; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.wikis.caches.*; public class Xomp_tmpl_cache_bldr { @@ -72,7 +72,7 @@ public class Xomp_tmpl_cache_bldr { int redirect_len = redirect_list.Len(); for (int i = 0; i < redirect_len; ++i) { Xow_page_cache_itm src_itm = (Xow_page_cache_itm)redirect_list.Get_at(i); - Xow_page_cache_itm trg_itm = (Xow_page_cache_itm)page_regy.Get_by(src_itm.Redirect_id()); + Xow_page_cache_itm trg_itm = (Xow_page_cache_itm)page_regy.GetByOrNull(src_itm.Redirect_id()); byte[] trg_itm_wtxt = null; Xoa_ttl trg_ttl = null; if (trg_itm == null) { // template can redirect to non-template pages diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xob_delete_regy_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xob_delete_regy_tbl.java index 086663d2a..88bb9b4b4 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xob_delete_regy_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xob_delete_regy_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.updates.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.updates.*; +package gplx.xowa.addons.bldrs.updates.files; import gplx.dbs.*; public class Xob_delete_regy_tbl { public final String tbl_name = "delete_regy"; - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld_fil_id, fld_thm_id, fld_reason; public final Db_conn conn; public Xob_delete_regy_tbl(Db_conn conn) { this.conn = conn; - this.fld_fil_id = flds.Add_int("fil_id"); - this.fld_thm_id = flds.Add_int("thm_id"); - this.fld_reason = flds.Add_str("reason", 255); + this.fld_fil_id = flds.AddInt("fil_id"); + this.fld_thm_id = flds.AddInt("thm_id"); + this.fld_reason = flds.AddStr("reason", 255); this.meta = Dbmeta_tbl_itm.New(tbl_name, flds); } public Dbmeta_tbl_itm Meta() {return meta;} private final Dbmeta_tbl_itm meta; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xodel_exec_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xodel_exec_mgr.java index 48d8c2d68..f10f702ca 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xodel_exec_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/updates/files/Xodel_exec_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.updates.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.updates.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.updates.files; import gplx.*; import gplx.xowa.*; import gplx.core.progs.*; import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.xowa.wikis.data.*; import gplx.xowa.bldrs.*; @@ -88,7 +88,7 @@ public class Xodel_exec_mgr { } } finally {rdr.Rls();} - int len = list.Count(); + int len = list.Len(); if (len == 0) return; // no files; exit, else will vacuum below deletion_conn.Env_db_attach("bin_db", bin_db.Conn()); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/utils_rankings/bldrs/Sqlite_percentile_cmd.java b/400_xowa/src/gplx/xowa/addons/bldrs/utils_rankings/bldrs/Sqlite_percentile_cmd.java index 76f04f225..c98d8e494 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/utils_rankings/bldrs/Sqlite_percentile_cmd.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/utils_rankings/bldrs/Sqlite_percentile_cmd.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.utils_rankings.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.utils_rankings.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.wikis.data.tbls.*; +package gplx.xowa.addons.bldrs.utils_rankings.bldrs; import gplx.*; import gplx.xowa.*; +import gplx.dbs.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; public class Sqlite_percentile_cmd extends Xob_cmd__base implements Xob_cmd { private String db_rel_url, tbl_name = "tmp_score"; private int score_max = 100000000; private String select_sql; @@ -36,24 +36,24 @@ public class Sqlite_percentile_cmd extends Xob_cmd__base implements Xob_cmd { conn.Meta_tbl_delete(tbl_name); conn.Meta_tbl_create ( Dbmeta_tbl_itm.New(tbl_name - , Dbmeta_fld_itm.new_int("row_rank").Primary_y_().Autonum_y_() - , Dbmeta_fld_itm.new_int("row_key") - , Dbmeta_fld_itm.new_double("row_val") - , Dbmeta_fld_itm.new_double("row_score").Default_(-1) + , DbmetaFldItm.NewInt("row_rank").PrimarySetY().AutonumSetY() + , DbmetaFldItm.NewInt("row_key") + , DbmetaFldItm.NewDouble("row_val") + , DbmetaFldItm.NewDouble("row_score").DefaultValSet(-1) )); Xoa_app_.Usr_dlg().Prog_many("", "", "filling temp_table: tbl=~{0} sql=~{1}", tbl_name, select_sql); new Db_attach_mgr(conn, new Db_attach_itm("page_db", wiki.Data__core_mgr().Tbl__page().Conn())) .Exec_sql(Bry_fmt.Make_str("INSERT INTO ~{tbl} (row_key, row_val) ~{select}", tbl_name, select_sql)); Xoa_app_.Usr_dlg().Prog_many("", "", "updating row_score: tbl=~{0}", tbl_name); - String score_max_as_str = Dbmeta_fld_itm.To_double_str_by_int(score_max); + String score_max_as_str = DbmetaFldItm.ToDoubleStrByInt(score_max); this.count = conn.Exec_select_as_int("SELECT Count(*) FROM " + tbl_name, -1); if (count == -1) throw Err_.new_("bldr", "failed to get count; tbl=~{0}", tbl_name); - String count_as_str = Dbmeta_fld_itm.To_double_str_by_int(count); + String count_as_str = DbmetaFldItm.ToDoubleStrByInt(count); conn.Exec_sql(Bry_fmt.Make_str("UPDATE ~{tbl} SET row_score = (row_rank * ~{score_max}) / ~{count}", tbl_name, score_max_as_str, count_as_str)); Xoa_app_.Usr_dlg().Prog_many("", "", "resolving ties: tbl=~{0}", tbl_name); conn.Meta_tbl_remake ( Dbmeta_tbl_itm.New(tbl_name + "_avg" - , Dbmeta_fld_itm.new_double("row_val").Primary_y_() - , Dbmeta_fld_itm.new_double("row_score") + , DbmetaFldItm.NewDouble("row_val").PrimarySetY() + , DbmetaFldItm.NewDouble("row_score") )); conn.Exec_sql(Bry_fmt.Make_str(String_.Concat_lines_nl_skip_last ( "INSERT INTO ~{tbl}_avg (row_val, row_score)" diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_mgr.java index e65349265..dc87e2a81 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.volumes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; +package gplx.xowa.addons.bldrs.volumes; import gplx.*; class Volume_prep_mgr { private final Volume_page_loader loader; private final Volume_page_itm tmp_page = new Volume_page_itm(); @@ -27,7 +27,7 @@ class Volume_prep_mgr { ctx.Init(ctx, itm); Calc_make(ctx, itm.Page_ttl); } - return (Volume_make_itm[])list.To_ary_and_clear(Volume_make_itm.class); + return (Volume_make_itm[])list.ToAryAndClear(Volume_make_itm.class); } private void Calc_make(Volume_prep_ctx ctx, byte[] page_ttl) { if (!loader.Load(tmp_page, page_ttl)) return; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_rdr.java b/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_rdr.java index 248e63c4b..ed5d50654 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_rdr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/volumes/Volume_prep_rdr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.bldrs.volumes; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.bldrs.volumes; import gplx.*; class Volume_prep_rdr { public Volume_prep_itm[] Parse(Io_url url) {return Parse(Io_mgr.Instance.LoadFilBryOr(url, null));} public Volume_prep_itm[] Parse(byte[] src) { @@ -25,7 +25,7 @@ class Volume_prep_rdr { Volume_prep_itm itm = Parse_line_or_null(lines[i]); if (itm != null) rv.Add(itm); } - return (Volume_prep_itm[])rv.To_ary_and_clear(Volume_prep_itm.class); + return (Volume_prep_itm[])rv.ToAryAndClear(Volume_prep_itm.class); } private Volume_prep_itm Parse_line_or_null(byte[] line) { byte[][] flds = Bry_split_.Split(line, Byte_ascii.Pipe); diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_reg_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_reg_tbl.java index b885d3a68..08060fbd6 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_reg_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_reg_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.wmdumps.imglinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.wmdumps.*; +package gplx.xowa.addons.bldrs.wmdumps.imglinks; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.bldrs.*; public class Imglnk_reg_tbl implements Db_tbl { - private final String tbl_name = "imglnk_reg"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "imglnk_reg"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__img_src, fld__img_trg, fld__img_repo; private final Db_conn conn; public Imglnk_reg_tbl(Db_conn conn) { this.conn = conn; - fld__img_src = flds.Add_str("img_src", 255); - fld__img_trg = flds.Add_str("img_trg", 255); - fld__img_repo = flds.Add_byte("img_repo"); - flds.Add_int("img_count"); + fld__img_src = flds.AddStr("img_src", 255); + fld__img_trg = flds.AddStr("img_trg", 255); + fld__img_repo = flds.AddByte("img_repo"); + flds.AddInt("img_count"); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_tmp_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_tmp_tbl.java index aabba48fa..7ad43b474 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_tmp_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Imglnk_tmp_tbl.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.wmdumps.imglinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.wmdumps.*; +package gplx.xowa.addons.bldrs.wmdumps.imglinks; import gplx.dbs.*; public class Imglnk_tmp_tbl implements Db_tbl { - private final String tbl_name = "imglnk_tmp"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "imglnk_tmp"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__page_id, fld__img_name; private final Db_conn conn; private Db_stmt stmt__insert; public Imglnk_tmp_tbl(Db_conn conn) { this.conn = conn; - flds.Add_int_pkey_autonum("img_uid"); - this.fld__page_id = flds.Add_int("page_id"); - this.fld__img_name = flds.Add_str("img_name", 255); - flds.Add_int_dflt("img_wiki", -1); - flds.Add_int_dflt("img_id", -1); + flds.AddIntPkeyAutonum("img_uid"); + this.fld__page_id = flds.AddInt("page_id"); + this.fld__img_name = flds.AddStr("img_name", 255); + flds.AddIntDflt("img_wiki", -1); + flds.AddIntDflt("img_id", -1); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Xof_orig_wkr__img_links.java b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Xof_orig_wkr__img_links.java index 9e3a448d5..ffd0f244e 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Xof_orig_wkr__img_links.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/imglinks/Xof_orig_wkr__img_links.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.wmdumps.imglinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.wmdumps.*; +package gplx.xowa.addons.bldrs.wmdumps.imglinks; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.bldrs.*; -import gplx.xowa.files.origs.*; import gplx.xowa.files.repos.*; +import gplx.xowa.files.origs.*; public class Xof_orig_wkr__img_links implements Xof_orig_wkr { private final Hash_adp_bry hash = Hash_adp_bry.cs(); private Db_conn imglnk_conn; @@ -24,7 +24,7 @@ public class Xof_orig_wkr__img_links implements Xof_orig_wkr { } public byte Tid() {return Xof_orig_wkr_.Tid_xowa_img_links;} public Xof_orig_itm Find_as_itm(byte[] ttl, int list_idx, int list_len) { - Xof_orig_itm rv = (Xof_orig_itm)hash.Get_by(ttl); + Xof_orig_itm rv = (Xof_orig_itm)hash.GetByOrNull(ttl); if (rv == Missing) return Xof_orig_itm.Null; else if (rv == null) rv = Load_from_db(ttl); return rv == Missing ? Xof_orig_itm.Null : rv; diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/bldrs/Pglnk_tempdb_mgr.java b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/bldrs/Pglnk_tempdb_mgr.java index c1810969b..f6201df46 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/bldrs/Pglnk_tempdb_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/bldrs/Pglnk_tempdb_mgr.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.wmdumps.pagelinks.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.wmdumps.*; import gplx.xowa.addons.bldrs.wmdumps.pagelinks.*; -import gplx.core.ios.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.wikis.dbs.*; import gplx.dbs.cfgs.*; +package gplx.xowa.addons.bldrs.wmdumps.pagelinks.bldrs; import gplx.*; import gplx.xowa.*; +import gplx.dbs.*; import gplx.xowa.bldrs.*; import gplx.xowa.addons.bldrs.wmdumps.pagelinks.dbs.*; class Pglnk_tempdb_mgr { @@ -24,7 +24,7 @@ class Pglnk_tempdb_mgr { private final int row_max; private int rows; - private final Dbmeta_fld_list dump_flds; + private final DbmetaFldList dump_flds; private final String dump_tbl_name = "pagelink_dump", dump_src_id, dump_trg_ns, dump_trg_ttl; private Db_stmt dump_insert; @@ -40,17 +40,17 @@ class Pglnk_tempdb_mgr { conn = Xob_db_file.New__page_link(wiki).Conn(); // create dump_tbl - dump_flds = new Dbmeta_fld_list(); - dump_flds.Add_int_pkey_autonum("uid"); - dump_src_id = dump_flds.Add_int("src_id"); - dump_trg_ns = dump_flds.Add_int("trg_ns"); - dump_trg_ttl = dump_flds.Add_str("trg_ttl", 255); + dump_flds = new DbmetaFldList(); + dump_flds.AddIntPkeyAutonum("uid"); + dump_src_id = dump_flds.AddInt("src_id"); + dump_trg_ns = dump_flds.AddInt("trg_ns"); + dump_trg_ttl = dump_flds.AddStr("trg_ttl", 255); // create temp_tbl - Dbmeta_fld_list temp_flds = new Dbmeta_fld_list(); - temp_flds.Add_int("src_id"); - temp_flds.Add_int("trg_id"); - temp_flds.Add_int("trg_count"); + DbmetaFldList temp_flds = new DbmetaFldList(); + temp_flds.AddInt("src_id"); + temp_flds.AddInt("trg_id"); + temp_flds.AddInt("trg_count"); conn.Meta_tbl_create(Dbmeta_tbl_itm.New(temp_tbl_name, temp_flds)); } private void Dump__insert_bgn() { diff --git a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/dbs/Pglnk_page_link_tbl.java b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/dbs/Pglnk_page_link_tbl.java index 48e7007a9..60e45f6a7 100644 --- a/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/dbs/Pglnk_page_link_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/bldrs/wmdumps/pagelinks/dbs/Pglnk_page_link_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.bldrs.wmdumps.pagelinks.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.bldrs.*; import gplx.xowa.addons.bldrs.wmdumps.*; import gplx.xowa.addons.bldrs.wmdumps.pagelinks.*; -import gplx.core.ios.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.wikis.dbs.*; import gplx.dbs.cfgs.*; +package gplx.xowa.addons.bldrs.wmdumps.pagelinks.dbs; import gplx.*; +import gplx.dbs.*; public class Pglnk_page_link_tbl implements Rls_able { - private static final String tbl_name = "page_link"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "page_link"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_src_id, fld_trg_id; private final Db_conn conn; public Pglnk_page_link_tbl(Db_conn conn) { this.conn = conn; - fld_src_id = flds.Add_int("src_id"); - fld_trg_id = flds.Add_int("trg_id"); - flds.Add_int("trg_count"); + fld_src_id = flds.AddInt("src_id"); + fld_trg_id = flds.AddInt("trg_id"); + flds.AddInt("trg_count"); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} diff --git a/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_htmlr.java b/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_htmlr.java index 767424245..1104110b3 100644 --- a/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_htmlr.java +++ b/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_htmlr.java @@ -1,72 +1,72 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.htmls.sidebars; - -import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.Bry_fmt; -import gplx.List_adp; -import gplx.core.brys.Bfr_arg; -import gplx.xowa.Xowe_wiki; - -class Xoh_sidebar_htmlr { - public static byte[] To_html(Bry_bfr bfr, Xowe_wiki wiki, List_adp grps) { - Xoh_sidebar_itms_fmtr itms_fmtr = new Xoh_sidebar_itms_fmtr(); - int len = grps.Count(); - boolean popups_enabled = wiki.Html_mgr().Head_mgr().Popup_mgr().Enabled(); - Bry_bfr tmp_bfr = Bry_bfr_.New(); - for (int i = 0; i < len; ++i) { - Xoh_sidebar_itm grp = (Xoh_sidebar_itm)grps.Get_at(i); - itms_fmtr.Init_by_grp(popups_enabled, grp); - itms_fmtr.Bfr_arg__add(tmp_bfr); - Db_Nav_template.Build_Sidebar(wiki, bfr, grp.Id(), grp.Text(), tmp_bfr.To_bry_and_clear()); - } - // dummy toolbox - // id="p-tb" used by some js - bfr.Add_str_a7("
"); - return bfr.To_bry_and_clear(); - } - private static final Bry_fmt fmt = Bry_fmt.Auto_nl_skip_last - ( "
" - , "

" - , " ~{grp_text}" - , "

" - , " " - , "
" - , " " - , "
    ~{itms}" - , "
" - , "
" - , "
" - , "" - ); -} -class Xoh_sidebar_itms_fmtr implements Bfr_arg { - private boolean popups_enabled; private Xoh_sidebar_itm grp; - public void Init_by_grp(boolean popups_enabled, Xoh_sidebar_itm grp) {this.popups_enabled = popups_enabled; this.grp = grp;} - public void Bfr_arg__add(Bry_bfr bfr) { - String itm_cls = popups_enabled ? " class='xowa-hover-off'" : ""; - int len = grp.Subs__len(); - for (int i = 0; i < len; ++i) { - Xoh_sidebar_itm itm = grp.Subs__get_at(i); - fmt.Bld_many(bfr, itm.Id(), itm.Href(), itm_cls, itm.Atr_accesskey_and_title(), itm.Text()); - } - } - private final Bry_fmt fmt = Bry_fmt.Auto_nl_skip_last - ( "" - , "
  • ~{itm_text}
    • " - ); -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.htmls.sidebars; + +import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.Bry_fmt; +import gplx.List_adp; +import gplx.core.brys.Bfr_arg; +import gplx.xowa.Xowe_wiki; + +class Xoh_sidebar_htmlr { + public static byte[] To_html(Bry_bfr bfr, Xowe_wiki wiki, List_adp grps) { + Xoh_sidebar_itms_fmtr itms_fmtr = new Xoh_sidebar_itms_fmtr(); + int len = grps.Len(); + boolean popups_enabled = wiki.Html_mgr().Head_mgr().Popup_mgr().Enabled(); + Bry_bfr tmp_bfr = Bry_bfr_.New(); + for (int i = 0; i < len; ++i) { + Xoh_sidebar_itm grp = (Xoh_sidebar_itm)grps.Get_at(i); + itms_fmtr.Init_by_grp(popups_enabled, grp); + itms_fmtr.Bfr_arg__add(tmp_bfr); + Db_Nav_template.Build_Sidebar(wiki, bfr, grp.Id(), grp.Text(), tmp_bfr.To_bry_and_clear()); + } + // dummy toolbox + // id="p-tb" used by some js + bfr.Add_str_a7("
    "); + return bfr.To_bry_and_clear(); + } + private static final Bry_fmt fmt = Bry_fmt.Auto_nl_skip_last + ( "
    " + , "

    " + , " ~{grp_text}" + , "

    " + , " " + , "
    " + , " " + , "
      ~{itms}" + , "
    " + , "
    " + , "
    " + , "" + ); +} +class Xoh_sidebar_itms_fmtr implements Bfr_arg { + private boolean popups_enabled; private Xoh_sidebar_itm grp; + public void Init_by_grp(boolean popups_enabled, Xoh_sidebar_itm grp) {this.popups_enabled = popups_enabled; this.grp = grp;} + public void Bfr_arg__add(Bry_bfr bfr) { + String itm_cls = popups_enabled ? " class='xowa-hover-off'" : ""; + int len = grp.Subs__len(); + for (int i = 0; i < len; ++i) { + Xoh_sidebar_itm itm = grp.Subs__get_at(i); + fmt.Bld_many(bfr, itm.Id(), itm.Href(), itm_cls, itm.Atr_accesskey_and_title(), itm.Text()); + } + } + private final Bry_fmt fmt = Bry_fmt.Auto_nl_skip_last + ( "" + , "
  • ~{itm_text}
    • " + ); +} diff --git a/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_itm.java b/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_itm.java index 9aa3b6fb9..cf142300c 100644 --- a/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_itm.java +++ b/400_xowa/src/gplx/xowa/addons/htmls/sidebars/Xoh_sidebar_itm.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.htmls.sidebars; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.htmls.*; +package gplx.xowa.addons.htmls.sidebars; import gplx.*; public class Xoh_sidebar_itm { public Xoh_sidebar_itm(boolean tid_is_itm, byte[] text_key, byte[] text_val, byte[] href) { this.tid_is_itm = tid_is_itm; @@ -28,7 +28,7 @@ public class Xoh_sidebar_itm { public byte[] Title() {return title;} private byte[] title; public byte[] Accesskey() {return accesskey;} private byte[] accesskey; public byte[] Atr_accesskey_and_title() {return atr_accesskey_and_title;} private byte[] atr_accesskey_and_title; - public int Subs__len() {return subs.Count();} private final List_adp subs = List_adp_.New(); + public int Subs__len() {return subs.Len();} private final List_adp subs = List_adp_.New(); public Xoh_sidebar_itm Subs__get_at(int i) {return (Xoh_sidebar_itm)subs.Get_at(i);} public Xoh_sidebar_itm Subs__add(Xoh_sidebar_itm... ary) { int len = ary.length; diff --git a/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt.java b/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt.java index 35b3e3972..c5202e8b8 100644 --- a/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt.java +++ b/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.htmls.*; +package gplx.xowa.addons.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; import gplx.langs.htmls.encoders.*; import gplx.xowa.htmls.core.htmls.tidy.*; -import gplx.xowa.parsers.amps.*; import gplx.core.primitives.*; +import gplx.xowa.parsers.amps.*; class Xoh_toc_wkr__txt { private final Gfh_tag_rdr tag_rdr = Gfh_tag_rdr.New__html().Skip_ws_after_slash_y_(); private final Bry_bfr anch_bfr = Bry_bfr_.New(), text_bfr = Bry_bfr_.New(); @@ -70,7 +70,7 @@ class Xoh_toc_wkr__txt { } } } - anch_hash.Add_as_key_and_val(anch_bry); + anch_hash.AddAsKeyAndVal(anch_bry); rv.Set__txt ( anch_bry , text_bfr.To_bry_and_clear_and_trim()); // NOTE: both id and text trim ends diff --git a/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java b/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java index af9fd24cf..d12ed2e93 100644 --- a/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java +++ b/400_xowa/src/gplx/xowa/addons/htmls/tocs/Xoh_toc_wkr__txt__basic__tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.htmls.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.htmls.*; +package gplx.xowa.addons.htmls.tocs; import gplx.*; import gplx.xowa.*; import org.junit.*; import gplx.core.tests.*; import gplx.langs.htmls.*; public class Xoh_toc_wkr__txt__basic__tst { @Before public void init() {fxt.Clear();} private final Xoh_toc_wkr__txt__fxt fxt = new Xoh_toc_wkr__txt__fxt(); @@ -81,7 +81,7 @@ class Xow_tidy_mgr_interface__test implements gplx.xowa.htmls.core.htmls.tidy.Xo public void Add(byte[] html, byte[] tidy) {hash.Add(html, tidy);} public void Exec_tidy(Bry_bfr bfr, boolean indent, byte[] page_url) { byte[] html = bfr.To_bry_and_clear(); - byte[] actl = (byte[])hash.Get_by_or_fail(html); + byte[] actl = (byte[])hash.GetByOrFail(html); bfr.Add(actl); } } diff --git a/400_xowa/src/gplx/xowa/addons/servers/https/Http_long_poll_cmd.java b/400_xowa/src/gplx/xowa/addons/servers/https/Http_long_poll_cmd.java index 27c424d50..4771cec89 100644 --- a/400_xowa/src/gplx/xowa/addons/servers/https/Http_long_poll_cmd.java +++ b/400_xowa/src/gplx/xowa/addons/servers/https/Http_long_poll_cmd.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.servers.https; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.servers.*; +package gplx.xowa.addons.servers.https; import gplx.*; import gplx.xowa.*; import gplx.core.envs.*; public class Http_long_poll_cmd implements gplx.xowa.htmls.bridges.Bridge_cmd_itm { private final List_adp msgs = List_adp_.New(); @@ -69,7 +69,7 @@ public class Http_long_poll_cmd implements gplx.xowa.htmls.bridges.Bridge_cmd_it // return commands String[] rv = null; synchronized (msgs) { - rv = msgs.To_str_ary_and_clear(); + rv = msgs.ToStrAryAndClear(); } return String_.Concat_lines_nl(rv); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/bldrs/Xob_catlink_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/bldrs/Xob_catlink_wkr.java index da6391cd5..09f02b03c 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/bldrs/Xob_catlink_wkr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/bldrs/Xob_catlink_wkr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.ctgs.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.ctgs.bldrs; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.addons.wikis.ctgs.dbs.*; class Xob_catlink_wkr { @@ -116,7 +116,7 @@ class Xob_catlink_wkr { // assert page_cat_db_id exists Xow_db_mgr db_mgr = wiki.Data__core_mgr(); Xowd_page_tbl page_tbl = db_mgr.Db__core().Tbl__page(); - page_conn.Meta_fld_append_if_missing(page_tbl.Tbl_name(), page_tbl.Flds__all(), Dbmeta_fld_itm.new_int("page_cat_db_id").Default_(-1)); + page_conn.Meta_fld_append_if_missing(page_tbl.Tbl_name(), page_tbl.Flds__all(), DbmetaFldItm.NewInt("page_cat_db_id").DefaultValSet(-1)); // prep sql String sql = String_.Concat_lines_nl_skip_last diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_link_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_link_tbl.java index 714c1ba66..ab92c99ee 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_link_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_link_tbl.java @@ -13,23 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; +package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.*; import gplx.dbs.*; -import gplx.xowa.wikis.data.*; -import gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.*; public class Xodb_cat_link_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__from, fld__to_id, fld__type_id, fld__timestamp_unix, fld__sortkey, fld__sortkey_prefix; private Db_stmt stmt_insert; public Xodb_cat_link_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = TBL_NAME; - this.fld__from = flds.Add_int ("cl_from"); // page_id - this.fld__to_id = flds.Add_int ("cl_to_id"); // cat_id - this.fld__type_id = flds.Add_byte ("cl_type_id"); // page,file,subc - this.fld__timestamp_unix = flds.Add_long ("cl_timestamp_unix"); - this.fld__sortkey = flds.Add_bry ("cl_sortkey"); // uca key - this.fld__sortkey_prefix = flds.Add_str (FLD__cl_sortkey_prefix, 255); // page_title; needed for sorting under letter on catpage + this.fld__from = flds.AddInt("cl_from"); // page_id + this.fld__to_id = flds.AddInt("cl_to_id"); // cat_id + this.fld__type_id = flds.AddByte("cl_type_id"); // page,file,subc + this.fld__timestamp_unix = flds.AddLong("cl_timestamp_unix"); + this.fld__sortkey = flds.AddBry("cl_sortkey"); // uca key + this.fld__sortkey_prefix = flds.AddStr(FLD__cl_sortkey_prefix, 255); // page_title; needed for sorting under letter on catpage conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; @@ -74,7 +72,7 @@ public class Xodb_cat_link_tbl implements Db_tbl { } finally { rdr.Rls(); } - return (Xodb_cat_link_row[])list.To_ary_and_clear(Xodb_cat_link_row.class); + return (Xodb_cat_link_row[])list.ToAryAndClear(Xodb_cat_link_row.class); } public void Delete_pages(int page_id) { Gfo_usr_dlg_.Instance.Log_many("", "", "db.cat_link: delete pages started: db=~{0} page_id=~{1}", conn.Conn_info().Raw(), page_id); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_sort_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_sort_tbl.java index 7bb49e5bd..ec1db0e84 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_sort_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_cat_sort_tbl.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.addons.wikis.ctgs.*; +package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.*; +import gplx.dbs.*; public class Xodb_cat_sort_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_key; public Xodb_cat_sort_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "cat_sort"; - flds.Add_int_pkey_autonum("cs_id"); - this.fld_key = flds.Add_str ("cs_key", 255); + flds.AddIntPkeyAutonum("cs_id"); + this.fld_key = flds.AddStr("cs_key", 255); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_hidden_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_hidden_tbl.java index dc9a3a1f4..10b916ec0 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_hidden_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_hidden_tbl.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; +package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.dbs.*; public class Xodb_tmp_cat_hidden_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_cat_id; private Db_stmt stmt_insert; public Xodb_tmp_cat_hidden_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "tmp_cat_hidden"; - this.fld_cat_id = flds.Add_int_pkey ("cat_id"); + this.fld_cat_id = flds.AddIntPkey("cat_id"); conn.Rls_reg(this); conn.Meta_tbl_remake(this); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_link_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_link_tbl.java index 2f3851393..9fdebe5f2 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_link_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/dbs/Xodb_tmp_cat_link_tbl.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.addons.wikis.ctgs.*; +package gplx.xowa.addons.wikis.ctgs.dbs; +import gplx.dbs.*; public class Xodb_tmp_cat_link_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_from, fld_to_ttl, fld_sortkey, fld_timestamp, fld_sortkey_prefix, fld_collation_id, fld_type_id; private Db_stmt stmt_insert; public Xodb_tmp_cat_link_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "tmp_cat_link"; - this.fld_from = flds.Add_int ("cl_from"); - this.fld_to_ttl = flds.Add_str ("cl_to_ttl", 255); - this.fld_sortkey = flds.Add_bry ("cl_sortkey"); - this.fld_timestamp = flds.Add_long ("cl_timestamp"); - this.fld_sortkey_prefix = flds.Add_str ("cl_sortkey_prefix", 230); - this.fld_collation_id = flds.Add_byte ("cl_collation_id"); - this.fld_type_id = flds.Add_byte ("cl_type_id"); + this.fld_from = flds.AddInt("cl_from"); + this.fld_to_ttl = flds.AddStr("cl_to_ttl", 255); + this.fld_sortkey = flds.AddBry("cl_sortkey"); + this.fld_timestamp = flds.AddLong("cl_timestamp"); + this.fld_sortkey_prefix = flds.AddStr("cl_sortkey_prefix", 230); + this.fld_collation_id = flds.AddByte("cl_collation_id"); + this.fld_type_id = flds.AddByte("cl_type_id"); conn.Rls_reg(this); conn.Meta_tbl_remake(this); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java index 79bc86f82..4e65500a2 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/Xoctg_catpage_mgr.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.htmls.catpages; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.*; -import gplx.xowa.wikis.dbs.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.htmls.core.htmls.*; import gplx.core.intls.ucas.*; -import gplx.xowa.wikis.nss.*; +package gplx.xowa.addons.wikis.ctgs.htmls.catpages; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.ctgs.*; +import gplx.xowa.langs.*; +import gplx.core.intls.ucas.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.fmts.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.dbs.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.urls.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.langs.*; public class Xoctg_catpage_mgr implements Gfo_invk { private final Xow_wiki wiki; @@ -51,7 +51,7 @@ public class Xoctg_catpage_mgr implements Gfo_invk { public void Free_mem_all() {cache.Clear();} public Xoctg_catpage_ctg Get_by_cache_or_null(byte[] page_ttl, Xoctg_catpage_url catpage_url, Xoa_ttl cat_ttl, int limit) { // DynamicPageList categories only (b/c of many members); for regular catpages, always retrieve on demand - Xoctg_catpage_ctg ctg = (Xoctg_catpage_ctg)cache.Get_by(cat_ttl.Full_db()); + Xoctg_catpage_ctg ctg = (Xoctg_catpage_ctg)cache.GetByOrNull(cat_ttl.Full_db()); if (ctg == null) { if (gplx.core.envs.Env_.Mode_testing()) return null; // needed for dpl test ctg = Get_by_db_or_null(page_ttl, catpage_url, cat_ttl, limit); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/dbs/Xoctg_catlink_loader.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/dbs/Xoctg_catlink_loader.java index a5a4cf3b4..9140f06d4 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/dbs/Xoctg_catlink_loader.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/dbs/Xoctg_catlink_loader.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.htmls.catpages.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.*; +package gplx.xowa.addons.wikis.ctgs.htmls.catpages.dbs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.ctgs.htmls.catpages.*; import gplx.dbs.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.langs.*; class Xoctg_catlink_loader { @@ -44,7 +45,7 @@ class Xoctg_catlink_loader { if (catlink_list.Len() == 0) return; // sort and reduce list to 200 total - catlink_list.Sort_by(new Xoctg_catlink_sorter(url_is_from)); + catlink_list.SortBy(new Xoctg_catlink_sorter(url_is_from)); Ordered_hash catlink_hash = Ordered_hash_.New(); int catlink_list_len = catlink_list.Len(); int max = catlink_list_len < limit ? catlink_list_len : limit; @@ -205,7 +206,7 @@ class Xoctg_catlink_loader { // add page_db db_list.Add(new Db_attach_itm("page_db", page_tbl.Conn())); - Db_attach_mgr attach_mgr = new Db_attach_mgr(db_1st, (Db_attach_itm[])db_list.To_ary_and_clear(Db_attach_itm.class)); + Db_attach_mgr attach_mgr = new Db_attach_mgr(db_1st, (Db_attach_itm[])db_list.ToAryAndClear(Db_attach_itm.class)); return new Xoctg_catlink_loader(wiki, catpage_mgr, page_tbl, version, link_dbs_len, attach_mgr); } } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/doms/Xoctg_catpage_tmp.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/doms/Xoctg_catpage_tmp.java index 01fe26d96..b020c3f28 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/doms/Xoctg_catpage_tmp.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/catpages/doms/Xoctg_catpage_tmp.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.*; +package gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.ctgs.*; public class Xoctg_catpage_tmp { private final List_adp subc_list = List_adp_.New(), page_list = List_adp_.New(), file_list = List_adp_.New(); public void Add(Xoctg_catpage_itm itm) { @@ -28,7 +29,7 @@ public class Xoctg_catpage_tmp { byte tid = grp.Tid(); List_adp list = Get_by_tid(tid); if (list.Len() == 0) return; - grp.Itms_(wiki, (Xoctg_catpage_itm[])list.To_ary_and_clear(Xoctg_catpage_itm.class)); + grp.Itms_(wiki, (Xoctg_catpage_itm[])list.ToAryAndClear(Xoctg_catpage_itm.class)); } private List_adp Get_by_tid(byte tid) { switch (tid) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_hash.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_hash.java index d6e11023d..d24887307 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_hash.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/Xoctg_pagebox_hash.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.htmls.pageboxs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.*; +package gplx.xowa.addons.wikis.ctgs.htmls.pageboxs; import gplx.*; import gplx.xowa.*; import gplx.core.lists.hashs.*; class Xoctg_pagebox_hash { private final Ordered_hash hash_by_ttl = Ordered_hash_.New_bry(); private final Hash_adp__int hash_by_id = new Hash_adp__int(); public int Len() {return hash_by_ttl.Len();} public Xoctg_pagebox_itm Get_at(int i) {return (Xoctg_pagebox_itm)hash_by_ttl.Get_at(i);} - public Xoctg_pagebox_itm Get_by_ttl(byte[] full_db) {return (Xoctg_pagebox_itm)hash_by_ttl.Get_by(full_db);} + public Xoctg_pagebox_itm Get_by_ttl(byte[] full_db) {return (Xoctg_pagebox_itm)hash_by_ttl.GetByOrNull(full_db);} public Xoctg_pagebox_itm Get_by_id(int page_id) {return (Xoctg_pagebox_itm)hash_by_id.Get_by_or_fail(page_id);} public Xoctg_pagebox_itm[] To_ary_and_clear() { hash_by_id.Clear(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_box__tst.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_box__tst.java index 823a2be1d..33b6dc7da 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_box__tst.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_box__tst.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.doubles; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.*; import gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.*; +package gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.doubles; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.*; import org.junit.*; -import gplx.xowa.wikis.data.tbls.*; public class Xoctg_double_box__tst { @Before public void init() {fxt.Clear();} private Xoctg_double_box__fxt fxt = new Xoctg_double_box__fxt(); @Test public void Single() { @@ -94,12 +94,12 @@ class Xoctg_double_box__fxt { Xoa_ttl ttl = fxt.Wiki().Ttl_parse(Bry_.new_u8(ary[i])); Xoctg_pagebox_itm itm = Xoctg_pagebox_itm.New_by_ttl(ttl); itm.Load_by_cat_core(hidden, 0, 0, 0); - init_ctgs.Add_many(itm); + init_ctgs.AddMany(itm); } } public void Test_print_hidden(String expd) { Bry_bfr bfr = Bry_bfr_.New(); - Xoctg_pagebox_itm[] ary = (Xoctg_pagebox_itm[])init_ctgs.To_ary_and_clear(Xoctg_pagebox_itm.class); + Xoctg_pagebox_itm[] ary = (Xoctg_pagebox_itm[])init_ctgs.ToAryAndClear(Xoctg_pagebox_itm.class); hidden_wtr.Write_pagebox(bfr, ary); Tfds.Eq_str_lines(expd, bfr.To_str_and_clear()); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_itm.java b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_itm.java index d2563407b..4cf2c8cdf 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_itm.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/ctgs/htmls/pageboxs/doubles/Xoctg_double_itm.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.doubles; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.*; import gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.*; -import gplx.core.brys.fmts.*; import gplx.core.brys.fmtrs.*; -import gplx.xowa.htmls.*; import gplx.xowa.htmls.hrefs.*; import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; -import gplx.xowa.wikis.nss.*; +package gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.doubles; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.ctgs.htmls.pageboxs.*; +import gplx.xowa.htmls.hrefs.*; +import gplx.xowa.htmls.core.wkrs.lnkis.htmls.*; import gplx.xowa.users.history.*; public class Xoctg_double_itm implements gplx.core.brys.Bfr_arg { private final List_adp itms = List_adp_.New(); @@ -27,10 +27,10 @@ public class Xoctg_double_itm implements gplx.core.brys.Bfr_arg { this.history_mgr = history_mgr; } public void Itms__clear() {itms.Clear();} - public int Itms__count() {return itms.Count();} + public int Itms__count() {return itms.Len();} public void Itms__add(Xoctg_pagebox_itm page) {itms.Add(page);} public void Bfr_arg__add(Bry_bfr bfr) { - int len = itms.Count(); + int len = itms.Len(); for (int i = 0; i < len; ++i) { Xoctg_pagebox_itm itm = (Xoctg_pagebox_itm)itms.Get_at(i); Xoa_ttl ttl = itm.Ttl(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_props_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_props_mgr.java index abee9ea95..251495072 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_props_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_props_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.directorys.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.directorys.*; +package gplx.xowa.addons.wikis.directorys.dbs; import gplx.*; import gplx.xowa.*; import gplx.langs.jsons.*; import gplx.xowa.wikis.data.*; public interface Xowdir_wiki_props_mgr { @@ -79,12 +79,12 @@ class Xowdir_wiki_props_mgr__mock extends Xowdir_wiki_props_mgr__base { public Xowdir_wiki_props_mgr__mock() {super(Gfo_usr_dlg_.Noop);} @Override public void Wiki_cfg__upsert(String key, String val) { if (val != null) - wiki_cfg_hash.Add_if_dupe_use_nth(key, val); + wiki_cfg_hash.AddIfDupeUseNth(key, val); } @Override public String Wiki_cfg__select_or(String key, String or) { - String rv = (String)wiki_cfg_hash.Get_by(key); + String rv = (String)wiki_cfg_hash.GetByOrNull(key); return rv == null ? or : rv; } - @Override public void User_reg__upsert(String domain, String val) {user_reg_hash.Add_if_dupe_use_nth(domain, val);} - @Override public String User_reg__select(String domain) {return (String)user_reg_hash.Get_by(domain);} + @Override public void User_reg__upsert(String domain, String val) {user_reg_hash.AddIfDupeUseNth(domain, val);} + @Override public String User_reg__select(String domain) {return (String)user_reg_hash.GetByOrNull(domain);} } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_tbl.java index 584be5cf2..b86061d12 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/dbs/Xowdir_wiki_tbl.java @@ -13,21 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.directorys.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.directorys.*; +package gplx.xowa.addons.wikis.directorys.dbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; import gplx.langs.jsons.*; public class Xowdir_wiki_tbl implements Db_tbl { // for domain and user-specific data only (name, url); don't replicate wiki-specific info here (like main_page) - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__wiki_id, fld__wiki_domain, fld__wiki_core_url, fld__wiki_json; private final Db_conn conn; private final Json_parser json_parser = new Json_parser(); public Xowdir_wiki_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = Tbl_name_dflt; - this.fld__wiki_id = flds.Add_int_pkey("wiki_id"); - this.fld__wiki_domain = flds.Add_str("wiki_domain", 255); // EX: "en.wikipedia.org" - this.fld__wiki_core_url = flds.Add_str("wiki_core_url", 255); // EX: "/xowa/wiki/en.wikipedia.org/en.wikipedia.org-core.xowa" - this.fld__wiki_json = flds.Add_text("wiki_json"); // EX: '{category_level="1",search_level="2", ...}' + this.fld__wiki_id = flds.AddIntPkey("wiki_id"); + this.fld__wiki_domain = flds.AddStr("wiki_domain", 255); // EX: "en.wikipedia.org" + this.fld__wiki_core_url = flds.AddStr("wiki_core_url", 255); // EX: "/xowa/wiki/en.wikipedia.org/en.wikipedia.org-core.xowa" + this.fld__wiki_json = flds.AddText("wiki_json"); // EX: '{category_level="1",search_level="2", ...}' conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; @@ -42,7 +42,7 @@ public class Xowdir_wiki_tbl implements Db_tbl { // for domain and user-specific while (rdr.Move_next()) { list.Add(Make(rdr)); } - return (Xowdir_wiki_itm[])list.To_ary_and_clear(Xowdir_wiki_itm.class); + return (Xowdir_wiki_itm[])list.ToAryAndClear(Xowdir_wiki_itm.class); } finally {rdr.Rls();} } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xodb_wiki_db.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xodb_wiki_db.java index 3b2df4d4b..4b4c8f1e9 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xodb_wiki_db.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xodb_wiki_db.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.directorys.specials.items.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.directorys.*; import gplx.xowa.addons.wikis.directorys.specials.*; import gplx.xowa.addons.wikis.directorys.specials.items.*; +package gplx.xowa.addons.wikis.directorys.specials.items.bldrs; import gplx.*; import gplx.dbs.*; public class Xodb_wiki_db implements Db_tbl_owner { private final Ordered_hash tbls = Ordered_hash_.New(); @@ -25,7 +25,7 @@ public class Xodb_wiki_db implements Db_tbl_owner { public int Tid() {return tid;} private final int tid; public Io_url Url() {return url;} private final Io_url url; public Db_conn Conn() {return conn;} private final Db_conn conn; - public Db_tbl Tbls__get_by_key(String key) {return (Db_tbl)tbls.Get_by(key);} + public Db_tbl Tbls__get_by_key(String key) {return (Db_tbl)tbls.GetByOrNull(key);} public void Tbls__add(boolean create, Db_tbl... ary) { int len = ary.length; for (int i = 0; i < len; ++i) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_db_mkr.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_db_mkr.java index 435734929..771d7dd80 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_db_mkr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_db_mkr.java @@ -1,25 +1,25 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.directorys.specials.items.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.directorys.*; import gplx.xowa.addons.wikis.directorys.specials.*; import gplx.xowa.addons.wikis.directorys.specials.items.*; -import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.dbs.sys.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.directorys.specials.items.bldrs; import gplx.*; +import gplx.dbs.*; import gplx.dbs.cfgs.*; +import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.core.ios.streams.*; -import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.data.site_stats.*; +import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.data.site_stats.*; import gplx.xowa.langs.cases.*; -import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.fsdb.data.*; import gplx.xowa.files.origs.*; -import gplx.xowa.addons.wikis.directorys.dbs.*; +import gplx.fsdb.meta.*; import gplx.fsdb.data.*; import gplx.xowa.files.origs.*; import gplx.xowa.addons.wikis.ctgs.dbs.*; import gplx.xowa.addons.wikis.searchs.dbs.*; public class Xow_db_mkr { @@ -41,7 +41,7 @@ public class Xow_db_mkr { ); // upgrade tbl: page for categories; NOTE: should change page_tbl to do this automatically - core_conn.Meta_fld_append(Xowd_page_tbl.TBL_NAME, Dbmeta_fld_itm.new_int(Xowd_page_tbl.FLD__page_cat_db_id).Default_(-1)); + core_conn.Meta_fld_append(Xowd_page_tbl.TBL_NAME, DbmetaFldItm.NewInt(Xowd_page_tbl.FLD__page_cat_db_id).DefaultValSet(-1)); // create tbls: cat; may want to do "if (props.Layout_text().Tid_is_all_or_few())" // create in advance else will fail for v2; import wiki -> wiki loads and tries to load categories; v2 category processes and builds tbl; DATE:2015-03-22 core_db.Tbls__add(Bool_.Y diff --git a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java index f08f20d4c..18c5c72b0 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/directorys/specials/items/bldrs/Xow_wiki_upgrade_.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.directorys.specials.items.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.directorys.*; import gplx.xowa.addons.wikis.directorys.specials.*; import gplx.xowa.addons.wikis.directorys.specials.items.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.directorys.specials.items.bldrs; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.addons.wikis.ctgs.dbs.*; import gplx.xowa.addons.wikis.directorys.dbs.*; @@ -64,7 +64,7 @@ public class Xow_wiki_upgrade_ { try { if (!core_db_conn.Meta_fld_exists(Xowd_page_tbl.TBL_NAME, Xowd_page_tbl.FLD__page_cat_db_id)) { Gfo_usr_dlg_.Instance.Log_many("", "", "xo.personal:page.page_cat_db_id upgrade; fil=~{0}", core_db_url.Raw()); - core_db_conn.Meta_fld_append(Xowd_page_tbl.TBL_NAME, Dbmeta_fld_itm.new_int(Xowd_page_tbl.FLD__page_cat_db_id).Default_(-1)); + core_db_conn.Meta_fld_append(Xowd_page_tbl.TBL_NAME, DbmetaFldItm.NewInt(Xowd_page_tbl.FLD__page_cat_db_id).DefaultValSet(-1)); } } catch (Exception e) { Gfo_usr_dlg_.Instance.Warn_many("", "", "xo.personal:page.page_cat_db_id upgrade failed; err=~{0}", Err_.Message_gplx_log(e)); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/indexers/bldrs/Xofulltext_indexer_args.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/indexers/bldrs/Xofulltext_indexer_args.java index 928710ffc..38194beff 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/indexers/bldrs/Xofulltext_indexer_args.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/indexers/bldrs/Xofulltext_indexer_args.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.fulltexts.indexers.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.fulltexts.*; import gplx.xowa.addons.wikis.fulltexts.indexers.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.fulltexts.indexers.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.nss.*; import gplx.gflucene.indexers.*; public class Xofulltext_indexer_args implements Gfo_invk { @@ -49,7 +49,7 @@ public class Xofulltext_indexer_args implements Gfo_invk { temp_ns_list.Add(Bry_.To_int(ns_bry)); } } - ns_ids_ary = (int[])temp_ns_list.To_ary_and_clear(int.class); + ns_ids_ary = (int[])temp_ns_list.ToAryAndClear(int.class); // idx_opt if (idx_opt == null) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/caches/Xofulltext_cache_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/caches/Xofulltext_cache_mgr.java index 4302dc67b..8c9287220 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/caches/Xofulltext_cache_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/caches/Xofulltext_cache_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.fulltexts.searchers.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.fulltexts.*; import gplx.xowa.addons.wikis.fulltexts.searchers.*; +package gplx.xowa.addons.wikis.fulltexts.searchers.caches; import gplx.*; import gplx.core.primitives.*; public class Xofulltext_cache_mgr { private final Ordered_hash qry_hash = Ordered_hash_.New(); @@ -23,13 +23,13 @@ public class Xofulltext_cache_mgr { qry_hash.Clear(); } public int Ids__get_or_neg1(byte[] qry_key) { - Int_obj_val id = (Int_obj_val)id_hash.Get_by(qry_key); + Int_obj_val id = (Int_obj_val)id_hash.GetByOrNull(qry_key); return id == null ? -1 : id.Val(); } public int Ids__next() {return next_qry_id++;} public void Add(int id, byte[] key) { id_hash.Add(key, new Int_obj_val(id)); - Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.Get_by(id); + Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.GetByOrNull(id); if (qry == null) { qry = new Xofulltext_cache_qry(id, key); qry_hash.Add(id, qry); @@ -37,29 +37,29 @@ public class Xofulltext_cache_mgr { } public void Add_page(int query_id, byte[] wiki_bry, int page_id, byte[] page_ttl) { // get qry - Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.Get_by_or_fail(query_id); + Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.GetByOrFail(query_id); // get page - Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().Get_by(page_id); + Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().GetByOrNull(page_id); if (page == null) { - page = new Xofulltext_cache_page(page_id, qry.Pages().Count(), page_ttl); + page = new Xofulltext_cache_page(page_id, qry.Pages().Len(), page_ttl); qry.Pages().Add(page_id, page); } } public void Add_line(int query_id, byte[] wiki_bry, int page_id, int line_seq, byte[] line_html) { // get qry - Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.Get_by_or_fail(query_id); - Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().Get_by_or_fail(page_id); + Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.GetByOrFail(query_id); + Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().GetByOrFail(page_id); // add line Xofulltext_cache_line line = new Xofulltext_cache_line(line_seq, line_html); page.Lines().Add(line); } public Xofulltext_cache_qry Get_or_null(int qry_id) { - return (Xofulltext_cache_qry)qry_hash.Get_by(qry_id); + return (Xofulltext_cache_qry)qry_hash.GetByOrNull(qry_id); } public Xofulltext_cache_page[] Get_pages_rng(int qry_id, int page_seq_bgn, int page_seq_end) { - Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.Get_by(qry_id); + Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.GetByOrNull(qry_id); if (qry == null) return null; List_adp list = List_adp_.New(); @@ -69,12 +69,12 @@ public class Xofulltext_cache_mgr { Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().Get_at(i); list.Add(page); } - return (Xofulltext_cache_page[])list.To_ary_and_clear(Xofulltext_cache_page.class); + return (Xofulltext_cache_page[])list.ToAryAndClear(Xofulltext_cache_page.class); } public Xofulltext_cache_line[] Get_lines_rest(int qry_id, byte[] wiki_bry, int page_id) { // get page - Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.Get_by(qry_id); - Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().Get_by(page_id); + Xofulltext_cache_qry qry = (Xofulltext_cache_qry)qry_hash.GetByOrNull(qry_id); + Xofulltext_cache_page page = (Xofulltext_cache_page)qry.Pages().GetByOrNull(page_id); // loop lines from 1 to n; note "1" b/c results will always show at least 1st line List_adp list = List_adp_.New(); @@ -83,6 +83,6 @@ public class Xofulltext_cache_mgr { Xofulltext_cache_line line = (Xofulltext_cache_line)page.Lines().Get_at(i); list.Add(line); } - return (Xofulltext_cache_line[])list.To_ary_and_clear(Xofulltext_cache_line.class); + return (Xofulltext_cache_line[])list.ToAryAndClear(Xofulltext_cache_line.class); } } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_args_wiki.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_args_wiki.java index 24bb791ac..2b265268b 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_args_wiki.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/mgrs/Xofulltext_args_wiki.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.fulltexts.searchers.mgrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.fulltexts.*; import gplx.xowa.addons.wikis.fulltexts.searchers.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.fulltexts.searchers.mgrs; import gplx.*; public class Xofulltext_args_wiki { public byte[] wiki; public byte[] ns_ids; @@ -34,7 +34,7 @@ public class Xofulltext_args_wiki { byte[][] ns_ary = Bry_split_.Split(ns_ids, Byte_ascii.Comma, true); for (byte[] ns_id : ns_ary) { int ns_int = Bry_.To_int(ns_id); - ns_hash.Add_if_dupe_use_1st(ns_int, ns_int); + ns_hash.AddIfDupeUse1st(ns_int, ns_int); } } else if (String_.Eq(key, "offsets")) this.bgn = Bry_.To_int(val); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java index 1d43cc993..9ffaa0e00 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/specials/Xofulltext_searcher_html.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.fulltexts.searchers.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.fulltexts.*; import gplx.xowa.addons.wikis.fulltexts.searchers.*; +package gplx.xowa.addons.wikis.fulltexts.searchers.specials; import gplx.*; import gplx.xowa.*; import gplx.core.net.qargs.*; -import gplx.dbs.*; import gplx.xowa.specials.*; import gplx.langs.mustaches.*; import gplx.xowa.wikis.pages.*; import gplx.xowa.wikis.pages.tags.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.parsers.amps.*; @@ -94,7 +93,7 @@ class Xofulltext_searcher_html extends Xow_special_wtr__base implements Mustache } public boolean Mustache__write(String key, Mustache_bfr bfr) { - String val = (String)props.Get_by(key); + String val = (String)props.GetByOrNull(key); if (val == null) return false; else { @@ -103,7 +102,7 @@ class Xofulltext_searcher_html extends Xow_special_wtr__base implements Mustache } } public Mustache_doc_itm[] Mustache__subs(String key) { - Object val_obj = props.Get_by(key); + Object val_obj = props.GetByOrNull(key); if (val_obj == null) { return Mustache_doc_itm_.Ary__empty; } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java index 5ac9fe0a2..1b9afa6b7 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/fulltexts/searchers/svcs/Xofulltext_searcher_svc.java @@ -13,16 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.fulltexts.searchers.svcs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.fulltexts.*; import gplx.xowa.addons.wikis.fulltexts.searchers.*; -import gplx.core.btries.*; +package gplx.xowa.addons.wikis.fulltexts.searchers.svcs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.fulltexts.*; import gplx.langs.jsons.*; -import gplx.dbs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.guis.cbks.*; import gplx.xowa.addons.apps.cfgs.*; -import gplx.xowa.addons.wikis.fulltexts.searchers.specials.*; import gplx.xowa.addons.wikis.fulltexts.searchers.caches.*; -import gplx.xowa.addons.wikis.searchs.searchers.crts.*; -import gplx.xowa.addons.wikis.searchs.searchers.crts.visitors.*; import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.*; import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.uis.*; import gplx.xowa.addons.wikis.fulltexts.searchers.mgrs.gflucenes.*; @@ -35,7 +31,7 @@ class Xofulltext_searcher_svc implements Gfo_invk { } public void Search_cxl(Json_nde args) {this.Search_cxl(args.Get_as_str("page_guid"));} private void Search_cxl(String page_guid) { - Xofulltext_args_qry prv_args = (Xofulltext_args_qry)wkr_hash.Get_by(page_guid); + Xofulltext_args_qry prv_args = (Xofulltext_args_qry)wkr_hash.GetByOrNull(page_guid); if (prv_args != null) { prv_args.Cancel(); synchronized (wkr_hash) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_core_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_core_tbl.java index ee6e6085b..811c2dfdc 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_core_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_core_tbl.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.htmls.css.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.htmls.*; import gplx.xowa.addons.wikis.htmls.css.*; +package gplx.xowa.addons.wikis.htmls.css.dbs; import gplx.*; import gplx.dbs.*; public class Xowd_css_core_tbl implements Rls_able { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_key, fld_updated_on; public Xowd_css_core_tbl(Db_conn conn) { this.conn = conn; - this.fld_id = flds.Add_int_pkey_autonum("css_id"); - this.fld_key = flds.Add_str("css_key", 255); - this.fld_updated_on = flds.Add_str("css_updated_on", 20); + this.fld_id = flds.AddIntPkeyAutonum("css_id"); + this.fld_key = flds.AddStr("css_key", 255); + this.fld_updated_on = flds.AddStr("css_updated_on", 20); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; @@ -59,7 +59,7 @@ public class Xowd_css_core_tbl implements Rls_able { while (rdr.Move_next()) rv.Add(new_itm(rdr)); } finally {rdr.Rls();} - return (Xowd_css_core_itm[])rv.To_ary_and_clear(Xowd_css_core_itm.class); + return (Xowd_css_core_itm[])rv.ToAryAndClear(Xowd_css_core_itm.class); } public void Delete_all() { conn.Stmt_delete(tbl_name).Exec_delete(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_file_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_file_tbl.java index 2854bf6b3..0a29c992a 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_file_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/htmls/css/dbs/Xowd_css_file_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.htmls.css.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.htmls.*; import gplx.xowa.addons.wikis.htmls.css.*; +package gplx.xowa.addons.wikis.htmls.css.dbs; import gplx.*; import gplx.dbs.*; public class Xowd_css_file_tbl implements Rls_able { - private final String tbl_name = "css_file"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "css_file"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_css_id, fld_path, fld_data; private final Db_conn conn; private Db_stmt stmt_insert; public Xowd_css_file_tbl(Db_conn conn) { this.conn = conn; - fld_css_id = flds.Add_int("css_id"); - fld_path = flds.Add_str("file_path", 255); - fld_data = flds.Add_bry("file_data"); + fld_css_id = flds.AddInt("css_id"); + fld_path = flds.AddStr("file_path", 255); + fld_data = flds.AddBry("file_data"); conn.Rls_reg(this); } public void Rls() { @@ -52,7 +52,7 @@ public class Xowd_css_file_tbl implements Rls_able { while (rdr.Move_next()) rv.Add(new_itm(rdr)); } finally {rdr.Rls();} - return (Xowd_css_file_itm[])rv.To_ary_and_clear(Xowd_css_file_itm.class); + return (Xowd_css_file_itm[])rv.ToAryAndClear(Xowd_css_file_itm.class); } public void Delete_all() { conn.Stmt_delete(tbl_name).Exec_delete(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_addon.java b/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_addon.java index 041c8dc67..03b5ecd10 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_addon.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_addon.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; +package gplx.xowa.addons.wikis.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.specials.*; public class Xow_import_addon implements Xoax_addon_itm, Xoax_addon_itm__special { private final Ordered_hash cbks = Ordered_hash_.New(); @@ -26,7 +26,7 @@ public class Xow_import_addon implements Xoax_addon_itm, Xoax_addon_itm__special if (!cbks.Has(cbk.Key())) cbks.Add(cbk.Key(), cbk); } - public Xow_import_dir_cbk Dir_selected_cbks__get_by(String key) {return (Xow_import_dir_cbk)cbks.Get_by(key);} + public Xow_import_dir_cbk Dir_selected_cbks__get_by(String key) {return (Xow_import_dir_cbk)cbks.GetByOrNull(key);} public String Addon__key() {return ADDON__KEY;} private static final String ADDON__KEY = "xowa.apps.file_browsers"; public static Xow_import_addon Addon__get(Xow_wiki wiki) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_doc.java b/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_doc.java index 3461dcaaf..2d6766671 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_doc.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/imports/Xow_import_doc.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; +package gplx.xowa.addons.wikis.imports; import gplx.*; import gplx.core.ios.*; import gplx.langs.mustaches.*; class Xow_import_doc implements Mustache_doc_itm { @@ -54,7 +54,7 @@ class Xow_import_doc implements Mustache_doc_itm { List_adp sub_list = List_adp_.New(); New_subs(owner_dir.Url(), sub_list, owner_dir.SubDirs(), dir_cmd); New_subs(owner_dir.Url(), sub_list, owner_dir.SubFils(), Bry_.Empty); - Xow_import_doc[] subs = (Xow_import_doc[])sub_list.To_ary_and_clear(Xow_import_doc.class); + Xow_import_doc[] subs = (Xow_import_doc[])sub_list.ToAryAndClear(Xow_import_doc.class); return new Xow_import_doc(Bool_.Y, Bool_.N, 0, owner_dir.Url().OwnerDir().RawBry(), owner_dir.Url().RawBry(), Bry_.new_u8(owner_dir.Name()), Bry_.Empty, Bry_.Empty, dir_cmd, subs); } private static void New_subs(Io_url owner_dir, List_adp list, IoItmList subs, byte[] dir_cmd) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_qry_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_qry_tbl.java index 55a861772..b807f0b40 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_qry_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_qry_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.pages.randoms.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.pages.*; import gplx.xowa.addons.wikis.pages.randoms.*; -import gplx.core.ios.*; import gplx.dbs.*; import gplx.dbs.utls.*; +package gplx.xowa.addons.wikis.pages.randoms.dbs; import gplx.*; +import gplx.dbs.*; public class Rndm_qry_tbl implements Rls_able { - private final String tbl_name = "rndm_qry"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "rndm_qry"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_qry_idx, fld_rng_end, fld_qry_key, fld_qry_data, fld_qry_name; private final Db_conn conn; public Rndm_qry_tbl(Db_conn conn) { this.conn = conn; - fld_qry_idx = flds.Add_int_pkey("qry_idx"); // EX: 0 - fld_rng_end = flds.Add_int("rng_end"); // EX: 123 - fld_qry_key = flds.Add_str("qry_key", 255); // EX: xowa.ns.0 - fld_qry_data = flds.Add_str("qry_data", 255); // EX: type=ns;ns=0 - fld_qry_name = flds.Add_str("qry_name", 255); // EX: Main Namespace - All + fld_qry_idx = flds.AddIntPkey("qry_idx"); // EX: 0 + fld_rng_end = flds.AddInt("rng_end"); // EX: 123 + fld_qry_key = flds.AddStr("qry_key", 255); // EX: xowa.ns.0 + fld_qry_data = flds.AddStr("qry_data", 255); // EX: type=ns;ns=0 + fld_qry_name = flds.AddStr("qry_name", 255); // EX: Main Namespace - All conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} diff --git a/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_rng_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_rng_tbl.java index 7c734e5f6..fb57653c6 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_rng_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_rng_tbl.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.pages.randoms.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.pages.*; import gplx.xowa.addons.wikis.pages.randoms.*; -import gplx.core.ios.*; import gplx.dbs.*; import gplx.dbs.utls.*; +package gplx.xowa.addons.wikis.pages.randoms.dbs; import gplx.*; +import gplx.dbs.*; public class Rndm_rng_tbl implements Rls_able { - private final String tbl_name = "rndm_rng"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "rndm_rng"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_qry_idx, fld_rng_idx, fld_seq_bgn, fld_seq_end; private final Db_conn conn; public Rndm_rng_tbl(Db_conn conn) { this.conn = conn; - fld_qry_idx = flds.Add_int("qry_idx"); - fld_rng_idx = flds.Add_int("rng_idx"); - fld_seq_bgn = flds.Add_int("seq_bgn"); - fld_seq_end = flds.Add_int("seq_end"); + fld_qry_idx = flds.AddInt("qry_idx"); + fld_rng_idx = flds.AddInt("rng_idx"); + fld_seq_bgn = flds.AddInt("seq_bgn"); + fld_seq_end = flds.AddInt("seq_end"); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} diff --git a/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_seq_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_seq_tbl.java index 168d8f343..75013bf69 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_seq_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/pages/randoms/dbs/Rndm_seq_tbl.java @@ -13,21 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.pages.randoms.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.pages.*; import gplx.xowa.addons.wikis.pages.randoms.*; -import gplx.core.ios.*; import gplx.dbs.*; import gplx.dbs.utls.*; +package gplx.xowa.addons.wikis.pages.randoms.dbs; import gplx.*; +import gplx.dbs.*; public class Rndm_seq_tbl implements Rls_able { // list of page_ids w/ random_idx; EX: 0,123|1,23|2,31|... private final String fld_qry_idx, fld_rng_idx, fld_seq_idx, fld_page_id; private final Db_conn conn; public Rndm_seq_tbl(Db_conn conn) { this.conn = conn; - fld_qry_idx = flds.Add_int("qry_idx"); - fld_rng_idx = flds.Add_int("rng_idx"); - fld_seq_idx = flds.Add_int("seq_idx"); - fld_page_id = flds.Add_int("page_id"); + fld_qry_idx = flds.AddInt("qry_idx"); + fld_rng_idx = flds.AddInt("rng_idx"); + fld_seq_idx = flds.AddInt("seq_idx"); + fld_page_id = flds.AddInt("page_id"); } public Db_conn Conn() {return conn;} public String Tbl_name() {return tbl_name;} private final String tbl_name = "rndm_seq"; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public String Fld__qry_idx() {return fld_qry_idx;} public String Fld__rng_idx() {return fld_rng_idx;} public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} diff --git a/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java index 4e150d4fc..23f6927b1 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/core/Xosync_read_mgr.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.pages.syncs.core; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.pages.*; import gplx.xowa.addons.wikis.pages.syncs.*; +package gplx.xowa.addons.wikis.pages.syncs.core; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; -import gplx.xowa.htmls.*; import gplx.xowa.addons.wikis.pages.syncs.dbs.*; import gplx.xowa.apps.apis.xowa.addons.bldrs.*; import gplx.xowa.wikis.data.tbls.*; @@ -52,12 +51,12 @@ public class Xosync_read_mgr implements Gfo_invk { while (true) { // exit early... if (pages.Has(page_ttl.Full_db()) // ... if circular redirect; EX: A -> B -> A - || pages.Count() == 3) { // ... or too many redirects EX: A -> B -> C -> D + || pages.Len() == 3) { // ... or too many redirects EX: A -> B -> C -> D return rv; } // else, add to list of pages else { - pages.Add_as_key_and_val(page_ttl.Full_db()); + pages.AddAsKeyAndVal(page_ttl.Full_db()); } // skip if special @@ -100,7 +99,7 @@ public class Xosync_read_mgr implements Gfo_invk { sync_tbl.Upsert(parse_data.Page_id(), Datetime_now.Get()); // redirect occurred; EX: A -> B will have A,B in pages - if (pages.Count() > 1) { + if (pages.Len() > 1) { wiki.Data__core_mgr().Tbl__page().Update__redirect(parse_data.Page_id(), prv_page_id); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/dbs/Xosync_sync_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/dbs/Xosync_sync_tbl.java index 1c127bafb..c1cc96395 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/dbs/Xosync_sync_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/pages/syncs/dbs/Xosync_sync_tbl.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.pages.syncs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.pages.*; import gplx.xowa.addons.wikis.pages.syncs.*; +package gplx.xowa.addons.wikis.pages.syncs.dbs; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; public class Xosync_sync_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_page_id, fld_sync_date; private final Db_conn conn; public Xosync_sync_tbl(Db_conn conn) { this.conn = conn; - this.fld_page_id = flds.Add_int_pkey("page_id"); - this.fld_sync_date = flds.Add_str("sync_date", 32); + this.fld_page_id = flds.AddIntPkey("page_id"); + this.fld_sync_date = flds.AddStr("sync_date", 32); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = "sync"; diff --git a/400_xowa/src/gplx/xowa/addons/wikis/registrys/lists/Xow_list_html.java b/400_xowa/src/gplx/xowa/addons/wikis/registrys/lists/Xow_list_html.java index fe541447e..8524cc872 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/registrys/lists/Xow_list_html.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/registrys/lists/Xow_list_html.java @@ -1,22 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.registrys.lists; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.registrys.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.registrys.lists; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.langs.mustaches.*; import gplx.xowa.wikis.pages.*; import gplx.xowa.wikis.pages.tags.*; -import gplx.xowa.wikis.xwikis.*; -import gplx.xowa.users.data.*; +import gplx.xowa.users.data.*; class Xow_list_html extends Xow_special_wtr__base { @Override protected Io_url Get_addon_dir(Xoa_app app) {return app.Fsys_mgr().Http_root().GenSubDir_nest("bin", "any", "xowa", "addon", "wiki", "registry", "list");} @Override protected Io_url Get_mustache_fil(Io_url addon_dir) {return addon_dir.GenSubFil_nest("bin", "xow_list.mustache.html");} @@ -31,7 +30,7 @@ class Xow_list_html extends Xow_special_wtr__base { if (String_.Eq(site_itm.Domain(), gplx.xowa.wikis.domains.Xow_domain_itm_.Str__home)) continue; list.Add(new Xow_list_doc_wiki(Bry_.new_u8(site_itm.Domain()), site_itm.Date())); } - return new Xow_list_doc(gplx.xowa.addons.wikis.imports.Xow_import_special.Get_root_url(), (Xow_list_doc_wiki[])list.To_ary_and_clear(Xow_list_doc_wiki.class)); + return new Xow_list_doc(gplx.xowa.addons.wikis.imports.Xow_import_special.Get_root_url(), (Xow_list_doc_wiki[])list.ToAryAndClear(Xow_list_doc_wiki.class)); } @Override protected void Bld_tags(Xoa_app app, Io_url addon_dir, Xopage_html_data page_data) { Xopg_tag_mgr head_tags = page_data.Head_tags(); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_temp_tbl_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_temp_tbl_wkr.java index 8c6086663..f0e5490b1 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_temp_tbl_wkr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/Srch_temp_tbl_wkr.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.addons.wikis.searchs.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.addons.wikis.searchs.bldrs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.searchs.*; import gplx.dbs.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.addons.wikis.searchs.dbs.*; import gplx.xowa.addons.wikis.searchs.parsers.*; class Srch_temp_tbl_wkr implements Srch_text_parser_wkr { @@ -82,7 +83,7 @@ class Srch_temp_tbl_wkr implements Srch_text_parser_wkr { // dump everything into a temp table in order to index it page_conn.Meta_idx_create(Dbmeta_idx_itm.new_normal_by_tbl("page", "page_ns__page_id", "page_namespace", "page_id")); Srch_db_mgr.Optimize_unsafe_(word_conn, Bool_.Y); - word_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("search_link_temp", Dbmeta_fld_itm.new_int("word_id"), Dbmeta_fld_itm.new_int("page_id"), Dbmeta_fld_itm.new_int("page_namespace"))); + word_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("search_link_temp", DbmetaFldItm.NewInt("word_id"), DbmetaFldItm.NewInt("page_id"), DbmetaFldItm.NewInt("page_namespace"))); attach_mgr.Conn_main_(word_conn).Conn_links_(new Db_attach_itm("page_db", page_conn)); attach_mgr.Exec_sql_w_msg ( "filling search_link_temp (please wait)", String_.Concat_lines_nl_skip_last @@ -185,9 +186,9 @@ class Srch_temp_tbl_wkr implements Srch_text_parser_wkr { private static void Search_word__insert(Db_conn word_conn) { // fill search_word; need to insert into temp first b/c PRIMARY KEY on search_word will dramatically slow down insertion word_conn.Meta_tbl_create(Dbmeta_tbl_itm.New("search_word_temp" - , Dbmeta_fld_itm.new_int("word_id") - , Dbmeta_fld_itm.new_str("word_text", 255) - , Dbmeta_fld_itm.new_int("link_count") + , DbmetaFldItm.NewInt("word_id") + , DbmetaFldItm.NewStr("word_text", 255) + , DbmetaFldItm.NewInt("link_count") )); word_conn.Exec_sql_concat_w_msg ( "filling search_word_temp (please wait)" diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__link__link_score.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__link__link_score.java index 4d76f6d34..d776d6d37 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__link__link_score.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__link__link_score.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.bldrs.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.bldrs.*; +package gplx.xowa.addons.wikis.searchs.bldrs.cmds; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.searchs.*; import gplx.dbs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; import gplx.xowa.addons.bldrs.utils_rankings.bldrs.*; import gplx.xowa.addons.wikis.searchs.bldrs.cmds.adjustments.*; import gplx.xowa.addons.wikis.searchs.dbs.*; @@ -32,9 +33,9 @@ public class Xobldr__link__link_score extends Xob_cmd__base { Db_conn plink_conn = Db_conn_bldr.Instance.Get_or_autocreate(false, wiki.Fsys_mgr().Root_dir().GenSubFil(Xob_db_file.Name__page_link)); String page_rank_tbl = Xobldr__page__page_score.Pagerank__tbl_name; Gfo_usr_dlg_.Instance.Prog_none("", "", "search.page.score:adding fields to page_rank_temp"); - plink_conn.Meta_fld_assert(page_rank_tbl, "page_len_score" , Dbmeta_fld_tid.Itm__int, 0); - plink_conn.Meta_fld_assert(page_rank_tbl, "page_rank_score" , Dbmeta_fld_tid.Itm__double, 0); - plink_conn.Meta_fld_assert(page_rank_tbl, "page_score" , Dbmeta_fld_tid.Itm__int, 0); + plink_conn.Meta_fld_assert(page_rank_tbl, "page_len_score" , DbmetaFldType.ItmInt, 0); + plink_conn.Meta_fld_assert(page_rank_tbl, "page_rank_score" , DbmetaFldType.ItmDouble, 0); + plink_conn.Meta_fld_assert(page_rank_tbl, "page_score" , DbmetaFldType.ItmInt, 0); int link_score_max = Srch_search_addon.Score_max; // percentize page_len_score to 0 : 100,000,000; NOTE: 100,000,000 so that no individual score should have 2+ page; i.e.: score_range > page_count @@ -56,7 +57,7 @@ public class Xobldr__link__link_score extends Xob_cmd__base { double page_rank_max = plink_conn.Exec_select_as_double("SELECT Max(page_rank) FROM " + page_rank_tbl, Double_.MinValue); if (page_rank_max == Double_.MinValue) throw Err_.new_("bldr", "failed to get max; tbl=~{0}", page_rank_tbl); double page_rank_rng = page_rank_max - page_rank_min; if (page_rank_rng == 0) page_rank_rng = 1; // if 0, set to 1 to prevent divide by 0 below; - String score_multiplier_as_str = Dbmeta_fld_itm.To_double_str_by_int(score_multiplier); + String score_multiplier_as_str = DbmetaFldItm.ToDoubleStrByInt(score_multiplier); // normalize page_rank to 0 : 100,000,000 plink_conn.Exec_sql @@ -95,8 +96,8 @@ public class Xobldr__link__link_score extends Xob_cmd__base { // update page table Xowd_page_tbl page_tbl = wiki.Data__core_mgr().Tbl__page(); Db_conn page_conn = page_tbl.Conn(); - if (page_tbl.Fld_page_score() == Dbmeta_fld_itm.Key_null) { - page_conn.Meta_fld_append(page_tbl.Tbl_name(), Dbmeta_fld_itm.new_int(Xowd_page_tbl.Fld__page_score__key).Default_(0)); + if (page_tbl.Fld_page_score() == DbmetaFldItm.KeyNull) { + page_conn.Meta_fld_append(page_tbl.Tbl_name(), DbmetaFldItm.NewInt(Xowd_page_tbl.Fld__page_score__key).DefaultValSet(0)); page_tbl = wiki.Data__core_mgr().Db__core().Tbl__page__rebind(); } new Db_attach_mgr(page_conn, new Db_attach_itm("plink_db", plink_conn)) @@ -110,12 +111,12 @@ public class Xobldr__link__link_score extends Xob_cmd__base { Srch_word_tbl word_tbl = search_db_mgr.Tbl__word(); if (!page_tbl.Conn().Eq(word_tbl.conn)) page_tbl.Conn().Env_vacuum(); // don't vacuum if single-db // Srch_db_mgr.Optimize_unsafe_(word_tbl.conn, Bool_.Y); - word_tbl.conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("link_score_mnx", Dbmeta_fld_itm.new_int("word_id"), Dbmeta_fld_itm.new_int("mnx_val"))); + word_tbl.conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("link_score_mnx", DbmetaFldItm.NewInt("word_id"), DbmetaFldItm.NewInt("mnx_val"))); int link_tbls_len = search_db_mgr.Tbl__link__len(); for (int i = 0; i < link_tbls_len; ++i) { Srch_link_tbl link_tbl = search_db_mgr.Tbl__link__get_at(i); // update search_link.link_score - link_tbl.conn.Meta_fld_assert(link_tbl.Tbl_name(), Srch_link_tbl.Fld_link_score, Dbmeta_fld_tid.Itm__int, 0); + link_tbl.conn.Meta_fld_assert(link_tbl.Tbl_name(), Srch_link_tbl.Fld_link_score, DbmetaFldType.ItmInt, 0); new Db_attach_mgr(link_tbl.conn , new Db_attach_itm("page_db", page_conn) ).Exec_sql_w_msg diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__page__page_score.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__page__page_score.java index c2c473348..2763dcb93 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__page__page_score.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/Xobldr__page__page_score.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.bldrs.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.bldrs.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; -import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.addons.bldrs.wmdumps.pagelinks.dbs.*; +package gplx.xowa.addons.wikis.searchs.bldrs.cmds; import gplx.*; import gplx.xowa.*; +import gplx.dbs.*; +import gplx.xowa.addons.bldrs.wmdumps.pagelinks.dbs.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; public class Xobldr__page__page_score extends Xob_cmd__base implements Xob_cmd { // create page_rank in page_db; drop and vaccuum later; avoid cross db for now private double damping_factor = .85; @@ -41,13 +41,13 @@ public class Xobldr__page__page_score extends Xob_cmd__base implements Xob_cmd { if (!plink_conn.Meta_tbl_exists(plink_tbl.Tbl_name())) plink_tbl.Create_tbl();// create page_link if it doesn't exist; occurs when page_rank_enabled == false; plink_conn.Meta_tbl_create(Dbmeta_tbl_itm.New ( Pagerank__tbl_name - , Dbmeta_fld_itm.new_int (Pagerank__fld_page_id).Primary_y_() - , Dbmeta_fld_itm.new_int (Pagerank__fld_link_count) - , Dbmeta_fld_itm.new_int (Pagerank__fld_has_converged).Default_(0) - , Dbmeta_fld_itm.new_double (Pagerank__fld_page_rank).Default_(1) - , Dbmeta_fld_itm.new_int ("page_namespace").Default_(Int_.Min_value) - , Dbmeta_fld_itm.new_byte ("page_is_redirect").Default_(0) - , Dbmeta_fld_itm.new_int ("page_len").Default_(0) + , DbmetaFldItm.NewInt(Pagerank__fld_page_id).PrimarySetY() + , DbmetaFldItm.NewInt(Pagerank__fld_link_count) + , DbmetaFldItm.NewInt(Pagerank__fld_has_converged).DefaultValSet(0) + , DbmetaFldItm.NewDouble(Pagerank__fld_page_rank).DefaultValSet(1) + , DbmetaFldItm.NewInt("page_namespace").DefaultValSet(Int_.Min_value) + , DbmetaFldItm.NewByte("page_is_redirect").DefaultValSet(0) + , DbmetaFldItm.NewInt("page_len").DefaultValSet(0) )); new Db_attach_mgr(plink_conn, new Db_attach_itm("page_db", page_conn)) diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Adjustment_cmd.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Adjustment_cmd.java index 1a478d243..deb80aea3 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Adjustment_cmd.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Adjustment_cmd.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.bldrs.cmds.adjustments; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.bldrs.*; import gplx.xowa.addons.wikis.searchs.bldrs.cmds.*; +package gplx.xowa.addons.wikis.searchs.bldrs.cmds.adjustments; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.searchs.bldrs.cmds.*; import gplx.dbs.*; import gplx.xowa.bldrs.*; import gplx.xowa.wikis.nss.*; public class Adjustment_cmd implements Gfo_invk { @@ -34,16 +35,16 @@ public class Adjustment_cmd implements Gfo_invk { // add fields to page_rank_tbl String page_rank_tbl = Xobldr__page__page_score.Pagerank__tbl_name; - pl_conn.Meta_fld_assert(page_rank_tbl, "score_old" , Dbmeta_fld_tid.Itm__int, 0); - pl_conn.Meta_fld_assert(page_rank_tbl, "len_avg" , Dbmeta_fld_tid.Itm__int, 0); + pl_conn.Meta_fld_assert(page_rank_tbl, "score_old" , DbmetaFldType.ItmInt, 0); + pl_conn.Meta_fld_assert(page_rank_tbl, "len_avg" , DbmetaFldType.ItmInt, 0); // create penalty summary tbl pl_conn.Meta_tbl_remake(Dbmeta_tbl_itm.New("penalty_summary" - , Dbmeta_fld_itm.new_int("page_ns") - , Dbmeta_fld_itm.new_int("score_bgn") - , Dbmeta_fld_itm.new_int("score_end") - , Dbmeta_fld_itm.new_int("len_avg") - , Dbmeta_fld_itm.new_int("page_count") + , DbmetaFldItm.NewInt("page_ns") + , DbmetaFldItm.NewInt("score_bgn") + , DbmetaFldItm.NewInt("score_end") + , DbmetaFldItm.NewInt("len_avg") + , DbmetaFldItm.NewInt("page_count") )); Db_stmt summary_stmt = pl_conn.Stmt_insert("penalty_summary", "page_ns", "score_bgn", "score_end", "len_avg", "page_count"); Db_stmt detail_stmt = pl_conn.Stmt_update(page_rank_tbl, String_.Ary("page_id"), "page_score", "score_old", "len_avg"); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Page_matcher_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Page_matcher_wkr.java index d10726000..d8088442e 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Page_matcher_wkr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/bldrs/cmds/adjustments/Page_matcher_wkr.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.bldrs.cmds.adjustments; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.bldrs.*; import gplx.xowa.addons.wikis.searchs.bldrs.cmds.*; +package gplx.xowa.addons.wikis.searchs.bldrs.cmds.adjustments; import gplx.*; import gplx.xowa.*; import gplx.core.lists.hashs.*; import gplx.core.primitives.*; -import gplx.dbs.*; import gplx.xowa.wikis.data.tbls.*; +import gplx.dbs.*; class Page_matcher_wkr implements Gfo_invk {// NOTE: tries would use less memory, but would be slower, especially for Has*() private final Xow_wiki wiki; private final List_adp rule_list = List_adp_.New(); @@ -51,7 +51,7 @@ class Page_matcher_wkr implements Gfo_invk {// NOTE: tries would use less memory page_hash.Add_if_dupe_use_nth(page_id, itm); } } finally {rdr.Rls();} - itm.Page_ids = (Int_obj_ref[])page_ids.To_ary_and_clear(Int_obj_ref.class); + itm.Page_ids = (Int_obj_ref[])page_ids.ToAryAndClear(Int_obj_ref.class); stmt.Rls(); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java index d3fede8a6..4b2dd3765 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_db_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.dbs.cfgs.*; import gplx.xowa.wikis.data.*; public class Srch_db_mgr { @@ -50,7 +50,7 @@ public class Srch_db_mgr { tbl__link__ary = new Srch_link_tbl[1]; Tbl__link__ary__set(tbl__link__ary, 0, word_db.Conn()); } else { // v3 file layout where search_link is in many db - int dbs_len = hash.Count(); + int dbs_len = hash.Len(); tbl__link__ary = new Srch_link_tbl[dbs_len]; for (int i = 0; i < dbs_len; ++i) { Xow_db_file db_file = (Xow_db_file)hash.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_reg_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_reg_tbl.java index dbb6c247c..0118f706e 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_reg_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_reg_tbl.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.dbs.*; public class Srch_link_reg_tbl implements Rls_able { - private final String tbl_name; public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name; public final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_db_id, fld_db_type, fld_ns_ids, fld_sub_id, fld_score_min, fld_score_max; private final Db_conn conn; public Srch_link_reg_tbl(Db_conn conn) { this.conn = conn; tbl_name = Tbl_name; - fld_id = flds.Add_int_pkey ("reg_id"); // corresponds to link_tbl_ary_idx - fld_db_id = flds.Add_int ("reg_db_id"); // corresponds to xowa_db - fld_db_type = flds.Add_int ("reg_db_type"); // "title"; "text" - fld_ns_ids = flds.Add_int ("reg_ns_ids"); // "0"; "*" - fld_sub_id = flds.Add_int ("reg_sub_id"); // "0"; "*" - fld_score_min = flds.Add_int ("reg_score_min"); // -1 - fld_score_max = flds.Add_int ("reg_score_max"); // -1 + fld_id = flds.AddIntPkey("reg_id"); // corresponds to link_tbl_ary_idx + fld_db_id = flds.AddInt("reg_db_id"); // corresponds to xowa_db + fld_db_type = flds.AddInt("reg_db_type"); // "title"; "text" + fld_ns_ids = flds.AddInt("reg_ns_ids"); // "0"; "*" + fld_sub_id = flds.AddInt("reg_sub_id"); // "0"; "*" + fld_score_min = flds.AddInt("reg_score_min"); // -1 + fld_score_max = flds.AddInt("reg_score_max"); // -1 } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public void Rls() {} diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_tbl.java index 04568af29..4cf222533 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_link_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.dbs.*; public class Srch_link_tbl { public final String fld_word_id, fld_page_id, fld_link_score; @@ -21,12 +21,12 @@ public class Srch_link_tbl { public Srch_link_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "search_link"; - fld_word_id = flds.Add_int("word_id"); - fld_page_id = flds.Add_int("page_id"); - fld_link_score = flds.Add_int_dflt(Fld_link_score, 0); + fld_word_id = flds.AddInt("word_id"); + fld_page_id = flds.AddInt("page_id"); + fld_link_score = flds.AddIntDflt(Fld_link_score, 0); } public String Tbl_name() {return tbl_name;} private final String tbl_name; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public int Id; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public void Create_idx__page_id() {} // TODO_OLD: conn.Meta_idx_create(Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "page_id", fld_page_id));} diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_temp_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_temp_tbl.java index a82267010..3c59ff5b6 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_temp_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_temp_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.dbs; import gplx.xowa.*; import gplx.dbs.*; public class Srch_temp_tbl { public final String tbl_name = "search_temp"; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_word_id, fld_page_id, fld_word_text; public final Db_conn conn; private Db_stmt stmt_insert; public Srch_temp_tbl(Db_conn conn) { this.conn = conn; - flds.Add_int_pkey_autonum("word_uid"); - fld_word_id = flds.Add_int("word_id"); - fld_page_id = flds.Add_int("page_id"); - fld_word_text = flds.Add_str("word_text", 255); + flds.AddIntPkeyAutonum("word_uid"); + fld_word_id = flds.AddInt("word_id"); + fld_page_id = flds.AddInt("page_id"); + fld_word_text = flds.AddStr("word_text", 255); } public void Insert_bgn() { conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds)); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java index 3e6f805ad..db059577a 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/dbs/Srch_word_tbl.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.dbs; import gplx.*; import gplx.dbs.*; public class Srch_word_tbl implements Rls_able { public final String tbl_name; - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld_id, fld_text, fld_link_count, fld_link_count_score, fld_link_score_min, fld_link_score_max; public final Db_conn conn; private Db_stmt stmt_insert, stmt_select_by; public Srch_word_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = TABLE_NAME; - this.fld_id = flds.Add_int_pkey("word_id"); - this.fld_text = flds.Add_str("word_text", 255); - this.fld_link_count = flds.Add_int("link_count"); - this.fld_link_count_score = Dbmeta_fld_itm.Make_or_null(conn, flds, tbl_name, Dbmeta_fld_tid.Tid__int, 0, "link_count_score"); - this.fld_link_score_min = Dbmeta_fld_itm.Make_or_null(conn, flds, tbl_name, Dbmeta_fld_tid.Tid__int, Int_.Max_value__31, "link_score_min"); - this.fld_link_score_max = Dbmeta_fld_itm.Make_or_null(conn, flds, tbl_name, Dbmeta_fld_tid.Tid__int, 0, "link_score_max"); + this.fld_id = flds.AddIntPkey("word_id"); + this.fld_text = flds.AddStr("word_text", 255); + this.fld_link_count = flds.AddInt("link_count"); + this.fld_link_count_score = DbmetaFldItm.Make_or_null(conn, flds, tbl_name, DbmetaFldType.TidInt, 0, "link_count_score"); + this.fld_link_score_min = DbmetaFldItm.Make_or_null(conn, flds, tbl_name, DbmetaFldType.TidInt, Int_.Max_value__31, "link_score_min"); + this.fld_link_score_max = DbmetaFldItm.Make_or_null(conn, flds, tbl_name, DbmetaFldType.TidInt, 0, "link_score_max"); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} @@ -57,11 +57,11 @@ public class Srch_word_tbl implements Rls_able { finally {rdr.Rls();} } public Srch_word_row New_row(Db_rdr rdr) { - int page_count = fld_link_count == Dbmeta_fld_itm.Key_null ? 0 : rdr.Read_int(fld_link_count); - int link_score_min = fld_link_score_min == Dbmeta_fld_itm.Key_null ? page_count : rdr.Read_int(fld_link_score_min); - int link_score_max = fld_link_score_max == Dbmeta_fld_itm.Key_null ? page_count : rdr.Read_int(fld_link_score_max); + int page_count = fld_link_count == DbmetaFldItm.KeyNull ? 0 : rdr.Read_int(fld_link_count); + int link_score_min = fld_link_score_min == DbmetaFldItm.KeyNull ? page_count : rdr.Read_int(fld_link_score_min); + int link_score_max = fld_link_score_max == DbmetaFldItm.KeyNull ? page_count : rdr.Read_int(fld_link_score_max); int link_count_score = 0; - if (fld_link_count_score != Dbmeta_fld_itm.Key_null) { + if (fld_link_count_score != DbmetaFldItm.KeyNull) { try {link_count_score = rdr.Read_int(fld_link_count_score);} catch (Exception e) {// handle 2016-05 and earlier wikis which stored value as double instead of int Err_.Noop(e); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/parsers/Srch_word_hash.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/parsers/Srch_word_hash.java index 884b5c894..e339cc6ff 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/parsers/Srch_word_hash.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/parsers/Srch_word_hash.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.parsers; import gplx.*; public class Srch_word_hash { private final Ordered_hash hash = Ordered_hash_.New_bry(); public void Clear() {hash.Clear();} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public boolean Has(byte[] word) {return hash.Has(word);} public Srch_word_itm Get_at(int i) {return (Srch_word_itm)hash.Get_at(i);} public void Add(byte[] word) { - Srch_word_itm itm = (Srch_word_itm)hash.Get_by(word); + Srch_word_itm itm = (Srch_word_itm)hash.GetByOrNull(word); if (itm == null) { itm = new Srch_word_itm(word); hash.Add(word, itm); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_ns_mgr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_ns_mgr.java index 3d20772b0..91ff65ed7 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_ns_mgr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/Srch_ns_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.searchers; import gplx.*; +import gplx.xowa.addons.wikis.searchs.*; import gplx.core.primitives.*; import gplx.xowa.wikis.nss.*; public class Srch_ns_mgr { @@ -31,10 +32,10 @@ public class Srch_ns_mgr { || ns_hash.Has(tmp_ns_id.Val_(ns_id)); // ns_hash returns true if has ns_id } public void Add_all() {ns_all = true;} - public Srch_ns_mgr Add_main_if_empty() {if (ns_hash.Count() == 0) ns_main = true; return this;} + public Srch_ns_mgr Add_main_if_empty() {if (ns_hash.Len() == 0) ns_main = true; return this;} public void Add_by_id(int ns_id) { if (ns_hash.Has(tmp_ns_id.Val_(ns_id))) ns_hash.Del(tmp_ns_id); - ns_hash.Add_as_key_and_val(Int_obj_ref.New(ns_id)); + ns_hash.AddAsKeyAndVal(Int_obj_ref.New(ns_id)); } public void Add_by_name(byte[] ns_name) { int id = Xow_ns_canonical_.To_id(ns_name); @@ -60,7 +61,7 @@ public class Srch_ns_mgr { if (ns_all) return Hash_key_all; else if (ns_main) return Hash_key_main; else { - int ns_hash_len = ns_hash.Count(); + int ns_hash_len = ns_hash.Len(); for (int i = 0; i < ns_hash_len; i++) { if (i != 0) tmp_bfr.Add_byte_semic(); Int_obj_ref ns_id_ref = (Int_obj_ref)ns_hash.Get_at(i); @@ -84,7 +85,7 @@ public class Srch_ns_mgr { if (ns_all) return Int_ary_.Empty; else if (ns_main) return Int_ary_.New(Xow_ns_.Tid__main); else { - int len = ns_hash.Count(); + int len = ns_hash.Len(); int[] rv = new int[len]; for (int i = 0; i < len; i++) { Int_obj_ref ns_id_ref = (Int_obj_ref)ns_hash.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_parser.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_parser.java index 2ea6112e0..87ff1e7e0 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_parser.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; +package gplx.xowa.addons.wikis.searchs.searchers.crts; import gplx.*; import gplx.xowa.addons.wikis.searchs.searchers.crts.visitors.*; public class Srch_crt_parser { private final Srch_crt_scanner scanner; @@ -130,7 +130,7 @@ class Srch_crt_parser_frame { join_tid = Srch_crt_tkn.Tid__null; return (Srch_crt_itm)subs.Get_at(0); default: - Srch_crt_itm[] subs_ary = (Srch_crt_itm[])subs.To_ary_and_clear(Srch_crt_itm.class); + Srch_crt_itm[] subs_ary = (Srch_crt_itm[])subs.ToAryAndClear(Srch_crt_itm.class); Srch_crt_itm rv = Srch_crt_itm.New_join(join_tid, parser.Next_uid(), subs_ary); join_tid = Srch_crt_tkn.Tid__null; return rv; diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_scanner.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_scanner.java index 0161b292a..c42036867 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_scanner.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/Srch_crt_scanner.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; -import gplx.core.btries.*; import gplx.xowa.langs.cases.*; -import gplx.xowa.addons.wikis.searchs.parsers.*; +package gplx.xowa.addons.wikis.searchs.searchers.crts; import gplx.*; +import gplx.core.btries.*; class Srch_crt_scanner { private final List_adp tkns = List_adp_.New(); private byte[] src; private int src_len, pos, txt_bgn; private final Srch_crt_scanner_syms trie_bldr; private final Btrie_slim_mgr trie; private final Btrie_rv trv = new Btrie_rv(); @@ -113,7 +112,7 @@ class Srch_crt_scanner { if (txt_bgn != -1) { // pending word; create Add_word(Srch_crt_tkn.Tid__word, txt_bgn, pos); } - return (Srch_crt_tkn[])tkns.To_ary_and_clear(Srch_crt_tkn.class); + return (Srch_crt_tkn[])tkns.ToAryAndClear(Srch_crt_tkn.class); } private void Add_word(byte tid, int src_bgn, int src_end) { // generate word_bry diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/visitors/Srch_crt_visitor__words.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/visitors/Srch_crt_visitor__words.java index f37a8cdfb..5c18cd9c2 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/visitors/Srch_crt_visitor__words.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/crts/visitors/Srch_crt_visitor__words.java @@ -13,18 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.crts.visitors; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.xowa.addons.wikis.searchs.searchers.crts.*; +package gplx.xowa.addons.wikis.searchs.searchers.crts.visitors; import gplx.*; +import gplx.xowa.addons.wikis.searchs.searchers.crts.*; public class Srch_crt_visitor__words implements Srch_crt_visitor { private final List_adp words_list = List_adp_.New(); public byte Words_tid() {return words_tid;} private byte words_tid; public Srch_crt_itm Words_nth() {return words_nth;} private Srch_crt_itm words_nth; - public Srch_crt_itm[] Words_ary() {return (Srch_crt_itm[])words_list.To_ary_and_clear(Srch_crt_itm.class);} + public Srch_crt_itm[] Words_ary() {return (Srch_crt_itm[])words_list.ToAryAndClear(Srch_crt_itm.class);} public void Gather(Srch_crt_itm root) { words_list.Clear(); words_tid = Srch_crt_mgr.Tid__ands; words_nth = null; Visit(root); - if (words_list.Count() == 1) + if (words_list.Len() == 1) words_tid = Srch_crt_mgr.Tid__one; } public void Visit(Srch_crt_itm itm) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_cache.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_cache.java index f5b5a49dc..103753a49 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_cache.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_cache.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.rslts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; +package gplx.xowa.addons.wikis.searchs.searchers.rslts; import gplx.*; public class Srch_rslt_cache { private final Hash_adp_bry hash = Hash_adp_bry.cs(); public void Clear() {hash.Clear();} public Srch_rslt_list Get_or_new(byte[] key) { - Srch_rslt_list rv = (Srch_rslt_list)hash.Get_by(key); + Srch_rslt_list rv = (Srch_rslt_list)hash.GetByOrNull(key); if (rv == null) { rv = new Srch_rslt_list(); hash.Add(key, rv); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_list.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_list.java index 0325ab365..a8dd6b36e 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_list.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/rslts/Srch_rslt_list.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.rslts; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; +package gplx.xowa.addons.wikis.searchs.searchers.rslts; import gplx.*; import gplx.core.lists.hashs.*; public class Srch_rslt_list { private final Ordered_hash key_hash = Ordered_hash_.New_bry(); @@ -25,7 +25,7 @@ public class Srch_rslt_list { public boolean Rslts_are_done; public int Len() {return key_hash.Len();} public boolean Has(byte[] key) {return key_hash.Has(key);} - public Srch_rslt_row Get_by(byte[] key) {return (Srch_rslt_row)key_hash.Get_by(key);} + public Srch_rslt_row Get_by(byte[] key) {return (Srch_rslt_row)key_hash.GetByOrNull(key);} public Srch_rslt_row Get_at(int i) {return (Srch_rslt_row)key_hash.Get_at(i);} public void Clear() {key_hash.Clear(); id_hash.Clear();} public void Add(Srch_rslt_row row) {key_hash.Add(row.Key, row);} diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/slabs/Srch_slab_itm_parser.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/slabs/Srch_slab_itm_parser.java index e70c4e8d8..41b489326 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/slabs/Srch_slab_itm_parser.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/slabs/Srch_slab_itm_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.slabs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; +package gplx.xowa.addons.wikis.searchs.searchers.slabs; import gplx.*; import gplx.core.brys.*; public class Srch_slab_itm_parser { private final List_adp itm_list = List_adp_.New(); @@ -27,6 +27,6 @@ public class Srch_slab_itm_parser { Srch_slab_itm itm = new Srch_slab_itm(wiki, bgn, end); itm_list.Add(itm); } - return (Srch_slab_itm[])itm_list.To_ary_and_clear(Srch_slab_itm.class); + return (Srch_slab_itm[])itm_list.ToAryAndClear(Srch_slab_itm.class); } } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java index 9a31039eb..b7e486802 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.wkrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; +package gplx.xowa.addons.wikis.searchs.searchers.wkrs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.dbs.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.addons.wikis.searchs.dbs.*; import gplx.xowa.addons.wikis.searchs.searchers.crts.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*; import gplx.dbs.percentiles.*; -import gplx.xowa.langs.cases.*; import gplx.xowa.addons.wikis.searchs.parsers.*; +import gplx.xowa.addons.wikis.searchs.searchers.crts.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*; import gplx.dbs.percentiles.*; public class Srch_link_wkr extends Percentile_select_base { private final Srch_link_wkr_sql sql_mkr = new Srch_link_wkr_sql(); private final Db_attach_mgr attach_mgr = new Db_attach_mgr(); @@ -124,7 +124,7 @@ public class Srch_link_wkr extends Percentile_select_base { this.cur_row = ctx.Cache__page.Get_by(key); // note that page could have been added from another word if (cur_row == null) { int page_len = rdr.Read_int(page_tbl.Fld_page_len()); - int page_score = page_tbl.Fld_page_score() == Dbmeta_fld_itm.Key_null ? page_len : rdr.Read_int(page_tbl.Fld_page_score()); + int page_score = page_tbl.Fld_page_score() == DbmetaFldItm.KeyNull ? page_len : rdr.Read_int(page_tbl.Fld_page_score()); int page_ns_id = rdr.Read_int(page_tbl.Fld_page_ns()); byte[] page_ttl_wo_ns = rdr.Read_bry_by_str(page_tbl.Fld_page_title()); Xoa_ttl page_ttl = ctx.Wiki.Ttl_parse(page_ns_id, page_ttl_wo_ns); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_.java index 32654bae2..173d208ee 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/searchers/wkrs/Srch_link_wkr_.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.searchers.wkrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.addons.wikis.searchs.searchers.*; +package gplx.xowa.addons.wikis.searchs.searchers.wkrs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.xowa.addons.wikis.searchs.parsers.*; import gplx.xowa.langs.cases.*; import gplx.xowa.addons.wikis.searchs.dbs.*; import gplx.xowa.addons.wikis.searchs.searchers.crts.*; class Srch_link_wkr_ { @@ -63,9 +64,9 @@ class Srch_link_wkr_ { Srch_word_row word_row = ctx.Tbl__word.Select_or_empty(word); if (word_row == Srch_word_row.Empty) continue; tmp_list.Add(word_row); } - if (tmp_list.Count() == 0) return null; // no words exist in db; EX: "xyz1 xyz2" - tmp_list.Sort_by(Srch_word_row_sorter__link_count.Desc); - Srch_word_row[] rows = (Srch_word_row[])tmp_list.To_ary_and_clear(Srch_word_row.class); + if (tmp_list.Len() == 0) return null; // no words exist in db; EX: "xyz1 xyz2" + tmp_list.SortBy(Srch_word_row_sorter__link_count.Desc); + Srch_word_row[] rows = (Srch_word_row[])tmp_list.ToAryAndClear(Srch_word_row.class); return rows; } private static int Find_sql_root__ands(Srch_search_ctx ctx, Srch_word_tbl word_tbl, Srch_crt_itm sub) { diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_page.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_page.java index e4edb5868..b0d28ce78 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_page.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_page.java @@ -13,11 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; -import gplx.core.primitives.*; import gplx.xowa.addons.wikis.searchs.specials.*; -import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.domains.crts.*; -import gplx.xowa.specials.*; import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.xowa.addons.wikis.searchs.searchers.cbks.*; -import gplx.xowa.addons.wikis.searchs.gui.htmlbars.*; +package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.xowa.*; +import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.domains.crts.*; +import gplx.xowa.specials.*; import gplx.xowa.addons.wikis.searchs.searchers.*; public class Srch_special_page implements Xow_special_page { public Xow_special_meta Special__meta() {return Xow_special_meta_.Itm__search;} public void Special__gen(Xow_wiki wikii, Xoa_page pagei, Xoa_url url, Xoa_ttl ttl) { @@ -93,7 +91,7 @@ public class Srch_special_page implements Xow_special_page { Xow_domain_itm domain_itm = Xow_domain_itm_.parse(xwiki.Domain_bry()); if (crt.Matches(cur, domain_itm)) rv.Add(domain_itm); } - return (Xow_domain_itm[])rv.To_ary_and_clear(Xow_domain_itm.class); + return (Xow_domain_itm[])rv.ToAryAndClear(Xow_domain_itm.class); } private static Xow_domain_itm[] Get_domains(Xoae_app app, Srch_special_cfg cfg, Xow_domain_itm wiki_domain) { Xow_domain_crt_itm crt = cfg.Multi_wikis_crt(wiki_domain); diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_searcher.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_searcher.java index 1d11b7132..b4df1d9d4 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_searcher.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Srch_special_searcher.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.xowa.*; +import gplx.xowa.addons.wikis.searchs.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.addons.wikis.searchs.searchers.*; import gplx.xowa.addons.wikis.searchs.specials.htmls.*; import gplx.xowa.addons.wikis.searchs.searchers.rslts.*; public class Srch_special_searcher { @@ -54,7 +55,7 @@ public class Srch_special_searcher { cancel_hash.Del(cmd.key); } public void Search__cancel(byte[] cmd_key) { - Srch_special_cmd cmd = (Srch_special_cmd)cancel_hash.Get_by(cmd_key); // if (cmd == null) return; // ignore false calls to cancel + Srch_special_cmd cmd = (Srch_special_cmd)cancel_hash.GetByOrNull(cmd_key); // if (cmd == null) return; // ignore false calls to cancel cmd.On_cancel(); cancel_hash.Del(cmd.key); } diff --git a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Xow_domain_sorter__manual.java b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Xow_domain_sorter__manual.java index 4b65ff300..2cbb9299c 100644 --- a/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Xow_domain_sorter__manual.java +++ b/400_xowa/src/gplx/xowa/addons/wikis/searchs/specials/Xow_domain_sorter__manual.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.*; import gplx.xowa.addons.wikis.*; import gplx.xowa.addons.wikis.searchs.*; +package gplx.xowa.addons.wikis.searchs.specials; import gplx.*; import gplx.core.primitives.*; import gplx.xowa.langs.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.domains.crts.*; public class Xow_domain_sorter__manual implements gplx.core.lists.ComparerAble { @@ -55,7 +55,7 @@ class Xow_domain_sorter__manual_tid implements gplx.core.lists.ComparerAble { int len = id_ary.length; for (int i = 0; i < len; ++i) { int id_itm = id_ary[i]; - sort_hash.Add_if_dupe_use_nth(Int_obj_ref.New(id_itm), Int_obj_ref.New(i)); + sort_hash.AddIfDupeUseNth(Int_obj_ref.New(id_itm), Int_obj_ref.New(i)); } } public int compare(Object lhsObj, Object rhsObj) { @@ -69,7 +69,7 @@ class Xow_domain_sorter__manual_tid implements gplx.core.lists.ComparerAble { else return Bry_.Compare(Xow_domain_tid_.Get_type_as_bry(lhs.Domain_type_id()), Xow_domain_tid_.Get_type_as_bry(rhs.Domain_type_id())); } private int Get_sort_idx_or_neg1(int tid) { - Object o = sort_hash.Get_by(sort_key.Val_(tid)); + Object o = sort_hash.GetByOrNull(sort_key.Val_(tid)); return o == null ? -1 : ((Int_obj_ref)o).Val(); } public static Xow_domain_sorter__manual_tid new_(byte[]... id_brys) { @@ -89,7 +89,7 @@ class Xow_domain_sorter__manual_lang implements gplx.core.lists.ComparerAble { int len = id_ary.length; for (int i = 0; i < len; ++i) { int id_int = id_ary[i]; - sort_hash.Add_if_dupe_use_nth(Int_obj_ref.New(id_int), Int_obj_ref.New(i)); + sort_hash.AddIfDupeUseNth(Int_obj_ref.New(id_int), Int_obj_ref.New(i)); } } public int compare(Object lhsObj, Object rhsObj) { @@ -103,7 +103,7 @@ class Xow_domain_sorter__manual_lang implements gplx.core.lists.ComparerAble { else return Bry_.Compare(lhs.Lang_actl_key(), rhs.Lang_actl_key()); } private int Get_sort_idx_or_neg1(int tid) { - Object o = sort_hash.Get_by(sort_key.Val_(tid)); + Object o = sort_hash.GetByOrNull(sort_key.Val_(tid)); return o == null ? -1 : ((Int_obj_ref)o).Val(); } public static Xow_domain_sorter__manual_lang new_(byte[]... id_brys) { diff --git a/400_xowa/src/gplx/xowa/apps/Xoa_app_mode.java b/400_xowa/src/gplx/xowa/apps/Xoa_app_mode.java index da73202f2..df4b7ed07 100644 --- a/400_xowa/src/gplx/xowa/apps/Xoa_app_mode.java +++ b/400_xowa/src/gplx/xowa/apps/Xoa_app_mode.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.apps; import gplx.*; import gplx.xowa.*; +package gplx.xowa.apps; import gplx.*; import gplx.core.primitives.*; public class Xoa_app_mode { Xoa_app_mode(int tid) {this.tid = tid;} @@ -50,7 +50,7 @@ public class Xoa_app_mode { .Add_bry_int(Key_file , Tid_file) ; public static Xoa_app_mode parse(String s) { - Object o = type_hash.Get_by(Bry_.new_u8(s)); if (o == null) return Itm_cmd; // default to cmd as per early behaviour; handles mistaken "--app_mode wrong" + Object o = type_hash.GetByOrNull(Bry_.new_u8(s)); if (o == null) return Itm_cmd; // default to cmd as per early behaviour; handles mistaken "--app_mode wrong" int tid = ((Int_obj_val)o).Val(); switch (tid) { case Tid_cmd: return Itm_cmd; diff --git a/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java b/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java index c07c36506..260f18ae8 100644 --- a/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java +++ b/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.apps; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; public class Xoa_sys_cfg implements Gfo_invk { @@ -63,10 +63,10 @@ class Options_list_lang_ { if (translated.Has(itm.Key())) continue; untranslated.Add(itm); } - untranslated.Sort_by(Xol_lang_stub_.Comparer_key); + untranslated.SortBy(Xol_lang_stub_.Comparer_key); Keyval[] rv = new Keyval[len]; - int translated_max = translated.Count(); + int translated_max = translated.Len(); for (int i = 0; i < translated_max; i++) rv[i] = new_itm((Xol_lang_stub)translated.Get_at(i)); @@ -83,7 +83,7 @@ class Options_list_lang_ { int langs_len = langs.length; for (int i = 0; i < langs_len; i++) { Xol_lang_stub itm = Xol_lang_stub_.Get_by_id(langs[i]); - translated.Add_if_dupe_use_nth(itm.Key(), itm); + translated.AddIfDupeUseNth(itm.Key(), itm); } } } diff --git a/400_xowa/src/gplx/xowa/apps/Xoav_wiki_mgr.java b/400_xowa/src/gplx/xowa/apps/Xoav_wiki_mgr.java index 3514be2eb..36f5fdda9 100644 --- a/400_xowa/src/gplx/xowa/apps/Xoav_wiki_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/Xoav_wiki_mgr.java @@ -14,22 +14,22 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.apps; import gplx.*; import gplx.xowa.*; -import gplx.xowa.*; import gplx.xowa.langs.cases.*; import gplx.xowa.users.data.*; +import gplx.xowa.langs.cases.*; import gplx.xowa.users.data.*; import gplx.xowa.wikis.*; public class Xoav_wiki_mgr implements Xoa_wiki_mgr { private final Xoav_app app; private final Ordered_hash hash = Ordered_hash_.New_bry(); public Xoav_wiki_mgr(Xoav_app app, Xol_case_mgr case_mgr) {this.app = app;} - public int Count() {return hash.Count();} + public int Count() {return hash.Len();} public boolean Has(byte[] key) {return hash.Has(key);} public Xow_wiki Get_at(int idx) {return (Xow_wiki)hash.Get_at(idx);} - public Xow_wiki Get_by_or_null(byte[] key) {return (Xow_wiki)hash.Get_by(key);} + public Xow_wiki Get_by_or_null(byte[] key) {return (Xow_wiki)hash.GetByOrNull(key);} public Xow_wiki Get_by_or_make_init_y(byte[] key) { Xow_wiki rv = this.Get_by_or_null(key); rv.Init_by_wiki(); return rv; } public Xow_wiki Get_by_or_make_init_n(byte[] key) {return Get_by_or_make_init_y(key);} - public void Add(Xow_wiki wiki) {hash.Add_if_dupe_use_nth(wiki.Domain_bry(), wiki);} + public void Add(Xow_wiki wiki) {hash.AddIfDupeUseNth(wiki.Domain_bry(), wiki);} public Xow_wiki Make(byte[] domain_bry, Io_url wiki_root_dir) {return new Xowv_wiki(app, domain_bry, wiki_root_dir);} public Xow_wiki Import_by_url(Io_url url) {return Xoa_wiki_mgr_.Import_by_url(app, this, url);} public void Load_by_user_data() { diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/addons/bldrs/Xopg_match_mgr.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/addons/bldrs/Xopg_match_mgr.java index 0c60c3055..b59d96ade 100644 --- a/400_xowa/src/gplx/xowa/apps/apis/xowa/addons/bldrs/Xopg_match_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/addons/bldrs/Xopg_match_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.apps.apis.xowa.addons.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.xowa.apps.apis.*; import gplx.xowa.apps.apis.xowa.*; import gplx.xowa.apps.apis.xowa.addons.*; +package gplx.xowa.apps.apis.xowa.addons.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.urls.*; public class Xopg_match_mgr { private String scope_raw; @@ -34,7 +34,7 @@ public class Xopg_match_mgr { if (wildcard_wiki.Has(page_ttl)) return true; } - Xopg_match_wiki match_wiki = (Xopg_match_wiki)wikis.Get_by(wiki.Domain_bry()); + Xopg_match_wiki match_wiki = (Xopg_match_wiki)wikis.GetByOrNull(wiki.Domain_bry()); if (match_wiki == null) return false; return match_wiki.Has(page_ttl); } @@ -59,7 +59,7 @@ public class Xopg_match_mgr { wiki_domain = url.Wiki_bry(); page_db = url.Page_bry(); } - Xopg_match_wiki match_wiki = (Xopg_match_wiki)wikis.Get_by(wiki_domain); + Xopg_match_wiki match_wiki = (Xopg_match_wiki)wikis.GetByOrNull(wiki_domain); if (match_wiki == null) { match_wiki = new Xopg_match_wiki(wiki_domain); wikis.Add(wiki_domain, match_wiki); @@ -87,7 +87,7 @@ class Xopg_match_wiki { wildcard_exists = true; } else { - hash.Add_if_dupe_use_1st(page_db, page_db); + hash.AddIfDupeUse1st(page_db, page_db); } } } diff --git a/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java b/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java index 4193742ad..282441cc6 100644 --- a/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/apis/xowa/html/Xoapi_toggle_mgr.java @@ -13,15 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.apps.apis.xowa.html; 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.*; +package gplx.xowa.apps.apis.xowa.html; import gplx.*; import gplx.xowa.*; public class Xoapi_toggle_mgr implements Gfo_invk { private Xoae_app app; private final Ordered_hash hash = Ordered_hash_.New_bry(); public void Ctor_by_app(Xoae_app app) {this.app = app;} public void Init_by_app(Xoae_app app) { Io_url img_dir = app.Fsys_mgr().Bin_xowa_file_dir().GenSubDir_nest("app.general"); - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xoapi_toggle_itm itm = (Xoapi_toggle_itm)hash.Get_at(i); itm.Init_fsys(img_dir); @@ -48,7 +47,7 @@ public class Xoapi_toggle_mgr implements Gfo_invk { } public Xoapi_toggle_itm Get_or_new(String key_str) { byte[] key_bry = Bry_.new_u8(key_str); - Xoapi_toggle_itm rv = (Xoapi_toggle_itm)hash.Get_by(key_bry); + Xoapi_toggle_itm rv = (Xoapi_toggle_itm)hash.GetByOrNull(key_bry); if (rv == null) { rv = new Xoapi_toggle_itm(app, key_bry); hash.Add(key_bry, rv); diff --git a/400_xowa/src/gplx/xowa/apps/boots/Xoa_boot_mgr.java b/400_xowa/src/gplx/xowa/apps/boots/Xoa_boot_mgr.java index 29ed4908f..df2aff33f 100644 --- a/400_xowa/src/gplx/xowa/apps/boots/Xoa_boot_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/boots/Xoa_boot_mgr.java @@ -1,24 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.apps.boots; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; import gplx.core.consoles.*; import gplx.core.envs.*; import gplx.dbs.*; -import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.xowa.guis.views.boots.*; +import gplx.gfui.kits.core.*; import gplx.xowa.guis.views.boots.*; import gplx.xowa.langs.*; -import gplx.xowa.users.*; public class Xoa_boot_mgr { private Gfo_usr_dlg usr_dlg; private Gfo_usr_dlg__log log_wtr; public void Run(String[] args, Xoa_cmd_arg_mgr arg_mgr) { @@ -102,7 +101,7 @@ public class Xoa_boot_mgr { special_pages = new byte[][] {Bry_.Empty}; } for (byte[] special_page : special_pages) { - app.Special_regy().Safelist_pages().Add_as_key_and_val(special_page); + app.Special_regy().Safelist_pages().AddAsKeyAndVal(special_page); } } diff --git a/400_xowa/src/gplx/xowa/apps/fmtrs/Xoa_fmtr_sort_mgr.java b/400_xowa/src/gplx/xowa/apps/fmtrs/Xoa_fmtr_sort_mgr.java index ddc7d047b..7f27f74b7 100644 --- a/400_xowa/src/gplx/xowa/apps/fmtrs/Xoa_fmtr_sort_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/fmtrs/Xoa_fmtr_sort_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.apps.fmtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.apps.fmtrs; import gplx.*; public class Xoa_fmtr_sort_mgr implements Gfo_invk { private Ordered_hash itms = Ordered_hash_.New(); private Xoa_fmtr_sort_wkr wkr = new Xoa_fmtr_sort_wkr(); @@ -24,7 +24,7 @@ public class Xoa_fmtr_sort_mgr implements Gfo_invk { int keys_len = keys.length; for (int i = 0; i < keys_len; i++) { Xoa_fmtr_sort_itm itm = new Xoa_fmtr_sort_itm(keys[i], true); - itms.Add_if_dupe_use_1st(itm.Key(), itm); + itms.AddIfDupeUse1st(itm.Key(), itm); } } public void Exec() { diff --git a/400_xowa/src/gplx/xowa/apps/kvs/Xoa_kv_hash.java b/400_xowa/src/gplx/xowa/apps/kvs/Xoa_kv_hash.java index 842f0c2c4..164c5b0d5 100644 --- a/400_xowa/src/gplx/xowa/apps/kvs/Xoa_kv_hash.java +++ b/400_xowa/src/gplx/xowa/apps/kvs/Xoa_kv_hash.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.apps.kvs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*; +package gplx.xowa.apps.kvs; import gplx.*; public class Xoa_kv_hash { private final Hash_adp hash = Hash_adp_.New(); public Object Get_or_make(Xoa_kv_itm itm) { String key = itm.Kv__key(); - Object val = hash.Get_by(key); + Object val = hash.GetByOrNull(key); if (val == null) { val = itm.Kv__val_make(); hash.Add(key, val); diff --git a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java index 725ea4f84..983e0416a 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java @@ -16,18 +16,19 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.*; import gplx.core.primitives.*; import gplx.xowa.wikis.*; import gplx.xowa.xtns.wbases.imports.*; -import gplx.xowa.wikis.data.*; -import gplx.xowa.bldrs.wkrs.*; import gplx.xowa.bldrs.cmds.texts.*; import gplx.xowa.bldrs.cmds.texts.sqls.*; import gplx.xowa.bldrs.cmds.texts.tdbs.*; import gplx.xowa.addons.bldrs.files.*; import gplx.xowa.addons.wikis.ctgs.bldrs.*; import gplx.xowa.bldrs.cmds.utils.*; +import gplx.xowa.bldrs.wkrs.*; +import gplx.xowa.bldrs.cmds.texts.sqls.*; +import gplx.xowa.bldrs.cmds.utils.*; import gplx.xowa.bldrs.cmds.diffs.*; -import gplx.xowa.files.origs.*; import gplx.xowa.htmls.core.bldrs.*; +import gplx.xowa.htmls.core.bldrs.*; import gplx.xowa.addons.wikis.searchs.bldrs.*; -import gplx.xowa.addons.bldrs.files.cmds.*; import gplx.xowa.addons.wikis.htmls.css.bldrs.*; +import gplx.xowa.addons.wikis.htmls.css.bldrs.*; public class Xob_cmd_mgr implements Gfo_invk { private final Xob_bldr bldr; public final Xob_cmd_regy cmd_regy; public Xob_cmd_mgr(Xob_bldr bldr, Xob_cmd_regy cmd_regy) {this.bldr = bldr; this.cmd_regy = cmd_regy;} public void Clear() {list.Clear(); dump_rdrs.Clear();} - public int Len() {return list.Count();} private final List_adp list = List_adp_.New(); + public int Len() {return list.Len();} private final List_adp list = List_adp_.New(); public Xob_cmd Get_at(int i) {return (Xob_cmd)list.Get_at(i);} public Xob_cmd Add(Xob_cmd cmd) {list.Add(cmd); return cmd;} public Gfo_invk Add_cmd(Xowe_wiki wiki, String cmd_key) { @@ -66,7 +67,7 @@ public class Xob_cmd_mgr implements Gfo_invk { } private Xob_page_wkr_cmd Xml_rdr_get(Xowe_wiki wiki) { byte[] wiki_key = wiki.Domain_bry(); - Xob_page_wkr_cmd rv = (Xob_page_wkr_cmd)dump_rdrs.Get_by(dump_rdrs_ref.Val_(wiki_key)); + Xob_page_wkr_cmd rv = (Xob_page_wkr_cmd)dump_rdrs.GetByOrNull(dump_rdrs_ref.Val_(wiki_key)); if (rv == null) { rv = new Xob_page_wkr_cmd(bldr, wiki); dump_rdrs.Add(Bry_obj_ref.New(wiki_key), rv); @@ -85,7 +86,7 @@ public class Xob_cmd_mgr implements Gfo_invk { private static final String Invk_add = "add", Invk_add_many = "add_many", Invk_new_batch = "new_batch", Invk_get_first = "get_first"; private Object Get_first(GfoMsg m) { String cmd_key = m.ReadStr("v"); - int cmds_len = list.Count(); + int cmds_len = list.Len(); for (int i = 0;i < cmds_len; i++) { Xob_cmd cmd = (Xob_cmd)list.Get_at(i); if (String_.Eq(cmd.Cmd_key(), cmd_key)) return cmd; diff --git a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_regy.java b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_regy.java index cfc86d76c..542969859 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_regy.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_regy.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.*; +package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.bldrs.wkrs.*; public class Xob_cmd_regy { private final Ordered_hash regy = Ordered_hash_.New(); - public Xob_cmd Get_or_null(String key) {return (Xob_cmd)regy.Get_by(key);} + public Xob_cmd Get_or_null(String key) {return (Xob_cmd)regy.GetByOrNull(key);} public void Add_many(Xob_cmd... ary) { int len = ary.length; for (int i = 0; i < len; ++i) { diff --git a/400_xowa/src/gplx/xowa/bldrs/Xob_ns_to_db_mgr.java b/400_xowa/src/gplx/xowa/bldrs/Xob_ns_to_db_mgr.java index 3fb70546b..0c523e5d6 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xob_ns_to_db_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xob_ns_to_db_mgr.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.*; -import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; +package gplx.xowa.bldrs; import gplx.*; +import gplx.xowa.wikis.data.*; import gplx.xowa.bldrs.cmds.*; public class Xob_ns_to_db_mgr { private final Xob_ns_to_db_wkr wkr; private final Xow_db_mgr db_mgr; private final long db_max; private boolean one_file_conn_init = true; @@ -78,7 +78,7 @@ public class Xob_ns_to_db_mgr { } } public void Commit() { - int len = db_list.Count(); + int len = db_list.Len(); for (int i = 0; i < len; ++i) { Xow_db_file db = (Xow_db_file)db_list.Get_at(i); db.Conn().Txn_sav(); diff --git a/400_xowa/src/gplx/xowa/bldrs/Xob_page_wkr_cmd.java b/400_xowa/src/gplx/xowa/bldrs/Xob_page_wkr_cmd.java index 626eb04a6..0429a1d76 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xob_page_wkr_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xob_page_wkr_cmd.java @@ -15,7 +15,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.*; import gplx.core.consoles.*; import gplx.core.ios.*; -import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.parsers.tmpls.*; +import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.bldrs.wkrs.*; import gplx.xowa.bldrs.xmls.*; public class Xob_page_wkr_cmd implements Xob_cmd { private final Xob_bldr bldr; private final Xowe_wiki wiki; @@ -74,7 +74,7 @@ public class Xob_page_wkr_cmd implements Xob_cmd { public void Cmd_end() {} public void Cmd_term() {} public void Wkr_add(Xob_page_wkr wkr) {wkrs.Add(wkr.Page_wkr__key(), wkr);} private Ordered_hash wkrs = Ordered_hash_.New(); - public Xob_page_wkr Wkr_get(String key) {return (Xob_page_wkr)wkrs.Get_by(key);} + public Xob_page_wkr Wkr_get(String key) {return (Xob_page_wkr)wkrs.GetByOrNull(key);} public Xobd_parser Page_parser_assert() { if (page_parser == null) { page_parser = new Xobd_parser(bldr); diff --git a/400_xowa/src/gplx/xowa/bldrs/Xobd_parser.java b/400_xowa/src/gplx/xowa/bldrs/Xobd_parser.java index 48887f0b7..c206a24e4 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xobd_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xobd_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.*; +package gplx.xowa.bldrs; import gplx.*; import gplx.core.btries.*; import gplx.xowa.bldrs.wkrs.*; import gplx.xowa.wikis.data.tbls.*; public class Xobd_parser implements Xob_page_wkr { @@ -25,11 +25,11 @@ public class Xobd_parser implements Xob_page_wkr { public Xobd_parser(Xob_bldr bldr) {this.bldr = bldr;} public void Wkr_add(Xobd_parser_wkr wkr) {wkr_list.Add(wkr);} public void Page_wkr__bgn() { - int wkr_list_len = wkr_list.Count(); + int wkr_list_len = wkr_list.Len(); for (int i = 0; i < wkr_list_len; i++) { Xobd_parser_wkr wkr = (Xobd_parser_wkr)wkr_list.Get_at(i); wkr.Wkr_bgn(bldr); - int hooks_len = wkr.Wkr_hooks().Count(); + int hooks_len = wkr.Wkr_hooks().Len(); for (int j = 0; j < hooks_len; j++) { byte[] bry = (byte[])wkr.Wkr_hooks().Get_at(j); trie.Add_obj(bry, wkr); @@ -52,7 +52,7 @@ public class Xobd_parser implements Xob_page_wkr { } public void Page_wkr__run_cleanup() {} public void Page_wkr__end() { - int wkr_list_len = wkr_list.Count(); + int wkr_list_len = wkr_list.Len(); for (int i = 0; i < wkr_list_len; i++) { Xobd_parser_wkr wkr = (Xobd_parser_wkr)wkr_list.Get_at(i); wkr.Wkr_end(); diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java b/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java index 4f2196aa4..30d9c031b 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java @@ -155,7 +155,7 @@ public abstract class Xob_dump_mgr_base extends Xob_itm_basic_base implements Xo int pg_id = pg_bgn; while (true) { page_src.Get_pages(wiki.Appe(), pages, db_id, ns_id, pg_id); - int pages_len = pages.Count(); + int pages_len = pages.Len(); if (pages_len == 0) { // no more pages in db; if (pg_id > pg_bgn) // reset pg_bgn to 0 only if pg_bgn seen; pg_bgn = 0; @@ -270,7 +270,7 @@ class Xob_dump_mgr_base_ { usr_dlg.Note_many("", "", "tmpl_load init"); while (true) { page_src.Get_pages(wiki.Appe(), pages, 0, Xow_ns_.Tid__template, cur_page_id); // 0 is always template db - int page_count = pages.Count(); + int page_count = pages.Len(); if (page_count == 0) break; // no more pages in db; Xowd_page_itm page = null; for (int i = 0; i < page_count; i++) { @@ -298,7 +298,7 @@ class Xob_dump_mgr_base_ { break; } } - return (Xow_db_file[])text_files_list.To_ary_and_clear(Xow_db_file.class); + return (Xow_db_file[])text_files_list.ToAryAndClear(Xow_db_file.class); } } class Xob_dump_bmk_mgr { diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_ns_file_itm_parser.java b/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_ns_file_itm_parser.java index 4c1b9d851..1d6c35007 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_ns_file_itm_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_ns_file_itm_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +package gplx.xowa.bldrs.cmds; import gplx.*; import gplx.langs.dsvs.*; import gplx.xowa.wikis.nss.*; public class Xob_ns_file_itm_parser extends Dsv_wkr_base { @@ -78,7 +78,7 @@ public class Xob_ns_file_itm_parser extends Dsv_wkr_base { } public Xob_ns_file_itm[] To_ary(byte[] bry) { this.Load_by_bry(bry); - return (Xob_ns_file_itm[])rslts.To_ary(Xob_ns_file_itm.class); + return (Xob_ns_file_itm[])rslts.ToAry(Xob_ns_file_itm.class); } public static final byte[] Ns_file_map__few = Bry_.new_a7("few"), Ns_file_map__each = Bry_.new_a7(""); /* diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_delete_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_delete_cmd.java index f4fbffa72..8c98a8073 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_delete_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_delete_cmd.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.cmds.texts.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.bldrs.cmds.texts.*; +package gplx.xowa.bldrs.cmds.texts.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.dbs.*; import gplx.xowa.wikis.data.*; import gplx.xowa.bldrs.wkrs.*; public class Xob_page_delete_cmd extends Xob_cmd_base { @@ -28,9 +28,9 @@ public class Xob_page_delete_cmd extends Xob_cmd_base { usr_dlg.Plog_many("", "", "creating page_filter"); if (!core_db_conn.Meta_tbl_exists("page_filter")) { core_db_conn.Meta_tbl_create - ( Dbmeta_tbl_itm.New("page_filter", new Dbmeta_fld_itm[] - { Dbmeta_fld_itm.new_int("page_id").Primary_y_() - , Dbmeta_fld_itm.new_int("page_text_db_id") + ( Dbmeta_tbl_itm.New("page_filter", new DbmetaFldItm[] + { DbmetaFldItm.NewInt("page_id").PrimarySetY() + , DbmetaFldItm.NewInt("page_text_db_id") } , Dbmeta_idx_itm.new_normal_by_tbl("page_filter", "db_id__page", "page_text_db_id", "page_id") , Dbmeta_idx_itm.new_normal_by_tbl("page_filter", "page_id", "page_id") diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_download_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_download_cmd.java index 6dee31d4e..57331d562 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_download_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_download_cmd.java @@ -1,20 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.bldrs.cmds.utils; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; -import gplx.dbs.*; import gplx.core.ios.*; import gplx.core.envs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.bldrs.cmds.utils; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +import gplx.core.ios.*; import gplx.core.envs.*; import gplx.xowa.bldrs.wkrs.*; import gplx.xowa.bldrs.wms.dumps.*; public class Xob_download_cmd extends Xob_cmd__base implements Xob_cmd { private String dump_date = "latest", dump_type = null, dump_src = null; @@ -74,7 +74,7 @@ public class Xob_download_cmd extends Xob_cmd__base implements Xob_cmd { } private static boolean Found(IoItmHash hash, String dump_type) { String match = String_.Format("{0}.sql", dump_type); // EX: "page_props.sql" - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { IoItm_base fil = (IoItm_base)hash.Get_at(i); if (String_.Has(fil.Url().NameAndExt(), match)) diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java index 4ca16a58b..f00bf503b 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.cmds.utils; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; +package gplx.xowa.bldrs.cmds.utils; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.core.net.*; -import gplx.dbs.*; -import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; import gplx.xowa.bldrs.wms.*; import gplx.xowa.bldrs.wms.sites.*; +import gplx.xowa.bldrs.wkrs.*; +import gplx.xowa.bldrs.wms.sites.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.apps.site_cfgs.*; public class Xob_site_meta_cmd implements Xob_cmd { private final Xob_bldr bldr; @@ -38,7 +38,7 @@ public class Xob_site_meta_cmd implements Xob_cmd { Ordered_hash reqd_hash = Ordered_hash_.New(); int reqd_len = reqd_ary.length; for (int i = 0; i < reqd_len; ++i) - reqd_hash.Add_as_key_and_val(reqd_ary[i]); + reqd_hash.AddAsKeyAndVal(reqd_ary[i]); Site_core_db json_db = new Site_core_db(db_url); Site_core_itm[] actl_ary = json_db.Tbl__core().Select_all_downloaded(cutoff); @@ -48,7 +48,7 @@ public class Xob_site_meta_cmd implements Xob_cmd { reqd_hash.Del(String_.new_u8(actl_itm.Site_domain())); } - reqd_len = reqd_hash.Count(); + reqd_len = reqd_hash.Len(); for (int i = 0; i < reqd_len; ++i) { String domain_str = (String)reqd_hash.Get_at(i); DateAdp json_date = Datetime_now.Get(); diff --git a/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java b/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java index d87f495e5..c9ca41fc1 100644 --- a/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java +++ b/400_xowa/src/gplx/xowa/bldrs/css/Xoa_css_extractor.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.css; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +package gplx.xowa.bldrs.css; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.core.ios.*; import gplx.core.envs.*; -import gplx.xowa.htmls.*; import gplx.langs.htmls.encoders.*; +import gplx.langs.htmls.encoders.*; import gplx.xowa.wikis.nss.*; -import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.data.*; +import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.data.*; import gplx.xowa.files.downloads.*; import gplx.core.net.*; -import gplx.xowa.addons.wikis.htmls.css.bldrs.*; import gplx.xowa.addons.wikis.htmls.css.mgrs.*; +import gplx.xowa.addons.wikis.htmls.css.mgrs.*; import gplx.xowa.wikis.data.fetchers.*; public class Xoa_css_extractor { private Io_url home_css_dir; @@ -266,7 +266,7 @@ public class Xoa_css_extractor { rv.Add(String_.new_u8(css_url_bry)); prv_pos = url_end; } - return rv.To_str_ary(); + return rv.ToStrAry(); } private static final byte[] Css_find_bgn = Bry_.new_a7(" "20130101" rv.Add(String_.new_u8(date)); } - return rv.To_str_ary(); + return rv.ToStrAry(); } private static final byte[] CONST_href_bgn = Bry_.new_a7(" -1 && i < hash_len ? (Xosql_fld_itm)hash.Get_at(i) : null; } diff --git a/400_xowa/src/gplx/xowa/bldrs/sql_dumps/Xosql_tbl_parser__tst.java b/400_xowa/src/gplx/xowa/bldrs/sql_dumps/Xosql_tbl_parser__tst.java index ffaf081ee..5382dcb95 100644 --- a/400_xowa/src/gplx/xowa/bldrs/sql_dumps/Xosql_tbl_parser__tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/sql_dumps/Xosql_tbl_parser__tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.sql_dumps; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +package gplx.xowa.bldrs.sql_dumps; import gplx.*; import org.junit.*; import gplx.core.tests.*; public class Xosql_tbl_parser__tst { private final Xosql_tbl_parser__fxt fxt = new Xosql_tbl_parser__fxt(); @@ -75,7 +75,7 @@ class Xosql_tbl_parser__fxt { public void Exec__parse(String v) {this.tbl_flds = parser.Parse(Bry_.new_a7(v));} public void Test__count(int expd) {Gftest.Eq__int(expd, tbl_flds.Len());} public void Test__get(String key, int expd) { - Xosql_fld_itm actl_itm = (Xosql_fld_itm)tbl_flds.Get_by(Bry_.new_u8(key)); + Xosql_fld_itm actl_itm = (Xosql_fld_itm)tbl_flds.GetByOrNull(Bry_.new_u8(key)); Gftest.Eq__int(expd, actl_itm == null ? Bry_find_.Not_found : actl_itm.Idx()); } public void Test__extract(String raw, String expd) { diff --git a/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java b/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java index 71f874be1..b0c8cdfa0 100644 --- a/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java +++ b/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java @@ -1,20 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.bldrs.syncs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; -import gplx.core.ios.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.bldrs.syncs; import gplx.*; class Xob_sync_grp { private final Ordered_hash itms = Ordered_hash_.New(); public Xob_sync_grp Ctor_itm(DateAdp dump_time, DateAdp upload_time) { @@ -23,7 +22,7 @@ class Xob_sync_grp { } public DateAdp Dump_time() {return dump_time;} private DateAdp dump_time; public DateAdp Upload_time() {return upload_time;} private DateAdp upload_time; - public int Itms__len() {return itms.Count();} + public int Itms__len() {return itms.Len();} public void Itms__add(Xob_sync_pkg file) {itms.Add(file.Path(), file);} public Xob_sync_pkg Itms__get_at(int i) {return (Xob_sync_pkg)itms.Get_at(i);} } @@ -34,7 +33,7 @@ class Xob_sync_pkg extends Xob_sync_fil { private final Ordered_hash itms = Orde } public String Url() {return url;} private String url; public byte Zip_tid() {return zip_tid;} private byte zip_tid; - public int Itms__len() {return itms.Count();} + public int Itms__len() {return itms.Len();} public void Itms__add(Xob_sync_fil file) {itms.Add(file.Path(), file);} public Xob_sync_fil Itms__get_at(int i) {return (Xob_sync_fil)itms.Get_at(i);} } diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xob_subpage_parser.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xob_subpage_parser.java index 9ba2401fe..b8f951be2 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xob_subpage_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xob_subpage_parser.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.bldrs.wiki_cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.bldrs.wiki_cfgs; import gplx.*; import gplx.core.log_msgs.*; import gplx.langs.phps.*; import gplx.xowa.langs.bldrs.*; class Xob_subpage_parser { @@ -24,7 +24,7 @@ class Xob_subpage_parser { Php_parser php_parser = new Php_parser(); Php_evaluator eval = new Php_evaluator(new Gfo_msg_log("test")); php_parser.Parse_tkns(src, eval); - Php_line[] lines = (Php_line[])eval.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])eval.List().ToAry(Php_line.class); Php_line_assign line = (Php_line_assign)lines[0]; Php_itm_ary root_ary = (Php_itm_ary)line.Val(); Php_itm_kv root_kv = (Php_itm_kv)root_ary.Subs_get(0); @@ -40,7 +40,7 @@ class Xob_subpage_parser { catch (Exception e) { throw Err_.new_exc(e, "xo", "parse failed", "src", String_.new_u8(src)); } - return (Xob_subpage_wiki[])wikis_list.To_ary(Xob_subpage_wiki.class); + return (Xob_subpage_wiki[])wikis_list.ToAry(Xob_subpage_wiki.class); } private void Parse_wiki(Php_itm_kv wiki_tkn, Xob_subpage_wiki wiki_itm) { wiki_itm.Name_(wiki_tkn.Key().Val_obj_bry()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java index 7721dbb24..c51cedf37 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.bldrs.wiki_cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.bldrs.wiki_cfgs; import gplx.*; import gplx.langs.xmls.*; import gplx.core.ios.*; public class Xoi_wiki_props_api { private IoEngine_xrg_downloadFil download_args = IoEngine_xrg_downloadFil.new_("", Io_url_.Empty); @@ -67,7 +67,7 @@ public class Xoi_wiki_props_api { sub_itm.Init_by_xml(sub_nde); list.Add(sub_itm); } - return (Xoi_wiki_props_alias[])list.To_ary_and_clear(Xoi_wiki_props_alias.class); + return (Xoi_wiki_props_alias[])list.ToAryAndClear(Xoi_wiki_props_alias.class); } private Xoi_wiki_props_ns[] Parse_ns_ary(XmlNde xnde) { int xndes_len = xnde.SubNdes().Count(); @@ -79,6 +79,6 @@ public class Xoi_wiki_props_api { sub_itm.Init_by_xml(sub_nde); list.Add(sub_itm); } - return (Xoi_wiki_props_ns[])list.To_ary_and_clear(Xoi_wiki_props_ns.class); + return (Xoi_wiki_props_ns[])list.ToAryAndClear(Xoi_wiki_props_ns.class); } } diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java index 948d8235f..f97d8b598 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wiki_cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; +package gplx.xowa.bldrs.wiki_cfgs; import gplx.*; import gplx.xowa.*; import org.junit.*; import gplx.core.strings.*; -import gplx.langs.xmls.*; import gplx.xowa.addons.bldrs.app_cfgs.*; public class Xoi_wiki_props_api_tst { private Xoi_wiki_props_fxt fxt = new Xoi_wiki_props_fxt(); @@ -130,7 +129,7 @@ class Xob_subpage_tst_fxt { } private void X_str_wiki(String_bldr sb, Xob_subpage_wiki wiki) { sb.Add(wiki.Name()).Add_char_nl(); - int ns_len = wiki.Ns_list().Count(); + int ns_len = wiki.Ns_list().Len(); for (int i = 0; i < ns_len; i++) { Xob_subpage_ns ns = (Xob_subpage_ns)wiki.Ns_list().Get_at(i); sb.Add(ns.Id()).Add("=").Add(Bool_.To_str_lower(ns.Enabled())).Add_char_nl(); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/dump_pages/Xowmf_wiki_dump_dirs_parser.java b/400_xowa/src/gplx/xowa/bldrs/wms/dump_pages/Xowmf_wiki_dump_dirs_parser.java index dc473165c..134f1ac82 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/dump_pages/Xowmf_wiki_dump_dirs_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/dump_pages/Xowmf_wiki_dump_dirs_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.dump_pages; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.dump_pages; import gplx.*; public class Xowmf_wiki_dump_dirs_parser { public static String[] Parse(byte[] wiki, byte[] src) { List_adp rv = List_adp_.New(); @@ -27,7 +27,7 @@ public class Xowmf_wiki_dump_dirs_parser { if (Bry_.Eq(href_bry, Tkn_owner)) continue; // ignore rv.Add(String_.new_u8(href_bry)); } - return (String[])rv.To_ary_and_clear(String.class); + return (String[])rv.ToAryAndClear(String.class); } private static final byte[] Tkn_href = Bry_.new_a7(" href=\""), Tkn_owner = Bry_.new_a7(".."); } diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_sync.java b/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_sync.java index 66d1dc20b..25b742d78 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_sync.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_sync.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.revs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; -import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.revs; import gplx.*; import gplx.xowa.*; class Xowm_rev_sync { private final Ordered_hash cur_hash = Ordered_hash_.New_bry(), new_hash = Ordered_hash_.New_bry(); private final List_adp del_list = List_adp_.New(); @@ -31,7 +30,7 @@ class Xowm_rev_sync { synchronized (new_hash) { Xowm_rev_sync_utl.Build_itms(cur_hash, ttls_ary); Xowm_rev_sync_utl.Build_itms(new_hash, ttls_ary); - int len = new_hash.Count(); + int len = new_hash.Len(); for (int i = 0; i < len; i += batch_size) Exec_batch(domain_str, i, len); } @@ -72,11 +71,11 @@ class Xowm_rev_sync_utl { for (int i = bgn; i < end; ++i) { Wmapi_itm__pge new_itm = (Wmapi_itm__pge)new_hash.Get_at(i); byte[] new_key = new_itm.Page_ttl(); - Wmapi_itm__pge cur_itm = (Wmapi_itm__pge)cur_hash.Get_by(new_key); if (cur_itm == null) continue; // itm not found; ignore + Wmapi_itm__pge cur_itm = (Wmapi_itm__pge)cur_hash.GetByOrNull(new_key); if (cur_itm == null) continue; // itm not found; ignore if (new_itm.Eq_meta(cur_itm, 0)) // itm is same; add to deleted list del_list.Add(new_itm); } - int len = del_list.Count(); + int len = del_list.Len(); for (int i = 0; i < len; ++i) { Wmapi_itm__pge itm = (Wmapi_itm__pge)del_list.Get_at(i); new_hash.Del(itm.Page_ttl()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm.java b/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm.java index 82689f0f5..430893bd9 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm.java @@ -1,64 +1,64 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.bldrs.wms.revs; - -import gplx.Bry_; -import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.Byte_ascii; -import gplx.Ordered_hash; -import gplx.core.net.Gfo_inet_conn; -import gplx.langs.jsons.Json_doc; -import gplx.langs.jsons.Json_nde; -import gplx.langs.jsons.Json_parser; -import gplx.xowa.bldrs.wms.Xowm_api_mgr; - -class Xowm_rev_wkr__meta__wm implements Xowm_rev_wkr__meta { - private final Json_parser json_parser = new Json_parser(); - private final Xowm_json_parser__page json_page_parser = new Xowm_json_parser__page(); - private final Bry_bfr tmp_bfr = Bry_bfr_.New_w_size(255); - private final Wmapi_itm__pge tmp_pge = new Wmapi_itm__pge(); - public Xowm_rev_wkr__meta__wm() { - tmp_pge.Rvn_ary_(new Wmapi_itm__rvn()); - } - public Gfo_inet_conn Inet_conn() {return inet_conn;} public void Inet_conn_(Gfo_inet_conn v) {this.inet_conn = v;} private Gfo_inet_conn inet_conn; - public void Fetch_meta(String domain_str, Ordered_hash hash, int bgn, int end) { - for (int i = bgn; i < end; ++i) { - Wmapi_itm__pge itm = (Wmapi_itm__pge)hash.Get_at(i); - if (i != bgn) tmp_bfr.Add_byte(Byte_ascii.Pipe); - tmp_bfr.Add(itm.Page_ttl()); - } - byte[] json = inet_conn.Download_as_bytes_or_null(Xowm_api_mgr.Bld_api_url(domain_str, "action=query&prop=revisions&rvprop=size|ids|timestamp|user|comment&format=json&rawcontinue=titles=" + tmp_bfr.To_str_and_clear())); - Parse_doc(hash, json); - } - private void Parse_doc(Ordered_hash hash, byte[] json) { - Json_doc jdoc = json_parser.Parse(json); - Json_nde pages_nde = Json_nde.Cast(jdoc.Get_grp_many(Jpath__query_pages)); - int len = pages_nde.Len(); - for (int i = 0; i < len; ++i) { - Parse_page(hash, pages_nde.Get_at_as_kv(i).Val_as_nde()); - } - } - private void Parse_page(Ordered_hash hash, Json_nde page_nde) { - json_page_parser.Parse("update", tmp_pge, page_nde); // have to pass tmp_pge, b/c don't know which itm is in hash - Wmapi_itm__pge hash_itm = (Wmapi_itm__pge)hash.Get_by(tmp_pge.Page_ttl()); if (hash_itm == null) return; - hash_itm.Init_id(tmp_pge.Page_id()); - Wmapi_itm__rvn tmp_rvn = tmp_pge.Rvn_itm_last(); - hash_itm.Rvn_ary_(new Wmapi_itm__rvn()); - hash_itm.Rvn_itm_last().Init(tmp_rvn.Rvn_id(), tmp_rvn.Rvn_len(), tmp_rvn.Rvn_time(), tmp_rvn.Rvn_user(), tmp_rvn.Rvn_note()); - } - private static final byte[][] Jpath__query_pages = Bry_.Ary("query", "pages"); -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.bldrs.wms.revs; + +import gplx.Bry_; +import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.Byte_ascii; +import gplx.Ordered_hash; +import gplx.core.net.Gfo_inet_conn; +import gplx.langs.jsons.Json_doc; +import gplx.langs.jsons.Json_nde; +import gplx.langs.jsons.Json_parser; +import gplx.xowa.bldrs.wms.Xowm_api_mgr; + +class Xowm_rev_wkr__meta__wm implements Xowm_rev_wkr__meta { + private final Json_parser json_parser = new Json_parser(); + private final Xowm_json_parser__page json_page_parser = new Xowm_json_parser__page(); + private final Bry_bfr tmp_bfr = Bry_bfr_.New_w_size(255); + private final Wmapi_itm__pge tmp_pge = new Wmapi_itm__pge(); + public Xowm_rev_wkr__meta__wm() { + tmp_pge.Rvn_ary_(new Wmapi_itm__rvn()); + } + public Gfo_inet_conn Inet_conn() {return inet_conn;} public void Inet_conn_(Gfo_inet_conn v) {this.inet_conn = v;} private Gfo_inet_conn inet_conn; + public void Fetch_meta(String domain_str, Ordered_hash hash, int bgn, int end) { + for (int i = bgn; i < end; ++i) { + Wmapi_itm__pge itm = (Wmapi_itm__pge)hash.Get_at(i); + if (i != bgn) tmp_bfr.Add_byte(Byte_ascii.Pipe); + tmp_bfr.Add(itm.Page_ttl()); + } + byte[] json = inet_conn.Download_as_bytes_or_null(Xowm_api_mgr.Bld_api_url(domain_str, "action=query&prop=revisions&rvprop=size|ids|timestamp|user|comment&format=json&rawcontinue=titles=" + tmp_bfr.To_str_and_clear())); + Parse_doc(hash, json); + } + private void Parse_doc(Ordered_hash hash, byte[] json) { + Json_doc jdoc = json_parser.Parse(json); + Json_nde pages_nde = Json_nde.Cast(jdoc.Get_grp_many(Jpath__query_pages)); + int len = pages_nde.Len(); + for (int i = 0; i < len; ++i) { + Parse_page(hash, pages_nde.Get_at_as_kv(i).Val_as_nde()); + } + } + private void Parse_page(Ordered_hash hash, Json_nde page_nde) { + json_page_parser.Parse("update", tmp_pge, page_nde); // have to pass tmp_pge, b/c don't know which itm is in hash + Wmapi_itm__pge hash_itm = (Wmapi_itm__pge)hash.GetByOrNull(tmp_pge.Page_ttl()); if (hash_itm == null) return; + hash_itm.Init_id(tmp_pge.Page_id()); + Wmapi_itm__rvn tmp_rvn = tmp_pge.Rvn_itm_last(); + hash_itm.Rvn_ary_(new Wmapi_itm__rvn()); + hash_itm.Rvn_itm_last().Init(tmp_rvn.Rvn_id(), tmp_rvn.Rvn_len(), tmp_rvn.Rvn_time(), tmp_rvn.Rvn_user(), tmp_rvn.Rvn_note()); + } + private static final byte[][] Jpath__query_pages = Bry_.Ary("query", "pages"); +} diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm_tst.java b/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm_tst.java index 17489e433..343135532 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/revs/Xowm_rev_wkr__meta__wm_tst.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.revs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; -import org.junit.*; import gplx.langs.jsons.*; import gplx.core.net.*; import gplx.xowa.wikis.nss.*; +package gplx.xowa.bldrs.wms.revs; import gplx.*; +import org.junit.*; +import gplx.core.net.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.domains.*; public class Xowm_rev_wkr__meta__wm_tst { private final Xowm_rev_wkr__meta__wm_fxt fxt = new Xowm_rev_wkr__meta__wm_fxt(); @@ -66,7 +67,7 @@ class Xowm_rev_wkr__meta__wm_fxt { } public void Test_fetch(String[] ttl_ary, Wmapi_itm__pge... expd) { Init_rev_hash(ttl_ary); - meta_wkr.Fetch_meta(domain_str, rev_hash, 0, rev_hash.Count()); + meta_wkr.Fetch_meta(domain_str, rev_hash, 0, rev_hash.Len()); Tfds.Eq_str_lines(String_.new_u8(json_wtr.To_bry(expd)), String_.new_u8(json_wtr.To_bry((Wmapi_itm__pge[])rev_hash.To_ary_and_clear(Wmapi_itm__pge.class)))); } private void Init_rev_hash(String[] ttl_ary) { diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_db.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_db.java index 1f3e360c7..75e083cd4 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_db.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_db.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.xwikis.bldrs.*; @@ -115,7 +115,7 @@ public class Site_core_db { public void Load_interwikimap(Xow_domain_itm domain_itm, gplx.xowa.wikis.xwikis.Xow_xwiki_mgr xwiki_mgr) { Ordered_hash hash = Ordered_hash_.New(); tbl__interwikimap.Select(domain_itm.Abrv_xo(), hash); - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Site_interwikimap_itm itm = (Site_interwikimap_itm)hash.Get_at(i); Xow_xwiki_itm xwiki_itm = Xow_xwiki_itm_bldr.Instance.Bld_mw(domain_itm, itm.Prefix, itm.Url, null); @@ -124,7 +124,7 @@ public class Site_core_db { } private static void Ns_mgr__load(Xow_ns_mgr rv, Ordered_hash hash) { rv.Clear(); - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Site_namespace_itm itm = (Site_namespace_itm)hash.Get_at(i); byte case_match = Xow_ns_case_.To_tid(String_.new_u8(itm.Case_tid())); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_tbl.java index 91585a5cc..7c049900e 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_core_tbl.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; public class Site_core_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_site_domain, fld_json_completed, fld_json_date, fld_json_text; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete, stmt_update; public Site_core_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_site_domain = flds.Add_str("site_domain", 255); - this.fld_json_completed = flds.Add_bool("json_completed"); - this.fld_json_date = flds.Add_str("json_date", 20); - this.fld_json_text = flds.Add_text("json_text"); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_site_domain = flds.AddStr("site_domain", 255); + this.fld_json_completed = flds.AddBool("json_completed"); + this.fld_json_date = flds.AddStr("json_date", 20); + this.fld_json_text = flds.AddText("json_text"); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} @@ -79,7 +79,7 @@ public class Site_core_tbl implements Db_tbl { } } finally {rdr.Rls();} - return (Site_core_itm[])list.To_ary_and_clear(Site_core_itm.class); + return (Site_core_itm[])list.ToAryAndClear(Site_core_itm.class); } private Site_core_itm new_itm(Db_rdr rdr) { return new Site_core_itm diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_extension_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_extension_tbl.java index 4495aee92..5bb15cb88 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_extension_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_extension_tbl.java @@ -13,37 +13,37 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_extension_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_type, fld_name, fld_namemsg, fld_description, fld_descriptionmsg, fld_author, fld_url, fld_version , fld_vcs_system, fld_vcs_version, fld_vcs_url, fld_vcs_date, fld_license_name, fld_license, fld_credits; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_extension_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_type = flds.Add_str("type", 255); - this.fld_name = flds.Add_str("name", 255); - this.fld_namemsg = flds.Add_str("namemsg", 255); - this.fld_description = flds.Add_str("description", 255); - this.fld_descriptionmsg = flds.Add_str("descriptionmsg", 255); - this.fld_author = flds.Add_str("author", 255); - this.fld_url = flds.Add_str("url", 255); - this.fld_version = flds.Add_str("version", 255); - this.fld_vcs_system = flds.Add_str("vcs_system", 255); - this.fld_vcs_version = flds.Add_str("vcs_version", 255); - this.fld_vcs_url = flds.Add_str("vcs_url", 255); - this.fld_vcs_date = flds.Add_str("vcs_date", 255); - this.fld_license_name = flds.Add_str("license_name", 255); - this.fld_license = flds.Add_str("license", 255); - this.fld_credits = flds.Add_str("credits", 255); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_type = flds.AddStr("type", 255); + this.fld_name = flds.AddStr("name", 255); + this.fld_namemsg = flds.AddStr("namemsg", 255); + this.fld_description = flds.AddStr("description", 255); + this.fld_descriptionmsg = flds.AddStr("descriptionmsg", 255); + this.fld_author = flds.AddStr("author", 255); + this.fld_url = flds.AddStr("url", 255); + this.fld_version = flds.AddStr("version", 255); + this.fld_vcs_system = flds.AddStr("vcs_system", 255); + this.fld_vcs_version = flds.AddStr("vcs_version", 255); + this.fld_vcs_url = flds.AddStr("vcs_url", 255); + this.fld_vcs_date = flds.AddStr("vcs_date", 255); + this.fld_license_name = flds.AddStr("license_name", 255); + this.fld_license = flds.AddStr("license", 255); + this.fld_credits = flds.AddStr("credits", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_extension"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_type, fld_name)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -81,7 +81,7 @@ class Site_extension_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_extension_itm itm = (Site_extension_itm)list.Get_at(i); Insert(site_abrv, itm.Type(), itm.Name(), itm.Namemsg(), itm.Description(), itm.Descriptionmsg(), itm.Author(), itm.Url(), itm.Version() diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_interwikimap_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_interwikimap_tbl.java index 332b750a5..6da69c53e 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_interwikimap_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_interwikimap_tbl.java @@ -13,30 +13,30 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_interwikimap_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_prefix, fld_local, fld_extralanglink, fld_linktext, fld_sitename, fld_language, fld_localinterwiki, fld_url, fld_protorel; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_interwikimap_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_prefix = flds.Add_str("prefix", 255); - this.fld_local = flds.Add_bool("local"); - this.fld_extralanglink = flds.Add_bool("extralanglink"); - this.fld_linktext = flds.Add_str("linktext", 255); - this.fld_sitename = flds.Add_str("sitename", 255); - this.fld_language = flds.Add_str("language", 255); - this.fld_localinterwiki = flds.Add_bool("localinterwiki"); - this.fld_url = flds.Add_str("url", 255); - this.fld_protorel = flds.Add_bool("protorel"); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_prefix = flds.AddStr("prefix", 255); + this.fld_local = flds.AddBool("local"); + this.fld_extralanglink = flds.AddBool("extralanglink"); + this.fld_linktext = flds.AddStr("linktext", 255); + this.fld_sitename = flds.AddStr("sitename", 255); + this.fld_language = flds.AddStr("language", 255); + this.fld_localinterwiki = flds.AddBool("localinterwiki"); + this.fld_url = flds.AddStr("url", 255); + this.fld_protorel = flds.AddBool("protorel"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_interwikimap"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_prefix)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -68,7 +68,7 @@ class Site_interwikimap_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_interwikimap_itm itm = (Site_interwikimap_itm)list.Get_at(i); Insert(site_abrv, itm.Prefix, itm.Local, itm.Extralanglink, itm.Linktext, itm.Sitename, itm.Language, itm.Localinterwiki, itm.Url, itm.Protorel); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_json_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_json_parser_tst.java index 5582d2f47..51ac6190f 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_json_parser_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_json_parser_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import org.junit.*; import gplx.langs.jsons.*; import gplx.xowa.wikis.nss.*; public class Site_json_parser_tst { private final Site_json_parser_fxt fxt = new Site_json_parser_fxt(); @@ -416,7 +416,7 @@ class Site_json_parser_fxt { public void Test_namespace(Site_namespace_itm... expd) {Tfds.Eq_ary_str(expd, (Site_namespace_itm[])site_meta.Namespace_list().To_ary(Site_namespace_itm.class));} public void Test_statistic(Site_statistic_itm expd) {Tfds.Eq_str_intf(expd, site_meta.Statistic_itm());} public void Test_interwikimap(Site_interwikimap_itm... expd) {Tfds.Eq_ary_str(expd, (Site_interwikimap_itm[])site_meta.Interwikimap_list().To_ary(Site_interwikimap_itm.class));} - public void Test_namespacealias(Site_namespacealias_itm... expd) {Tfds.Eq_ary_str(expd, (Site_namespacealias_itm[])site_meta.Namespacealias_list().To_ary(Site_namespacealias_itm.class));} + public void Test_namespacealias(Site_namespacealias_itm... expd) {Tfds.Eq_ary_str(expd, (Site_namespacealias_itm[])site_meta.Namespacealias_list().ToAry(Site_namespacealias_itm.class));} public void Test_specialpagealias(Site_specialpagealias_itm... expd) {Tfds.Eq_ary_str(expd, (Site_specialpagealias_itm[])site_meta.Specialpagealias_list().To_ary(Site_specialpagealias_itm.class));} public void Test_library(Site_library_itm... expd) {Tfds.Eq_ary_str(expd, (Site_library_itm[])site_meta.Library_list().To_ary(Site_library_itm.class));} public void Test_extension(Site_extension_itm... expd) {Tfds.Eq_ary_str(expd, (Site_extension_itm[])site_meta.Extension_list().To_ary(Site_extension_itm.class));} diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_kv_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_kv_tbl.java index c190efe48..d726ec0c9 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_kv_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_kv_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_kv_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_key, fld_val; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_kv_tbl(Db_conn conn, String tbl_name) { this.conn = conn; this.tbl_name = tbl_name; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_key = flds.Add_str("key", 255); - this.fld_val = flds.Add_str("val", 255); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_key = flds.AddStr("key", 255); + this.fld_val = flds.AddStr("val", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_key)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -52,7 +52,7 @@ class Site_kv_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Keyval itm = (Keyval)list.Get_at(i); Insert(site_abrv, itm.Key(), itm.Val_to_str_or_empty()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_language_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_language_tbl.java index c5f3301c1..52968720d 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_language_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_language_tbl.java @@ -13,24 +13,24 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_language_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_code, fld_name, fld_bcp47; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_language_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_code = flds.Add_str("code", 255); - this.fld_name = flds.Add_str("name", 255); - this.fld_bcp47 = flds.Add_str("bcp47", 255); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_code = flds.AddStr("code", 255); + this.fld_name = flds.AddStr("name", 255); + this.fld_bcp47 = flds.AddStr("bcp47", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_language"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_code, fld_bcp47)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -56,7 +56,7 @@ class Site_language_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_language_itm itm = (Site_language_itm)list.Get_at(i); Insert(site_abrv, itm.Code(), itm.Name(), itm.Bcp47()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_library_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_library_tbl.java index 08232c556..e8759fbb8 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_library_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_library_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_library_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_name, fld_version; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_library_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_name = flds.Add_str("name", 255); - this.fld_version = flds.Add_str("version", 255); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_name = flds.AddStr("name", 255); + this.fld_version = flds.AddStr("version", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_library"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_name)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -54,7 +54,7 @@ class Site_library_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_library_itm itm = (Site_library_itm)list.Get_at(i); Insert(site_abrv, itm.Name(), itm.Version()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_magicword_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_magicword_tbl.java index 3b0186cdc..9b33b7b5d 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_magicword_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_magicword_tbl.java @@ -13,24 +13,24 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_magicword_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_name, fld_case_match, fld_aliases; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_magicword_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_name = flds.Add_str("name", 255); - this.fld_case_match = flds.Add_bool("case_match"); - this.fld_aliases = flds.Add_str("aliases", 2048); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_name = flds.AddStr("name", 255); + this.fld_case_match = flds.AddBool("case_match"); + this.fld_aliases = flds.AddStr("aliases", 2048); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_magicword"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_name)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -56,7 +56,7 @@ class Site_magicword_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_magicword_itm itm = (Site_magicword_itm)list.Get_at(i); Insert(site_abrv, itm.Name(), itm.Case_match(), itm.Aliases()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespace_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespace_tbl.java index 562621df2..4e8110b97 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespace_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespace_tbl.java @@ -13,28 +13,28 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; public class Site_namespace_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_id, fld_case_tid, fld_canonical, fld_localized, fld_subpages, fld_content, fld_defaultcontentmodel; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_namespace_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_id = flds.Add_int("id"); - this.fld_case_tid = flds.Add_str("case_tid", 255); - this.fld_canonical = flds.Add_str("canonical", 255); - this.fld_localized = flds.Add_str("localized", 255); - this.fld_subpages = flds.Add_byte("subpages"); - this.fld_content = flds.Add_byte("content"); - this.fld_defaultcontentmodel = flds.Add_str("defaultcontentmodel", 255); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_id = flds.AddInt("id"); + this.fld_case_tid = flds.AddStr("case_tid", 255); + this.fld_canonical = flds.AddStr("canonical", 255); + this.fld_localized = flds.AddStr("localized", 255); + this.fld_subpages = flds.AddByte("subpages"); + this.fld_content = flds.AddByte("content"); + this.fld_defaultcontentmodel = flds.AddStr("defaultcontentmodel", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_namespace"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_id)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -63,7 +63,7 @@ public class Site_namespace_tbl implements Db_tbl { public void Insert(byte[] site_abrv, Ordered_hash list) { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_namespace_itm itm = (Site_namespace_itm)list.Get_at(i); Insert(site_abrv, itm.Id(), itm.Case_tid(), itm.Canonical(), itm.Localized(), itm.Subpages(), itm.Content(), itm.Defaultcontentmodel()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespacealias_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespacealias_tbl.java index f3fac2f28..90efee444 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespacealias_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_namespacealias_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_namespacealias_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_id, fld_alias; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_namespacealias_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_id = flds.Add_int("id"); - this.fld_alias = flds.Add_str("alias", 2048); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_id = flds.AddInt("id"); + this.fld_alias = flds.AddStr("alias", 2048); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_namespacealias"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_normal_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_id, fld_alias)));} // NOTE: kk.w has duplicate entries in json - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -54,7 +54,7 @@ class Site_namespacealias_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_namespacealias_itm itm = (Site_namespacealias_itm)list.Get_at(i); Insert(site_abrv, itm.Id(), itm.Alias()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_showhook_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_showhook_tbl.java index e15bf788f..cdf21b642 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_showhook_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_showhook_tbl.java @@ -13,24 +13,24 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_showhook_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_name, fld_scribunto, fld_subscribers; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_showhook_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_name = flds.Add_str("name", 255); - this.fld_scribunto = flds.Add_str("scribunto", 255); - this.fld_subscribers = flds.Add_str("subscribers", 2048); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_name = flds.AddStr("name", 255); + this.fld_scribunto = flds.AddStr("scribunto", 255); + this.fld_subscribers = flds.AddStr("subscribers", 2048); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_showhook"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_name)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -56,7 +56,7 @@ class Site_showhook_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_showhook_itm itm = (Site_showhook_itm)list.Get_at(i); Insert(site_abrv, itm.Name(), itm.Scribunto(), itm.Subscribers()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_skin_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_skin_tbl.java index 1cec670a6..8c983c097 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_skin_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_skin_tbl.java @@ -13,25 +13,25 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_skin_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_code, fld_dflt, fld_name, fld_unusable; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_skin_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_code = flds.Add_str("code", 255); - this.fld_dflt = flds.Add_bool("dflt"); - this.fld_name = flds.Add_str("name", 255); - this.fld_unusable = flds.Add_bool("unusable"); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_code = flds.AddStr("code", 255); + this.fld_dflt = flds.AddBool("dflt"); + this.fld_name = flds.AddStr("name", 255); + this.fld_unusable = flds.AddBool("unusable"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_skin"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_code)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -58,7 +58,7 @@ class Site_skin_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_skin_itm itm = (Site_skin_itm)list.Get_at(i); Insert(site_abrv, itm.Code(), itm.Dflt(), itm.Name(), itm.Unusable()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_specialpagealias_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_specialpagealias_tbl.java index a99e11984..33bbd2c2a 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_specialpagealias_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_specialpagealias_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_specialpagealias_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_realname, fld_aliases; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_specialpagealias_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_realname = flds.Add_str("realname", 255); - this.fld_aliases = flds.Add_str("aliases", 2048); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_realname = flds.AddStr("realname", 255); + this.fld_aliases = flds.AddStr("aliases", 2048); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_specialpagealias"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main")), fld_site_abrv, fld_realname)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -54,7 +54,7 @@ class Site_specialpagealias_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Site_specialpagealias_itm itm = (Site_specialpagealias_itm)list.Get_at(i); Insert(site_abrv, itm.Realname(), itm.Aliases()); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_statistic_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_statistic_tbl.java index 18ed5f4ef..903b828ac 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_statistic_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_statistic_tbl.java @@ -13,30 +13,30 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.dbs.*; class Site_statistic_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_pages, fld_articles, fld_edits, fld_images, fld_users, fld_activeusers, fld_admins, fld_jobs, fld_queued_massmessages; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_statistic_tbl(Db_conn conn) { this.conn = conn; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_pages = flds.Add_long("pages"); - this.fld_articles = flds.Add_long("articles"); - this.fld_edits = flds.Add_long("edits"); - this.fld_images = flds.Add_long("images"); - this.fld_users = flds.Add_long("users"); - this.fld_activeusers = flds.Add_long("activeusers"); - this.fld_admins = flds.Add_long("admins"); - this.fld_jobs = flds.Add_long("jobs"); - this.fld_queued_massmessages = flds.Add_long("queued_massmessages"); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_pages = flds.AddLong("pages"); + this.fld_articles = flds.AddLong("articles"); + this.fld_edits = flds.AddLong("edits"); + this.fld_images = flds.AddLong("images"); + this.fld_users = flds.AddLong("users"); + this.fld_activeusers = flds.AddLong("activeusers"); + this.fld_admins = flds.AddLong("admins"); + this.fld_jobs = flds.AddLong("jobs"); + this.fld_queued_massmessages = flds.AddLong("queued_massmessages"); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private static final String tbl_name = "site_statistic"; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); diff --git a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_val_tbl.java b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_val_tbl.java index fd52118bd..960712dba 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_val_tbl.java +++ b/400_xowa/src/gplx/xowa/bldrs/wms/sites/Site_val_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.*; +package gplx.xowa.bldrs.wms.sites; import gplx.*; import gplx.dbs.*; class Site_val_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_abrv, fld_val; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete; public Site_val_tbl(Db_conn conn, String tbl_name) { this.conn = conn; this.tbl_name = tbl_name; - this.fld_site_abrv = flds.Add_str("site_abrv", 255); - this.fld_val = flds.Add_str("val", 255); + this.fld_site_abrv = flds.AddStr("site_abrv", 255); + this.fld_val = flds.AddStr("val", 255); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_unique_by_name(tbl_name, Dbmeta_idx_itm.Bld_idx_name(tbl_name, "main"), fld_site_abrv, fld_val)));} - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Rls() { stmt_select = Db_stmt_.Rls(stmt_select); stmt_insert = Db_stmt_.Rls(stmt_insert); @@ -51,7 +51,7 @@ class Site_val_tbl implements Db_tbl { if (stmt_delete == null) stmt_delete = conn.Stmt_delete(tbl_name, fld_site_abrv); if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_delete.Clear().Crt_bry_as_str(fld_site_abrv, site_abrv).Exec_delete(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { byte[] itm = (byte[])list.Get_at(i); Insert(site_abrv, itm); diff --git a/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_import_marker.java b/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_import_marker.java index 09068a463..001d87f90 100644 --- a/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_import_marker.java +++ b/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_import_marker.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.bldrs.xmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; -import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.xowa.bldrs.cmds.utils.*; +package gplx.xowa.bldrs.xmls; import gplx.*; import gplx.xowa.*; +import gplx.gfui.kits.core.*; import gplx.xowa.bldrs.cmds.utils.*; public class Xob_import_marker { private final Hash_adp_bry in_progress_hash = Hash_adp_bry.cs(); public void Bgn(Xowe_wiki wiki) { - in_progress_hash.Add_as_key_and_val(wiki.Domain_bry()); + in_progress_hash.AddAsKeyAndVal(wiki.Domain_bry()); Io_mgr.Instance.SaveFilStr(url_(wiki), "XOWA has created this file to indicate that an import is in progress. This file will be deleted once the import is completed."); } public void End(Xowe_wiki wiki) { diff --git a/400_xowa/src/gplx/xowa/drds/ios/media_scanners/Xod_media_scanner__base.java b/400_xowa/src/gplx/xowa/drds/ios/media_scanners/Xod_media_scanner__base.java index ba1208435..c1a8364be 100644 --- a/400_xowa/src/gplx/xowa/drds/ios/media_scanners/Xod_media_scanner__base.java +++ b/400_xowa/src/gplx/xowa/drds/ios/media_scanners/Xod_media_scanner__base.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.drds.ios.media_scanners; import gplx.*; import gplx.xowa.*; import gplx.xowa.drds.*; import gplx.xowa.drds.ios.*; +package gplx.xowa.drds.ios.media_scanners; import gplx.*; public abstract class Xod_media_scanner__base implements Xod_media_scanner { private final List_adp list = List_adp_.New(); public Xod_media_scanner__base() { @@ -23,7 +23,7 @@ public abstract class Xod_media_scanner__base implements Xod_media_scanner { public Gfo_evt_mgr Evt_mgr() {return evt_mgr;} private final Gfo_evt_mgr evt_mgr; public Xod_media_scanner Add(Io_url url) {list.Add(url.Xto_api()); return this;} public void Scan() { - String[] urls = list.To_str_ary_and_clear(); + String[] urls = list.ToStrAryAndClear(); Gfo_log_.Instance.Info("xo.io:media scan", "urls", String_.Concat_with_str(":", urls)); this.Scan__hook(urls); } diff --git a/400_xowa/src/gplx/xowa/drds/pages/Xod_page_itm.java b/400_xowa/src/gplx/xowa/drds/pages/Xod_page_itm.java index 477d94e7c..49fa12653 100644 --- a/400_xowa/src/gplx/xowa/drds/pages/Xod_page_itm.java +++ b/400_xowa/src/gplx/xowa/drds/pages/Xod_page_itm.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.drds.pages; import gplx.*; import gplx.xowa.*; import gplx.xowa.drds.*; +package gplx.xowa.drds.pages; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.sections.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.wikis.pages.*; import gplx.xowa.wikis.pages.tags.*; +import gplx.xowa.wikis.pages.tags.*; public class Xod_page_itm { public int Page_id() {return page_id;} private int page_id; public long Rev_id() {return rev_id;} private long rev_id; @@ -84,7 +84,7 @@ public class Xod_page_itm { .Add_str_a7_null(head_ttl).Add_byte_pipe() .Add_str_a7_null(first_allowed_editor_role).Add_byte_nl() ; - int len = section_list.Count(); + int len = section_list.Len(); for (int i = 0; i < len; ++i) { Xoh_section_itm section = (Xoh_section_itm)section_list.Get_at(i); section.To_bfr(bfr); diff --git a/400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java b/400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java index c8b41c9e7..2cc6408c4 100644 --- a/400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java +++ b/400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files; import gplx.*; import gplx.xowa.*; +package gplx.xowa.files; import gplx.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.repos.*; public class Xoa_repo_mgr implements Gfo_invk { private final Xoa_fsys_mgr app_fsys; private final Xof_rule_mgr ext_rule_mgr; public Xoa_repo_mgr(Xoa_fsys_mgr app_fsys, Xof_rule_mgr ext_rule_mgr) {this.app_fsys = app_fsys; this.ext_rule_mgr = ext_rule_mgr;} - public int Count() {return hash.Count();} + public int Count() {return hash.Len();} public Xof_repo_itm Get_at(int i) {return (Xof_repo_itm)hash.Get_at(i);} - public Xof_repo_itm Get_by(byte[] key) {return (Xof_repo_itm)hash.Get_by(key);} + public Xof_repo_itm Get_by(byte[] key) {return (Xof_repo_itm)hash.GetByOrNull(key);} public Xof_repo_itm Get_by_primary(byte[] key) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Xof_repo_itm repo = (Xof_repo_itm)hash.Get_at(i); if (Bry_.Eq(key, repo.Wiki_domain()) && repo.Primary()) return repo; @@ -30,7 +30,7 @@ public class Xoa_repo_mgr implements Gfo_invk { return null; } public Xof_repo_itm Get_by_wmf_fsys(byte[] key) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Xof_repo_itm repo = (Xof_repo_itm)hash.Get_at(i); if (Bry_.Eq(key, repo.Wiki_domain()) && repo.Wmf_fsys()) return repo; @@ -38,7 +38,7 @@ public class Xoa_repo_mgr implements Gfo_invk { return null; } public Xof_repo_itm Get_by_wiki_key(byte[] key) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Xof_repo_itm repo = (Xof_repo_itm)hash.Get_at(i); if (Bry_.Eq(key, repo.Wiki_domain())) return repo; @@ -52,7 +52,7 @@ public class Xoa_repo_mgr implements Gfo_invk { } private static final String Invk_set = "set"; public Xof_repo_itm Set(String key, String url_str, String wiki) { byte[] key_bry = Bry_.new_u8(key); - Xof_repo_itm itm = (Xof_repo_itm)hash.Get_by(key_bry); + Xof_repo_itm itm = (Xof_repo_itm)hash.GetByOrNull(key_bry); byte[] wiki_domain = Bry_.new_u8(wiki); if (itm == null) { itm = new Xof_repo_itm(key_bry, app_fsys, ext_rule_mgr, wiki_domain); diff --git a/400_xowa/src/gplx/xowa/files/Xof_ext_.java b/400_xowa/src/gplx/xowa/files/Xof_ext_.java index 0a6d15cea..2da574fa2 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_ext_.java +++ b/400_xowa/src/gplx/xowa/files/Xof_ext_.java @@ -91,7 +91,7 @@ public class Xof_ext_ { return Bry__ary[id]; } public static int Get_id_by_ext_(byte[] ext_bry) { - Object o = id_hash.Get_by(ext_bry); + Object o = id_hash.GetByOrNull(ext_bry); return o == null ? Id_unknown : ((Int_obj_val)o).Val(); } public static Xof_ext new_by_ttl_(byte[] ttl) { diff --git a/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java b/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java index 4cf669849..dbfcb150c 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java +++ b/400_xowa/src/gplx/xowa/files/Xof_file_wkr.java @@ -15,7 +15,8 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files; import gplx.*; import gplx.xowa.*; import gplx.core.threads.*; import gplx.core.ios.*; import gplx.core.ios.streams.*; -import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.fsdb.data.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.imgs.*; +import gplx.fsdb.meta.*; +import gplx.xowa.files.imgs.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.guis.cbks.js.*; public class Xof_file_wkr implements Gfo_thread_wkr { private final Xof_orig_mgr orig_mgr; private final Xof_bin_mgr bin_mgr; private final Fsm_mnt_mgr mnt_mgr; private final Xou_cache_mgr cache_mgr; @@ -30,7 +31,7 @@ public class Xof_file_wkr implements Gfo_thread_wkr { public String Thread__name() {return "xowa.load_imgs";} public boolean Thread__resume() {return true;} public void Thread__exec() { - int len = imgs.Count(); + int len = imgs.Len(); for (int i = 0; i < len; ++i) Exec_by_fsdb((Xof_fsdb_itm)imgs.Get_at(i)); Xoa_app_.Usr_dlg().Prog_none("", "", ""); diff --git a/400_xowa/src/gplx/xowa/files/Xof_mime_minor_.java b/400_xowa/src/gplx/xowa/files/Xof_mime_minor_.java index 52be3dda2..1aad6658e 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_mime_minor_.java +++ b/400_xowa/src/gplx/xowa/files/Xof_mime_minor_.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files; import gplx.*; import gplx.xowa.*; +package gplx.xowa.files; import gplx.*; import gplx.core.primitives.*; public class Xof_mime_minor_ { public static Xof_ext ext_(byte[] minor_mime) { - Int_obj_val id_obj = (Int_obj_val)mime_hash.Get_by(minor_mime); + Int_obj_val id_obj = (Int_obj_val)mime_hash.GetByOrNull(minor_mime); int id = id_obj == null ? Xof_ext_.Id_unknown : id_obj.Val(); return Xof_ext_.new_by_id_(id); } diff --git a/400_xowa/src/gplx/xowa/files/Xofv_repo_mgr.java b/400_xowa/src/gplx/xowa/files/Xofv_repo_mgr.java index c2cb86c1c..8b47fe3e4 100644 --- a/400_xowa/src/gplx/xowa/files/Xofv_repo_mgr.java +++ b/400_xowa/src/gplx/xowa/files/Xofv_repo_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files; import gplx.*; import gplx.xowa.*; +package gplx.xowa.files; import gplx.*; import gplx.core.primitives.*; public class Xofv_repo_mgr { private final Hash_adp_bry key_regy = Hash_adp_bry.cs(); @@ -24,9 +24,9 @@ public class Xofv_repo_mgr { return this; } public Xofv_repo_itm Get_by_key(byte[] key) { - return (Xofv_repo_itm)key_regy.Get_by(key); + return (Xofv_repo_itm)key_regy.GetByOrNull(key); } public Xofv_repo_itm Get_by_tid(byte tid) { - return (Xofv_repo_itm)tid_regy.Get_by(tid_key.Val_(tid)); + return (Xofv_repo_itm)tid_regy.GetByOrNull(tid_key.Val_(tid)); } } \ No newline at end of file diff --git a/400_xowa/src/gplx/xowa/files/Xow_file_mgr.java b/400_xowa/src/gplx/xowa/files/Xow_file_mgr.java index 3eb04cdb7..8871ff27e 100644 --- a/400_xowa/src/gplx/xowa/files/Xow_file_mgr.java +++ b/400_xowa/src/gplx/xowa/files/Xow_file_mgr.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files; import gplx.*; import gplx.xowa.*; -import gplx.dbs.*; import gplx.dbs.cfgs.*; +import gplx.dbs.cfgs.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*; import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.wikis.tdbs.metas.*; @@ -99,7 +99,7 @@ public class Xow_file_mgr implements Gfo_invk { } public void Cfg_set(String grp, String key, String val) { // TEST: should only be called by tests if (test_grps == null) test_grps = Hash_adp_.New(); - Db_cfg_hash grp_itm = (Db_cfg_hash)test_grps.Get_by(grp); + Db_cfg_hash grp_itm = (Db_cfg_hash)test_grps.GetByOrNull(grp); if (grp_itm == null) { grp_itm = new Db_cfg_hash(grp); test_grps.Add(grp, grp_itm); @@ -108,7 +108,7 @@ public class Xow_file_mgr implements Gfo_invk { } private Hash_adp test_grps; public Db_cfg_hash Cfg_get(String grp) { if (test_grps != null) { - Db_cfg_hash rv = (Db_cfg_hash)test_grps.Get_by(grp); + Db_cfg_hash rv = (Db_cfg_hash)test_grps.GetByOrNull(grp); return rv == null ? new Db_cfg_hash("") : rv; } if (this.Version() == Version_1) return new Db_cfg_hash(""); diff --git a/400_xowa/src/gplx/xowa/files/bins/Io_download_mgr__memory.java b/400_xowa/src/gplx/xowa/files/bins/Io_download_mgr__memory.java index 5987ec544..b1fda7126 100644 --- a/400_xowa/src/gplx/xowa/files/bins/Io_download_mgr__memory.java +++ b/400_xowa/src/gplx/xowa/files/bins/Io_download_mgr__memory.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.bins; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.ios.*; import gplx.core.ios.streams.*; +package gplx.xowa.files.bins; import gplx.*; +import gplx.core.ios.streams.*; public class Io_download_mgr__memory implements Io_download_mgr { private final Ordered_hash hash = Ordered_hash_.New(); public void Clear() {hash.Clear();} public void Upload_data(String url, byte[] data) {hash.Add(url, data);} public Io_stream_rdr Download_as_rdr(String url) { - byte[] data = (byte[])hash.Get_by(url); if (data == null) return Io_stream_rdr_.Noop; + byte[] data = (byte[])hash.GetByOrNull(url); if (data == null) return Io_stream_rdr_.Noop; return Io_stream_rdr_.New__mem(data); } } diff --git a/400_xowa/src/gplx/xowa/files/bins/Xof_bin_mgr.java b/400_xowa/src/gplx/xowa/files/bins/Xof_bin_mgr.java index 76b0f453a..21c33022f 100644 --- a/400_xowa/src/gplx/xowa/files/bins/Xof_bin_mgr.java +++ b/400_xowa/src/gplx/xowa/files/bins/Xof_bin_mgr.java @@ -13,11 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.bins; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; +package gplx.xowa.files.bins; import gplx.*; +import gplx.xowa.files.*; import gplx.core.primitives.*; import gplx.core.ios.*; import gplx.core.ios.streams.*; import gplx.fsdb.meta.*; -import gplx.xowa.files.repos.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.cnvs.*; import gplx.xowa.files.caches.*; -import gplx.xowa.bldrs.wms.*; +import gplx.xowa.files.repos.*; +import gplx.xowa.files.cnvs.*; public class Xof_bin_mgr { private final Fsm_mnt_mgr mnt_mgr; private final Gfo_usr_dlg usr_dlg; private final Xow_repo_mgr repo_mgr; private final Xof_url_bldr url_bldr = Xof_url_bldr.new_v2(); @@ -37,7 +38,7 @@ public class Xof_bin_mgr { if (String_.Eq(key, wkr.Key())) continue; list.Add(wkr); } - this.wkrs = (Xof_bin_wkr[])list.To_ary(Xof_bin_wkr.class); + this.wkrs = (Xof_bin_wkr[])list.ToAry(Xof_bin_wkr.class); this.wkrs_len = wkrs.length; } public void Wkrs__add(Xof_bin_wkr v) { diff --git a/400_xowa/src/gplx/xowa/files/bins/Xof_bin_skip_mgr.java b/400_xowa/src/gplx/xowa/files/bins/Xof_bin_skip_mgr.java index cbf7a4786..b38d4476c 100644 --- a/400_xowa/src/gplx/xowa/files/bins/Xof_bin_skip_mgr.java +++ b/400_xowa/src/gplx/xowa/files/bins/Xof_bin_skip_mgr.java @@ -14,8 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.bins; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.ios.*; import gplx.core.ios.streams.*; -import gplx.fsdb.meta.*; import gplx.xowa.files.fsdb.*; +import gplx.core.ios.streams.*; +import gplx.fsdb.meta.*; public class Xof_bin_skip_mgr { private Xof_bin_skip_wkr[] wkrs = new Xof_bin_skip_wkr[0]; private int wkrs_len; public Xof_bin_skip_mgr(Fsm_cfg_mgr cfg_mgr, String[] wkr_keys) { @@ -24,7 +24,7 @@ public class Xof_bin_skip_mgr { Xof_bin_skip_wkr wkr = New_wkr(cfg_mgr, wkr_keys[i]); if (wkr != null) list.Add(wkr); } - this.wkrs = (Xof_bin_skip_wkr[])list.To_ary_and_clear(Xof_bin_skip_wkr.class); + this.wkrs = (Xof_bin_skip_wkr[])list.ToAryAndClear(Xof_bin_skip_wkr.class); this.wkrs_len = wkrs.length; } public boolean Skip(Xof_fsdb_itm fsdb, Io_stream_rdr src_rdr) { diff --git a/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_mgr.java b/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_mgr.java index 50eeaa8a9..aaeac4cc1 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_mgr.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; +package gplx.xowa.files.caches; import gplx.*; import gplx.dbs.*; class Xofc_dir_mgr { private final Xofc_dir_tbl tbl = new Xofc_dir_tbl(); @@ -21,7 +21,7 @@ class Xofc_dir_mgr { private Xof_cache_mgr cache_mgr; public Xofc_dir_mgr(Xof_cache_mgr v) {this.cache_mgr = v;} public void Conn_(Db_conn v, boolean created, boolean schema_is_1) {tbl.Conn_(v, created, schema_is_1);} - public Xofc_dir_itm Get_by_id(int id) {return (Xofc_dir_itm)hash_by_ids.Get_by(id);} + public Xofc_dir_itm Get_by_id(int id) {return (Xofc_dir_itm)hash_by_ids.GetByOrNull(id);} public Xofc_dir_itm Get_by_name_or_make(byte[] name) { Xofc_dir_itm itm = Get_by_name_or_null(name); if (itm == null) { // not in memory / db @@ -32,7 +32,7 @@ class Xofc_dir_mgr { return itm; } public Xofc_dir_itm Get_by_name_or_null(byte[] name) { - Xofc_dir_itm itm = (Xofc_dir_itm)hash_by_names.Get_by(name); + Xofc_dir_itm itm = (Xofc_dir_itm)hash_by_names.GetByOrNull(name); if (itm == null) { // not in memory itm = tbl.Select_one(name); // check db if (itm == Xofc_dir_itm.Null) return null; // in db @@ -45,7 +45,7 @@ class Xofc_dir_mgr { hash_by_ids.Add(dir.Id(), dir); } public void Save_all() { - int len = hash_by_names.Count(); + int len = hash_by_names.Len(); boolean err_seen = false; for (int i = 0; i < len; i++) { Xofc_dir_itm itm = (Xofc_dir_itm)hash_by_names.Get_at(i); @@ -66,7 +66,7 @@ class Xofc_dir_mgr { public void Load_all() { List_adp list = List_adp_.New(); tbl.Select_all(list); - int len = list.Count(); + int len = list.Len(); hash_by_ids.Clear(); hash_by_names.Clear(); for (int i = 0; i < len; ++i) { diff --git a/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_tbl.java b/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_tbl.java index ed90c8fa7..1c73bb6ce 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_tbl.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xofc_dir_tbl.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.dbs.*; import gplx.dbs.engines.sqlite.*; +package gplx.xowa.files.caches; import gplx.*; +import gplx.dbs.*; class Xofc_dir_tbl implements Rls_able { - private String tbl_name = "file_cache_dir"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private String tbl_name = "file_cache_dir"; private final DbmetaFldList flds = new DbmetaFldList(); private String fld_id, fld_name; private Db_conn conn; private final Db_stmt_bldr stmt_bldr = new Db_stmt_bldr(); private Db_stmt select_stmt; public void Conn_(Db_conn new_conn, boolean created, boolean schema_is_1) { @@ -26,8 +26,8 @@ class Xofc_dir_tbl implements Rls_able { tbl_name = "cache_dir"; fld_prefix = "dir_"; } - fld_id = flds.Add_int_pkey(fld_prefix + "id"); - fld_name = flds.Add_str(fld_prefix + "name", 255); + fld_id = flds.AddIntPkey(fld_prefix + "id"); + fld_name = flds.AddStr(fld_prefix + "name", 255); if (created) { Dbmeta_tbl_itm meta = Dbmeta_tbl_itm.New(tbl_name, flds , Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "name", fld_name) @@ -71,7 +71,7 @@ class Xofc_dir_tbl implements Rls_able { } public void Select_all(List_adp list) { list.Clear(); - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); try { while (rdr.Move_next()) list.Add(new_itm(rdr)); diff --git a/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_mgr.java b/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_mgr.java index ac4773eac..5c06331a8 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_mgr.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_mgr.java @@ -15,7 +15,8 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.core.primitives.*; -import gplx.dbs.*; import gplx.fsdb.*; import gplx.xowa.wikis.*; +import gplx.dbs.*; +import gplx.xowa.wikis.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.imgs.*; class Xofc_fil_mgr { private Xof_cache_mgr cache_mgr; @@ -23,7 +24,7 @@ class Xofc_fil_mgr { public Xofc_fil_mgr(Xof_cache_mgr v) {this.cache_mgr = v;} public void Conn_(Db_conn v, boolean created, boolean schema_is_1) {tbl.Conn_(v, created, schema_is_1);} public void Save_all() { - int len = hash.Count(); + int len = hash.Len(); boolean err_seen = false; for (int i = 0; i < len; i++) { Xofc_fil_itm itm = (Xofc_fil_itm)hash.Get_at(i); @@ -43,7 +44,7 @@ class Xofc_fil_mgr { } public Xofc_fil_itm Get_or_make(int dir_id, byte[] name, boolean is_orig, int w, int h, double time, Xof_ext ext, long size, Bool_obj_ref created) { byte[] key = Xofc_fil_itm.Gen_hash_key_v1(key_bldr, dir_id, name, is_orig, w, h, time); - Xofc_fil_itm itm = (Xofc_fil_itm)hash.Get_by(key); + Xofc_fil_itm itm = (Xofc_fil_itm)hash.GetByOrNull(key); if (itm == Xofc_fil_itm.Null) { // not in memory itm = tbl.Select_one_v1(dir_id, name, is_orig, w, h, time); if (itm == Xofc_fil_itm.Null) { // not in db @@ -57,7 +58,7 @@ class Xofc_fil_mgr { } public Xofc_fil_itm Get_or_null(int dir_id, byte[] name, boolean is_orig, int w, double time, int page) { byte[] key = Xofc_fil_itm.Gen_hash_key_v2(key_bldr, dir_id, name, is_orig, w, time, page); - Xofc_fil_itm itm = (Xofc_fil_itm)hash.Get_by(key); + Xofc_fil_itm itm = (Xofc_fil_itm)hash.GetByOrNull(key); if (itm == null) { // not in memory itm = tbl.Select_one_v2(dir_id, name, is_orig, w, time, page); if (itm == Xofc_fil_itm.Null) return itm; // not in db @@ -80,7 +81,7 @@ class Xofc_fil_mgr { dir_mgr.Save_all(); dir_mgr.Load_all(); // save and load all dirs this.Save_all(); tbl.Select_all(key_bldr, hash); // save and load all fils hash.Sort(); // sorts by cache_time desc - int len = hash.Count(); + int len = hash.Len(); long cur_size = 0, actl_size = 0; Xof_url_bldr url_bldr = new Xof_url_bldr(); List_adp deleted = List_adp_.New(); @@ -102,7 +103,7 @@ class Xofc_fil_mgr { if (err_msg != null) Db_recalc_next_id(itm, err_msg); } - len = deleted.Count(); + len = deleted.Len(); for (int i = 0; i < len; i++) { Xofc_fil_itm itm = (Xofc_fil_itm)deleted.Get_at(i); byte[] fil_key = itm.Gen_hash_key_v1(key_bldr); diff --git a/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_tbl.java b/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_tbl.java index f9253123a..bd0f5fc25 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_tbl.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xofc_fil_tbl.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.dbs.*; import gplx.dbs.engines.sqlite.*; +package gplx.xowa.files.caches; import gplx.*; +import gplx.xowa.files.*; +import gplx.dbs.*; class Xofc_fil_tbl implements Rls_able { - private String tbl_name = "file_cache_fil"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private String tbl_name = "file_cache_fil"; private final DbmetaFldList flds = new DbmetaFldList(); private String fld_uid, fld_dir_id, fld_name, fld_is_orig, fld_w, fld_h, fld_time, fld_page, fld_ext, fld_size, fld_cache_time; private Db_conn conn; private final Db_stmt_bldr stmt_bldr = new Db_stmt_bldr(); private Db_stmt select_itm_stmt, select_itm_v2_stmt; public Db_conn Conn() {return conn;} @@ -27,22 +28,22 @@ class Xofc_fil_tbl implements Rls_able { tbl_name = "cache_fil"; fld_prefix = "fil_"; } - fld_uid = flds.Add_int_pkey("uid"); - fld_dir_id = flds.Add_int("dir_id"); - fld_name = flds.Add_str(fld_prefix + "name", 255); - fld_is_orig = flds.Add_byte(fld_prefix + "is_orig"); - fld_w = flds.Add_int(fld_prefix + "w"); - fld_h = flds.Add_int(fld_prefix + "h"); - fld_time = flds.Add_int(fld_prefix + "thumbtime"); + fld_uid = flds.AddIntPkey("uid"); + fld_dir_id = flds.AddInt("dir_id"); + fld_name = flds.AddStr(fld_prefix + "name", 255); + fld_is_orig = flds.AddByte(fld_prefix + "is_orig"); + fld_w = flds.AddInt(fld_prefix + "w"); + fld_h = flds.AddInt(fld_prefix + "h"); + fld_time = flds.AddInt(fld_prefix + "thumbtime"); if (schema_is_1) { - fld_page = Dbmeta_fld_itm.Key_null; + fld_page = DbmetaFldItm.KeyNull; } else { - fld_page = flds.Add_int(fld_prefix + "page"); + fld_page = flds.AddInt(fld_prefix + "page"); } - fld_ext = flds.Add_int(fld_prefix + "ext"); - fld_size = flds.Add_long(fld_prefix + "size"); - fld_cache_time = flds.Add_long("cache_time"); + fld_ext = flds.AddInt(fld_prefix + "ext"); + fld_size = flds.AddLong(fld_prefix + "size"); + fld_cache_time = flds.AddLong("cache_time"); if (created) { Dbmeta_tbl_itm meta = Dbmeta_tbl_itm.New(tbl_name, flds , Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "fil", fld_name, fld_is_orig, fld_w, fld_h, fld_time, fld_cache_time, fld_uid) @@ -120,7 +121,7 @@ class Xofc_fil_tbl implements Rls_able { } public void Select_all(Bry_bfr fil_key_bldr, Ordered_hash hash) { hash.Clear(); - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); try { while (rdr.Move_next()) { Xofc_fil_itm fil_itm = new_itm(rdr); diff --git a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_finder_mem.java b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_finder_mem.java index cce8d93b4..c7c62104f 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_finder_mem.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_finder_mem.java @@ -22,7 +22,7 @@ public class Xou_cache_finder_mem implements Xou_cache_finder { private final Xof_url_bldr url_bldr = Xof_url_bldr.new_v2(); public boolean Find(Xow_wiki wiki, byte[] page_url, Xof_fsdb_itm cur) { byte[] key = Xou_cache_itm.Key_gen(tmp_bfr, cur.Lnki_wiki_abrv(), cur.Lnki_ttl(), cur.Lnki_type(), cur.Lnki_upright(), cur.Lnki_w(), cur.Lnki_h(), cur.Lnki_time(), cur.Lnki_page(), cur.User_thumb_w()); - Xof_fsdb_itm mem = (Xof_fsdb_itm)hash.Get_by(key); + Xof_fsdb_itm mem = (Xof_fsdb_itm)hash.GetByOrNull(key); if (mem == null) { cur.Init_at_cache(false, 0, 0, Io_url_.Empty); return false; diff --git a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java index 6e64e64d5..0f25f5886 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java @@ -14,8 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.primitives.*; import gplx.dbs.*; import gplx.dbs.cfgs.*; -import gplx.xowa.files.fsdb.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.imgs.*; +import gplx.dbs.*; import gplx.dbs.cfgs.*; +import gplx.xowa.files.repos.*; import gplx.xowa.files.imgs.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.users.data.*; public class Xou_cache_mgr implements Gfo_invk { private long fsys_size_cur = 0; @@ -41,7 +41,7 @@ public class Xou_cache_mgr implements Gfo_invk { synchronized (thread_lock) { this.Page_bgn(); byte[] key = Xou_cache_itm.Key_gen(tmp_bfr, wiki, ttl, type, upright, w, h, time, page, user_thumb_w); - Xou_cache_itm rv = (Xou_cache_itm)hash.Get_by(key); + Xou_cache_itm rv = (Xou_cache_itm)hash.GetByOrNull(key); if (rv == Xou_cache_itm.Null) { rv = cache_tbl.Select_one(wiki, ttl, type, upright, w, h, time, page, user_thumb_w); if (rv == Xou_cache_itm.Null) return Xou_cache_itm.Null; @@ -89,7 +89,7 @@ public class Xou_cache_mgr implements Gfo_invk { Db_conn conn = cache_tbl.Conn(); try { conn.Txn_bgn("user__file_cache__save"); - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xou_cache_itm itm = (Xou_cache_itm)hash.Get_at(i); cache_tbl.Db_save(itm); @@ -105,12 +105,12 @@ public class Xou_cache_mgr implements Gfo_invk { try { this.Db_save(); cache_tbl.Select_all(tmp_bfr, hash); // save and load Ordered_hash grp_hash = Ordered_hash_.New(); // aggregate by file path; needed when same commons file used by two wikis - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xou_cache_itm itm = (Xou_cache_itm)hash.Get_at(i); Io_url itm_url = Calc_url(itm); itm.File_url_(itm_url); - Xou_cache_grp grp = (Xou_cache_grp)grp_hash.Get_by(itm_url.Raw()); + Xou_cache_grp grp = (Xou_cache_grp)grp_hash.GetByOrNull(itm_url.Raw()); if (grp == null) { grp = new Xou_cache_grp(itm_url); grp_hash.Add(itm_url.Raw(), grp); @@ -118,7 +118,7 @@ public class Xou_cache_mgr implements Gfo_invk { grp.Add(itm); } grp_hash.Sort_by(Xou_cache_grp_sorter.Instance); // sorts by cache_time desc - len = grp_hash.Count(); + len = grp_hash.Len(); long fsys_size_calc = 0, fsys_size_temp = 0; List_adp deleted = List_adp_.New(); for (int i = 0; i < len; ++i) { // iterate and find items to delete @@ -131,7 +131,7 @@ public class Xou_cache_mgr implements Gfo_invk { else fsys_size_calc = fsys_size_temp; } - len = deleted.Count(); + len = deleted.Len(); Db_conn conn = cache_tbl.Conn(); conn.Txn_bgn("user__file_cache__delete"); for (int i = 0; i < len; i++) { // iterate and delete @@ -193,7 +193,7 @@ public class Xou_cache_mgr implements Gfo_invk { private Keyval[] Info_kvs() { long view_date = Long_.Max_value; long fsys_size = 0; - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xou_cache_itm itm = (Xou_cache_itm)hash.Get_at(i); fsys_size += itm.File_size(); @@ -213,14 +213,14 @@ class Xou_cache_grp { public long View_date() {return view_date;} private long view_date; public long File_size() {return file_size;} private long file_size; public Io_url File_url() {return file_url;} private final Io_url file_url; - public int Len() {return list.Count();} + public int Len() {return list.Len();} public void Add(Xou_cache_itm itm) { if (itm.View_date() > view_date) view_date = itm.View_date(); file_size += itm.File_size(); list.Add(itm); } public void Delete(Ordered_hash cache_hash, Xou_cache_tbl cache_tbl) { - int len = list.Count(); + int len = list.Len(); boolean deleted = false; for (int i = 0; i < len; ++i) { Xou_cache_itm itm = (Xou_cache_itm)list.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_tbl.java b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_tbl.java index f6432c77f..2f16099c2 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_tbl.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_tbl.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.caches; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; +package gplx.xowa.files.caches; import gplx.*; +import gplx.xowa.files.*; import gplx.dbs.*; public class Xou_cache_tbl implements Rls_able { - private String tbl_name = "file_cache"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private String tbl_name = "file_cache"; private final DbmetaFldList flds = new DbmetaFldList(); private String fld_lnki_wiki_abrv, fld_lnki_ttl, fld_lnki_type, fld_lnki_upright, fld_lnki_w, fld_lnki_h, fld_lnki_time, fld_lnki_page, fld_user_thumb_w , fld_orig_repo, fld_orig_ttl, fld_orig_ext, fld_orig_w, fld_orig_h @@ -31,31 +32,31 @@ public class Xou_cache_tbl implements Rls_able { public Db_conn Conn() {return conn;} public Xou_cache_tbl(Db_conn conn) { this.conn = conn; - fld_lnki_wiki_abrv = flds.Add_str("lnki_wiki_abrv", 255); - fld_lnki_ttl = flds.Add_str("lnki_ttl", 255); - fld_lnki_type = flds.Add_int("lnki_type"); - fld_lnki_upright = flds.Add_double("lnki_upright"); - fld_lnki_w = flds.Add_int("lnki_w"); - fld_lnki_h = flds.Add_int("lnki_h"); - fld_lnki_time = flds.Add_double("lnki_time"); - fld_lnki_page = flds.Add_int("lnki_page"); - fld_user_thumb_w = flds.Add_int("user_thumb_w"); - fld_orig_repo = flds.Add_int("orig_repo"); - fld_orig_ttl = flds.Add_str("orig_ttl", 255); - fld_orig_ext = flds.Add_int("orig_ext"); - fld_orig_w = flds.Add_int("orig_w"); - fld_orig_h = flds.Add_int("orig_h"); - fld_html_w = flds.Add_int("html_w"); - fld_html_h = flds.Add_int("html_h"); - fld_html_time = flds.Add_double("html_time"); - fld_html_page = flds.Add_int("html_page"); - fld_file_is_orig = flds.Add_bool("file_is_orig"); - fld_file_w = flds.Add_int("file_w"); - fld_file_time = flds.Add_double("file_time"); - fld_file_page = flds.Add_int("file_page"); - fld_file_size = flds.Add_long("file_size"); - fld_view_count = flds.Add_int("view_count"); - fld_view_date = flds.Add_long("view_date"); + fld_lnki_wiki_abrv = flds.AddStr("lnki_wiki_abrv", 255); + fld_lnki_ttl = flds.AddStr("lnki_ttl", 255); + fld_lnki_type = flds.AddInt("lnki_type"); + fld_lnki_upright = flds.AddDouble("lnki_upright"); + fld_lnki_w = flds.AddInt("lnki_w"); + fld_lnki_h = flds.AddInt("lnki_h"); + fld_lnki_time = flds.AddDouble("lnki_time"); + fld_lnki_page = flds.AddInt("lnki_page"); + fld_user_thumb_w = flds.AddInt("user_thumb_w"); + fld_orig_repo = flds.AddInt("orig_repo"); + fld_orig_ttl = flds.AddStr("orig_ttl", 255); + fld_orig_ext = flds.AddInt("orig_ext"); + fld_orig_w = flds.AddInt("orig_w"); + fld_orig_h = flds.AddInt("orig_h"); + fld_html_w = flds.AddInt("html_w"); + fld_html_h = flds.AddInt("html_h"); + fld_html_time = flds.AddDouble("html_time"); + fld_html_page = flds.AddInt("html_page"); + fld_file_is_orig = flds.AddBool("file_is_orig"); + fld_file_w = flds.AddInt("file_w"); + fld_file_time = flds.AddDouble("file_time"); + fld_file_page = flds.AddInt("file_page"); + fld_file_size = flds.AddLong("file_size"); + fld_view_count = flds.AddInt("view_count"); + fld_view_date = flds.AddLong("view_date"); stmt_bldr.Conn_(conn, tbl_name, flds, fld_lnki_wiki_abrv, fld_lnki_ttl, fld_lnki_type, fld_lnki_upright, fld_lnki_w, fld_lnki_h, fld_lnki_time, fld_lnki_page, fld_user_thumb_w); conn.Rls_reg(this); } @@ -88,12 +89,12 @@ public class Xou_cache_tbl implements Rls_able { } public void Select_all(Bry_bfr fil_key_bldr, Ordered_hash hash) { hash.Clear(); - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); try { while (rdr.Move_next()) { Xou_cache_itm itm = new_itm(rdr); if (hash.Has(itm.Lnki_key())) { // dupes shouldn't happen, but has been reported; ISSUE#:534; DATE:2019-08-11 - Gfo_usr_dlg_.Instance.Note_many("", "", "user_cache: duplicate key; key=~{0} count=~{1}", itm.Lnki_key(), hash.Count()); + Gfo_usr_dlg_.Instance.Note_many("", "", "user_cache: duplicate key; key=~{0} count=~{1}", itm.Lnki_key(), hash.Len()); } else { hash.Add(itm.Lnki_key(), itm); @@ -115,7 +116,7 @@ public class Xou_cache_tbl implements Rls_able { itm.Db_state_(Db_cmd_mode.Tid_ignore); } catch (Exception e) {stmt_bldr.Rls(); throw Err_.new_exc(e, "xo", "db_save failed");} } - @gplx.Internal protected Db_rdr Select_all_for_test() {return conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_manual();} + @gplx.Internal protected Db_rdr Select_all_for_test() {return conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_manual();} private void Db_save_crt(Db_stmt stmt, Xou_cache_itm itm, boolean insert) { if (insert) { stmt.Val_bry_as_str (fld_lnki_wiki_abrv , itm.Lnki_wiki_abrv()) diff --git a/400_xowa/src/gplx/xowa/files/commons/Xof_commons_image_tbl.java b/400_xowa/src/gplx/xowa/files/commons/Xof_commons_image_tbl.java index 5a1f17995..b0a55e1af 100644 --- a/400_xowa/src/gplx/xowa/files/commons/Xof_commons_image_tbl.java +++ b/400_xowa/src/gplx/xowa/files/commons/Xof_commons_image_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.commons; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; +package gplx.xowa.files.commons; import gplx.*; import gplx.dbs.*; public class Xof_commons_image_tbl implements Rls_able { private Db_stmt stmt_insert; @@ -50,20 +50,20 @@ public class Xof_commons_image_tbl implements Rls_able { ); } finally {rdr.Rls();} } - private static final String tbl_name = "image"; private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "image"; private static final DbmetaFldList flds = new DbmetaFldList(); private static final String - fld_img_name = flds.Add_str("img_name", 255) // varbinary(255) - , fld_img_media_type = flds.Add_str("img_media_type", 255) // enum('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE')" - , fld_img_minor_mime = flds.Add_str("img_minor_mime", 255) // DEFAULT 'unknown'" - , fld_img_size = flds.Add_int("img_size") // int(8) unsigned - , fld_img_width = flds.Add_int("img_width") // int(5) - , fld_img_height = flds.Add_int("img_height") // int(5) - , fld_img_bits = flds.Add_short("img_bits") // int(3) - , fld_img_ext_id = flds.Add_int("img_ext_id") // xowa - , fld_img_timestamp = flds.Add_str("img_timestamp", 255) // 20140101155749 + fld_img_name = flds.AddStr("img_name", 255) // varbinary(255) + , fld_img_media_type = flds.AddStr("img_media_type", 255) // enum('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE')" + , fld_img_minor_mime = flds.AddStr("img_minor_mime", 255) // DEFAULT 'unknown'" + , fld_img_size = flds.AddInt("img_size") // int(8) unsigned + , fld_img_width = flds.AddInt("img_width") // int(5) + , fld_img_height = flds.AddInt("img_height") // int(5) + , fld_img_bits = flds.AddShort("img_bits") // int(3) + , fld_img_ext_id = flds.AddInt("img_ext_id") // xowa + , fld_img_timestamp = flds.AddStr("img_timestamp", 255) // 20140101155749 ; public static Dbmeta_tbl_itm new_meta() { - return Dbmeta_tbl_itm.New(tbl_name, flds.To_fld_ary() + return Dbmeta_tbl_itm.New(tbl_name, flds.ToFldAry() , Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "name", fld_img_name, fld_img_timestamp) ); } diff --git a/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java b/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java index 87a63a5a5..3797a6237 100644 --- a/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java +++ b/400_xowa/src/gplx/xowa/files/fsdb/Xof_fsdb_mgr__sql.java @@ -14,11 +14,9 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.fsdb; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.primitives.*; -import gplx.core.ios.*; -import gplx.dbs.*; import gplx.xowa.wikis.data.*; -import gplx.fsdb.*; import gplx.fsdb.meta.*; -import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.imgs.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.guis.cbks.js.*; +import gplx.fsdb.*; import gplx.fsdb.meta.*; +import gplx.xowa.files.repos.*; +import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.caches.*; import gplx.xowa.guis.cbks.js.*; public class Xof_fsdb_mgr__sql implements Xof_fsdb_mgr, Gfo_invk { private boolean init = false; private boolean fsdb_enabled = false; private Xow_repo_mgr repo_mgr; private Xof_url_bldr url_bldr; private final Xof_img_size img_size = new Xof_img_size(); @@ -44,7 +42,7 @@ public class Xof_fsdb_mgr__sql implements Xof_fsdb_mgr, Gfo_invk { } public void Fsdb_search_by_list(List_adp itms, Xow_wiki cur_wiki, Xoa_page page, Xog_js_wkr js_wkr) { if (!fsdb_enabled) return; - int len = itms.Count(); + int len = itms.Len(); Gfo_usr_dlg usr_dlg = Gfo_usr_dlg_.Instance; Xow_wiki wiki = page.Commons_mgr().Source_wiki_or(cur_wiki); Xou_cache_mgr cache_mgr = wiki.App().User().User_db_mgr().Cache_mgr(); diff --git a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_core.java b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_core.java index bfdf38298..2e410707a 100644 --- a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_core.java +++ b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Fs_root_core.java @@ -34,7 +34,7 @@ public class Fs_root_core implements Xof_fsdb_mgr, Gfo_invk { // reads images fr } public void Orig_dir_(Io_url v) {mgr.Orig_dir_(v);} public void Fsdb_search_by_list(List_adp itms, Xow_wiki wiki, Xoa_page page, Xog_js_wkr js_wkr) { - int itms_len = itms.Count(); + int itms_len = itms.Len(); // NOTE: do not cache in /xowa/file b/c files will already exist in /xowa/wiki/wiki_name/file/thumb gplx.xowa.files.caches.Xou_cache_mgr cache_mgr = wiki.App().User().User_db_mgr().Cache_mgr(); diff --git a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_mgr.java b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_mgr.java index 7a5e96e91..259c6dbbf 100644 --- a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_mgr.java +++ b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_mgr.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.fsdb.fs_roots; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*; +package gplx.xowa.files.fsdb.fs_roots; import gplx.*; class Orig_fil_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); public boolean Has(byte[] lnki_ttl) {return hash.Has(lnki_ttl);} - public Orig_fil_row Get_by_ttl(byte[] lnki_ttl) {return (Orig_fil_row)hash.Get_by(lnki_ttl);} + public Orig_fil_row Get_by_ttl(byte[] lnki_ttl) {return (Orig_fil_row)hash.GetByOrNull(lnki_ttl);} public void Add(Orig_fil_row fil) {hash.Add(fil.Name(), fil);} } diff --git a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_tbl.java b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_tbl.java index 8b95c72cb..707d053da 100644 --- a/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_tbl.java +++ b/400_xowa/src/gplx/xowa/files/fsdb/fs_roots/Orig_fil_tbl.java @@ -13,23 +13,23 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.fsdb.fs_roots; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*; +package gplx.xowa.files.fsdb.fs_roots; import gplx.*; import gplx.dbs.*; class Orig_fil_tbl implements Rls_able { private final Db_conn conn; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private String tbl_name = "orig_fil"; private String fld_uid, fld_name, fld_ext_id, fld_w, fld_h, fld_dir_url; private Db_stmt stmt_insert, stmt_select; public Orig_fil_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; conn.Rls_reg(this); String fld_prefix = schema_is_1 ? "fil_" : ""; - fld_uid = flds.Add_int(fld_prefix + "uid"); - fld_name = flds.Add_str(fld_prefix + "name", 1024); - fld_ext_id = flds.Add_int(fld_prefix + "ext_id"); - fld_w = flds.Add_int(fld_prefix + "w"); - fld_h = flds.Add_int(fld_prefix + "h"); - fld_dir_url = flds.Add_str(fld_prefix + "dir_url", 1024); // NOTE: don't put dir in separate table; note that entire root_dir_wkr is not built to scale due to need for recursively loading all files + fld_uid = flds.AddInt(fld_prefix + "uid"); + fld_name = flds.AddStr(fld_prefix + "name", 1024); + fld_ext_id = flds.AddInt(fld_prefix + "ext_id"); + fld_w = flds.AddInt(fld_prefix + "w"); + fld_h = flds.AddInt(fld_prefix + "h"); + fld_dir_url = flds.AddStr(fld_prefix + "dir_url", 1024); // NOTE: don't put dir in separate table; note that entire root_dir_wkr is not built to scale due to need for recursively loading all files } public void Create_tbl() { conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_mgr.java b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_mgr.java index 66f6d045b..40969f9d6 100644 --- a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_mgr.java +++ b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_mgr.java @@ -14,9 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.origs; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.primitives.*; import gplx.dbs.*; -import gplx.xowa.files.repos.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.downloads.*; -import gplx.xowa.apps.wms.apis.*; import gplx.xowa.apps.wms.apis.origs.*; +import gplx.xowa.files.repos.*; +import gplx.xowa.apps.wms.apis.origs.*; public class Xof_orig_mgr { private Xof_orig_wkr[] wkrs; private int wkrs_len; private Xof_url_bldr url_bldr; private Xow_repo_mgr repo_mgr; private final Xof_img_size img_size = new Xof_img_size(); @@ -59,12 +58,12 @@ public class Xof_orig_mgr { Xof_orig_wkr wkr = wkrs[i]; wkr.Find_by_list(rv, itms); } - int len = itms.Count(); + int len = itms.Len(); for (int i = 0; i < len; i++) { try { Xof_fsdb_itm fsdb = (Xof_fsdb_itm)itms.Get_at(i); fsdb.Orig_exists_n_(); // default to status = missing - Xof_orig_itm orig = (Xof_orig_itm)rv.Get_by(fsdb.Lnki_ttl()); if (orig == Xof_orig_itm.Null) continue; + Xof_orig_itm orig = (Xof_orig_itm)rv.GetByOrNull(fsdb.Lnki_ttl()); if (orig == Xof_orig_itm.Null) continue; if (orig.Insert_new()) this.Insert(orig.Repo(), fsdb.Lnki_ttl(), orig.Ext_id(), orig.W(), orig.H(), orig.Redirect()); // NOTE: orig_page must be same as find_arg not orig.Page() else will not be found for next call; DATE:2015-04-14 Xof_file_wkr.Eval_orig(orig, fsdb, url_bldr, repo_mgr, img_size); if (!Io_mgr.Instance.ExistsFil(fsdb.Html_view_url())) @@ -96,7 +95,7 @@ public class Xof_orig_mgr { if (wkr.Tid() == tid) continue; // do not add deleted wkr list.Add(wkr); } - wkrs = (Xof_orig_wkr[])list.To_ary_and_clear(Xof_orig_wkr.class); + wkrs = (Xof_orig_wkr[])list.ToAryAndClear(Xof_orig_wkr.class); wkrs_len = wkrs.length; } } diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl.java b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl.java index b327791e1..9f867156d 100644 --- a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl.java +++ b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl.java @@ -13,12 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.origs; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.primitives.*; -import gplx.dbs.*; import gplx.dbs.utls.*; -import gplx.xowa.files.fsdb.*; import gplx.xowa.files.repos.*; +package gplx.xowa.files.origs; import gplx.*; +import gplx.xowa.files.*; +import gplx.dbs.*; import gplx.dbs.utls.*; public class Xof_orig_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld_repo, fld_ttl, fld_status, fld_ext, fld_w, fld_h, fld_redirect; public final Db_conn conn; private final Xof_orig_tbl__in_wkr select_in_wkr = new Xof_orig_tbl__in_wkr(); public Db_conn Conn() {return conn;} @@ -27,19 +26,19 @@ public class Xof_orig_tbl implements Db_tbl { String fld_status_name = "orig_status"; if (schema_is_1) {tbl_name = "wiki_orig"; fld_status_name = "status";} else {tbl_name = "orig_reg";} - fld_ttl = flds.Add_str("orig_ttl", 1024); - fld_repo = flds.Add_byte("orig_repo"); - fld_status = flds.Add_byte(fld_status_name); - fld_ext = flds.Add_int("orig_ext"); - fld_w = flds.Add_int("orig_w"); - fld_h = flds.Add_int("orig_h"); - fld_redirect = flds.Add_str("orig_redirect", 1024); + fld_ttl = flds.AddStr("orig_ttl", 1024); + fld_repo = flds.AddByte("orig_repo"); + fld_status = flds.AddByte(fld_status_name); + fld_ext = flds.AddInt("orig_ext"); + fld_w = flds.AddInt("orig_w"); + fld_h = flds.AddInt("orig_h"); + fld_redirect = flds.AddStr("orig_redirect", 1024); select_in_wkr.Ctor(this, tbl_name, flds, fld_ttl); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds, Dbmeta_idx_itm.new_normal_by_tbl(tbl_name, "main", fld_ttl)));} - public void Select_by_list(Ordered_hash rv, List_adp itms) {select_in_wkr.Init(rv, itms).Select_in(Cancelable_.Never, conn, 0, itms.Count());} + public void Select_by_list(Ordered_hash rv, List_adp itms) {select_in_wkr.Init(rv, itms).Select_in(Cancelable_.Never, conn, 0, itms.Len());} public Xof_orig_itm Select_itm(byte[] ttl) { Db_rdr rdr = conn.Stmt_select(tbl_name, flds, fld_ttl).Clear().Crt_bry_as_str(fld_ttl, ttl).Exec_select__rls_auto(); try {return rdr.Move_next() ? Load_by_rdr(rdr) : Xof_orig_itm.Null;} @@ -84,15 +83,15 @@ public class Xof_orig_tbl implements Db_tbl { public void Rls() {} } class Xof_orig_tbl__in_wkr extends Db_in_wkr__base { - private Xof_orig_tbl tbl; private String tbl_name; private Dbmeta_fld_list flds; private String fld_ttl; + private Xof_orig_tbl tbl; private String tbl_name; private DbmetaFldList flds; private String fld_ttl; private List_adp itms; private Ordered_hash rv; - public void Ctor(Xof_orig_tbl tbl, String tbl_name, Dbmeta_fld_list flds, String fld_ttl) { + public void Ctor(Xof_orig_tbl tbl, String tbl_name, DbmetaFldList flds, String fld_ttl) { this.tbl = tbl; this.tbl_name = tbl_name; this.flds = flds; this.fld_ttl = fld_ttl; } public Xof_orig_tbl__in_wkr Init(Ordered_hash rv, List_adp itms) {this.itms = itms; this.rv = rv; return this;} @Override protected Db_qry Make_qry(int bgn, int end) { Object[] part_ary = In_ary(end - bgn); - return Db_qry_.select_cols_(tbl_name, Db_crt_.New_in(fld_ttl, part_ary), flds.To_str_ary()); + return Db_qry_.select_cols_(tbl_name, Db_crt_.New_in(fld_ttl, part_ary), flds.ToStrAry()); } @Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) { for (int i = bgn; i < end; i++) { @@ -106,7 +105,7 @@ class Xof_orig_tbl__in_wkr extends Db_in_wkr__base { Xof_orig_itm itm = tbl.Load_by_rdr(rdr); if (itm == Xof_orig_itm.Null) continue; byte[] itm_ttl = itm.Ttl(); - rv.Add_if_dupe_use_1st(itm_ttl, itm); // guard against dupes; fails on en.w:Paris; DATE:2015-03-08 + rv.AddIfDupeUse1st(itm_ttl, itm); // guard against dupes; fails on en.w:Paris; DATE:2015-03-08 } } } diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr_.java b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr_.java index 6bbafe9f9..52ca5bdb4 100644 --- a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr_.java +++ b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr_.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.origs; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.xowa.apps.wms.apis.*; import gplx.xowa.files.fsdb.*; +package gplx.xowa.files.origs; import gplx.*; +import gplx.xowa.files.*; public class Xof_orig_wkr_ { public static final Xof_orig_wkr[] Ary_empty = new Xof_orig_wkr[0]; public static void Find_by_list(Xof_orig_wkr wkr, Ordered_hash rv, List_adp itms) { - int len = itms.Count(); + int len = itms.Len(); for (int i = 0; i < len; ++i) { Xof_fsdb_itm fsdb = (Xof_fsdb_itm)itms.Get_at(i); byte[] fsdb_ttl = fsdb.Lnki_ttl(); diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__mock.java b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__mock.java index bf236a388..ced8e0ce0 100644 --- a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__mock.java +++ b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__mock.java @@ -13,16 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.files.origs; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; -import gplx.core.flds.*; -import gplx.dbs.*; import gplx.xowa.files.fsdb.*; -import gplx.xowa.wikis.tdbs.metas.*; +package gplx.xowa.files.origs; import gplx.*; public class Xof_orig_wkr__mock implements Xof_orig_wkr { private final Ordered_hash hash = Ordered_hash_.New_bry(); public byte Tid() {return Xof_orig_wkr_.Tid_mock;} public void Find_by_list(Ordered_hash rv, List_adp itms) {Xof_orig_wkr_.Find_by_list(this, rv, itms);} public Xof_orig_itm Find_as_itm(byte[] ttl, int list_idx, int list_len) { - return (Xof_orig_itm)hash.Get_by(ttl); // new Xof_orig_itm((byte)meta_itm.Vrtl_repo(), ttl, Xof_ext_.new_by_ttl_(ttl).Id(), meta_itm.Orig_w(), meta_itm.Orig_h(), meta_itm.Ptr_ttl()); + return (Xof_orig_itm)hash.GetByOrNull(ttl); // new Xof_orig_itm((byte)meta_itm.Vrtl_repo(), ttl, Xof_ext_.new_by_ttl_(ttl).Id(), meta_itm.Orig_w(), meta_itm.Orig_h(), meta_itm.Ptr_ttl()); } public boolean Add_orig(byte repo, byte[] page, int ext_id, int w, int h, byte[] redirect) { Xof_orig_itm itm = new Xof_orig_itm(repo, page, ext_id, w, h, redirect); diff --git a/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_base.java b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_base.java index 222eae774..7cf33b6c7 100644 --- a/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_base.java +++ b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_base.java @@ -15,13 +15,14 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.repos; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.xowa.wikis.nss.*; -import gplx.xowa.wikis.*; import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.wikis.data.tbls.*; +import gplx.xowa.wikis.*; +import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.parsers.utils.*; public class Xofw_wiki_wkr_base implements Xofw_wiki_finder { public Xofw_wiki_wkr_base(Xowe_wiki wiki, Xoae_wiki_mgr wiki_mgr) {this.wiki = wiki; this.wiki_mgr = wiki_mgr;} private Xowe_wiki wiki; Xoae_wiki_mgr wiki_mgr; public void Find(List_adp repo_pairs, Xof_xfer_itm file) { byte[] ttl_bry = file.Lnki_ttl(); - int repo_pairs_len = repo_pairs.Count(); + int repo_pairs_len = repo_pairs.Len(); for (int i = 0; i < repo_pairs_len; i++) { Xof_repo_pair repo_pair = (Xof_repo_pair)repo_pairs.Get_at(i); byte[] wiki_key = repo_pair.Src().Wiki_domain(); @@ -43,7 +44,7 @@ public class Xofw_wiki_wkr_base implements Xofw_wiki_finder { Xow_ns file_ns = wiki.Ns_mgr().Ns_file(); // NOTE: file_ns should also be the same across all wikis; being used for data_mgr.Parse below byte[] ttl_db_key = ttl.Page_db(); rv.Init(ttl_db_key); - int repo_pairs_len = repo_pairs.Count(); + int repo_pairs_len = repo_pairs.Len(); for (int i = 0; i < repo_pairs_len; i++) { Xof_repo_pair repo_pair = (Xof_repo_pair)repo_pairs.Get_at(i); byte[] src_wiki_key = repo_pair.Src().Wiki_domain(); diff --git a/400_xowa/src/gplx/xowa/files/repos/Xowe_repo_mgr.java b/400_xowa/src/gplx/xowa/files/repos/Xowe_repo_mgr.java index b2e0f0be0..818470d93 100644 --- a/400_xowa/src/gplx/xowa/files/repos/Xowe_repo_mgr.java +++ b/400_xowa/src/gplx/xowa/files/repos/Xowe_repo_mgr.java @@ -29,9 +29,9 @@ public class Xowe_repo_mgr implements Xow_repo_mgr, Gfo_invk { } public Xof_xfer_mgr Xfer_mgr() {return xfer_mgr;} private Xof_xfer_mgr xfer_mgr; public Xowe_repo_mgr Page_finder_(Xofw_wiki_finder v) {page_finder = v; return this;} private Xofw_wiki_finder page_finder; - public int Repos_len() {return repos.Count();} + public int Repos_len() {return repos.Len();} public Xof_repo_pair Repos_get_by_wiki(byte[] wiki) { - int len = repos.Count(); + int len = repos.Len(); for (int i = 0; i < len; i++) { Xof_repo_pair pair = (Xof_repo_pair)repos.Get_at(i); if (Bry_.Eq(wiki, pair.Wiki_domain())) @@ -50,7 +50,7 @@ public class Xowe_repo_mgr implements Xow_repo_mgr, Gfo_invk { } public Xof_repo_pair Repos_get_at(int i) {return (Xof_repo_pair)repos.Get_at(i);} private Xof_repo_pair Repos_get_by_id(int id) { - int len = repos.Count(); + int len = repos.Len(); for (int i = 0; i < len; i++) { Xof_repo_pair pair = (Xof_repo_pair)repos.Get_at(i); if (pair.Id() == id) return pair; @@ -78,7 +78,7 @@ public class Xowe_repo_mgr implements Xow_repo_mgr, Gfo_invk { public Xof_repo_itm Get_trg_by_tid_or_null(byte[] tid) { return null; } - public Xof_repo_pair[] Repos_ary() {if (repos_ary == null) repos_ary = (Xof_repo_pair[])repos.To_ary(Xof_repo_pair.class); return repos_ary;} private Xof_repo_pair[] repos_ary; + public Xof_repo_pair[] Repos_ary() {if (repos_ary == null) repos_ary = (Xof_repo_pair[])repos.ToAry(Xof_repo_pair.class); return repos_ary;} private Xof_repo_pair[] repos_ary; public boolean Xfer_by_meta(Xof_xfer_itm xfer_itm, Xof_xfer_queue queue) { byte[] ttl = xfer_itm.Lnki_ttl(); Xof_meta_itm meta_itm = xfer_itm.Dbmeta_itm(); @@ -152,7 +152,7 @@ public class Xowe_repo_mgr implements Xow_repo_mgr, Gfo_invk { return trg_repo.Wiki_domain(); } boolean Xfer_by_meta__exec(boolean chk_all, Xof_xfer_itm xfer_itm, Xof_meta_itm meta_itm, byte[] main_wiki_key, Xof_xfer_queue queue, boolean second_chance) { - int repos_len = repos.Count(); + int repos_len = repos.Len(); for (int i = 0; i < repos_len; i++) { // iterate over all repo pairs Xof_repo_pair pair = (Xof_repo_pair)repos.Get_at(i); Xof_repo_itm pair_src = pair.Src(); @@ -207,7 +207,7 @@ public class Xowe_repo_mgr implements Xow_repo_mgr, Gfo_invk { Xof_repo_itm src_repo = repo_mgr.Get_by(src_repo_key), trg_repo = repo_mgr.Get_by(trg_repo_key); byte[] src_wiki_key = src_repo.Wiki_domain(), trg_wiki_key = trg_repo.Wiki_domain(); if (!Bry_.Eq(src_wiki_key, trg_wiki_key) && !Bry_.Eq(src_wiki_key, Xow_domain_tid_.Bry__home)) throw Err_.new_wo_type("wiki keys do not match", "src", String_.new_u8(src_wiki_key), "trg", String_.new_u8(trg_wiki_key)); - Xof_repo_pair pair = new Xof_repo_pair((byte)repos.Count(), src_wiki_key, src_repo, trg_repo); + Xof_repo_pair pair = new Xof_repo_pair((byte)repos.Len(), src_wiki_key, src_repo, trg_repo); repos.Add(pair); return pair; } @@ -215,7 +215,7 @@ public class Xowe_repo_mgr implements Xow_repo_mgr, Gfo_invk { int repo_idx = file.Orig_repo_id(); boolean wiki_is_unknown = repo_idx == Xof_meta_itm.Repo_unknown; boolean make_pass = false; - int len = repos.Count(); + int len = repos.Len(); if (!wiki_is_unknown) make_pass = Xfer_file_exec(file, this.Repos_get_at(repo_idx), repo_idx); if (make_pass) return true; diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java index cc99153a5..a7fdd2115 100644 --- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java +++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue.java @@ -15,13 +15,12 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.core.primitives.*; import gplx.core.envs.*; -import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.origs.*; import gplx.xowa.guis.cbks.js.*; import gplx.xowa.wikis.tdbs.metas.*; public class Xof_xfer_queue { private final List_adp xfer_list = List_adp_.New(); private final Ordered_hash dirty_meta_mgrs = Ordered_hash_.New_bry(); public Int_obj_ref Html_uid() {return html_uid;} private Int_obj_ref html_uid = Int_obj_ref.New_neg1(); - public int Count() {return xfer_list.Count();} + public int Count() {return xfer_list.Len();} public void Clear() { dirty_meta_mgrs.Clear(); xfer_list.Clear(); @@ -37,7 +36,7 @@ public class Xof_xfer_queue { } private void Exec_v1(Xowe_wiki wiki, Xoae_page page) { Xof_meta_mgr meta_mgr = null; - int xfer_len = xfer_list.Count(); + int xfer_len = xfer_list.Len(); Gfo_usr_dlg usr_dlg = Xoa_app_.Usr_dlg(); for (int i = 0; i < xfer_len; i++) { if (wiki.Appe().Usr_dlg().Canceled()) break; @@ -57,7 +56,7 @@ public class Xof_xfer_queue { Js_img_mgr.Update_img(page, js_wkr, xfer_itm); } } - for (int i = 0; i < dirty_meta_mgrs.Count(); i++) { + for (int i = 0; i < dirty_meta_mgrs.Len(); i++) { meta_mgr = (Xof_meta_mgr)dirty_meta_mgrs.Get_at(i); meta_mgr.Save(true); } @@ -70,7 +69,7 @@ public class Xof_xfer_queue { } private List_adp Xfer_itms_to_fsdb_itms(Xowe_wiki cur_wiki, Xoae_page page, List_adp xfer_list, int upright_patch) { List_adp rv = List_adp_.New(); - int list_len = xfer_list.Count(); + int list_len = xfer_list.Len(); for (int i = 0; i < list_len; i++) { Xof_file_itm xfer = (Xof_file_itm)xfer_list.Get_at(i); if (xfer.Hdump_mode() == Xof_fsdb_itm.Hdump_mode__null) { diff --git a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_box.java b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_box.java index 49646bf90..503dce2b0 100644 --- a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_box.java +++ b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_box.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.guis.bnds; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; +package gplx.xowa.guis.bnds; import gplx.*; public class Xog_bnd_box { private final Ordered_hash key_hash = Ordered_hash_.New(); private final Hash_adp cmd_hash = Hash_adp_.New(); @@ -23,27 +23,27 @@ public class Xog_bnd_box { } public int Tid() {return tid;} private final int tid; public String Key() {return key;} private final String key; - public int Len() {return key_hash.Count();} + public int Len() {return key_hash.Len();} public Xog_bnd_itm Get_at(int i) {return (Xog_bnd_itm)key_hash.Get_at(i);} public void Add(Xog_bnd_itm itm) { - key_hash.Add_if_dupe_use_nth(itm.Key(), itm); // Add_if_dupe_use_nth, else Xou_user_tst.Run fails; DATE:2014-05-15 + key_hash.AddIfDupeUseNth(itm.Key(), itm); // Add_if_dupe_use_nth, else Xou_user_tst.Run fails; DATE:2014-05-15 // add by cmd; needed b/c gfui.ipt_mgr hashes by cmd ("sandbox"), not key ("sandbox-1"); DATE:2016-12-25 - List_adp list = (List_adp)cmd_hash.Get_by(itm.Cmd()); + List_adp list = (List_adp)cmd_hash.GetByOrNull(itm.Cmd()); if (list == null) { list = List_adp_.New(); cmd_hash.Add(itm.Cmd(), list); } list.Add(itm); } - public List_adp Get_list_by_cmd(String cmd) {return (List_adp)cmd_hash.Get_by(cmd);} + public List_adp Get_list_by_cmd(String cmd) {return (List_adp)cmd_hash.GetByOrNull(cmd);} public void Del(String key) { // delete from key_hash - Xog_bnd_itm itm = (Xog_bnd_itm)key_hash.Get_by(key); + Xog_bnd_itm itm = (Xog_bnd_itm)key_hash.GetByOrNull(key); key_hash.Del(key); // delete from cmd_hash - List_adp list = (List_adp)cmd_hash.Get_by(itm.Cmd()); + List_adp list = (List_adp)cmd_hash.GetByOrNull(itm.Cmd()); if (list != null) list.Del(itm); } } diff --git a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java index 67a4d2d66..00cead7c8 100644 --- a/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/bnds/Xog_bnd_mgr.java @@ -46,9 +46,9 @@ public class Xog_bnd_mgr implements Gfo_invk { private List_adp startup_itms = List_adp_.New(); private Ordered_hash regy = Ordered_hash_.New(); public Xog_bnd_mgr(Xog_win_itm win) {this.win = win; invk_mgr = win.Gui_mgr().Cmd_mgr().Invk_mgr();} - public int Len() {return regy.Count();} + public int Len() {return regy.Len();} public Xog_bnd_itm Get_at(int i) {return (Xog_bnd_itm)regy.Get_at(i);} - public Xog_bnd_itm Get_or_null(String v) {return (Xog_bnd_itm)regy.Get_by(v);} + public Xog_bnd_itm Get_or_null(String v) {return (Xog_bnd_itm)regy.GetByOrNull(v);} public void Init_by_kit(Xoae_app app) { this.app = app; Add_system_bnds(); @@ -213,7 +213,7 @@ public class Xog_bnd_mgr implements Gfo_invk { } // remove old bnd from box - int deleted_len = deleted.Count(); + int deleted_len = deleted.Len(); for (int j = 0; j < deleted_len; j++) { // delete from box Xog_bnd_itm deleted_itm = (Xog_bnd_itm)deleted.Get_at(j); @@ -384,11 +384,11 @@ public class Xog_bnd_mgr implements Gfo_invk { IptBnd_.ipt_to_(null_cfg , win.Url_box() , invk_mgr, Xog_cmd_itm_.Key_gui_browser_url_type , IptEventType_.KeyUp, IptKey_.printableKeys_(IptKey_.Ary(IptKey_.Back, IptKey_.Escape, IptKey_.MOD_1ST.Add(IptKey_.X), IptKey_.MOD_1ST.Add(IptKey_.V)), IptKey_.Ary())); } private void Add_custom_bnds() { // NOTE: custom bnds are stored in cfg; cfg executes before Init_by_kit when all windows elements are null; run cfg now, while Init_by_kit is called and elems are now created - int len = startup_itms.Count(); + int len = startup_itms.Len(); for (int i = 0; i < len; i++) { Xog_bnd_itm new_itm = (Xog_bnd_itm)startup_itms.Get_at(i); try { - Xog_bnd_itm cur_itm = (Xog_bnd_itm)regy.Get_by(new_itm.Key()); + Xog_bnd_itm cur_itm = (Xog_bnd_itm)regy.GetByOrNull(new_itm.Key()); if (cur_itm == null) {win.Usr_dlg().Warn_many("", "", "binding no longer exists; key=~{0}", new_itm.Key());} // could happen when breaking backward compatibility cur_itm.Init_by_set(new_itm.Box(), new_itm.Ipt()); } catch (Exception e) {win.Usr_dlg().Warn_many("", "", "failed to set custom binding; key=~{0} err=~{1}", new_itm.Key(), Err_.Message_gplx_full(e));} diff --git a/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java index a3b3ef955..b1fc8f9d9 100644 --- a/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java +++ b/400_xowa/src/gplx/xowa/guis/cbks/js/Xog_js_wkr__log.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.guis.cbks.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cbks.*; +package gplx.xowa.guis.cbks.js; import gplx.*; public class Xog_js_wkr__log implements Xog_js_wkr { private final List_adp log_list = List_adp_.New(); public void Html_img_update (String uid, String src, int w, int h) {log_list.Add(Object_.Ary(Proc_img_update, uid, src, w, h));} @@ -26,7 +26,7 @@ public class Xog_js_wkr__log implements Xog_js_wkr { public void Html_popups_bind_hover_to_doc() {log_list.Add(Object_.Ary(Proc_popups_bind_hover_to_doc));} public void Log__clear() {log_list.Clear();} - public int Log__len() {return log_list.Count();} + public int Log__len() {return log_list.Len();} public Object[] Log__get_at(int i) {return (Object[])log_list.Get_at(i);} public static final String diff --git a/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java b/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java index a94953756..c7754d5d1 100644 --- a/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java +++ b/400_xowa/src/gplx/xowa/guis/cmds/Xog_cmd_itm_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.guis.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; +package gplx.xowa.guis.cmds; import gplx.*; public class Xog_cmd_itm_ { private static final Ordered_hash regy = Ordered_hash_.New(); // NOTE: must be defined at top public static final String @@ -168,9 +168,9 @@ public class Xog_cmd_itm_ { regy.Add(key, new Xog_cmd_itm(key, ctg_itm, text)); return key; } - public static int Regy_len() {return regy.Count();} + public static int Regy_len() {return regy.Len();} public static Xog_cmd_itm Regy_get_at(int i) {return (Xog_cmd_itm)regy.Get_at(i);} - public static Xog_cmd_itm Regy_get_or_null(String key) {return (Xog_cmd_itm)regy.Get_by(key);} + public static Xog_cmd_itm Regy_get_or_null(String key) {return (Xog_cmd_itm)regy.GetByOrNull(key);} public static void Regy_add(Xog_cmd_itm itm) {regy.Add(itm.Key(), itm);} public static final byte[] Msg_pre_api = Bry_.new_a7("api-") diff --git a/400_xowa/src/gplx/xowa/guis/history/Xog_history_mgr.java b/400_xowa/src/gplx/xowa/guis/history/Xog_history_mgr.java index 5b1d8401e..d7e564735 100644 --- a/400_xowa/src/gplx/xowa/guis/history/Xog_history_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/history/Xog_history_mgr.java @@ -28,7 +28,7 @@ import gplx.xowa.Xowe_wiki; public class Xog_history_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); private final Xog_history_stack stack = new Xog_history_stack(); - public int Count() {return hash.Count();} + public int Count() {return hash.Len();} public Xoae_page Cur_page(Xowe_wiki wiki) {return Get_or_fetch(wiki, stack.Cur_itm());} public Xoae_page Go_bwd(Xowe_wiki wiki) {return Go_by_dir(wiki, Bool_.N);} public Xoae_page Go_fwd(Xowe_wiki wiki) {return Go_by_dir(wiki, Bool_.Y);} @@ -72,7 +72,7 @@ public class Xog_history_mgr { } private Xoae_page Get_or_fetch(Xowe_wiki wiki, Xog_history_itm itm) { byte[] page_key = Build_page_key(itm.Wiki(), itm.Page(), itm.Qarg()); - Xoae_page rv = (Xoae_page)hash.Get_by(page_key); + Xoae_page rv = (Xoae_page)hash.GetByOrNull(page_key); if (rv != null) return rv; Xoa_ttl ttl = Xoa_ttl.Parse(wiki, itm.Page()); return wiki.Data_mgr().Load_page_by_ttl(ttl); diff --git a/400_xowa/src/gplx/xowa/guis/history/Xog_history_stack.java b/400_xowa/src/gplx/xowa/guis/history/Xog_history_stack.java index c50bffe90..0c2d94e2f 100644 --- a/400_xowa/src/gplx/xowa/guis/history/Xog_history_stack.java +++ b/400_xowa/src/gplx/xowa/guis/history/Xog_history_stack.java @@ -13,38 +13,38 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.guis.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; +package gplx.xowa.guis.history; import gplx.*; public class Xog_history_stack { private final List_adp list = List_adp_.New(); - public int Len() {return list.Count();} + public int Len() {return list.Len();} public void Clear() {list.Clear(); cur_pos = 0;} public Xog_history_itm Get_at(int i) {return (Xog_history_itm)list.Get_at(i);} public int Cur_pos() {return cur_pos;} private int cur_pos = 0; - public Xog_history_itm Cur_itm() {return list.Count() == 0 ? Xog_history_itm.Null : (Xog_history_itm)list.Get_at(cur_pos);} + public Xog_history_itm Cur_itm() {return list.Len() == 0 ? Xog_history_itm.Null : (Xog_history_itm)list.Get_at(cur_pos);} public void Add(Xog_history_itm new_itm) { Xog_history_itm cur_itm = this.Cur_itm(); if (cur_itm != Xog_history_itm.Null && cur_itm.Eq_wo_bmk_pos(new_itm)) return; // do not add if last itm is same; this.Del_from(cur_pos + 1); list.Add(new_itm); - cur_pos = list.Count() - 1; + cur_pos = list.Len() - 1; } public Xog_history_itm Go_bwd() { - if (list.Count() == 0) return Xog_history_itm.Null; + if (list.Len() == 0) return Xog_history_itm.Null; if (cur_pos == 0) return Xog_history_itm.Null; --cur_pos; return this.Cur_itm(); } public Xog_history_itm Go_fwd() { - int list_count = list.Count(); + int list_count = list.Len(); if (list_count == 0) return Xog_history_itm.Null; if (cur_pos == list_count - 1) return Xog_history_itm.Null; ++cur_pos; return this.Cur_itm(); } private void Del_from(int from) { - int len = list.Count(); + int len = list.Len(); if (from <= len - 1) - list.Del_range(from, len - 1); + list.DelRange(from, len - 1); } public void Cur_pos_(int v) {this.cur_pos = v;} public static final byte Nav_fwd = 1, Nav_bwd = 2, Nav_by_anchor = 3; diff --git a/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java b/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java index c720bbf97..12227ec57 100644 --- a/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/menus/Xog_window_mnu_mgr.java @@ -28,7 +28,7 @@ public class Xog_window_mnu_mgr implements Gfo_invk { app.Cfg().Bind_many_app(this, Cfg__browser__enabled, Cfg__browser__source); } public Xog_mnu_grp Get_or_new(String key) { - Xog_mnu_grp rv = (Xog_mnu_grp)hash.Get_by(key); + Xog_mnu_grp rv = (Xog_mnu_grp)hash.GetByOrNull(key); if (rv == null) { rv = new Xog_mnu_grp(gui_mgr, false, key); hash.Add(key, rv); diff --git a/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_base.java b/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_base.java index 4320c8290..e29479d4a 100644 --- a/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_base.java +++ b/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_base.java @@ -13,9 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*; -import gplx.gfui.*; import gplx.gfui.imgs.*; -import gplx.xowa.langs.*; import gplx.xowa.guis.cmds.*; +package gplx.xowa.guis.menus.dom; import gplx.*; +import gplx.xowa.guis.*; +import gplx.gfui.imgs.*; +import gplx.xowa.langs.*; public abstract class Xog_mnu_base implements Gfo_invk { private List_adp list = List_adp_.New(); public Xog_mnu_base() {evt_mgr = new Xog_mnu_evt_mgr(this);} @@ -25,14 +26,14 @@ public abstract class Xog_mnu_base implements Gfo_invk { public abstract boolean Tid_is_app_menu_grp(); public void Ctor(Xoa_gui_mgr gui_mgr) {this.gui_mgr = gui_mgr;} public void Clear() { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Xog_mnu_itm itm = (Xog_mnu_itm)list.Get_at(i); itm.Clear(); } list.Clear(); } - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Xog_mnu_itm Get_at(int i) {return (Xog_mnu_itm)list.Get_at(i);} public Xog_mnu_itm Add_btn_default(String key) {return Add_itm_default(Xog_mnu_itm.Tid_btn, key);} public Xog_mnu_itm Add_chk_default(String key) {return Add_itm_default(Xog_mnu_itm.Tid_chk, key);} @@ -68,7 +69,7 @@ public abstract class Xog_mnu_base implements Gfo_invk { return itm; } public Xog_mnu_itm Add_spr() { - String key = "xowa.spr" + Int_.To_str(list.Count()); + String key = "xowa.spr" + Int_.To_str(list.Len()); Xog_mnu_itm rv = new Xog_mnu_itm(gui_mgr, key).Tid_(Xog_mnu_itm.Tid_spr); list.Add(rv); return rv; diff --git a/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_evt_mgr.java b/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_evt_mgr.java index 728326f80..9dca97478 100644 --- a/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_evt_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_evt_mgr.java @@ -1,20 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*; -import gplx.gfui.*; import gplx.gfui.kits.core.*; import gplx.xowa.guis.cmds.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.guis.menus.dom; import gplx.*; +import gplx.gfui.kits.core.*; public class Xog_mnu_evt_mgr implements Gfo_evt_itm { private Ordered_hash itms = Ordered_hash_.New(); public Xog_mnu_evt_mgr(Xog_mnu_base owner) {this.ev_mgr = new Gfo_evt_mgr(this);} @@ -24,7 +24,7 @@ public class Xog_mnu_evt_mgr implements Gfo_evt_itm { } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Evt_selected_changed)) { - int len = itms.Count(); + int len = itms.Len(); for (int i = 0; i < len; i++) { Gfui_mnu_itm itm = (Gfui_mnu_itm)itms.Get_at(i); itm.Selected_(m.ReadBool("v")); diff --git a/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_regy.java b/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_regy.java index e26970f08..5f08b9b5d 100644 --- a/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_regy.java +++ b/400_xowa/src/gplx/xowa/guis/menus/dom/Xog_mnu_regy.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.menus.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.guis.menus.dom; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.cmds.*; public class Xog_mnu_regy { private Ordered_hash hash; @@ -34,7 +34,7 @@ public class Xog_mnu_regy { Init_obsolete(hash, gui_mgr); } public Xog_mnu_itm Get_or_make(String key) { - Xog_mnu_itm rv = (Xog_mnu_itm)hash.Get_by(key); + Xog_mnu_itm rv = (Xog_mnu_itm)hash.GetByOrNull(key); if (rv == null) { rv = new Xog_mnu_itm(gui_mgr, key); hash.Add(key, rv); 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 3256e113a..d3b44b1f7 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 @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.guis.views; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.guis.views; import gplx.*; import gplx.xowa.*; import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.addons.apps.updates.specials.*; public class Xog_startup_tabs { private String type, custom_list, prev_list, prev_version, curr_version; @@ -56,7 +56,7 @@ public class Xog_startup_tabs { } // generate urls - startup_urls = (String[])list.To_ary_and_clear(String.class); + startup_urls = (String[])list.ToAryAndClear(String.class); // do bounds check if (startup_idx < 0 || startup_idx >= startup_urls.length) diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_close_mgr.java b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_close_mgr.java index 910af1fde..90badb24f 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_close_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_close_mgr.java @@ -1,27 +1,27 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.guis.views; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.guis.views; import gplx.*; import gplx.xowa.*; public class Xog_tab_close_mgr { private List_adp list = List_adp_.New(); public void Clear() {list.Clear();} public void Add(Xog_tab_close_lnr lnr) {list.Add(lnr);} - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Xog_tab_close_lnr Get_at(int i) {return (Xog_tab_close_lnr)list.Get_at(i);} public boolean When_close(Xog_tab_itm tab, Xoa_url url) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Xog_tab_close_lnr lnr = Get_at(i); if (!lnr.When_close(tab, url)) return false; diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java index 82266a34a..59436a24a 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_itm.java @@ -266,7 +266,7 @@ public class Xog_tab_itm implements Gfo_invk { } } public void Exec_async_hdump(Xoa_app app, Xow_wiki wiki, gplx.xowa.guis.cbks.js.Xog_js_wkr js_wkr, gplx.core.threads.Gfo_thread_pool thread_pool, Xoa_page page, List_adp imgs, int[] redlink_ary) { - if (imgs.Count() > 0) { + if (imgs.Len() > 0) { Xof_file_wkr file_thread = new Xof_file_wkr ( wiki.File__orig_mgr(), wiki.File__bin_mgr(), wiki.File__mnt_mgr() , app.User().User_db_mgr().Cache_mgr(), wiki.File__repo_mgr(), html_itm, page, imgs diff --git a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java index 0474a80a6..b178a74f7 100644 --- a/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/views/Xog_tab_mgr.java @@ -78,7 +78,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { tab_itm.Tab_name_(); } } - public int Tabs_len() {return tab_regy.Count();} + public int Tabs_len() {return tab_regy.Len();} public Xog_tab_itm Tabs_new_init(Xowe_wiki wiki, Xoae_page page) {return this.Tabs_new(true, true, wiki, page);} public Xog_tab_itm Tabs_get_at(int i) {return (Xog_tab_itm)tab_regy.Get_at(i);} public Xog_tab_itm Tabs_new_dflt() {return Tabs_new_dflt(false);} @@ -93,7 +93,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { return rv; } private Xog_tab_itm Tabs_new(boolean focus, boolean active_tab_is_null, Xowe_wiki wiki, Xoae_page page) { - String tab_key = "tab_" + Int_.To_str(tab_uid++); int tab_idx = tab_regy.Count(); + String tab_key = "tab_" + Int_.To_str(tab_uid++); int tab_idx = tab_regy.Len(); Gfui_tab_itm_data tab_data = new Gfui_tab_itm_data(tab_key, tab_idx); Xog_tab_itm rv = new Xog_tab_itm(this, tab_data, wiki, page); Gfui_tab_itm tab_box = tab_mgr.Tabs_add(tab_data); @@ -118,7 +118,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { } public void Tabs_javascript_enabled_(boolean v) { this.javascript_enabled = v; - int len = tab_regy.Count(); + int len = tab_regy.Len(); for (int i = 0; i < len; i++) { Xog_tab_itm tab = Tabs_get_by_idx_or_warn(i); tab.Html_itm().Js_enabled_(v); @@ -140,7 +140,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { } public void Tabs_close_others() {this.Tabs_close_to_bgn(); this.Tabs_close_to_end();} public void Tabs_close_to_bgn() {if (Active_tab_is_null()) return; Tabs_close_rng(0 , active_tab.Tab_idx());} - public void Tabs_close_to_end() {if (Active_tab_is_null()) return; Tabs_close_rng(active_tab.Tab_idx() + 1 , tab_regy.Count());} + public void Tabs_close_to_end() {if (Active_tab_is_null()) return; Tabs_close_rng(active_tab.Tab_idx() + 1 , tab_regy.Len());} public void Tabs_close_rng(int bgn, int end) { for (int i = bgn; i < end; i++) { Xog_tab_itm tab = Tabs_get_at(bgn); @@ -163,7 +163,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { return tab.Page().Tab_data().Close_mgr().When_close(tab, Xoa_url.Null); } public void Tabs_close_undo() { - if (closed_undo_list.Count() == 0) return; + if (closed_undo_list.Len() == 0) return; String url = (String)List_adp_.Pop(closed_undo_list); Tabs_new_dflt(true); win.Page__navigate_by_url_bar(url); @@ -174,7 +174,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { itm.Html_box().Html_dispose(); closed_undo_list.Add(itm.Page().Url().To_str()); tab_regy.Del(key); - if (tab_regy.Count() == 0) { + if (tab_regy.Len() == 0) { active_tab = Xog_tab_itm_.Null; Xog_tab_itm_read_mgr.Update_selected_tab_blank(win); } @@ -183,7 +183,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { Tabs_hide_if_one_chk(false); } private Xog_tab_itm Tabs_get_by_key_or_warn(String key) { - Xog_tab_itm rv = (Xog_tab_itm)tab_regy.Get_by(key); if (rv == null) win.App().Usr_dlg().Warn_many("", "", "tab.selected could not find tab; key={0}", key); + Xog_tab_itm rv = (Xog_tab_itm)tab_regy.GetByOrNull(key); if (rv == null) win.App().Usr_dlg().Warn_many("", "", "tab.selected could not find tab; key={0}", key); return rv; } private Xog_tab_itm Tabs_get_by_idx_or_warn(int idx) { @@ -191,7 +191,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { return rv; } private void Tabs_recalc_idx() { - int len = tab_regy.Count(); + int len = tab_regy.Len(); for (int i = 0; i < len; i++) { Xog_tab_itm itm = Tabs_get_by_idx_or_warn(i); itm.Tab_idx_(i); @@ -199,17 +199,17 @@ public class Xog_tab_mgr implements Gfo_evt_itm { } public void Tabs_select(boolean fwd) { if (this.Active_tab_is_null()) return; - int new_idx = TabBox_.Cycle(fwd, active_tab.Tab_idx(), tab_regy.Count()); + int new_idx = TabBox_.Cycle(fwd, active_tab.Tab_idx(), tab_regy.Len()); tab_mgr.Tabs_select_by_idx(new_idx); } public void Tabs_select_by_idx(int v) { - if (v < 0 || v >= tab_regy.Count()) return; + if (v < 0 || v >= tab_regy.Len()) return; tab_mgr.Tabs_select_by_idx(v); } public void Tabs_move(boolean fwd) { if (this.Active_tab_is_null()) return; int src_idx = active_tab.Tab_idx(); - int trg_idx = TabBox_.Cycle(fwd, src_idx, tab_regy.Count()); + int trg_idx = TabBox_.Cycle(fwd, src_idx, tab_regy.Len()); tab_mgr.Tabs_switch(src_idx, trg_idx); } private void Tabs_switched(String src_key, String trg_key) { @@ -245,7 +245,7 @@ public class Xog_tab_mgr implements Gfo_evt_itm { } private void Tabs_hide_if_one_chk(boolean force) { if (btns__hide_if_one || force) {// run code only if enabled or forced - if (tab_regy.Count() == 1) { + if (tab_regy.Len() == 1) { int desired_height = btns__hide_if_one ? 0 : btns__height; if (tab_mgr.Btns_height() != desired_height) tab_mgr.Btns_height_(desired_height); diff --git a/400_xowa/src/gplx/xowa/guis/views/url_box_fmts/Xog_urlfmtr_mgr.java b/400_xowa/src/gplx/xowa/guis/views/url_box_fmts/Xog_urlfmtr_mgr.java index 6eab82ef3..ea9bb5e02 100644 --- a/400_xowa/src/gplx/xowa/guis/views/url_box_fmts/Xog_urlfmtr_mgr.java +++ b/400_xowa/src/gplx/xowa/guis/views/url_box_fmts/Xog_urlfmtr_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.guis.views.url_box_fmts; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.*; import gplx.xowa.guis.views.*; +package gplx.xowa.guis.views.url_box_fmts; import gplx.*; import gplx.xowa.*; public class Xog_urlfmtr_mgr implements Gfo_invk { private Xog_urlfmtr_itm wildcard = new Xog_urlfmtr_itm(Byte_ascii.Star_bry, Bry_.new_a7("~{wiki_domain}/wiki/~{page_title}")); private final Bry_bfr bfr = Bry_bfr_.New(); @@ -46,12 +46,12 @@ public class Xog_urlfmtr_mgr implements Gfo_invk { wildcard = itm; } else { - hash.Add_if_dupe_use_nth(domain, itm); + hash.AddIfDupeUseNth(domain, itm); } } } public String Gen(Xoa_url url) { - Xog_urlfmtr_itm itm = (Xog_urlfmtr_itm)hash.Get_by(url.Wiki_bry()); + Xog_urlfmtr_itm itm = (Xog_urlfmtr_itm)hash.GetByOrNull(url.Wiki_bry()); if (itm == null) { itm = wildcard; } diff --git a/400_xowa/src/gplx/xowa/htmls/Xoh_cmd_mgr.java b/400_xowa/src/gplx/xowa/htmls/Xoh_cmd_mgr.java index 1f2e4d374..d16c4b2c8 100644 --- a/400_xowa/src/gplx/xowa/htmls/Xoh_cmd_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/Xoh_cmd_mgr.java @@ -1,25 +1,25 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.htmls; import gplx.*; import gplx.xowa.*; public class Xoh_cmd_mgr { - public int Count() {return cmds.Count();} + public int Count() {return cmds.Len();} public void Clear() {cmds.Clear();} public void Add(Xoh_cmd_itm itm) {cmds.Add(itm);} List_adp cmds = List_adp_.New(); public void Exec(Xoae_app app, Xoae_page page) { - int len = cmds.Count(); + int len = cmds.Len(); if (len == 0) return; Gfo_usr_dlg usr_dlg = app.Usr_dlg(); usr_dlg.Prog_one(GRP_KEY, "bgn", "cmds bgn: ~{0}", len); // NOTE: this message will not show, but is needed for other messages to show; SWT swallowing 1st msg before showing others?; DATE:2013-04-25 diff --git a/400_xowa/src/gplx/xowa/htmls/Xoh_img_mgr.java b/400_xowa/src/gplx/xowa/htmls/Xoh_img_mgr.java index 0695f7878..9d3db8105 100644 --- a/400_xowa/src/gplx/xowa/htmls/Xoh_img_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/Xoh_img_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls; import gplx.*; import gplx.xowa.*; +package gplx.xowa.htmls; import gplx.*; import gplx.xowa.files.*; public class Xoh_img_mgr { private final List_adp list = List_adp_.New(); @@ -22,7 +22,7 @@ public class Xoh_img_mgr { this.uid_nxt = -1; list.Clear(); } - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Xof_fsdb_itm Get_at(int i) {return (Xof_fsdb_itm)list.Get_at(i);} public Xof_fsdb_itm Make_aud() { Xof_fsdb_itm itm = new Xof_fsdb_itm(); diff --git a/400_xowa/src/gplx/xowa/htmls/bridges/Gfo_tree_itm.java b/400_xowa/src/gplx/xowa/htmls/bridges/Gfo_tree_itm.java index 8cd50545f..d16ac74f4 100644 --- a/400_xowa/src/gplx/xowa/htmls/bridges/Gfo_tree_itm.java +++ b/400_xowa/src/gplx/xowa/htmls/bridges/Gfo_tree_itm.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.htmls.bridges; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.htmls.bridges; import gplx.*; interface Gfo_tree_itm { int Tid(); } @@ -35,7 +35,7 @@ class Gfo_tree_list implements Gfo_tree_itm { public int Tid() {return Gfo_tree_itm_.Tid_list;} public String Key() {return key;} private final String key; public void Clear() {list.Clear();} - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Gfo_tree_data Add_data(String key, Object val, int val_tid) {Gfo_tree_data rv = new Gfo_tree_data(key, val, val_tid); this.Add(key, rv); return rv;} public Gfo_tree_list Add_list(String key) {Gfo_tree_list rv = new Gfo_tree_list(key); this.Add(key, rv); return rv;} private void Add(String key, Gfo_tree_itm itm) {list.Add(key, itm);} diff --git a/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/Dbui_cmd_mgr.java b/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/Dbui_cmd_mgr.java index 0e45464ea..057f4169f 100644 --- a/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/Dbui_cmd_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/Dbui_cmd_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.bridges.dbuis; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.bridges.*; +package gplx.xowa.htmls.bridges.dbuis; import gplx.*; import gplx.xowa.*; +import gplx.xowa.htmls.bridges.*; import gplx.langs.jsons.*; import gplx.xowa.htmls.bridges.dbuis.tbls.*; public class Dbui_cmd_mgr { private final Hash_adp_bry hash = Hash_adp_bry.cs(); @@ -36,7 +37,7 @@ public class Dbui_cmd_mgr { } private Dbui_tbl_itm Get_tbl(Json_nde data) { byte[] tbl_key = data.Get_bry(Arg_tbl_key); - Dbui_tbl_itm rv = (Dbui_tbl_itm)hash.Get_by(tbl_key); if (rv == null) throw Err_.new_("dbui", "unknown tbl_key", "tbl_key", tbl_key); + Dbui_tbl_itm rv = (Dbui_tbl_itm)hash.GetByOrNull(tbl_key); if (rv == null) throw Err_.new_("dbui", "unknown tbl_key", "tbl_key", tbl_key); return rv; } private static Dbui_val_hash To_hash(Json_grp grp) { diff --git a/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/tbls/Dbui_val_hash.java b/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/tbls/Dbui_val_hash.java index 0ab6911e1..76d6bf81d 100644 --- a/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/tbls/Dbui_val_hash.java +++ b/400_xowa/src/gplx/xowa/htmls/bridges/dbuis/tbls/Dbui_val_hash.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.bridges.dbuis.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.bridges.*; import gplx.xowa.htmls.bridges.dbuis.*; -public class Dbui_val_hash { - private final Ordered_hash hash = Ordered_hash_.New_bry(); - public void Add(byte[] key, Dbui_val_itm itm) {hash.Add(key, itm);} - public byte[] Get_val_as_bry(String key) {return Get_val_as_bry(Bry_.new_u8(key));} - public byte[] Get_val_as_bry(byte[] key) { - Dbui_val_itm itm = (Dbui_val_itm)hash.Get_by(key); if (itm == null) throw Err_.new_wo_type("dbui.val_hash; unknown key", "key", key); - return itm.Data(); - } -} +package gplx.xowa.htmls.bridges.dbuis.tbls; import gplx.*; +public class Dbui_val_hash { + private final Ordered_hash hash = Ordered_hash_.New_bry(); + public void Add(byte[] key, Dbui_val_itm itm) {hash.Add(key, itm);} + public byte[] Get_val_as_bry(String key) {return Get_val_as_bry(Bry_.new_u8(key));} + public byte[] Get_val_as_bry(byte[] key) { + Dbui_val_itm itm = (Dbui_val_itm)hash.GetByOrNull(key); if (itm == null) throw Err_.new_wo_type("dbui.val_hash; unknown key", "key", key); + return itm.Data(); + } +} diff --git a/400_xowa/src/gplx/xowa/htmls/core/Xow_hdump_mgr__load.java b/400_xowa/src/gplx/xowa/htmls/core/Xow_hdump_mgr__load.java index f2098eb9b..f7c5f6b04 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/Xow_hdump_mgr__load.java +++ b/400_xowa/src/gplx/xowa/htmls/core/Xow_hdump_mgr__load.java @@ -135,7 +135,7 @@ public class Xow_hdump_mgr__load implements Gfo_invk { html_data.Content_sub_(tmp_hpg.Content_sub()); html_data.Xtn_skin_mgr().Add(new Xopg_xtn_skin_itm_stub(tmp_hpg.Sidebar_div())); html_data.Custom_head_tags().Add(hpg.Html_data().Custom_head_tags().To_ary()); - html_data.Indicators().Deserialise(wiki, hpg, (byte[])tmp_hpg.Props().Get_by(Indicator_hxtn_page_wkr.KEY)); + html_data.Indicators().Deserialise(wiki, hpg, (byte[])tmp_hpg.Props().GetByOrNull(Indicator_hxtn_page_wkr.KEY)); Xoh_head_mgr wpg_head = html_data.Head_mgr(); Xopg_module_mgr hpg_head = hpg.Head_mgr(); diff --git a/400_xowa/src/gplx/xowa/htmls/core/bldrs/Xob_link_dump_tbl.java b/400_xowa/src/gplx/xowa/htmls/core/bldrs/Xob_link_dump_tbl.java index 57ec10f87..46c91e2ee 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/bldrs/Xob_link_dump_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/core/bldrs/Xob_link_dump_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; +package gplx.xowa.htmls.core.bldrs; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; class Xob_link_dump_tbl implements Rls_able { - public static final String Tbl_name = "link_dump"; private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public static final String Tbl_name = "link_dump"; private static final DbmetaFldList flds = new DbmetaFldList(); public static final String - Fld_uid = flds.Add_int_pkey_autonum("uid") - , Fld_src_page_id = flds.Add_int("src_page_id") - , Fld_src_html_uid = flds.Add_int("src_html_uid") - , Fld_trg_page_id = flds.Add_int_dflt("trg_page_id", -1) - , Fld_trg_ns = flds.Add_int("trg_ns") - , Fld_trg_ttl = flds.Add_str("trg_ttl", 255) + Fld_uid = flds.AddIntPkeyAutonum("uid") + , Fld_src_page_id = flds.AddInt("src_page_id") + , Fld_src_html_uid = flds.AddInt("src_html_uid") + , Fld_trg_page_id = flds.AddIntDflt("trg_page_id", -1) + , Fld_trg_ns = flds.AddInt("trg_ns") + , Fld_trg_ttl = flds.AddStr("trg_ttl", 255) ; private Db_stmt stmt_insert; public Xob_link_dump_tbl(Db_conn conn) { @@ -49,7 +49,7 @@ class Xob_link_dump_tbl implements Rls_able { public void Insert_bgn() {conn.Txn_bgn("bldr__link_dump");} public void Insert_end() {conn.Txn_end(); stmt_insert = Db_stmt_.Rls(stmt_insert);} public void Insert_cmd_by_batch(int src_page_id, int src_html_uid, int trg_ns, byte[] trg_ttl) { - if (stmt_insert == null) stmt_insert = conn.Stmt_insert(Tbl_name, flds.To_str_ary_wo_autonum()); + if (stmt_insert == null) stmt_insert = conn.Stmt_insert(Tbl_name, flds.ToStrAryWoAutonum()); stmt_insert.Clear().Val_int(Fld_src_page_id, src_page_id) .Val_int(Fld_src_html_uid, src_html_uid).Val_int(Fld_trg_page_id, -1).Val_int(Fld_trg_ns, trg_ns).Val_bry_as_str(Fld_trg_ttl, trg_ttl) .Exec_insert(); diff --git a/400_xowa/src/gplx/xowa/htmls/core/dbs/Xoh_redlink_tbl.java b/400_xowa/src/gplx/xowa/htmls/core/dbs/Xoh_redlink_tbl.java index 1a437f210..dbdaf24c0 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/dbs/Xoh_redlink_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/core/dbs/Xoh_redlink_tbl.java @@ -13,16 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; +package gplx.xowa.htmls.core.dbs; import gplx.*; import gplx.dbs.*; public class Xoh_redlink_tbl implements Rls_able { - private final String tbl_name = "html_redlink"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "html_redlink"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_page_id, fld_redlink_uids; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert, stmt_delete, stmt_update; public Xoh_redlink_tbl(Db_conn conn) { this.conn = conn; - this.fld_page_id = flds.Add_int_pkey("page_id"); - this.fld_redlink_uids = flds.Add_bry("redlink_uids"); + this.fld_page_id = flds.AddIntPkey("page_id"); + this.fld_redlink_uids = flds.AddBry("redlink_uids"); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} diff --git a/400_xowa/src/gplx/xowa/htmls/core/dbs/Xowd_html_tbl.java b/400_xowa/src/gplx/xowa/htmls/core/dbs/Xowd_html_tbl.java index 5c9ad7acf..fcc482b26 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/dbs/Xowd_html_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/core/dbs/Xowd_html_tbl.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; +package gplx.xowa.htmls.core.dbs; import gplx.*; +import gplx.xowa.htmls.*; import gplx.dbs.*; import gplx.core.brys.*; public class Xowd_html_tbl implements Db_tbl { private final String fld_page_id, fld_head_flag, fld_body_flag, fld_display_ttl, fld_content_sub, fld_sidebar_div, fld_body; @@ -21,18 +22,18 @@ public class Xowd_html_tbl implements Db_tbl { private final Int_flag_bldr body_flag_bldr = Make_body_flag_bldr(); public Xowd_html_tbl(Db_conn conn) { this.conn = conn; - this.fld_page_id = flds.Add_int_pkey("page_id"); - this.fld_head_flag = flds.Add_int("head_flag"); - this.fld_body_flag = flds.Add_int("body_flag"); - this.fld_display_ttl = flds.Add_str("display_ttl", 1024); - this.fld_content_sub = flds.Add_str("content_sub", 1024); - this.fld_sidebar_div = flds.Add_str("sidebar_div", 2048); - this.fld_body = flds.Add_bry("body"); + this.fld_page_id = flds.AddIntPkey("page_id"); + this.fld_head_flag = flds.AddInt("head_flag"); + this.fld_body_flag = flds.AddInt("body_flag"); + this.fld_display_ttl = flds.AddStr("display_ttl", 1024); + this.fld_content_sub = flds.AddStr("content_sub", 1024); + this.fld_sidebar_div = flds.AddStr("sidebar_div", 2048); + this.fld_body = flds.AddBry("body"); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; public String Tbl_name() {return tbl_name;} private final String tbl_name = "html"; - public Dbmeta_fld_list Flds() {return flds;} private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public DbmetaFldList Flds() {return flds;} private final DbmetaFldList flds = new DbmetaFldList(); public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public void Insert_bgn() {conn.Txn_bgn("html__insert"); stmt_insert = conn.Stmt_insert(tbl_name, flds);} diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java index d88670880..717b87ace 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/glys/Xoh_gly_grp_data.java @@ -13,10 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; -import gplx.core.brys.*; +package gplx.xowa.htmls.core.wkrs.glys; import gplx.*; +import gplx.xowa.htmls.core.wkrs.*; import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; import gplx.langs.htmls.styles.*; import gplx.langs.htmls.clses.*; -import gplx.xowa.htmls.core.hzips.*; import gplx.xowa.xtns.gallery.*; public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr { // FUTURE:add gallerycaption private final List_adp itms_list = List_adp_.New(); @@ -39,7 +38,7 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr { / public boolean Xtra_style_exists() {return xtra_style_end > xtra_style_bgn;} public int Capt_bgn() {return capt_bgn;} private int capt_bgn; public int Capt_end() {return capt_end;} private int capt_end; - public int Itms__len() {return itms_list.Count();} + public int Itms__len() {return itms_list.Len();} public Xoh_gly_itm_data Itms__get_at(int i) {return (Xoh_gly_itm_data)itms_list.Get_at(i);} private void Clear() { this.gly_tid = Byte_.Max_value_127; @@ -170,9 +169,9 @@ public class Xoh_gly_grp_data implements Gfh_class_parser_wkr, Gfh_style_wkr { / private static final Hash_adp_bry atrs_ignored = Make_atrs_ignored(); private static Hash_adp_bry Make_atrs_ignored() { Hash_adp_bry rv = Hash_adp_bry.ci_a7(); - rv.Add_as_key_and_val(Gfh_atr_.Bry__class); - rv.Add_as_key_and_val(Gfh_atr_.Bry__style); - rv.Add_as_key_and_val(Gallery_mgr_wtr.Bry__data_xogly); + rv.AddAsKeyAndVal(Gfh_atr_.Bry__class); + rv.AddAsKeyAndVal(Gfh_atr_.Bry__style); + rv.AddAsKeyAndVal(Gallery_mgr_wtr.Bry__data_xogly); return rv; } } diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/tags/Xoh_tag_parser.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/tags/Xoh_tag_parser.java index 19a3d349c..f13e8a565 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/tags/Xoh_tag_parser.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/tags/Xoh_tag_parser.java @@ -13,14 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.tags; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; -import gplx.core.btries.*; import gplx.core.primitives.*; +package gplx.xowa.htmls.core.wkrs.tags; import gplx.*; import gplx.xowa.*; +import gplx.xowa.htmls.core.wkrs.*; import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; import gplx.xowa.htmls.hdumps.*; -import gplx.xowa.htmls.core.wkrs.lnkes.*; import gplx.xowa.htmls.core.wkrs.lnkis.*; import gplx.xowa.htmls.core.wkrs.hdrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; +import gplx.xowa.htmls.core.wkrs.lnkes.*; import gplx.xowa.htmls.core.wkrs.lnkis.*; import gplx.xowa.htmls.core.wkrs.hdrs.*; import gplx.xowa.htmls.core.wkrs.imgs.*; import gplx.xowa.htmls.core.wkrs.thms.*; import gplx.xowa.htmls.core.wkrs.glys.*; import gplx.xowa.htmls.core.wkrs.addons.forms.*; import gplx.xowa.htmls.core.hzips.*; import gplx.xowa.htmls.core.wkrs.tocs.*; -import gplx.xowa.wikis.ttls.*; public class Xoh_tag_parser implements Gfh_doc_wkr { private final Xoh_hdoc_wkr hdoc_wkr; private final Gfh_tag_rdr tag_rdr = Gfh_tag_rdr.New__html(); @@ -52,7 +51,7 @@ public class Xoh_tag_parser implements Gfh_doc_wkr { int rv = -1; Gfh_atr hdump_atr = cur.Atrs__get_by_or_empty(Bry__data_xowa_hdump); if (hdump_atr != Gfh_atr.Noop) { - Xoh_hdump_wkr hdump_wkr = (Xoh_hdump_wkr)hdump_wkrs.Get_by(hdump_atr.Val()); + Xoh_hdump_wkr hdump_wkr = (Xoh_hdump_wkr)hdump_wkrs.GetByOrNull(hdump_atr.Val()); if (hdump_wkr == null) { tag_rdr.Err_wkr().Warn("unable to find hdump_wkr: " + String_.new_a7(hdump_atr.Val())); rv = cur_end; diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_itm__style.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_itm__style.java index 7939cdb86..ba66b1cd1 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_itm__style.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_itm__style.java @@ -13,9 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.xndes.atrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; +package gplx.xowa.htmls.core.wkrs.xndes.atrs; import gplx.*; +import gplx.xowa.htmls.core.wkrs.*; import gplx.core.brys.*; -import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; import gplx.langs.htmls.styles.*; +import gplx.langs.htmls.docs.*; import gplx.langs.htmls.styles.*; class Xohz_atr_itm__style implements Xohz_atr_itm { // EX: style='width:20em;' private int flag_idx; private final Ordered_hash zatr_hash; @@ -36,7 +37,7 @@ class Xohz_atr_itm__style implements Xohz_atr_itm { // EX: style='width:20em;' bfr.Add_hzip_int(1, len); for (int i = 0; i < len; ++i) { Gfh_style_itm hitm = itms[i]; - Xohz_atr_itm zitm = (Xohz_atr_itm)zatr_hash.Get_by(hitm.Key()); + Xohz_atr_itm zitm = (Xohz_atr_itm)zatr_hash.GetByOrNull(hitm.Key()); if (zitm == null) { // get dict key // write dict key @@ -53,7 +54,7 @@ class Xohz_atr_itm__style implements Xohz_atr_itm { // EX: style='width:20em;' int len = rdr.Read_hzip_int(1); for (int i = 0; i < len; ++i) { int key_uid = rdr.Read_hzip_int(1); - Xohz_atr_itm zatr = (Xohz_atr_itm)zatr_hash.Get_by(key_uid); + Xohz_atr_itm zatr = (Xohz_atr_itm)zatr_hash.GetByOrNull(key_uid); bfr.Add(zatr.Key()); int val_bgn = rdr.Pos(); int val_end = rdr.Find_fwd_lr(); diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_regy.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_regy.java index d2cce0c47..77321a82f 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_regy.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/atrs/Xohz_atr_regy.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.xndes.atrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; +package gplx.xowa.htmls.core.wkrs.xndes.atrs; import gplx.*; public class Xohz_atr_regy { private final Hash_adp_bry itm_regy = Hash_adp_bry.cs(); private final Hash_adp_bry grp_regy = Hash_adp_bry.cs(); @@ -24,14 +24,14 @@ public class Xohz_atr_regy { byte[] sub_key = sub_keys[i]; Grps__add__recur(sub_key); } - Xohz_atr_grp grp = new Xohz_atr_grp((byte[][])tmp_list.To_ary_and_clear(byte[].class)); + Xohz_atr_grp grp = new Xohz_atr_grp((byte[][])tmp_list.ToAryAndClear(byte[].class)); grp_regy.Add(grp_key, grp); return this; } private void Grps__add__recur(byte[] sub_key) { - Object sub_obj = itm_regy.Get_by(sub_key); + Object sub_obj = itm_regy.GetByOrNull(sub_key); if (sub_obj == null) { - sub_obj = grp_regy.Get_by(sub_key); + sub_obj = grp_regy.GetByOrNull(sub_key); if (sub_obj == null) throw Err_.new_("hzip", "sub_key is not known itm or grp", "sub_key", sub_key); Xohz_atr_grp sub_grp = (Xohz_atr_grp)sub_obj; byte[][] subs = sub_grp.Subs(); int subs_len = subs.length; @@ -47,11 +47,11 @@ public class Xohz_atr_regy { public Xohz_atr_regy Itms__add_str(int uid, byte[] key) {itm_regy.Add(key, new Xohz_atr_itm__str(uid, key)); return this;} public Xohz_atr_itm[] Resolve(byte[] key) { Grps__add__recur(key); - byte[][] itm_keys = (byte[][])tmp_list.To_ary_and_clear(byte[].class); + byte[][] itm_keys = (byte[][])tmp_list.ToAryAndClear(byte[].class); int itm_keys_len = itm_keys.length; Xohz_atr_itm[] rv = new Xohz_atr_itm[itm_keys_len]; for (int i = 0; i < itm_keys_len; ++i) - rv[i] = (Xohz_atr_itm)itm_regy.Get_by(itm_keys[i]); + rv[i] = (Xohz_atr_itm)itm_regy.GetByOrNull(itm_keys[i]); return rv; } } diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/dicts/Xoh_xnde_dict_grp.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/dicts/Xoh_xnde_dict_grp.java index a8b8d14e8..3d76d1678 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/dicts/Xoh_xnde_dict_grp.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/dicts/Xoh_xnde_dict_grp.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.xndes.dicts; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; +package gplx.xowa.htmls.core.wkrs.xndes.dicts; import gplx.*; +import gplx.xowa.htmls.core.wkrs.*; import gplx.core.brys.*; public class Xoh_xnde_dict_grp { private final int id_len; @@ -41,7 +42,7 @@ public class Xoh_xnde_dict_grp { public void Save(Xoh_hzip_bfr bfr) { // sort by val // write dict_id? - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Xoh_xnde_dict_itm itm = (Xoh_xnde_dict_itm)list.Get_at(i); itm.Save(bfr, id_len); diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag.java index fef174888..4d7611999 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.xndes.tags; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; +package gplx.xowa.htmls.core.wkrs.xndes.tags; import gplx.*; +import gplx.xowa.htmls.core.wkrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; import gplx.core.brys.*; import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; import gplx.xowa.htmls.core.wkrs.xndes.atrs.*; @@ -32,23 +33,23 @@ public class Xohz_tag { private void Init_flag_bldr() { for (int i = 0; i < zatr_ary_len; ++i) { Xohz_atr_itm zatr = zatr_ary[i]; - zatr.Ini_flag(tmp_pow_ary_list.Count(), tmp_pow_ary_list); + zatr.Ini_flag(tmp_pow_ary_list.Len(), tmp_pow_ary_list); zatr_hash.Add(zatr.Key(), zatr); } tmp_pow_ary_list.Add(1); // 0=no unknown ; 1=unknown atrs tmp_pow_ary_list.Add(1); // 0=head ; 1=inline - int tmp_pow_ary_len = tmp_pow_ary_list.Count(); + int tmp_pow_ary_len = tmp_pow_ary_list.Len(); flag__tag_is_inline = tmp_pow_ary_len - 2; flag__unknown_atrs_exist = tmp_pow_ary_len - 1; - flag_bldr.Pow_ary_bld_((int[])tmp_pow_ary_list.To_ary_and_clear(int.class)); + flag_bldr.Pow_ary_bld_((int[])tmp_pow_ary_list.ToAryAndClear(int.class)); } public boolean Encode(Xoh_hdoc_ctx hctx, Xoh_hzip_bfr bfr, byte[] src, Xoh_xnde_parser parser) { Ordered_hash hatrs = parser.Atrs(); - int hatrs_len = hatrs.Count(); + int hatrs_len = hatrs.Len(); int unknown_atrs = 0; for (int i = 0; i < hatrs_len; ++i) { Gfh_atr hatr = (Gfh_atr)hatrs.Get_at(i); - Xohz_atr_itm zatr = (Xohz_atr_itm)zatr_hash.Get_by(hatr.Key()); + Xohz_atr_itm zatr = (Xohz_atr_itm)zatr_hash.GetByOrNull(hatr.Key()); if (zatr == null) ++unknown_atrs; else zatr.Enc_flag(hctx, src, hatr, flag_bldr); } @@ -58,7 +59,7 @@ public class Xohz_tag { if (unknown_atrs > 0) bfr.Add_hzip_int(1, unknown_atrs); for (int i = 0; i < zatr_ary_len; ++i) { Gfh_atr hatr = (Gfh_atr)hatrs.Get_at(i); - Xohz_atr_itm zatr = (Xohz_atr_itm)zatr_hash.Get_by(hatr.Key()); + Xohz_atr_itm zatr = (Xohz_atr_itm)zatr_hash.GetByOrNull(hatr.Key()); if (zatr != null) zatr.Enc_data(hctx, src, hatr, bfr); // zatr should be String // else zatr.Enc_data(hctx, src, hatr, bfr); } diff --git a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag_regy.java b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag_regy.java index 25d3157f9..77cf5e439 100644 --- a/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag_regy.java +++ b/400_xowa/src/gplx/xowa/htmls/core/wkrs/xndes/tags/Xohz_tag_regy.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.core.wkrs.xndes.tags; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.*; import gplx.xowa.htmls.core.wkrs.*; import gplx.xowa.htmls.core.wkrs.xndes.*; +package gplx.xowa.htmls.core.wkrs.xndes.tags; import gplx.*; import gplx.core.primitives.*; -import gplx.langs.htmls.*; import gplx.xowa.htmls.core.wkrs.xndes.atrs.*; +import gplx.xowa.htmls.core.wkrs.xndes.atrs.*; public class Xohz_tag_regy { private final Ordered_hash keys = Ordered_hash_.New_bry(); private final Hash_adp uids = Hash_adp_.New(); private final Byte_obj_ref uids_ref = Byte_obj_ref.zero_(); public Xohz_atr_regy Atr_regy() {return atr_regy;} private final Xohz_atr_regy atr_regy = new Xohz_atr_regy(); - public Xohz_tag Get_by_key(byte[] key) {return (Xohz_tag)keys.Get_by(key);} - public Xohz_tag Get_by_uid(byte uid) {return (Xohz_tag)uids.Get_by(uids_ref.Val_(uid));} + public Xohz_tag Get_by_key(byte[] key) {return (Xohz_tag)keys.GetByOrNull(key);} + public Xohz_tag Get_by_uid(byte uid) {return (Xohz_tag)uids.GetByOrNull(uids_ref.Val_(uid));} public Xohz_tag_regy Add(int uid, byte[] key, int flag_len, byte[] atr_key) { Xohz_tag tag = new Xohz_tag(uid, key, flag_len, atr_regy.Resolve(atr_key)); keys.Add(key, tag); diff --git a/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_mgr.java b/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_mgr.java index 87ec031fc..3e9da8fc1 100644 --- a/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/heads/Xoh_head_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.heads; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; +package gplx.xowa.htmls.heads; import gplx.*; import gplx.xowa.*; import gplx.core.bits.*; import gplx.xowa.wikis.pages.*; public class Xoh_head_mgr implements gplx.core.brys.Bfr_arg { @@ -179,7 +179,7 @@ public class Xoh_head_mgr implements gplx.core.brys.Bfr_arg { } class Xoh_head_wkr { private final List_adp list = List_adp_.New_w_size(Xoh_head_itm__base.Idx__max); - public int Len() {return list.Count();} + public int Len() {return list.Len();} public void Clear() {list.Clear();} public void Add(Xoh_head_itm__base itm) {list.Add(itm);} public Xoh_head_itm__base Get_at(int i) {return (Xoh_head_itm__base)list.Get_at(i);} diff --git a/400_xowa/src/gplx/xowa/htmls/hxtns/blobs/Hxtn_blob_tbl.java b/400_xowa/src/gplx/xowa/htmls/hxtns/blobs/Hxtn_blob_tbl.java index 85dcefd94..1ddb32171 100644 --- a/400_xowa/src/gplx/xowa/htmls/hxtns/blobs/Hxtn_blob_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/hxtns/blobs/Hxtn_blob_tbl.java @@ -25,15 +25,15 @@ import gplx.dbs.Db_rdr; import gplx.dbs.Db_rdr_; import gplx.dbs.Db_stmt; import gplx.dbs.Db_stmt_; -import gplx.dbs.Dbmeta_fld_list; +import gplx.dbs.DbmetaFldList; import gplx.dbs.Dbmeta_idx_itm; import gplx.dbs.Dbmeta_tbl_itm; public class Hxtn_blob_tbl implements Rls_able { - private static final String tbl_name = "hxtn_blob"; private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "hxtn_blob"; private static final DbmetaFldList flds = new DbmetaFldList(); private static final String - fld_blob_tid = flds.Add_int("blob_tid"), fld_wiki_id = flds.Add_int("wiki_id"), fld_blob_id = flds.Add_int("blob_id") - , fld_zip_tid = flds.Add_byte("zip_tid"), fld_blob_data = flds.Add_bry("blob_data"); + fld_blob_tid = flds.AddInt("blob_tid"), fld_wiki_id = flds.AddInt("wiki_id"), fld_blob_id = flds.AddInt("blob_id") + , fld_zip_tid = flds.AddByte("zip_tid"), fld_blob_data = flds.AddBry("blob_data"); private final Db_conn conn; private Db_stmt stmt_insert; private final byte zip_tid_default; private final Io_stream_zip_mgr zip_mgr = new Io_stream_zip_mgr(); @@ -88,7 +88,7 @@ public class Hxtn_blob_tbl implements Rls_able { try { while (rdr.Move_next()) { byte[] key = Make_key(temp_bfr, rdr.Read_int(fld_wiki_id), rdr.Read_int(fld_blob_id), rdr.Read_int(fld_blob_tid)); - blob_data_hash.Add_as_key_and_val(key); + blob_data_hash.AddAsKeyAndVal(key); } } finally { rdr.Rls(); diff --git a/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_mgr.java b/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_mgr.java index 945f48232..ab6fd9fea 100644 --- a/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_mgr.java @@ -93,7 +93,7 @@ public class Hxtn_page_mgr { public void Blob_tbl__insert(int blob_tid, int wiki_id, int blob_id, byte[] blob_text) { byte[] key = Hxtn_blob_tbl.Make_key(temp_bfr, blob_tid, wiki_id, blob_id); if (!blob_hash.Has(key)) {// multiple pages can refer to same template; only insert if not seen - blob_hash.Add_as_key_and_val(key); + blob_hash.AddAsKeyAndVal(key); if (!blob_tbl.Exists(blob_tid, wiki_id, blob_id)) { blob_tbl.Insert_exec(blob_tid, wiki_id, blob_id, blob_text); } diff --git a/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_tbl.java b/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_tbl.java index e19271a2f..062ef8bfe 100644 --- a/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/hxtns/pages/Hxtn_page_tbl.java @@ -23,21 +23,21 @@ import gplx.dbs.Db_rdr; import gplx.dbs.Db_rdr_; import gplx.dbs.Db_stmt; import gplx.dbs.Db_stmt_; -import gplx.dbs.Dbmeta_fld_list; +import gplx.dbs.DbmetaFldList; import gplx.dbs.Dbmeta_idx_itm; import gplx.dbs.Dbmeta_tbl_itm; public class Hxtn_page_tbl implements Rls_able { - private static final String tbl_name = "hxtn_page"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "hxtn_page"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_page_id, fld_wkr_id, fld_data_id; private final Db_conn conn; private Db_stmt stmt_insert; public Hxtn_page_tbl(Db_conn conn) { this.conn = conn; conn.Rls_reg(this); - flds.Add_int_pkey_autonum("id"); - this.fld_page_id = flds.Add_int("page_id"); - this.fld_wkr_id = flds.Add_int("wkr_id"); - this.fld_data_id = flds.Add_int("data_id"); + flds.AddIntPkeyAutonum("id"); + this.fld_page_id = flds.AddInt("page_id"); + this.fld_wkr_id = flds.AddInt("wkr_id"); + this.fld_data_id = flds.AddInt("data_id"); } public String Tbl_name() {return tbl_name;} public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} diff --git a/400_xowa/src/gplx/xowa/htmls/hxtns/wikis/Hxtn_wiki_tbl.java b/400_xowa/src/gplx/xowa/htmls/hxtns/wikis/Hxtn_wiki_tbl.java index fa82cd512..842d74550 100644 --- a/400_xowa/src/gplx/xowa/htmls/hxtns/wikis/Hxtn_wiki_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/hxtns/wikis/Hxtn_wiki_tbl.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.hxtns.wikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.hxtns.*; +package gplx.xowa.htmls.hxtns.wikis; import gplx.*; import gplx.dbs.*; public class Hxtn_wiki_tbl implements Rls_able { - private static final String tbl_name = "hxtn_wiki"; private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "hxtn_wiki"; private static final DbmetaFldList flds = new DbmetaFldList(); private static final String - fld_wiki_id = flds.Add_int_pkey("wiki_id"), fld_wiki_domain = flds.Add_str("wiki_domain", 255) + fld_wiki_id = flds.AddIntPkey("wiki_id"), fld_wiki_domain = flds.AddStr("wiki_domain", 255) ; private final Db_conn conn; public Hxtn_wiki_tbl(Db_conn conn) { diff --git a/400_xowa/src/gplx/xowa/htmls/hxtns/wkrs/Hxtn_wkr_tbl.java b/400_xowa/src/gplx/xowa/htmls/hxtns/wkrs/Hxtn_wkr_tbl.java index d1cec0cb4..0cc081a04 100644 --- a/400_xowa/src/gplx/xowa/htmls/hxtns/wkrs/Hxtn_wkr_tbl.java +++ b/400_xowa/src/gplx/xowa/htmls/hxtns/wkrs/Hxtn_wkr_tbl.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.hxtns.wkrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.hxtns.*; +package gplx.xowa.htmls.hxtns.wkrs; import gplx.*; import gplx.dbs.*; import gplx.core.lists.hashs.*; public class Hxtn_wkr_tbl implements Rls_able { - private static final String tbl_name = "hxtn_wkr"; private static final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private static final String tbl_name = "hxtn_wkr"; private static final DbmetaFldList flds = new DbmetaFldList(); private static final String - fld_wkr_id = flds.Add_int_pkey("wkr_id"), fld_wkr_key = flds.Add_str("wkr_key", 255) + fld_wkr_id = flds.AddIntPkey("wkr_id"), fld_wkr_key = flds.AddStr("wkr_key", 255) ; private final Db_conn conn; public Hxtn_wkr_tbl(Db_conn conn) { diff --git a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java index 7cf1b9a49..afb22afc1 100644 --- a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr.java @@ -13,15 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.modules.*; -import gplx.core.primitives.*; import gplx.core.threads.*; import gplx.core.envs.*; +package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.*; +import gplx.core.primitives.*; import gplx.core.threads.*; import gplx.core.js.*; -import gplx.xowa.addons.apps.cfgs.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.guis.views.*; -import gplx.xowa.htmls.hrefs.*; import gplx.xowa.specials.*; -import gplx.xowa.apps.apis.xowa.html.modules.*; public class Xow_popup_mgr implements Gfo_invk, Gfo_evt_itm { private Xoae_app app; private Xowe_wiki wiki; private Js_wtr js_wtr = new Js_wtr(); private int show_init_word_count, show_more_word_count; @@ -90,7 +87,7 @@ public class Xow_popup_mgr implements Gfo_invk, Gfo_evt_itm { // return load_popup_wkr.Rslt_bry(); Running_(true); if (itm.Canceled()) return null; - cur_page.Popup_mgr().Itms().Add_if_dupe_use_nth(itm.Popup_id(), itm); + cur_page.Popup_mgr().Itms().AddIfDupeUseNth(itm.Popup_id(), itm); app.Html__href_parser().Parse_as_url(tmp_url, itm.Page_href(), wiki, cur_page.Ttl().Full_url()); // NOTE: use Full_url, not Page_url, else anchors won't work for non-main ns; PAGE:en.w:Project:Sandbox; DATE:2014-08-07 if (!Xoa_url_.Tid_is_pagelike(tmp_url.Tid())) return Bry_.Empty; // NOTE: do not get popups for "file:///"; DATE:2015-04-05 Xowe_wiki popup_wiki = (Xowe_wiki)app.Wiki_mgr().Get_by_or_null(tmp_url.Wiki_bry()); @@ -104,7 +101,7 @@ public class Xow_popup_mgr implements Gfo_invk, Gfo_evt_itm { if (!Xow_special_meta_.Itm__popup_history.Match_ttl(popup_ttl)) return Bry_.Empty; // do not popup for special, unless popupHistory; DATE:2015-04-20 break; } - if (ns_allowed_regy.Count() > 0 && !ns_allowed_regy.Has(ns_allowed_regy_key.Val_(popup_ttl.Ns().Id()))) return Bry_.Empty; + if (ns_allowed_regy.Len() > 0 && !ns_allowed_regy.Has(ns_allowed_regy_key.Val_(popup_ttl.Ns().Id()))) return Bry_.Empty; itm.Init(popup_wiki.Domain_bry(), popup_ttl); int wait_count = 0; while (gplx.xowa.guis.views.Load_page_wkr.Running() && ++wait_count < 100) { @@ -172,11 +169,11 @@ public class Xow_popup_mgr implements Gfo_invk, Gfo_evt_itm { Int_obj_ref ns_id_itm = Int_obj_ref.New(ns.Id()); rv.Add(ns_id_itm); } - return (Int_obj_ref[])rv.To_ary(Int_obj_ref.class); + return (Int_obj_ref[])rv.ToAry(Int_obj_ref.class); } private Hash_adp ns_allowed_regy = Hash_adp_.New(); private Int_obj_ref ns_allowed_regy_key = Int_obj_ref.New_zero(); private Xoae_page Cur_page() {return app.Gui_mgr().Browser_win().Active_page();} private Xowe_wiki Cur_wiki() {return app.Gui_mgr().Browser_win().Active_tab().Wiki();} - private Xow_popup_itm Itms_get_or_null(Xoae_page page, String popup_id) {return (Xow_popup_itm)page.Popup_mgr().Itms().Get_by(popup_id);} + private Xow_popup_itm Itms_get_or_null(Xoae_page page, String popup_id) {return (Xow_popup_itm)page.Popup_mgr().Itms().GetByOrNull(popup_id);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Cfg__enabled)) enabled = m.ReadYn("v"); else if (ctx.Match(k, Cfg__show_init_word_count)) show_init_word_count = m.ReadInt("v"); diff --git a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr_.java b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr_.java index 624dd674d..9b8e5bdf0 100644 --- a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr_.java +++ b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_mgr_.java @@ -1,20 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.modules.*; -import gplx.core.threads.*; import gplx.core.primitives.*; import gplx.core.js.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.*; +import gplx.core.threads.*; import gplx.core.primitives.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.specials.*; class Load_popup_wkr implements Gfo_thread_wkr { private Xow_popup_itm itm; private Xoae_page cur_page; private Xoa_url tmp_url; @@ -33,7 +33,7 @@ class Load_popup_wkr implements Gfo_thread_wkr { Xoae_app app = wiki.Appe(); try { if (itm.Canceled()) return; - cur_page.Popup_mgr().Itms().Add_if_dupe_use_nth(itm.Popup_id(), itm); + cur_page.Popup_mgr().Itms().AddIfDupeUseNth(itm.Popup_id(), itm); app.Html__href_parser().Parse_as_url(tmp_url, itm.Page_href(), wiki, cur_page.Ttl().Full_url()); // NOTE: use Full_url, not Page_url, else anchors won't work for non-main ns; PAGE:en.w:Project:Sandbox; DATE:2014-08-07 if (!Xoa_url_.Tid_is_pagelike(tmp_url.Tid())) return; // NOTE: do not get popups for "file:///"; DATE:2015-04-05 Xowe_wiki popup_wiki = (Xowe_wiki)app.Wiki_mgr().Get_by_or_null(tmp_url.Wiki_bry()); @@ -47,7 +47,7 @@ class Load_popup_wkr implements Gfo_thread_wkr { if (!Xow_special_meta_.Itm__popup_history.Match_ttl(popup_ttl)) return; // do not popup for special, unless popupHistory; DATE:2015-04-20 break; } - if (ns_allowed_regy.Count() > 0 && !ns_allowed_regy.Has(ns_allowed_regy_key.Val_(popup_ttl.Ns().Id()))) return; + if (ns_allowed_regy.Len() > 0 && !ns_allowed_regy.Has(ns_allowed_regy_key.Val_(popup_ttl.Ns().Id()))) return; itm.Init(popup_wiki.Domain_bry(), popup_ttl); Xoae_page popup_page = popup_wiki.Data_mgr().Load_page_by_ttl(popup_ttl); byte[] rv = popup_wiki.Html_mgr().Head_mgr().Popup_mgr().Parser().Parse(wiki, popup_page, cur_page.Tab_data().Tab(), itm); diff --git a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_parser_data.java b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_parser_data.java index 6af2ee70e..3e2780c82 100644 --- a/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_parser_data.java +++ b/400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_parser_data.java @@ -1,20 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.modules.*; -import gplx.xowa.apps.apis.xowa.html.modules.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.parsers.*; public class Xow_popup_parser_data { public int Tmpl_max() {return tmpl_max;} private int tmpl_max; @@ -23,7 +22,7 @@ public class Xow_popup_parser_data { private int words_needed_min; public int Words_found() {return words_found;} private int words_found; public Bry_bfr Wrdx_bfr() {return wrdx_bfr;} private Bry_bfr wrdx_bfr = Bry_bfr_.Reset(255); - public Xow_popup_word[] Words_found_ary() {return (Xow_popup_word[])words_found_list.To_ary_and_clear(Xow_popup_word.class);} private List_adp words_found_list = List_adp_.New(); + public Xow_popup_word[] Words_found_ary() {return (Xow_popup_word[])words_found_list.ToAryAndClear(Xow_popup_word.class);} private List_adp words_found_list = List_adp_.New(); public int Tmpl_loop_count() {return tmpl_loop_count;} private int tmpl_loop_count; public void Tmpl_loop_count_add() {++tmpl_loop_count;} private Xow_popup_itm popup_itm; diff --git a/400_xowa/src/gplx/xowa/htmls/modules/popups/keeplists/Xop_keeplist_wiki.java b/400_xowa/src/gplx/xowa/htmls/modules/popups/keeplists/Xop_keeplist_wiki.java index fbddbf9d5..382299d34 100644 --- a/400_xowa/src/gplx/xowa/htmls/modules/popups/keeplists/Xop_keeplist_wiki.java +++ b/400_xowa/src/gplx/xowa/htmls/modules/popups/keeplists/Xop_keeplist_wiki.java @@ -1,20 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.htmls.modules.popups.keeplists; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.modules.*; import gplx.xowa.htmls.modules.popups.*; -import gplx.langs.regxs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.htmls.modules.popups.keeplists; import gplx.*; import gplx.xowa.*; public class Xop_keeplist_wiki { public Xop_keeplist_wiki(Xowe_wiki wiki) { srl = new Xop_keeplist_wiki_srl(wiki); @@ -24,7 +23,7 @@ public class Xop_keeplist_wiki { public Xop_keeplist_wiki_srl Srl() {return srl;} private Xop_keeplist_wiki_srl srl; public void Rules_add(Xop_keeplist_rule rule) {rules_list.Add(rule);} private List_adp rules_list = List_adp_.New(); public void Rules_seal() { - this.rules = (Xop_keeplist_rule[])rules_list.To_ary_and_clear(Xop_keeplist_rule.class); + this.rules = (Xop_keeplist_rule[])rules_list.ToAryAndClear(Xop_keeplist_rule.class); this.rules_len = rules.length; if (rules_len == 0) return; if (rules_len == 1) { diff --git a/400_xowa/src/gplx/xowa/htmls/sections/Xoh_section_mgr.java b/400_xowa/src/gplx/xowa/htmls/sections/Xoh_section_mgr.java index 01c124aca..0b0aa774e 100644 --- a/400_xowa/src/gplx/xowa/htmls/sections/Xoh_section_mgr.java +++ b/400_xowa/src/gplx/xowa/htmls/sections/Xoh_section_mgr.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.htmls.sections; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; +package gplx.xowa.htmls.sections; import gplx.*; public class Xoh_section_mgr { private final List_adp list = List_adp_.New(); public void Clear() {list.Clear();} - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Xoh_section_itm Get_at(int i) {return (Xoh_section_itm)list.Get_at(i);} public Xoh_section_itm Add(int uid, int level, byte[] anchor, byte[] display) { Xoh_section_itm rv = new Xoh_section_itm(uid, level, anchor, display); diff --git a/400_xowa/src/gplx/xowa/htmls/skins/Xoh_skin_regy.java b/400_xowa/src/gplx/xowa/htmls/skins/Xoh_skin_regy.java index 434d5e280..4a6c8bbcf 100644 --- a/400_xowa/src/gplx/xowa/htmls/skins/Xoh_skin_regy.java +++ b/400_xowa/src/gplx/xowa/htmls/skins/Xoh_skin_regy.java @@ -1,24 +1,24 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.htmls.skins; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.htmls.skins; import gplx.*; class Xoh_skin_regy { private final Ordered_hash hash = Ordered_hash_.New(); - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Xoh_skin_itm Get_at(int i) {return (Xoh_skin_itm)hash.Get_at(i);} - public Xoh_skin_itm Get_by_key(String key) {return (Xoh_skin_itm)hash.Get_by(key);} + public Xoh_skin_itm Get_by_key(String key) {return (Xoh_skin_itm)hash.GetByOrNull(key);} public void Set(String key, String fmt) { Xoh_skin_itm itm = Get_by_key(key); if (itm == null) { diff --git a/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java b/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java index 50cfe6235..6e64a8aaf 100644 --- a/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java @@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.langs; import gplx.*; import gplx.xowa.*; -import gplx.xowa.apps.fsys.*; import gplx.xowa.apps.gfs.*; +import gplx.xowa.apps.gfs.*; import gplx.xowa.langs.bldrs.*; import gplx.xowa.langs.names.*; public class Xoa_lang_mgr implements Gfo_invk { private final Ordered_hash hash = Ordered_hash_.New_bry(); @@ -30,10 +30,10 @@ public class Xoa_lang_mgr implements Gfo_invk { public Xol_lang_itm Lang_en() {return lang_en;} private final Xol_lang_itm lang_en; public Xol_name_mgr Name_mgr() {return name_mgr;} private final Xol_name_mgr name_mgr; public void Clear() {hash.Clear();} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public void Add(Xol_lang_itm itm) {hash.Add(itm.Key_bry(), itm);} public Io_url Root_dir() {return root_dir;} private final Io_url root_dir; - public Xol_lang_itm Get_by_or_null(byte[] key) {return (Xol_lang_itm)hash.Get_by(key);} // check if exists + public Xol_lang_itm Get_by_or_null(byte[] key) {return (Xol_lang_itm)hash.GetByOrNull(key);} // check if exists public Xol_lang_itm Get_by_or_load(byte[] key) { // main call Xol_lang_itm rv = Get_by_or_null(key); if (rv == null) { diff --git a/400_xowa/src/gplx/xowa/langs/Xol_lang_itm.java b/400_xowa/src/gplx/xowa/langs/Xol_lang_itm.java index fcb87b6fe..176a4f5db 100644 --- a/400_xowa/src/gplx/xowa/langs/Xol_lang_itm.java +++ b/400_xowa/src/gplx/xowa/langs/Xol_lang_itm.java @@ -17,7 +17,9 @@ package gplx.xowa.langs; import gplx.*; import gplx.xowa.*; import gplx.core.envs.*; import gplx.gfui.draws.*; import gplx.xowa.langs.cases.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.grammars.*; import gplx.xowa.langs.genders.*; import gplx.xowa.langs.plurals.*; import gplx.xowa.langs.vnts.*; import gplx.xowa.langs.vnts.converts.*; import gplx.xowa.langs.numbers.*; import gplx.xowa.langs.durations.*; import gplx.xowa.langs.lnki_trails.*; import gplx.xowa.langs.funcs.*; import gplx.xowa.langs.specials.*; import gplx.xowa.langs.bldrs.*; import gplx.xowa.langs.commas.*; -import gplx.xowa.apps.gfs.*; import gplx.xowa.apps.fsys.*; import gplx.core.intls.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.xtns.lst.*; import gplx.xowa.wikis.caches.*; import gplx.xowa.parsers.lnkis.*; +import gplx.xowa.apps.gfs.*; import gplx.xowa.apps.fsys.*; +import gplx.xowa.wikis.nss.*; import gplx.xowa.xtns.lst.*; +import gplx.xowa.parsers.lnkis.*; import gplx.xowa.guis.langs.*; import gplx.xowa.mediawiki.languages.*; public class Xol_lang_itm implements Gfo_invk { @@ -69,7 +71,7 @@ public class Xol_lang_itm implements Gfo_invk { // EX: // * lang.Load_lang("gl") calls lang.Fallback_bry_ with "pt" (the fallback_lang) and "en" (the default lang) // * then lang.Fallback_bry_ calls lang.Exec_fallback_load("pt") which calls lang.Fallack_bry_ with "pt-br"(the fallback_lang) and "en" (the default lang) - fallback_hash.Add_if_dupe_use_1st(val, val); + fallback_hash.AddIfDupeUse1st(val, val); } } catch (Exception exc) { String cur_fallbacks = String_.AryXtoStr((String[])fallback_hash.To_ary(String.class)); diff --git a/400_xowa/src/gplx/xowa/langs/bldrs/Xobc_utl_make_lang_kwds.java b/400_xowa/src/gplx/xowa/langs/bldrs/Xobc_utl_make_lang_kwds.java index 633b85b2d..645028431 100644 --- a/400_xowa/src/gplx/xowa/langs/bldrs/Xobc_utl_make_lang_kwds.java +++ b/400_xowa/src/gplx/xowa/langs/bldrs/Xobc_utl_make_lang_kwds.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.parsers.*; +package gplx.xowa.langs.bldrs; import gplx.*; +import gplx.xowa.langs.*; +import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.parsers.*; public class Xobc_utl_make_lang_kwds implements Gfo_invk, Xol_lang_transform { private final Xoa_lang_mgr lang_mgr; public Xobc_utl_make_lang_kwds(Xoa_lang_mgr lang_mgr) {this.lang_mgr = lang_mgr;} @@ -42,7 +43,7 @@ public class Xobc_utl_make_lang_kwds implements Gfo_invk, Xol_lang_transform { public void Add_words() { Ordered_hash hash = add_words_hash; Ordered_hash tmp = Ordered_hash_.New_bry(); - int hash_len = hash.Count(); + int hash_len = hash.Len(); for (int i = 0; i < hash_len; i++) { Xobcl_kwd_lang cfg_lang = (Xobcl_kwd_lang)hash.Get_at(i); Xol_lang_itm lang = lang_mgr.Get_by_or_null(cfg_lang.Key_bry()); if (lang == null) continue; @@ -74,7 +75,7 @@ public class Xobc_utl_make_lang_kwds implements Gfo_invk, Xol_lang_transform { } } boolean Hash_itm_applies(Ordered_hash hash, byte[] lang_key, byte[] kwd_key, byte[] kwd_word) { - Xobcl_kwd_lang cfg_lang = (Xobcl_kwd_lang)hash.Get_by(lang_key); if (cfg_lang == null) return false; + Xobcl_kwd_lang cfg_lang = (Xobcl_kwd_lang)hash.GetByOrNull(lang_key); if (cfg_lang == null) return false; Xobcl_kwd_row cfg_grp = cfg_lang.Grps_get_by_key(kwd_key); if (cfg_grp == null) return false; return cfg_grp.Itms().length == 0 || cfg_grp.Itms_has(kwd_word); } @@ -88,7 +89,7 @@ public class Xobc_utl_make_lang_kwds implements Gfo_invk, Xol_lang_transform { for (int i = 0; i < len; ++i) { Xol_lang_stub stub_itm = stub_ary[i]; byte[] key = stub_itm.Key(); - Xobcl_kwd_lang grp = (Xobcl_kwd_lang)hash.Get_by(key); + Xobcl_kwd_lang grp = (Xobcl_kwd_lang)hash.GetByOrNull(key); if (grp == null) { grp = new Xobcl_kwd_lang(key, itms); hash.Add(key, grp); @@ -126,7 +127,7 @@ public class Xobc_utl_make_lang_kwds implements Gfo_invk, Xol_lang_transform { if (last) break; ++pos; } - return (Xobcl_kwd_row[])rv.To_ary(Xobcl_kwd_row.class); + return (Xobcl_kwd_row[])rv.ToAry(Xobcl_kwd_row.class); } } class Xobcl_kwd_lang { @@ -138,10 +139,10 @@ class Xobcl_kwd_lang { public void Merge(Xobcl_kwd_row[] v) { grps = (Xobcl_kwd_row[])Array_.Resize_add(grps, v); for (Xobcl_kwd_row grp : v) { - grps_hash.Add_if_dupe_use_nth(grp.Key(), grp); // NOTE: Add_if_dupe_use_nth instead of Add b/c kwds may be expanded; EX: lst is added to all langs but de requires #lst~#section~Abschnitt~; DATE:2013-06-02 + grps_hash.AddIfDupeUseNth(grp.Key(), grp); // NOTE: Add_if_dupe_use_nth instead of Add b/c kwds may be expanded; EX: lst is added to all langs but de requires #lst~#section~Abschnitt~; DATE:2013-06-02 } } - public Xobcl_kwd_row Grps_get_by_key(byte[] key) {return (Xobcl_kwd_row)grps_hash.Get_by(key);} private Ordered_hash grps_hash = Ordered_hash_.New_bry(); + public Xobcl_kwd_row Grps_get_by_key(byte[] key) {return (Xobcl_kwd_row)grps_hash.GetByOrNull(key);} private Ordered_hash grps_hash = Ordered_hash_.New_bry(); public byte[] Key_bry() {return key_bry;} private byte[] key_bry; public Xobcl_kwd_row[] Grps() {return grps;} private Xobcl_kwd_row[] grps; } diff --git a/400_xowa/src/gplx/xowa/langs/bldrs/Xol_mw_lang_parser.java b/400_xowa/src/gplx/xowa/langs/bldrs/Xol_mw_lang_parser.java index 35f1ff7d0..aea031d6a 100644 --- a/400_xowa/src/gplx/xowa/langs/bldrs/Xol_mw_lang_parser.java +++ b/400_xowa/src/gplx/xowa/langs/bldrs/Xol_mw_lang_parser.java @@ -13,11 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.bldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; -import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.core.consoles.*; import gplx.core.intls.*; import gplx.langs.phps.*; import gplx.core.log_msgs.*; +package gplx.xowa.langs.bldrs; import gplx.*; +import gplx.xowa.langs.*; +import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.core.consoles.*; +import gplx.langs.phps.*; import gplx.core.log_msgs.*; import gplx.xowa.apps.gfs.*; import gplx.xowa.apps.fsys.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.numbers.*; import gplx.xowa.langs.parsers.*; import gplx.xowa.langs.specials.*; +import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.numbers.*; import gplx.xowa.langs.parsers.*; import gplx.xowa.langs.specials.*; import gplx.xowa.wikis.nss.*; public class Xol_mw_lang_parser { private Php_parser parser = new Php_parser(); private Php_evaluator evaluator; @@ -55,7 +57,7 @@ public class Xol_mw_lang_parser { } } private void Save_langs_by_manual_text(Xoa_gfs_bldr bldr, Ordered_hash manual_text_hash, String lang_key) { - byte[][] itm = (byte[][])manual_text_hash.Get_by(Bry_.new_u8(lang_key)); + byte[][] itm = (byte[][])manual_text_hash.GetByOrNull(Bry_.new_u8(lang_key)); if (itm != null) bldr.Bfr().Add(itm[1]); } public void Parse_mediawiki(Xoa_lang_mgr lang_mgr, Io_url mediawiki_root, Xol_lang_transform lang_transform) { @@ -112,7 +114,7 @@ public class Xol_mw_lang_parser { public void Parse_core(String text, Xol_lang_itm lang, Bry_bfr bfr, Xol_lang_transform lang_transform) { evaluator.Clear(); parser.Parse_tkns(text, evaluator); - Php_line[] lines = (Php_line[])evaluator.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])evaluator.List().ToAry(Php_line.class); int lines_len = lines.length; List_adp bry_list = List_adp_.New(); for (int i = 0; i < lines_len; i++) { @@ -171,7 +173,7 @@ public class Xol_mw_lang_parser { evaluator.Clear(); parser.Parse_tkns(text, evaluator); List_adp bry_list = List_adp_.New(); - Php_line[] lines = (Php_line[])evaluator.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])evaluator.List().ToAry(Php_line.class); int lines_len = lines.length; for (int i = 0; i < lines_len; i++) { Php_line_assign line = (Php_line_assign)lines[i]; @@ -214,7 +216,7 @@ public class Xol_mw_lang_parser { } } public Xow_ns[] Parse_namespace_strings(List_adp list, boolean ns_names) { - byte[][] brys = (byte[][])list.To_ary(byte[].class); + byte[][] brys = (byte[][])list.ToAry(byte[].class); int brys_len = brys.length; Xow_ns[] rv = new Xow_ns[brys_len / 2]; int key_dif = ns_names ? 0 : 1; @@ -230,7 +232,7 @@ public class Xol_mw_lang_parser { return rv; } private void Parse_messages(List_adp rv, Xol_lang_itm lang, Bry_bfr bfr) { - byte[][] brys = (byte[][])rv.To_ary(byte[].class); + byte[][] brys = (byte[][])rv.ToAry(byte[].class); int brys_len = brys.length; Xol_msg_mgr mgr = lang.Msg_mgr(); List_adp quote_itm_list = List_adp_.New(); Byte_obj_ref quote_parse_result = Byte_obj_ref.zero_(); diff --git a/400_xowa/src/gplx/xowa/langs/cases/Xol_case_itm_.java b/400_xowa/src/gplx/xowa/langs/cases/Xol_case_itm_.java index b8756e432..c7102e72e 100644 --- a/400_xowa/src/gplx/xowa/langs/cases/Xol_case_itm_.java +++ b/400_xowa/src/gplx/xowa/langs/cases/Xol_case_itm_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.cases; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.cases; import gplx.*; import gplx.xowa.langs.parsers.*; public class Xol_case_itm_ { public static final byte Tid_both = 0, Tid_upper = 1, Tid_lower = 2; @@ -69,7 +69,7 @@ public class Xol_case_itm_ { if (last) break; ++src_pos; } - return (Xol_case_itm[])list.To_ary(Xol_case_itm.class); + return (Xol_case_itm[])list.ToAry(Xol_case_itm.class); } public static Xol_case_itm[] parse_mw_(byte[] raw) { Ordered_hash hash = Ordered_hash_.New_bry(); @@ -116,7 +116,7 @@ public class Xol_case_itm_ { tid = Xol_case_itm_.Tid_lower; rev_tid = Xol_case_itm_.Tid_upper; } - Xol_case_itm_bry itm = (Xol_case_itm_bry)hash.Get_by(upper); + Xol_case_itm_bry itm = (Xol_case_itm_bry)hash.GetByOrNull(upper); if (itm == null) { itm = new Xol_case_itm_bry(tid, upper, lower); hash.Add(upper, itm); diff --git a/400_xowa/src/gplx/xowa/langs/cases/Xol_case_mgr_tst.java b/400_xowa/src/gplx/xowa/langs/cases/Xol_case_mgr_tst.java index 41b02e316..58fabcb0e 100644 --- a/400_xowa/src/gplx/xowa/langs/cases/Xol_case_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/langs/cases/Xol_case_mgr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.cases; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.cases; import gplx.*; import org.junit.*; import gplx.core.strings.*; public class Xol_case_mgr_tst { @Before public void init() {fxt.Clear();} private Xol_case_mgr_fxt fxt = new Xol_case_mgr_fxt(); @@ -116,7 +116,7 @@ class Xol_case_mgr_fxt { break; } } - return raw_str_(uppers_list.To_str_ary(), lowers_list.To_str_ary()); + return raw_str_(uppers_list.ToStrAry(), lowers_list.ToStrAry()); } List_adp uppers_list = List_adp_.New(), lowers_list = List_adp_.New(); String raw_str_(String[] uppers, String[] lowers) { sb.Add("a:2:{s:14:\"wikiUpperChars\";a:1046:{"); diff --git a/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_itm_.java b/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_itm_.java index 072c6dcdc..54538bf2e 100644 --- a/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_itm_.java +++ b/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_itm_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.durations; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.durations; import gplx.*; public class Xol_duration_itm_ { private static final Hash_adp_bry regy = Hash_adp_bry.ci_a7(); // ASCII:MW.consts public static final byte @@ -61,11 +61,11 @@ public class Xol_duration_itm_ { for (int i = 0; i < len; i++) { Keyval kv = kv_ary[i]; String name = kv.Val_to_str_or_empty(); - Xol_duration_itm itm = (Xol_duration_itm)regy.Get_by(Bry_.new_u8(name)); + Xol_duration_itm itm = (Xol_duration_itm)regy.GetByOrNull(Bry_.new_u8(name)); if (itm != null) rv.Add(itm); } - return (Xol_duration_itm[])rv.To_ary(Xol_duration_itm.class); + return (Xol_duration_itm[])rv.ToAry(Xol_duration_itm.class); } } class Xol_duration_itm_sorter implements gplx.core.lists.ComparerAble { diff --git a/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_mgr.java b/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_mgr.java index 5da7ace41..c61814d32 100644 --- a/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/durations/Xol_duration_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.durations; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.durations; import gplx.*; +import gplx.xowa.langs.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.parsers.*; import gplx.xowa.langs.msgs.*; @@ -33,13 +34,13 @@ public class Xol_duration_mgr { long itm_seconds = itm.Seconds(); val = seconds / itm_seconds; if ( val > 0 - || (i == intervals_len - 1 && rv.Count() == 0) // always add one seg; EX: 40 seconds, but minutes requested -> 0 minutes; DATE:2014-05-10 + || (i == intervals_len - 1 && rv.Len() == 0) // always add one seg; EX: 40 seconds, but minutes requested -> 0 minutes; DATE:2014-05-10 ) { seconds -= val * itm_seconds; rv.Add(new Xol_interval_itm(itm, val)); } } - return (Xol_interval_itm[])rv.To_ary(Xol_interval_itm.class); + return (Xol_interval_itm[])rv.ToAry(Xol_interval_itm.class); } public byte[] Format_durations(Xop_ctx ctx, long seconds, Xol_duration_itm[] ary) { if (interval_msgs == null) Format_durations_init(); diff --git a/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr.java b/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr.java index 1ee20f387..4f2c58e42 100644 --- a/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.msgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.msgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.parsers.*; public class Xol_msg_mgr implements Gfo_invk { private final Gfo_invk owner; private final boolean owner_is_lang; @@ -31,7 +31,7 @@ public class Xol_msg_mgr implements Gfo_invk { } public int Itms_max() {return itms_max;} private Xol_msg_itm[] itms; int itms_max = Xol_msg_itm_.Id__max; int itms_id_next = Xol_msg_itm_.Id__max; public Xol_msg_itm Itm_by_id_or_null(int id) {return id < itms_max ? itms[id] : null;} - public Xol_msg_itm Itm_by_key_or_null(byte[] key) {return (Xol_msg_itm)hash.Get_by(key);} + public Xol_msg_itm Itm_by_key_or_null(byte[] key) {return (Xol_msg_itm)hash.GetByOrNull(key);} public Xol_msg_itm Itms_new(byte[] msg_key) { Xol_msg_itm rv = new Xol_msg_itm(itms_id_next++, msg_key); Itms_reg(rv); @@ -44,7 +44,7 @@ public class Xol_msg_mgr implements Gfo_invk { return rv; } public Xol_msg_itm Itm_by_key_or_new(byte[] key) { - Object o = hash.Get_by(key); + Object o = hash.GetByOrNull(key); Xol_msg_itm rv = null; if (o == null) { // key not found; likely not a system_id; generate a custom one rv = new Xol_msg_itm(itms_id_next++, key); diff --git a/400_xowa/src/gplx/xowa/langs/names/Xol_name_mgr.java b/400_xowa/src/gplx/xowa/langs/names/Xol_name_mgr.java index 3f4c19a73..5531c8b10 100644 --- a/400_xowa/src/gplx/xowa/langs/names/Xol_name_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/names/Xol_name_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.names; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.names; import gplx.*; import gplx.core.primitives.*; import gplx.xowa.xtns.cldrs.*; @@ -42,7 +42,7 @@ public class Xol_name_mgr { code = String_.Lower(code); if (include == null) include = Scope__str__all; Ordered_hash array = fetchLanguageNames(inLanguage, include, page_url); - Keyval rv = (Keyval)array.Get_by(code); + Keyval rv = (Keyval)array.GetByOrNull(code); return rv == null ? "" : rv.Val_to_str_or_null(); } } @@ -68,9 +68,9 @@ public class Xol_name_mgr { String cacheKey = inLanguage + ":" + include_str; if (languageNameCache == null) languageNameCache = Ordered_hash_.New(); - Ordered_hash ret = (Ordered_hash)languageNameCache.Get_by(cacheKey); + Ordered_hash ret = (Ordered_hash)languageNameCache.GetByOrNull(cacheKey); if (ret == null) { - Byte_obj_val include_byte = (Byte_obj_val)Scope__hash.Get_by(include_str); + Byte_obj_val include_byte = (Byte_obj_val)Scope__hash.GetByOrNull(include_str); byte include = include_byte == null ? Scope__int__all : include_byte.Val(); Cldr_name_file cldr_file = cldr_loader.Load_or_empty(inLanguage); @@ -166,9 +166,9 @@ public class Xol_name_mgr { , Scope__str__mwFile = "mwFile" ; private static final Hash_adp Scope__hash = Hash_adp_.New() - .Add_and_more(Scope__str__mw , Byte_obj_val.new_(Scope__int__mw)) - .Add_and_more(Scope__str__all , Byte_obj_val.new_(Scope__int__all)) - .Add_and_more(Scope__str__mwFile, Byte_obj_val.new_(Scope__int__mwFile)) + .AddAndMore(Scope__str__mw , Byte_obj_val.new_(Scope__int__mw)) + .AddAndMore(Scope__str__all , Byte_obj_val.new_(Scope__int__all)) + .AddAndMore(Scope__str__mwFile, Byte_obj_val.new_(Scope__int__mwFile)) ; public static Ordered_hash fetchLanguageNamesUncached ( String inLanguage, byte include @@ -207,7 +207,7 @@ public class Xol_name_mgr { // # - For other mwNames just add if not added through the hook String code = mw_name.Key(); if (String_.Eq(code, inLanguage) || !names.Has(code)) { - names.Add_if_dupe_use_nth(code, Keyval_.new_(code, mw_name.Val_to_str_or_empty())); + names.AddIfDupeUseNth(code, Keyval_.new_(code, mw_name.Val_to_str_or_empty())); } } @@ -221,7 +221,7 @@ public class Xol_name_mgr { for (int i = 0; i < mwNames_len; i++) { Keyval coreName = (Keyval)mwNames.Get_at(i); String code = coreName.Key(); - returnMw.Add(code, (Keyval)names.Get_by(code)); + returnMw.Add(code, (Keyval)names.GetByOrNull(code)); } // REF.MW: /languages/classes/i18n/*.json @@ -235,7 +235,7 @@ public class Xol_name_mgr { Keyval kv = (Keyval)returnMw.Get_at(i); String code = kv.Key(); if (lang_files.Has(code)) { - namesMwFile.Add(code, (Keyval)names.Get_by(code)); + namesMwFile.Add(code, (Keyval)names.GetByOrNull(code)); } } diff --git a/400_xowa/src/gplx/xowa/langs/numbers/Xol_transform_mgr.java b/400_xowa/src/gplx/xowa/langs/numbers/Xol_transform_mgr.java index cc8eca55e..328d2b33f 100644 --- a/400_xowa/src/gplx/xowa/langs/numbers/Xol_transform_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/numbers/Xol_transform_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.langs.numbers; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.langs.numbers; import gplx.*; import gplx.core.btries.*; public class Xol_transform_mgr implements Gfo_invk { private Btrie_fast_mgr trie_k_to_v = Btrie_fast_mgr.cs(); @@ -21,10 +21,10 @@ public class Xol_transform_mgr implements Gfo_invk { private Ordered_hash hash = Ordered_hash_.New_bry(); private boolean empty = true; public void Clear() {hash.Clear(); trie_k_to_v.Clear(); trie_v_to_k.Clear(); empty = true;} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Keyval Get_at(int i) {return (Keyval)hash.Get_at(i);} public byte[] Get_val_or_self(byte[] k) { // NOTE: return self; note that MW defaults "." and "," to self, even though MessagesLa.php only specifies ","; i.e.: always return something for "."; DATE:2014-05-13 - Keyval kv = (Keyval)hash.Get_by(k); + Keyval kv = (Keyval)hash.GetByOrNull(k); return kv == null ? k : (byte[])kv.Val(); } public Xol_transform_mgr Set(byte[] k, byte[] v) { diff --git a/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl.java b/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl.java index 5ccd575e5..441d25e9b 100644 --- a/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl.java +++ b/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl.java @@ -1,20 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.langs.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; -import gplx.core.intls.*; import gplx.xowa.apps.gfs.*; import gplx.xowa.langs.numbers.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.bldrs.*; import gplx.xowa.langs.specials.*; import gplx.xowa.wikis.nss.*; @@ -46,7 +45,7 @@ public class Xol_lang_srl { if (last) break; ++pos; } - return (Xow_ns[])rv.To_ary(Xow_ns.class); + return (Xow_ns[])rv.ToAry(Xow_ns.class); } public static void Load_keywords(Xol_kwd_mgr keyword_mgr, byte[] src) { int src_len = src.length, pos = 0, fld_bgn = 0, fld_idx = 0; @@ -80,10 +79,10 @@ public class Xol_lang_srl { fld_bgn = pos + 1; break; case Byte_ascii.Nl: - if (cur_words.Count() > 0) { // guard against blank line wiping out entries; EX: "toc|0|toc1\n\n"; 2nd \n will get last grp and make 0 entries + if (cur_words.Len() > 0) { // guard against blank line wiping out entries; EX: "toc|0|toc1\n\n"; 2nd \n will get last grp and make 0 entries int cur_id = Xol_kwd_grp_.Id_by_bry(cur_key); if (cur_id == -1) throw Err_.new_wo_type("key does not have id", "id", cur_id); Xol_kwd_grp grp = keyword_mgr.Get_or_new(cur_id); - grp.Srl_load(cur_cs, (byte[][])cur_words.To_ary(byte[].class)); + grp.Srl_load(cur_cs, (byte[][])cur_words.ToAry(byte[].class)); } fld_bgn = pos + 1; fld_idx = 0; diff --git a/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl_tst.java b/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl_tst.java index 644f17be7..3b2722cee 100644 --- a/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl_tst.java +++ b/400_xowa/src/gplx/xowa/langs/parsers/Xol_lang_srl_tst.java @@ -15,9 +15,8 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.langs.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import org.junit.*; import gplx.core.strings.*; -import gplx.core.intls.*; import gplx.xowa.apps.gfs.*; -import gplx.xowa.langs.numbers.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.bldrs.*; import gplx.xowa.langs.specials.*; import gplx.xowa.langs.names.*; +import gplx.xowa.langs.numbers.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.langs.bldrs.*; import gplx.xowa.langs.specials.*; import gplx.xowa.wikis.nss.*; public class Xol_lang_srl_tst { private Xol_lang_srl_fxt fxt = new Xol_lang_srl_fxt(); @@ -307,7 +306,7 @@ class Xol_lang_srl_fxt { if (kwd_grp == null) continue; rv.Add(kwd_grp); } - return (Xol_kwd_grp[])rv.To_ary(Xol_kwd_grp.class); + return (Xol_kwd_grp[])rv.ToAry(Xol_kwd_grp.class); } String Xto_str(Xol_kwd_grp[] ary) { int len = ary.length; @@ -331,7 +330,7 @@ class Xol_lang_srl_fxt { if (itm == null || !itm.Dirty()) continue; rv.Add(itm); } - return (Xol_msg_itm[])rv.To_ary(Xol_msg_itm.class); + return (Xol_msg_itm[])rv.ToAry(Xol_msg_itm.class); } String Xto_str(Xol_msg_itm[] ary) { int len = ary.length; diff --git a/400_xowa/src/gplx/xowa/langs/specials/Xol_specials_mgr.java b/400_xowa/src/gplx/xowa/langs/specials/Xol_specials_mgr.java index e53369c83..4ca4e008c 100644 --- a/400_xowa/src/gplx/xowa/langs/specials/Xol_specials_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/specials/Xol_specials_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.specials; import gplx.*; +import gplx.xowa.langs.*; import gplx.xowa.langs.parsers.*; public class Xol_specials_mgr implements Gfo_invk { private final Ordered_hash hash_by_special = Ordered_hash_.New_bry(), hash_by_aliases = Ordered_hash_.New_bry(); @@ -22,10 +23,10 @@ public class Xol_specials_mgr implements Gfo_invk { public void Clear() {hash_by_special.Clear();} public int Len() {return hash_by_special.Len();} public Xol_specials_itm Get_at(int i) {return (Xol_specials_itm)hash_by_special.Get_at(i);} - public Xol_specials_itm Get_by_alias(byte[] alias) {return (Xol_specials_itm)hash_by_aliases.Get_by(alias);} - public Xol_specials_itm Get_by_key(byte[] special) {return (Xol_specials_itm)hash_by_special.Get_by(special);} + public Xol_specials_itm Get_by_alias(byte[] alias) {return (Xol_specials_itm)hash_by_aliases.GetByOrNull(alias);} + public Xol_specials_itm Get_by_key(byte[] special) {return (Xol_specials_itm)hash_by_special.GetByOrNull(special);} public void Add(byte[] special, byte[][] alias_ary) { - Xol_specials_itm itm = (Xol_specials_itm)hash_by_special.Get_by(special); + Xol_specials_itm itm = (Xol_specials_itm)hash_by_special.GetByOrNull(special); if (itm == null) { // NOTE: most items will be null, but MessagesCs.php has two entries for PasswordReset; DATE:2016-07-08 itm = new Xol_specials_itm(special, alias_ary); hash_by_special.Add(special, itm); diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy.java b/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy.java index 03b0a2913..a0a16fab8 100644 --- a/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy.java +++ b/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_regy.java @@ -13,17 +13,16 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; +package gplx.xowa.langs.vnts; import gplx.*; import gplx.core.btries.*; import gplx.core.bits.*; -import gplx.xowa.parsers.vnts.*; public class Xol_vnt_regy { private final Hash_adp_bry hash = Hash_adp_bry.ci_a7(); private int hash_len; private final List_adp list = List_adp_.New(); public Btrie_slim_mgr Trie() {return trie;} private final Btrie_slim_mgr trie = Btrie_slim_mgr.ci_a7(); - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public boolean Has(byte[] k) {return hash.Has(k);} public Xol_vnt_itm Get_at(int i) {return (Xol_vnt_itm)list.Get_at(i);} - public Xol_vnt_itm Get_by(byte[] k) {return (Xol_vnt_itm)hash.Get_by(k);} + public Xol_vnt_itm Get_by(byte[] k) {return (Xol_vnt_itm)hash.GetByOrNull(k);} public Xol_vnt_itm Get_by(byte[] s, int b, int e) {return (Xol_vnt_itm)hash.Get_by_mid(s, b, e);} public void Clear() {hash.Clear(); list.Clear(); trie.Clear(); hash_len = 0;} public Xol_vnt_itm Add(byte[] key, byte[] name) { @@ -32,7 +31,7 @@ public class Xol_vnt_regy { hash.Add(key, itm); list.Add(itm); trie.Add_obj(key, itm); - hash_len = hash.Count(); + hash_len = hash.Len(); return itm; } public int Mask__calc(byte[]... ary) { @@ -40,7 +39,7 @@ public class Xol_vnt_regy { int len = ary.length; for (int i = 0; i < len; ++i) { byte[] key = ary[i]; - Xol_vnt_itm itm = (Xol_vnt_itm)hash.Get_by(key); if (itm == null) continue; // handle bad vnt from user input; EX: -{zh;bad|text}- + Xol_vnt_itm itm = (Xol_vnt_itm)hash.GetByOrNull(key); if (itm == null) continue; // handle bad vnt from user input; EX: -{zh;bad|text}- int itm_mask = itm.Mask__vnt(); rv = rv == 0 ? itm_mask : Bitmask_.Flip_int(true, rv, itm_mask); } diff --git a/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_grp.java b/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_grp.java index 17a044489..360700918 100644 --- a/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_grp.java +++ b/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_grp.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import gplx.xowa.langs.vnts.*; +package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.langs.parsers.*; public class Xol_convert_grp implements Gfo_invk {// group of convert_itm by vnt; EX: zh-hant {A -> A1; B -> B1} private final Ordered_hash hash = Ordered_hash_.New_bry(); public Xol_convert_grp(byte[] key) {this.key = key;} public byte[] Key() {return key;} private final byte[] key; - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Xol_convert_itm Get_at(int i) {return (Xol_convert_itm)hash.Get_at(i);} - public void Add(byte[] src, byte[] trg) {hash.Add_if_dupe_use_nth(src, new Xol_convert_itm(src, trg));} + public void Add(byte[] src, byte[] trg) {hash.AddIfDupeUseNth(src, new Xol_convert_itm(src, trg));} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_add_bulk)) Add_bulk(this, m.ReadBry("v")); else return Gfo_invk_.Rv_unhandled; diff --git a/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_regy.java b/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_regy.java index 558799f8c..c95fa0c1a 100644 --- a/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_regy.java +++ b/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_convert_regy.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import gplx.xowa.langs.vnts.*; +package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.apps.fsys.*; public class Xol_convert_regy implements Gfo_invk { // registry of convert_grp; EX: zh-hans;zh-hant; private final Ordered_hash hash = Ordered_hash_.New_bry(); - public Xol_convert_grp Get_or_null(byte[] key) {return (Xol_convert_grp)hash.Get_by(key);} + public Xol_convert_grp Get_or_null(byte[] key) {return (Xol_convert_grp)hash.GetByOrNull(key);} public Xol_convert_grp Get_or_make(byte[] key) { - Xol_convert_grp rv = (Xol_convert_grp)hash.Get_by(key); + Xol_convert_grp rv = (Xol_convert_grp)hash.GetByOrNull(key); if (rv == null) { rv = new Xol_convert_grp(key); hash.Add(key, rv); diff --git a/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_mw_parse_tst.java b/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_mw_parse_tst.java index a407545b0..584f0da95 100644 --- a/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_mw_parse_tst.java +++ b/400_xowa/src/gplx/xowa/langs/vnts/converts/Xol_mw_parse_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.langs.vnts.converts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*; import gplx.xowa.langs.vnts.*; +package gplx.xowa.langs.vnts.converts; import gplx.*; import org.junit.*; import gplx.core.log_msgs.*; import gplx.langs.phps.*; public class Xol_mw_parse_tst { private final Xol_mw_parse_fxt fxt = new Xol_mw_parse_fxt(); @@ -106,14 +106,14 @@ class Xol_mw_parse_fxt { Gfo_msg_log msg_log = new Gfo_msg_log("xowa"); Php_evaluator evaluator = new Php_evaluator(msg_log); parser.Parse_tkns(src, evaluator); - Php_line[] lines = (Php_line[])evaluator.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])evaluator.List().ToAry(Php_line.class); int lines_len = lines.length; for (int i = 0; i < lines_len; i++) { Php_line_assign line = (Php_line_assign)lines[i]; Xol_mw_parse_grp grp = Parse_grp(line); list.Add(grp); } - return (Xol_mw_parse_grp[])list.To_ary(Xol_mw_parse_grp.class); + return (Xol_mw_parse_grp[])list.ToAry(Xol_mw_parse_grp.class); } private List_adp tmp_itm_list = List_adp_.New(); private Xol_mw_parse_grp Parse_grp(Php_line_assign line) { @@ -136,6 +136,6 @@ class Xol_mw_parse_fxt { Xol_mw_parse_itm itm = new Xol_mw_parse_itm(kv.Key().Val_obj_bry(), kv.Val().Val_obj_bry()); tmp_itm_list.Add(itm); } - grp.Itms_((Xol_mw_parse_itm[])tmp_itm_list.To_ary(Xol_mw_parse_itm.class)); + grp.Itms_((Xol_mw_parse_itm[])tmp_itm_list.ToAry(Xol_mw_parse_itm.class)); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/XophpArray.java b/400_xowa/src/gplx/xowa/mediawiki/XophpArray.java index 0486ca456..d5cef40e2 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/XophpArray.java +++ b/400_xowa/src/gplx/xowa/mediawiki/XophpArray.java @@ -123,7 +123,7 @@ public class XophpArray implements Bry_bfr_able, Iterable { public int Get_by_int_or(String key, int or) {Object rv = this.Get_by(key); return rv == null ? or : Int_.Cast(rv);} public int Get_by_int(String key) {return Int_.Cast(this.Get_by(key));} public XophpArray Xet_by_ary(String key) { - XophpArrayItm itm = (XophpArrayItm)hash.Get_by(key); + XophpArrayItm itm = (XophpArrayItm)hash.GetByOrNull(key); if (itm == null) { XophpArray val = new XophpArray(); this.Set(key, val); @@ -139,11 +139,11 @@ public class XophpArray implements Bry_bfr_able, Iterable { public String Get_by_str(int key) {return (String)this.Get_by(Int_.To_str(key));} public String Get_by_str(String key) {return (String)this.Get_by(key);} public T Get_by(String key) { - XophpArrayItm itm = (XophpArrayItm)hash.Get_by(key); + XophpArrayItm itm = (XophpArrayItm)hash.GetByOrNull(key); return itm == null ? null : (T)itm.Val(); } public XophpArrayItm Get_by_itm(String key) { - return (XophpArrayItm)hash.Get_by(key); + return (XophpArrayItm)hash.GetByOrNull(key); } public void Set(int key, Object val) { this.Set(XophpArrayItm.NewInt(key, val)); @@ -153,7 +153,7 @@ public class XophpArray implements Bry_bfr_able, Iterable { } private void Set(XophpArrayItm itm) { String key = itm.Key(); - XophpArrayItm cur = (XophpArrayItm)hash.Get_by(key); + XophpArrayItm cur = (XophpArrayItm)hash.GetByOrNull(key); if (cur == null) { hash.Add(key, itm); } @@ -323,7 +323,7 @@ public class XophpArray implements Bry_bfr_able, Iterable { rv.Add(val); return rv; } - public static boolean Eq_to_new(XophpArray array) {return array.hash.Count() == 0;}// same as "array === []" + public static boolean Eq_to_new(XophpArray array) {return array.hash.Len() == 0;}// same as "array === []" public static boolean empty(XophpArray array) {return array.Len() == 0;} public static int count(XophpArray array) {return array.Len();} diff --git a/400_xowa/src/gplx/xowa/mediawiki/XophpClassBldrs.java b/400_xowa/src/gplx/xowa/mediawiki/XophpClassBldrs.java index 58540acc9..fcc138ea2 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/XophpClassBldrs.java +++ b/400_xowa/src/gplx/xowa/mediawiki/XophpClassBldrs.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki; import gplx.*; import gplx.xowa.*; +package gplx.xowa.mediawiki; import gplx.*; public class XophpClassBldrs { private final Ordered_hash hash = Ordered_hash_.New(); public void Add(String id, XophpClassBldr bldr) { hash.Add(id, bldr); } public XophpClassBldr Get_by_or_null(String id) { - return (XophpClassBldr)hash.Get_by(id); + return (XophpClassBldr)hash.GetByOrNull(id); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/XophpRegex_.java b/400_xowa/src/gplx/xowa/mediawiki/XophpRegex_.java index 311fd5ae9..aa8cc2441 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/XophpRegex_.java +++ b/400_xowa/src/gplx/xowa/mediawiki/XophpRegex_.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki; import gplx.*; import gplx.xowa.*; +package gplx.xowa.mediawiki; import gplx.*; import gplx.langs.regxs.*; import gplx.core.strings.*; import gplx.core.primitives.*; import gplx.core.bits.*; public class XophpRegex_ { // REF.PHP: https://www.php.net/manual/en/function.preg-quote.php // The special regular expression characters are: - private static final Hash_adp preg_quote_hash = Hash_adp_.New().Add_many_as_key_and_val + private static final Hash_adp preg_quote_hash = Hash_adp_.New().AddManyAsKeyAndVal ('.', '\\', '+', '*', '?', '[', '^', ']', '$', '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', '-', '#'); public static String preg_quote(String str, String delimiter) {// NOTE: "String delimiter" not used b/c Java / XO does not allow symbolic quotes; EX: "/abc/i" String_bldr sb = String_bldr_.new_(); diff --git a/400_xowa/src/gplx/xowa/mediawiki/XophpStdClass.java b/400_xowa/src/gplx/xowa/mediawiki/XophpStdClass.java index e77b7f372..7c4b778f8 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/XophpStdClass.java +++ b/400_xowa/src/gplx/xowa/mediawiki/XophpStdClass.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki; import gplx.*; import gplx.xowa.*; +package gplx.xowa.mediawiki; import gplx.*; public class XophpStdClass { private final List_adp list = List_adp_.New(); private final Ordered_hash hash = Ordered_hash_.New(); @@ -27,9 +27,9 @@ public class XophpStdClass { hash.Add(key, itm); } public XophpStdClass Get_at_as_itm(int idx) {return (XophpStdClass)list.Get_at(idx);} - public Object Get_by_as_obj(String key) {return hash.Get_by(key);} - public XophpStdClass Get_by_as_itm(String key) {return (XophpStdClass)hash.Get_by(key);} - public String Get_by_as_str(String key) {return (String)hash.Get_by(key);} + public Object Get_by_as_obj(String key) {return hash.GetByOrNull(key);} + public XophpStdClass Get_by_as_itm(String key) {return (XophpStdClass)hash.GetByOrNull(key);} + public String Get_by_as_str(String key) {return (String)hash.GetByOrNull(key);} public String Get_at_as_str(int idx) {return (String)list.Get_at(idx);} public XophpStdClass Get_by_ary_as_itm(String... keys) { return (XophpStdClass)Get_by_ary_or_null(false, keys, keys.length - 1, 0); @@ -39,7 +39,7 @@ public class XophpStdClass { return String_.Eq(expd, actl); } public void Set_by_as_itm(String key, XophpStdClass itm) { - hash.Add_if_dupe_use_nth(key, itm); + hash.AddIfDupeUseNth(key, itm); } public void Set_by_as_itm(String[] keys, XophpStdClass rv) { int keys_last_idx = keys.length - 1; @@ -47,20 +47,20 @@ public class XophpStdClass { itm.Set_by_as_itm(keys[keys_last_idx], rv); } public void Set_by_as_str(String key, String val) { - hash.Add_if_dupe_use_nth(key, val); + hash.AddIfDupeUseNth(key, val); } public void Set_at_as_str(int idx, String val) { - list.Del_at(idx); - list.Add_at(idx, val); + list.DelAt(idx); + list.AddAt(idx, val); } public void Del_by(String key) { - Object itm = hash.Get_by(key); + Object itm = hash.GetByOrNull(key); hash.Del(key); list.Del(itm); } private Object Get_by_ary_or_null(boolean create, String[] keys, int keys_idx_last, int keys_idx) { if (keys_idx == keys_idx_last) { - return hash.Get_by(keys[keys_idx_last]); + return hash.GetByOrNull(keys[keys_idx_last]); } String key = keys[keys_idx]; diff --git a/400_xowa/src/gplx/xowa/mediawiki/XophpString_.java b/400_xowa/src/gplx/xowa/mediawiki/XophpString_.java index cb5b0faaa..52a721f92 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/XophpString_.java +++ b/400_xowa/src/gplx/xowa/mediawiki/XophpString_.java @@ -80,7 +80,7 @@ public class XophpString_ implements XophpCallbackOwner { else { key = Char_.To_str(hi_char); } - rv.Add_if_dupe_use_1st(key, key); + rv.AddIfDupeUse1st(key, key); i++; } return rv; @@ -288,7 +288,7 @@ public class XophpString_ implements XophpCallbackOwner { public static int strlen(byte[] src) {return src.length;} // REF.PHP: https://www.php.net/manual/en/function.rtrim.php - private static final Hash_adp trim_ws_hash = Hash_adp_.New().Add_many_as_key_and_val + private static final Hash_adp trim_ws_hash = Hash_adp_.New().AddManyAsKeyAndVal ( Int_obj_ref.New(Byte_ascii.Space) , Int_obj_ref.New(Byte_ascii.Tab) , Int_obj_ref.New(Byte_ascii.Nl) @@ -336,7 +336,7 @@ public class XophpString_ implements XophpCallbackOwner { for (byte j = prv_byte; j < nxt_byte; j++) { Byte_obj_ref rng_obj = Byte_obj_ref.new_(j); if (!pad_hash.Has(rng_obj)) - pad_hash.Add_as_key_and_val(rng_obj); + pad_hash.AddAsKeyAndVal(rng_obj); } i += 2; continue; @@ -350,7 +350,7 @@ public class XophpString_ implements XophpCallbackOwner { prv_byte = pad_byte; Byte_obj_ref pad_obj = Byte_obj_ref.new_(pad_byte); if (!pad_hash.Has(pad_obj)) - pad_hash.Add_as_key_and_val(pad_obj); + pad_hash.AddAsKeyAndVal(pad_obj); } } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/JCSingleton.java b/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/JCSingleton.java index 8fd689f65..85cca634a 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/JCSingleton.java +++ b/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/JCSingleton.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.extensions.JsonConfig.includes; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.extensions.*; import gplx.xowa.mediawiki.extensions.JsonConfig.*; -import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.extensions.JsonConfig.includes; import gplx.*; +import gplx.xowa.mediawiki.*; public class JCSingleton { // /** // * @var array describes how a title should be handled by JsonConfig extension. @@ -335,13 +335,13 @@ public class JCSingleton { // seems wasteful and redundant, plus most of the time there will be just a single // namespace declared, so this structure seems efficient and easy enough. String mapCacheLruKey = String_.Concat(wiki, "|", ns); - Ordered_hash cache = (Ordered_hash)mapCacheLru.Get_by(mapCacheLruKey); + Ordered_hash cache = (Ordered_hash)mapCacheLru.GetByOrNull(mapCacheLruKey); if (cache == null) { cache = Ordered_hash_.New(); mapCacheLru.Add(mapCacheLruKey, cache); } - return (JCContent)cache.Get_by(page); + return (JCContent)cache.GetByOrNull(page); } /** diff --git a/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/Xomw_page_fetcher.java b/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/Xomw_page_fetcher.java index 1716b750d..534841e8c 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/Xomw_page_fetcher.java +++ b/400_xowa/src/gplx/xowa/mediawiki/extensions/JsonConfig/includes/Xomw_page_fetcher.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.extensions.JsonConfig.includes; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.extensions.*; import gplx.xowa.mediawiki.extensions.JsonConfig.*; +package gplx.xowa.mediawiki.extensions.JsonConfig.includes; import gplx.*; public interface Xomw_page_fetcher { byte[] Get_wtxt(byte[] wiki, byte[] page); } @@ -23,7 +23,7 @@ class Xomw_page_fetcher__mock implements Xomw_page_fetcher { hash.Add(Make_key(wiki, page), wtxt); } public byte[] Get_wtxt(byte[] wiki, byte[] page) { - return (byte[])hash.Get_by(Make_key(wiki, page)); + return (byte[])hash.GetByOrNull(Make_key(wiki, page)); } private static byte[] Make_key(byte[] wiki, byte[] page) { return Bry_.Add(wiki, Byte_ascii.Pipe_bry, page); diff --git a/400_xowa/src/gplx/xowa/mediawiki/extensions/Wikibase/client/includes/dataAccess/scribunto/Wbase_entity_accessor.java b/400_xowa/src/gplx/xowa/mediawiki/extensions/Wikibase/client/includes/dataAccess/scribunto/Wbase_entity_accessor.java index 9e5de78be..24e7b1d90 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/extensions/Wikibase/client/includes/dataAccess/scribunto/Wbase_entity_accessor.java +++ b/400_xowa/src/gplx/xowa/mediawiki/extensions/Wikibase/client/includes/dataAccess/scribunto/Wbase_entity_accessor.java @@ -93,7 +93,7 @@ public class Wbase_entity_accessor { // $serialization = $this->newClientStatementListSerializer()->serialize( $statements ); // $this->renumber( $serialization ); // return $serialization; - return rv.Len() == 0 ? null : (Wbase_claim_base[])rv.To_ary(Wbase_claim_base.class); + return rv.Len() == 0 ? null : (Wbase_claim_base[])rv.ToAry(Wbase_claim_base.class); } private static final int ID_NULL = 0, ID_BEST = 1, ID_ALL = 2; diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwDefaultSettings.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwDefaultSettings.java index 688b4130c..6c65935e1 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwDefaultSettings.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwDefaultSettings.java @@ -8669,7 +8669,7 @@ public class XomwDefaultSettings { * @since 1.20 */ public static Hash_adp wgSiteTypes = Hash_adp_.New() - .Add_and_more("mediawiki", wgSiteTypes__MediaWikiSite) + .AddAndMore("mediawiki", wgSiteTypes__MediaWikiSite) ; ///** // * Whether the page_props table has a pp_sortkey column. Set to false in case diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwLinker.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwLinker.java index b79b94fe8..df8a3b984 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwLinker.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwLinker.java @@ -2212,7 +2212,7 @@ class Linker_rel_splitter implements gplx.core.brys.Bry_split_wkr { byte[] val = (byte[])hash.Get_by_mid(src, itm_bgn, itm_end); if (val == null) { val = Bry_.Mid(src, itm_bgn, itm_end); - hash.Add_as_key_and_val(val); + hash.AddAsKeyAndVal(val); if (bfr.Len_gt_0()) bfr.Add_byte_space(); bfr.Add(val); } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMagicWordMgr.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMagicWordMgr.java index 42e0f3ade..6acce992b 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMagicWordMgr.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMagicWordMgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; +package gplx.xowa.mediawiki.includes; import gplx.*; public class XomwMagicWordMgr { private final Hash_adp_bry hash = Hash_adp_bry.cs(); public void Add(byte[] name, boolean cs, byte[]... synonyms) { @@ -21,6 +21,6 @@ public class XomwMagicWordMgr { hash.Add(name, mw); } public XomwMagicWord Get(byte[] name) { - return (XomwMagicWord)hash.Get_by(name); + return (XomwMagicWord)hash.GetByOrNull(name); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageMgr.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageMgr.java index 0155d0a92..89c446586 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageMgr.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageMgr.java @@ -20,5 +20,5 @@ public class XomwMessageMgr { public void Old_add(String key, String val, XomwLanguage language) { hash.Add(key, new XomwMessageOld(Bry_.new_u8(val), language)); } - public XomwMessageOld Old_get_by_str(String key) {return (XomwMessageOld)hash.Get_by(key);} + public XomwMessageOld Old_get_by_str(String key) {return (XomwMessageOld)hash.GetByOrNull(key);} } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageOld.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageOld.java index ab50cf3fe..15f78571c 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageOld.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwMessageOld.java @@ -173,10 +173,10 @@ public class XomwMessageOld { * @var array */ private static final Hash_adp listTypeMap = Hash_adp_.New() - .Add_and_more("comma", "commaList") - .Add_and_more("semicolon", "semicolonList") - .Add_and_more("pipe", "pipeList") - .Add_and_more("text", "listToText") + .AddAndMore("comma", "commaList") + .AddAndMore("semicolon", "semicolonList") + .AddAndMore("pipe", "pipeList") + .AddAndMore("text", "listToText") ; /** diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespace.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespace.java index 5b3a1e90d..200292afe 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespace.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespace.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.mediawiki.includes; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.mediawiki.includes; import gplx.*; +import gplx.xowa.mediawiki.*; public class XomwNamespace { // /** // * These namespaces should always be first-letter capitalized, now and @@ -239,7 +240,7 @@ public class XomwNamespace { xNamespaces.Add(Bry_.Lcase__all(item.name), item); // NOTE: MW does "strtolower($text)"; canonical namespaces are always ascii } } - XomwNamespaceItem xNs = (XomwNamespaceItem)xNamespaces.Get_by(name); + XomwNamespaceItem xNs = (XomwNamespaceItem)xNamespaces.GetByOrNull(name); if (xNs != null) { return xNs.id; } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespacesByName.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespacesByName.java index b5ed1c2b3..5d6da4b81 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespacesByName.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwNamespacesByName.java @@ -13,12 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; +package gplx.xowa.mediawiki.includes; import gplx.*; +import gplx.xowa.mediawiki.*; public class XomwNamespacesByName { private final Ordered_hash hash = Ordered_hash_.New_bry(); public int Len() {return hash.Len();} public int GetAsIdOrNullInt(byte[] name) { - XomwNamespaceItem item = (XomwNamespaceItem)hash.Get_by(name); + XomwNamespaceItem item = (XomwNamespaceItem)hash.GetByOrNull(name); return item == null ? XophpObject_.NULL_INT : item.id; } public XomwNamespaceItem GetAtOrNull(int idx) { diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwSanitizer.java b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwSanitizer.java index 3f25e5507..8b99ac47b 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/XomwSanitizer.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/XomwSanitizer.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; +package gplx.xowa.mediawiki.includes; import gplx.*; +import gplx.xowa.mediawiki.*; import gplx.core.brys.*; import gplx.core.btries.*; import gplx.core.encoders.*; import gplx.core.primitives.*; import gplx.langs.htmls.entitys.*; import gplx.xowa.parsers.htmls.*; import gplx.langs.htmls.*; import gplx.xowa.mediawiki.includes.xohtml.*; import gplx.xowa.mediawiki.includes.parsers.*; @@ -2087,7 +2088,7 @@ public class XomwSanitizer { private static void Html_entities_set(Hash_adp_bry rv, byte type, int code, String name_str, String html_str) {Html_entities_set(rv, type, code, name_str, Bry_.new_u8(html_str));} private static void Html_entities_set(Hash_adp_bry rv, byte type, int code, String name_str, byte[] html_bry) { byte[] name_bry = Bry_.new_u8(name_str); - rv.Add_if_dupe_use_1st(name_bry, new Xomw_html_ent(type, code, name_bry, html_bry)); // Add_dupe needed b/c "lt" and co. are added early; ignore subsequent call + rv.AddIfDupeUse1st(name_bry, new Xomw_html_ent(type, code, name_bry, html_bry)); // Add_dupe needed b/c "lt" and co. are added early; ignore subsequent call } } class Xomw_html_ent { diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/content/XomwContentHandler.java b/400_xowa/src/gplx/xowa/mediawiki/includes/content/XomwContentHandler.java index 703b45a31..64b4a07bc 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/content/XomwContentHandler.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/content/XomwContentHandler.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.content; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.content; import gplx.*; +import gplx.xowa.mediawiki.includes.*; /** * A content handler knows how do deal with a specific type of content on a wiki * page. Content is stored in the database in a serialized form (using a @@ -374,7 +375,7 @@ public abstract class XomwContentHandler { this.mSupportedFormats = formats; for (String format : formats) { - mSupportedFormatsHash.Add_as_key_and_val(format); + mSupportedFormatsHash.AddAsKeyAndVal(format); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/filerepo/file/XomwFileFinderMock.java b/400_xowa/src/gplx/xowa/mediawiki/includes/filerepo/file/XomwFileFinderMock.java index 6543f8eb8..bebdef542 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/filerepo/file/XomwFileFinderMock.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/filerepo/file/XomwFileFinderMock.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.filerepo.file; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; import gplx.xowa.mediawiki.includes.filerepo.*; -import gplx.xowa.mediawiki.includes.parsers.*; +package gplx.xowa.mediawiki.includes.filerepo.file; import gplx.*; +import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; import gplx.xowa.mediawiki.includes.filerepo.*; public class XomwFileFinderMock implements XomwFileFinder { private final XomwEnv env; public XomwFileFinderMock(XomwEnv env) {this.env = env;} private final Hash_adp_bry hash = Hash_adp_bry.cs(); public void Clear() {hash.Clear();} public XomwFile Find_file(XomwTitleOld ttl) { - return (XomwFile)hash.Get_by(ttl.getPrefixedDBkey()); + return (XomwFile)hash.GetByOrNull(ttl.getPrefixedDBkey()); } public void Add(String title, XomwFileRepo repo, int w, int h, byte[] mime) { byte[] title_bry = Bry_.new_u8(title); XomwLocalFile file = new XomwLocalFile(env, XomwTitleOld.newFromText(env, title_bry), repo, w, h, mime); - hash.Add_if_dupe_use_nth(title_bry, file); + hash.AddIfDupeUseNth(title_bry, file); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/interwiki/XomwInterwikiLookupAdapter.java b/400_xowa/src/gplx/xowa/mediawiki/includes/interwiki/XomwInterwikiLookupAdapter.java index d256153ca..9c2f6b997 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/interwiki/XomwInterwikiLookupAdapter.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/interwiki/XomwInterwikiLookupAdapter.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.interwiki; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.interwiki; import gplx.*; +import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.site.*; public class XomwInterwikiLookupAdapter implements XomwInterwikiLookup { /** @@ -60,7 +61,7 @@ public class XomwInterwikiLookupAdapter implements XomwInterwikiLookup { return null; } - return (XomwInterwiki)this.interwikiMap.Get_by(prefix); + return (XomwInterwiki)this.interwikiMap.GetByOrNull(prefix); } /** @@ -82,7 +83,7 @@ public class XomwInterwikiLookupAdapter implements XomwInterwikiLookup { res.Add(interwiki.interwikiId); } } - return (byte[][])res.To_ary_and_clear(byte[].class); + return (byte[][])res.ToAryAndClear(byte[].class); } // /** diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwArrayObject.java b/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwArrayObject.java index 40d36678f..d5d0d0faa 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwArrayObject.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwArrayObject.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.libs; import gplx.*; // bare-bones implementation of PHP ArrayObject // REF:http://php.net/manual/en/class.arrayobject.php public abstract class XomwArrayObject { @@ -22,7 +22,7 @@ public abstract class XomwArrayObject { return hash.Has(key); } public Object offsetGet(Object key) { - return hash.Get_by(key); + return hash.GetByOrNull(key); } public void offsetUnset(Object key) { hash.Del(key); @@ -34,6 +34,6 @@ public abstract class XomwArrayObject { public int count() {return hash.Len();} public Object Get_at(int i) {return hash.Get_at(i);} public void Add_or_update(Object val) { - hash.Add(hash.Count(), val); + hash.Add(hash.Len(), val); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwStringUtils.java b/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwStringUtils.java index 50225958d..f7ce6c172 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwStringUtils.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/libs/XomwStringUtils.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.libs; import gplx.*; import gplx.core.btries.*; import gplx.xowa.mediawiki.includes.libs.replacers.*; /** @@ -110,7 +110,7 @@ public class XomwStringUtils { } cur = trv.Pos(); } - return (byte[][])tmp.To_ary_and_clear(byte[].class); + return (byte[][])tmp.ToAryAndClear(byte[].class); } // /** diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaHandlerFactory.java b/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaHandlerFactory.java index c2998a428..96faced96 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaHandlerFactory.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaHandlerFactory.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.media; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.media; import gplx.*; // XO.MW:MW has registry and instance cache; XO only has instance // XO.MW:SYNC:1.29; DATE:2017-02-05 public class XomwMediaHandlerFactory { @@ -40,7 +40,7 @@ public class XomwMediaHandlerFactory { // XO.MW:SYNC:1.29; DATE:2017-02-05 public XomwMediaHandler getHandler(byte[] type) { - return (XomwMediaHandler)handlers.Get_by(type); + return (XomwMediaHandler)handlers.GetByOrNull(type); } public static byte[] diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaTransformOutput.java b/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaTransformOutput.java index cd9e40597..e26c5af09 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaTransformOutput.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwMediaTransformOutput.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.media; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.media; import gplx.*; +import gplx.xowa.mediawiki.includes.*; import gplx.langs.htmls.*; import gplx.xowa.mediawiki.includes.parsers.lnkis.*; import gplx.xowa.mediawiki.includes.filerepo.file.*; @@ -257,10 +258,10 @@ public abstract class XomwMediaTransformOutput { // } attribs.Clear(); - attribs.Add_many(Gfh_atr_.Bry__href, this.file.getTitle().getLocalURL(query)); - attribs.Add_many(Gfh_atr_.Bry__class, Bry__class__image); + attribs.AddMany(Gfh_atr_.Bry__href, this.file.getTitle().getLocalURL(query)); + attribs.AddMany(Gfh_atr_.Bry__class, Bry__class__image); if (title != null) { - attribs.Add_many(Gfh_atr_.Bry__title, title); + attribs.AddMany(Gfh_atr_.Bry__title, title); } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwThumbnailImage.java b/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwThumbnailImage.java index fc72f03f8..6b99b8f22 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwThumbnailImage.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/media/XomwThumbnailImage.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.media; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.media; import gplx.*; +import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; import gplx.langs.htmls.*; import gplx.xowa.mediawiki.includes.parsers.lnkis.*; import gplx.xowa.mediawiki.includes.filerepo.file.*; @@ -132,23 +133,23 @@ public class XomwThumbnailImage extends XomwMediaTransformOutput { private final // byte[] query = options.desc_query; attribs.Clear(); - attribs.Add_many(Gfh_atr_.Bry__alt, alt); - attribs.Add_many(Gfh_atr_.Bry__src, url); + attribs.AddMany(Gfh_atr_.Bry__alt, alt); + attribs.AddMany(Gfh_atr_.Bry__src, url); boolean link_attribs_is_null = false; if (!XophpObject_.empty(options.custom_url_link)) { link_attribs.Clear(); - link_attribs.Add_many(Gfh_atr_.Bry__href, options.custom_url_link); + link_attribs.AddMany(Gfh_atr_.Bry__href, options.custom_url_link); if (!XophpObject_.empty(options.title)) { - link_attribs.Add_many(Gfh_atr_.Bry__title, options.title); + link_attribs.AddMany(Gfh_atr_.Bry__title, options.title); } if (XophpObject_.empty(options.custom_target_link)) { - link_attribs.Add_many(Gfh_atr_.Bry__target, options.custom_target_link); + link_attribs.AddMany(Gfh_atr_.Bry__target, options.custom_target_link); } else if (XophpObject_.empty(options.parser_extlink_target)) { - link_attribs.Add_many(Gfh_atr_.Bry__target, options.parser_extlink_target); + link_attribs.AddMany(Gfh_atr_.Bry__target, options.parser_extlink_target); } if (XophpObject_.empty(options.parser_extlink_rel)) { - link_attribs.Add_many(Gfh_atr_.Bry__rel, options.parser_extlink_rel); + link_attribs.AddMany(Gfh_atr_.Bry__rel, options.parser_extlink_rel); } } else if (!XophpObject_.empty(options.custom_title_link)) { @@ -175,25 +176,25 @@ public class XomwThumbnailImage extends XomwMediaTransformOutput { private final else { link_attribs_is_null = true; if (!XophpObject_.empty(options.title)) { - attribs.Add_many(Gfh_atr_.Bry__title, options.title); + attribs.AddMany(Gfh_atr_.Bry__title, options.title); } } if (XophpObject_.empty(options.no_dimensions)) { - attribs.Add_many(Gfh_atr_.Bry__width, Int_.To_bry(width)); - attribs.Add_many(Gfh_atr_.Bry__height, Int_.To_bry(height)); + attribs.AddMany(Gfh_atr_.Bry__width, Int_.To_bry(width)); + attribs.AddMany(Gfh_atr_.Bry__height, Int_.To_bry(height)); } if (!XophpObject_.empty(options.valign)) { - attribs.Add_many(Gfh_atr_.Bry__style, Bry_.Add(Bry__vertical_align, options.valign)); + attribs.AddMany(Gfh_atr_.Bry__style, Bry_.Add(Bry__vertical_align, options.valign)); } if (!XophpObject_.empty(options.img_cls)) { - attribs.Add_many(Gfh_atr_.Bry__class, options.img_cls); + attribs.AddMany(Gfh_atr_.Bry__class, options.img_cls); } if (XophpObject_.isset(options.override_height)) { - attribs.Add_many(Gfh_atr_.Bry__class, options.override_height); + attribs.AddMany(Gfh_atr_.Bry__class, options.override_height); } if (XophpObject_.isset(options.override_width)) { - attribs.Add_many(Gfh_atr_.Bry__width, options.override_height); + attribs.AddMany(Gfh_atr_.Bry__width, options.override_height); } // Additional densities for responsive images, if specified. diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/XomwPreprocessor.java b/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/XomwPreprocessor.java index d2d1e28fc..0f6319a69 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/XomwPreprocessor.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/XomwPreprocessor.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.parsers; import gplx.*; +import gplx.xowa.mediawiki.*; import gplx.core.btries.*; import gplx.xowa.mediawiki.includes.parsers.preprocessors.*; /** @@ -178,7 +179,7 @@ public abstract class XomwPreprocessor { Elements_trie__add(trie, Bool_.N, xmlish_elem, xmlish_elem); // PORTED: $xmlishRegex = implode( '|', array_merge( $xmlishElements, $ignoredTags ) ); - int ignored_tags_len = ignored_tags.Count(); + int ignored_tags_len = ignored_tags.Len(); for (int j = 0; j < ignored_tags_len; j++) { byte[] bry = (byte[])ignored_tags.Get_at(j); String str = String_.new_u8(bry); @@ -585,7 +586,7 @@ public abstract class XomwPreprocessor { i = tag_end_pos + 1; this.preprocessToObj_literal(src, tag_bgn_pos, tag_end_pos + 1); // Cache results, otherwise we have O(N^2) performance for input like ... - no_more_closing_tag.Add_if_dupe_use_nth(name, name); + no_more_closing_tag.AddIfDupeUseNth(name, name); continue; } } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_lnki_wkr.java b/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_lnki_wkr.java index 161098b44..c511130fe 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_lnki_wkr.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_lnki_wkr.java @@ -14,13 +14,11 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.mediawiki.includes.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; import gplx.xowa.mediawiki.includes.parsers.*; -import gplx.core.btries.*; import gplx.core.primitives.*; -import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.xwikis.*; -import gplx.xowa.mediawiki.includes.parsers.*; import gplx.xowa.mediawiki.includes.parsers.quotes.*; +import gplx.core.btries.*; +import gplx.xowa.mediawiki.includes.parsers.quotes.*; import gplx.xowa.mediawiki.includes.xohtml.*; import gplx.xowa.mediawiki.includes.linkers.*; import gplx.xowa.mediawiki.includes.libs.*; import gplx.xowa.mediawiki.includes.media.*; import gplx.xowa.mediawiki.includes.filerepo.file.*; -import gplx.xowa.parsers.uniqs.*; /* TODO.XO * P7: multi-line links; // look at the next 'line' to see if we can close it there * P7: interwiki @@ -680,7 +678,7 @@ public class Xomw_lnki_wkr {// THREAD.UNSAFE: caching for repeated calls private void getImageParams(Xomw_image_params rv, XomwMediaHandler handler) { byte[] handlerClass = handler == null ? Bry_.Empty : handler.Key(); - rv.paramMap = (Xomw_param_map)mImageParams.Get_by(handlerClass); + rv.paramMap = (Xomw_param_map)mImageParams.GetByOrNull(handlerClass); // NOTE: lazy-init; code below can be inefficent if (rv.paramMap == null) { // Initialise static lists @@ -718,7 +716,7 @@ public class Xomw_lnki_wkr {// THREAD.UNSAFE: caching for repeated calls rv.mwArray = mw_array; } else { - rv.mwArray = (XomwMagicWordArray)mImageParamsMagicArray.Get_by(handlerClass); + rv.mwArray = (XomwMagicWordArray)mImageParamsMagicArray.GetByOrNull(handlerClass); } } // Parsed a width param of imagelink like 300px or 200x300px diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_param_map.java b/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_param_map.java index 07a86e58a..29acc8e50 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_param_map.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/parsers/lnkis/Xomw_param_map.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; import gplx.xowa.mediawiki.includes.parsers.*; +package gplx.xowa.mediawiki.includes.parsers.lnkis; import gplx.*; public class Xomw_param_map { private final Ordered_hash hash = Ordered_hash_.New_bry(); public final Xomw_params_frame Frame = new Xomw_params_frame(); @@ -23,7 +23,7 @@ public class Xomw_param_map { public int Len() {return hash.Len();} public Xomw_param_itm Get_at(int i) {return (Xomw_param_itm)hash.Get_at(i);} public Xomw_param_itm Get_by(byte[] name) { - return (Xomw_param_itm)hash.Get_by(name); + return (Xomw_param_itm)hash.GetByOrNull(name); } public Xomw_param_itm Get_by(int name_type) { return null; diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSite.java b/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSite.java index 9f9a2d169..d32a3be82 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSite.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSite.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.site; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.site; import gplx.*; +import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; import gplx.xowa.mediawiki.includes.exception.*; /** * Represents a single site. @@ -496,14 +497,14 @@ public class XomwSite { this.localIds = Ordered_hash_.New(); } - Ordered_hash typeHash = (Ordered_hash)this.localIds.Get_by(type); + Ordered_hash typeHash = (Ordered_hash)this.localIds.GetByOrNull(type); if (typeHash == null) { typeHash = Ordered_hash_.New(); this.localIds.Add(type, typeHash); } - if (typeHash.Get_by(identifier) == null) { - typeHash.Add_as_key_and_val(identifier); + if (typeHash.GetByOrNull(identifier) == null) { + typeHash.AddAsKeyAndVal(identifier); } } @@ -537,7 +538,7 @@ public class XomwSite { * @return String[] */ public Ordered_hash getInterwikiIds() { - return (Ordered_hash)this.localIds.Get_by(XomwSite.ID_INTERWIKI); + return (Ordered_hash)this.localIds.GetByOrNull(XomwSite.ID_INTERWIKI); } /** @@ -549,7 +550,7 @@ public class XomwSite { * @return String[] */ public Ordered_hash getNavigationIds() { - return (Ordered_hash)this.localIds.Get_by(XomwSite.ID_EQUIVALENT); + return (Ordered_hash)this.localIds.GetByOrNull(XomwSite.ID_EQUIVALENT); } /** @@ -579,13 +580,13 @@ public class XomwSite { // throw new MWException('$fullUrl needs to be a String'); // } - Hash_adp paths = (Hash_adp)this.extraData.Get_by("paths"); + Hash_adp paths = (Hash_adp)this.extraData.GetByOrNull("paths"); if (paths == null) { paths = Hash_adp_.New(); this.extraData.Add("paths", paths); } - paths.Add_if_dupe_use_nth(pathType, fullUrl); + paths.AddIfDupeUseNth(pathType, fullUrl); } /** @@ -599,7 +600,7 @@ public class XomwSite { */ public String getPath(String pathType) { Hash_adp paths = this.getAllPaths(); - return (String)paths.Get_by(pathType); + return (String)paths.GetByOrNull(pathType); } /** @@ -611,7 +612,7 @@ public class XomwSite { * @return String[] */ public Hash_adp getAllPaths() { - return (Hash_adp)this.extraData.Get_by("paths"); + return (Hash_adp)this.extraData.GetByOrNull("paths"); } /** @@ -622,7 +623,7 @@ public class XomwSite { * @param String $pathType */ public void removePath(String pathType) { - Hash_adp pathsHash = (Hash_adp)this.extraData.Get_by(pathType); + Hash_adp pathsHash = (Hash_adp)this.extraData.GetByOrNull(pathType); if (pathsHash != null) { pathsHash.Del(pathType); } @@ -636,7 +637,7 @@ public class XomwSite { * @return Site */ public static XomwSite newForType(String siteType) { - String type = (String)XomwDefaultSettings.wgSiteTypes.Get_by(siteType); + String type = (String)XomwDefaultSettings.wgSiteTypes.GetByOrNull(siteType); if (String_.Eq(type, XomwDefaultSettings.wgSiteTypes__MediaWikiSite)) { return new XomwMediaWikiSite(); } diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSiteList.java b/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSiteList.java index baec5894c..06760b6c4 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSiteList.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/site/XomwSiteList.java @@ -152,7 +152,7 @@ public class XomwSiteList extends XomwGenericArrayObject { public int Len() {ret * @return Site */ public XomwSite getSite(String globalSiteId) { - return (XomwSite)this.offsetGet(this.byGlobalId.Get_by(globalSiteId)); + return (XomwSite)this.offsetGet(this.byGlobalId.GetByOrNull(globalSiteId)); } /** @@ -164,7 +164,7 @@ public class XomwSiteList extends XomwGenericArrayObject { public int Len() {ret * @param String globalSiteId */ public void removeSite(String globalSiteId) { - this.offsetUnset(this.byGlobalId.Get_by(globalSiteId)); + this.offsetUnset(this.byGlobalId.GetByOrNull(globalSiteId)); } /** @@ -200,7 +200,7 @@ public class XomwSiteList extends XomwGenericArrayObject { public int Len() {ret * @return Site */ public XomwSite getSiteByInternalId(int id) { - return (XomwSite)this.offsetGet(this.byInternalId.Get_by(id)); + return (XomwSite)this.offsetGet(this.byInternalId.GetByOrNull(id)); } /** @@ -212,7 +212,7 @@ public class XomwSiteList extends XomwGenericArrayObject { public int Len() {ret * @param int id */ public void removeSiteByInternalId(int id) { - this.offsetUnset(this.byInternalId.Get_by(id)); + this.offsetUnset(this.byInternalId.GetByOrNull(id)); } /** @@ -237,7 +237,7 @@ public class XomwSiteList extends XomwGenericArrayObject { public int Len() {ret * @return Site */ public XomwSite getSiteByNavigationId(String id) { - return (XomwSite)this.offsetGet(this.byNavigationId.Get_by(id)); + return (XomwSite)this.offsetGet(this.byNavigationId.GetByOrNull(id)); } /** @@ -249,7 +249,7 @@ public class XomwSiteList extends XomwGenericArrayObject { public int Len() {ret * @param String id */ public void removeSiteByNavigationId(String id) { - this.offsetUnset(this.byNavigationId.Get_by(id)); + this.offsetUnset(this.byNavigationId.GetByOrNull(id)); } /** diff --git a/400_xowa/src/gplx/xowa/mediawiki/includes/xohtml/Xomw_atr_mgr.java b/400_xowa/src/gplx/xowa/mediawiki/includes/xohtml/Xomw_atr_mgr.java index e900f0d1a..33739a517 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/includes/xohtml/Xomw_atr_mgr.java +++ b/400_xowa/src/gplx/xowa/mediawiki/includes/xohtml/Xomw_atr_mgr.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.includes.xohtml; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; import gplx.xowa.mediawiki.includes.*; +package gplx.xowa.mediawiki.includes.xohtml; import gplx.*; public class Xomw_atr_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); public int Len() {return hash.Len();} public Xomw_atr_itm Get_at(int i) {return (Xomw_atr_itm)hash.Get_at(i);} - public Xomw_atr_itm Get_by_or_null(byte[] k) {return (Xomw_atr_itm)hash.Get_by(k);} + public Xomw_atr_itm Get_by_or_null(byte[] k) {return (Xomw_atr_itm)hash.GetByOrNull(k);} public Xomw_atr_mgr Clear() {hash.Clear(); return this;} public void Del(byte[] key) {hash.Del(key);} public void Add(Xomw_atr_itm itm) {hash.Add(itm.Key_bry(), itm);} @@ -27,7 +27,7 @@ public class Xomw_atr_mgr { return this; } public void Add_or_set(Xomw_atr_itm src) { - Xomw_atr_itm trg = (Xomw_atr_itm)hash.Get_by(src.Key_bry()); + Xomw_atr_itm trg = (Xomw_atr_itm)hash.GetByOrNull(src.Key_bry()); if (trg == null) this.Add(src); else @@ -38,7 +38,7 @@ public class Xomw_atr_mgr { atr.Val_(val); } public Xomw_atr_itm Get_by_or_make(byte[] k) { - Xomw_atr_itm rv = (Xomw_atr_itm)hash.Get_by(k); + Xomw_atr_itm rv = (Xomw_atr_itm)hash.GetByOrNull(k); if (rv == null) { rv = new Xomw_atr_itm(-1, k, null); Add(rv); @@ -46,7 +46,7 @@ public class Xomw_atr_mgr { return rv; } public byte[] Get_val_or_null(byte[] k) { - Xomw_atr_itm atr = (Xomw_atr_itm)hash.Get_by(k); + Xomw_atr_itm atr = (Xomw_atr_itm)hash.GetByOrNull(k); return atr == null ? null : atr.Val(); } public Xomw_atr_mgr Add_many(String... kvs) {// TEST diff --git a/400_xowa/src/gplx/xowa/mediawiki/xml/XophpDOMNodeList.java b/400_xowa/src/gplx/xowa/mediawiki/xml/XophpDOMNodeList.java index e2f5404d6..649425d5b 100644 --- a/400_xowa/src/gplx/xowa/mediawiki/xml/XophpDOMNodeList.java +++ b/400_xowa/src/gplx/xowa/mediawiki/xml/XophpDOMNodeList.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.mediawiki.xml; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.*; +package gplx.xowa.mediawiki.xml; import gplx.*; import gplx.langs.xmls.*; public class XophpDOMNodeList { private final List_adp list = List_adp_.New(); @@ -24,6 +24,6 @@ public class XophpDOMNodeList { list.Add(new XophpDOMNode(nde)); } } - public int count() {return list.Count();} + public int count() {return list.Len();} public XophpDOMNode item(int i) {return (XophpDOMNode)list.Get_at(i);} } diff --git a/400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java b/400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java index bb5968590..03eb52af8 100644 --- a/400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java @@ -16,7 +16,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*; import gplx.core.btries.*; import gplx.xowa.langs.*; -import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.lnkes.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.lists.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.paras.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.miscs.*; import gplx.xowa.parsers.uniqs.*; +import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.lnkes.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.lists.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.paras.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.miscs.*; public class Xop_lxr_mgr { private final Xop_lxr[] ary; private final List_adp page_lxr_list = List_adp_.New(); @@ -31,7 +31,7 @@ public class Xop_lxr_mgr { } } public void Page__del_all() { - int len = page_lxr_list.Count(); + int len = page_lxr_list.Len(); for (int i = 0; i < len; ++i) { Xop_lxr lxr = (Xop_lxr)page_lxr_list.Get_at(i); lxr.Term(trie); diff --git a/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list.java b/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list.java index 916ddfd0e..ea25d51d7 100644 --- a/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list.java +++ b/400_xowa/src/gplx/xowa/parsers/hdrs/sections/Xop_section_list.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.hdrs.sections; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.hdrs.*; +package gplx.xowa.parsers.hdrs.sections; import gplx.*; import gplx.xowa.*; import gplx.xowa.mediawiki.includes.parsers.headingsOld.*; import gplx.xowa.addons.htmls.tocs.*; import gplx.xowa.htmls.core.htmls.tidy.*; class Xop_section_list implements Xomw_heading_cbk { @@ -69,7 +69,7 @@ class Xop_section_list implements Xomw_heading_cbk { } // else, get section matching key else { - Xop_section_itm itm = (Xop_section_itm)hash.Get_by(key); + Xop_section_itm itm = (Xop_section_itm)hash.GetByOrNull(key); if (itm == null) return null; // get bgn @@ -111,7 +111,7 @@ class Xop_section_list implements Xomw_heading_cbk { Xoh_toc_itm toc_itm = toc_mgr.Add(num, key); key = toc_itm.Anch(); - Xop_section_itm itm = new Xop_section_itm(hash.Count(), num, key, wkr.Hdr_bgn(), wkr.Hdr_end()); + Xop_section_itm itm = new Xop_section_itm(hash.Len(), num, key, wkr.Hdr_bgn(), wkr.Hdr_end()); hash.Add(key, itm); } public void On_src_done(Xomw_heading_wkr wkr) {} diff --git a/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser_fxt.java b/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser_fxt.java index 8230f10a8..6b4d7a921 100644 --- a/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser_fxt.java +++ b/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_parser_fxt.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.htmls; import gplx.*; class Mwh_doc_parser_fxt { private final Bry_bfr expd_bfr = Bry_bfr_.New(), actl_bfr = Bry_bfr_.New(); private final Mwh_doc_parser parser = new Mwh_doc_parser(); @@ -69,5 +69,5 @@ class Mwh_doc_wkr__itm_bldr implements Mwh_doc_wkr { public void On_comment_end (Mwh_doc_parser mgr, byte[] src, int nde_tid, int itm_bgn, int itm_end) {list.Add(new Mwh_doc_itm(Mwh_doc_itm.Itm_tid__comment , nde_tid, Bry_.Mid(src, itm_bgn, itm_end)));} public void On_entity_end (Mwh_doc_parser mgr, byte[] src, int nde_tid, int itm_bgn, int itm_end) {list.Add(new Mwh_doc_itm(Mwh_doc_itm.Itm_tid__entity , nde_tid, Bry_.Mid(src, itm_bgn, itm_end)));} - public Mwh_doc_itm[] To_atr_ary() {return (Mwh_doc_itm[])list.To_ary_and_clear(Mwh_doc_itm.class);} + public Mwh_doc_itm[] To_atr_ary() {return (Mwh_doc_itm[])list.ToAryAndClear(Mwh_doc_itm.class);} } diff --git a/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_wkr__atr_bldr.java b/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_wkr__atr_bldr.java index 79266a0c4..66e9bfad3 100644 --- a/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_wkr__atr_bldr.java +++ b/400_xowa/src/gplx/xowa/parsers/htmls/Mwh_doc_wkr__atr_bldr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.htmls; import gplx.*; public class Mwh_doc_wkr__atr_bldr implements Mwh_doc_wkr { private final List_adp list = List_adp_.New(); public Hash_adp_bry Nde_regy() {return null;} @@ -38,7 +38,7 @@ public class Mwh_doc_wkr__atr_bldr implements Mwh_doc_wkr { public void On_comment_end (Mwh_doc_parser mgr, byte[] src, int nde_tid, int itm_bgn, int itm_end) {} public void On_entity_end (Mwh_doc_parser mgr, byte[] src, int nde_tid, int itm_bgn, int itm_end) {} - public Mwh_atr_itm[] To_atr_ary() {return (Mwh_atr_itm[])list.To_ary_and_clear(Mwh_atr_itm.class);} + public Mwh_atr_itm[] To_atr_ary() {return (Mwh_atr_itm[])list.ToAryAndClear(Mwh_atr_itm.class);} public int Atrs__len() {return list.Len();} public Mwh_atr_itm Atrs__get_at(int i) {return (Mwh_atr_itm)list.Get_at(i);} public void Atrs__clear() {list.Clear();} diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_tst.java index 0de395759..17581089a 100644 --- a/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_tst.java +++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import org.junit.*; public class Xop_lnki_wkr__xwiki_tst { @Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private Xop_fxt fxt = new Xop_fxt(); @@ -61,7 +61,7 @@ public class Xop_lnki_wkr__xwiki_tst { ( "[[:fr:A]]", String_.Concat_lines_nl_skip_last ( "A" )); - Tfds.Eq(0, fxt.Page().Slink_list().Count()); + Tfds.Eq(0, fxt.Page().Slink_list().Len()); } @Test public void Simple_and_english() { // PURPOSE: s.w xwiki links to en were not working b/c s.w and en had same super lang of English; PAGE:s.q:Anonymous DATE:2014-09-10 Xoae_app app = Xoa_app_fxt.Make__app__edit(); @@ -72,7 +72,7 @@ public class Xop_lnki_wkr__xwiki_tst { ( "[[en:A]]" , "" ); - Tfds.Eq(1, fxt.Page().Slink_list().Count()); // test 1 xwiki lang + Tfds.Eq(1, fxt.Page().Slink_list().Len()); // test 1 xwiki lang } @Test public void Species_and_commons() { // PURPOSE: species xwiki links to commons should not put link in wikidata langs; PAGE:species:Scarabaeidae DATE:2014-09-10 Xoae_app app = Xoa_app_fxt.Make__app__edit(); @@ -83,7 +83,7 @@ public class Xop_lnki_wkr__xwiki_tst { ( "[[commons:A]]" , "commons:A" ); - Tfds.Eq(0, fxt.Page().Slink_list().Count()); // no xwiki langs + Tfds.Eq(0, fxt.Page().Slink_list().Len()); // no xwiki langs } @Test public void Wiktionary_and_wikipedia() { // PURPOSE: do not create xwiki links if same lang and differet type; PAGE:s.d:water DATE:2014-09-14 Xoae_app app = Xoa_app_fxt.Make__app__edit(); @@ -94,7 +94,7 @@ public class Xop_lnki_wkr__xwiki_tst { ( "[[w:A]]" , "w:A" ); - Tfds.Eq(0, fxt.Page().Slink_list().Count()); // test 0 xwiki lang + Tfds.Eq(0, fxt.Page().Slink_list().Len()); // test 0 xwiki lang } @Test public void Species_and_wikipedia() { // PURPOSE: species creates xwiki links to wikipedia; PAGE:species:Puccinia DATE:2014-09-14 Xoae_app app = Xoa_app_fxt.Make__app__edit(); @@ -105,7 +105,7 @@ public class Xop_lnki_wkr__xwiki_tst { ( "[[fr:A]]" , "" ); - Tfds.Eq(1, fxt.Page().Slink_list().Count()); // 1 xwiki lang + Tfds.Eq(1, fxt.Page().Slink_list().Len()); // 1 xwiki lang } private void Reg_xwiki_alias(String alias, String domain) { Xop_fxt.Reg_xwiki_alias(fxt.Wiki(), alias, domain); diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/cfgs/Xoc_xwiki_repo_mgr.java b/400_xowa/src/gplx/xowa/parsers/lnkis/cfgs/Xoc_xwiki_repo_mgr.java index 5a171e096..5ff75a59e 100644 --- a/400_xowa/src/gplx/xowa/parsers/lnkis/cfgs/Xoc_xwiki_repo_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/lnkis/cfgs/Xoc_xwiki_repo_mgr.java @@ -1,29 +1,29 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.parsers.lnkis.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.parsers.lnkis.cfgs; import gplx.*; import gplx.xowa.*; public class Xoc_xwiki_repo_mgr implements Gfo_invk { private Ordered_hash hash = Ordered_hash_.New_bry(); private Xowe_wiki wiki; public Xoc_xwiki_repo_mgr(Xowe_wiki wiki) {this.wiki = wiki;} public boolean Has(byte[] abrv) { - Xoc_xwiki_repo_itm itm = (Xoc_xwiki_repo_itm)hash.Get_by(abrv); + Xoc_xwiki_repo_itm itm = (Xoc_xwiki_repo_itm)hash.GetByOrNull(abrv); return itm != null; } public void Add_or_mod(byte[] abrv) { - Xoc_xwiki_repo_itm itm = (Xoc_xwiki_repo_itm)hash.Get_by(abrv); + Xoc_xwiki_repo_itm itm = (Xoc_xwiki_repo_itm)hash.GetByOrNull(abrv); if (itm == null) { itm = new Xoc_xwiki_repo_itm(abrv); hash.Add(abrv, itm); diff --git a/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_tbl.java b/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_tbl.java index 951b2072e..2c6a0ab4e 100644 --- a/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_tbl.java +++ b/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_tbl.java @@ -13,25 +13,25 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.logs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.dbs.engines.sqlite.*; +package gplx.xowa.parsers.logs; +import gplx.dbs.*; import gplx.dbs.qrys.*; public class Xop_log_basic_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); public final String fld__log_id, fld__log_tid, fld__log_msg, fld__log_time, fld__page_id, fld__page_ttl, fld__args_len, fld__args_str, fld__src_len, fld__src_str; private Db_stmt stmt_insert; public Xop_log_basic_tbl(Db_conn conn){ this.conn = conn; this.tbl_name = "log_basic_temp"; - this.fld__log_id = flds.Add_int_pkey_autonum("log_id"); - this.fld__log_tid = flds.Add_int("log_tid"); - this.fld__log_msg = flds.Add_str("log_msg", 255); - this.fld__log_time = flds.Add_int("log_time"); - this.fld__page_id = flds.Add_int("page_id"); - this.fld__page_ttl = flds.Add_str("page_ttl", 255); - this.fld__args_len = flds.Add_int("args_len"); - this.fld__args_str = flds.Add_str("args_str", 4096); - this.fld__src_len = flds.Add_int("src_len"); - this.fld__src_str = flds.Add_str("src_str", 4096); + this.fld__log_id = flds.AddIntPkeyAutonum("log_id"); + this.fld__log_tid = flds.AddInt("log_tid"); + this.fld__log_msg = flds.AddStr("log_msg", 255); + this.fld__log_time = flds.AddInt("log_time"); + this.fld__page_id = flds.AddInt("page_id"); + this.fld__page_ttl = flds.AddStr("page_ttl", 255); + this.fld__args_len = flds.AddInt("args_len"); + this.fld__args_str = flds.AddStr("args_str", 4096); + this.fld__src_len = flds.AddInt("src_len"); + this.fld__src_str = flds.AddStr("src_str", 4096); conn.Rls_reg(this); this.Create_tbl(); } diff --git a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace.java b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace.java index 8d7de393f..35cef199a 100644 --- a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace.java +++ b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.parsers.tmpls; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.parsers.tmpls; import gplx.*; +import gplx.xowa.parsers.*; import gplx.core.primitives.*; public interface Xot_defn_trace { void Clear(); @@ -22,11 +23,11 @@ public interface Xot_defn_trace { void Print(byte[] src, Bry_bfr bb); } class Xot_defn_trace_brief implements Xot_defn_trace { - public int Count() {return hash.Count();} + public int Count() {return hash.Len();} public Xot_defn_trace_itm_brief GetAt(int i) {return (Xot_defn_trace_itm_brief)hash.Get_at(i);} public void Trace_bgn(Xop_ctx ctx, byte[] src, byte[] name, Xot_invk caller, Xot_invk self, Xot_defn defn) { int hashKey = Bry_obj_ref.CalcHashCode(name, 0, name.length); - Object o = hash.Get_by(hashKey); + Object o = hash.GetByOrNull(hashKey); Xot_defn_trace_itm_brief itm = null; if (o == null) { itm = new Xot_defn_trace_itm_brief().Name_(name); @@ -38,7 +39,7 @@ class Xot_defn_trace_brief implements Xot_defn_trace { } private Ordered_hash hash = Ordered_hash_.New(); public void Trace_end(int trg_bgn, Bry_bfr trg) {} public void Print(byte[] src, Bry_bfr bb) { - int count = hash.Count(); if (count == 0) return; + int count = hash.Len(); if (count == 0) return; if (bb.Len() != 0) bb.Add_byte_nl(); // only add newLine if something in bb; needed for tests for (int i = 0; i < count; i++) { Xot_defn_trace_itm_brief itm = (Xot_defn_trace_itm_brief)hash.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace_dbg.java b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace_dbg.java index f4cd729ef..7a05d7e24 100644 --- a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace_dbg.java +++ b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_defn_trace_dbg.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.tmpls; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.tmpls; import gplx.*; +import gplx.xowa.parsers.*; import gplx.xowa.xtns.pfuncs.*; public class Xot_defn_trace_dbg implements Xot_defn_trace { public void Trace_bgn(Xop_ctx ctx, byte[] src, byte[] name, Xot_invk caller, Xot_invk invk, Xot_defn defn) { @@ -88,7 +89,7 @@ public class Xot_defn_trace_dbg implements Xot_defn_trace { } } argKeys.Sort(); - for (int i = 0; i < argKeys.Count(); i++) { + for (int i = 0; i < argKeys.Len(); i++) { String s = (String)argKeys.Get_at(i); String key = String_.GetStrBefore(s, "="); String val = String_.GetStrAfter(s, "="); diff --git a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_mock.java b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_mock.java index 5efba7df3..463d8a7f4 100644 --- a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_mock.java +++ b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_mock.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.tmpls; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; -import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.parsers.tmpls; import gplx.*; public class Xot_invk_mock implements Xot_invk { Xot_invk_mock(byte defn_tid, int idx_adj, byte[] frame_ttl) { this.defn_tid = defn_tid; this.idx_adj = idx_adj; this.frame_ttl = frame_ttl; @@ -28,10 +27,10 @@ public class Xot_invk_mock implements Xot_invk { public int Frame_lifetime() {return frame_lifetime;} public void Frame_lifetime_(int v) {frame_lifetime = v;} private int frame_lifetime; public boolean Rslt_is_redirect() {return rslt_is_redirect;} public void Rslt_is_redirect_(boolean v) {rslt_is_redirect = v;} private boolean rslt_is_redirect; public Arg_nde_tkn Name_tkn() {return Arg_nde_tkn.Null;} - public int Args_len() {return args.Count() + idx_adj;} private Ordered_hash args = Ordered_hash_.New_bry(); + public int Args_len() {return args.Len() + idx_adj;} private Ordered_hash args = Ordered_hash_.New_bry(); public Arg_nde_tkn Args_get_by_idx(int i) {return (Arg_nde_tkn)args.Get_at(i - idx_adj);} public Arg_nde_tkn Args_eval_by_idx(byte[] src, int idx) {// DUPE:MW_ARG_RETRIEVE - int cur = 0, list_len = args.Count(); + int cur = 0, list_len = args.Len(); if (idx >= list_len) return null; for (int i = 0; i < list_len; i++) { // iterate over list to find nth *non-keyd* arg; SEE:NOTE_1 Arg_nde_tkn nde = (Arg_nde_tkn)args.Get_at(i); @@ -53,7 +52,7 @@ public class Xot_invk_mock implements Xot_invk { } return Args_get_by_key(src, Bry_.To_a7_bry(idx + 1, 1)); } - public Arg_nde_tkn Args_get_by_key(byte[] src, byte[] key) {return (Arg_nde_tkn)args.Get_by(key);} + public Arg_nde_tkn Args_get_by_key(byte[] src, byte[] key) {return (Arg_nde_tkn)args.GetByOrNull(key);} public static Xot_invk_mock new_(byte defn_tid, byte[] frame_ttl, Keyval... args) {return new_(defn_tid, 1, frame_ttl, args);} public static Xot_invk_mock new_(byte[] frame_ttl, Keyval... args) {return new_(Xot_defn_.Tid_null, 1, frame_ttl, args);} public static Xot_invk_mock preprocess_(byte[] frame_ttl, Keyval... args) {return new_(Xot_defn_.Tid_null, 1, frame_ttl, args);} @@ -81,7 +80,7 @@ public class Xot_invk_mock implements Xot_invk { } else // regular nde nde_tkn = new Arg_nde_tkn_mock(kv_key_str, kv.Val_to_str_or_empty()); // add regular key, val strings - rv.args.Add_if_dupe_use_nth(Bry_.new_u8(kv_key_str), nde_tkn); + rv.args.AddIfDupeUseNth(Bry_.new_u8(kv_key_str), nde_tkn); } return rv; } diff --git a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_temp.java b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_temp.java index 1630b04d3..bebd3770b 100644 --- a/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_temp.java +++ b/400_xowa/src/gplx/xowa/parsers/tmpls/Xot_invk_temp.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.tmpls; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.tmpls; import gplx.*; import gplx.core.primitives.*; -import gplx.xowa.xtns.scribunto.*; public class Xot_invk_temp implements Xot_invk { private List_adp list; private Hash_adp_bry arg_key_hash; @@ -37,11 +36,11 @@ public class Xot_invk_temp implements Xot_invk { public byte[] Frame_ttl() {return frame_ttl;} public void Frame_ttl_(byte[] v) {frame_ttl = v;} private byte[] frame_ttl = Bry_.Empty; // NOTE: set frame_ttl to non-null value; PAGE:en.w:Constantine_the_Great {{Christianity}}; DATE:2014-06-26 public int Frame_lifetime() {return frame_lifetime;} public void Frame_lifetime_(int v) {frame_lifetime = v;} private int frame_lifetime; public boolean Rslt_is_redirect() {return rslt_is_redirect;} public void Rslt_is_redirect_(boolean v) {rslt_is_redirect = v;} private boolean rslt_is_redirect; - public int Args_len() {return list == null ? 0 : list.Count();} + public int Args_len() {return list == null ? 0 : list.Len();} public Arg_nde_tkn Args_eval_by_idx(byte[] src, int idx) { // NOTE: idx is base0 return arg_idx_hash == null // only true if no args, or all args are keys; EX: {{A|b=1|c=2}} ? null - : (Arg_nde_tkn)arg_idx_hash.Get_by(arg_idx_ref.Val_(idx)); // lookup int in hash; needed b/c multiple identical keys should retrieve last, not first; EX: {{A|1=a|1=b}}; PAGE:el.d:ἔχω DATE:2014-07-23 + : (Arg_nde_tkn)arg_idx_hash.GetByOrNull(arg_idx_ref.Val_(idx)); // lookup int in hash; needed b/c multiple identical keys should retrieve last, not first; EX: {{A|1=a|1=b}}; PAGE:el.d:ἔχω DATE:2014-07-23 } public Arg_nde_tkn Args_get_by_idx(int i) {return list == null ? null : (Arg_nde_tkn)list.Get_at(i);} public Arg_nde_tkn Args_get_by_key(byte[] src, byte[] key) { @@ -53,7 +52,7 @@ public class Xot_invk_temp implements Xot_invk { } public void Args_add_by_key(byte[] key, Arg_nde_tkn arg) { if (arg_key_hash == null) arg_key_hash = Hash_adp_bry.cs(); // PERF: lazy - arg_key_hash.Add_if_dupe_use_nth(key, arg); + arg_key_hash.AddIfDupeUseNth(key, arg); int key_as_int = Bry_.To_int_or(key, Int_.Min_value); if (key_as_int != Int_.Min_value) // key is int; add it to arg_idx_hash; EX:{{A|1=a}} vs {{A|a}}; DATE:2014-07-23 Arg_idx_hash_add(key_as_int - List_adp_.Base1, arg); @@ -64,7 +63,7 @@ public class Xot_invk_temp implements Xot_invk { arg_idx_hash = Hash_adp_.New(); arg_idx_ref = Int_obj_ref.New_neg1(); } - arg_idx_hash.Add_if_dupe_use_nth(Int_obj_ref.New(int_key), arg); // Add_if_dupe_use_nth to keep latest version; needed for {{A|1=a|1=b}} DATE:2014-07-23 + arg_idx_hash.AddIfDupeUseNth(Int_obj_ref.New(int_key), arg); // Add_if_dupe_use_nth to keep latest version; needed for {{A|1=a|1=b}} DATE:2014-07-23 } public static final Xot_invk Null_frame = null; diff --git a/400_xowa/src/gplx/xowa/parsers/utils/TstObj_tst.java b/400_xowa/src/gplx/xowa/parsers/utils/TstObj_tst.java index dca439803..45133e46f 100644 --- a/400_xowa/src/gplx/xowa/parsers/utils/TstObj_tst.java +++ b/400_xowa/src/gplx/xowa/parsers/utils/TstObj_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.utils; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.utils; import gplx.*; import org.junit.*; import gplx.core.strings.*; import gplx.core.type_xtns.*; import gplx.core.stores.*; import gplx.core.envs.*; interface TstRuleMgr { boolean SkipChkVal(String expdTypeKey, TstAtr expd); @@ -22,14 +22,14 @@ interface TstRuleMgr { class Xop_rule_mgr implements TstRuleMgr { public boolean SkipChkVal(String expdTypeKey, TstAtr expd) { String key = expdTypeKey + "." + expd.Key(); - Xop_rule_dat ruleDat = (Xop_rule_dat)hash.Get_by(key); if (ruleDat == null) return false; + Xop_rule_dat ruleDat = (Xop_rule_dat)hash.GetByOrNull(key); if (ruleDat == null) return false; if (expd.ValType().Eq(expd.Val(), ruleDat.SkipVal())) return true; return false; } public boolean SkipChkObj(String expdTypeKey, String atrKey, TstObj expd) { String key = expdTypeKey + "." + atrKey; - Xop_rule_dat ruleDat = (Xop_rule_dat)hash.Get_by(key); if (ruleDat == null) return false; - TstAtr expdAtr = (TstAtr)expd.Atrs().Get_by(ruleDat.SubKey()); + Xop_rule_dat ruleDat = (Xop_rule_dat)hash.GetByOrNull(key); if (ruleDat == null) return false; + TstAtr expdAtr = (TstAtr)expd.Atrs().GetByOrNull(ruleDat.SubKey()); if (expdAtr == null) return false; if (expdAtr.ValType().Eq(expdAtr.Val(), ruleDat.SkipVal())) return true; return false; @@ -83,14 +83,14 @@ public class TstObj_tst { sb.Add(raw).Add(Op_sys.Lnx.Nl_str()); boolean pass = true; int[] cols = new int[3]; - for (int i = 0; i < rslts.Count(); i++) { + for (int i = 0; i < rslts.Len(); i++) { TstRslt rslt = (TstRslt)rslts.Get_at(i); Max(cols, 0, rslt.EvalStr()); Max(cols, 1, rslt.Id()); Max(cols, 2, rslt.Key()); } String hdr = String_.Repeat(" ", Add(cols) + 3); - for (int i = 0; i < rslts.Count(); i++) { + for (int i = 0; i < rslts.Len(); i++) { TstRslt rslt = (TstRslt)rslts.Get_at(i); // if (rslt.EvalPass()) continue; sb .Add(String_.PadEnd(rslt.EvalStr(), cols[0] + 1, " ")) @@ -106,12 +106,12 @@ public class TstObj_tst { throw Err_.new_wo_type(Op_sys.Lnx.Nl_str() + sb.To_str()); } private static void Eval(List_adp rslts, TstRuleMgr ruleMgr, Ordered_hash props, String idx, TstObj expd, TstObj actl) { - int expdLen = expd.Atrs().Count(); + int expdLen = expd.Atrs().Len(); props.Clear(); for (int i = 0; i < expdLen; i++) { TstAtr expdAtr = (TstAtr)expd.Atrs().Get_at(i); String key = expdAtr.Key(); - TstAtr actlAtr = (TstAtr)actl.Atrs().Get_by(key); + TstAtr actlAtr = (TstAtr)actl.Atrs().GetByOrNull(key); if (expdAtr.ValType() == ObjectClassXtn.Instance) { SrlObj expdSrl = (SrlObj)expdAtr.Val(); TstObj expdTst = TstObj.new_(); @@ -128,7 +128,7 @@ public class TstObj_tst { } props.Add(key, key); } - int expdSubsLen = expd.Subs().Count(), actlSubsLen = actl.Subs().Count(); + int expdSubsLen = expd.Subs().Len(), actlSubsLen = actl.Subs().Len(); int maxLen = expdSubsLen > actlSubsLen ? expdSubsLen : actlSubsLen; for (int i = 0; i < maxLen; i++) { TstObj expdSub = i < expdSubsLen ? (TstObj)expd.Subs().Get_at(i) : TstObj.Null; diff --git a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_convert_rule.java b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_convert_rule.java index d8882923b..09253cc90 100644 --- a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_convert_rule.java +++ b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_convert_rule.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; -import gplx.core.btries.*; import gplx.core.primitives.*; +package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.langs.vnts.*; class Vnt_convert_rule { // REF.MW: /languages/LanguageConverter.php|ConverterRule private final Vnt_flag_parser flag_parser = new Vnt_flag_parser(); private final Vnt_flag_code_mgr flag_codes = new Vnt_flag_code_mgr(); private final Vnt_flag_lang_mgr flag_langs = new Vnt_flag_lang_mgr(); @@ -122,7 +121,7 @@ class Vnt_convert_rule { // REF.MW: /languages/LanguageConverter.php|ConverterRu if (bidi_bry != null) rule_bidis.Set(vnt_key, bidi_bry); } if (bidi_bry != null) { - int marked_len = cnv_marked_hash.Count(); + int marked_len = cnv_marked_hash.Len(); for (int j = 0; j < marked_len; ++j) { Xol_vnt_itm marked_itm = (Xol_vnt_itm)cnv_marked_hash.Get_at(j); byte[] marked_key = marked_itm.Key(); diff --git a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_flag_lang_mgr.java b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_flag_lang_mgr.java index 5d0dfab4b..839d55fa7 100644 --- a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_flag_lang_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_flag_lang_mgr.java @@ -1,29 +1,29 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.langs.vnts.*; class Vnt_flag_lang_mgr { private final Ordered_hash regy = Ordered_hash_.New_bry(); - public int Count() {return regy.Count();} + public int Count() {return regy.Len();} public boolean Has(byte[] vnt) {return regy.Has(vnt);} public void Clear() {regy.Clear();} - public void Add(Xol_vnt_itm itm) {regy.Add_if_dupe_use_1st(itm.Key(), itm);} + public void Add(Xol_vnt_itm itm) {regy.AddIfDupeUse1st(itm.Key(), itm);} public Xol_vnt_itm Get_at(int i) {return (Xol_vnt_itm)regy.Get_at(i);} public void To_bfr__dbg(Bry_bfr bfr) { - int len = regy.Count(); + int len = regy.Len(); for (int i = 0; i < len; ++i) { Xol_vnt_itm itm = (Xol_vnt_itm)regy.Get_at(i); if (bfr.Len_gt_0()) bfr.Add_byte_semic(); diff --git a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_log_tbl.java b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_log_tbl.java index e07a1246e..dd7b8cbab 100644 --- a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_log_tbl.java +++ b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_log_tbl.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.vnts; import gplx.*; import gplx.dbs.*; public class Vnt_log_tbl implements Rls_able { - private final String tbl_name = "log_vnt"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "log_vnt"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_uid, fld_page_id, fld_rule_idx , fld_flag_count, fld_lang_count, fld_undi_count, fld_bidi_count , fld_flag_add, fld_flag_del, fld_flag_aout, fld_flag_hide, fld_flag_raw, fld_flag_show, fld_flag_descrip, fld_flag_name, fld_flag_title, fld_flag_err @@ -25,36 +25,36 @@ public class Vnt_log_tbl implements Rls_able { private Db_stmt stmt_insert; public Vnt_log_tbl(Db_conn conn) { this.conn = conn; - this.fld_uid = flds.Add_int("uid"); - this.fld_page_id = flds.Add_int("page_id"); - this.fld_rule_idx = flds.Add_int("rule_idx"); - this.fld_flag_count = flds.Add_int("flag_count"); - this.fld_lang_count = flds.Add_int("lang_count"); - this.fld_undi_count = flds.Add_int("undi_count"); - this.fld_bidi_count = flds.Add_int("bidi_count"); - this.fld_flag_add = flds.Add_int("flag_add"); - this.fld_flag_del = flds.Add_int("flag_del"); - this.fld_flag_aout = flds.Add_int("flag_aout"); - this.fld_flag_hide = flds.Add_int("flag_hide"); - this.fld_flag_raw = flds.Add_int("flag_raw"); - this.fld_flag_show = flds.Add_int("flag_show"); - this.fld_flag_descrip = flds.Add_int("flag_descrip"); - this.fld_flag_name = flds.Add_int("flag_name"); - this.fld_flag_title = flds.Add_int("flag_title"); - this.fld_flag_err = flds.Add_int("flag_err"); - this.fld_vnt_0 = flds.Add_int("vnt_0"); - this.fld_vnt_1 = flds.Add_int("vnt_1"); - this.fld_vnt_2 = flds.Add_int("vnt_2"); - this.fld_vnt_3 = flds.Add_int("vnt_3"); - this.fld_vnt_4 = flds.Add_int("vnt_4"); - this.fld_vnt_5 = flds.Add_int("vnt_5"); - this.fld_vnt_6 = flds.Add_int("vnt_6"); - this.fld_vnt_7 = flds.Add_int("vnt_7"); - this.fld_vnt_8 = flds.Add_int("vnt_8"); - this.fld_vnt_9 = flds.Add_int("vnt_9"); - this.fld_src_bgn = flds.Add_int("src_bgn"); - this.fld_src_end = flds.Add_int("src_end"); - this.fld_src_txt = flds.Add_text("src_txt"); + this.fld_uid = flds.AddInt("uid"); + this.fld_page_id = flds.AddInt("page_id"); + this.fld_rule_idx = flds.AddInt("rule_idx"); + this.fld_flag_count = flds.AddInt("flag_count"); + this.fld_lang_count = flds.AddInt("lang_count"); + this.fld_undi_count = flds.AddInt("undi_count"); + this.fld_bidi_count = flds.AddInt("bidi_count"); + this.fld_flag_add = flds.AddInt("flag_add"); + this.fld_flag_del = flds.AddInt("flag_del"); + this.fld_flag_aout = flds.AddInt("flag_aout"); + this.fld_flag_hide = flds.AddInt("flag_hide"); + this.fld_flag_raw = flds.AddInt("flag_raw"); + this.fld_flag_show = flds.AddInt("flag_show"); + this.fld_flag_descrip = flds.AddInt("flag_descrip"); + this.fld_flag_name = flds.AddInt("flag_name"); + this.fld_flag_title = flds.AddInt("flag_title"); + this.fld_flag_err = flds.AddInt("flag_err"); + this.fld_vnt_0 = flds.AddInt("vnt_0"); + this.fld_vnt_1 = flds.AddInt("vnt_1"); + this.fld_vnt_2 = flds.AddInt("vnt_2"); + this.fld_vnt_3 = flds.AddInt("vnt_3"); + this.fld_vnt_4 = flds.AddInt("vnt_4"); + this.fld_vnt_5 = flds.AddInt("vnt_5"); + this.fld_vnt_6 = flds.AddInt("vnt_6"); + this.fld_vnt_7 = flds.AddInt("vnt_7"); + this.fld_vnt_8 = flds.AddInt("vnt_8"); + this.fld_vnt_9 = flds.AddInt("vnt_9"); + this.fld_src_bgn = flds.AddInt("src_bgn"); + this.fld_src_end = flds.AddInt("src_end"); + this.fld_src_txt = flds.AddText("src_txt"); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; diff --git a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_bidi_mgr.java b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_bidi_mgr.java index 93b08fc50..ea0df98e1 100644 --- a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_bidi_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_bidi_mgr.java @@ -1,39 +1,39 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.parsers.vnts; import gplx.*; class Vnt_rule_bidi_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); - public int Len() {return hash.Count();} - public boolean Has_none() {return hash.Count() == 0;} + public int Len() {return hash.Len();} + public boolean Has_none() {return hash.Len() == 0;} public void Clear() {hash.Clear();} public Vnt_rule_bidi_itm Get_at(int i) {return (Vnt_rule_bidi_itm)hash.Get_at(i);} - public Vnt_rule_bidi_itm Get_by(byte[] k) {return (Vnt_rule_bidi_itm)hash.Get_by(k);} + public Vnt_rule_bidi_itm Get_by(byte[] k) {return (Vnt_rule_bidi_itm)hash.GetByOrNull(k);} public byte[] Get_text_by_ary_or_null(byte[]... ary) { int len = ary.length; byte[] rv = null; for (int i = 0; i < len; ++i) { byte[] itm = ary[i]; - Vnt_rule_bidi_itm bidi_itm = (Vnt_rule_bidi_itm)hash.Get_by(itm); if (bidi_itm == null) continue; + Vnt_rule_bidi_itm bidi_itm = (Vnt_rule_bidi_itm)hash.GetByOrNull(itm); if (bidi_itm == null) continue; rv = Get_text_by_key_or_null(bidi_itm.Vnt()); if (rv != null) return rv; } return rv; } public byte[] Get_text_by_key_or_null(byte[] vnt) { - Vnt_rule_bidi_itm rv = (Vnt_rule_bidi_itm)hash.Get_by(vnt); + Vnt_rule_bidi_itm rv = (Vnt_rule_bidi_itm)hash.GetByOrNull(vnt); return rv == null ? null : rv.Text(); } public byte[] Get_text_at(int i) { @@ -41,7 +41,7 @@ class Vnt_rule_bidi_mgr { return itm == null ? null : itm.Text(); } public void Set(byte[] vnt, byte[] text) { - Vnt_rule_bidi_itm itm = (Vnt_rule_bidi_itm)hash.Get_by(vnt); + Vnt_rule_bidi_itm itm = (Vnt_rule_bidi_itm)hash.GetByOrNull(vnt); if (itm == null) { itm = new Vnt_rule_bidi_itm(vnt, text); hash.Add(vnt, itm); @@ -50,7 +50,7 @@ class Vnt_rule_bidi_mgr { itm.Text_(text); } public void To_bry__dbg(Bry_bfr bfr) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { if (i != 0) bfr.Add_byte_nl(); Vnt_rule_bidi_itm itm = (Vnt_rule_bidi_itm)hash.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_undi_mgr.java b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_undi_mgr.java index 51e4d4d85..f11e63120 100644 --- a/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_undi_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/vnts/Vnt_rule_undi_mgr.java @@ -1,28 +1,28 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.parsers.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.parsers.vnts; import gplx.*; class Vnt_rule_undi_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); - public int Len() {return hash.Count();} - public boolean Has_none() {return hash.Count() == 0;} + public int Len() {return hash.Len();} + public boolean Has_none() {return hash.Len() == 0;} public void Clear() {hash.Clear();} public Vnt_rule_undi_grp Get_at(int i) {return (Vnt_rule_undi_grp)hash.Get_at(i);} - public Vnt_rule_undi_grp Get_by(byte[] key) {return (Vnt_rule_undi_grp)hash.Get_by(key);} + public Vnt_rule_undi_grp Get_by(byte[] key) {return (Vnt_rule_undi_grp)hash.GetByOrNull(key);} public byte[] Get_text_by_key_or_null(byte[] key) { - Vnt_rule_undi_grp grp = (Vnt_rule_undi_grp)hash.Get_by(key); if (grp == null) return null; + Vnt_rule_undi_grp grp = (Vnt_rule_undi_grp)hash.GetByOrNull(key); if (grp == null) return null; return grp.Len() == 0 ? null : grp.Get_at(0).Trg(); // REF.MW: $disp = $disp[0]; } public byte[] Get_text_at(int i) { @@ -30,7 +30,7 @@ class Vnt_rule_undi_mgr { return grp.Len() == 0 ? null : grp.Get_at(0).Trg(); } public Vnt_rule_undi_grp Set(byte[] vnt, byte[] src, byte[] trg) { - Vnt_rule_undi_grp grp = (Vnt_rule_undi_grp)hash.Get_by(vnt); + Vnt_rule_undi_grp grp = (Vnt_rule_undi_grp)hash.GetByOrNull(vnt); if (grp == null) { grp = new Vnt_rule_undi_grp(vnt); hash.Add(vnt, grp); @@ -39,7 +39,7 @@ class Vnt_rule_undi_mgr { return grp; } public void To_bry__dbg(Bry_bfr bfr) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { if (i != 0) bfr.Add_byte_nl(); Vnt_rule_undi_grp grp = (Vnt_rule_undi_grp)hash.Get_at(i); @@ -51,11 +51,11 @@ class Vnt_rule_undi_mgr { class Vnt_rule_undi_grp { private final Ordered_hash hash = Ordered_hash_.New_bry(); public Vnt_rule_undi_grp(byte[] vnt) {this.vnt = vnt;} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Vnt_rule_undi_itm Get_at(int i) {return (Vnt_rule_undi_itm)hash.Get_at(i);} public byte[] Vnt() {return vnt;} private final byte[] vnt; public Vnt_rule_undi_itm Set(byte[] src, byte[] trg) { - Vnt_rule_undi_itm itm = (Vnt_rule_undi_itm)hash.Get_by(src); + Vnt_rule_undi_itm itm = (Vnt_rule_undi_itm)hash.GetByOrNull(src); if (itm == null) { itm = new Vnt_rule_undi_itm(src, trg); hash.Add(src, itm); @@ -63,7 +63,7 @@ class Vnt_rule_undi_grp { return itm; } public void To_bry__dbg(Bry_bfr bfr) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Vnt_rule_undi_itm itm = (Vnt_rule_undi_itm)hash.Get_at(i); bfr.Add(itm.Src()).Add_byte_eq().Add(itm.Trg()); diff --git a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xatr_whitelist_mgr.java b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xatr_whitelist_mgr.java index 09c4849f3..915fc634c 100644 --- a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xatr_whitelist_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xatr_whitelist_mgr.java @@ -304,7 +304,7 @@ public class Xop_xatr_whitelist_mgr { keys.Add(grp_keys[j]); } } - len = keys.Count(); + len = keys.Len(); for (int i = 0; i < len; i++) { byte[] key_bry = (byte[])keys.Get_at(i); Xop_xatr_whitelist_itm itm = (Xop_xatr_whitelist_itm)key_trie.Match_exact(key_bry, 0, key_bry.length); @@ -325,7 +325,7 @@ public class Xop_xatr_whitelist_mgr { itm.Tags()[i] = 1; } private Xop_xatr_whitelist_itm Ini_key_trie_add(byte[] key, boolean exact) { - Object key_tid_obj = tid_hash.Get_by(key); + Object key_tid_obj = tid_hash.GetByOrNull(key); byte key_tid = key_tid_obj == null ? Mwh_atr_itm_.Key_tid__generic : ((Byte_obj_val)key_tid_obj).Val(); Xop_xatr_whitelist_itm rv = new Xop_xatr_whitelist_itm(key, key_tid, exact); key_trie.Add_obj(key, rv); diff --git a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag.java b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag.java index 4c4e4a43c..491958527 100644 --- a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag.java +++ b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.xndes; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.xndes; import gplx.*; import gplx.core.primitives.*; public class Xop_xnde_tag { public Xop_xnde_tag(int id, String name_str) { // NOTE: should only be used by Xop_xnde_tag_ @@ -75,7 +75,7 @@ public class Xop_xnde_tag { synchronized (langs) { langs_key.Val_(cur_lang); } - Xop_xnde_tag_lang lang = (Xop_xnde_tag_lang)langs.Get_by(langs_key); + Xop_xnde_tag_lang lang = (Xop_xnde_tag_lang)langs.GetByOrNull(langs_key); if (lang == null) return null; // cur tag is a lang tag, but no tag for this lang; EX: "" and cur_lang=de return Bry_.Eq_ci_a7(lang.Name_bry(), src, bgn, end) ? lang diff --git a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag_regy.java b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag_regy.java index 0a269dda1..3dcad5c12 100644 --- a/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag_regy.java +++ b/400_xowa/src/gplx/xowa/parsers/xndes/Xop_xnde_tag_regy.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.parsers.xndes; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; +package gplx.xowa.parsers.xndes; import gplx.*; +import gplx.xowa.parsers.*; import gplx.core.btries.*; public class Xop_xnde_tag_regy { private boolean init_needed = true; @@ -70,7 +71,7 @@ public class Xop_xnde_tag_regy { trie.Add_obj(xnde.Name_bry(), xnde); Ordered_hash langs = xnde.Langs(); if (langs != null) { // tag has langs; EX:
    ; DATE:2014-07-18 - int langs_len = langs.Count(); + int langs_len = langs.Len(); for (int i = 0; i < langs_len; ++i) { // register each lang's tag; EX: "", "" Xop_xnde_tag_lang lang = (Xop_xnde_tag_lang)langs.Get_at(i); trie.Add_obj(lang.Name_bry(), xnde); diff --git a/400_xowa/src/gplx/xowa/specials/Xoa_special_mgr.java b/400_xowa/src/gplx/xowa/specials/Xoa_special_mgr.java index 854efd317..06706b9c5 100644 --- a/400_xowa/src/gplx/xowa/specials/Xoa_special_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/Xoa_special_mgr.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.wbases.specials.*; public class Xoa_special_mgr implements Gfo_invk { @@ -25,7 +25,7 @@ public class Xoa_special_mgr implements Gfo_invk { wbase_cfg.Init_by_app(app); } public void Add(String key, Gfo_invk cfg) {hash.Add(key, cfg);} - public Gfo_invk Get_or_null(String key) {return (Gfo_invk)hash.Get_by(key);} + public Gfo_invk Get_or_null(String key) {return (Gfo_invk)hash.GetByOrNull(key);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_get)) return Get_or_null(m.ReadStr("v")); else return Gfo_invk_.Rv_unhandled; diff --git a/400_xowa/src/gplx/xowa/specials/Xow_special_mgr.java b/400_xowa/src/gplx/xowa/specials/Xow_special_mgr.java index 227e400ee..895ffe436 100644 --- a/400_xowa/src/gplx/xowa/specials/Xow_special_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/Xow_special_mgr.java @@ -16,11 +16,11 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.xowa.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.history.*; import gplx.xowa.langs.*; import gplx.xowa.langs.specials.*; -import gplx.xowa.specials.*; import gplx.xowa.specials.allPages.*; import gplx.xowa.specials.nearby.*; import gplx.xowa.specials.statistics.*; import gplx.xowa.xtns.translates.*; import gplx.xowa.specials.movePage.*; -import gplx.xowa.specials.xowa.system_data.*; import gplx.xowa.specials.xowa.default_tab.*; import gplx.xowa.specials.xowa.popup_history.*; import gplx.xowa.addons.wikis.imports.*; import gplx.xowa.specials.xowa.diags.*; import gplx.xowa.mediawiki.extensions.Wikibase.repo.includes.specials.*; import gplx.xowa.specials.xowa.errors.*; +import gplx.xowa.specials.xowa.system_data.*; import gplx.xowa.specials.xowa.default_tab.*; import gplx.xowa.specials.xowa.popup_history.*; +import gplx.xowa.specials.xowa.diags.*; import gplx.xowa.mediawiki.extensions.Wikibase.repo.includes.specials.*; import gplx.xowa.specials.xowa.errors.*; import gplx.xowa.xtns.wbases.specials.*; -import gplx.xowa.users.data.*; import gplx.xowa.users.bmks.*; +import gplx.xowa.users.bmks.*; import gplx.xowa.specials.mgrs.*; import gplx.xowa.addons.wikis.searchs.specials.*; import gplx.xowa.wikis.pages.*; public class Xow_special_mgr { @@ -75,9 +75,9 @@ public class Xow_special_mgr { for (int i = 0; i < len; ++i) { Xow_special_page proto = special_regy.Get_at(i); Xow_special_meta proto_meta = proto.Special__meta(); - hash.Add_if_dupe_use_1st(proto_meta.Key_bry(), proto); + hash.AddIfDupeUse1st(proto_meta.Key_bry(), proto); for (byte[] alias : proto_meta.Aliases()) - hash.Add_if_dupe_use_1st(alias, proto); + hash.AddIfDupeUse1st(alias, proto); } // add lang's special aliases to hash table; EX: Special:Recherche @@ -88,7 +88,7 @@ public class Xow_special_mgr { Xow_special_page page = (Xow_special_page)hash.Get_by_bry(lang_itm.Special()); if (page == null) continue; // NOTE: ignore specials that are not in XOWA; EX: Special:ChangeEmail for (byte[] alias : lang_itm.Aliases()) - hash.Add_if_dupe_use_1st(alias, page); + hash.AddIfDupeUse1st(alias, page); } } public void Special__gen(Xoa_app app, Xow_wiki wiki, Xoa_page page, Xoa_url url, Xoa_ttl ttl) { @@ -102,7 +102,7 @@ public class Xow_special_mgr { if (special != null) { // special found; generate it; // check safelisted pages; DATE:2017-07-22 Hash_adp safelist = app.Special_regy().Safelist_pages(); - if (safelist.Count() > 0) { // safelist pages enabled + if (safelist.Len() > 0) { // safelist pages enabled if (!safelist.Has(special_name)) { byte[] safelist_failed = Bry_.new_u8("This special page is not listed in the special_pages safelist. Re-run XOWA and list it in the command-line arguments similar to this: \"--http_server.special_pages_safelist " + String_.new_u8(special_name) + "\""); Xopage_html_data page_data = new Xopage_html_data(special.Special__meta().Display_ttl(), safelist_failed); diff --git a/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java b/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java index e5f8fac61..436b60139 100644 --- a/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java +++ b/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java @@ -14,7 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.specials.allPages; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; -import org.junit.*; import gplx.core.net.*; import gplx.core.net.qargs.*; import gplx.xowa.wikis.data.tbls.*; +import org.junit.*; +import gplx.core.net.qargs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.tdbs.hives.*; public class Xows_page_allpages_tst { @@ -181,8 +182,8 @@ class Xows_page_allpages_fxt { if (expd_ttls != null) Tfds.Eq_ary_str(expd_ttls, Xto_str_ary(wiki, allpages.Rslt_list_ttls())); if (expd_nxt != null) Tfds.Eq(expd_nxt, Xto_str(wiki, allpages.Rslt_nxt())); if (expd_prv != null) Tfds.Eq(expd_prv, Xto_str(wiki, allpages.Rslt_prv())); - if (expd_args.Count() > 0) { - Gfo_qarg_itm[] expd_args_ary = (Gfo_qarg_itm[])expd_args.To_ary(Gfo_qarg_itm.class); + if (expd_args.Len() > 0) { + Gfo_qarg_itm[] expd_args_ary = (Gfo_qarg_itm[])expd_args.ToAry(Gfo_qarg_itm.class); Tfds.Eq_ary_str(Xto_str_ary(expd_args_ary), Xto_str_ary(init_url.Qargs_ary())); } return this; @@ -195,7 +196,7 @@ class Xows_page_allpages_fxt { } private void Exec_build() { if (allpages.Itms_per_page() != init_itms_per_page) allpages.Itms_per_page_(init_itms_per_page); - init_url.Qargs_ary_((Gfo_qarg_itm[])init_args.To_ary(Gfo_qarg_itm.class)); + init_url.Qargs_ary_((Gfo_qarg_itm[])init_args.ToAry(Gfo_qarg_itm.class)); init_args.Clear(); Xoa_ttl init_ttl = Make_init_ttl(); allpages.Build_data(init_url, init_ttl); diff --git a/400_xowa/src/gplx/xowa/specials/mgrs/Xoa_special_regy.java b/400_xowa/src/gplx/xowa/specials/mgrs/Xoa_special_regy.java index e930c9a13..c2ac52d7b 100644 --- a/400_xowa/src/gplx/xowa/specials/mgrs/Xoa_special_regy.java +++ b/400_xowa/src/gplx/xowa/specials/mgrs/Xoa_special_regy.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.specials.mgrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; +package gplx.xowa.specials.mgrs; import gplx.*; import gplx.xowa.specials.*; public class Xoa_special_regy { private final Ordered_hash hash = Ordered_hash_.New_bry(); // NOTE: case-sensitive; case-insensitive requires lang, but regy is at app level public Hash_adp_bry Safelist_pages() {return safelist_pages;} private final Hash_adp_bry safelist_pages = Hash_adp_bry.ci_u8(gplx.xowa.langs.cases.Xol_case_mgr_.U8()); public int Len() {return hash.Len();} public Xow_special_page Get_at(int i) {return (Xow_special_page)hash.Get_at(i);} - public Xow_special_page Get_by_or_null(byte[] key) {return (Xow_special_page)hash.Get_by(key);} + public Xow_special_page Get_by_or_null(byte[] key) {return (Xow_special_page)hash.GetByOrNull(key);} public void Add(Xow_special_page page) { hash.Add(page.Special__meta().Key_bry(), page); byte[][] aliases = page.Special__meta().Aliases(); diff --git a/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java b/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java index 1af38b759..8278c9b0d 100644 --- a/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java +++ b/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java @@ -14,7 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.specials.movePage; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; -import gplx.core.primitives.*; import gplx.core.brys.fmtrs.*; import gplx.core.net.*; import gplx.core.net.qargs.*; import gplx.xowa.wikis.data.tbls.*; +import gplx.core.primitives.*; import gplx.core.brys.fmtrs.*; +import gplx.core.net.qargs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.htmls.hrefs.*; import gplx.xowa.wikis.nss.*; @@ -154,7 +155,7 @@ class Move_url_args { int args_len = args.length; for (int i = 0; i < args_len; i++) { Gfo_qarg_itm arg = args[i]; - Object tid_obj = arg_keys.Get_by(arg.Key_bry()); + Object tid_obj = arg_keys.GetByOrNull(arg.Key_bry()); byte[] val_bry = arg.Val_bry(); if (tid_obj != null) { switch (((Byte_obj_val)tid_obj).Val()) { diff --git a/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java b/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java index 8e94a75bd..15e8a8491 100644 --- a/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java @@ -1,18 +1,18 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.specials.nearby; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*; @@ -38,7 +38,7 @@ public class Nearby_mgr implements Xow_special_page { form_fmtr.Bld_bfr_many(tmp_bfr); List_adp list = Find_from_to(wiki, Bry_.new_a7("Earth"), Bry_.new_a7("Atom"), excluded); tmp_bfr.Add_str_a7(""); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Nearby_rslt rslt = (Nearby_rslt)list.Get_at(i); tmp_bfr.Add_str_a7(""); @@ -83,7 +83,7 @@ public class Nearby_mgr implements Xow_special_page { return results; } private void Examine_page(Ordered_hash src_pool){ - int len = src_pool.Count(); + int len = src_pool.Len(); Ordered_hash next_pool = Ordered_hash_.New_bry(); for (int i = 0; i < len; i++) { Nearby_itmx itmx = (Nearby_itmx)src_pool.Get_at(i); @@ -102,7 +102,7 @@ public class Nearby_mgr implements Xow_special_page { results.Add(new Nearby_rslt(itmx.Trail(), trg_ttl)); if (results_cur == results_max) return; } - int lnkis_len = lnkis.Count(); + int lnkis_len = lnkis.Len(); for (int j = 0; j < lnkis_len; j++) { Xoa_ttl lnki_ttl = (Xoa_ttl)lnkis.Get_at(j); if (next_pool.Has(lnki_ttl.Page_db())) continue; @@ -110,7 +110,7 @@ public class Nearby_mgr implements Xow_special_page { next_pool.Add(lnki_ttl.Page_db(), next_itmx); } } - if (next_pool.Count() > 0) + if (next_pool.Len() > 0) Examine_page(next_pool); // ++pages_count; // wiki.Parser_mgr().Parse(page, true); @@ -173,20 +173,20 @@ public class Nearby_mgr implements Xow_special_page { } class Nearby_rslt { public Nearby_rslt(List_adp trail, Xoa_ttl trg_ttl) { - int len = trail.Count(); + int len = trail.Len(); for (int i = 0; i < len; i++) { Xoa_ttl ttl = (Xoa_ttl)trail.Get_at(i); list.Add(ttl); } list.Add(trg_ttl); } - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Xoa_ttl Get_at(int i) {return (Xoa_ttl)list.Get_at(i);} List_adp list = List_adp_.New(); } class Nearby_itmx { public Nearby_itmx(List_adp v, Xoa_ttl ttl) { - int len = v.Count(); + int len = v.Len(); for (int i = 0; i < len; i++) { Xoa_ttl v_ttl = (Xoa_ttl)v.Get_at(i); trail.Add(v_ttl); diff --git a/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr_tst.java b/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr_tst.java index 12dc46f05..a762e1e73 100644 --- a/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.specials.nearby; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; +package gplx.xowa.specials.nearby; import gplx.*; import gplx.xowa.*; import org.junit.*; public class Nearby_mgr_tst { @Before public void init() {fxt.Clear();} Nearby_mgr_fxt fxt = new Nearby_mgr_fxt(); @@ -59,7 +59,7 @@ class Nearby_mgr_fxt { Tfds.Eq_ary(String_.SplitLines_nl(Xto_str(actl)), expd); } String Xto_str(List_adp list) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Nearby_rslt rslt = (Nearby_rslt)list.Get_at(i); int ttls = rslt.Len(); diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java index cd9c06713..95d022ab3 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java +++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Db_rdr_utl.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.core.stores.*; import gplx.dbs.*; import gplx.dbs.engines.mems.*; @@ -21,7 +21,7 @@ public class Db_rdr_utl { public static void Load_and_write(Db_conn conn, String sql, Bry_bfr bfr) { Write_to_bfr(bfr, Load(conn, sql)); } - public static Mem_qry_set Load_as_qry_set(Db_conn conn, Dbmeta_fld_list fld_list, String sql) { + public static Mem_qry_set Load_as_qry_set(Db_conn conn, DbmetaFldList fld_list, String sql) { Mem_qry_set qry_set = new Mem_qry_set(); DataRdr rdr = conn.Exec_sql_as_old_rdr(sql); try { @@ -29,7 +29,7 @@ public class Db_rdr_utl { while (rdr.MoveNextPeer()) { Mem_row row = new Mem_row(); for (int i = 0; i < fld_count; ++i) - row.Add(fld_list.Get_at(i).Name(), rdr.ReadAt(i)); + row.Add(fld_list.GetAt(i).Name(), rdr.ReadAt(i)); qry_set.Add(row); } } @@ -54,7 +54,7 @@ public class Db_rdr_utl { finally { rdr.Rls(); } - return (Object[][])list.To_ary_and_clear(Object[].class); + return (Object[][])list.ToAryAndClear(Object[].class); } public static void Write_to_bfr(Bry_bfr bfr, Object[][] rows, int... skip) { int rows_len = rows.length; diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java index 52bcecd00..b6a81b6e3 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java +++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__fs_check.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*; -import gplx.core.ios.*; import gplx.core.net.*; import gplx.core.net.qargs.*; +package gplx.xowa.specials.xowa.diags; import gplx.*; import gplx.xowa.*; +import gplx.core.ios.*; +import gplx.core.net.qargs.*; import gplx.fsdb.meta.*; -import gplx.xowa.apps.urls.*; class Xows_cmd__fs_check { public void Exec(Bry_bfr bfr, Xoa_app app, Xoa_url url, Gfo_qarg_mgr_old arg_hash) { byte[] dir_bry = arg_hash.Get_val_bry_or(Arg_dir, null); @@ -38,14 +38,14 @@ class Xows_cmd__fs_check { bfr.Add_byte_nl().Add_str_a7("scanning: ").Add_str_u8(dir_url.Raw()).Add_byte_nl(); if (!Io_mgr.Instance.ExistsDir(dir_url)) return; IoItmDir dir_itm = Io_mgr.Instance.QueryDir_args(dir_url).Recur_(false).DirInclude_(true).ExecAsDir(); - IoItmList sub_itms = dir_itm.SubDirs(); int len = sub_itms.Count(); + IoItmList sub_itms = dir_itm.SubDirs(); int len = sub_itms.Len(); for (int i = 0; i < len; ++i) { try { IoItmDir sub_itm = (IoItmDir)sub_itms.Get_at(i); bfr.Add_str_a7("dir").Add_byte_pipe().Add_str_u8(sub_itm.Name()).Add_byte_nl(); } catch (Exception e) {bfr.Add_str_u8(Err_.Message_gplx_full(e));} } - sub_itms = dir_itm.SubFils(); len = sub_itms.Count(); + sub_itms = dir_itm.SubFils(); len = sub_itms.Len(); for (int i = 0; i < len; ++i) { try { IoItmFil sub_itm = (IoItmFil)sub_itms.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java b/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java index 6f8d835bc..3381c4c40 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java +++ b/400_xowa/src/gplx/xowa/specials/xowa/popup_history/Popup_history_page.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.specials.xowa.popup_history; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.specials.xowa.popup_history; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.htmls.modules.popups.*; public class Popup_history_page implements Xow_special_page { @@ -22,7 +22,7 @@ public class Popup_history_page implements Xow_special_page { Xowe_wiki wiki = (Xowe_wiki)wikii; Xoae_page page = (Xoae_page)pagei; Xoae_page cur_page = wiki.Appe().Gui_mgr().Browser_win().Active_page(); if (cur_page == null) return; Ordered_hash hash = cur_page.Popup_mgr().Itms(); - int len = hash.Count(); + int len = hash.Len(); Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_k004(); for (int i = len - 1; i > -1; --i) { Xow_popup_itm itm = (Xow_popup_itm)hash.Get_at(i); 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 f20ce9a34..a7f2d1a82 100644 --- a/400_xowa/src/gplx/xowa/users/Xou_user_mgr.java +++ b/400_xowa/src/gplx/xowa/users/Xou_user_mgr.java @@ -19,7 +19,7 @@ public class Xou_user_mgr implements Gfo_invk { 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);} - private Xoue_user GetByKey(String key) {return (Xoue_user)regy.Get_by(key);} + private Xoue_user GetByKey(String key) {return (Xoue_user)regy.GetByOrNull(key);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_get)) { diff --git a/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_dir_tbl.java b/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_dir_tbl.java index 1ac36ad1c..6d1d91378 100644 --- a/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_dir_tbl.java +++ b/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_dir_tbl.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.bmks; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; +package gplx.xowa.users.bmks; import gplx.*; +import gplx.dbs.*; public class Xoud_bmk_dir_tbl implements Rls_able { - private final String tbl_name = "bmk_dir"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "bmk_dir"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_owner, fld_sort, fld_name; public Xoud_bmk_dir_tbl(Db_conn conn) { this.conn = conn; - fld_id = flds.Add_int_pkey_autonum("dir_id"); - fld_owner = flds.Add_int("dir_owner"); - fld_sort = flds.Add_int("dir_sort"); - fld_name = flds.Add_str("dir_name", 255); + fld_id = flds.AddIntPkeyAutonum("dir_id"); + fld_owner = flds.AddInt("dir_owner"); + fld_sort = flds.AddInt("dir_sort"); + fld_name = flds.AddStr("dir_name", 255); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; public String Tbl_name() {return tbl_name;} - public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds.To_fld_ary()));} + public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds.ToFldAry()));} public void Insert(int owner, int sort, byte[] name) { Db_stmt stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_insert.Clear() diff --git a/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java b/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java index 6f669b99b..ba16091ec 100644 --- a/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java +++ b/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java @@ -13,26 +13,26 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.bmks; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; +package gplx.xowa.users.bmks; import gplx.*; +import gplx.dbs.*; public class Xoud_bmk_itm_tbl implements Rls_able { - private final String tbl_name = "bmk_itm"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "bmk_itm"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_owner, fld_sort, fld_name, fld_wiki, fld_url, fld_comment; private Db_stmt stmt_update_sort; public Xoud_bmk_itm_tbl(Db_conn conn) { this.conn = conn; - fld_id = flds.Add_int_pkey_autonum("itm_id"); - fld_owner = flds.Add_int("itm_owner"); - fld_sort = flds.Add_int("itm_sort"); - fld_name = flds.Add_str("itm_name" , 255); - fld_wiki = flds.Add_str("itm_wiki" , 255); - fld_url = flds.Add_str("itm_url" , 1024); - fld_comment = flds.Add_str("itm_comment" , 4096); + fld_id = flds.AddIntPkeyAutonum("itm_id"); + fld_owner = flds.AddInt("itm_owner"); + fld_sort = flds.AddInt("itm_sort"); + fld_name = flds.AddStr("itm_name" , 255); + fld_wiki = flds.AddStr("itm_wiki" , 255); + fld_url = flds.AddStr("itm_url" , 1024); + fld_comment = flds.AddStr("itm_comment" , 4096); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; public String Tbl_name() {return tbl_name;} - public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds.To_fld_ary()));} + public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds.ToFldAry()));} public void Insert(int owner, int sort, byte[] name, byte[] wiki, byte[] url, byte[] comment) { Db_stmt stmt_insert = conn.Stmt_insert(tbl_name, flds); stmt_insert.Clear() @@ -66,7 +66,7 @@ public class Xoud_bmk_itm_tbl implements Rls_able { list.Add(new_row(rdr)); } finally {rdr.Rls();} - return (Xoud_bmk_itm_row[])list.To_ary_and_clear(Xoud_bmk_itm_row.class); + return (Xoud_bmk_itm_row[])list.ToAryAndClear(Xoud_bmk_itm_row.class); } public int Select_sort_next(int owner) { Db_rdr rdr = conn.Stmt_select_max(tbl_name, fld_sort, fld_owner).Crt_int(fld_owner, owner).Exec_select__rls_manual(); diff --git a/400_xowa/src/gplx/xowa/users/cfgs/Xocfg_meta_tbl.java b/400_xowa/src/gplx/xowa/users/cfgs/Xocfg_meta_tbl.java index e874b6a50..3673e9177 100644 --- a/400_xowa/src/gplx/xowa/users/cfgs/Xocfg_meta_tbl.java +++ b/400_xowa/src/gplx/xowa/users/cfgs/Xocfg_meta_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.cfgs; import gplx.*; import gplx.dbs.*; public class Xocfg_meta_tbl implements Rls_able { - private final String tbl_name; public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name; public final DbmetaFldList flds = new DbmetaFldList(); private final String fld_key, fld_type, fld_dflt, fld_version; private final Db_conn conn; public Xocfg_meta_tbl(Db_conn conn) { this.conn = conn; tbl_name = Tbl_name; - fld_key = flds.Add_str_pkey ("cfg_key" , 1024); // EX: "xowa.net.web_enabled" - fld_type = flds.Add_str ("cfg_type" , 255); // EX: "yn" - fld_dflt = flds.Add_str ("cfg_dflt" , 1024); // EX: "n" - fld_version = flds.Add_str ("cfg_version" , 16); // EX: "v1.1.1.1" + fld_key = flds.AddStrPkey("cfg_key" , 1024); // EX: "xowa.net.web_enabled" + fld_type = flds.AddStr("cfg_type" , 255); // EX: "yn" + fld_dflt = flds.AddStr("cfg_dflt" , 1024); // EX: "n" + fld_version = flds.AddStr("cfg_version" , 16); // EX: "v1.1.1.1" } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} public void Insert(String key, String type, String dflt, String version) { diff --git a/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_mgr.java b/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_mgr.java index 11574e005..4065a3082 100644 --- a/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_mgr.java +++ b/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.cfgs; import gplx.*; import gplx.dbs.*; public class Xou_cfg_mgr { private Xou_cfg_tbl tbl; @@ -27,7 +27,7 @@ public class Xou_cfg_mgr { public String Get_app_str_or(String key, String or) { // NOTE: app-level is always loaded at start; don't check db synchronized (hash) { // LOCK:app-level String uid = Bld_uid(tmp_bfr, Usr__anonymous, Ctx__app, key); - Xou_cfg_itm itm = (Xou_cfg_itm)hash.Get_by(uid); + Xou_cfg_itm itm = (Xou_cfg_itm)hash.GetByOrNull(uid); return itm == null ? or : itm.Val(); } } @@ -37,7 +37,7 @@ public class Xou_cfg_mgr { // update val in reg String uid = Bld_uid(tmp_bfr, Usr__anonymous, Ctx__app, key); boolean insert = false; - Xou_cfg_itm itm = (Xou_cfg_itm)hash.Get_by(uid); + Xou_cfg_itm itm = (Xou_cfg_itm)hash.GetByOrNull(uid); if (itm == null) { itm = new Xou_cfg_itm(Usr__anonymous, Ctx__app, key, val); hash.Add(uid, itm); diff --git a/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_tbl.java b/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_tbl.java index a856c770c..a96d63cc6 100644 --- a/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_tbl.java +++ b/400_xowa/src/gplx/xowa/users/cfgs/Xou_cfg_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.cfgs; import gplx.*; import gplx.dbs.*; public class Xou_cfg_tbl implements Db_tbl { - public final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + public final DbmetaFldList flds = new DbmetaFldList(); private final String fld_key, fld_usr, fld_ctx, fld_val; public Xou_cfg_tbl(Db_conn conn) { this.conn = conn; - this.fld_usr = flds.Add_int ("cfg_usr"); // EX: 1=anonymous; others will require usr_regy - this.fld_ctx = flds.Add_str ("cfg_ctx", 1024); // EX: "app"; "en.w" - this.fld_key = flds.Add_str ("cfg_key", 1024); // EX: "xowa.net.web_enabled" - this.fld_val = flds.Add_str ("cfg_val", 4096); // EX: "y" + this.fld_usr = flds.AddInt("cfg_usr"); // EX: 1=anonymous; others will require usr_regy + this.fld_ctx = flds.AddStr("cfg_ctx", 1024); // EX: "app"; "en.w" + this.fld_key = flds.AddStr("cfg_key", 1024); // EX: "xowa.net.web_enabled" + this.fld_val = flds.AddStr("cfg_val", 4096); // EX: "y" conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; @@ -58,7 +58,7 @@ public class Xou_cfg_tbl implements Db_tbl { list.Add(Make_itm(rdr)); } } finally {rdr.Rls();} - return (Xou_cfg_itm[])list.To_ary_and_clear(Xou_cfg_itm.class); + return (Xou_cfg_itm[])list.ToAryAndClear(Xou_cfg_itm.class); } public void Rls() {} diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java b/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java index fc9755c1e..43066f9fc 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java +++ b/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.data; import gplx.*; import gplx.core.btries.*; import gplx.core.primitives.*; import gplx.xowa.langs.*; import gplx.xowa.wikis.domains.*; @@ -42,7 +42,7 @@ class Xoud_opt_scope_parser { list.Add(itm); pos = comma_pos + 1; } - return (Xoud_opt_scope[])list.To_ary_and_clear(Xoud_opt_scope.class); + return (Xoud_opt_scope[])list.ToAryAndClear(Xoud_opt_scope.class); } public Xoud_opt_scope Parse_itm(byte[] src, int bgn, int end) { int lang_dot = Bry_find_.Find_fwd(src, Byte_ascii.Dot, bgn, end); if (lang_dot == Bry_find_.Not_found) return Warn("scope.parse.missing_lang_dot: src=~{0}", src, bgn, end); diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_site_tbl.java b/400_xowa/src/gplx/xowa/users/data/Xoud_site_tbl.java index def95a8a9..9c4437421 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_site_tbl.java +++ b/400_xowa/src/gplx/xowa/users/data/Xoud_site_tbl.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.data; import gplx.*; import gplx.dbs.*; public class Xoud_site_tbl implements Rls_able { public static final String Tbl_name = "user_site"; - private final String tbl_name = Tbl_name; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = Tbl_name; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_site_id, fld_site_priority, fld_site_domain, fld_site_name, fld_site_path, fld_site_xtn, fld_site_date; private final Db_conn conn; public Xoud_site_tbl(Db_conn conn) { this.conn = conn; - fld_site_id = flds.Add_int_pkey("site_id"); - fld_site_priority = flds.Add_int("site_priority"); // EX: 0=default; 1+ is order if 0 is unavailable - fld_site_domain = flds.Add_str("site_domain", 255); // EX: en.wikipedia.org; NOTE: no protocol (https:) - fld_site_name = flds.Add_str("site_name", 255); // EX: English Wikipedia - fld_site_path = flds.Add_str("site_path", 255); // EX: ~{xowa_root}/wiki/en.wikipedia.org/ - fld_site_date = conn.Meta_fld_append_if_missing(tbl_name, flds, Dbmeta_fld_itm.new_str("site_date", 255).Default_("")); // EX: 2016-06-10 - fld_site_xtn = flds.Add_text("site_xtn"); + fld_site_id = flds.AddIntPkey("site_id"); + fld_site_priority = flds.AddInt("site_priority"); // EX: 0=default; 1+ is order if 0 is unavailable + fld_site_domain = flds.AddStr("site_domain", 255); // EX: en.wikipedia.org; NOTE: no protocol (https:) + fld_site_name = flds.AddStr("site_name", 255); // EX: English Wikipedia + fld_site_path = flds.AddStr("site_path", 255); // EX: ~{xowa_root}/wiki/en.wikipedia.org/ + fld_site_date = conn.Meta_fld_append_if_missing(tbl_name, flds, DbmetaFldItm.NewStr("site_date", 255).DefaultValSet("")); // EX: 2016-06-10 + fld_site_xtn = flds.AddText("site_xtn"); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} @@ -54,7 +54,7 @@ public class Xoud_site_tbl implements Rls_able { try { while (rdr.Move_next()) rv.Add(New_site(rdr)); - return (Xoud_site_row[])rv.To_ary_and_clear(Xoud_site_row.class); + return (Xoud_site_row[])rv.ToAryAndClear(Xoud_site_row.class); } finally {rdr.Rls();} } diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java b/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java index ce37a7e03..063f0421d 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java +++ b/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.data; import gplx.*; import gplx.dbs.*; class Xoud_user_mgr { private Xoud_user_tbl tbl = new Xoud_user_tbl(); @@ -28,13 +28,13 @@ class Xoud_user_mgr { } } class Xoud_user_tbl { - private String tbl_name = "user_user_regy"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private String tbl_name = "user_user_regy"; private final DbmetaFldList flds = new DbmetaFldList(); private String fld_id, fld_name; private Db_conn conn; public void Conn_(Db_conn new_conn, boolean created) { this.conn = new_conn; flds.Clear(); - fld_id = flds.Add_int_pkey("id"); - fld_name = flds.Add_str("name", 255); + fld_id = flds.AddIntPkey("id"); + fld_name = flds.AddStr("name", 255); if (created) { Dbmeta_tbl_itm meta = Dbmeta_tbl_itm.New(tbl_name, flds , Dbmeta_idx_itm.new_unique_by_tbl(tbl_name, "name", fld_name) @@ -56,7 +56,7 @@ class Xoud_user_tbl { } public int Select_id_next() { int rv = 1; - Db_rdr rdr = conn.Stmt_select(tbl_name, flds, Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = conn.Stmt_select(tbl_name, flds, DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); try { while (rdr.Move_next()) { int cur = rdr.Read_int(fld_id); diff --git a/400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java b/400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java index a604769a8..e8636a9e0 100644 --- a/400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java +++ b/400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java @@ -13,10 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.core.errs.*; -import gplx.langs.jsons.*; import gplx.langs.htmls.*; -import gplx.xowa.users.data.*; import gplx.xowa.users.bmks.*; +import gplx.langs.htmls.*; import gplx.xowa.htmls.bridges.*; import gplx.xowa.htmls.bridges.dbuis.*; import gplx.xowa.htmls.bridges.dbuis.tbls.*; import gplx.xowa.htmls.bridges.dbuis.fmtrs.*; public class Dbui_tbl_itm__history implements Dbui_tbl_itm { private final Xoa_app app; private final Xoud_history_tbl tbl; @@ -36,7 +35,7 @@ public class Dbui_tbl_itm__history implements Dbui_tbl_itm { private final List_adp select_list = List_adp_.New(); public void Select(Bry_bfr bfr, int top) { tbl.Select_by_top(select_list, 100); - Xoud_history_row[] db_rows = (Xoud_history_row[])select_list.To_ary_and_clear(Xoud_history_row.class); + Xoud_history_row[] db_rows = (Xoud_history_row[])select_list.ToAryAndClear(Xoud_history_row.class); Xow_wiki usr_wiki = app.User().Wikii(); byte[] option_link = usr_wiki.Html__lnki_bldr().Href_(Bry_.new_a7("home"), usr_wiki.Ttl_parse(Bry_.new_a7("Options/PageHistory"))).Img_16x16(gplx.xowa.htmls.core.htmls.utls.Xoh_img_path.Img_option).Bld_to_bry();// HOME byte[] delete_confirm_msg = app.Api_root().Usr().Bookmarks().Delete_confirm() ? Msg__delete_confirm : Bry_.Empty; diff --git a/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java b/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java index b03383b4f..bee3d299b 100644 --- a/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java +++ b/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; -import gplx.core.primitives.*; import gplx.core.net.*; import gplx.core.net.qargs.*; import gplx.xowa.htmls.hrefs.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; +import gplx.core.primitives.*; +import gplx.core.net.qargs.*; import gplx.xowa.htmls.hrefs.*; public class Xou_history_mgr implements Gfo_invk { private final Xou_history_html html_mgr = new Xou_history_html(); private Xou_history_sorter sorter = new Xou_history_sorter().Sort_fld_(Xou_history_itm.Fld_view_end).Ascending_(false); private final Io_url history_fil; @@ -29,19 +30,19 @@ public class Xou_history_mgr implements Gfo_invk { app.Cfg().Bind_many_app(this, Cfg__enabled, Cfg__log_all); } public boolean Enabled() {return enabled;} private boolean enabled = true; - public int Len() {return itms.Count();} + public int Len() {return itms.Len();} public void Clear() {itms.Clear();} public Xou_history_itm Get_at(int i) {return (Xou_history_itm)itms.Get_at(i);} public String Get_at_last() { if (!load_chk) Load(); - int len = itms.Count(); if (len == 0) return String_.new_a7(Xoa_page_.Main_page_bry); // if no history, return Main_page (which should go to home/wiki/Main_page) + int len = itms.Len(); if (len == 0) return String_.new_a7(Xoa_page_.Main_page_bry); // if no history, return Main_page (which should go to home/wiki/Main_page) Xou_history_itm itm = (Xou_history_itm)itms.Get_at(0); return String_.new_u8(Bry_.Add(itm.Wiki(), Xoh_href_.Bry__wiki, itm.Page())); } public Xou_history_itm Get_or_null(byte[] wiki, byte[] page) { if (!load_chk) Load(); byte[] key = Xou_history_itm.key_(wiki, page); - return (Xou_history_itm)itms.Get_by(key); + return (Xou_history_itm)itms.GetByOrNull(key); } public boolean Has(byte[] wiki, byte[] page) { if (!load_chk) Load(); @@ -65,7 +66,7 @@ public class Xou_history_mgr implements Gfo_invk { if (gplx.xowa.users.history.Xoud_history_mgr.Skip_history(ttl)) return; if (!load_chk) Load(); byte[] key = Xou_history_itm.key_(url.Wiki_bry(), page_ttl); - Xou_history_itm itm = (Xou_history_itm)itms.Get_by(key); + Xou_history_itm itm = (Xou_history_itm)itms.GetByOrNull(key); if (itm == null) { itm = new Xou_history_itm(url.Wiki_bry(), To_full_db_w_qargs(url, ttl)); itms.Add(key, itm); @@ -91,7 +92,7 @@ public class Xou_history_mgr implements Gfo_invk { } public void Save(Xoae_app app) { if (!load_chk) return; // nothing loaded; nothing to save - int itms_len = itms.Count(); + int itms_len = itms.Len(); if (itms_len == 0) return; // no items; occurs when history disable; itms.Sort_by(sorter); if (itms_len > current_itms_max) itms = Archive(app); @@ -105,11 +106,11 @@ public class Xou_history_mgr implements Gfo_invk { Ordered_hash archive_itms = Ordered_hash_.New_bry(); // iterate over all itms - int itms_len = itms.Count(); + int itms_len = itms.Len(); for (int i = 0; i < itms_len; i++) { Xou_history_itm itm = (Xou_history_itm)itms.Get_at(i); Ordered_hash itms_hash = (i < current_itms_reset) ? current_itms : archive_itms; // if < cutoff, add to current file; else add to archive - itms_hash.Add_if_dupe_use_nth(itm.Key(), itm); // NOTE: dupes should not exist, but if they do, ignore it; else app won't close on first time; DATE:2016-07-14 + itms_hash.AddIfDupeUseNth(itm.Key(), itm); // NOTE: dupes should not exist, but if they do, ignore it; else app won't close on first time; DATE:2016-07-14 } // save archive @@ -146,7 +147,7 @@ class Xou_history_itm_srl { if (pos.Val() == aryLen) break; Xou_history_itm itm = Xou_history_itm.csv_(ary, pos); byte[] key = itm.Key(); - Xou_history_itm existing = (Xou_history_itm)list.Get_by(key); + Xou_history_itm existing = (Xou_history_itm)list.GetByOrNull(key); if (existing == null) // new itm; add list.Add(itm.Key(), itm); else // existing itm; update @@ -157,7 +158,7 @@ class Xou_history_itm_srl { } public static byte[] Save(Ordered_hash list) { Bry_bfr bb = Bry_bfr_.New(); - int listLen = list.Count(); + int listLen = list.Len(); for (int i = 0; i < listLen; i++) ((Xou_history_itm)list.Get_at(i)).Save(bb); return bb.To_bry(); diff --git a/400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java b/400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java index 3639af728..8ae753a2e 100644 --- a/400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java +++ b/400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.dbs.metas.*; import gplx.dbs.metas.updates.*; +package gplx.xowa.users.history; import gplx.*; +import gplx.dbs.*; import gplx.dbs.qrys.*; public class Xoud_history_tbl implements Rls_able { - private final String tbl_name = "user_history"; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name = "user_history"; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_wiki, fld_url, fld_time, fld_count; private final Db_conn conn; private Db_stmt stmt_select_by_page, stmt_select_by_top, stmt_insert, stmt_update, stmt_delete; public Xoud_history_tbl(Db_conn conn) { this.conn = conn; - fld_id = flds.Add_int_pkey_autonum("hist_id"); - fld_wiki = flds.Add_str("hist_wiki", 255); - fld_url = flds.Add_str("hist_url", 255); - fld_time = flds.Add_str("hist_time", 20); - fld_count = flds.Add_int("hist_count"); + fld_id = flds.AddIntPkeyAutonum("hist_id"); + fld_wiki = flds.AddStr("hist_wiki", 255); + fld_url = flds.AddStr("hist_url", 255); + fld_time = flds.AddStr("hist_time", 20); + fld_count = flds.AddInt("hist_count"); stmt_insert = stmt_update = stmt_delete = stmt_select_by_page = stmt_select_by_top = null; conn.Rls_reg(this); } @@ -69,7 +69,7 @@ public class Xoud_history_tbl implements Rls_able { } public void Select_by_top(List_adp rv, int count) { if (stmt_select_by_top == null) { - Db_qry__select_in_tbl qry = new Db_qry__select_in_tbl(tbl_name, flds.To_str_ary(), null, null, null, fld_time + " DESC", " LIMIT " + Int_.To_str(count)); + Db_qry__select_in_tbl qry = new Db_qry__select_in_tbl(tbl_name, flds.ToStrAry(), null, null, null, fld_time + " DESC", " LIMIT " + Int_.To_str(count)); stmt_select_by_top = conn.Stmt_new(qry); } Db_rdr rdr = stmt_select_by_top.Clear().Exec_select__rls_manual(); diff --git a/400_xowa/src/gplx/xowa/users/wikis/Xofs_url_itm_parser.java b/400_xowa/src/gplx/xowa/users/wikis/Xofs_url_itm_parser.java index 717c4b664..6995cb2c6 100644 --- a/400_xowa/src/gplx/xowa/users/wikis/Xofs_url_itm_parser.java +++ b/400_xowa/src/gplx/xowa/users/wikis/Xofs_url_itm_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.users.wikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.wikis; import gplx.*; import gplx.core.envs.*; class Xofs_url_itm { public boolean Tid_is_xowa() {return tid_is_xowa;} public void Tid_is_xowa_(boolean v) {tid_is_xowa = v;} private boolean tid_is_xowa = true; @@ -29,7 +29,7 @@ class Xofs_url_itm_parser { public void Names_add(String key_str, String val_str) { byte[] key_bry = Bry_.new_u8(key_str); byte[] val_bry = Bry_.new_u8(val_str); - names.Add_if_dupe_use_nth(key_bry, val_bry); + names.AddIfDupeUseNth(key_bry, val_bry); } public void Parse(Xofs_url_itm itm, String raw_str) { itm.Raw_(raw_str); diff --git a/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java b/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java index ea13ca7ca..e5f05117c 100644 --- a/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/Xoae_wiki_mgr.java @@ -65,11 +65,11 @@ public class Xoae_wiki_mgr implements Xoa_wiki_mgr, Gfo_invk { this.db_mgr = new Xowdir_db_mgr(app.User().User_db_mgr().Conn()); wdata_mgr.Init_by_app(); } - public int Count() {return list.Count();} + public int Count() {return list.Len();} public boolean Has(byte[] key) {return hash.Has(key);} public Xow_wiki Get_at(int idx) {return (Xow_wiki)list.Get_at(idx);} public Xowe_wiki Get_at_or_null(int i) {return Int_.Between(i, 0, this.Count() - 1) ? (Xowe_wiki)list.Get_at(i) : null;} - public Xow_wiki Get_by_or_null(byte[] key) {return Bry_.Len_eq_0(key) ? null : (Xowe_wiki)hash.Get_by(key);} + public Xow_wiki Get_by_or_null(byte[] key) {return Bry_.Len_eq_0(key) ? null : (Xowe_wiki)hash.GetByOrNull(key);} public Xow_wiki Get_by_or_make_init_y(byte[] key) { synchronized (this) { // LOCK:app-level; DATE:2016-07-06 Xowe_wiki rv = (Xowe_wiki)this.Get_by_or_null(key); if (rv == null) rv = Make_and_add(key); @@ -126,7 +126,7 @@ public class Xoae_wiki_mgr implements Xoa_wiki_mgr, Gfo_invk { public void Del(byte[] key) {hash.Del(key);} public void Clear() {hash.Clear(); list.Clear();} public void Free_mem(boolean clear_ctx) { - int list_len = list.Count(); + int list_len = list.Len(); for (int i = 0; i < list_len; i++) { Xowe_wiki wiki = (Xowe_wiki)list.Get_at(i); // wiki.Defn_cache().ReduceCache(); @@ -135,7 +135,7 @@ public class Xoae_wiki_mgr implements Xoa_wiki_mgr, Gfo_invk { } } public void Rls() { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Xowe_wiki wiki = (Xowe_wiki)list.Get_at(i); wiki.Rls(); diff --git a/400_xowa/src/gplx/xowa/wikis/Xowv_repo_mgr.java b/400_xowa/src/gplx/xowa/wikis/Xowv_repo_mgr.java index a73d92978..2b46f5581 100644 --- a/400_xowa/src/gplx/xowa/wikis/Xowv_repo_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/Xowv_repo_mgr.java @@ -17,9 +17,9 @@ package gplx.xowa.wikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.repos.*; public class Xowv_repo_mgr implements Xow_repo_mgr { private final List_adp repos = List_adp_.New(); - public Xof_repo_pair[] Repos_ary() {return (Xof_repo_pair[])repos.To_ary(Xof_repo_pair.class);} + public Xof_repo_pair[] Repos_ary() {return (Xof_repo_pair[])repos.ToAry(Xof_repo_pair.class);} public Xof_repo_pair Repos_get_by_wiki(byte[] wiki) { - int len = repos.Count(); + int len = repos.Len(); for (int i = 0; i < len; i++) { Xof_repo_pair pair = (Xof_repo_pair)repos.Get_at(i); if (Bry_.Eq(wiki, pair.Wiki_domain())) @@ -29,7 +29,7 @@ public class Xowv_repo_mgr implements Xow_repo_mgr { } public Xof_repo_pair Repos_get_at(int i) {return (Xof_repo_pair)repos.Get_at(i);} private Xof_repo_pair Repos_get_by_id(int id) { - int len = repos.Count(); + int len = repos.Len(); for (int i = 0; i < len; i++) { Xof_repo_pair pair = (Xof_repo_pair)repos.Get_at(i); if (pair.Id() == id) return pair; @@ -58,7 +58,7 @@ public class Xowv_repo_mgr implements Xow_repo_mgr { Xof_repo_itm src_repo = Add(app, wiki_root, src_repo_key), trg_repo = Add(app, wiki_root, trg_repo_key); byte[] src_wiki_key = src_repo.Wiki_domain();//, trg_wiki_key = trg_repo.Wiki_key(); // if (!Bry_.Eq(src_wiki_key, trg_wiki_key) && !Bry_.Eq(src_wiki_key, Xow_domain_tid_.Bry__home)) throw Err_mgr.Instance.fmt_(GRP_KEY, "add_repo", "wiki keys do not match: ~{0} ~{1}", String_.new_u8(src_wiki_key), String_.new_u8(trg_wiki_key)); - Xof_repo_pair pair = new Xof_repo_pair((byte)repos.Count(), src_wiki_key, src_repo, trg_repo); + Xof_repo_pair pair = new Xof_repo_pair((byte)repos.Len(), src_wiki_key, src_repo, trg_repo); repos.Add(pair); return pair; } diff --git a/400_xowa/src/gplx/xowa/wikis/caches/Xow_cache_mgr.java b/400_xowa/src/gplx/xowa/wikis/caches/Xow_cache_mgr.java index 7b5719c96..0543e3d4f 100644 --- a/400_xowa/src/gplx/xowa/wikis/caches/Xow_cache_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/caches/Xow_cache_mgr.java @@ -61,7 +61,7 @@ public class Xow_cache_mgr { Keyval kv = Keyval_.new_(String_.new_u8(itm.Key()), String_.new_u8(itm.Name())); list.Add(kv); } - scrib_lang_names = (Keyval[])list.To_ary(Keyval.class); + scrib_lang_names = (Keyval[])list.ToAry(Keyval.class); } return scrib_lang_names; } diff --git a/400_xowa/src/gplx/xowa/wikis/data/Xow_db_file_hash.java b/400_xowa/src/gplx/xowa/wikis/data/Xow_db_file_hash.java index 356877f71..445269a62 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/Xow_db_file_hash.java +++ b/400_xowa/src/gplx/xowa/wikis/data/Xow_db_file_hash.java @@ -13,15 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +package gplx.xowa.wikis.data; import gplx.*; class Xow_db_file_hash { private final Ordered_hash hash = Ordered_hash_.New(); public int Count_total() {return count_total;} private int count_total; public void Clear() {hash.Clear(); count_total = 0;} - public Ordered_hash Get_by_tid_or_null(byte tid) {return (Ordered_hash)hash.Get_by(tid);} + public Ordered_hash Get_by_tid_or_null(byte tid) {return (Ordered_hash)hash.GetByOrNull(tid);} public void Add_or_new(Xow_db_file file) { byte tid = file.Tid(); - Ordered_hash tids = (Ordered_hash)hash.Get_by(tid); + Ordered_hash tids = (Ordered_hash)hash.GetByOrNull(tid); if (tids == null) { tids = Ordered_hash_.New(); hash.Add(tid, tids); @@ -30,14 +30,14 @@ class Xow_db_file_hash { ++count_total; } public void Del(Xow_db_file file) { - Ordered_hash tids = (Ordered_hash)hash.Get_by(file.Tid()); + Ordered_hash tids = (Ordered_hash)hash.GetByOrNull(file.Tid()); if (tids == null) throw Err_.new_wo_type("unknown file.tid", "url", file.Url()); if (!tids.Has(file.Id())) throw Err_.new_wo_type("unknown file.id", "url", file.Url()); tids.Del(file.Id()); --count_total; } public int Count_of_tid(byte tid) { - Ordered_hash tids = (Ordered_hash)hash.Get_by(tid); - return tids == null ? 0 : tids.Count(); + Ordered_hash tids = (Ordered_hash)hash.GetByOrNull(tid); + return tids == null ? 0 : tids.Len(); } } diff --git a/400_xowa/src/gplx/xowa/wikis/data/Xow_db_mgr.java b/400_xowa/src/gplx/xowa/wikis/data/Xow_db_mgr.java index 0c8ce5825..7094d9210 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/Xow_db_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/data/Xow_db_mgr.java @@ -94,8 +94,8 @@ public class Xow_db_mgr { public int Dbs__len() {return hash_by_id.Len();} public Xow_db_file Dbs__get_at(int i) {return (Xow_db_file)hash_by_id.Get_at(i);} - public Xow_db_file Dbs__get_by_id_or_fail(int id) {return (Xow_db_file)hash_by_id.Get_by_or_fail(id);} - public Xow_db_file Dbs__get_by_id_or_null(int id) {return (Xow_db_file)hash_by_id.Get_by(id);} + public Xow_db_file Dbs__get_by_id_or_fail(int id) {return (Xow_db_file)hash_by_id.GetByOrFail(id);} + public Xow_db_file Dbs__get_by_id_or_null(int id) {return (Xow_db_file)hash_by_id.GetByOrNull(id);} public Xow_db_file Dbs__get_by_tid_or_core(byte... tids_ary) {Xow_db_file rv = Dbs__get_by_tid_or_null(tids_ary); return rv == null ? db__core : rv;} public Xow_db_file Dbs__get_by_tid_or_null(byte... tids_ary) { int tids_len = tids_ary.length; @@ -200,7 +200,7 @@ public class Xow_db_mgr { rv.Add(db); } - return (Xow_db_file[])rv.To_ary_and_clear(Xow_db_file.class); + return (Xow_db_file[])rv.ToAryAndClear(Xow_db_file.class); } public void Create_page(Xowd_page_tbl core_tbl, Xowd_text_tbl text_tbl, int page_id, int ns_id, byte[] ttl_wo_ns, boolean redirect, DateAdp modified_on, byte[] text_zip_data, int text_raw_len, int random_int, int text_db_id, int html_db_id) { core_tbl.Insert_cmd_by_batch(page_id, ns_id, ttl_wo_ns, redirect, modified_on, text_raw_len, random_int, text_db_id, html_db_id, -1); diff --git a/400_xowa/src/gplx/xowa/wikis/data/fetchers/Xow_page_fetcher_mock.java b/400_xowa/src/gplx/xowa/wikis/data/fetchers/Xow_page_fetcher_mock.java index e05cd0164..30c603428 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/fetchers/Xow_page_fetcher_mock.java +++ b/400_xowa/src/gplx/xowa/wikis/data/fetchers/Xow_page_fetcher_mock.java @@ -13,18 +13,18 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.fetchers; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; -import gplx.xowa.wikis.data.tbls.*; -public class Xow_page_fetcher_mock implements Xow_page_fetcher { - public Xow_page_fetcher Wiki_(Xowe_wiki v) {return this;} - public void Clear() {pages.Clear();} private Hash_adp pages = Hash_adp_.New(); - public void Add(int ns_id, byte[] ttl, byte[] text) { - Xowd_page_itm page = new Xowd_page_itm().Ns_id_(ns_id).Ttl_page_db_(ttl).Text_(text); - pages.Add(Make_key(ns_id, ttl), page); - } - public byte[] Get_by(int ns_id, byte[] ttl) { - Xowd_page_itm rv = (Xowd_page_itm)pages.Get_by(Make_key(ns_id, ttl)); - return rv == null ? null : rv.Text(); - } - String Make_key(int ns_id, byte[] ttl) {return Int_.To_str(ns_id) + "|" + String_.new_u8(ttl);} -} +package gplx.xowa.wikis.data.fetchers; import gplx.*; import gplx.xowa.*; +import gplx.xowa.wikis.data.tbls.*; +public class Xow_page_fetcher_mock implements Xow_page_fetcher { + public Xow_page_fetcher Wiki_(Xowe_wiki v) {return this;} + public void Clear() {pages.Clear();} private Hash_adp pages = Hash_adp_.New(); + public void Add(int ns_id, byte[] ttl, byte[] text) { + Xowd_page_itm page = new Xowd_page_itm().Ns_id_(ns_id).Ttl_page_db_(ttl).Text_(text); + pages.Add(Make_key(ns_id, ttl), page); + } + public byte[] Get_by(int ns_id, byte[] ttl) { + Xowd_page_itm rv = (Xowd_page_itm)pages.GetByOrNull(Make_key(ns_id, ttl)); + return rv == null ? null : rv.Text(); + } + String Make_key(int ns_id, byte[] ttl) {return Int_.To_str(ns_id) + "|" + String_.new_u8(ttl);} +} diff --git a/400_xowa/src/gplx/xowa/wikis/data/site_stats/Xowd_site_stats_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/site_stats/Xowd_site_stats_tbl.java index 2304a98d5..f22c2621c 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/site_stats/Xowd_site_stats_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/site_stats/Xowd_site_stats_tbl.java @@ -13,17 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.site_stats; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; -import gplx.dbs.*; import gplx.xowa.wikis.data.site_stats.*; +package gplx.xowa.wikis.data.site_stats; import gplx.*; +import gplx.dbs.*; public class Xowd_site_stats_tbl implements Db_tbl { private final String fld_row_id, fld_good_articles, fld_total_pages, fld_images; - private final Db_conn conn; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final Db_conn conn; private final DbmetaFldList flds = new DbmetaFldList(); public Xowd_site_stats_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; - fld_row_id = flds.Add_int_pkey("ss_row_id"); - fld_good_articles = flds.Add_long("ss_good_articles"); - fld_total_pages = flds.Add_long("ss_total_pages"); - fld_images = flds.Add_int("ss_images"); + fld_row_id = flds.AddIntPkey("ss_row_id"); + fld_good_articles = flds.AddLong("ss_good_articles"); + fld_total_pages = flds.AddLong("ss_total_pages"); + fld_images = flds.AddInt("ss_images"); } public String Tbl_name() {return tbl_name;} private final String tbl_name = TBL_NAME; public void Create_tbl() { diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java index 178cb23c1..3332f2bea 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.dbs.*; public class Xowd_cat_core_tbl implements Db_tbl { - private final String tbl_name; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_pages, fld_subcats, fld_files, fld_hidden, fld_link_db_id; private final Db_conn conn; private Db_stmt stmt_insert, stmt_update, stmt_select; private final Xowd_cat_core_tbl__in_wkr in_wkr = new Xowd_cat_core_tbl__in_wkr(); @@ -27,12 +27,12 @@ public class Xowd_cat_core_tbl implements Db_tbl { String fld_link_db_id_name = ""; if (schema_is_1) {tbl_name = "category"; fld_link_db_id_name = "cat_file_idx";} else {tbl_name = "cat_core"; fld_link_db_id_name = "cat_link_db_id";} - fld_id = flds.Add_int_pkey ("cat_id"); - fld_pages = flds.Add_int ("cat_pages"); - fld_subcats = flds.Add_int ("cat_subcats"); - fld_files = flds.Add_int ("cat_files"); - fld_hidden = flds.Add_byte ("cat_hidden"); - fld_link_db_id = flds.Add_int(fld_link_db_id_name); + fld_id = flds.AddIntPkey("cat_id"); + fld_pages = flds.AddInt("cat_pages"); + fld_subcats = flds.AddInt("cat_subcats"); + fld_files = flds.AddInt("cat_files"); + fld_hidden = flds.AddByte("cat_hidden"); + fld_link_db_id = flds.AddInt(fld_link_db_id_name); in_wkr.Ctor(this, tbl_name, flds, fld_id); conn.Rls_reg(this); } @@ -56,7 +56,7 @@ public class Xowd_cat_core_tbl implements Db_tbl { conn.Stmt_delete(tbl_name, fld_id).Crt_int(fld_id, page_id).Exec_delete(); Gfo_usr_dlg_.Instance.Log_many("", "", "db.cat_core: delete done"); } - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public void Update_page_id(int old_id, int new_id) { Gfo_usr_dlg_.Instance.Log_many("", "", "db.cat_core: update page_id started: db=~{0} old_id=~{1} new_id=~{2}", conn.Conn_info().Raw(), old_id, new_id); conn.Stmt_update(tbl_name, String_.Ary(fld_id), fld_id).Val_int(fld_id, new_id).Crt_int(fld_id, old_id).Exec_update(); diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl__in_wkr.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl__in_wkr.java index ab39c2760..19351c6fb 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl__in_wkr.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_core_tbl__in_wkr.java @@ -1,30 +1,30 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.dbs.*; import gplx.dbs.utls.*; class Xowd_cat_core_tbl__in_wkr extends Db_in_wkr__base { private Xowd_cat_core_tbl tbl; - private String tbl_name, fld_cat_id; private Dbmeta_fld_list flds; private Ordered_hash hash; - public void Ctor(Xowd_cat_core_tbl tbl, String tbl_name, Dbmeta_fld_list flds, String fld_cat_id) { + private String tbl_name, fld_cat_id; private DbmetaFldList flds; private Ordered_hash hash; + public void Ctor(Xowd_cat_core_tbl tbl, String tbl_name, DbmetaFldList flds, String fld_cat_id) { this.tbl = tbl; this.tbl_name = tbl_name; this.flds = flds; this.fld_cat_id = fld_cat_id; } public void Init(Ordered_hash hash) {this.hash = hash;} @Override protected Db_qry Make_qry(int bgn, int end) { Object[] part_ary = In_ary(end - bgn); - return Db_qry_.select_cols_(tbl_name, Db_crt_.New_in(fld_cat_id, part_ary), flds.To_str_ary()); + return Db_qry_.select_cols_(tbl_name, Db_crt_.New_in(fld_cat_id, part_ary), flds.ToStrAry()); } @Override protected void Fill_stmt(Db_stmt stmt, int bgn, int end) { for (int i = bgn; i < end; i++) { @@ -36,7 +36,7 @@ class Xowd_cat_core_tbl__in_wkr extends Db_in_wkr__base { while (rdr.Move_next()) { if (cancelable.Canceled()) return; Xowd_category_itm ctg_data = tbl.Load_itm(rdr); - Xowd_page_itm page = (Xowd_page_itm)hash.Get_by(ctg_data.Id_val()); + Xowd_page_itm page = (Xowd_page_itm)hash.GetByOrNull(ctg_data.Id_val()); page.Xtn_(ctg_data); } } diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java index e565737ce..7cd6ae03a 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_cat_link_tbl.java @@ -13,20 +13,20 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.addons.wikis.ctgs.*; public class Xowd_cat_link_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_from, fld_to_id, fld_sortkey, fld_timestamp, fld_type_id; private Db_stmt stmt_insert, stmt_select_in; public Xowd_cat_link_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; this.tbl_name = schema_is_1 ? "categorylinks" : "cat_link"; - fld_from = flds.Add_int ("cl_from"); // page_id - fld_to_id = flds.Add_int ("cl_to_id"); // cat_id - fld_type_id = flds.Add_byte ("cl_type_id"); - fld_sortkey = flds.Add_str ("cl_sortkey", 230); - fld_timestamp = flds.Add_str ("cl_timestamp", 14); + fld_from = flds.AddInt("cl_from"); // page_id + fld_to_id = flds.AddInt("cl_to_id"); // cat_id + fld_type_id = flds.AddByte("cl_type_id"); + fld_sortkey = flds.AddStr("cl_sortkey", 230); + fld_timestamp = flds.AddStr("cl_timestamp", 14); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; @@ -49,7 +49,7 @@ public class Xowd_cat_link_tbl implements Db_tbl { .Val_int(fld_timestamp , timestamp) .Exec_insert(); } - public void Delete_all() {conn.Stmt_delete(tbl_name, Dbmeta_fld_itm.Str_ary_empty).Exec_delete();} + public void Delete_all() {conn.Stmt_delete(tbl_name, DbmetaFldItm.StrAryEmpty).Exec_delete();} public int Select_by_type(List_adp list, int cat_page_id, byte arg_tid, byte[] arg_sortkey, boolean arg_is_from, int limit) { String arg_sortkey_str = arg_sortkey == null ? "" : String_.new_u8(arg_sortkey); gplx.core.criterias.Criteria comp_crt = !arg_is_from @@ -70,7 +70,7 @@ public class Xowd_cat_link_tbl implements Db_tbl { ++count; } } finally {rdr.Rls();} - list.Sort_by(Xowd_page_itm_sorter.Ctg_tid_sortkey_asc); + list.SortBy(Xowd_page_itm_sorter.Ctg_tid_sortkey_asc); return count; } public void Select_in(List_adp rv, int cat_id) { diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java index 2a05d0a2e..1a0a98dd7 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java @@ -13,47 +13,48 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.core.primitives.*; import gplx.core.criterias.*; -import gplx.dbs.*; import gplx.xowa.*; import gplx.xowa.wikis.dbs.*; import gplx.dbs.qrys.*; +import gplx.dbs.*; +import gplx.dbs.qrys.*; import gplx.xowa.wikis.nss.*; public class Xowd_page_tbl implements Db_tbl { private final Object thread_lock = new Object(); public final boolean schema_is_1; private String fld_id, fld_ns, fld_title, fld_is_redirect, fld_touched, fld_len, fld_random_int, fld_score, fld_text_db_id, fld_html_db_id, fld_redirect_id, fld_cat_db_id; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private Db_stmt stmt_select_all_by_ttl, stmt_select_all_by_id, stmt_select_id_by_ttl, stmt_insert; private final String[] flds_select_all, flds_select_idx; public Xowd_page_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; this.schema_is_1 = schema_is_1; String fld_text_db_id_name = ""; - String fld_cat_db_id_name = Dbmeta_fld_itm.Key_null; + String fld_cat_db_id_name = DbmetaFldItm.KeyNull; if (schema_is_1) {fld_text_db_id_name = "page_file_idx";} else { fld_text_db_id_name = "page_text_db_id"; if (conn.Meta_fld_exists(tbl_name, "page_cat_db_id")) fld_cat_db_id_name = "page_cat_db_id"; } - fld_id = flds.Add_int_pkey("page_id"); // int(10); unsigned -- MW:same - fld_ns = flds.Add_int("page_namespace"); // int(11); -- MW:same - fld_title = flds.Add_str("page_title", 255); // varbinary(255); -- MW:blob - fld_is_redirect = flds.Add_int("page_is_redirect"); // tinyint(3); -- MW:same - fld_touched = flds.Add_str("page_touched", 14); // binary(14); -- MW:blob; NOTE: should be revision!rev_timestamp, but needs extra join - fld_len = flds.Add_int("page_len"); // int(10); unsigned -- MW:same except NULL REF: WikiPage.php!updateRevisionOn;" - fld_random_int = flds.Add_int("page_random_int"); // MW:XOWA - fld_text_db_id = flds.Add_int(fld_text_db_id_name); // MW:XOWA - fld_html_db_id = flds.Add_int_dflt("page_html_db_id", -1); // MW:XOWA - fld_redirect_id = flds.Add_int_dflt("page_redirect_id", -1); // MW:XOWA - fld_score = flds.Add_int_dflt(Fld__page_score__key, -1); // MW:XOWA - if (fld_cat_db_id_name != Dbmeta_fld_itm.Key_null) - fld_cat_db_id = flds.Add_int_dflt(fld_cat_db_id_name, -1);// MW:XOWA + fld_id = flds.AddIntPkey("page_id"); // int(10); unsigned -- MW:same + fld_ns = flds.AddInt("page_namespace"); // int(11); -- MW:same + fld_title = flds.AddStr("page_title", 255); // varbinary(255); -- MW:blob + fld_is_redirect = flds.AddInt("page_is_redirect"); // tinyint(3); -- MW:same + fld_touched = flds.AddStr("page_touched", 14); // binary(14); -- MW:blob; NOTE: should be revision!rev_timestamp, but needs extra join + fld_len = flds.AddInt("page_len"); // int(10); unsigned -- MW:same except NULL REF: WikiPage.php!updateRevisionOn;" + fld_random_int = flds.AddInt("page_random_int"); // MW:XOWA + fld_text_db_id = flds.AddInt(fld_text_db_id_name); // MW:XOWA + fld_html_db_id = flds.AddIntDflt("page_html_db_id", -1); // MW:XOWA + fld_redirect_id = flds.AddIntDflt("page_redirect_id", -1); // MW:XOWA + fld_score = flds.AddIntDflt(Fld__page_score__key, -1); // MW:XOWA + if (fld_cat_db_id_name != DbmetaFldItm.KeyNull) + fld_cat_db_id = flds.AddIntDflt(fld_cat_db_id_name, -1);// MW:XOWA flds_select_all = String_.Ary_wo_null(fld_id, fld_ns, fld_title, fld_touched, fld_is_redirect, fld_len, fld_random_int, fld_text_db_id, fld_html_db_id, fld_redirect_id, fld_score, fld_cat_db_id); flds_select_idx = String_.Ary_wo_null(fld_ns, fld_title, fld_id, fld_len, fld_score); conn.Rls_reg(this); } public Db_conn Conn() {return conn;} private final Db_conn conn; public String Tbl_name() {return tbl_name;} private final String tbl_name = TBL_NAME; - public Dbmeta_fld_list Flds__all() {return flds;} + public DbmetaFldList Flds__all() {return flds;} public String Fld_page_id() {return fld_id;} public String Fld_page_ns() {return fld_ns;} public String Fld_page_title() {return fld_title;} @@ -68,11 +69,11 @@ public class Xowd_page_tbl implements Db_tbl { public String[] Flds_select_idx() {return flds_select_idx;} public String[] Flds_select_all() {return flds_select_all;} public void Flds__assert() { - conn.Meta_fld_assert(tbl_name, this.Fld_html_db_id() , Dbmeta_fld_tid.Itm__int, -1); - conn.Meta_fld_assert(tbl_name, this.Fld_redirect_id() , Dbmeta_fld_tid.Itm__int, -1); - conn.Meta_fld_assert(tbl_name, Fld__page_score__key , Dbmeta_fld_tid.Itm__int, -1); + conn.Meta_fld_assert(tbl_name, this.Fld_html_db_id() , DbmetaFldType.ItmInt, -1); + conn.Meta_fld_assert(tbl_name, this.Fld_redirect_id() , DbmetaFldType.ItmInt, -1); + conn.Meta_fld_assert(tbl_name, Fld__page_score__key , DbmetaFldType.ItmInt, -1); } - public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds.To_fld_ary()));} + public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds.ToFldAry()));} public void Insert(int page_id, int ns_id, byte[] ttl_wo_ns, boolean page_is_redirect, DateAdp modified_on, int page_len, int random_int, int text_db_id, int html_db_id) { this.Insert_bgn(); this.Insert_cmd_by_batch(page_id, ns_id, ttl_wo_ns, page_is_redirect, modified_on, page_len, random_int, text_db_id, html_db_id, -1); @@ -188,9 +189,9 @@ public class Xowd_page_tbl implements Db_tbl { wkr.Init(this, ns_mgr, rv); wkr.Select_in(cancelable, conn, bgn, end); } - public boolean Select_in__id(Cancelable cancelable, boolean show_progress, List_adp rv) {return Select_in__id(cancelable, false, show_progress, rv, 0, rv.Count());} + public boolean Select_in__id(Cancelable cancelable, boolean show_progress, List_adp rv) {return Select_in__id(cancelable, false, show_progress, rv, 0, rv.Len());} public boolean Select_in__id(Cancelable cancelable, boolean skip_table_read, boolean show_progress, List_adp rv, int bgn, int end) { - Xowd_page_itm[] page_ary = (Xowd_page_itm[])rv.To_ary(Xowd_page_itm.class); + Xowd_page_itm[] page_ary = (Xowd_page_itm[])rv.ToAry(Xowd_page_itm.class); int len = page_ary.length; if (len == 0) return false; Ordered_hash hash = Ordered_hash_.New(); for (int i = 0; i < len; i++) { @@ -246,7 +247,7 @@ public class Xowd_page_tbl implements Db_tbl { Read_page__idx(page, rdr); rslt_list.Add(page); } - rslt_list.Sort_by(Xowd_page_itm_sorter.TitleAsc); + rslt_list.SortBy(Xowd_page_itm_sorter.TitleAsc); } finally {rdr.Rls();} } @@ -300,7 +301,7 @@ public class Xowd_page_tbl implements Db_tbl { if (found) rslt_prv.Copy(prv_itm); else { // at beginning of range, so no items found; EX: "Module:A" is search, but 1st Module is "Module:B" - if (rslt_list.Count() > 0) // use 1st item + if (rslt_list.Len() > 0) // use 1st item rslt_prv.Copy((Xowd_page_itm)rslt_list.Get_at(0)); } } @@ -319,8 +320,8 @@ public class Xowd_page_tbl implements Db_tbl { public void Read_page__all(Xowd_page_itm page, Db_rdr rdr) { // handle page_score defaulting to page_len int page_len = rdr.Read_int(fld_len); - int page_score = fld_score == Dbmeta_fld_itm.Key_null ? page_len : rdr.Read_int(fld_score); - int cat_db_id = fld_cat_db_id == Dbmeta_fld_itm.Key_null ? -1 : rdr.Read_int(fld_cat_db_id); + int page_score = fld_score == DbmetaFldItm.KeyNull ? page_len : rdr.Read_int(fld_score); + int cat_db_id = fld_cat_db_id == DbmetaFldItm.KeyNull ? -1 : rdr.Read_int(fld_cat_db_id); page.Init_by_load__all ( rdr.Read_int(fld_id) @@ -395,7 +396,7 @@ public class Xowd_page_tbl implements Db_tbl { ); } public int Fld_page_score_eval(Db_rdr rdr, int page_len) { - return fld_score == Dbmeta_fld_itm.Key_null ? page_len : rdr.Read_int(fld_score); + return fld_score == DbmetaFldItm.KeyNull ? page_len : rdr.Read_int(fld_score); } public void Rls() { synchronized (thread_lock) {// LOCK:stmt-rls; DATE:2016-07-06 diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java index 12afb975b..a8918a210 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__id.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.core.criterias.*; -import gplx.dbs.*; import gplx.dbs.utls.*; +import gplx.dbs.*; class Xowd_page_tbl__id extends Xowd_page_tbl__in_wkr__base { private final List_adp list; // list is original list of ids which may have dupes; needed to fill statement (which takes range of bgn - end); DATE:2013-12-08 private final Ordered_hash hash; // hash is unique list of ids; needed for fetch from rdr (which indexes by id) @@ -34,5 +34,5 @@ class Xowd_page_tbl__id extends Xowd_page_tbl__in_wkr__base { stmt.Val_int(page.Id()); } } - @Override protected Xowd_page_itm Get_page_or_null(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.Get_by(rdr_page.Id_val());} + @Override protected Xowd_page_itm Get_page_or_null(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.GetByOrNull(rdr_page.Id_val());} } diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java index 07fccd1ae..03f2d0d3e 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl.java @@ -1,21 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.core.criterias.*; -import gplx.dbs.*; import gplx.dbs.utls.*; +import gplx.dbs.*; class Xowd_page_tbl__ttl extends Xowd_page_tbl__in_wkr__base { private Ordered_hash hash; private int in_ns; @Override protected int Interval() {return 64;} // NOTE: 96+ overflows; EX: w:Space_Liability_Convention; DATE:2013-10-24 @@ -35,5 +35,5 @@ class Xowd_page_tbl__ttl extends Xowd_page_tbl__in_wkr__base { stmt.Val_bry_as_str(page.Ttl_page_db()); } } - @Override protected Xowd_page_itm Get_page_or_null(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.Get_by(rdr_page.Ttl_page_db());} + @Override protected Xowd_page_itm Get_page_or_null(Xowd_page_itm rdr_page) {return (Xowd_page_itm)hash.GetByOrNull(rdr_page.Ttl_page_db());} } diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java index e6f863c5a..e81a4ca9b 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl__ttl_ns.java @@ -1,21 +1,21 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.core.criterias.*; -import gplx.dbs.*; import gplx.dbs.utls.*; +import gplx.dbs.*; import gplx.xowa.wikis.nss.*; class Xowd_page_tbl__ttl_ns extends Xowd_page_tbl__in_wkr__base { private Xowd_page_tbl page_tbl; @@ -45,6 +45,6 @@ class Xowd_page_tbl__ttl_ns extends Xowd_page_tbl__in_wkr__base { if (ns == null) return null; // NOTE: ns seems to "randomly" be null when threading during redlinks; guard against null; DATE:2014-01-03 byte[] ttl_wo_ns = rdr_page.Ttl_page_db(); rdr_page.Ttl_(ns, ttl_wo_ns); - return (Xowd_page_itm)hash.Get_by(rdr_page.Ttl_full_db()); + return (Xowd_page_itm)hash.GetByOrNull(rdr_page.Ttl_full_db()); } } diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java index 508619d8f..d0c534509 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java @@ -13,21 +13,21 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; +import gplx.dbs.*; import gplx.xowa.wikis.nss.*; public class Xowd_site_ns_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_name, fld_case, fld_count, fld_is_alias; private final Db_conn conn; public Xowd_site_ns_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; this.tbl_name = schema_is_1 ? "xowa_ns" : "site_ns"; - fld_id = flds.Add_int_pkey ("ns_id"); - fld_name = flds.Add_str ("ns_name", 255); - fld_case = flds.Add_byte ("ns_case"); - fld_is_alias = flds.Add_bool ("ns_is_alias"); - fld_count = flds.Add_int ("ns_count"); + fld_id = flds.AddIntPkey("ns_id"); + fld_name = flds.AddStr("ns_name", 255); + fld_case = flds.AddByte("ns_case"); + fld_is_alias = flds.AddBool("ns_is_alias"); + fld_count = flds.AddInt("ns_count"); } public String Tbl_name() {return tbl_name;} private final String tbl_name; public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_text_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_text_tbl.java index 04db9ad83..f1ed167e3 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_text_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_text_tbl.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; -import gplx.core.ios.*; import gplx.dbs.*; import gplx.dbs.utls.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; +import gplx.core.ios.*; import gplx.dbs.*; public class Xowd_text_tbl implements Db_tbl { private final Object thread_lock = new Object(); - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_page_id, fld_text_data; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert; private final Io_stream_zip_mgr zip_mgr = new Io_stream_zip_mgr(); private final byte zip_tid; @@ -26,8 +26,8 @@ public class Xowd_text_tbl implements Db_tbl { this.conn = conn; this.zip_tid = zip_tid; String fld_text_data_name = ""; fld_text_data_name = schema_is_1 ? "old_text" : "text_data"; - fld_page_id = flds.Add_int_pkey("page_id"); - fld_text_data = flds.Add_bry(fld_text_data_name); + fld_page_id = flds.AddIntPkey("page_id"); + fld_text_data = flds.AddBry(fld_text_data_name); conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name = TBL_NAME; @@ -79,7 +79,7 @@ public class Xowd_text_tbl implements Db_tbl { list.Add(new Xowd_text_row(page_id, text)); } } finally {rdr.Rls();} - return (Xowd_text_row[])list.To_ary_and_clear(Xowd_text_row.class); + return (Xowd_text_row[])list.ToAryAndClear(Xowd_text_row.class); } public byte[] Zip(byte[] data) {return zip_mgr.Zip(zip_tid, data);} public void Rls() { diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java index b5f2d0241..012ea84d5 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java @@ -13,27 +13,27 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; -import gplx.dbs.*; import gplx.dbs.qrys.*; +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.wikis.data.*; +import gplx.dbs.*; public class Xowd_xowa_db_tbl implements Db_tbl { public static final String Fld_id = "db_id", Fld_type = "db_type", Fld_url = "db_url"; - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_id, fld_type, fld_url, fld_ns_ids, fld_part_id, fld_guid; private boolean schema_is_1; private final Db_conn conn; private final Db_stmt_bldr stmt_bldr = new Db_stmt_bldr(); public Xowd_xowa_db_tbl(Db_conn conn, boolean schema_is_1) { this.conn = conn; this.schema_is_1 = schema_is_1; this.tbl_name = TBL_NAME; - fld_id = flds.Add_int_pkey (Fld_id); - fld_type = flds.Add_byte (Fld_type); - fld_url = flds.Add_str (Fld_url, 512); + fld_id = flds.AddIntPkey(Fld_id); + fld_type = flds.AddByte(Fld_type); + fld_url = flds.AddStr(Fld_url, 512); if (schema_is_1) { - fld_ns_ids = fld_part_id = fld_guid = Dbmeta_fld_itm.Key_null; + fld_ns_ids = fld_part_id = fld_guid = DbmetaFldItm.KeyNull; } else { - fld_ns_ids = flds.Add_str ("db_ns_ids", 255); - fld_part_id = flds.Add_int ("db_part_id"); - fld_guid = flds.Add_str ("db_guid", 36); + fld_ns_ids = flds.AddStr("db_ns_ids", 255); + fld_part_id = flds.AddInt("db_part_id"); + fld_guid = flds.AddStr("db_guid", 36); } stmt_bldr.Conn_(conn, tbl_name, flds, fld_id); } @@ -55,8 +55,8 @@ public class Xowd_xowa_db_tbl implements Db_tbl { list.Add(db_file); } } finally {rdr.Rls();} - list.Sort_by(Xow_db_file_sorter__id.Instance); - return (Xow_db_file[])list.To_ary_and_clear(Xow_db_file.class); + list.SortBy(Xow_db_file_sorter__id.Instance); + return (Xow_db_file[])list.ToAryAndClear(Xow_db_file.class); } public void Commit_all(Xow_db_mgr core_data_mgr) { stmt_bldr.Batch_bgn(); diff --git a/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_load_mgr_txt.java b/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_load_mgr_txt.java index 3b8411d40..311ed8544 100644 --- a/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_load_mgr_txt.java +++ b/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_load_mgr_txt.java @@ -13,16 +13,15 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; -import gplx.core.primitives.*; import gplx.core.brys.*; import gplx.core.flds.*; import gplx.core.envs.*; -import gplx.xowa.addons.wikis.ctgs.bldrs.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.core.encoders.*; +package gplx.xowa.wikis.dbs; import gplx.*; import gplx.xowa.*; +import gplx.core.primitives.*; import gplx.core.brys.*; +import gplx.core.envs.*; +import gplx.core.encoders.*; import gplx.xowa.wikis.nss.*; -import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; +import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.wikis.tdbs.*; import gplx.xowa.wikis.tdbs.hives.*; import gplx.xowa.wikis.tdbs.xdats.*; -import gplx.xowa.wikis.pages.*; import gplx.xowa.addons.wikis.searchs.specials.*; import gplx.xowa.guis.views.*; -import gplx.xowa.addons.wikis.ctgs.htmls.catpages.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.urls.*; public class Xodb_load_mgr_txt implements Xodb_load_mgr { private final Xob_xdat_file tmp_xdat_file = new Xob_xdat_file(); private final Xob_xdat_itm tmp_xdat_itm = new Xob_xdat_itm(); private final Xowd_page_itm tmp_page = new Xowd_page_itm(); @@ -365,7 +364,7 @@ public class Xodb_load_mgr_txt implements Xodb_load_mgr { xdat_file = null; --fil_idx; } - if (prv_itm == null && rslt_list.Count() > 0) { + if (prv_itm == null && rslt_list.Len() > 0) { prv_itm = (Xowd_page_itm)rslt_list.Get_at(0); } if (rslt_prv != null) diff --git a/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_save_mgr_sql.java b/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_save_mgr_sql.java index 3e98f67d2..e19a6c53f 100644 --- a/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_save_mgr_sql.java +++ b/400_xowa/src/gplx/xowa/wikis/dbs/Xodb_save_mgr_sql.java @@ -19,7 +19,7 @@ import gplx.DateAdp; import gplx.Datetime_now; import gplx.String_; import gplx.dbs.Db_rdr; -import gplx.dbs.Dbmeta_fld_itm; +import gplx.dbs.DbmetaFldItm; import gplx.xowa.Xoa_ttl; import gplx.xowa.Xoae_page; import gplx.xowa.Xowe_wiki; @@ -42,7 +42,7 @@ public class Xodb_save_mgr_sql implements Xodb_save_mgr { int ns_count = db_file.Tbl__ns().Select_ns_count(ns_id) + 1; int page_id = db_file.Tbl__cfg().Select_int_or(Xowd_cfg_key_.Grp__db, Xowd_cfg_key_.Key__wiki__page__id_next, -1); if (page_id == -1) { // HACK: changed for tests; was dbs.qrys.Db_qry_sql.rdr_("SELECT (Max(page_id) + 1) AS max_page_id FROM page;") - Db_rdr rdr = db_mgr.Core_data_mgr().Tbl__page().Conn().Stmt_select(db_file.Tbl__page().Tbl_name(), String_.Ary(db_file.Tbl__page().Fld_page_id()), Dbmeta_fld_itm.Str_ary_empty).Exec_select__rls_auto(); + Db_rdr rdr = db_mgr.Core_data_mgr().Tbl__page().Conn().Stmt_select(db_file.Tbl__page().Tbl_name(), String_.Ary(db_file.Tbl__page().Fld_page_id()), DbmetaFldItm.StrAryEmpty).Exec_select__rls_auto(); try { int max_page_id = -1; while (rdr.Move_next()) { diff --git a/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_wm_.java b/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_wm_.java index 2f30f47d5..a700ff2b7 100644 --- a/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_wm_.java +++ b/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_wm_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.domains; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +package gplx.xowa.wikis.domains; import gplx.*; import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.xowa.langs.*; public class Xow_abrv_wm_ { @@ -100,7 +100,7 @@ public class Xow_abrv_wm_ { return null; } public static void To_abrv(Bry_bfr bfr, byte[] lang_key, Int_obj_ref domain_type) { - byte[] suffix_bry = (byte[])int_hash.Get_by(domain_type); if (suffix_bry == null) return; + byte[] suffix_bry = (byte[])int_hash.GetByOrNull(domain_type); if (suffix_bry == null) return; switch (domain_type.Val()) { case Xow_domain_tid_.Tid__commons: case Xow_domain_tid_.Tid__species: @@ -117,7 +117,7 @@ public class Xow_abrv_wm_ { } public static byte[] To_abrv(Xow_domain_itm domain_itm) { int tid = domain_itm.Domain_type_id(); - byte[] suffix = (byte[])int_hash.Get_by(Int_obj_ref.New(tid)); + byte[] suffix = (byte[])int_hash.GetByOrNull(Int_obj_ref.New(tid)); if (suffix == null) // Tid__home and Tid__other (wikia) return domain_itm.Domain_bry(); // return domain; needed for WikibaseLanguageIndependentLuaBindings; DATE:2019-11-23 switch (tid) { diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_parser.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_parser.java index 16f6e9ccd..abd4c18c0 100644 --- a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_parser.java +++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_itm_parser.java @@ -13,16 +13,17 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; +package gplx.xowa.wikis.domains.crts; import gplx.*; +import gplx.xowa.wikis.domains.*; import gplx.xowa.langs.*; class Xow_domain_crt_itm_parser { public Xow_domain_crt_kv_itm[] Parse_as_kv_itms_or_null(byte[] raw) { List_adp rv = Parse_as_obj_or_null(raw, Bool_.N); - return rv == null ? null : (Xow_domain_crt_kv_itm[])rv.To_ary_and_clear(Xow_domain_crt_kv_itm.class); + return rv == null ? null : (Xow_domain_crt_kv_itm[])rv.ToAryAndClear(Xow_domain_crt_kv_itm.class); } public Xow_domain_crt_kv_ary[] Parse_as_kv_arys_or_null(byte[] raw) { List_adp rv = Parse_as_obj_or_null(raw, Bool_.Y); - return rv == null ? null : (Xow_domain_crt_kv_ary[])rv.To_ary_and_clear(Xow_domain_crt_kv_ary.class); + return rv == null ? null : (Xow_domain_crt_kv_ary[])rv.ToAryAndClear(Xow_domain_crt_kv_ary.class); } public List_adp Parse_as_obj_or_null(byte[] raw, boolean is_ary) { List_adp rv = List_adp_.New(); diff --git a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_kv_itm_mgr.java b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_kv_itm_mgr.java index 159a71323..e0dfa7f1a 100644 --- a/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_kv_itm_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/domains/crts/Xow_domain_crt_kv_itm_mgr.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.domains.crts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; +package gplx.xowa.wikis.domains.crts; import gplx.*; +import gplx.xowa.wikis.domains.*; public class Xow_domain_crt_kv_itm_mgr { private final List_adp list = List_adp_.New(); public void Clear() {list.Clear();} @@ -37,7 +38,7 @@ public class Xow_domain_crt_kv_itm_mgr { return true; } public Xow_domain_crt_itm Find_itm(Xow_domain_itm cur, Xow_domain_itm comp) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Xow_domain_crt_kv_itm kv = (Xow_domain_crt_kv_itm)list.Get_at(i); if (kv.Key().Matches(cur, comp)) return kv.Val(); @@ -45,7 +46,7 @@ public class Xow_domain_crt_kv_itm_mgr { return Xow_domain_crt_itm__none.Instance; } public Xow_domain_crt_itm[] Find_ary(Xow_domain_itm cur, Xow_domain_itm comp) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Xow_domain_crt_kv_ary kv = (Xow_domain_crt_kv_ary)list.Get_at(i); if (kv.Key().Matches(cur, comp)) return kv.Val(); diff --git a/400_xowa/src/gplx/xowa/wikis/metas/Xow_script_mgr.java b/400_xowa/src/gplx/xowa/wikis/metas/Xow_script_mgr.java index 53e31ac5b..26d346dd9 100644 --- a/400_xowa/src/gplx/xowa/wikis/metas/Xow_script_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/metas/Xow_script_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.metas; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.metas; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.core.envs.*; import gplx.xowa.wikis.domains.*; public class Xow_script_mgr implements Gfo_invk { @@ -23,7 +23,7 @@ public class Xow_script_mgr implements Gfo_invk { return this; } private static final String Invk_set = "set"; public void Exec(Xowe_wiki wiki) { - int len = hash.Count(); + int len = hash.Len(); Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_k004(); for (int i = 0; i < len; i++) { Xow_script_itm itm = (Xow_script_itm)hash.Get_at(i); @@ -43,7 +43,7 @@ public class Xow_script_mgr implements Gfo_invk { wiki_tids[i] = Xow_domain_tid_.Get_type_as_tid(wiki_tid_names[i]); Xow_script_itm itm = new Xow_script_itm(key, wiki_tids, script); - hash.Add_if_dupe_use_nth(itm.Key(), itm); + hash.AddIfDupeUseNth(itm.Key(), itm); } public Ordered_hash hash = Ordered_hash_.New_bry(); } diff --git a/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns.java b/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns.java index 388018416..abc328d46 100644 --- a/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns.java +++ b/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.nss; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +package gplx.xowa.wikis.nss; import gplx.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.apps.utls.*; public class Xow_ns implements Gfo_invk { public Xow_ns(int id, byte case_match, byte[] name, boolean is_alias) { @@ -81,11 +81,11 @@ public class Xow_ns implements Gfo_invk { public void Aliases_add(String alias) { if (String_.Eq(alias, name_db_str)) return; if (aliases == null) aliases = Ordered_hash_.New(); - aliases.Add_if_dupe_use_1st(alias, alias); + aliases.AddIfDupeUse1st(alias, alias); } private Ordered_hash aliases; public Keyval[] Aliases_as_scrib_ary() { // NOTE: intended for Scrib_lib_site; DATE:2014-02-15 if (aliases == null) return Keyval_.Ary_empty; - int len = aliases.Count(); + int len = aliases.Len(); Keyval[] rv = new Keyval[len]; for (int i = 0; i < len; i++) { String alias = (String)aliases.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_canonical_.java b/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_canonical_.java index 0d51680c4..190694224 100644 --- a/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_canonical_.java +++ b/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_canonical_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.nss; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +package gplx.xowa.wikis.nss; import gplx.*; import gplx.core.primitives.*; public class Xow_ns_canonical_ { public static final Xow_ns[] Ary = new Xow_ns[] // REF.MW: Namespace.php|$wgCanonicalNamespaceNames @@ -48,7 +48,7 @@ public class Xow_ns_canonical_ { id_hash.Add(ns.Name_db(), new Int_obj_val(ns.Id())); } } - Object rv_obj = id_hash.Get_by(key); + Object rv_obj = id_hash.GetByOrNull(key); return rv_obj == null ? Xow_ns_.Tid__null : ((Int_obj_val)rv_obj).Val(); } public static String To_canonical_or_local_as_str(Xow_ns ns) { // NOTE: prefer canonical names if they exist; otherwise use local; PAGE:sh.w:Koprno; DATE:2015-11-08 diff --git a/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_mgr.java b/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_mgr.java index 2e4840b9c..63ff7219b 100644 --- a/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/nss/Xow_ns_mgr.java @@ -13,10 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.nss; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +package gplx.xowa.wikis.nss; import gplx.*; import gplx.xowa.*; import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.xowa.langs.cases.*; -import gplx.xowa.bldrs.installs.*; -import gplx.xowa.xtns.scribunto.*; public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { private Ordered_hash id_hash = Ordered_hash_.New(); // hash for retrieval by id private Hash_adp_bry name_hash; // hash for retrieval by name; note that ns names are case-insensitive "File:" == "fILe:" @@ -52,9 +50,9 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { public Xow_ns[] Ords_ary() {return ords;} private Xow_ns[] ords = new Xow_ns[Xow_ns_mgr_.Ordinal_max]; public int Ords_len() {return ords_len;} private int ords_len; public Xow_ns Ords_get_at(int ord) {return ords[ord];} - public int Ids_len() {return id_hash.Count();} + public int Ids_len() {return id_hash.Len();} public Xow_ns Ids_get_at(int idx) {return (Xow_ns)id_hash.Get_at(idx);} - public Xow_ns Ids_get_or_null(int id) {synchronized (id_hash_ref) {return (Xow_ns)id_hash.Get_by(id_hash_ref.Val_(id));}} // LOCK:hash-key; DATE:2016-07-06 + public Xow_ns Ids_get_or_null(int id) {synchronized (id_hash_ref) {return (Xow_ns)id_hash.GetByOrNull(id_hash_ref.Val_(id));}} // LOCK:hash-key; DATE:2016-07-06 private Xow_ns Ids_get_or_empty(int id) { Xow_ns rv = Ids_get_or_null(id); return rv == null ? Ns__empty : rv; @@ -84,7 +82,7 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { public void Aliases_clear() {aliases.Clear();} public Xow_ns_mgr Aliases_add(int ns_id, String name) { Keyval kv = Keyval_.new_(name, new Int_obj_val(ns_id)); - aliases.Add_if_dupe_use_nth(name, kv); + aliases.AddIfDupeUseNth(name, kv); return this; } public void Aliases_del(String name) {aliases.Del(name);} @@ -106,7 +104,7 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { Rebuild_hashes__add(name_hash, ns, ns.Name_db()); if (ns.Id_is_tmpl()) tmpl_hash.Add(ns.Name_db_w_colon(), ns.Name_db_w_colon()); } - int aliases_len = aliases.Count(); + int aliases_len = aliases.Len(); for (int i = 0; i < aliases_len; i++) { Keyval kv = (Keyval)aliases.Get_at(i); int ns_id = ((Int_obj_val)kv.Val()).Val(); @@ -117,7 +115,7 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { if (ns.Id_is_tmpl()) { byte[] alias_name = Bry_.new_u8(kv.Key()); alias_name = Bry_.Add(alias_name, Byte_ascii.Colon); - tmpl_hash.Add_if_dupe_use_nth(alias_name, alias_name); + tmpl_hash.AddIfDupeUseNth(alias_name, alias_name); } } } @@ -130,9 +128,9 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { } private static final byte[] Project_talk_fmt_arg = Bry_.new_a7("$1"); private void Rebuild_hashes__add(Hash_adp_bry hash, Xow_ns ns, byte[] key) { Xow_ns_mgr_name_itm ns_itm = new Xow_ns_mgr_name_itm(ns, key); - hash.Add_if_dupe_use_nth(key, ns_itm); + hash.AddIfDupeUseNth(key, ns_itm); if (Bry_find_.Find_fwd(key, Byte_ascii.Underline) != Bry_find_.Not_found) // ns has _; add another entry for space; EX: Help_talk -> Help talk - hash.Add_if_dupe_use_nth(Bry_.Replace(key, Byte_ascii.Underline, Byte_ascii.Space), ns_itm); + hash.AddIfDupeUseNth(Bry_.Replace(key, Byte_ascii.Underline, Byte_ascii.Space), ns_itm); } public Xow_ns_mgr Add_defaults() { // NOTE: needs to happen after File ns is added; i.e.: cannot be put in Xow_ns_mgr() {} ctor Aliases_add(Xow_ns_.Tid__file , "Image"); // REF.MW: Setup.php; add "Image", "Image talk" for backward compatibility; note that MW hardcodes Image ns as well @@ -165,7 +163,7 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { if (!id_hash.Has(id_hash_ref.Val_(ns_id))) // NOTE: do not add if already exists; avoids alias id_hash.Add(Int_obj_ref.New(ns.Id()), ns); } - name_hash.Add_if_dupe_use_nth(ns.Name_db(), new Xow_ns_mgr_name_itm(ns, ns.Name_db())); + name_hash.AddIfDupeUseNth(ns.Name_db(), new Xow_ns_mgr_name_itm(ns, ns.Name_db())); return this; } public int compare(Object lhsObj, Object rhsObj) { @@ -175,7 +173,7 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { } private void Ords_sort() { int ords_cur = 0; - int ns_len = id_hash.Count(); + int ns_len = id_hash.Len(); id_hash.Sort_by(this); // assert that all items are grouped in pairs of subj, talk; note that subj is even and talk is odd int nxt_ns_id = Int_.Min_value; @@ -204,7 +202,7 @@ public class Xow_ns_mgr implements Gfo_invk, gplx.core.lists.ComparerAble { // sort again b/c new ns may have been added id_hash.Sort_by(this); - ns_len = id_hash.Count(); + ns_len = id_hash.Len(); // assign ords; assert that subj has even ordinal index ords_len = 0; for (int i = 0; i < ns_len; i++) { diff --git a/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java b/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java index 8229fa044..cba035c5a 100644 --- a/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/pages/lnkis/Xopg_redlink_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.pages.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.pages.*; +package gplx.xowa.wikis.pages.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.guis.cbks.js.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.langs.vnts.*; @@ -55,7 +55,7 @@ public class Xopg_redlink_mgr implements Gfo_invk { for (int i = 0; i < len; ++i) { Xopg_lnki_itm lnki = lnki_list.Get_at(i); byte[] full_db = lnki.Ttl().Full_db(); - Xowd_page_itm page_row = (Xowd_page_itm)lnki_hash.Get_by(full_db); + Xowd_page_itm page_row = (Xowd_page_itm)lnki_hash.GetByOrNull(full_db); if (page_row.Exists()) continue; // page exists; nothing to do; // for vnt languages, convert missing ttl to vnt and check again; EX: [[zh_cn]] will check for page_ttl for [[zh_tw]] diff --git a/400_xowa/src/gplx/xowa/wikis/pages/skins/Xopg_xtn_skin_mgr.java b/400_xowa/src/gplx/xowa/wikis/pages/skins/Xopg_xtn_skin_mgr.java index 26d5b2e2c..8e71b3f5c 100644 --- a/400_xowa/src/gplx/xowa/wikis/pages/skins/Xopg_xtn_skin_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/pages/skins/Xopg_xtn_skin_mgr.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.pages.skins; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.pages.*; -public class Xopg_xtn_skin_mgr { - private Ordered_hash hash = Ordered_hash_.New_bry(); - public int Count() {return hash.Count();} - public void Add(Xopg_xtn_skin_itm itm) {hash.Add_if_dupe_use_1st(itm.Key(), itm);} - public Xopg_xtn_skin_itm Get_at(int i) {return (Xopg_xtn_skin_itm)hash.Get_at(i);} - public Xopg_xtn_skin_itm Get_or_null(byte[] key) {return (Xopg_xtn_skin_itm)hash.Get_by(key);} - public void Clear() {hash.Clear();} -} +package gplx.xowa.wikis.pages.skins; import gplx.*; +public class Xopg_xtn_skin_mgr { + private Ordered_hash hash = Ordered_hash_.New_bry(); + public int Count() {return hash.Len();} + public void Add(Xopg_xtn_skin_itm itm) {hash.AddIfDupeUse1st(itm.Key(), itm);} + public Xopg_xtn_skin_itm Get_at(int i) {return (Xopg_xtn_skin_itm)hash.Get_at(i);} + public Xopg_xtn_skin_itm Get_or_null(byte[] key) {return (Xopg_xtn_skin_itm)hash.GetByOrNull(key);} + public void Clear() {hash.Clear();} +} diff --git a/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_mgr.java b/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_mgr.java index 105e61454..af76e94cf 100644 --- a/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/pages/tags/Xopg_tag_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.pages.tags; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.pages.*; +package gplx.xowa.wikis.pages.tags; import gplx.*; public class Xopg_tag_mgr { private final List_adp list = List_adp_.New(); public Xopg_tag_mgr(boolean pos_is_head) {this.pos_is_head = pos_is_head;} @@ -21,7 +21,7 @@ public class Xopg_tag_mgr { public int Len() {return list.Len();} public void Clear() {list.Clear();} public Xopg_tag_itm Get_at(int i) {return (Xopg_tag_itm)list.Get_at(i);} - public Xopg_tag_itm[] To_ary() {return (Xopg_tag_itm[])list.To_ary(Xopg_tag_itm.class);} + public Xopg_tag_itm[] To_ary() {return (Xopg_tag_itm[])list.ToAry(Xopg_tag_itm.class);} public void Add(Xopg_tag_itm... ary) {for (Xopg_tag_itm itm : ary) list.Add(itm);} public void Copy(Xopg_tag_mgr src) { int len = src.Len(); diff --git a/400_xowa/src/gplx/xowa/wikis/pages/wtxts/Xopg_wtxt_data.java b/400_xowa/src/gplx/xowa/wikis/pages/wtxts/Xopg_wtxt_data.java index 13349f339..6e427b47b 100644 --- a/400_xowa/src/gplx/xowa/wikis/pages/wtxts/Xopg_wtxt_data.java +++ b/400_xowa/src/gplx/xowa/wikis/pages/wtxts/Xopg_wtxt_data.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.pages.wtxts; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.pages.*; +package gplx.xowa.wikis.pages.wtxts; import gplx.*; import gplx.xowa.*; public class Xopg_wtxt_data { public Xopg_toc_mgr Toc() {return toc;} private final Xopg_toc_mgr toc = new Xopg_toc_mgr(); public int Ctgs__len() {return ctg_hash == null ? 0 : ctg_hash.Len();} private Ordered_hash ctg_hash; @@ -21,7 +21,7 @@ public class Xopg_wtxt_data { public Xoa_ttl[] Ctgs__to_ary() {return ctg_hash == null ? new Xoa_ttl[0] : (Xoa_ttl[])ctg_hash.To_ary(Xoa_ttl.class);} public void Ctgs__add(Xoa_ttl ttl) { if (ctg_hash == null) ctg_hash = Ordered_hash_.New_bry(); - ctg_hash.Add_if_dupe_use_1st(ttl.Full_db(), ttl); + ctg_hash.AddIfDupeUse1st(ttl.Full_db(), ttl); } public void Clear() { if (ctg_hash != null) ctg_hash.Clear(); diff --git a/400_xowa/src/gplx/xowa/wikis/tdbs/ByteAry_fil.java b/400_xowa/src/gplx/xowa/wikis/tdbs/ByteAry_fil.java index 62887680f..911ec9e77 100644 --- a/400_xowa/src/gplx/xowa/wikis/tdbs/ByteAry_fil.java +++ b/400_xowa/src/gplx/xowa/wikis/tdbs/ByteAry_fil.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.tdbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; +package gplx.xowa.wikis.tdbs; import gplx.*; import gplx.core.primitives.*; public class ByteAry_fil { public List_adp Itms() {return itms;} List_adp itms = List_adp_.New(); @@ -27,7 +27,7 @@ public class ByteAry_fil { return this; } public Object Xto_itms(Class itm_type) { - Object rv = itms.To_ary(itm_type); + Object rv = itms.ToAry(itm_type); itms.Clear(); if (raw_bry.length > raw_max) raw_bry = Bry_.Empty; raw_len.Val_zero_(); diff --git a/400_xowa/src/gplx/xowa/wikis/tdbs/hives/Xow_hive_mgr_fxt.java b/400_xowa/src/gplx/xowa/wikis/tdbs/hives/Xow_hive_mgr_fxt.java index 3b60e5bd9..0239e50fc 100644 --- a/400_xowa/src/gplx/xowa/wikis/tdbs/hives/Xow_hive_mgr_fxt.java +++ b/400_xowa/src/gplx/xowa/wikis/tdbs/hives/Xow_hive_mgr_fxt.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.tdbs.hives; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.tdbs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.tdbs.hives; import gplx.*; import gplx.xowa.*; +import gplx.xowa.wikis.tdbs.*; import gplx.core.encoders.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.wikis.tdbs.xdats.*; public class Xow_hive_mgr_fxt { @@ -30,7 +31,7 @@ public class Xow_hive_mgr_fxt { public void Find_nearby(String key, int count, boolean include_redirects, String... expd) { List_adp list = List_adp_.New(); wiki.Hive_mgr().Find_bgn(list, wiki.Ns_mgr().Ns_main(), Bry_.new_a7(key), count, include_redirects); - int actl_len = list.Count(); + int actl_len = list.Len(); String[] actl = new String[actl_len]; for (int i = 0; i < actl_len; i++) { Xowd_page_itm itm = (Xowd_page_itm)list.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_fil.java b/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_fil.java index e465f7c5f..347459593 100644 --- a/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_fil.java +++ b/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_fil.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.tdbs.metas; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.tdbs.*; +package gplx.xowa.wikis.tdbs.metas; import gplx.*; import gplx.core.flds.*; public class Xof_meta_fil { private final Ordered_hash itms = Ordered_hash_.New_bry(); @@ -29,9 +29,9 @@ public class Xof_meta_fil { } return rv; } - public Xof_meta_itm Get_or_null(byte[] ttl) {return (Xof_meta_itm)itms.Get_by(ttl);} + public Xof_meta_itm Get_or_null(byte[] ttl) {return (Xof_meta_itm)itms.GetByOrNull(ttl);} public void Save(Gfo_fld_wtr wtr) { - int itms_len = itms.Count(); + int itms_len = itms.Len(); for (int i = 0; i < itms_len; i++) { Xof_meta_itm itm = (Xof_meta_itm)itms.Get_at(i); itm.Save(wtr); diff --git a/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_mgr.java b/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_mgr.java index 59ac91f52..ea2f8230f 100644 --- a/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/tdbs/metas/Xof_meta_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.tdbs.metas; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.tdbs.*; +package gplx.xowa.wikis.tdbs.metas; import gplx.*; import gplx.xowa.*; import gplx.core.flds.*; public class Xof_meta_mgr implements Gfo_invk { private Object[] root = new Object[16]; private final Ordered_hash dirty_fils = Ordered_hash_.New_bry(); @@ -48,7 +48,7 @@ public class Xof_meta_mgr implements Gfo_invk { public void Clear() {root = new Object[16]; dirty_fils.Clear();} public void Save() {Save(false);} public void Save(boolean clear) { - int dirty_len = dirty_fils.Count(); + int dirty_len = dirty_fils.Len(); Bry_bfr tmp_bfr = Bry_bfr_.New(); wtr.Bfr_(tmp_bfr); for (int i = 0; i < dirty_len; i++) { diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java index a019b56ff..f5ee25d57 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.xwikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; -import gplx.core.net.*; import gplx.xowa.htmls.hrefs.*; -import gplx.xowa.langs.*; +package gplx.xowa.wikis.xwikis; import gplx.*; import gplx.xowa.*; +import gplx.core.net.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.xwikis.parsers.*; import gplx.xowa.wikis.xwikis.sitelinks.*; import gplx.xowa.wikis.xwikis.interwikis.*; public class Xow_xwiki_mgr { @@ -27,7 +26,7 @@ public class Xow_xwiki_mgr { } public Xow_interwiki_map Interwiki_map() {return interwiki_map;} private final Xow_interwiki_map interwiki_map = new Xow_interwiki_map(); // separate map for Scrib; DATE:2017-04-01 public int Xwiki_domain_tid() {return xwiki_domain_tid;} private int xwiki_domain_tid; - public int Len() {return list.Count();} + public int Len() {return list.Len();} public void Clear() {hash.Clear(); list.Clear();} public void Sort_by_key() {list.Sort();} public Xow_xwiki_itm Get_at(int i) {return (Xow_xwiki_itm)list.Get_at(i);} @@ -72,7 +71,7 @@ public class Xow_xwiki_mgr { itm_parser.Init_by_wiki(wiki.Domain_itm()); itm_parser.Load_by_bry(src); Ordered_hash xwiki_list = itm_parser.Xwiki_list(); - int len = xwiki_list.Count(); + int len = xwiki_list.Len(); for (int i = 0; i < len; ++i) { Xow_xwiki_itm itm = (Xow_xwiki_itm)xwiki_list.Get_at(i); Add_itm(itm); @@ -82,8 +81,8 @@ public class Xow_xwiki_mgr { public void Add_itm(Xow_xwiki_itm itm) { byte[] key_bry = itm.Key_bry(); if (wiki.Ns_mgr().Names_get_or_null(key_bry) != null) return;// NOTE: do not add xwiki if key matches Srch_rslt_cbk; EX: en.wiktionary.org has ns of "Wiktionary"; do not add key of "wiktionary"; note that wikipedia does have an key to wiktionary - list.Add_if_dupe_use_nth(key_bry, itm); // NOTE: some wikis like commons will be added multiple times under different aliases (commons, c, commons.wikimedia.org); need to check domain and add only once DATE:2014-11-07 - hash.Add_if_dupe_use_nth(key_bry, itm); + list.AddIfDupeUseNth(key_bry, itm); // NOTE: some wikis like commons will be added multiple times under different aliases (commons, c, commons.wikimedia.org); need to check domain and add only once DATE:2014-11-07 + hash.AddIfDupeUseNth(key_bry, itm); } private static int Xwiki_tid(int tid) { switch (tid) { diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/interwikis/Xow_interwiki_map.java b/400_xowa/src/gplx/xowa/wikis/xwikis/interwikis/Xow_interwiki_map.java index de416762d..67232f2a8 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/interwikis/Xow_interwiki_map.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/interwikis/Xow_interwiki_map.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.xwikis.interwikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; +package gplx.xowa.wikis.xwikis.interwikis; import gplx.*; public class Xow_interwiki_map { private final Ordered_hash hash = Ordered_hash_.New_bry(); public int Len() {return hash.Len();} public Xow_interwiki_itm Get_at(int i) {return (Xow_interwiki_itm)hash.Get_at(i);} public void Add(byte[] key, byte[] domain, byte[] url) { Xow_interwiki_itm itm = new Xow_interwiki_itm(key, domain, url); - hash.Add_if_dupe_use_nth(key, itm); + hash.AddIfDupeUseNth(key, itm); } } diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_itm_parser_tst.java b/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_itm_parser_tst.java index 7ee64ec2e..79f2c05ee 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_itm_parser_tst.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_itm_parser_tst.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.xwikis.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; +package gplx.xowa.wikis.xwikis.parsers; import gplx.*; +import gplx.xowa.wikis.xwikis.*; import org.junit.*; import gplx.xowa.wikis.domains.*; public class Xow_xwiki_itm_parser_tst { private final Xow_xwiki_itm_parser_fxt fxt = new Xow_xwiki_itm_parser_fxt(); @@ -82,7 +83,7 @@ class Xow_xwiki_itm_parser_fxt { } private String To_str() { Ordered_hash list = parser.Xwiki_list(); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Xow_xwiki_itm itm = (Xow_xwiki_itm)list.Get_at(i); tmp_bfr.Add(itm.Key_bry()).Add_byte_pipe(); diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_mgr_tst.java b/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_mgr_tst.java index b4a2dcba0..17862a385 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/parsers/Xow_xwiki_mgr_tst.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.xwikis.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; +package gplx.xowa.wikis.xwikis.parsers; import gplx.*; import gplx.xowa.*; +import gplx.xowa.wikis.xwikis.*; import org.junit.*; import gplx.core.strings.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.langs.*; public class Xow_xwiki_mgr_tst { @@ -128,7 +129,7 @@ class Xow_xwiki_mgr_fxt { if (itm == null) itm = xwiki_null_(String_.new_u8(alias)); // "null", ignore rv.Add(itm); } - return (Xow_xwiki_itm[])rv.To_ary(Xow_xwiki_itm.class); + return (Xow_xwiki_itm[])rv.ToAry(Xow_xwiki_itm.class); } String Xto_str(Xow_xwiki_itm[] itms) { int len = itms.length; diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp.java b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp.java index 2f4fb9df6..1a247e26d 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.xwikis.sitelinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.xwikis.sitelinks; import gplx.*; public class Xoa_sitelink_grp implements gplx.CompareAble { private final Ordered_hash hash = Ordered_hash_.New_bry(); public Xoa_sitelink_grp(byte[] name, int sort) { @@ -22,14 +22,14 @@ public class Xoa_sitelink_grp implements gplx.CompareAble { } public byte[] Name() {return name;} private final byte[] name; public int Sort() {return sort;} private final int sort; - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Xoa_sitelink_itm Get_at(int i) {return (Xoa_sitelink_itm)hash.Get_at(i);} public void Add(Xoa_sitelink_itm itm) {hash.Add(itm.Key(), itm);} public void Del(byte[] key) {hash.Del(key);} public void Active_len__add() {++active_len;} public int Active_len() {return active_len;} private int active_len; public void Reset() { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xoa_sitelink_itm itm = (Xoa_sitelink_itm)hash.Get_at(i); itm.Init_by_page(null, null, false, null); // clear out pre-existing page names; needed b/c this struct is a singleton for entire wiki @@ -40,7 +40,7 @@ public class Xoa_sitelink_grp implements gplx.CompareAble { public void To_bfr(Bry_bfr bfr) { bfr.Add_int_digits(1, Xoa_sitelink_mgr_parser.Tid__grp).Add_byte_pipe(); bfr.Add(name).Add_byte_nl(); - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xoa_sitelink_itm itm = (Xoa_sitelink_itm)hash.Get_at(i); itm.To_bfr(bfr); diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp_mgr.java b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp_mgr.java index 4cf6ca350..7ffa99554 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_grp_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.xwikis.sitelinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.xwikis.sitelinks; import gplx.*; public class Xoa_sitelink_grp_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); public Xoa_sitelink_grp_mgr() { @@ -21,20 +21,20 @@ public class Xoa_sitelink_grp_mgr { hash.Add(default_grp.Name(), default_grp); } public Xoa_sitelink_grp Default_grp() {return default_grp;} private final Xoa_sitelink_grp default_grp; - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public void Clear() {hash.Clear();} public Xoa_sitelink_grp Get_at(int idx) {return (Xoa_sitelink_grp)hash.Get_at(idx);} public Xoa_sitelink_grp Get_by_or_new(byte[] key) { - Xoa_sitelink_grp rv = (Xoa_sitelink_grp)hash.Get_by(key); + Xoa_sitelink_grp rv = (Xoa_sitelink_grp)hash.GetByOrNull(key); if (rv == null) { - rv = new Xoa_sitelink_grp(key, hash.Count()); + rv = new Xoa_sitelink_grp(key, hash.Len()); hash.Add(key, rv); } return rv; } public void Sort() {hash.Sort();} public void To_bfr(Bry_bfr bfr) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; ++i) { Xoa_sitelink_grp grp = (Xoa_sitelink_grp)hash.Get_at(i); grp.To_bfr(bfr); diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_itm_mgr.java b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_itm_mgr.java index d7bc9d3de..13dc6cdc2 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_itm_mgr.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/Xoa_sitelink_itm_mgr.java @@ -1,31 +1,30 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.wikis.xwikis.sitelinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; -import gplx.xowa.langs.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.wikis.xwikis.sitelinks; import gplx.*; public class Xoa_sitelink_itm_mgr { private final Ordered_hash hash = Ordered_hash_.New_bry(); private final Xoa_sitelink_grp default_grp; public Xoa_sitelink_itm_mgr(Xoa_sitelink_grp default_grp) {this.default_grp = default_grp;} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public void Clear() {hash.Clear();} public void Add(Xoa_sitelink_itm itm) {hash.Add(itm.Key(), itm);} public Xoa_sitelink_itm Get_at(int idx) {return (Xoa_sitelink_itm)hash.Get_at(idx);} - public Xoa_sitelink_itm Get_by(byte[] key) {return (Xoa_sitelink_itm)hash.Get_by(key);} + public Xoa_sitelink_itm Get_by(byte[] key) {return (Xoa_sitelink_itm)hash.GetByOrNull(key);} public Xoa_sitelink_itm Get_by_or_new(byte[] key) { - Xoa_sitelink_itm rv = (Xoa_sitelink_itm)hash.Get_by(key); + Xoa_sitelink_itm rv = (Xoa_sitelink_itm)hash.GetByOrNull(key); if (rv == null) { rv = new Xoa_sitelink_itm(default_grp, key, Bry_.Empty); hash.Add(key, rv); diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/htmls/Xoa_sitelink_div_wtr.java b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/htmls/Xoa_sitelink_div_wtr.java index bfd0c7054..9a38ecedc 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/htmls/Xoa_sitelink_div_wtr.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/sitelinks/htmls/Xoa_sitelink_div_wtr.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.wikis.xwikis.sitelinks.htmls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.xwikis.sitelinks.*; +package gplx.xowa.wikis.xwikis.sitelinks.htmls; import gplx.*; import gplx.xowa.*; +import gplx.xowa.wikis.xwikis.sitelinks.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.apps.apis.xowa.html.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; +import gplx.xowa.langs.msgs.*; import gplx.xowa.xtns.wbases.core.*; public class Xoa_sitelink_div_wtr { private final Xoa_sitelink_grp_wtr grp_wtr = new Xoa_sitelink_grp_wtr(); @@ -30,7 +31,7 @@ public class Xoa_sitelink_div_wtr { grp.Reset(); } // add itms to each grp - int slink_len = slink_list.Count(); + int slink_len = slink_list.Len(); for (int i = 0; i < slink_len; i++) { Wdata_sitelink_itm slink = (Wdata_sitelink_itm)slink_list.Get_at(i); Xoa_ttl ttl = slink.Page_ttl(); diff --git a/400_xowa/src/gplx/xowa/xtns/Xow_xtn_mgr.java b/400_xowa/src/gplx/xowa/xtns/Xow_xtn_mgr.java index 81fb89787..b291ae170 100644 --- a/400_xowa/src/gplx/xowa/xtns/Xow_xtn_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/Xow_xtn_mgr.java @@ -19,7 +19,7 @@ import gplx.xowa.xtns.cites.*; import gplx.xowa.xtns.imaps.*; import gplx.xowa.x import gplx.xowa.xtns.insiders.*; import gplx.xowa.xtns.indicators.*; import gplx.xowa.xtns.pagebanners.*; public class Xow_xtn_mgr implements Gfo_invk { private Ordered_hash regy = Ordered_hash_.New_bry(); - public int Count() {return regy.Count();} + public int Count() {return regy.Len();} public Cite_xtn_mgr Xtn_cite() {return xtn_cite;} private Cite_xtn_mgr xtn_cite; public Imap_xtn_mgr Xtn_imap() {return xtn_imap;} private Imap_xtn_mgr xtn_imap; public Sites_xtn_mgr Xtn_sites() {return xtn_sites;} private Sites_xtn_mgr xtn_sites; @@ -64,14 +64,14 @@ public class Xow_xtn_mgr implements Gfo_invk { return this; } public void Init_by_app(Xoae_app app) { - int regy_len = regy.Count(); + int regy_len = regy.Len(); for (int i = 0; i < regy_len; i++) { Xox_mgr mgr = (Xox_mgr)regy.Get_at(i); mgr.Xtn_init_by_app(app); } } public Xow_xtn_mgr Init_by_wiki(Xowe_wiki wiki) { - int regy_len = regy.Count(); + int regy_len = regy.Len(); for (int i = 0; i < regy_len; i++) { Xox_mgr mgr = (Xox_mgr)regy.Get_at(i); mgr.Xtn_init_by_wiki(wiki); @@ -79,7 +79,7 @@ public class Xow_xtn_mgr implements Gfo_invk { return this; } public Xox_mgr Get_at(int i) {return (Xox_mgr)regy.Get_at(i);} - public Xox_mgr Get_or_fail(byte[] key) {Object rv = regy.Get_by(key); if (rv == null) throw Err_.new_wo_type("unknown xtn", "key", String_.new_u8(key)); return (Xox_mgr)rv;} + public Xox_mgr Get_or_fail(byte[] key) {Object rv = regy.GetByOrNull(key); if (rv == null) throw Err_.new_wo_type("unknown xtn", "key", String_.new_u8(key)); return (Xox_mgr)rv;} private Xox_mgr Add(Xoae_app app, Xox_mgr xtn) { xtn.Xtn_ctor_by_app(app); regy.Add(xtn.Xtn_key(), xtn); diff --git a/400_xowa/src/gplx/xowa/xtns/cites/Cite_link_label_mgr.java b/400_xowa/src/gplx/xowa/xtns/cites/Cite_link_label_mgr.java index 6b4b02498..24188257e 100644 --- a/400_xowa/src/gplx/xowa/xtns/cites/Cite_link_label_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/cites/Cite_link_label_mgr.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cites; import gplx.*; class Cite_link_label_mgr { private final Hash_adp_bry hash = Hash_adp_bry.cs(); public void Clear() { hash.Clear(); } public Cite_link_label_grp Get_or_null(byte[] group) { - return (Cite_link_label_grp)hash.Get_by(group); + return (Cite_link_label_grp)hash.GetByOrNull(group); } public void Add(byte[] group, Cite_link_label_grp grp) { hash.Add(group, grp); diff --git a/400_xowa/src/gplx/xowa/xtns/cites/Ref_html_wtr_cfg.java b/400_xowa/src/gplx/xowa/xtns/cites/Ref_html_wtr_cfg.java index 4234f3a5d..26a66fcde 100644 --- a/400_xowa/src/gplx/xowa/xtns/cites/Ref_html_wtr_cfg.java +++ b/400_xowa/src/gplx/xowa/xtns/cites/Ref_html_wtr_cfg.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cites; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; public class Ref_html_wtr_cfg { public Bry_fmtr Itm_html() {return itm_html;} private Bry_fmtr itm_html; public Ref_html_wtr_cfg Itm_html_(String v) {itm_html = Bry_fmtr.new_(v, "itm_id", "grp_id", "grp_key"); return this;} @@ -114,6 +114,6 @@ public class Ref_html_wtr_cfg { if (last) break; ++pos; } - return (byte[][])list.To_ary_and_clear(byte[].class); + return (byte[][])list.ToAryAndClear(byte[].class); } } diff --git a/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_grp.java b/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_grp.java index af4166712..aaf18f66c 100644 --- a/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_grp.java +++ b/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_grp.java @@ -13,22 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cites; import gplx.*; public class Ref_itm_grp { private final List_adp lsts = List_adp_.New(); private int lst_idx; public Ref_itm_grp(byte[] grp_name) {this.grp_name = grp_name;} public byte[] Grp_name() {return grp_name;} private byte[] grp_name; public int Grp_seal() { - if (lst_idx == lsts.Count()) // NOTE: lst_idx == lsts.Count() if there are no itms in lst; need to add placeholder list anyway; nodes has a List_index, which will call lsts.Get_at(); see Empty_group_before_ref + if (lst_idx == lsts.Len()) // NOTE: lst_idx == lsts.Count() if there are no itms in lst; need to add placeholder list anyway; nodes has a List_index, which will call lsts.Get_at(); see Empty_group_before_ref lsts.Add(new Ref_itm_lst(grp_name)); return lst_idx++; } - public int Lsts_len() {return lsts.Count();} - public Ref_itm_lst Lsts_get_at(int i) {return i < lsts.Count() ? (Ref_itm_lst)lsts.Get_at(i) : null;} // NOTE: null can be returned; see Infobox planet; w:Mars + public int Lsts_len() {return lsts.Len();} + public Ref_itm_lst Lsts_get_at(int i) {return i < lsts.Len() ? (Ref_itm_lst)lsts.Get_at(i) : null;} // NOTE: null can be returned; see Infobox planet; w:Mars public void Lsts_add(byte[] itm_name, byte[] follow, Ref_nde itm) { Ref_itm_lst lst = null; - int lsts_len = lsts.Count(); + int lsts_len = lsts.Len(); if (lst_idx >= lsts_len) { lst = new Ref_itm_lst(grp_name); lsts.Add(lst); @@ -38,7 +38,7 @@ public class Ref_itm_grp { lst.Itms_add(itm_name, follow, itm); } public void Lsts_clear() { - int lsts_len = lsts.Count(); + int lsts_len = lsts.Len(); for (int i = 0; i < lsts_len; i++) { Ref_itm_lst lst = (Ref_itm_lst)lsts.Get_at(i); lst.Itms_clear(); diff --git a/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_lst.java b/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_lst.java index 99c7a78a8..43d551f1c 100644 --- a/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_lst.java +++ b/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_lst.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cites; import gplx.*; public class Ref_itm_lst { private final Hash_adp hash = Hash_adp_bry.cs(); private final List_adp list = List_adp_.New(); private int idx_major_last = 0; // private byte[] grp_name; public Ref_itm_lst(byte[] grp_name) {} //this.grp_name = grp_name; - public int Itms_len() {return list.Count();} + public int Itms_len() {return list.Len();} public Ref_nde Itms_get_at(int i) {return (Ref_nde)list.Get_at(i);} public void Itms_add(byte[] itm_name, byte[] follow, Ref_nde itm) { if (itm_name == Bry_.Empty) { @@ -29,7 +29,7 @@ public class Ref_itm_lst { list.Add(itm); } else { - Object o = hash.Get_by(follow); + Object o = hash.GetByOrNull(follow); if (o == null) {// fail } else { @@ -41,7 +41,7 @@ public class Ref_itm_lst { } } else { - Object o = hash.Get_by(itm_name); + Object o = hash.GetByOrNull(itm_name); if (o == null) { hash.Add(itm_name, itm); itm.Idx_major_(idx_major_last++); diff --git a/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_mgr.java b/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_mgr.java index 42b995bdd..940f8abbd 100644 --- a/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/cites/Ref_itm_mgr.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cites; import gplx.*; public class Ref_itm_mgr { private final Hash_adp_bry grps = Hash_adp_bry.cs(); // CASE_MATCH:changed from ci; DATE:2014-07-07 private final Ref_itm_grp grp_default = new Ref_itm_grp(Bry_.Empty); private int uid_last; public boolean References__recursing() {return references__recursing;} public void References__recursing_(boolean v) {references__recursing = v;} private boolean references__recursing; public Ref_itm_lst Lst_get(byte[] grp_name, int lst_idx) { - return Bry_.Len_eq_0(grp_name) ? grp_default.Lsts_get_at(lst_idx) : ((Ref_itm_grp)grps.Get_by(grp_name)).Lsts_get_at(lst_idx); // NOTE: must be Bry_.Len_eq_0 else not same as ; DATE:2013-02-06 + return Bry_.Len_eq_0(grp_name) ? grp_default.Lsts_get_at(lst_idx) : ((Ref_itm_grp)grps.GetByOrNull(grp_name)).Lsts_get_at(lst_idx); // NOTE: must be Bry_.Len_eq_0 else not same as ; DATE:2013-02-06 } public void Grps_add(byte[] grp_name, byte[] itm_name, byte[] follow, Ref_nde itm) { Ref_itm_grp grp = Grps_get(grp_name); diff --git a/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_converter.java b/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_converter.java index a5cc890e8..1c0075126 100644 --- a/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_converter.java +++ b/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_converter.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.core.primitives.*; import gplx.langs.phps.*; import gplx.langs.jsons.*; @@ -40,7 +40,7 @@ class Cldr_name_converter { byte[] src = Io_mgr.Instance.LoadFilBry(fil); rv.Add(Parse_fil(key, src)); } - return (Cldr_name_file[])rv.To_ary_and_clear(Cldr_name_file.class); + return (Cldr_name_file[])rv.ToAryAndClear(Cldr_name_file.class); } public String Extract_key_or_fail(String fil_name) { if (!String_.Has_at_bgn(fil_name, File_CldrNames) || !String_.Has_at_end(fil_name, ".php")) throw Err_.new_wo_type("file name must have a format of CldrNamesLANG.php", "fil_name", fil_name); @@ -49,7 +49,7 @@ class Cldr_name_converter { public Cldr_name_file Parse_fil(String key, byte[] src) { Cldr_name_file file = new Cldr_name_file(key); parser.Parse_tkns(src, eval); - Php_line[] lines = (Php_line[])eval.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])eval.List().ToAry(Php_line.class); int lines_len = lines.length; for (int i = 0; i < lines_len; i++) { Php_line line = lines[i]; @@ -91,7 +91,7 @@ class Cldr_name_converter { return doc_wtr.Bld_as_str(); } private void To_json(Int_obj_ref written, String node_name, Ordered_hash hash) { - int len = hash.Count(); + int len = hash.Len(); if (len == 0) return; doc_wtr.Key(written.Val() != 0, node_name); doc_wtr.Nde_bgn(); diff --git a/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_loader.java b/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_loader.java index 704ed91b2..ad3b41fa0 100644 --- a/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_loader.java +++ b/400_xowa/src/gplx/xowa/xtns/cldrs/Cldr_name_loader.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.langs.jsons.*; public class Cldr_name_loader { private final Json_parser parser = new Json_parser(); @@ -34,7 +34,7 @@ public class Cldr_name_loader { lang_key = String_.Lower(lang_key); // return file if already exists - Cldr_name_file file = (Cldr_name_file)files_hash.Get_by(lang_key); + Cldr_name_file file = (Cldr_name_file)files_hash.GetByOrNull(lang_key); if (file != null) return file; // create urls_hash from dir if it doesn't exist @@ -42,7 +42,7 @@ public class Cldr_name_loader { urls_hash = Make_urls_hash(Io_mgr.Instance.QueryDir_fils(cldr_dir)); // get file - Io_url url = (Io_url)urls_hash.Get_by(lang_key); + Io_url url = (Io_url)urls_hash.GetByOrNull(lang_key); if (url == null) { Gfo_usr_dlg_.Instance.Log_many("", "", "no cldrName file exists for lang; lang=~{0}", lang_key); return Cldr_name_file.Empty; @@ -112,7 +112,7 @@ public class Cldr_name_loader { } name = String_.Lower(name); name = String_.Replace(name, "_", "-"); // CldrNamesEn_gb.json should have a key of "en-gb", not en_gb; ISSUE#:349; DATE:2019-02-01 - rv.Add_if_dupe_use_1st(name, url); + rv.AddIfDupeUse1st(name, url); } return rv; } diff --git a/400_xowa/src/gplx/xowa/xtns/cldrs/Language_name_loader.java b/400_xowa/src/gplx/xowa/xtns/cldrs/Language_name_loader.java index 438c571fe..ba249969c 100644 --- a/400_xowa/src/gplx/xowa/xtns/cldrs/Language_name_loader.java +++ b/400_xowa/src/gplx/xowa/xtns/cldrs/Language_name_loader.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.langs.jsons.*; public class Language_name_loader { private final Json_parser parser = new Json_parser(); @@ -53,6 +53,6 @@ public class Language_name_loader { Language_name itm = new Language_name(code, name, null); list.Add(itm); } - return (Language_name[])list.To_ary_and_clear(Language_name.class); + return (Language_name[])list.ToAryAndClear(Language_name.class); } } diff --git a/400_xowa/src/gplx/xowa/xtns/cldrs/Language_names_converter.java b/400_xowa/src/gplx/xowa/xtns/cldrs/Language_names_converter.java index 05a7bbbf0..1949190e5 100644 --- a/400_xowa/src/gplx/xowa/xtns/cldrs/Language_names_converter.java +++ b/400_xowa/src/gplx/xowa/xtns/cldrs/Language_names_converter.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.cldrs; import gplx.*; import gplx.core.primitives.*; import gplx.langs.phps.*; import gplx.langs.jsons.*; @@ -35,7 +35,7 @@ class Language_names_converter { } public Language_name[] Parse(byte[] src) { parser.Parse_tkns(src, eval); - Php_line[] lines = (Php_line[])eval.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])eval.List().ToAry(Php_line.class); List_adp rv = List_adp_.New(); int lines_len = lines.length; @@ -49,7 +49,7 @@ class Language_names_converter { } } eval.Clear(); - return (Language_name[])rv.To_ary_and_clear(Language_name.class); + return (Language_name[])rv.ToAryAndClear(Language_name.class); } private byte[][][] Parse_ary_kvs(byte[] src, Php_line_assign assign) { List_adp list = List_adp_.New(); @@ -69,7 +69,7 @@ class Language_names_converter { byte[] comm = tmp_bfr.To_bry_and_clear(); list.Add(new byte[][] {key, val, comm}); } - return (byte[][][])list.To_ary_and_clear(byte[][].class); + return (byte[][][])list.ToAryAndClear(byte[][].class); } public String To_json(Language_name[] ary) { Json_doc_wtr doc_wtr = new Json_doc_wtr(); diff --git a/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_page_finder.java b/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_page_finder.java index b34f34634..8e8f5c7af 100644 --- a/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_page_finder.java +++ b/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_page_finder.java @@ -13,9 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.dynamicPageList; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.dynamicPageList; import gplx.*; import gplx.xowa.*; import gplx.core.primitives.*; import gplx.core.lists.*; -import gplx.xowa.wikis.dbs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.urls.*; class Dpl_page_finder { @@ -94,7 +93,7 @@ class Dpl_page_finder { return rv; // loop exclude ttls - int len = ttls.Count(); + int len = ttls.Len(); for (int i = 0; i < len; i++) { Xoa_ttl ttl = Get_ctg_ttl_or_null(ttls, i); if (ttl == null) continue; diff --git a/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_xnde.java b/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_xnde.java index a105aa3e5..2a0935d23 100644 --- a/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_xnde.java +++ b/400_xowa/src/gplx/xowa/xtns/dynamicPageList/Dpl_xnde.java @@ -1,24 +1,22 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ package gplx.xowa.xtns.dynamicPageList; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; -import gplx.core.primitives.*; import gplx.langs.htmls.*; import gplx.langs.htmls.encoders.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.htmls.*; -import gplx.xowa.wikis.dbs.*; import gplx.xowa.addons.wikis.ctgs.*; import gplx.xowa.wikis.data.tbls.*; +import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.htmls.*; import gplx.xowa.parsers.amps.*; -import gplx.xowa.addons.wikis.ctgs.htmls.catpages.doms.*; import gplx.xowa.addons.wikis.ctgs.htmls.catpages.urls.*; public class Dpl_xnde implements Xox_xnde { private Dpl_itm itm; private Ordered_hash pages; public void Xatr__set(Xowe_wiki wiki, byte[] src, Mwh_atr_itm xatr, Object xatr_id_obj) {} // NOTE: has no attributes @@ -29,7 +27,7 @@ public class Dpl_xnde implements Xox_xnde { public void Xtn_write(Bry_bfr bfr, Xoae_app app, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, Xoae_page wpg, Xop_xnde_tkn xnde, byte[] src) { Xowe_wiki wiki = ctx.Wiki(); Dpl_html_data html_mode = Dpl_html_data.new_(Dpl_itm_keys.Key_unordered); - int itms_len = pages.Count(); + int itms_len = pages.Len(); if (itms_len == 0) { if (!itm.Suppress_errors()) bfr.Add_str_a7("No pages meet these criteria."); diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java index 07fe0f203..e585c2b8c 100644 --- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java +++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_mgr_wtr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.langs.htmls.*; import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.parsers.htmls.*; @@ -174,7 +174,7 @@ public class Gallery_mgr_wtr { Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__class, ul_cls); Gfh_wtr.Write_atr_bry(bfr, Gfh_atr_.Bry__style, ul_style); if (xatr_list != null) { - int len = xatr_list.Count(); + int len = xatr_list.Len(); for (int i = 0; i < len; i++) { Mwh_atr_itm xatr = (Mwh_atr_itm)xatr_list.Get_at(i); if (!whitelist_mgr.Chk(Xop_xnde_tag_.Tid__ul, xatr)) continue; diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java index ac819ff29..45c06c355 100644 --- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_parser_tst.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; -import org.junit.*; import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; +package gplx.xowa.xtns.gallery; import gplx.*; import gplx.xowa.*; +import org.junit.*; +import gplx.xowa.langs.kwds.*; public class Gallery_parser_tst { @Before public void init() {fxt.Init();} private Gallery_parser_fxt fxt = new Gallery_parser_fxt(); @Test public void All() {fxt.Test_parse("File:A.png|a|alt=b|link=c" , fxt.Expd("File:A.png", "a" , "b" , "c"));} @@ -91,7 +92,7 @@ class Gallery_parser_fxt { Tfds.Eq_ary(String_.Ary_flatten(expd), String_.Ary_flatten(Xto_str_ary(src, actl))); } private String[][] Xto_str_ary(byte[] src, List_adp list) { - int len = list.Count(); + int len = list.Len(); String[][] rv = new String[len][]; for (int i = 0; i < len; i++) { Gallery_itm itm = (Gallery_itm)list.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java index 2caadbec9..9ce4edfbd 100644 --- a/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java +++ b/400_xowa/src/gplx/xowa/xtns/gallery/Gallery_xnde.java @@ -25,7 +25,7 @@ public class Gallery_xnde implements Xox_xnde, Mwh_atr_itm_owner2 { public int Itm_w_actl() {return itm_w_actl;} private int itm_w_actl = Null; public int Itm_h_actl() {return itm_h_actl;} private int itm_h_actl = Null; public int Itms_per_row() {return itms_per_row;} private int itms_per_row = Null; - public int Itms_len() {return itms.Count();} private final List_adp itms = List_adp_.New(); + public int Itms_len() {return itms.Len();} private final List_adp itms = List_adp_.New(); public Gallery_itm Itms_get_at(int i) {return (Gallery_itm)itms.Get_at(i);} public byte[] Atr_style() {return atr_style;} private byte[] atr_style = Bry_.Empty; public byte[] Atr_cls() {return atr_cls;} private byte[] atr_cls = Bry_.Empty; diff --git a/400_xowa/src/gplx/xowa/xtns/graphs/Graph_html_fxt.java b/400_xowa/src/gplx/xowa/xtns/graphs/Graph_html_fxt.java index 93b4a23e3..c5b6cefd4 100644 --- a/400_xowa/src/gplx/xowa/xtns/graphs/Graph_html_fxt.java +++ b/400_xowa/src/gplx/xowa/xtns/graphs/Graph_html_fxt.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.graphs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.graphs; import gplx.*; import gplx.xowa.*; import gplx.core.tests.*; import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.htmls.core.makes.tests.*; class Graph_html_fxt { @@ -55,7 +55,7 @@ class Graph_html_fxt { private Gfo_test_lnr_base hdump_wkr_lnr = Gfo_test_lnr_base.New__keys("is_commons", "is_orig", "ttl"); public String Wikirawupload__wtxt() { - Graph_json_load_mgr hdump_wkr = (Graph_json_load_mgr)parser_fxt.Wiki().Html__hdump_mgr().Wkrs().Get_by(Graph_json_load_mgr.KEY); + Graph_json_load_mgr hdump_wkr = (Graph_json_load_mgr)parser_fxt.Wiki().Html__hdump_mgr().Wkrs().GetByOrNull(Graph_json_load_mgr.KEY); hdump_wkr_lnr = Gfo_test_lnr_base.New__keys("is_commons", "is_orig", "ttl"); hdump_wkr.Test_lnr_(hdump_wkr_lnr); diff --git a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_file_mgr.java b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_file_mgr.java index 4e0ef550a..aab1176d3 100644 --- a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_file_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_file_mgr.java @@ -1,29 +1,29 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.hieros; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.hieros; import gplx.*; import gplx.langs.dsvs.*; class Hiero_file_mgr implements Gfo_invk { private Ordered_hash hash = Ordered_hash_.New_bry(); private Hiero_file_srl srl; public Hiero_file_mgr() {srl = new Hiero_file_srl(this);} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Hiero_file_itm Get_at(int i) {return (Hiero_file_itm)hash.Get_at(i);} public void Add(byte[] key, int file_w, int file_h) {hash.Add(key, new Hiero_file_itm(key, file_w, file_h));} public void Clear() {hash.Clear();} - public Hiero_file_itm Get_by_key(byte[] key) {return (Hiero_file_itm)hash.Get_by(key);} + public Hiero_file_itm Get_by_key(byte[] key) {return (Hiero_file_itm)hash.GetByOrNull(key);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_srl)) return srl; else return Gfo_invk_.Rv_unhandled; diff --git a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_mw_tables_parser.java b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_mw_tables_parser.java index a782a351d..27684bf1d 100644 --- a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_mw_tables_parser.java +++ b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_mw_tables_parser.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.hieros; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.hieros; import gplx.*; import gplx.core.primitives.*; import gplx.core.log_msgs.*; import gplx.langs.phps.*; import gplx.langs.dsvs.*; import gplx.xowa.apps.gfs.*; @@ -30,7 +30,7 @@ public class Hiero_mw_tables_parser { public void Load_data(Hiero_xtn_mgr xtn_mgr, Io_url load_fil) {// NOTE: parsing tables.php instead of tables.ser b/c latter is too difficult to read / debug evaluator.Clear(); parser.Parse_tkns(Io_mgr.Instance.LoadFilBry(load_fil), evaluator); - Php_line[] lines = (Php_line[])evaluator.List().To_ary(Php_line.class); + Php_line[] lines = (Php_line[])evaluator.List().ToAry(Php_line.class); int lines_len = lines.length; for (int i = 0; i < lines_len; i++) { Php_line_assign line = (Php_line_assign)lines[i]; diff --git a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_parser.java b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_parser.java index fee4aa087..5f0ea3bbd 100644 --- a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_parser.java +++ b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_parser.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.hieros; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; -import gplx.core.btries.*; import gplx.langs.htmls.*; import gplx.xowa.htmls.*; +package gplx.xowa.xtns.hieros; import gplx.*; +import gplx.core.btries.*; import gplx.langs.htmls.*; class Hiero_parser { private final Btrie_slim_mgr trie = Btrie_slim_mgr.cs(); private final Btrie_rv trv = new Btrie_rv(); @@ -64,7 +64,7 @@ class Hiero_parser { } } this.New_block();// flush remaining items - return (Hiero_block[])blocks.To_ary_and_clear(Hiero_block.class); + return (Hiero_block[])blocks.ToAryAndClear(Hiero_block.class); } } private void New_block() { @@ -127,7 +127,7 @@ class Hiero_parser_itm { } class Hiero_block { private List_adp list = List_adp_.New(); - public int Len() {return list.Count();} + public int Len() {return list.Len();} public byte[] Get_at(int i) {return (byte[])list.Get_at(i);} public void Add(byte[] v) {list.Add(v);} } diff --git a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_phoneme_mgr.java b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_phoneme_mgr.java index f8a3c1e62..812bbc79d 100644 --- a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_phoneme_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_phoneme_mgr.java @@ -1,29 +1,29 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.hieros; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.hieros; import gplx.*; import gplx.langs.dsvs.*; class Hiero_phoneme_mgr implements Gfo_invk { private Ordered_hash hash = Ordered_hash_.New_bry(); private Hiero_phoneme_srl srl; public Hiero_phoneme_mgr() {srl = new Hiero_phoneme_srl(this);} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Hiero_phoneme_itm Get_at(int i) {return (Hiero_phoneme_itm)hash.Get_at(i);} public void Add(byte[] key, byte[] val) {hash.Add(key, new Hiero_phoneme_itm(key, val));} public void Clear() {hash.Clear();} - public Hiero_phoneme_itm Get_by_key(byte[] key) {return (Hiero_phoneme_itm)hash.Get_by(key);} + public Hiero_phoneme_itm Get_by_key(byte[] key) {return (Hiero_phoneme_itm)hash.GetByOrNull(key);} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_srl)) return srl; else return Gfo_invk_.Rv_unhandled; diff --git a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_prefab_mgr.java b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_prefab_mgr.java index ecf9d6534..d8408a12c 100644 --- a/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_prefab_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/hieros/Hiero_prefab_mgr.java @@ -1,27 +1,27 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.hieros; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.hieros; import gplx.*; import gplx.langs.dsvs.*; class Hiero_prefab_mgr implements Gfo_invk { private Ordered_hash hash = Ordered_hash_.New_bry(); private Hiero_prefab_srl srl; public Hiero_prefab_mgr() {srl = new Hiero_prefab_srl(this);} - public int Len() {return hash.Count();} + public int Len() {return hash.Len();} public Hiero_prefab_itm Get_at(int i) {return (Hiero_prefab_itm)hash.Get_at(i);} - public Hiero_prefab_itm Get_by_key(byte[] key) {return (Hiero_prefab_itm)hash.Get_by(key);} + public Hiero_prefab_itm Get_by_key(byte[] key) {return (Hiero_prefab_itm)hash.GetByOrNull(key);} public void Add(byte[] key) {hash.Add(key, new Hiero_prefab_itm(key));} public void Clear() {hash.Clear();} public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { diff --git a/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java b/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java index c68826de0..2b3abb453 100644 --- a/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java +++ b/400_xowa/src/gplx/xowa/xtns/imaps/Imap_parser.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.imaps; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.imaps; import gplx.*; import gplx.xowa.*; import gplx.core.btries.*; import gplx.core.primitives.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.lnkis.files.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.tmpls.*; import gplx.xowa.xtns.imaps.itms.*; @@ -83,7 +83,7 @@ public class Imap_parser { } catch (Exception e) {usr_dlg.Warn_many("", "", "imap.parse:skipping line; page=~{0} line=~{1} err=~{2}", page_url.To_str(), Bry_.Mid_safe(src, itm_bgn, itm_end), Err_.Message_gplx_log(e));} ++itm_idx; } - rv.Init(xtn_mgr, imap_img_src, imap_img, imap_dflt, imap_desc, (Imap_part_shape[])shapes.To_ary_and_clear(Imap_part_shape.class), (Imap_err[])errs.To_ary_and_clear(Imap_err.class)); + rv.Init(xtn_mgr, imap_img_src, imap_img, imap_dflt, imap_desc, (Imap_part_shape[])shapes.ToAryAndClear(Imap_part_shape.class), (Imap_err[])errs.ToAryAndClear(Imap_err.class)); } private void Parse_comment(int itm_bgn, int itm_end) {} // noop comments; EX: "# comment\n" private void Parse_invalid(int itm_bgn, int itm_end) {usr_dlg.Warn_many("", "", "imap has invalid line: page=~{0} line=~{1}", page_url.To_str(), String_.new_u8(src, itm_bgn, itm_end));} @@ -148,7 +148,7 @@ public class Imap_parser { if (pts_len < reqd_pts) return Add_err(Bool_.Y, itm_bgn, itm_end, "imagemap_missing_coord"); } pos = Bry_find_.Trim_fwd_space_tab(src, pos, itm_end); - Imap_part_shape shape_itm = new Imap_part_shape(shape_tid, (Double_obj_val[])pts.To_ary_and_clear(Double_obj_val.class)); + Imap_part_shape shape_itm = new Imap_part_shape(shape_tid, (Double_obj_val[])pts.ToAryAndClear(Double_obj_val.class)); Init_link_owner(shape_itm, src, pos, itm_end); shapes.Add(shape_itm); return true; diff --git a/400_xowa/src/gplx/xowa/xtns/indicators/IndicatorSerialCore.java b/400_xowa/src/gplx/xowa/xtns/indicators/IndicatorSerialCore.java index c854a7591..41348ce6f 100644 --- a/400_xowa/src/gplx/xowa/xtns/indicators/IndicatorSerialCore.java +++ b/400_xowa/src/gplx/xowa/xtns/indicators/IndicatorSerialCore.java @@ -46,7 +46,7 @@ public class IndicatorSerialCore { Indicator_xnde xnde = new Indicator_xnde(); xnde.Name_(wkr.LoadStr()); xnde.Html_(wkr.LoadBry()); - list.Add_if_dupe_use_nth(xnde.Name(), xnde); + list.AddIfDupeUseNth(xnde.Name(), xnde); } return list; } diff --git a/400_xowa/src/gplx/xowa/xtns/indicators/Indicator_html_bldr.java b/400_xowa/src/gplx/xowa/xtns/indicators/Indicator_html_bldr.java index 75641c9c4..efe995e83 100644 --- a/400_xowa/src/gplx/xowa/xtns/indicators/Indicator_html_bldr.java +++ b/400_xowa/src/gplx/xowa/xtns/indicators/Indicator_html_bldr.java @@ -18,8 +18,6 @@ package gplx.xowa.xtns.indicators; import gplx.Bool_; import gplx.Bry_; import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.Int_; import gplx.Ordered_hash; import gplx.Ordered_hash_; import gplx.String_; @@ -41,14 +39,14 @@ public class Indicator_html_bldr implements gplx.core.brys.Bfr_arg { enabled = Bool_.Y; list.Clear(); } - public int Count() {return list.Count();} + public int Count() {return list.Len();} public boolean Has(String key) {return list.Has(key);} public void Add(Indicator_xnde xnde) { if (!enabled) return; // do not add if disabled; called from ; PAGE:en.s:The_Parochial_System_(Wilberforce,_1838); DATE:2015-04-29 - list.Add_if_dupe_use_nth(xnde.Name(), xnde); // Add_if_dupe_use_nth: 2nd indicator overwrites 1st; DATE:2015-04-29 + list.AddIfDupeUseNth(xnde.Name(), xnde); // Add_if_dupe_use_nth: 2nd indicator overwrites 1st; DATE:2015-04-29 } public void Bfr_arg__add(Bry_bfr bfr) { - if (list.Count() == 0) return; // do not build html if no items; DATE:2015-04-29 + if (list.Len() == 0) return; // do not build html if no items; DATE:2015-04-29 bldr_itm.Init(list); fmtr_grp.Bld_bfr_many(bfr, bldr_itm); } @@ -62,7 +60,7 @@ public class Indicator_html_bldr implements gplx.core.brys.Bfr_arg { public void HxtnSave(Xowe_wiki wiki, Hxtn_page_mgr hxtnPageMgr, Xoae_page page, int pageId) { // exit if empty - int len = list.Count(); + int len = list.Len(); if (len == 0) return; // reparse html to generate xoimg attribute b/c indicators are parsed differently due to location above the "mw-content-text" div @@ -86,7 +84,7 @@ public class Indicator_html_bldr implements gplx.core.brys.Bfr_arg { this.list = IndicatorSerialCore.Load(data); // reparse html to convert xoimg attribute to file - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Indicator_xnde xnde = (Indicator_xnde)list.Get_at(i); byte[] html = wiki.Html__hdump_mgr().Load_mgr().Make_mgr().Parse(xnde.Html(), wiki, hpg); @@ -98,7 +96,7 @@ class Indicator_html_bldr_itm implements gplx.core.brys.Bfr_arg { private Ordered_hash list; public void Init(Ordered_hash list) {this.list = list;} public void Bfr_arg__add(Bry_bfr bfr) { - int list_len = list.Count(); + int list_len = list.Len(); for (int i = list_len - 1; i > -1; --i) { // reverse order Indicator_xnde xnde = (Indicator_xnde)list.Get_at(i); fmtr_itm.Bld_bfr_many(bfr, xnde.Name(), xnde.Html()); diff --git a/400_xowa/src/gplx/xowa/xtns/insiders/Insider_func_tst.java b/400_xowa/src/gplx/xowa/xtns/insiders/Insider_func_tst.java index ce0e2f381..c3748604a 100644 --- a/400_xowa/src/gplx/xowa/xtns/insiders/Insider_func_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/insiders/Insider_func_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.insiders; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.insiders; import gplx.*; import gplx.xowa.*; import org.junit.*; public class Insider_func_tst { @Before public void init() {fxt.Reset();} private Insider_func_fxt fxt = new Insider_func_fxt(); @@ -30,7 +30,7 @@ class Insider_func_fxt { fxt.Test_parse_tmpl_str_test(raw, "{{test}}", expd); Insider_xtn_skin_itm skin_itm = (Insider_xtn_skin_itm)fxt.Page().Html_data().Xtn_skin_mgr().Get_or_null(Insider_xtn_skin_itm.KEY); List_adp list = skin_itm.Itms(); - byte[][] brys = (byte[][])list.To_ary(byte[].class); + byte[][] brys = (byte[][])list.ToAry(byte[].class); Tfds.Eq_ary_str(insiders, String_.Ary(brys)); } } diff --git a/400_xowa/src/gplx/xowa/xtns/insiders/Insider_html_bldr.java b/400_xowa/src/gplx/xowa/xtns/insiders/Insider_html_bldr.java index 84e152db8..59086e806 100644 --- a/400_xowa/src/gplx/xowa/xtns/insiders/Insider_html_bldr.java +++ b/400_xowa/src/gplx/xowa/xtns/insiders/Insider_html_bldr.java @@ -13,11 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.insiders; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.insiders; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.langs.htmls.encoders.*; -import gplx.xowa.wikis.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.pages.skins.*; -import gplx.xowa.htmls.hrefs.*; +import gplx.xowa.wikis.pages.skins.*; import gplx.xowa.wikis.nss.*; class Insider_xtn_skin_itm implements Xopg_xtn_skin_itm { private List_adp itms = List_adp_.New(); @@ -38,7 +37,7 @@ public class Insider_html_bldr implements gplx.core.brys.Bfr_arg { private Hash_adp_bry hash = Hash_adp_bry.cs(); public Insider_html_bldr(Insider_xtn_mgr xtn_mgr) {this.xtn_mgr = xtn_mgr;} public void Bld_all(Bry_bfr bfr, Xoae_page page, List_adp list) { - this.list = list; this.list_len = list.Count(); + this.list = list; this.list_len = list.Len(); hash.Clear(); fmtr_grp.Bld_bfr_many(bfr, xtn_mgr.Msg_sidebar_ttl(), xtn_mgr.Msg_about_page(), xtn_mgr.Msg_about_ttl(), this); } diff --git a/400_xowa/src/gplx/xowa/xtns/lst/Db_Section_list.java b/400_xowa/src/gplx/xowa/xtns/lst/Db_Section_list.java index c7f8f7813..1d655e470 100644 --- a/400_xowa/src/gplx/xowa/xtns/lst/Db_Section_list.java +++ b/400_xowa/src/gplx/xowa/xtns/lst/Db_Section_list.java @@ -1,403 +1,403 @@ -/* search for '' -any - if end position before < -*/ -package gplx.xowa.xtns.lst; -import gplx.Bry_; -import gplx.List_adp; -import gplx.List_adp_; - -import gplx.xowa.Xoa_ttl; -import gplx.xowa.Xoae_page; -import gplx.xowa.Xowe_wiki; -import gplx.xowa.parsers.Xop_ctx; -import gplx.xowa.parsers.Xop_root_tkn; -import gplx.xowa.parsers.Xop_parser; -import gplx.xowa.parsers.Xop_parser_; -import gplx.xowa.parsers.Xop_parser_tid_; -import gplx.xowa.parsers.Xop_tkn_mkr; -import gplx.xowa.parsers.tmpls.Xot_invk_temp; -import gplx.xowa.parsers.lnkis.files.Xop_file_logger_; -import gplx.xowa.parsers.tmpls.Xot_defn_tmpl; -import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.Bool_; -import gplx.Hash_adp_bry; - -public class Db_Section_list { - private List_adp sects; - private List_adp heads; - private byte[] src; - private Xop_ctx ctx; - private Xop_ctx sub_ctx; - private Xowe_wiki wiki; - private Xoa_ttl ttl; - private byte[] ttl_bry; - private static final byte Include_between = 0, Include_to_eos = 1, Include_to_bos = 2; - public Db_Section_list(byte[] src, int langid, Xop_ctx ctx, Xop_ctx sub_ctx, Xoa_ttl ttl, byte[] ttl_bry) { - byte b; - this.src = src; - this.ctx = ctx; - this.wiki = ctx.Wiki(); - this.sub_ctx = sub_ctx; - this.ttl = ttl; - this.ttl_bry = ttl_bry; - int src_len = src.length; - int pos = 0; - int bgn, end, atr; - sects = List_adp_.New(); - begin_end keyword; - switch (langid) { - case 1: // german!!! - keyword = new DE_begin_end(); - break; - default: - keyword = new EN_begin_end(); - break; - } - while (pos < src_len) { - b = src[pos++]; - if (b == '<') { - if (pos + 10 < src_len && (src[pos] | 32) == 's' && (src[pos+1] | 32) == 'e' && (src[pos+2] | 32) == 'c' && (src[pos+3] | 32) == 't' && (src[pos+4] | 32) == 'i' && (src[pos+5] | 32) == 'o' && (src[pos+6] | 32) == 'n' && src[pos+7] == ' ') { - bgn = pos - 1; - pos += 8; - atr = pos; - while (pos < src_len) { - b = src[pos++]; - if (b == '>') - break; - } - if (pos == src_len) // no end found - break; - end = pos; - // now find a keyword - begin_end_result bg = keyword.Find(src, atr, end); - if (bg != null) { - sects.Add(new Section(src, bg.start, bg.type, bgn, end)); - } - } - } - else if (b == '\n') { // check for headers - if (pos + 10 < src_len && src[pos] == '=') { - int count = 1; - pos++; - while (pos < src_len) { - b = src[pos++]; - if (b != '=') - break; - count++; - } - // now find the next - if (b != '\n') { - int npos = pos; - while (npos < src_len) { - b = src[npos++]; - if (b == '\n') - break; - } - if (b == '\n') { - // now count any '=' backwards - int ncount = 0; - while (npos > pos) { - b = src[--npos]; - if (b == '=') - ncount++; - else - break; - } - if (ncount == count) { // we have a header - heads.Add(new Header(src, pos, npos, count)); - pos = npos + count; - } - } - } - } - } - } - } - public byte[] Include(byte[] from, byte[] to) { - if (to == Lst_pfunc_itm.Null_arg) { // no end arg; EX: {{#lst:page|bgn}}; NOTE: different than {{#lst:page|bgn|}} - if (from == Lst_pfunc_itm.Null_arg) { // no bgn arg; EX: {{#lst:page}} - return Compile3(src); - } - else // bgn exists; set end to bgn; EX: {{#lst:page|bgn}} is same as {{#lst:page|bgn|bgn}}; NOTE: {{#lst:page|bgn|}} means write from bgn to eos - to = from; - } - Bry_bfr bfr = Bry_bfr_.New(); - byte include_mode = Include_between; - if (Bry_.Len_eq_0(to)) - include_mode = Include_to_eos; - else if (Bry_.Len_eq_0(from)) - include_mode = Include_to_bos; - int bgn_pos = 0; boolean bgn_found = false; int src_page_bry_len = src.length; - int sections_len = sects.Count(); - for (int i = 0; i < sections_len; i++) { - Section sect = (Section)sects.Get_at(i); - byte section_tid = (byte)sect.type; - if (section_tid == begin_end_result.BEGIN && Matchkey(sect, from)) { - int sect_bgn_rhs = sect.end; - if (include_mode == Include_to_eos) { // write from cur to eos; EX: {{#lst:page|bgn|}} - bfr.Add_mid(src, sect_bgn_rhs, src_page_bry_len); - bgn_found = false; - break; - } - else { // bgn and end - if (!bgn_found) { // NOTE: !bgn_found to prevent "resetting" of dupe; EX: ab; should start from a not b - bgn_pos = sect_bgn_rhs; - bgn_found = true; - } - } - } - else if (section_tid == begin_end_result.END && Matchkey(sect, to)) { - int sect_end_lhs = sect.bgn; - if (include_mode == Include_to_bos) { // write from bos to cur; EX: {{#lst:page||end}} - bfr.Add_mid(src, 0, sect_end_lhs); - bgn_found = false; - break; - } - else { - if (bgn_found) { // NOTE: bgn_found to prevent writing from bos; EX: ab should not write anything - bfr.Add_mid(src, bgn_pos, sect_end_lhs); - bgn_found = false; - } - } - } - } - if (bgn_found) // bgn_found, but no end; write to end of page; EX: "a
    b" -> " b" - bfr.Add_mid(src, bgn_pos, src_page_bry_len); - - return Compile3(bfr.To_bry()); - } - public byte[] Exclude(byte[] sect_exclude, byte[] sect_replace) { - if (Bry_.Len_eq_0(sect_exclude)) { // no exclude arg; EX: {{#lstx:page}} or {{#lstx:page}} - return Compile3(src); // write all and exit - } - int sections_len = sects.Count(); - int bgn_pos = 0; - Bry_bfr bfr = Bry_bfr_.New(); - for (int i = 0; i < sections_len; i++) { - Section sect = (Section)sects.Get_at(i); - byte section_tid = (byte)sect.type; - if (section_tid == begin_end_result.BEGIN && Matchkey(sect, sect_exclude)) { - bfr.Add_mid(src, bgn_pos, sect.bgn); // write everything from bgn_pos up to exclude - } - else if (section_tid == begin_end_result.END && Matchkey(sect, sect_exclude)) { // exclude end found - if (sect_replace != null) - bfr.Add(sect_replace); // write replacement - bgn_pos = sect.end; // reset bgn_pos - } - } - bfr.Add_mid(src, bgn_pos, src.length); - return Compile3(bfr.To_bry()); - } - public byte[] Header(byte[] lhs_hdr, byte[] rhs_hdr) { - return Bry_.Empty; - } - private boolean Matchkey(Section sect, byte[] find) { - if (find == Lst_pfunc_itm.Null_arg) return false; - int pos = sect.keybgn; - int keylen = sect.keyend - pos; - int find_end = find.length; - if (find_end != keylen) return false; - for (int i = 0; i < find_end; i++) { - if (src[pos + i] != find[i]) return false; - } - return true; - } - // need ctx hence wiki and page - private byte[] Compile(byte[] page_bry) { - Xop_root_tkn xtn_root = null; - // set recursing flag - Xoae_page page = ctx.Page(); - Bry_bfr full_bfr = wiki.Utl__bfr_mkr().Get_m001(); - try { - wiki.Parser_mgr().Lst__recursing_(true); - Hash_adp_bry lst_page_regy = ctx.Lst_page_regy(); if (lst_page_regy == null) lst_page_regy = Hash_adp_bry.cs(); // SEE:NOTE:page_regy; DATE:2014-01-01 - page.Html_data().Indicators().Enabled_(Bool_.N); // disable b/c should not add to current page; PAGE:en.s:The_Parochial_System_(Wilberforce,_1838); DATE:2015-04-29 - xtn_root = Bld_root_nde(full_bfr, lst_page_regy, page_bry); // NOTE: this effectively reparses page twice; needed b/c of "if {| : ; # *, auto add new_line" which can build different tokens - } finally { - wiki.Parser_mgr().Lst__recursing_(false); - full_bfr.Mkr_rls(); - } - page.Html_data().Indicators().Enabled_(Bool_.Y); - if (xtn_root == null) return null; - //html_wtr.Write_tkn_to_html(bfr, ctx, hctx, xtn_root.Root_src(), xnde, Xoh_html_wtr.Sub_idx_null, xtn_root); - return null; - } - private byte[] Compile2(byte[] msg_val) { - Xowe_wiki wikie = (Xowe_wiki)wiki; - Xop_ctx sub_ctx = Xop_ctx.New__sub__reuse_page(wikie.Parser_mgr().Ctx()); - sub_ctx.Parse_tid_(Xop_parser_tid_.Tid__wtxt); - Xop_tkn_mkr tkn_mkr = sub_ctx.Tkn_mkr(); - Xop_root_tkn sub_root = tkn_mkr.Root(msg_val); - return wikie.Parser_mgr().Main().Expand_tmpl(sub_root, sub_ctx, tkn_mkr, msg_val); - } - private byte[] Compile3(byte[] sub_src) { - // parse page; note adding to stack to prevent circular recursions - if (!wiki.Parser_mgr().Tmpl_stack_add(ttl.Full_db())) return null; - Xot_defn_tmpl tmpl = wiki.Parser_mgr().Main().Parse_text_to_defn_obj(sub_ctx, sub_ctx.Tkn_mkr(), ttl.Ns(), ttl_bry, sub_src); // NOTE: parse as tmpl to ignore - wiki.Parser_mgr().Tmpl_stack_del(); // take template off stack; evaluate will never recurse, but will fail if ttl is still on stack; DATE:2014-03-10 - - // eval tmpl - Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_m001(); - try { - tmpl.Tmpl_evaluate(sub_ctx, Xot_invk_temp.New_root(ttl.Page_txt()), tmp_bfr); - sub_src = tmp_bfr.To_bry_and_clear(); - } finally { - tmp_bfr.Mkr_rls(); - } - return sub_src; - } - private Xop_root_tkn Bld_root_nde(Bry_bfr page_bfr, Hash_adp_bry lst_page_regy, byte[] wikitext) { - Xop_ctx tmp_ctx = Xop_ctx.New__sub__reuse_lst(wiki, ctx, lst_page_regy); - tmp_ctx.Page().Ttl_(ctx.Page().Ttl()); // NOTE: must set tmp_ctx.Ttl to ctx.Ttl; EX: Flatland and First World; DATE:2013-04-29 - tmp_ctx.Lnki().File_logger_(Xop_file_logger_.Noop); // NOTE: set file_wkr to null, else items will be double-counted - tmp_ctx.Parse_tid_(Xop_parser_tid_.Tid__defn); - Xop_parser tmp_parser = Xop_parser.new_(wiki, wiki.Parser_mgr().Main().Tmpl_lxr_mgr(), wiki.Parser_mgr().Main().Wtxt_lxr_mgr()); - Xop_root_tkn rv = tmp_ctx.Tkn_mkr().Root(wikitext); - tmp_parser.Parse_text_to_wdom(rv, tmp_ctx, tmp_ctx.Tkn_mkr(), wikitext, Xop_parser_.Doc_bgn_bos); - return rv; - } -} - -class Section { - public int keybgn; - public int keyend; - public int type; - public int bgn; - public int end; - Section(byte[] src, int keybgn, int type, int bgn, int end) { - this.type = type; - this.bgn = bgn; - this.end = end; - byte b = src[keybgn]; - if (b == '\'' || b == '"') - keybgn++; - keyend = end - 2; - while (keyend > bgn) { - b = src[keyend - 1]; - if (b != ' ' && b != '\t' && b != '\n') - break; - keyend--; - } - if (b == '\'' || b == '"') - keyend--; - this.keybgn = keybgn; - } -} -class Header { - public int bgn; - public int end; - public int level; - Header(byte[] src, int bgn, int end, int level) { - this.level = level; - byte b; - while (bgn < end) { - b = src[bgn]; - if (b == ' ' || b == '\t') - bgn++; - else - break; - } - this.bgn = bgn; - while (end > bgn) { - b = src[end - 1]; - if (b == ' ' || b == '\t') - bgn--; - else - break; - } - this.end = end; - } -} -interface begin_end { - begin_end_result Find(byte[] src, int bgn, int end); -} - -class EN_begin_end implements begin_end { - public begin_end_result Find(byte[] src, int bgn, int end) { - while (bgn < end) { - byte b = src[bgn++]; - switch (b) { - case 'b': - case 'B': - if ((src[bgn] | 32) == 'e' && (src[bgn+1] | 32) == 'g' && (src[bgn+2] | 32) == 'i' && (src[bgn+3] | 32) == 'n' && src[bgn+4] == '=') { - bgn += 5; - b = src[bgn]; - return new begin_end_result(begin_end_result.BEGIN, bgn); - } - break; - case 'e': - case 'E': - if ((src[bgn] | 32) == 'n' && (src[bgn+1] | 32) == 'd' && src[bgn+2] == '=') { - bgn += 3; - b = src[bgn]; - return new begin_end_result(begin_end_result.END, bgn); - } - break; - } - } - return null; - } -} -class DE_begin_end implements begin_end { - public begin_end_result Find(byte[] src, int bgn, int end) { - while (bgn < end) { - byte b = src[bgn++]; - switch (b) { - case 'b': - case 'B': - if ((src[bgn] | 32) == 'e' && (src[bgn+1] | 32) == 'g' && (src[bgn+2] | 32) == 'i' && (src[bgn+3] | 32) == 'n' && src[bgn+4] == '=') { - bgn += 5; - b = src[bgn]; - return new begin_end_result(begin_end_result.BEGIN, bgn); - } - break; - // End - // Ende - case 'e': - case 'E': - if ((src[bgn] | 32) == 'n' && (src[bgn+1] | 32) == 'd') { - if (src[bgn+2] == '=') { - bgn += 3; - } - else if ((src[bgn+2] | 32) == 'e' && src[bgn+3] == '=') { - bgn += 4; - } - else - break; - b = src[bgn]; - return new begin_end_result(begin_end_result.END, bgn); - } - break; - // Anfang - case 'a': - case 'A': - if ((src[bgn] | 32) == 'n' && (src[bgn+1] | 32) == 'f' && (src[bgn+2] | 32) == 'a' && (src[bgn+3] | 32) == 'n' && (src[bgn+4] | 32) == 'g' && src[bgn+5] == '=') { - bgn += 6; - b = src[bgn]; - return new begin_end_result(begin_end_result.END, bgn); - } - break; - } - } - return null; - } -} -class begin_end_result { - public static int BEGIN = 1; - public static int END = 2; - public int type; - public int start; - begin_end_result(int type, int start) { - this.type = type; - this.start = start; - } +/* search for '' +any
    + if end position before < +*/ +package gplx.xowa.xtns.lst; +import gplx.Bry_; +import gplx.List_adp; +import gplx.List_adp_; + +import gplx.xowa.Xoa_ttl; +import gplx.xowa.Xoae_page; +import gplx.xowa.Xowe_wiki; +import gplx.xowa.parsers.Xop_ctx; +import gplx.xowa.parsers.Xop_root_tkn; +import gplx.xowa.parsers.Xop_parser; +import gplx.xowa.parsers.Xop_parser_; +import gplx.xowa.parsers.Xop_parser_tid_; +import gplx.xowa.parsers.Xop_tkn_mkr; +import gplx.xowa.parsers.tmpls.Xot_invk_temp; +import gplx.xowa.parsers.lnkis.files.Xop_file_logger_; +import gplx.xowa.parsers.tmpls.Xot_defn_tmpl; +import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.Bool_; +import gplx.Hash_adp_bry; + +public class Db_Section_list { + private List_adp sects; + private List_adp heads; + private byte[] src; + private Xop_ctx ctx; + private Xop_ctx sub_ctx; + private Xowe_wiki wiki; + private Xoa_ttl ttl; + private byte[] ttl_bry; + private static final byte Include_between = 0, Include_to_eos = 1, Include_to_bos = 2; + public Db_Section_list(byte[] src, int langid, Xop_ctx ctx, Xop_ctx sub_ctx, Xoa_ttl ttl, byte[] ttl_bry) { + byte b; + this.src = src; + this.ctx = ctx; + this.wiki = ctx.Wiki(); + this.sub_ctx = sub_ctx; + this.ttl = ttl; + this.ttl_bry = ttl_bry; + int src_len = src.length; + int pos = 0; + int bgn, end, atr; + sects = List_adp_.New(); + begin_end keyword; + switch (langid) { + case 1: // german!!! + keyword = new DE_begin_end(); + break; + default: + keyword = new EN_begin_end(); + break; + } + while (pos < src_len) { + b = src[pos++]; + if (b == '<') { + if (pos + 10 < src_len && (src[pos] | 32) == 's' && (src[pos+1] | 32) == 'e' && (src[pos+2] | 32) == 'c' && (src[pos+3] | 32) == 't' && (src[pos+4] | 32) == 'i' && (src[pos+5] | 32) == 'o' && (src[pos+6] | 32) == 'n' && src[pos+7] == ' ') { + bgn = pos - 1; + pos += 8; + atr = pos; + while (pos < src_len) { + b = src[pos++]; + if (b == '>') + break; + } + if (pos == src_len) // no end found + break; + end = pos; + // now find a keyword + begin_end_result bg = keyword.Find(src, atr, end); + if (bg != null) { + sects.Add(new Section(src, bg.start, bg.type, bgn, end)); + } + } + } + else if (b == '\n') { // check for headers + if (pos + 10 < src_len && src[pos] == '=') { + int count = 1; + pos++; + while (pos < src_len) { + b = src[pos++]; + if (b != '=') + break; + count++; + } + // now find the next + if (b != '\n') { + int npos = pos; + while (npos < src_len) { + b = src[npos++]; + if (b == '\n') + break; + } + if (b == '\n') { + // now count any '=' backwards + int ncount = 0; + while (npos > pos) { + b = src[--npos]; + if (b == '=') + ncount++; + else + break; + } + if (ncount == count) { // we have a header + heads.Add(new Header(src, pos, npos, count)); + pos = npos + count; + } + } + } + } + } + } + } + public byte[] Include(byte[] from, byte[] to) { + if (to == Lst_pfunc_itm.Null_arg) { // no end arg; EX: {{#lst:page|bgn}}; NOTE: different than {{#lst:page|bgn|}} + if (from == Lst_pfunc_itm.Null_arg) { // no bgn arg; EX: {{#lst:page}} + return Compile3(src); + } + else // bgn exists; set end to bgn; EX: {{#lst:page|bgn}} is same as {{#lst:page|bgn|bgn}}; NOTE: {{#lst:page|bgn|}} means write from bgn to eos + to = from; + } + Bry_bfr bfr = Bry_bfr_.New(); + byte include_mode = Include_between; + if (Bry_.Len_eq_0(to)) + include_mode = Include_to_eos; + else if (Bry_.Len_eq_0(from)) + include_mode = Include_to_bos; + int bgn_pos = 0; boolean bgn_found = false; int src_page_bry_len = src.length; + int sections_len = sects.Len(); + for (int i = 0; i < sections_len; i++) { + Section sect = (Section)sects.Get_at(i); + byte section_tid = (byte)sect.type; + if (section_tid == begin_end_result.BEGIN && Matchkey(sect, from)) { + int sect_bgn_rhs = sect.end; + if (include_mode == Include_to_eos) { // write from cur to eos; EX: {{#lst:page|bgn|}} + bfr.Add_mid(src, sect_bgn_rhs, src_page_bry_len); + bgn_found = false; + break; + } + else { // bgn and end + if (!bgn_found) { // NOTE: !bgn_found to prevent "resetting" of dupe; EX: ab; should start from a not b + bgn_pos = sect_bgn_rhs; + bgn_found = true; + } + } + } + else if (section_tid == begin_end_result.END && Matchkey(sect, to)) { + int sect_end_lhs = sect.bgn; + if (include_mode == Include_to_bos) { // write from bos to cur; EX: {{#lst:page||end}} + bfr.Add_mid(src, 0, sect_end_lhs); + bgn_found = false; + break; + } + else { + if (bgn_found) { // NOTE: bgn_found to prevent writing from bos; EX: ab should not write anything + bfr.Add_mid(src, bgn_pos, sect_end_lhs); + bgn_found = false; + } + } + } + } + if (bgn_found) // bgn_found, but no end; write to end of page; EX: "a
    b" -> " b" + bfr.Add_mid(src, bgn_pos, src_page_bry_len); + + return Compile3(bfr.To_bry()); + } + public byte[] Exclude(byte[] sect_exclude, byte[] sect_replace) { + if (Bry_.Len_eq_0(sect_exclude)) { // no exclude arg; EX: {{#lstx:page}} or {{#lstx:page}} + return Compile3(src); // write all and exit + } + int sections_len = sects.Len(); + int bgn_pos = 0; + Bry_bfr bfr = Bry_bfr_.New(); + for (int i = 0; i < sections_len; i++) { + Section sect = (Section)sects.Get_at(i); + byte section_tid = (byte)sect.type; + if (section_tid == begin_end_result.BEGIN && Matchkey(sect, sect_exclude)) { + bfr.Add_mid(src, bgn_pos, sect.bgn); // write everything from bgn_pos up to exclude + } + else if (section_tid == begin_end_result.END && Matchkey(sect, sect_exclude)) { // exclude end found + if (sect_replace != null) + bfr.Add(sect_replace); // write replacement + bgn_pos = sect.end; // reset bgn_pos + } + } + bfr.Add_mid(src, bgn_pos, src.length); + return Compile3(bfr.To_bry()); + } + public byte[] Header(byte[] lhs_hdr, byte[] rhs_hdr) { + return Bry_.Empty; + } + private boolean Matchkey(Section sect, byte[] find) { + if (find == Lst_pfunc_itm.Null_arg) return false; + int pos = sect.keybgn; + int keylen = sect.keyend - pos; + int find_end = find.length; + if (find_end != keylen) return false; + for (int i = 0; i < find_end; i++) { + if (src[pos + i] != find[i]) return false; + } + return true; + } + // need ctx hence wiki and page + private byte[] Compile(byte[] page_bry) { + Xop_root_tkn xtn_root = null; + // set recursing flag + Xoae_page page = ctx.Page(); + Bry_bfr full_bfr = wiki.Utl__bfr_mkr().Get_m001(); + try { + wiki.Parser_mgr().Lst__recursing_(true); + Hash_adp_bry lst_page_regy = ctx.Lst_page_regy(); if (lst_page_regy == null) lst_page_regy = Hash_adp_bry.cs(); // SEE:NOTE:page_regy; DATE:2014-01-01 + page.Html_data().Indicators().Enabled_(Bool_.N); // disable b/c should not add to current page; PAGE:en.s:The_Parochial_System_(Wilberforce,_1838); DATE:2015-04-29 + xtn_root = Bld_root_nde(full_bfr, lst_page_regy, page_bry); // NOTE: this effectively reparses page twice; needed b/c of "if {| : ; # *, auto add new_line" which can build different tokens + } finally { + wiki.Parser_mgr().Lst__recursing_(false); + full_bfr.Mkr_rls(); + } + page.Html_data().Indicators().Enabled_(Bool_.Y); + if (xtn_root == null) return null; + //html_wtr.Write_tkn_to_html(bfr, ctx, hctx, xtn_root.Root_src(), xnde, Xoh_html_wtr.Sub_idx_null, xtn_root); + return null; + } + private byte[] Compile2(byte[] msg_val) { + Xowe_wiki wikie = (Xowe_wiki)wiki; + Xop_ctx sub_ctx = Xop_ctx.New__sub__reuse_page(wikie.Parser_mgr().Ctx()); + sub_ctx.Parse_tid_(Xop_parser_tid_.Tid__wtxt); + Xop_tkn_mkr tkn_mkr = sub_ctx.Tkn_mkr(); + Xop_root_tkn sub_root = tkn_mkr.Root(msg_val); + return wikie.Parser_mgr().Main().Expand_tmpl(sub_root, sub_ctx, tkn_mkr, msg_val); + } + private byte[] Compile3(byte[] sub_src) { + // parse page; note adding to stack to prevent circular recursions + if (!wiki.Parser_mgr().Tmpl_stack_add(ttl.Full_db())) return null; + Xot_defn_tmpl tmpl = wiki.Parser_mgr().Main().Parse_text_to_defn_obj(sub_ctx, sub_ctx.Tkn_mkr(), ttl.Ns(), ttl_bry, sub_src); // NOTE: parse as tmpl to ignore + wiki.Parser_mgr().Tmpl_stack_del(); // take template off stack; evaluate will never recurse, but will fail if ttl is still on stack; DATE:2014-03-10 + + // eval tmpl + Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_m001(); + try { + tmpl.Tmpl_evaluate(sub_ctx, Xot_invk_temp.New_root(ttl.Page_txt()), tmp_bfr); + sub_src = tmp_bfr.To_bry_and_clear(); + } finally { + tmp_bfr.Mkr_rls(); + } + return sub_src; + } + private Xop_root_tkn Bld_root_nde(Bry_bfr page_bfr, Hash_adp_bry lst_page_regy, byte[] wikitext) { + Xop_ctx tmp_ctx = Xop_ctx.New__sub__reuse_lst(wiki, ctx, lst_page_regy); + tmp_ctx.Page().Ttl_(ctx.Page().Ttl()); // NOTE: must set tmp_ctx.Ttl to ctx.Ttl; EX: Flatland and First World; DATE:2013-04-29 + tmp_ctx.Lnki().File_logger_(Xop_file_logger_.Noop); // NOTE: set file_wkr to null, else items will be double-counted + tmp_ctx.Parse_tid_(Xop_parser_tid_.Tid__defn); + Xop_parser tmp_parser = Xop_parser.new_(wiki, wiki.Parser_mgr().Main().Tmpl_lxr_mgr(), wiki.Parser_mgr().Main().Wtxt_lxr_mgr()); + Xop_root_tkn rv = tmp_ctx.Tkn_mkr().Root(wikitext); + tmp_parser.Parse_text_to_wdom(rv, tmp_ctx, tmp_ctx.Tkn_mkr(), wikitext, Xop_parser_.Doc_bgn_bos); + return rv; + } +} + +class Section { + public int keybgn; + public int keyend; + public int type; + public int bgn; + public int end; + Section(byte[] src, int keybgn, int type, int bgn, int end) { + this.type = type; + this.bgn = bgn; + this.end = end; + byte b = src[keybgn]; + if (b == '\'' || b == '"') + keybgn++; + keyend = end - 2; + while (keyend > bgn) { + b = src[keyend - 1]; + if (b != ' ' && b != '\t' && b != '\n') + break; + keyend--; + } + if (b == '\'' || b == '"') + keyend--; + this.keybgn = keybgn; + } +} +class Header { + public int bgn; + public int end; + public int level; + Header(byte[] src, int bgn, int end, int level) { + this.level = level; + byte b; + while (bgn < end) { + b = src[bgn]; + if (b == ' ' || b == '\t') + bgn++; + else + break; + } + this.bgn = bgn; + while (end > bgn) { + b = src[end - 1]; + if (b == ' ' || b == '\t') + bgn--; + else + break; + } + this.end = end; + } +} +interface begin_end { + begin_end_result Find(byte[] src, int bgn, int end); +} + +class EN_begin_end implements begin_end { + public begin_end_result Find(byte[] src, int bgn, int end) { + while (bgn < end) { + byte b = src[bgn++]; + switch (b) { + case 'b': + case 'B': + if ((src[bgn] | 32) == 'e' && (src[bgn+1] | 32) == 'g' && (src[bgn+2] | 32) == 'i' && (src[bgn+3] | 32) == 'n' && src[bgn+4] == '=') { + bgn += 5; + b = src[bgn]; + return new begin_end_result(begin_end_result.BEGIN, bgn); + } + break; + case 'e': + case 'E': + if ((src[bgn] | 32) == 'n' && (src[bgn+1] | 32) == 'd' && src[bgn+2] == '=') { + bgn += 3; + b = src[bgn]; + return new begin_end_result(begin_end_result.END, bgn); + } + break; + } + } + return null; + } +} +class DE_begin_end implements begin_end { + public begin_end_result Find(byte[] src, int bgn, int end) { + while (bgn < end) { + byte b = src[bgn++]; + switch (b) { + case 'b': + case 'B': + if ((src[bgn] | 32) == 'e' && (src[bgn+1] | 32) == 'g' && (src[bgn+2] | 32) == 'i' && (src[bgn+3] | 32) == 'n' && src[bgn+4] == '=') { + bgn += 5; + b = src[bgn]; + return new begin_end_result(begin_end_result.BEGIN, bgn); + } + break; + // End + // Ende + case 'e': + case 'E': + if ((src[bgn] | 32) == 'n' && (src[bgn+1] | 32) == 'd') { + if (src[bgn+2] == '=') { + bgn += 3; + } + else if ((src[bgn+2] | 32) == 'e' && src[bgn+3] == '=') { + bgn += 4; + } + else + break; + b = src[bgn]; + return new begin_end_result(begin_end_result.END, bgn); + } + break; + // Anfang + case 'a': + case 'A': + if ((src[bgn] | 32) == 'n' && (src[bgn+1] | 32) == 'f' && (src[bgn+2] | 32) == 'a' && (src[bgn+3] | 32) == 'n' && (src[bgn+4] | 32) == 'g' && src[bgn+5] == '=') { + bgn += 6; + b = src[bgn]; + return new begin_end_result(begin_end_result.END, bgn); + } + break; + } + } + return null; + } +} +class begin_end_result { + public static int BEGIN = 1; + public static int END = 2; + public int type; + public int start; + begin_end_result(int type, int start) { + this.type = type; + this.start = start; + } } \ No newline at end of file diff --git a/400_xowa/src/gplx/xowa/xtns/lst/Lst_section_nde_mgr.java b/400_xowa/src/gplx/xowa/xtns/lst/Lst_section_nde_mgr.java index de7d03b1d..c81aa7993 100644 --- a/400_xowa/src/gplx/xowa/xtns/lst/Lst_section_nde_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/lst/Lst_section_nde_mgr.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.lst; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.lst; import gplx.*; public class Lst_section_nde_mgr { private final List_adp list = List_adp_.New(); - public int Len() {return list.Count();} + public int Len() {return list.Len();} public Lst_section_nde Get_at(int i) {return (Lst_section_nde)list.Get_at(i);} public void Add(Lst_section_nde xnde) {list.Add(xnde);} public void Clear() {list.Clear();} diff --git a/400_xowa/src/gplx/xowa/xtns/mapSources/Map_dd2dms_func.java b/400_xowa/src/gplx/xowa/xtns/mapSources/Map_dd2dms_func.java index 6d0f073dd..07838e28c 100644 --- a/400_xowa/src/gplx/xowa/xtns/mapSources/Map_dd2dms_func.java +++ b/400_xowa/src/gplx/xowa/xtns/mapSources/Map_dd2dms_func.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.mapSources; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.mapSources; import gplx.*; import gplx.core.primitives.*; import gplx.xowa.xtns.pfuncs.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; +import gplx.xowa.langs.kwds.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*; public class Map_dd2dms_func extends Pf_func_base { @Override public int Id() {return Xol_kwd_grp_.Id_mapSources_dd2dms;} @@ -32,7 +32,7 @@ public class Map_dd2dms_func extends Pf_func_base { Arg_nde_tkn arg = self.Args_get_by_idx(i); func_arg.Set(tmp_bfr, ctx, src, caller, self, arg); byte[] key = func_arg.key; - Object key_tid_obj = Key_hash.Get_by(key); + Object key_tid_obj = Key_hash.GetByOrNull(key); if (key_tid_obj != null) { byte[] val = func_arg.val; switch (((Byte_obj_val)key_tid_obj).Val()) { diff --git a/400_xowa/src/gplx/xowa/xtns/mapSources/Map_geolink_func.java b/400_xowa/src/gplx/xowa/xtns/mapSources/Map_geolink_func.java index 53dbef3bf..4063c5996 100644 --- a/400_xowa/src/gplx/xowa/xtns/mapSources/Map_geolink_func.java +++ b/400_xowa/src/gplx/xowa/xtns/mapSources/Map_geolink_func.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.mapSources; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.mapSources; import gplx.*; import gplx.core.primitives.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; +import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.xtns.pfuncs.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*; public class Map_geolink_func extends Pf_func_base { @@ -33,7 +33,7 @@ public class Map_geolink_func extends Pf_func_base { Arg_nde_tkn arg = self.Args_get_by_idx(i); func_arg.Set(tmp_bfr, ctx, src, caller, self, arg);; byte[] key = func_arg.key; - Object key_tid_obj = Key_hash.Get_by(key); + Object key_tid_obj = Key_hash.GetByOrNull(key); if (key_tid_obj != null) { byte[] val = func_arg.val; switch (((Byte_obj_val)key_tid_obj).Val()) { diff --git a/400_xowa/src/gplx/xowa/xtns/math/Xomath_latex_bldr.java b/400_xowa/src/gplx/xowa/xtns/math/Xomath_latex_bldr.java index e20b052b3..9391d7738 100644 --- a/400_xowa/src/gplx/xowa/xtns/math/Xomath_latex_bldr.java +++ b/400_xowa/src/gplx/xowa/xtns/math/Xomath_latex_bldr.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.math; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.math; import gplx.*; import gplx.xowa.*; import gplx.core.envs.*; public class Xomath_latex_bldr { public static void Async(Xoae_app app, Xoae_page page, gplx.xowa.guis.cbks.js.Xog_js_wkr js_wkr) { // get len; if 0, exit Gfo_usr_dlg usr_dlg = app.Usr_dlg(); - int len = page.File_math().Count(); + int len = page.File_math().Len(); if (len == 0) return; usr_dlg.Prog_one("", "", "page.async.math; count=~{0}", len); diff --git a/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_cfg.java b/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_cfg.java index 82a432c27..f07b537e5 100644 --- a/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_cfg.java +++ b/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_cfg.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.pagebanners; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.pagebanners; import gplx.*; import gplx.xowa.*; import gplx.core.primitives.*; public class Pgbnr_cfg { private final Hash_adp ns_hash = Hash_adp_.New(); private final Int_obj_ref tmp_ns_key = Int_obj_ref.New_neg1(); @@ -22,7 +22,7 @@ public class Pgbnr_cfg { this.standard_sizes = standard_sizes; this.dflt_img_wdata_prop = dflt_img_wdata_prop; this.dflt_img_title = dflt_img_title; for (int ns : ns_ary) - this.ns_hash.Add_as_key_and_val(Int_obj_ref.New(ns)); + this.ns_hash.AddAsKeyAndVal(Int_obj_ref.New(ns)); } public final boolean enabled; public final boolean enable_heading_override; diff --git a/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_func.java b/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_func.java index 337f9b093..c5b42a785 100644 --- a/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_func.java +++ b/400_xowa/src/gplx/xowa/xtns/pagebanners/Pgbnr_func.java @@ -133,7 +133,7 @@ public class Pgbnr_func extends Pf_func_base { Xof_file_itm banner_file_itm = File__make_tkn(ctx, Xop_file_logger_.Tid__pgbnr_main, banner_ttl, Xop_lnki_tkn.Width_null, Xop_lnki_tkn.Height_null); Pgbnr_itm itm = new Pgbnr_itm(); - itm.Init_from_wtxt(banner_ttl, banner_file_itm, tooltip, title, bottomtoc, toc, data_pos_x, data_pos_y, origin_x, icons_list == null ? Pgbnr_icon.Ary_empty : (Pgbnr_icon[])icons_list.To_ary_and_clear(Pgbnr_icon.class)); + itm.Init_from_wtxt(banner_ttl, banner_file_itm, tooltip, title, bottomtoc, toc, data_pos_x, data_pos_y, origin_x, icons_list == null ? Pgbnr_icon.Ary_empty : (Pgbnr_icon[])icons_list.ToAryAndClear(Pgbnr_icon.class)); page.Html_data().Xtn_pgbnr_(itm); page.Html_data().Head_mgr().Itm__pgbnr().Enabled_y_(); // register css / js during parse stage page.Wtxt().Toc().Flag__toc_(true); // NOTE: must mark toc_manual else will show 2nd TOC in edit mode; DATE:2016-07-10 @@ -213,7 +213,7 @@ public class Pgbnr_func extends Pf_func_base { for (int i = 0; i < sizes_len; ++i) { byte[] url = Get_image_url(wiki, banner_ttl, sizes[i]); if (url != null) - hash.Add_if_dupe_use_1st(url, url); + hash.AddIfDupeUse1st(url, url); } return (byte[][])hash.To_ary_and_clear(byte[].class); } diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java index eb50ae355..8bdad4aa0 100644 --- a/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java +++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/Pf_func_.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.pfuncs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.pfuncs; import gplx.*; import gplx.core.primitives.*; import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; import gplx.xowa.langs.kwds.*; import gplx.xowa.xtns.pfuncs.ifs.*; import gplx.xowa.xtns.pfuncs.times.*; import gplx.xowa.xtns.pfuncs.numbers.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.xtns.pfuncs.langs.*; import gplx.xowa.xtns.pfuncs.strings.*; import gplx.xowa.xtns.pfuncs.tags.*; import gplx.xowa.xtns.pfuncs.stringutils.*; import gplx.xowa.xtns.pfuncs.pages.*; import gplx.xowa.xtns.pfuncs.wikis.*; @@ -92,7 +92,7 @@ public class Pf_func_ { for (int i = 0; i < len; ++i) { list.Add(Ary_wmf[i]); } - list.Add_many + list.AddMany ( Xol_kwd_grp_.Id_strx_len , Xol_kwd_grp_.Id_strx_pos , Xol_kwd_grp_.Id_strx_rpos @@ -103,7 +103,7 @@ public class Pf_func_ { , Xol_kwd_grp_.Id_strx_urldecode , Xol_kwd_grp_.Id_new_window_link ); - Ary_nonwmf = (int[])list.To_ary_and_clear(int.class); + Ary_nonwmf = (int[])list.ToAryAndClear(int.class); } return Ary_nonwmf; } diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_switch_tst.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_switch_tst.java index af05542ac..aa6946517 100644 --- a/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_switch_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/ifs/Pfunc_switch_tst.java @@ -13,8 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.pfuncs.ifs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.pfuncs.*; -import org.junit.*; import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; +package gplx.xowa.xtns.pfuncs.ifs; import gplx.*; import gplx.xowa.*; +import org.junit.*; +import gplx.xowa.langs.kwds.*; public class Pfunc_switch_tst { @Before public void init() {fxt.Reset();} private final Xop_fxt fxt = new Xop_fxt(); @Test public void Basic_a() {fxt.Test_parse_tmpl_str_test("{{#switch:a|a=1|b=2|3}}" , "{{test}}" , "1");} @@ -67,7 +68,7 @@ public class Pfunc_switch_tst { fxt.Init_defn_add("pass", "{{#xowa_dbg:Pass}}"); fxt.Init_defn_add("dflt", "{{#xowa_dbg:Dflt}}"); fxt.Test_parse_tmpl_str_test("{{#switch:{{{1}}}|a={{fail}}|#default={{dflt}}|b={{pass}}}}", "{{test|b}}", "Pass"); - Tfds.Eq(1, Xop_xowa_dbg.Argx_list.Count()); + Tfds.Eq(1, Xop_xowa_dbg.Argx_list.Len()); } @Test public void Dflt_empty() { // PURPOSE: empty default should return "" not "#default"; PAGE:de.v:M�nchen/Sehensw�rdigkeiten; DATE:2014-05-29 fxt.Test_parse_tmpl_str_test("{{#switch:z|b=1|#default}}" , "{{test}}" , ""); diff --git a/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pft_fmt_itm_.java b/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pft_fmt_itm_.java index c7c0d026d..eb353f398 100644 --- a/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pft_fmt_itm_.java +++ b/400_xowa/src/gplx/xowa/xtns/pfuncs/times/Pft_fmt_itm_.java @@ -233,6 +233,6 @@ public class Pft_fmt_itm_ { } } if (raw_bgn != String_.Pos_neg1) {fmt_itms.Add(fmt_len - raw_bgn == 1 ? new Pft_fmt_itm_raw_byt(fmt[fmt_len - 1]) : (Pft_fmt_itm)new Pft_fmt_itm_raw_ary(fmt, raw_bgn, fmt_len)); raw_bgn = String_.Pos_neg1;} - return (Pft_fmt_itm[])fmt_itms.To_ary(Pft_fmt_itm.class); + return (Pft_fmt_itm[])fmt_itms.ToAry(Pft_fmt_itm.class); } } diff --git a/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_index_parser.java b/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_index_parser.java index 6e75c6746..a15057257 100644 --- a/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_index_parser.java +++ b/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_index_parser.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.proofreadPage; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.proofreadPage; import gplx.*; import gplx.xowa.*; import gplx.core.primitives.*; import gplx.xowa.wikis.nss.*; -import gplx.xowa.parsers.*; import gplx.xowa.parsers.logs.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*; +import gplx.xowa.parsers.*; +import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*; class Pp_index_parser { public static Pp_index_page Parse(Xowe_wiki wiki, Xop_ctx ctx, Xoa_ttl index_ttl, int ns_page_id) { byte[] src = wiki.Cache_mgr().Page_cache().Get_src_else_load_or_null(index_ttl); @@ -93,7 +94,7 @@ class Pp_index_page { public List_adp Main_lnkis() {return main_lnkis;} private List_adp main_lnkis = List_adp_.New(); public List_adp Invk_args() {return invk_args;} private List_adp invk_args = List_adp_.New(); public Xoa_ttl[] Get_ttls_rng(Xowe_wiki wiki, int ns_page_id, byte[] bgn_page_bry, byte[] end_page_bry, Int_obj_ref bgn_page_ref, Int_obj_ref end_page_ref) { - int list_len = page_ttls.Count(); if (list_len == 0) return Pp_pages_nde.Ttls_null; + int list_len = page_ttls.Len(); if (list_len == 0) return Pp_pages_nde.Ttls_null; List_adp rv = List_adp_.New(); Xoa_ttl bgn_page_ttl = new_ttl_(wiki, ns_page_id, bgn_page_bry), end_page_ttl = new_ttl_(wiki, ns_page_id, end_page_bry); boolean add = bgn_page_ttl == Xoa_ttl.Null; // if from is missing, default to bgn; EX: @@ -107,8 +108,8 @@ class Pp_index_page { } if (bgn_page_ref.Val() == -1) bgn_page_ref.Val_(0); // NOTE: set "from" which will be passed to {{MediaWiki:Proofreadpage_header_template}}; DATE:2014-05-21 if (end_page_ref.Val() == -1) end_page_ref.Val_(list_len - 1); // NOTE: set "to" which will be passed to {{MediaWiki:Proofreadpage_header_template}}; DATE:2014-05-21 - if (rv.Count() == 0) return Pp_pages_nde.Ttls_null; - return (Xoa_ttl[])rv.To_ary(Xoa_ttl.class); + if (rv.Len() == 0) return Pp_pages_nde.Ttls_null; + return (Xoa_ttl[])rv.ToAry(Xoa_ttl.class); } private static Xoa_ttl new_ttl_(Xowe_wiki wiki, int ns_page_id, byte[] bry) {return bry == null ? Xoa_ttl.Null : Xoa_ttl.Parse(wiki, ns_page_id, bry);} public static final Pp_index_page Null = new Pp_index_page(); diff --git a/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_pages_nde.java b/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_pages_nde.java index 10b7df877..96b4dfba2 100644 --- a/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_pages_nde.java +++ b/400_xowa/src/gplx/xowa/xtns/proofreadPage/Pp_pages_nde.java @@ -16,7 +16,7 @@ Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt package gplx.xowa.xtns.proofreadPage; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.core.primitives.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.apps.cfgs.*; -import gplx.langs.htmls.entitys.*; import gplx.xowa.htmls.core.htmls.*; +import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.xtns.lst.*; import gplx.xowa.wikis.pages.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.htmls.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*; @@ -118,11 +118,11 @@ public class Pp_pages_nde implements Xox_xnde, Mwh_atr_itm_owner1 { } private byte[] Bld_wikitext(Bry_bfr full_bfr, Gfo_number_parser num_parser, Hash_adp_bry lst_page_regy) { Pp_index_page index_page = Pp_index_parser.Parse(wiki, ctx, index_ttl, ns_page_id); - int index_page_ttls_len = index_page.Page_ttls().Count(); + int index_page_ttls_len = index_page.Page_ttls().Len(); byte[] rv = Bry_.Empty; if (bgn_page_bry != null || end_page_bry != null || include != null) { // from, to, or include specified Xoa_ttl[] ttls = null; - if ( index_page.Pagelist_xndes().Count() > 0 // pagelist exists; don't get from args + if ( index_page.Pagelist_xndes().Len() > 0 // pagelist exists; don't get from args || index_page_ttls_len == 0 // no [[Page:]] in [[Index:]] ) // NOTE: this simulates MW's if (empty($links)); REF.MW:ProofreadPageRenderer.php|renderPages ttls = Get_ttls_from_xnde_args(num_parser); @@ -171,7 +171,7 @@ public class Pp_pages_nde implements Xox_xnde, Mwh_atr_itm_owner1 { } private byte[] Bld_wikitext_for_header(Bry_bfr full_bfr, Pp_index_page index_page, byte[] rv) { List_adp main_lnkis = index_page.Main_lnkis(); - int main_lnkis_len = main_lnkis.Count(); + int main_lnkis_len = main_lnkis.Len(); byte[] index_page_src = index_page.Src(); if (main_lnkis_len > 0) { Xoa_ttl page_ttl = ctx.Page().Ttl(); @@ -213,7 +213,7 @@ public class Pp_pages_nde implements Xox_xnde, Mwh_atr_itm_owner1 { return full_bfr.To_bry_and_clear(); } private void Add_args(Bry_bfr full_bfr, List_adp invk_args) { - int invk_args_len = invk_args.Count(); + int invk_args_len = invk_args.Len(); for (int i = 0; i < invk_args_len; i++) { Pp_index_arg arg = (Pp_index_arg)invk_args.Get_at(i); full_bfr @@ -308,7 +308,7 @@ public class Pp_pages_nde implements Xox_xnde, Mwh_atr_itm_owner1 { exclude_pages_hash.Add(exclude_page, exclude_page); } List_adp new_list = List_adp_.New(); - int list_len = list.Count(); + int list_len = list.Len(); for (int i = 0; i < list_len; i++) { Int_obj_val page = (Int_obj_val)list.Get_at(i); if (exclude_pages_hash.Has(page)) continue; @@ -317,7 +317,7 @@ public class Pp_pages_nde implements Xox_xnde, Mwh_atr_itm_owner1 { return new_list; } private Xoa_ttl[] Get_ttls_from_xnde_args__ttls(List_adp list) { - int list_len = list.Count(); if (list_len == 0) return Ttls_null; + int list_len = list.Len(); if (list_len == 0) return Ttls_null; Xoa_ttl[] rv = new Xoa_ttl[(list_len / step_int) + ((list_len % step_int == 0) ? 0 : 1)]; int rv_idx = 0; Bry_bfr ttl_bfr = wiki.Utl__bfr_mkr().Get_b512(); diff --git a/400_xowa/src/gplx/xowa/xtns/relatedArticles/Articles_func.java b/400_xowa/src/gplx/xowa/xtns/relatedArticles/Articles_func.java index 7118a701e..a784d4ed1 100644 --- a/400_xowa/src/gplx/xowa/xtns/relatedArticles/Articles_func.java +++ b/400_xowa/src/gplx/xowa/xtns/relatedArticles/Articles_func.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.relatedArticles; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.relatedArticles; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.kwds.*; -import gplx.xowa.htmls.*; import gplx.xowa.wikis.pages.skins.*; import gplx.xowa.xtns.pfuncs.*; +import gplx.xowa.langs.kwds.*; +import gplx.xowa.wikis.pages.skins.*; import gplx.xowa.xtns.pfuncs.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*; public class Articles_func extends Pf_func_base { @Override public int Id() {return Xol_kwd_grp_.Id_relatedArticles;} @@ -55,7 +55,7 @@ class Articles_itm_fmtr implements gplx.core.brys.Bfr_arg { private Xowe_wiki wiki; private List_adp itms; public void Init(Xowe_wiki wiki, List_adp itms) {this.wiki = wiki; this.itms = itms;} public void Bfr_arg__add(Bry_bfr bfr) { - int len = itms.Count(); + int len = itms.Len(); for (int i = 0; i < len; i++) { Articles_itm itm = (Articles_itm)itms.Get_at(i); Xoa_ttl ttl = Xoa_ttl.Parse(wiki, itm.Ttl()); if (ttl == null) continue; diff --git a/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_html_bldr.java b/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_html_bldr.java index 41b08fcbe..3ba55bd37 100644 --- a/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_html_bldr.java +++ b/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_html_bldr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.relatedSites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.relatedSites; import gplx.*; import gplx.xowa.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.pages.skins.*; import gplx.xowa.htmls.hrefs.*; @@ -36,7 +36,7 @@ public class Sites_html_bldr implements gplx.core.brys.Bfr_arg { public Sites_html_bldr(Sites_xtn_mgr xtn_mgr) {this.xtn_mgr = xtn_mgr;} private Bry_fmtr url_fmtr = Bry_fmtr.keys_("title"); public void Bld_all(Bry_bfr bfr, Xoae_page page, List_adp list) { - this.list = list; this.list_len = list.Count(); + this.list = list; this.list_len = list.Len(); hash.Clear(); fmtr_grp.Bld_bfr_many(bfr, xtn_mgr.Msg_related_sites(), this); } diff --git a/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_regy_mgr.java b/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_regy_mgr.java index ed9679f95..a57a64171 100644 --- a/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_regy_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/relatedSites/Sites_regy_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.relatedSites; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.relatedSites; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.pages.skins.*; public class Sites_regy_mgr implements Gfo_invk { private Hash_adp_bry hash = Hash_adp_bry.cs(); @@ -25,7 +25,7 @@ public class Sites_regy_mgr implements Gfo_invk { int len = keys.length; for (int i = 0; i < len; ++i) { byte[] key = Bry_.new_u8(keys[i]); - hash.Add_if_dupe_use_nth(key, key); + hash.AddIfDupeUseNth(key, key); } } public boolean Match(Xoae_page page, Xoa_ttl lnki_ttl) { diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java index 2e9331d43..db13888fb 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java @@ -36,7 +36,6 @@ import gplx.xowa.parsers.Xop_ctx; import gplx.xowa.parsers.tmpls.Xot_invk; import gplx.xowa.xtns.scribunto.engines.Scrib_engine; import gplx.xowa.xtns.scribunto.engines.Scrib_engine_type; -import gplx.xowa.xtns.scribunto.cfgs.ScribCfgResolver; import gplx.xowa.xtns.scribunto.libs.Scrib_lib_hash; import gplx.xowa.xtns.scribunto.libs.Scrib_lib_html; import gplx.xowa.xtns.scribunto.libs.Scrib_lib_language; @@ -235,9 +234,9 @@ public class Scrib_core { frame_created_list.Clear(); } } - public Scrib_lua_mod Mods_get(byte[] mod_name) {return (Scrib_lua_mod)mods.Get_by(mod_name);} + public Scrib_lua_mod Mods_get(byte[] mod_name) {return (Scrib_lua_mod)mods.GetByOrNull(mod_name);} private Scrib_lua_mod Mods_get_or_new(byte[] mod_name, byte[] mod_text) { - Scrib_lua_mod rv = (Scrib_lua_mod)mods.Get_by(mod_name); + Scrib_lua_mod rv = (Scrib_lua_mod)mods.GetByOrNull(mod_name); if (rv == null) { rv = new Scrib_lua_mod(this, "Module:" + String_.new_u8(mod_name)); rv.LoadString(String_.new_u8(mod_text)); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core_fxt.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core_fxt.java index 65c6aa512..f071ab300 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core_fxt.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core_fxt.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.scribunto.engines.process.*; import gplx.xowa.parsers.tmpls.*; public class Scrib_core_fxt { public Scrib_core_fxt() {} @@ -137,8 +137,8 @@ public class Scrib_core_fxt { return this; } private static final byte[] Frame_ttl_test = Bry_.new_a7("test"); private void Test_server_logs() { - if (expd_server_rcvd_list.Count() > 0) { - Tfds.Eq_ary_str(expd_server_rcvd_list.To_str_ary(), server.Log_rcvd().To_str_ary()); + if (expd_server_rcvd_list.Len() > 0) { + Tfds.Eq_ary_str(expd_server_rcvd_list.ToStrAry(), server.Log_rcvd().ToStrAry()); expd_server_rcvd_list.Clear(); server.Log_rcvd().Clear(); } diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_err_filter_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_err_filter_mgr.java index 0361b8936..9bfdad3b6 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_err_filter_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_err_filter_mgr.java @@ -1,112 +1,112 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto; - -import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.GfoMsg; -import gplx.Gfo_invk; -import gplx.Gfo_invk_; -import gplx.GfsCtx; -import gplx.List_adp; -import gplx.List_adp_; -import gplx.Ordered_hash; -import gplx.Ordered_hash_; -import gplx.String_; - -public class Scrib_err_filter_mgr implements Gfo_invk { - private final Object thread_lock = new Object(); - private final Ordered_hash hash_by_mod = Ordered_hash_.New(); - public void Clear() {hash_by_mod.Clear();} - public boolean Empty() {return empty;} private boolean empty = true; - public boolean Match(String mod, String fnc, String err) { - List_adp itms = Get_itms_or_null(mod, fnc); if (itms == null) return false; - int itms_len = itms.Count(); - boolean match = false; - for (int i = 0; i < itms_len; ++i) { - Scrib_err_filter_itm itm = (Scrib_err_filter_itm)itms.Get_at(i); - if (String_.Has(err, itm.Err())) { - match = true; - itm.Count_actl_add_1(); - break; - } - } - return match; - } - public void Add(int count_expd, String mod, String fnc, String err, String comment) { - synchronized (thread_lock) { - empty = false; - List_adp itms = Get_itms_or_null(mod, fnc); - if (itms == null) itms = New_itms(mod, fnc); - itms.Add(new Scrib_err_filter_itm(count_expd, mod, fnc, err, comment)); - } - } - public String Print() { - Bry_bfr bfr = Bry_bfr_.New_w_size(8); - int i_len = hash_by_mod.Count(); - for (int i = 0; i < i_len; ++i) { - Ordered_hash fncs = (Ordered_hash)hash_by_mod.Get_at(i); - int j_len = fncs.Count(); - for (int j = 0; j < j_len; ++j) { - List_adp errs = (List_adp)fncs.Get_at(j); - int k_len = errs.Count(); - for (int k = 0; k < k_len; ++k) { - Scrib_err_filter_itm err = (Scrib_err_filter_itm)errs.Get_at(k); - bfr.Add_int_variable(err.Count_actl()).Add_byte_pipe().Add_int_variable(err.Count_expd()) - .Add_byte_pipe().Add_str_u8(err.Mod()).Add_byte_pipe().Add_str_u8(err.Fnc()).Add_byte_pipe().Add_str_u8(err.Err()) - .Add_byte_pipe().Add_str_u8(err.Comment()) - .Add_byte_nl(); - } - } - } - return bfr.To_str_and_clear(); - } - private List_adp Get_itms_or_null(String mod, String fnc) { - Ordered_hash hash_by_fnc = (Ordered_hash)hash_by_mod.Get_by(mod); if (hash_by_fnc == null) return null; - return (List_adp)hash_by_fnc.Get_by(fnc); - } - private List_adp New_itms(String mod, String fnc) { - Ordered_hash hash_by_fnc = (Ordered_hash)hash_by_mod.Get_by(mod); - if (hash_by_fnc == null) { - hash_by_fnc = Ordered_hash_.New(); - hash_by_mod.Add(mod, hash_by_fnc); - } - List_adp list_of_err = (List_adp)hash_by_fnc.Get_by(fnc); - if (list_of_err == null) { - list_of_err = List_adp_.New(); - hash_by_fnc.Add(fnc, list_of_err); - } - return list_of_err; - } - public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk_add)) Add(m.ReadInt("count_expd"), m.ReadStr("mod"), m.ReadStr("fnc"), m.ReadStr("err"), m.ReadStr("comment")); - else return Gfo_invk_.Rv_unhandled; - return this; - } private static final String Invk_add = "add"; - - // 2020-09-01: singleton b/c xomp instantiates multiple wikis; previous implementation was `((Scrib_xtn_mgr)(wiki.Xtn_mgr().Get_or_fail(Scrib_xtn_mgr.XTN_KEY))).Invoke_wkr();` which doesn't multi-thread - public static final Scrib_err_filter_mgr INSTANCE = new Scrib_err_filter_mgr(); -} -class Scrib_err_filter_itm { - public Scrib_err_filter_itm(int count_expd, String mod, String fnc, String err, String comment) {this.count_expd = count_expd; this.mod = mod; this.err = err; this.fnc = fnc; this.comment = comment;} - public String Mod() {return mod;} private final String mod; - public String Fnc() {return fnc;} private final String fnc; - public String Err() {return err;} private final String err; - public String Comment() {return comment;} private final String comment; - public int Count_expd() {return count_expd;} private final int count_expd; - public int Count_actl() {return count_actl;} private int count_actl; - public void Count_actl_add_1() {++count_actl;} -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto; + +import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.GfoMsg; +import gplx.Gfo_invk; +import gplx.Gfo_invk_; +import gplx.GfsCtx; +import gplx.List_adp; +import gplx.List_adp_; +import gplx.Ordered_hash; +import gplx.Ordered_hash_; +import gplx.String_; + +public class Scrib_err_filter_mgr implements Gfo_invk { + private final Object thread_lock = new Object(); + private final Ordered_hash hash_by_mod = Ordered_hash_.New(); + public void Clear() {hash_by_mod.Clear();} + public boolean Empty() {return empty;} private boolean empty = true; + public boolean Match(String mod, String fnc, String err) { + List_adp itms = Get_itms_or_null(mod, fnc); if (itms == null) return false; + int itms_len = itms.Len(); + boolean match = false; + for (int i = 0; i < itms_len; ++i) { + Scrib_err_filter_itm itm = (Scrib_err_filter_itm)itms.Get_at(i); + if (String_.Has(err, itm.Err())) { + match = true; + itm.Count_actl_add_1(); + break; + } + } + return match; + } + public void Add(int count_expd, String mod, String fnc, String err, String comment) { + synchronized (thread_lock) { + empty = false; + List_adp itms = Get_itms_or_null(mod, fnc); + if (itms == null) itms = New_itms(mod, fnc); + itms.Add(new Scrib_err_filter_itm(count_expd, mod, fnc, err, comment)); + } + } + public String Print() { + Bry_bfr bfr = Bry_bfr_.New_w_size(8); + int i_len = hash_by_mod.Len(); + for (int i = 0; i < i_len; ++i) { + Ordered_hash fncs = (Ordered_hash)hash_by_mod.Get_at(i); + int j_len = fncs.Len(); + for (int j = 0; j < j_len; ++j) { + List_adp errs = (List_adp)fncs.Get_at(j); + int k_len = errs.Len(); + for (int k = 0; k < k_len; ++k) { + Scrib_err_filter_itm err = (Scrib_err_filter_itm)errs.Get_at(k); + bfr.Add_int_variable(err.Count_actl()).Add_byte_pipe().Add_int_variable(err.Count_expd()) + .Add_byte_pipe().Add_str_u8(err.Mod()).Add_byte_pipe().Add_str_u8(err.Fnc()).Add_byte_pipe().Add_str_u8(err.Err()) + .Add_byte_pipe().Add_str_u8(err.Comment()) + .Add_byte_nl(); + } + } + } + return bfr.To_str_and_clear(); + } + private List_adp Get_itms_or_null(String mod, String fnc) { + Ordered_hash hash_by_fnc = (Ordered_hash)hash_by_mod.GetByOrNull(mod); if (hash_by_fnc == null) return null; + return (List_adp)hash_by_fnc.GetByOrNull(fnc); + } + private List_adp New_itms(String mod, String fnc) { + Ordered_hash hash_by_fnc = (Ordered_hash)hash_by_mod.GetByOrNull(mod); + if (hash_by_fnc == null) { + hash_by_fnc = Ordered_hash_.New(); + hash_by_mod.Add(mod, hash_by_fnc); + } + List_adp list_of_err = (List_adp)hash_by_fnc.GetByOrNull(fnc); + if (list_of_err == null) { + list_of_err = List_adp_.New(); + hash_by_fnc.Add(fnc, list_of_err); + } + return list_of_err; + } + public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { + if (ctx.Match(k, Invk_add)) Add(m.ReadInt("count_expd"), m.ReadStr("mod"), m.ReadStr("fnc"), m.ReadStr("err"), m.ReadStr("comment")); + else return Gfo_invk_.Rv_unhandled; + return this; + } private static final String Invk_add = "add"; + + // 2020-09-01: singleton b/c xomp instantiates multiple wikis; previous implementation was `((Scrib_xtn_mgr)(wiki.Xtn_mgr().Get_or_fail(Scrib_xtn_mgr.XTN_KEY))).Invoke_wkr();` which doesn't multi-thread + public static final Scrib_err_filter_mgr INSTANCE = new Scrib_err_filter_mgr(); +} +class Scrib_err_filter_itm { + public Scrib_err_filter_itm(int count_expd, String mod, String fnc, String err, String comment) {this.count_expd = count_expd; this.mod = mod; this.err = err; this.fnc = fnc; this.comment = comment;} + public String Mod() {return mod;} private final String mod; + public String Fnc() {return fnc;} private final String fnc; + public String Err() {return err;} private final String err; + public String Comment() {return comment;} private final String comment; + public int Count_expd() {return count_expd;} private final int count_expd; + public int Count_actl() {return count_actl;} private int count_actl; + public void Count_actl_add_1() {++count_actl;} +} diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_frame_.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_frame_.java index 289d106fc..b55348cb9 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_frame_.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_frame_.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.parsers.tmpls.*; public class Scrib_frame_ { public static final byte Tid_null = 0, Tid_current = 1, Tid_parent = 2, Tid_dynamic = 3; @@ -28,7 +28,7 @@ public class Scrib_frame_ { else if (String_.Eq(frame_id, "parent")) return core.Frame_parent(); else if (String_.Eq(frame_id, "empty")) return Xot_invk_mock.new_(core.Frame_current().Defn_tid(), 0, null, Keyval_.Ary_empty); // not sure if it should return null title; DATE:2014-07-12 else { - return (Xot_invk)core.Frame_created_list().Get_by(frame_id); // NOTE: can return null; some calls expect nil; EX:mw.lua and "currentFrame = newFrame( 'empty' )"; DATE:2014-07-12 + return (Xot_invk)core.Frame_created_list().GetByOrNull(frame_id); // NOTE: can return null; some calls expect nil; EX:mw.lua and "currentFrame = newFrame( 'empty' )"; DATE:2014-07-12 } } public static int Get_arg_adj(byte frame_tid) { diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_fsys_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_fsys_mgr.java index 8b96c85ff..e0461c188 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_fsys_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_fsys_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto; import gplx.*; public class Scrib_fsys_mgr { private Ordered_hash libs; private Io_url[] lib_dirs = new Io_url[lib_dirs_len]; static final int lib_dirs_len = 3; @@ -28,7 +28,7 @@ public class Scrib_fsys_mgr { } public String Get_or_null(String name) { if (libs == null) libs = libs_init(script_dir); - Object lib_fil_obj = libs.Get_by(name); if (lib_fil_obj == null) return null; + Object lib_fil_obj = libs.GetByOrNull(name); if (lib_fil_obj == null) return null; gplx.core.ios.Io_fil lib_fil = (gplx.core.ios.Io_fil)lib_fil_obj; String lib_data = lib_fil.Data(); if (lib_data == null) { @@ -53,15 +53,15 @@ public class Scrib_fsys_mgr { if (gplx.core.envs.Op_sys.Cur().Tid_is_wnt()) // if windows, replace "\" rel_path = String_.Replace(rel_path, fil.Info().DirSpr(), "/"); rel_path = String_.DelEndIf(rel_path, ".lua"); // remove ".lua" - rv.Add_if_dupe_use_1st(fil.NameOnly(), fil_itm); // add filename only (no extension); EX: "c" - rv.Add_if_dupe_use_1st(rel_path, fil_itm); // add relpath; EX: "a/b/c" - rv.Add_if_dupe_use_1st(String_.Replace(rel_path, "/", "."), fil_itm); // add relpath in dotted form; EX: "a.b.c" + rv.AddIfDupeUse1st(fil.NameOnly(), fil_itm); // add filename only (no extension); EX: "c" + rv.AddIfDupeUse1st(rel_path, fil_itm); // add relpath; EX: "a/b/c" + rv.AddIfDupeUse1st(String_.Replace(rel_path, "/", "."), fil_itm); // add relpath in dotted form; EX: "a.b.c" } return rv; } public void Shrink() { - int len = libs.Count(); + int len = libs.Len(); for (int i = 0; i < len; i++) { gplx.core.ios.Io_fil fil = (gplx.core.ios.Io_fil)libs.Get_at(i); fil.Url_(null).Data_(null); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_kv_utl_.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_kv_utl_.java index 2a5795514..e13f92606 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_kv_utl_.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_kv_utl_.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto; import gplx.*; public class Scrib_kv_utl_ { public static Keyval[] base1_obj_(Object v) {return new Keyval[] {Keyval_.int_(0 + Scrib_core.Base_1, v)};} public static Keyval[] base1_many_(Object... vals) { @@ -31,7 +31,7 @@ public class Scrib_kv_utl_ { return rv; } public static Keyval[] base1_list_(List_adp list) { - int len = list.Count(); + int len = list.Len(); Keyval[] rv = new Keyval[len]; for (int i = 0; i < len; i++) rv[i] = Keyval_.int_(i + Scrib_core.Base_1, list.Get_at(i)); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lib_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lib_mgr.java index d8efa7bf4..91963698c 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lib_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lib_mgr.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.scribunto; import gplx.*; public class Scrib_lib_mgr { private final List_adp list = List_adp_.New(); - public int Len() {return list.Count();} + public int Len() {return list.Len();} public void Add(Scrib_lib v) {list.Add(v); v.Init();} public Scrib_lib Get_at(int i) {return (Scrib_lib)list.Get_at(i);} public void Init_for_core(Scrib_core core, Io_url script_dir) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; i++) { Scrib_lib lib = Get_at(i).Clone_lib(core); lib.Register(core, script_dir); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lua_mod.java b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lua_mod.java index 787d6019a..ade98129a 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lua_mod.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_lua_mod.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto; import gplx.*; public class Scrib_lua_mod { private Ordered_hash hash = Ordered_hash_.New(); public Scrib_lua_mod(Scrib_core core, String name) {this.name = name; this.core = core;} private Scrib_core core; @@ -22,9 +22,9 @@ public class Scrib_lua_mod { public Scrib_lua_proc Init_chunk_func() {return init_chunk_func;} private Scrib_lua_proc init_chunk_func; public byte[] Text_bry() {return text_bry;} private byte[] text_bry; public void Fncs_clear() {hash.Clear();} - public int Fncs_len() {return hash.Count();} + public int Fncs_len() {return hash.Len();} public Scrib_lua_proc Fncs_get_at(int i) {return (Scrib_lua_proc)hash.Get_at(i);} - public Scrib_lua_proc Fncs_get_by_key(String key) {return (Scrib_lua_proc)hash.Get_by(key);} + public Scrib_lua_proc Fncs_get_by_key(String key) {return (Scrib_lua_proc)hash.GetByOrNull(key);} public void Fncs_add(Scrib_lua_proc prc) {hash.Add(prc.Key(), prc);} public int Fncs_get_id(String key) { Scrib_lua_proc fnc = Fncs_get_by_key(key); if (fnc == null) throw Err_.new_wo_type("Scrb_fnc does not exist", "module", name, "func", key); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolver.java b/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolver.java index b926371e3..6aa91d347 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolver.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolver.java @@ -39,7 +39,7 @@ class ScribCfgResolverUtil { Json_ary subKeys = subNde.Get_as_ary("keys"); for (int keyIdx = 0; keyIdx < subKeys.Len(); keyIdx++) { byte[] subKey = subKeys.Get_at(keyIdx).Data_bry(); - ScribCfgResolver subScope = (ScribCfgResolver)hash.Get_by(subKey); + ScribCfgResolver subScope = (ScribCfgResolver)hash.GetByOrNull(subKey); if (subScope == null) { subScope = proto.CloneNew(String_.new_u8(subKey)); hash.Add(subKey, subScope); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolverApp.java b/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolverApp.java index 0370da46f..2f45a56b9 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolverApp.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/cfgs/ScribCfgResolverApp.java @@ -58,7 +58,7 @@ public class ScribCfgResolverApp implements ScribCfgResolver, CfgResolver { private void SetResolverCfg(Xow_wiki wikii) { Xowe_wiki wiki = (Xowe_wiki)wikii; byte[] key = wiki.Domain_bry(); - ScribCfgResolverWiki wikiScope = (ScribCfgResolverWiki)wikis.Get_by(key); + ScribCfgResolverWiki wikiScope = (ScribCfgResolverWiki)wikis.GetByOrNull(key); if (wikiScope == null) { // no defined cfg; create defailt wikiScope = new ScribCfgResolverWiki(String_.new_u8(key)); wikis.Add(key, wikiScope); // cache it for future @@ -77,9 +77,9 @@ class ScribCfgResolverWiki implements ScribCfgResolver { @Override public String Key() {return key;} private final String key; @Override public ScribCfg Fallback() {return fallback;} @Override public void FallbackSet(ScribCfg v) {fallback = v;} private ScribCfg fallback; @Override public ScribCfg Resolve(byte[] page, byte[] mod, byte[] func) { - ScribCfgResolverModule modResolver = (ScribCfgResolverModule)mods.Get_by(mod); + ScribCfgResolverModule modResolver = (ScribCfgResolverModule)mods.GetByOrNull(mod); if (modResolver == null) { - ScribCfgResolverMods pageResolver = (ScribCfgResolverMods)pages.Get_by(mod); + ScribCfgResolverMods pageResolver = (ScribCfgResolverMods)pages.GetByOrNull(mod); return pageResolver == null ? fallback : pageResolver.Resolve(page, mod, func); @@ -104,9 +104,9 @@ class ScribCfgResolverModule implements ScribCfgResolver { @Override public String Key() {return key;} private final String key; @Override public ScribCfg Fallback() {return fallback;} @Override public void FallbackSet(ScribCfg v) {fallback = v;} private ScribCfg fallback; @Override public ScribCfg Resolve(byte[] page, byte[] mod, byte[] func) { - ScribCfgResolverPages funcResolver = (ScribCfgResolverPages)funcs.Get_by(func); + ScribCfgResolverPages funcResolver = (ScribCfgResolverPages)funcs.GetByOrNull(func); if (funcResolver == null) { - ScribCfgResolverFuncs pageResolver = (ScribCfgResolverFuncs)pages.Get_by(page); + ScribCfgResolverFuncs pageResolver = (ScribCfgResolverFuncs)pages.GetByOrNull(page); return pageResolver == null ? fallback : pageResolver.Resolve(page, mod, func); @@ -132,7 +132,7 @@ class ScribCfgResolverPages implements ScribCfgResolver { @Override public String Key() {return key;} private final String key; @Override public ScribCfg Fallback() {return fallback;} @Override public void FallbackSet(ScribCfg v) {fallback = v;} private ScribCfg fallback; @Override public ScribCfg Resolve(byte[] page, byte[] mod, byte[] func) { - ScribCfg rv = (ScribCfg)pages.Get_by(page); + ScribCfg rv = (ScribCfg)pages.GetByOrNull(page); return rv == null ? fallback : rv; @@ -153,7 +153,7 @@ class ScribCfgResolverMods implements ScribCfgResolver { @Override public String Key() {return key;} private final String key; @Override public ScribCfg Fallback() {return fallback;} @Override public void FallbackSet(ScribCfg v) {fallback = v;} private ScribCfg fallback; @Override public ScribCfg Resolve(byte[] page, byte[] mod, byte[] func) { - ScribCfgResolverFuncs rv = (ScribCfgResolverFuncs)mods.Get_by(mod); + ScribCfgResolverFuncs rv = (ScribCfgResolverFuncs)mods.GetByOrNull(mod); return rv == null ? fallback : rv.Resolve(page, mod, func); @@ -172,7 +172,7 @@ class ScribCfgResolverFuncs implements ScribCfgResolver { @Override public String Key() {return key;} private final String key; @Override public ScribCfg Fallback() {return fallback;} @Override public void FallbackSet(ScribCfg v) {fallback = v;} private ScribCfg fallback; @Override public ScribCfg Resolve(byte[] page, byte[] mod, byte[] func) { - ScribCfg rv = (ScribCfg)funcs.Get_by(func); + ScribCfg rv = (ScribCfg)funcs.GetByOrNull(func); return rv == null ? fallback : rv; diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/luaj/Luaj_value_.java b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/luaj/Luaj_value_.java index 1809d34db..d6af3c704 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/luaj/Luaj_value_.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/luaj/Luaj_value_.java @@ -1,20 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto.engines.luaj; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.scribunto.engines.*; -import java.util.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto.engines.luaj; import gplx.*; +import gplx.xowa.xtns.scribunto.*; import org.luaj.vm2.*; class Luaj_value_ { public static String Get_val_as_str(LuaTable owner, String key) { @@ -103,7 +103,7 @@ class Luaj_value_ { cur = itm_key; ++rv_idx; } - return rv_list == null ? rv_ary : (Keyval[])rv_list.To_ary_and_clear(Keyval.class); + return rv_list == null ? rv_ary : (Keyval[])rv_list.ToAryAndClear(Keyval.class); } private static Object Lua_val_to_obj(Luaj_server server, LuaValue v) { switch (v.type()) { diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java index a0177f197..6bc677d65 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/mocks/Mock_engine.java @@ -13,8 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.engines.mocks; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.scribunto.engines.*; -import gplx.core.primitives.*; +package gplx.xowa.xtns.scribunto.engines.mocks; import gplx.*; +import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.scribunto.engines.*; import gplx.core.lists.hashs.*; public class Mock_engine implements Scrib_engine { private final Hash_adp__int fnc_hash = new Hash_adp__int(); @@ -25,7 +25,7 @@ public class Mock_engine implements Scrib_engine { public Scrib_server Server() {return server;} public void Server_(Scrib_server v) {} private final Mock_server server = new Mock_server(); public Scrib_lua_proc LoadString(String name, String text) { - return (Scrib_lua_proc)mod_init_hash.Get_by(name); + return (Scrib_lua_proc)mod_init_hash.GetByOrNull(name); } public Keyval[] CallFunction(int id, Keyval[] args) { Mock_proc_stub fnc = (Mock_proc_stub)fnc_hash.Get_by_or_fail(id); @@ -41,7 +41,7 @@ public class Mock_engine implements Scrib_engine { } public void Init_module(String mod_name, int mod_id) { - mod_init_hash.Add_if_dupe_use_nth(mod_name, new Scrib_lua_proc(mod_name, mod_id)); + mod_init_hash.AddIfDupeUseNth(mod_name, new Scrib_lua_proc(mod_name, mod_id)); } public void Init_module_func(int mod_id, Mock_proc_stub fnc) { Hash_adp funcs = (Hash_adp)mod_fnc_hash.Get_by_or_null(mod_id); @@ -54,7 +54,7 @@ public class Mock_engine implements Scrib_engine { } public Scrib_lua_proc Get_module_func(int mod_id, String fnc_name) { Hash_adp funcs = (Hash_adp)mod_fnc_hash.Get_by_or_fail(mod_id); - return (Scrib_lua_proc)funcs.Get_by_or_fail(fnc_name); + return (Scrib_lua_proc)funcs.GetByOrFail(fnc_name); } } class Mock_server implements Scrib_server { diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/process/Process_recv_msg.java b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/process/Process_recv_msg.java index 94e181f49..d5e887b30 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/engines/process/Process_recv_msg.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/engines/process/Process_recv_msg.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto.engines.process; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.scribunto.engines.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto.engines.process; import gplx.*; +import gplx.xowa.xtns.scribunto.*; import gplx.core.primitives.*; import gplx.langs.phps.*; public class Process_recv_msg { private Php_srl_parser parser = new Php_srl_parser(); @@ -38,7 +39,7 @@ public class Process_recv_msg { for (int i = 0; i < len; i++) { Keyval kv = rslt_ary[i]; String kv_key = kv.Key(); - Byte_obj_val bv = (Byte_obj_val)arg_keys.Get_by(kv_key); + Byte_obj_val bv = (Byte_obj_val)arg_keys.GetByOrNull(kv_key); if (bv != null) { switch (bv.Val()) { case Arg_op: op = kv.Val_to_str_or_empty(); break; diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/errs/Scrib_err_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/errs/Scrib_err_mgr.java index be2b94034..2b8b61b27 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/errs/Scrib_err_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/errs/Scrib_err_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.errs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.errs; import gplx.*; class Scrib_err_mgr implements Gfo_invk { private Ordered_hash hash = Ordered_hash_.New_bry(); private int key_id = 0; @@ -21,7 +21,7 @@ class Scrib_err_mgr implements Gfo_invk { private Scrib_err_cmd Set(byte[] key) { if (key == null) Bry_.Add(Key_prefix, Bry_.new_by_int(key_id++)); Scrib_err_cmd rv = new Scrib_err_cmd(key); - hash.Add_if_dupe_use_1st(key, rv); + hash.AddIfDupeUse1st(key, rv); return rv; } public void Clear() { @@ -29,7 +29,7 @@ class Scrib_err_mgr implements Gfo_invk { key_id = 0; } public void Process(Scrib_err_data err) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Scrib_err_cmd itm = (Scrib_err_cmd)hash.Get_at(i); if (itm.Warn_disabled(err)) { diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Referenced_entity_lookup_wkr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Referenced_entity_lookup_wkr.java index d69195029..4f3280f85 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Referenced_entity_lookup_wkr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Referenced_entity_lookup_wkr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.stores.*; // REF: https://github.com/wmde/WikibaseDataModelServices/blob/master/src/Lookup/EntityRetrievingClosestReferencedEntityIdLookup.php class Referenced_entity_lookup_wkr { @@ -41,7 +41,7 @@ class Referenced_entity_lookup_wkr { int steps = this.maxDepth + 1;// Add one as checking $fromId already is a step Ordered_hash toVisit = Ordered_hash_.New_bry(); - toVisit.Add_as_key_and_val(fromId); + toVisit.AddAsKeyAndVal(fromId); while (steps-- > 0) { // $this->entityPrefetcher->prefetch( $toVisit ); @@ -89,7 +89,7 @@ class Referenced_entity_lookup_wkr { Gfo_usr_dlg_.Instance.Warn_many("", "", "Entity " + String_.new_u8(id) + " already visited"); return null; } - alreadyVisited.Add_as_key_and_val(id); + alreadyVisited.AddAsKeyAndVal(id); if (alreadyVisited.Len() > maxEntityVisits) throw newErr(false); return entity_mgr.Get_by_loose_id_or_null(id); @@ -106,7 +106,7 @@ class Referenced_entity_lookup_wkr { byte[] entityId = snakEntity.Page_ttl_db(); if (toIds.Has(entityId)) return entityId; - toVisit.Add_as_key_and_val(entityId); + toVisit.AddAsKeyAndVal(entityId); return null; } diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_message.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_message.java index 67932050c..babec4ebf 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_message.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_message.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.scribunto.*; import gplx.core.primitives.*; import gplx.langs.htmls.*; import gplx.xowa.apps.gfs.*; import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; @@ -71,7 +72,7 @@ class Scrib_lib_message_data { for (int i = 0; i < len; i++) { Keyval kv = ary[i]; byte[] kv_key = Bry_.new_a7(kv.Key()); - Object key_obj = key_hash.Get_by(kv_key); if (key_obj == null) throw Err_.new_wo_type("msg_key is invalid", "key", kv_key); + Object key_obj = key_hash.GetByOrNull(kv_key); if (key_obj == null) throw Err_.new_wo_type("msg_key is invalid", "key", kv_key); byte key_tid = ((Byte_obj_val)key_obj).Val(); switch (key_tid) { case Key_tid_keys: diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_mw.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_mw.java index 3e4a59c43..081dc7b1f 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_mw.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_mw.java @@ -13,9 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; -import gplx.core.primitives.*; import gplx.core.envs.*; import gplx.core.errs.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.funcs.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.scribunto.*; +import gplx.core.primitives.*; import gplx.core.envs.*; +import gplx.xowa.langs.funcs.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*; import gplx.xowa.xtns.scribunto.procs.*; public class Scrib_lib_mw implements Scrib_lib { @@ -39,7 +40,7 @@ public class Scrib_lib_mw implements Scrib_lib { this.cur_wiki = wiki; this.ctx = ctx; this.src = new_src; } private Xowe_wiki cur_wiki; private byte[] src; private Xop_ctx ctx; private List_adp src_stack = List_adp_.New(); public void Invoke_end() { - if (src_stack.Count() > 0) // src_stack item exists; pop + if (src_stack.Len() > 0) // src_stack item exists; pop src = (byte[])List_adp_.Pop(src_stack); else // entry point; set to null src = null; @@ -209,7 +210,7 @@ public class Scrib_lib_mw implements Scrib_lib { rv.Add(kv); } tmp_bfr.Mkr_rls(); - return rslt.Init_obj((Keyval[])rv.To_ary(Keyval.class)); + return rslt.Init_obj((Keyval[])rv.ToAry(Keyval.class)); } public boolean FrameExists(Scrib_proc_args args, Scrib_proc_rslt rslt) { String frame_id = args.Cast_str_or_null(0); @@ -287,7 +288,7 @@ public class Scrib_lib_mw implements Scrib_lib { else rv.Add(arg); } - rv.Sort_by(Scrib_lib_mw_callParserFunction_sorter.Instance); + rv.SortBy(Scrib_lib_mw_callParserFunction_sorter.Instance); // get argx byte[] fnc_name = fnc_name_ref.Val(); int fnc_name_len = fnc_name.length; @@ -296,7 +297,7 @@ public class Scrib_lib_mw implements Scrib_lib { if (rv.Len() > 0) { // some parser_functions can pass 0 args; PAGE:en.w:Paris EX:{{#coordinates}} DATE:2016-10-12 Keyval arg_argx = (Keyval)rv.Get_at(0); argx_ref.Val_(arg_argx.Val_to_bry()); - rv.Del_at(0); + rv.DelAt(0); } } else { @@ -304,7 +305,7 @@ public class Scrib_lib_mw implements Scrib_lib { fnc_name = Bry_.Mid(fnc_name, 0, fnc_name_colon_pos); fnc_name_ref.Val_(fnc_name); } - return (Keyval[])rv.To_ary(Keyval.class); + return (Keyval[])rv.ToAry(Keyval.class); } private static boolean Is_kv_ary(Keyval kv) {return Type_.Eq_by_obj(kv.Val(), Keyval[].class);} public boolean ExpandTemplate(Scrib_proc_args args, Scrib_proc_rslt rslt) { @@ -356,7 +357,7 @@ public class Scrib_lib_mw implements Scrib_lib { } public boolean NewChildFrame(Scrib_proc_args args, Scrib_proc_rslt rslt) { Ordered_hash frame_list = core.Frame_created_list(); - int frame_list_len = frame_list.Count(); + int frame_list_len = frame_list.Len(); if (frame_list_len > 100) throw Err_.new_wo_type("newChild: too many frames"); String frame_id = args.Pull_str(0); Xot_invk frame = Scrib_frame_.Get_frame(core, frame_id); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_site.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_site.java index 289c919fb..528b372e0 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_site.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_site.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; -import gplx.xowa.langs.*; import gplx.xowa.langs.msgs.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.scribunto.*; +import gplx.xowa.langs.msgs.*; import gplx.xowa.wikis.nss.*; import gplx.xowa.addons.wikis.ctgs.*; -import gplx.xowa.wikis.metas.*; import gplx.xowa.wikis.data.site_stats.*; import gplx.xowa.wikis.xwikis.*; +import gplx.xowa.wikis.metas.*; import gplx.xowa.wikis.data.site_stats.*; import gplx.xowa.xtns.scribunto.procs.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.xwikis.interwikis.*; public class Scrib_lib_site implements Scrib_lib { @@ -107,7 +108,7 @@ public class Scrib_lib_site implements Scrib_lib { throw Err_.new_wo_type("bad argument #1 to 'interwikiMap' (unknown filter '$filter')", "filter", filter); Hash_adp misc_cache = core.Wiki().Cache_mgr().Misc_cache(); String cache_key = "scribunto.interwikimap." + core.Wiki().Domain_str() + "." + filter; - Keyval[] rv = (Keyval[])misc_cache.Get_by(cache_key); + Keyval[] rv = (Keyval[])misc_cache.GetByOrNull(cache_key); if (rv == null) { Xow_interwiki_map interwiki_map = core.Wiki().Xwiki_mgr().Interwiki_map(); int interwiki_map_len = interwiki_map.Len(); @@ -121,7 +122,7 @@ public class Scrib_lib_site implements Scrib_lib { String prefix = String_.new_u8(itm.Key()); list.Add(Keyval_.new_(prefix, InterwikiMap_itm(prefix, itm_is_local, String_.new_u8(itm.Url())))); } - rv = (Keyval[])list.To_ary_and_clear(Keyval.class); + rv = (Keyval[])list.ToAryAndClear(Keyval.class); misc_cache.Add(cache_key, rv); } return rslt.Init_obj(rv); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_text_.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_text_.java index a9e0e15ee..5952a03a3 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_text_.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_text_.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.core.net.*; class Scrib_lib_text_ { public static Keyval[] Init_nowiki_protocols(Xowe_wiki wiki) { Bry_bfr bfr = wiki.Utl__bfr_mkr().Get_b128(); Ordered_hash protocols = Gfo_protocol_itm.Regy; - int len = protocols.Count(); + int len = protocols.Len(); List_adp rv = List_adp_.New(); for (int i = 0; i < len; i++) { Gfo_protocol_itm itm = (Gfo_protocol_itm)protocols.Get_at(i); @@ -29,7 +29,7 @@ class Scrib_lib_text_ { } } bfr.Mkr_rls(); - return (Keyval[])rv.To_ary(Keyval.class); + return (Keyval[])rv.ToAry(Keyval.class); } private static Keyval Init_nowiki_protocols_itm(Bry_bfr bfr, Gfo_protocol_itm itm) { byte[] key = itm.Key_wo_colon_bry(); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_title.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_title.java index 9a6ce8d27..bae68126e 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_title.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_title.java @@ -13,14 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.scribunto.*; import gplx.core.primitives.*; import gplx.xowa.wikis.nss.*; -import gplx.xowa.wikis.caches.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.files.commons.*; import gplx.xowa.files.origs.*; -import gplx.xowa.apps.wms.apis.*; +import gplx.xowa.wikis.caches.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.wikis.xwikis.*; +import gplx.xowa.files.origs.*; import gplx.xowa.xtns.scribunto.procs.*; -import gplx.xowa.wikis.pages.redirects.*; public class Scrib_lib_title implements Scrib_lib { public Scrib_lib_title(Scrib_core core) {this.core = core;} private Scrib_core core; public String Key() {return "mw.title";} @@ -91,7 +90,7 @@ public class Scrib_lib_title implements Scrib_lib { Xowe_wiki wiki = core.Wiki(); byte[] ttl_bry = args.Pull_bry(0); byte[] url_func_bry = args.Pull_bry(1); - Object url_func_obj = url_func_hash.Get_by(url_func_bry); + Object url_func_obj = url_func_hash.GetByOrNull(url_func_bry); if (url_func_obj == null) throw Err_.new_wo_type("url_function is not valid", "url_func", String_.new_u8(url_func_bry)); byte url_func_tid = ((Byte_obj_val)url_func_obj).Val(); byte[] qry_bry = args.Extract_qry_args(wiki, 2); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring.java index 7ee80d8b1..de494bc8e 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring.java @@ -1,236 +1,236 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto.libs; - -import gplx.Bool_; -import gplx.Err_; -import gplx.Gfo_usr_dlg_; -import gplx.Io_url; -import gplx.Keyval; -import gplx.Keyval_; -import gplx.List_adp; -import gplx.List_adp_; -import gplx.String_; -import gplx.langs.regxs.Regx_adp; -import gplx.langs.regxs.Regx_adp_; -import gplx.langs.regxs.Regx_group; -import gplx.langs.regxs.Regx_match; -import gplx.objects.strings.unicodes.Ustring; -import gplx.objects.strings.unicodes.Ustring_; -import gplx.xowa.Xoa_page_; -import gplx.xowa.xtns.scribunto.Scrib_core; -import gplx.xowa.xtns.scribunto.Scrib_kv_utl_; -import gplx.xowa.xtns.scribunto.Scrib_lib; -import gplx.xowa.xtns.scribunto.Scrib_lua_mod; -import gplx.xowa.xtns.scribunto.libs.patterns.Scrib_pattern_matcher; -import gplx.xowa.xtns.scribunto.procs.Scrib_proc_args; -import gplx.xowa.xtns.scribunto.procs.Scrib_proc_mgr; -import gplx.xowa.xtns.scribunto.procs.Scrib_proc_rslt; - -public class Scrib_lib_ustring implements Scrib_lib { - public Scrib_lib_ustring(Scrib_core core) {this.core = core;} private Scrib_core core; - public String Key() {return "mw.ustring";} - public Scrib_lua_mod Mod() {return mod;} private Scrib_lua_mod mod; - public int String_len_max() {return string_len_max;} public Scrib_lib_ustring String_len_max_(int v) {string_len_max = v; return this;} private int string_len_max = Xoa_page_.Page_len_max; - public int Pattern_len_max() {return pattern_len_max;} public Scrib_lib_ustring Pattern_len_max_(int v) {pattern_len_max = v; return this;} private int pattern_len_max = 10000; - public Scrib_lib Init() {procs.Init_by_lib(this, Proc_names); return this;} - public Scrib_lib Clone_lib(Scrib_core core) {return new Scrib_lib_ustring(core);} - public Scrib_lua_mod Register(Scrib_core core, Io_url script_dir) { - Init(); - mod = core.RegisterInterface(this, script_dir.GenSubFil("mw.ustring.lua") - , Keyval_.new_("stringLengthLimit", string_len_max) - , Keyval_.new_("patternLengthLimit", pattern_len_max) - ); - return mod; - } - public Scrib_proc_mgr Procs() {return procs;} private Scrib_proc_mgr procs = new Scrib_proc_mgr(); - public boolean Procs_exec(int key, Scrib_proc_args args, Scrib_proc_rslt rslt) { - switch (key) { - case Proc_find: return Find(args, rslt); - case Proc_match: return Match(args, rslt); - case Proc_gmatch_init: return Gmatch_init(args, rslt); - case Proc_gmatch_callback: return Gmatch_callback(args, rslt); - case Proc_gsub: return Gsub(args, rslt); - default: throw Err_.new_unhandled(key); - } - } - private static final int Proc_find = 0, Proc_match = 1, Proc_gmatch_init = 2, Proc_gmatch_callback = 3, Proc_gsub = 4; - public static final String Invk_find = "find", Invk_match = "match", Invk_gmatch_init = "gmatch_init", Invk_gmatch_callback = "gmatch_callback", Invk_gsub = "gsub"; - private static final String[] Proc_names = String_.Ary(Invk_find, Invk_match, Invk_gmatch_init, Invk_gmatch_callback, Invk_gsub); - public boolean Find(Scrib_proc_args args, Scrib_proc_rslt rslt) { - // get args - String text_str = args.Xstr_str_or_null(0); - String find_str = args.Pull_str(1); - int bgn_as_codes_base1 = args.Cast_int_or(2, 1); - boolean plain = args.Cast_bool_or_n(3); - - // init text vars - Ustring text_ucs = Ustring_.New_codepoints(text_str); // NOTE: must count codes for supplementaries; PAGE:en.d:iglesia DATE:2017-04-23 - - // convert bgn from base_1 to base_0 - int bgn_as_codes = To_java_by_lua(bgn_as_codes_base1, text_ucs.Len_in_data()); - - /* - int offset = 0; - if (bgn_as_codes > 0) { // NOTE: MW.BASE - // $offset = strlen( mb_substr( $s, 0, $init - 1, 'UTF-8' ) ); - } - else { - bgn_as_codes_base1 = 0; // NOTE: MW.BASE1 - offset = 0; // -1? - } - */ - - // find_str of "" should return (bgn, bgn - 1) regardless of whether plain is true or false; - // NOTE: do not include surrogate calc; PAGE:en.d:佻 DATE:2017-04-24 - // NOTE: not in MW; is this needed? DATE:2019-02-24 - if (String_.Len_eq_0(find_str)) - return rslt.Init_many_objs(bgn_as_codes_base1, bgn_as_codes_base1 - 1); - - // if plain, just do literal match of find and exit - if (plain) { - // find pos by literal match - Ustring find_ucs = Ustring_.New_codepoints(find_str); - int pos = text_ucs.Index_of(find_ucs, bgn_as_codes); - - // if nothing found, return empty - if (pos == String_.Find_none) - return rslt.Init_ary_empty(); - - // bgn: adjust for base1 - int bgn = pos + Base1; - - // end: add find.Len_in_codes and adjust end for PHP/LUA - int end = bgn + find_ucs.Len_in_data() - End_adj; - - return rslt.Init_many_objs(bgn, end); - } - - // run regex; NOTE: take only 1st result; DATE:2014-08-27 - Scrib_pattern_matcher matcher = Scrib_pattern_matcher.New(core.Page_url()); - Regx_match match = matcher.Match_one(text_ucs, find_str, bgn_as_codes, true); - if (match.Rslt_none()) return rslt.Init_null(); // null verified on MW; EX: =mw.ustring.find("abc", "z"); DATE:2019-04-11 - - // add to tmp_list - List_adp tmp_list = List_adp_.New(); - tmp_list.Add(text_ucs.Map_char_to_data(match.Find_bgn()) + Scrib_lib_ustring.Base1); - tmp_list.Add(text_ucs.Map_char_to_data(match.Find_end()) + Scrib_lib_ustring.Base1 - Scrib_lib_ustring.End_adj); - AddCapturesFromMatch(tmp_list, match, text_str, matcher.Capt_ary(), false); - return rslt.Init_many_list(tmp_list); - } - public boolean Match(Scrib_proc_args args, Scrib_proc_rslt rslt) { - // get args - String text_str = args.Xstr_str_or_null(0); // Module can pass raw ints; PAGE:en.w:Budget_of_the_European_Union; DATE:2015-01-22 - // 2019-20-01|ISSUE#:802|passing integer should return NULL, not throw error - String find_str = args.Xstr_str_or_null(1); - int bgn_as_codes_base1 = args.Cast_int_or(2, 1); - - // validate / adjust - if (text_str == null) // if no text_str is passed, do not fail; return empty; EX:d:changed; DATE:2014-02-06 - return rslt.Init_many_list(List_adp_.Noop); - Ustring text_ucs = Ustring_.New_codepoints(text_str); // NOTE: must count codes for supplementaries; PAGE:en.d:iglesia DATE:2017-04-23 - int bgn_as_codes = To_java_by_lua(bgn_as_codes_base1, text_ucs.Len_in_data()); - - // run regex; NOTE add 1st match only; do not add all; PAGE:en.d:действительное_причастие_настоящего_времени DATE:2017-04-23 - Scrib_pattern_matcher matcher = Scrib_pattern_matcher.New(core.Page_url()); - Regx_match match = matcher.Match_one(text_ucs, find_str, bgn_as_codes, true); - if (match.Rslt_none()) return rslt.Init_null(); // return null if no matches found; EX:w:Mount_Gambier_(volcano); DATE:2014-04-02; confirmed with en.d:民; DATE:2015-01-30 - - List_adp tmp_list = List_adp_.New(); - AddCapturesFromMatch(tmp_list, match, text_str, matcher.Capt_ary(), true); - return rslt.Init_many_list(tmp_list); - } - public boolean Gsub(Scrib_proc_args args, Scrib_proc_rslt rslt) { - Scrib_lib_ustring_gsub_mgr gsub_mgr = new Scrib_lib_ustring_gsub_mgr(core); - return gsub_mgr.Exec(args, rslt); - } - public boolean Gmatch_init(Scrib_proc_args args, Scrib_proc_rslt rslt) { - // String text = Scrib_kv_utl_.Val_to_str(values, 0); - String regx = args.Pull_str(1); - Scrib_regx_converter regx_converter = new Scrib_regx_converter(); - if (Scrib_pattern_matcher.Mode_is_xowa()) - regx_converter.patternToRegex(regx, Scrib_regx_converter.Anchor_null, true); - else - regx = regx_converter.patternToRegex(regx, Scrib_regx_converter.Anchor_null, true); - return rslt.Init_many_objs(regx, regx_converter.Capt_ary()); - } - public boolean Gmatch_callback(Scrib_proc_args args, Scrib_proc_rslt rslt) { - String text = args.Xstr_str_or_null(0); // NOTE: UstringLibrary.php!ustringGmatchCallback calls preg_match directly; $s can be any type, and php casts automatically; - String regx = args.Pull_str(1); - Keyval[] capt = args.Cast_kv_ary_or_null(2); - int pos = args.Pull_int(3); - - Ustring text_ucs = Ustring_.New_codepoints(text); - // int pos_as_codes = To_java_by_lua(pos, text_ucs.Len_in_data()); - Regx_match match = Scrib_pattern_matcher.New(core.Page_url()).Match_one(text_ucs, regx, pos, false); - if (match.Rslt_none()) return rslt.Init_many_objs(pos, Keyval_.Ary_empty); - List_adp tmp_list = List_adp_.New(); - AddCapturesFromMatch(tmp_list, match, text, capt, true); // NOTE: was incorrectly set as false; DATE:2014-04-23 - return rslt.Init_many_objs(match.Find_end(), Scrib_kv_utl_.base1_list_(tmp_list)); - } - private int To_java_by_lua(int bgn_as_codes_base1, int len_in_codes) { - // convert bgn from base_1 to base_0 - int bgn_as_codes = bgn_as_codes_base1; - if (bgn_as_codes > 0) - bgn_as_codes -= Scrib_lib_ustring.Base1; - // TOMBSTONE: do not adjust negative numbers for base1; fails tests - // else if (bgn_as_codes < 0) bgn_as_codes += Scrib_lib_ustring.Base1; - - // adjust bgn for negative-numbers and large positive-numbers - // NOTE: MW uses mb_strlen which returns len of mb chars as 1; REF.PHP: http://php.net/manual/en/function.mb-strlen.php - // NOTE: MW does additional +1 for PHP.base_1. This is not needed for JAVA; noted below as IGNORE_BASE_1_ADJ - if (bgn_as_codes < 0) // negative number means search from rear of String - bgn_as_codes += len_in_codes; // NOTE:IGNORE_BASE_1_ADJ - else if (bgn_as_codes > len_in_codes) // bgn_as_codes > text_len; confine to text_len; NOTE:IGNORE_BASE_1_ADJ - bgn_as_codes = len_in_codes; // NOTE:IGNORE_BASE_1_ADJ - - // will be negative if Abs(bgn_as_codes) > text.length; ISSUE#:366; DATE:2019-02-23 - if (bgn_as_codes < 0) - bgn_as_codes = 0; - return bgn_as_codes; - } - private void AddCapturesFromMatch(List_adp tmp_list, Regx_match rslt, String text, Keyval[] capts, boolean op_is_match) {// NOTE: this matches behavior in UstringLibrary.php!addCapturesFromMatch - int capts_len = capts == null ? 0 : capts.length; - if (capts_len > 0) { // NOTE: changed from "grps_len > 0"; PAGE:en.w:Portal:Constructed_languages/Intro DATE:2018-07-02 - Regx_group[] grps = rslt.Groups(); - int grps_len = grps.length; - for (int j = 0; j < grps_len; j++) { - Regx_group grp = grps[j]; - if ( j < capts_len // bounds check b/c null can be passed - && Bool_.Cast(capts[j].Val()) // check if true; indicates that group is "()" or "anypos" see regex converter; DATE:2014-04-23 - ) - tmp_list.Add(grp.Bgn() + Scrib_lib_ustring.Base1); // return index only for "()"; NOTE: do not return as String; callers expect int and will fail typed comparisons; DATE:2016-01-21 - else - tmp_list.Add(grp.Val()); // return match - } - } - else if ( op_is_match // if op_is_match, and no captures, extract find_txt; note that UstringLibrary.php says "$arr[] = $m[0][0];" which means get the 1st match; - && tmp_list.Count() == 0) // only add match once; EX: "aaaa", "a" will have four matches; get 1st; DATE:2014-04-02 - tmp_list.Add(String_.Mid(text, rslt.Find_bgn(), rslt.Find_end())); - } - public static Regx_adp RegxAdp_new_(byte[] page_url, String regx) { - Regx_adp rv = Regx_adp_.new_(regx); - if (rv.Pattern_is_invalid()) { - // try to identify [z-a] errors; PAGE:https://en.wiktionary.org/wiki/Module:scripts/data; DATE:2017-04-23 - Exception exc = rv.Pattern_is_invalid_exception(); - Gfo_usr_dlg_.Instance.Log_many("", "", "regx is invalid: regx=~{0} page=~{1} exc=~{2}", regx, page_url, Err_.Message_gplx_log(exc)); - } - return rv; - } - private static final int - Base1 = 1 - , End_adj = 1; // lua / php uses "end" as <= not <; EX: "abc" and bgn=0, end= 1; for XOWA, this is "a"; for MW / PHP it is "ab" -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto.libs; + +import gplx.Bool_; +import gplx.Err_; +import gplx.Gfo_usr_dlg_; +import gplx.Io_url; +import gplx.Keyval; +import gplx.Keyval_; +import gplx.List_adp; +import gplx.List_adp_; +import gplx.String_; +import gplx.langs.regxs.Regx_adp; +import gplx.langs.regxs.Regx_adp_; +import gplx.langs.regxs.Regx_group; +import gplx.langs.regxs.Regx_match; +import gplx.objects.strings.unicodes.Ustring; +import gplx.objects.strings.unicodes.Ustring_; +import gplx.xowa.Xoa_page_; +import gplx.xowa.xtns.scribunto.Scrib_core; +import gplx.xowa.xtns.scribunto.Scrib_kv_utl_; +import gplx.xowa.xtns.scribunto.Scrib_lib; +import gplx.xowa.xtns.scribunto.Scrib_lua_mod; +import gplx.xowa.xtns.scribunto.libs.patterns.Scrib_pattern_matcher; +import gplx.xowa.xtns.scribunto.procs.Scrib_proc_args; +import gplx.xowa.xtns.scribunto.procs.Scrib_proc_mgr; +import gplx.xowa.xtns.scribunto.procs.Scrib_proc_rslt; + +public class Scrib_lib_ustring implements Scrib_lib { + public Scrib_lib_ustring(Scrib_core core) {this.core = core;} private Scrib_core core; + public String Key() {return "mw.ustring";} + public Scrib_lua_mod Mod() {return mod;} private Scrib_lua_mod mod; + public int String_len_max() {return string_len_max;} public Scrib_lib_ustring String_len_max_(int v) {string_len_max = v; return this;} private int string_len_max = Xoa_page_.Page_len_max; + public int Pattern_len_max() {return pattern_len_max;} public Scrib_lib_ustring Pattern_len_max_(int v) {pattern_len_max = v; return this;} private int pattern_len_max = 10000; + public Scrib_lib Init() {procs.Init_by_lib(this, Proc_names); return this;} + public Scrib_lib Clone_lib(Scrib_core core) {return new Scrib_lib_ustring(core);} + public Scrib_lua_mod Register(Scrib_core core, Io_url script_dir) { + Init(); + mod = core.RegisterInterface(this, script_dir.GenSubFil("mw.ustring.lua") + , Keyval_.new_("stringLengthLimit", string_len_max) + , Keyval_.new_("patternLengthLimit", pattern_len_max) + ); + return mod; + } + public Scrib_proc_mgr Procs() {return procs;} private Scrib_proc_mgr procs = new Scrib_proc_mgr(); + public boolean Procs_exec(int key, Scrib_proc_args args, Scrib_proc_rslt rslt) { + switch (key) { + case Proc_find: return Find(args, rslt); + case Proc_match: return Match(args, rslt); + case Proc_gmatch_init: return Gmatch_init(args, rslt); + case Proc_gmatch_callback: return Gmatch_callback(args, rslt); + case Proc_gsub: return Gsub(args, rslt); + default: throw Err_.new_unhandled(key); + } + } + private static final int Proc_find = 0, Proc_match = 1, Proc_gmatch_init = 2, Proc_gmatch_callback = 3, Proc_gsub = 4; + public static final String Invk_find = "find", Invk_match = "match", Invk_gmatch_init = "gmatch_init", Invk_gmatch_callback = "gmatch_callback", Invk_gsub = "gsub"; + private static final String[] Proc_names = String_.Ary(Invk_find, Invk_match, Invk_gmatch_init, Invk_gmatch_callback, Invk_gsub); + public boolean Find(Scrib_proc_args args, Scrib_proc_rslt rslt) { + // get args + String text_str = args.Xstr_str_or_null(0); + String find_str = args.Pull_str(1); + int bgn_as_codes_base1 = args.Cast_int_or(2, 1); + boolean plain = args.Cast_bool_or_n(3); + + // init text vars + Ustring text_ucs = Ustring_.New_codepoints(text_str); // NOTE: must count codes for supplementaries; PAGE:en.d:iglesia DATE:2017-04-23 + + // convert bgn from base_1 to base_0 + int bgn_as_codes = To_java_by_lua(bgn_as_codes_base1, text_ucs.Len_in_data()); + + /* + int offset = 0; + if (bgn_as_codes > 0) { // NOTE: MW.BASE + // $offset = strlen( mb_substr( $s, 0, $init - 1, 'UTF-8' ) ); + } + else { + bgn_as_codes_base1 = 0; // NOTE: MW.BASE1 + offset = 0; // -1? + } + */ + + // find_str of "" should return (bgn, bgn - 1) regardless of whether plain is true or false; + // NOTE: do not include surrogate calc; PAGE:en.d:佻 DATE:2017-04-24 + // NOTE: not in MW; is this needed? DATE:2019-02-24 + if (String_.Len_eq_0(find_str)) + return rslt.Init_many_objs(bgn_as_codes_base1, bgn_as_codes_base1 - 1); + + // if plain, just do literal match of find and exit + if (plain) { + // find pos by literal match + Ustring find_ucs = Ustring_.New_codepoints(find_str); + int pos = text_ucs.Index_of(find_ucs, bgn_as_codes); + + // if nothing found, return empty + if (pos == String_.Find_none) + return rslt.Init_ary_empty(); + + // bgn: adjust for base1 + int bgn = pos + Base1; + + // end: add find.Len_in_codes and adjust end for PHP/LUA + int end = bgn + find_ucs.Len_in_data() - End_adj; + + return rslt.Init_many_objs(bgn, end); + } + + // run regex; NOTE: take only 1st result; DATE:2014-08-27 + Scrib_pattern_matcher matcher = Scrib_pattern_matcher.New(core.Page_url()); + Regx_match match = matcher.Match_one(text_ucs, find_str, bgn_as_codes, true); + if (match.Rslt_none()) return rslt.Init_null(); // null verified on MW; EX: =mw.ustring.find("abc", "z"); DATE:2019-04-11 + + // add to tmp_list + List_adp tmp_list = List_adp_.New(); + tmp_list.Add(text_ucs.Map_char_to_data(match.Find_bgn()) + Scrib_lib_ustring.Base1); + tmp_list.Add(text_ucs.Map_char_to_data(match.Find_end()) + Scrib_lib_ustring.Base1 - Scrib_lib_ustring.End_adj); + AddCapturesFromMatch(tmp_list, match, text_str, matcher.Capt_ary(), false); + return rslt.Init_many_list(tmp_list); + } + public boolean Match(Scrib_proc_args args, Scrib_proc_rslt rslt) { + // get args + String text_str = args.Xstr_str_or_null(0); // Module can pass raw ints; PAGE:en.w:Budget_of_the_European_Union; DATE:2015-01-22 + // 2019-20-01|ISSUE#:802|passing integer should return NULL, not throw error + String find_str = args.Xstr_str_or_null(1); + int bgn_as_codes_base1 = args.Cast_int_or(2, 1); + + // validate / adjust + if (text_str == null) // if no text_str is passed, do not fail; return empty; EX:d:changed; DATE:2014-02-06 + return rslt.Init_many_list(List_adp_.Noop); + Ustring text_ucs = Ustring_.New_codepoints(text_str); // NOTE: must count codes for supplementaries; PAGE:en.d:iglesia DATE:2017-04-23 + int bgn_as_codes = To_java_by_lua(bgn_as_codes_base1, text_ucs.Len_in_data()); + + // run regex; NOTE add 1st match only; do not add all; PAGE:en.d:действительное_причастие_настоящего_времени DATE:2017-04-23 + Scrib_pattern_matcher matcher = Scrib_pattern_matcher.New(core.Page_url()); + Regx_match match = matcher.Match_one(text_ucs, find_str, bgn_as_codes, true); + if (match.Rslt_none()) return rslt.Init_null(); // return null if no matches found; EX:w:Mount_Gambier_(volcano); DATE:2014-04-02; confirmed with en.d:民; DATE:2015-01-30 + + List_adp tmp_list = List_adp_.New(); + AddCapturesFromMatch(tmp_list, match, text_str, matcher.Capt_ary(), true); + return rslt.Init_many_list(tmp_list); + } + public boolean Gsub(Scrib_proc_args args, Scrib_proc_rslt rslt) { + Scrib_lib_ustring_gsub_mgr gsub_mgr = new Scrib_lib_ustring_gsub_mgr(core); + return gsub_mgr.Exec(args, rslt); + } + public boolean Gmatch_init(Scrib_proc_args args, Scrib_proc_rslt rslt) { + // String text = Scrib_kv_utl_.Val_to_str(values, 0); + String regx = args.Pull_str(1); + Scrib_regx_converter regx_converter = new Scrib_regx_converter(); + if (Scrib_pattern_matcher.Mode_is_xowa()) + regx_converter.patternToRegex(regx, Scrib_regx_converter.Anchor_null, true); + else + regx = regx_converter.patternToRegex(regx, Scrib_regx_converter.Anchor_null, true); + return rslt.Init_many_objs(regx, regx_converter.Capt_ary()); + } + public boolean Gmatch_callback(Scrib_proc_args args, Scrib_proc_rslt rslt) { + String text = args.Xstr_str_or_null(0); // NOTE: UstringLibrary.php!ustringGmatchCallback calls preg_match directly; $s can be any type, and php casts automatically; + String regx = args.Pull_str(1); + Keyval[] capt = args.Cast_kv_ary_or_null(2); + int pos = args.Pull_int(3); + + Ustring text_ucs = Ustring_.New_codepoints(text); + // int pos_as_codes = To_java_by_lua(pos, text_ucs.Len_in_data()); + Regx_match match = Scrib_pattern_matcher.New(core.Page_url()).Match_one(text_ucs, regx, pos, false); + if (match.Rslt_none()) return rslt.Init_many_objs(pos, Keyval_.Ary_empty); + List_adp tmp_list = List_adp_.New(); + AddCapturesFromMatch(tmp_list, match, text, capt, true); // NOTE: was incorrectly set as false; DATE:2014-04-23 + return rslt.Init_many_objs(match.Find_end(), Scrib_kv_utl_.base1_list_(tmp_list)); + } + private int To_java_by_lua(int bgn_as_codes_base1, int len_in_codes) { + // convert bgn from base_1 to base_0 + int bgn_as_codes = bgn_as_codes_base1; + if (bgn_as_codes > 0) + bgn_as_codes -= Scrib_lib_ustring.Base1; + // TOMBSTONE: do not adjust negative numbers for base1; fails tests + // else if (bgn_as_codes < 0) bgn_as_codes += Scrib_lib_ustring.Base1; + + // adjust bgn for negative-numbers and large positive-numbers + // NOTE: MW uses mb_strlen which returns len of mb chars as 1; REF.PHP: http://php.net/manual/en/function.mb-strlen.php + // NOTE: MW does additional +1 for PHP.base_1. This is not needed for JAVA; noted below as IGNORE_BASE_1_ADJ + if (bgn_as_codes < 0) // negative number means search from rear of String + bgn_as_codes += len_in_codes; // NOTE:IGNORE_BASE_1_ADJ + else if (bgn_as_codes > len_in_codes) // bgn_as_codes > text_len; confine to text_len; NOTE:IGNORE_BASE_1_ADJ + bgn_as_codes = len_in_codes; // NOTE:IGNORE_BASE_1_ADJ + + // will be negative if Abs(bgn_as_codes) > text.length; ISSUE#:366; DATE:2019-02-23 + if (bgn_as_codes < 0) + bgn_as_codes = 0; + return bgn_as_codes; + } + private void AddCapturesFromMatch(List_adp tmp_list, Regx_match rslt, String text, Keyval[] capts, boolean op_is_match) {// NOTE: this matches behavior in UstringLibrary.php!addCapturesFromMatch + int capts_len = capts == null ? 0 : capts.length; + if (capts_len > 0) { // NOTE: changed from "grps_len > 0"; PAGE:en.w:Portal:Constructed_languages/Intro DATE:2018-07-02 + Regx_group[] grps = rslt.Groups(); + int grps_len = grps.length; + for (int j = 0; j < grps_len; j++) { + Regx_group grp = grps[j]; + if ( j < capts_len // bounds check b/c null can be passed + && Bool_.Cast(capts[j].Val()) // check if true; indicates that group is "()" or "anypos" see regex converter; DATE:2014-04-23 + ) + tmp_list.Add(grp.Bgn() + Scrib_lib_ustring.Base1); // return index only for "()"; NOTE: do not return as String; callers expect int and will fail typed comparisons; DATE:2016-01-21 + else + tmp_list.Add(grp.Val()); // return match + } + } + else if ( op_is_match // if op_is_match, and no captures, extract find_txt; note that UstringLibrary.php says "$arr[] = $m[0][0];" which means get the 1st match; + && tmp_list.Len() == 0) // only add match once; EX: "aaaa", "a" will have four matches; get 1st; DATE:2014-04-02 + tmp_list.Add(String_.Mid(text, rslt.Find_bgn(), rslt.Find_end())); + } + public static Regx_adp RegxAdp_new_(byte[] page_url, String regx) { + Regx_adp rv = Regx_adp_.new_(regx); + if (rv.Pattern_is_invalid()) { + // try to identify [z-a] errors; PAGE:https://en.wiktionary.org/wiki/Module:scripts/data; DATE:2017-04-23 + Exception exc = rv.Pattern_is_invalid_exception(); + Gfo_usr_dlg_.Instance.Log_many("", "", "regx is invalid: regx=~{0} page=~{1} exc=~{2}", regx, page_url, Err_.Message_gplx_log(exc)); + } + return rv; + } + private static final int + Base1 = 1 + , End_adj = 1; // lua / php uses "end" as <= not <; EX: "abc" and bgn=0, end= 1; for XOWA, this is "a"; for MW / PHP it is "ab" +} diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring_gsub_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring_gsub_mgr.java index e9c06d134..e58cbf1f1 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring_gsub_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_ustring_gsub_mgr.java @@ -168,7 +168,7 @@ public class Scrib_lib_ustring_gsub_mgr { // THREAD.UNSAFE:LOCAL_VALUES Regx_group grp = grps[0]; find_str = grp.Val(); } - Object actl_repl_obj = repl_hash.Get_by(find_str); + Object actl_repl_obj = repl_hash.GetByOrNull(find_str); if (actl_repl_obj == null) // match found, but no replacement specified; EX:"abc", "[ab]", "a:A"; "b" in regex but not in tbl; EX:d:DVD; DATE:2014-03-31 tmp_bfr.Add_str_u8(find_str); else diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase.java index c9f300136..0d9813d9a 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase.java @@ -13,13 +13,13 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; -import gplx.langs.jsons.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.parsers.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.stores.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.scribunto.*; +import gplx.xowa.xtns.wbases.*; +import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.stores.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.xtns.scribunto.procs.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.mediawiki.extensions.Wikibase.client.includes.*; import gplx.xowa.mediawiki.extensions.Wikibase.client.includes.dataAccess.scribunto.*; -import gplx.xowa.mediawiki.*; -import gplx.xowa.mediawiki.extensions.Wikibase.lib.includes.Store.*; // REF.MW:https://github.com/wikimedia/mediawiki-extensions-Wikibase/blob/master/client/includes/DataAccess/Scribunto/Scribunto_LuaWikibaseLibrary.php public class Scrib_lib_wikibase implements Scrib_lib { private final Scrib_core core; @@ -216,7 +216,7 @@ public class Scrib_lib_wikibase implements Scrib_lib { Keyval[] toIdsAry = args.Pull_kv_ary_safe(2); Ordered_hash toIds = Ordered_hash_.New_bry(); for (Keyval kv : toIdsAry) { - toIds.Add_as_key_and_val(checkEntityIdOrNull(Bry_.new_u8((String)kv.Val()))); + toIds.AddAsKeyAndVal(checkEntityIdOrNull(Bry_.new_u8((String)kv.Val()))); } Referenced_entity_lookup_wkr wkr = new Referenced_entity_lookup_wkr(ReferencedEntityIdMaxDepth, ReferencedEntityIdMaxReferencedEntityVisits, entity_mgr, core.Page().Url(), fromId, propertyId, toIds); return rslt.Init_obj(wkr.Get_referenced_entity()); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl.java index 99604f9fa..e8127d20b 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_lib_wikibase_srl.java @@ -66,14 +66,14 @@ public class Scrib_lib_wikibase_srl { Srl_root(rv, Wdata_doc_parser_v2.Str_sitelinks , Srl_sitelinks (Wdata_dict_sitelink.Itm__site.Key_str() , Wdata_dict_sitelink.Itm__title.Key_str(), wdoc.Slink_list(), base_adj)); Srl_root(rv, Wdata_doc_parser_v2.Str_aliases , Srl_aliases (base_adj, wdoc.Alias_list())); Srl_root(rv, Wdata_doc_parser_v2.Str_claims , Srl_claims (base_adj, legacy_style, prop_mgr, wdoc.Claim_list(), page_url)); - return (Keyval[])rv.To_ary(Keyval.class); + return (Keyval[])rv.ToAry(Keyval.class); } private static void Srl_root(List_adp rv, String label, Keyval[] ary) { if (ary == null) return; // don't add node if empty; EX: labels:{} should not add "labels" kv rv.Add(Keyval_.new_(label, ary)); } private static Keyval[] Srl_langtexts(String lang_label, String text_label, Ordered_hash list) { - int len = list.Count(); if (len == 0) return null; + int len = list.Len(); if (len == 0) return null; Keyval[] rv = new Keyval[len]; for (int i = 0; i < len; i++) { Wdata_langtext_itm itm = (Wdata_langtext_itm)list.Get_at(i); @@ -84,7 +84,7 @@ public class Scrib_lib_wikibase_srl { return rv; } private static Keyval[] Srl_sitelinks(String key_label, String val_label, Ordered_hash list, int base_adj) { - int len = list.Count(); if (len == 0) return null; + int len = list.Len(); if (len == 0) return null; Keyval[] rv = new Keyval[len]; for (int i = 0; i < len; i++) { Wdata_sitelink_itm itm = (Wdata_sitelink_itm)list.Get_at(i); @@ -105,7 +105,7 @@ public class Scrib_lib_wikibase_srl { return Keyval_.new_("badges", kvs); } private static Keyval[] Srl_aliases(int base_adj, Ordered_hash list) { - int len = list.Count(); if (len == 0) return null; + int len = list.Len(); if (len == 0) return null; Keyval[] rv = new Keyval[len]; for (int i = 0; i < len; i++) { Wdata_alias_itm itm = (Wdata_alias_itm)list.Get_at(i); @@ -124,7 +124,7 @@ public class Scrib_lib_wikibase_srl { return rv; } private static Keyval[] Srl_claims(int base_adj, boolean legacy_style, Wbase_prop_mgr prop_mgr, Ordered_hash claim_grps, byte[] page_url) { - int len = claim_grps.Count(); if (len == 0) return null; + int len = claim_grps.Len(); if (len == 0) return null; Scrib_lib_wikibase_srl_visitor visitor = new Scrib_lib_wikibase_srl_visitor(); int rv_len = legacy_style ? len * 2 : len; // NOTE: legacyStyle returns 2 sets of properties: official "P" and legacy "p"; DATE:2014-05-11 Keyval[] rv = new Keyval[rv_len]; @@ -166,7 +166,7 @@ public class Scrib_lib_wikibase_srl { Srl_root(list, Wdata_dict_claim.Itm__qualifiers.Key_str(), Srl_qualifiers(prop_mgr, visitor, itm.Qualifiers(), base_adj, page_url)); Srl_root(list, Wdata_dict_claim.Itm__qualifiers_order.Key_str(), Srl_qualifiers_order(prop_mgr, visitor, itm.Qualifiers_order(), base_adj, page_url)); Srl_root(list, Wdata_dict_claim.Itm__references.Key_str(), Srl_references(prop_mgr, visitor, itm.References(), base_adj, page_url)); - return (Keyval[])list.To_ary_and_clear(Keyval.class); + return (Keyval[])list.ToAryAndClear(Keyval.class); } private static Keyval[] Srl_qualifiers(Wbase_prop_mgr prop_mgr, Scrib_lib_wikibase_srl_visitor visitor, Wbase_claim_grp_list list, int base_adj, byte[] page_url) { if (list == null) return null; @@ -182,9 +182,9 @@ public class Scrib_lib_wikibase_srl { Wbase_claim_base itm = grp.Get_at(j); pid_list.Add(Keyval_.int_(j + base_adj, Srl_claims_prop_itm_core(prop_mgr, visitor, itm_pid, itm, page_url))); // NOTE: was originally "+ 1"; changed to base_adj; PAGE:ru.w:Tor ru.w:Кактусовые DATE:2014-10-25 } - rv.Add(Keyval_.new_(itm_pid, pid_list.To_ary_and_clear(Keyval.class))); + rv.Add(Keyval_.new_(itm_pid, pid_list.ToAryAndClear(Keyval.class))); } - return (Keyval[])rv.To_ary_and_clear(Keyval.class); + return (Keyval[])rv.ToAryAndClear(Keyval.class); } private static Keyval[] Srl_qualifiers_order(Wbase_prop_mgr prop_mgr, Scrib_lib_wikibase_srl_visitor visitor, int[] list, int base_adj, byte[] page_url) { if (list == null) return null; @@ -194,7 +194,7 @@ public class Scrib_lib_wikibase_srl { String itm_pid = "P" + Int_.To_str(list[i]); rv.Add(Keyval_.int_(i + base_adj, itm_pid)); } - return (Keyval[])rv.To_ary_and_clear(Keyval.class); + return (Keyval[])rv.ToAryAndClear(Keyval.class); } private static Keyval[] Srl_references(Wbase_prop_mgr prop_mgr, Scrib_lib_wikibase_srl_visitor visitor, Wbase_references_grp[] list, int base_adj, byte[] page_url) { if (list == null) return null; @@ -208,7 +208,7 @@ public class Scrib_lib_wikibase_srl { references_kvs[2] = Keyval_.new_("snaks-order", Srl_qualifiers_order(prop_mgr, visitor, references_grp.Snaks_order(), base_adj, page_url)); rv.Add(Keyval_.int_(i + base_adj, references_kvs)); } - return (Keyval[])rv.To_ary_and_clear(Keyval.class); + return (Keyval[])rv.ToAryAndClear(Keyval.class); } private static Keyval[] Srl_claims_prop_itm_core(Wbase_prop_mgr prop_mgr, Scrib_lib_wikibase_srl_visitor visitor, String pid, Wbase_claim_base itm, byte[] page_url) { boolean snak_is_valued = itm.Snak_tid() == Wbase_claim_value_type_.Tid__value; // PURPOSE: was != Wbase_claim_value_type_.Tid__novalue; PAGE:it.s:Autore:Anonimo DATE:2015-12-06 diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_regx_grp_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_regx_grp_mgr.java index 2e7c10aab..93886b03f 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_regx_grp_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/libs/Scrib_regx_grp_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.libs; import gplx.*; import gplx.langs.regxs.*; class Scrib_regx_grp_mgr { private final List_adp capt_list = List_adp_.New(); @@ -33,7 +33,7 @@ class Scrib_regx_grp_mgr { public int Open__get_at(int idx) {return Int_.Cast(open_list.Get_at(idx));} public void Open__pop() {List_adp_.Del_at_last(open_list);} public boolean Open__has(int v) { - int len = open_list.Count(); + int len = open_list.Len(); for (int i = 0; i < len; i++) { Object o = open_list.Get_at(i); if (Int_.Cast(o) == v) return true; @@ -41,8 +41,8 @@ class Scrib_regx_grp_mgr { return false; } - public int Capt__len() {return capt_list.Count();} - public Keyval[] Capt__to_ary() {return capt_list.Count() == 0 ? null : (Keyval[])capt_list.To_ary(Keyval.class);} + public int Capt__len() {return capt_list.Len();} + public Keyval[] Capt__to_ary() {return capt_list.Len() == 0 ? null : (Keyval[])capt_list.ToAry(Keyval.class);} public void Capt__add__real(int grp_idx, boolean is_empty_capture) { capt_list.Add(Keyval_.int_(grp_idx, is_empty_capture)); open_list.Add(grp_idx); @@ -55,7 +55,7 @@ class Scrib_regx_grp_mgr { fake_count += count; } public void Idx__add(Bry_bfr bfr, int regx_idx) { - int actl_idx = Int_.Cast(idx_list.Get_by(regx_idx)); + int actl_idx = Int_.Cast(idx_list.GetByOrNull(regx_idx)); bfr.Add_int_variable(actl_idx); } public Regx_match[] Adjust_balanced_many(Regx_match[] matches) { diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_args.java b/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_args.java index 03f67ac71..a27d7b900 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_args.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_args.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto.procs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto.procs; import gplx.*; import gplx.xowa.*; import gplx.langs.htmls.encoders.*; public class Scrib_proc_args { private Keyval[] ary; private int ary_len; @@ -113,7 +113,7 @@ public class Scrib_proc_args { } return (list == null) ? rv - : (Keyval[])list.To_ary(Keyval.class); + : (Keyval[])list.ToAry(Keyval.class); } public String Cast_str_or(int i, String or) {Object rv = Get_or_null(i); return rv == null ? or : String_.cast (rv);} public String Cast_str_or_null(int i) {Object rv = Get_or_null(i); return rv == null ? null : String_.cast (rv);} diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_mgr.java b/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_mgr.java index 5d452d93d..2024470f5 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_mgr.java @@ -13,21 +13,22 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.scribunto.procs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +package gplx.xowa.xtns.scribunto.procs; import gplx.*; +import gplx.xowa.xtns.scribunto.*; public class Scrib_proc_mgr { private final Ordered_hash hash = Ordered_hash_.New(); public void Clear() {hash.Clear();} - public Scrib_proc Get_by_key(String key) {synchronized (hash) {return (Scrib_proc)hash.Get_by(key);}} + public Scrib_proc Get_by_key(String key) {synchronized (hash) {return (Scrib_proc)hash.GetByOrNull(key);}} public Scrib_proc Get_at(int i) {synchronized (hash) {return (Scrib_proc)hash.Get_at(i);}} public void Set(String key, Scrib_proc proc) { - hash.Add_if_dupe_use_nth(key, proc); // WORKAROUND: Add_if_dupe_use_nth b/c some libraries reuse proc name; EX: getGlobalSiteId is used by mw.wikibase.lua and mw.wikibase.entity.lua + hash.AddIfDupeUseNth(key, proc); // WORKAROUND: Add_if_dupe_use_nth b/c some libraries reuse proc name; EX: getGlobalSiteId is used by mw.wikibase.lua and mw.wikibase.entity.lua } public Scrib_proc Set(Scrib_lib lib, String proc_name, int proc_id) { Scrib_proc proc = new Scrib_proc(lib, proc_name, proc_id); Set(proc.Proc_key(), proc); return proc; } - public int Len() {synchronized (hash) {return hash.Count();}} + public int Len() {synchronized (hash) {return hash.Len();}} public void Init_by_lib(Scrib_lib lib, String[] proc_names) { synchronized (hash) { hash.Clear(); diff --git a/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_rslt.java b/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_rslt.java index 26d989a5c..7adc72a96 100644 --- a/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_rslt.java +++ b/400_xowa/src/gplx/xowa/xtns/scribunto/procs/Scrib_proc_rslt.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.scribunto.procs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.scribunto.procs; import gplx.*; +import gplx.xowa.xtns.scribunto.*; public class Scrib_proc_rslt { private Keyval[] ary; public Keyval[] Ary() {return ary;} @@ -38,7 +39,7 @@ public class Scrib_proc_rslt { return true; } public boolean Init_many_list(List_adp list) { - int len = list.Count(); + int len = list.Len(); ary = new Keyval[len]; for (int i = 0; i < len; i++) ary[i] = Keyval_.int_(i + Scrib_core.Base_1, list.Get_at(i)); diff --git a/400_xowa/src/gplx/xowa/xtns/syntax_highlights/Int_rng_mgr.java b/400_xowa/src/gplx/xowa/xtns/syntax_highlights/Int_rng_mgr.java index c9caeea0a..2e4239a9e 100644 --- a/400_xowa/src/gplx/xowa/xtns/syntax_highlights/Int_rng_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/syntax_highlights/Int_rng_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.syntax_highlights; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.syntax_highlights; import gplx.*; public interface Int_rng_mgr { boolean Match(int v); boolean Parse(byte[] src); @@ -27,7 +27,7 @@ class Int_rng_mgr_base implements Int_rng_mgr { private List_adp itms = List_adp_.New(); public void Clear() {itms.Clear();} public boolean Match(int v) { - int len = itms.Count(); + int len = itms.Len(); for (int i = 0; i < len; i++) { Int_where itm = (Int_where)itms.Get_at(i); if (itm.Match(v)) return true; diff --git a/400_xowa/src/gplx/xowa/xtns/translates/Xop_languages_xnde.java b/400_xowa/src/gplx/xowa/xtns/translates/Xop_languages_xnde.java index 0630363fd..f43d5f6a4 100644 --- a/400_xowa/src/gplx/xowa/xtns/translates/Xop_languages_xnde.java +++ b/400_xowa/src/gplx/xowa/xtns/translates/Xop_languages_xnde.java @@ -61,14 +61,14 @@ public class Xop_languages_xnde implements Xox_xnde { rv.Add(lang_itm); } } - if (rv.Count() == 0) return List_adp_.Noop; // no lang items; handles situations where just "Page" is returned + if (rv.Len() == 0) return List_adp_.Noop; // no lang items; handles situations where just "Page" is returned if (english_needed) // english not found; always add; handles situations wherein Page/fr and Page/de added, but not Page/en rv.Add(Xol_lang_stub_.Get_by_key_or_en(Xol_lang_itm_.Key_en)); - rv.Sort_by(Xol_lang_stub_.Comparer_key); + rv.SortBy(Xol_lang_stub_.Comparer_key); return rv; } public void Xtn_write(Bry_bfr bfr, Xoae_app app, Xop_ctx ctx, Xoh_html_wtr html_wtr, Xoh_wtr_ctx hctx, Xoae_page wpg, Xop_xnde_tkn xnde, byte[] src) { - if (langs.Count() == 0) return; // no langs; don't write anything; + if (langs.Len() == 0) return; // no langs; don't write anything; fmtr_mgr_itms.Init(langs, ctx.Wiki(), root_ttl, ctx.Page().Lang().Key_bry()); fmtr_all.Bld_bfr_many(bfr, "Other languages", fmtr_mgr_itms); } @@ -107,7 +107,7 @@ class Xop_languages_fmtr implements gplx.core.brys.Bfr_arg { this.cur_lang = cur_lang; } private List_adp langs; private Xowe_wiki wiki; private Xoa_ttl root_ttl; private byte[] cur_lang; public void Bfr_arg__add(Bry_bfr bfr) { - int len = langs.Count(); + int len = langs.Len(); Xoh_href_wtr href_wtr = wiki.Html__href_wtr(); int ns_id = root_ttl.Ns().Id(); byte[] root_ttl_bry = root_ttl.Page_db(); // NOTE: do not use .Full(); ns will be added in Xoa_ttl.Parse below diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc.java index 5ce4d6a53..fbebddcb1 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc.java @@ -13,11 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +package gplx.xowa.xtns.wbases; import gplx.*; import gplx.core.primitives.*; import gplx.langs.jsons.*; import gplx.xowa.langs.*; -import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.parsers.*; +import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; public class Wdata_doc { private final Wdata_wiki_mgr mgr; public Wdata_doc(Wdata_wiki_mgr mgr, Json_doc jdoc, byte[] qid) { @@ -37,21 +37,21 @@ public class Wdata_doc { // various getters public Wbase_claim_grp Get_claim_grp_or_null(int pid) { - Object o = this.Claim_list().Get_by(Int_obj_ref.New(pid)); + Object o = this.Claim_list().GetByOrNull(Int_obj_ref.New(pid)); return (Wbase_claim_grp)o; } public byte[] Get_label_bry_or_null(byte[] lang_key) { - Wdata_langtext_itm itm = (Wdata_langtext_itm)this.Label_list().Get_by(lang_key); + Wdata_langtext_itm itm = (Wdata_langtext_itm)this.Label_list().GetByOrNull(lang_key); return itm == null ? null : itm.Text(); } public Wdata_langtext_itm Get_label_itm_or_null(Xol_lang_itm lang) {return Get_langtext_itm_or_null(this.Label_list(), lang);} public Wdata_langtext_itm Get_descr_itm_or_null(Xol_lang_itm lang) {return Get_langtext_itm_or_null(this.Descr_list(), lang);} - public Wdata_sitelink_itm Get_slink_itm_or_null(byte[] abrv_wm) {return (Wdata_sitelink_itm)this.Slink_list().Get_by(abrv_wm);} + public Wdata_sitelink_itm Get_slink_itm_or_null(byte[] abrv_wm) {return (Wdata_sitelink_itm)this.Slink_list().GetByOrNull(abrv_wm);} // helper method private Wdata_langtext_itm Get_langtext_itm_or_null(Ordered_hash hash, Xol_lang_itm lang) { // get itm by lang's key - Wdata_langtext_itm itm = (Wdata_langtext_itm)hash.Get_by(lang.Key_bry()); + Wdata_langtext_itm itm = (Wdata_langtext_itm)hash.GetByOrNull(lang.Key_bry()); if (itm != null) return itm; // loop over fallback_langs @@ -59,7 +59,7 @@ public class Wdata_doc { int len = fallback_langs.length; for (int i = 0; i < len; i++) { byte[] lang_key = fallback_langs[i]; - Object itm_obj = hash.Get_by(lang_key); + Object itm_obj = hash.GetByOrNull(lang_key); if (itm_obj != null) { return (Wdata_langtext_itm)itm_obj; } diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc_wtr.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc_wtr.java index 72886b324..d29223011 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc_wtr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_doc_wtr.java @@ -1,21 +1,22 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases; import gplx.*; import gplx.langs.jsons.*; -import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.parsers.*; +import gplx.xowa.xtns.wbases.core.*; +import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.xtns.wbases.parsers.*; public class Wdata_doc_wtr { private Json_doc_wtr wtr = new Json_doc_wtr(); public byte[] Xto_bry(Wdata_doc wdoc) { @@ -30,7 +31,7 @@ public class Wdata_doc_wtr { return wtr.Bld(); } private void Xto_bry__list(byte[] key, Ordered_hash list) { - int len = list.Count(); + int len = list.Len(); if (len == 0) return; wtr.Key(true, key); wtr.Nde_bgn(); @@ -42,7 +43,7 @@ public class Wdata_doc_wtr { list.Clear(); } private void Xto_bry__sitelinks(byte[] key, Ordered_hash list) { // NOTE: changed to reflect new sitelinks structure; DATE:2014-02-04 - int len = list.Count(); + int len = list.Len(); if (len == 0) return; wtr.Key(true, key); wtr.Nde_bgn(); @@ -58,7 +59,7 @@ public class Wdata_doc_wtr { list.Clear(); } private void Xto_bry__aliases(Ordered_hash aliases) { - int len = aliases.Count(); + int len = aliases.Len(); if (len == 0) return; wtr.Key(true, Wdata_doc_parser_v1.Bry_aliases); wtr.Nde_bgn(); @@ -78,7 +79,7 @@ public class Wdata_doc_wtr { aliases.Clear(); } private void Xto_bry__claims(byte[] qid, Ordered_hash props) { - int len = props.Count(); + int len = props.Len(); if (len == 0) return; wtr.Key(true, Wdata_doc_parser_v1.Bry_claims); wtr.Ary_bgn(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java index 7fd1ef29c..556d6da13 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_wiki_mgr_fxt.java @@ -213,7 +213,7 @@ public class Wdata_wiki_mgr_fxt { Tfds.Eq_ary_str(expd, Test_xwiki_links_xto_str_ary(tmp_langs)); } private List_adp tmp_langs = List_adp_.New(); String[] Test_xwiki_links_xto_str_ary(List_adp list) { - int len = list.Count(); + int len = list.Len(); String[] rv = new String[len]; for (int i = 0; i < len; i++) { Wdata_sitelink_itm itm = (Wdata_sitelink_itm)list.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_xwiki_link_wtr.java b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_xwiki_link_wtr.java index a2bc46acd..12665b7dc 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_xwiki_link_wtr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/Wdata_xwiki_link_wtr.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; -import gplx.langs.jsons.*; +package gplx.xowa.xtns.wbases; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.pfuncs.*; public class Wdata_xwiki_link_wtr implements gplx.core.brys.Bfr_arg { @@ -38,7 +37,7 @@ public class Wdata_xwiki_link_wtr implements gplx.core.brys.Bfr_arg { boolean external_links_mgr_enabled = external_links_mgr.Enabled(); Ordered_hash links = doc.Slink_list(); Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_k004(); - int len = links.Count(); + int len = links.Len(); for (int i = 0; i < len; i++) { Wdata_sitelink_itm slink = (Wdata_sitelink_itm)links.Get_at(i); byte[] xwiki_key = slink.Site(); @@ -64,7 +63,7 @@ public class Wdata_xwiki_link_wtr implements gplx.core.brys.Bfr_arg { } tmp_bfr.Mkr_rls(); if (external_links_mgr_enabled && external_links_mgr.Sort()) - slink_list.Sort_by(Xoa_ttl_sorter.Instance); + slink_list.SortBy(Xoa_ttl_sorter.Instance); return doc.Qid(); } catch (Exception e) {Err_.Noop(e); return Qid_null;} } diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp.java b/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp.java index 695102005..e273fa461 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.claims; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.claims; import gplx.*; import gplx.core.primitives.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; public class Wbase_claim_grp { @@ -49,12 +49,12 @@ public class Wbase_claim_grp { break; } } - return tmp_snak_list.Count() == 0 ? Empty_array : (Wbase_claim_base[])tmp_snak_list.To_ary_and_clear(Wbase_claim_base.class); + return tmp_snak_list.Len() == 0 ? Empty_array : (Wbase_claim_base[])tmp_snak_list.ToAryAndClear(Wbase_claim_base.class); } private static final Wbase_claim_base[] Empty_array = new Wbase_claim_base[0]; public static List_adp Xto_list(Ordered_hash hash) { - int len = hash.Count(); + int len = hash.Len(); List_adp rv = List_adp_.New(); for (int i = 0; i < len; ++i) { Wbase_claim_grp grp = (Wbase_claim_grp)hash.Get_at(i); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_list.java b/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_list.java index 64f939271..4af186a46 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_list.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_list.java @@ -13,10 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.claims; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; -public class Wbase_claim_grp_list { - private Ordered_hash hash = Ordered_hash_.New(); - public void Add(Wbase_claim_grp itm) {hash.Add(itm.Id_ref(), itm);} - public int Len() {return hash.Count();} - public Wbase_claim_grp Get_at(int i) {return (Wbase_claim_grp)hash.Get_at(i);} -} +package gplx.xowa.xtns.wbases.claims; import gplx.*; +public class Wbase_claim_grp_list { + private Ordered_hash hash = Ordered_hash_.New(); + public void Add(Wbase_claim_grp itm) {hash.Add(itm.Id_ref(), itm);} + public int Len() {return hash.Len();} + public Wbase_claim_grp Get_at(int i) {return (Wbase_claim_grp)hash.Get_at(i);} +} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_tst.java b/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_tst.java index 3c7b6c938..f7659e1be 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/claims/Wbase_claim_grp_tst.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.claims; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.claims; import gplx.*; import org.junit.*; import gplx.core.tests.*; import gplx.core.primitives.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; public class Wbase_claim_grp_tst { @@ -54,7 +54,7 @@ class Wbase_claim_grp_bldr { list.Add(claim); } public void Test__Get_best(String... expd) { - Wbase_claim_grp grp = new Wbase_claim_grp(Int_obj_ref.New(pid), (Wbase_claim_base[])list.To_ary_and_clear(Wbase_claim_base.class)); + Wbase_claim_grp grp = new Wbase_claim_grp(Int_obj_ref.New(pid), (Wbase_claim_base[])list.ToAryAndClear(Wbase_claim_base.class)); List_adp tmp_list = List_adp_.New(); Gftest.Eq__ary(expd, To_string(grp.Get_best(tmp_list))); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/claims/enums/Wbase_enum_hash.java b/400_xowa/src/gplx/xowa/xtns/wbases/claims/enums/Wbase_enum_hash.java index 3f7b0154e..36d9fc208 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/claims/enums/Wbase_enum_hash.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/claims/enums/Wbase_enum_hash.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.claims.enums; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.claims.*; +package gplx.xowa.xtns.wbases.claims.enums; import gplx.*; public class Wbase_enum_hash { private final Wbase_enum_itm[] ary; private final int ary_len; private final Hash_adp_bry hash_by_bry = Hash_adp_bry.cs(); @@ -34,10 +34,10 @@ public class Wbase_enum_hash { public String Get_str_or(byte tid, String or) {return tid < ary_len ? ary[tid].Key_str() : or;} public String Get_str_or_fail(byte tid) {return ary[tid].Key_str();} public byte[] Get_bry_or_fail(byte tid) {return ary[tid].Key_bry();} - public byte Get_tid_or_fail(byte[] key) {return ((Wbase_enum_itm)hash_by_bry.Get_by_or_fail(key)).Tid();} + public byte Get_tid_or_fail(byte[] key) {return ((Wbase_enum_itm)hash_by_bry.GetByOrFail(key)).Tid();} public byte Get_tid_or_max_and_log(byte[] qid, String key) {return Get_tid_or_max_and_log(qid, Bry_.new_u8(key));} public byte Get_tid_or_max_and_log(byte[] qid, byte[] key) { - Object rv_obj = hash_by_bry.Get_by(key); + Object rv_obj = hash_by_bry.GetByOrNull(key); if (rv_obj == null) { Gfo_usr_dlg_.Instance.Warn_many("", "", "unknown enum key for wikibase; qid=~{0} enum=~{1} key=~{2}", qid, name, key); return Byte_.Max_value_127; diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_lang_sorter.java b/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_lang_sorter.java index d0c1b83bc..1c5f8b870 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_lang_sorter.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_lang_sorter.java @@ -13,7 +13,8 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.core; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.core; import gplx.*; +import gplx.xowa.xtns.wbases.*; import gplx.xowa.apps.apis.xowa.xtns.*; public class Wdata_lang_sorter implements Gfo_evt_itm, gplx.core.lists.ComparerAble { private Hash_adp_bry hash = Hash_adp_bry.cs(); @@ -27,7 +28,7 @@ public class Wdata_lang_sorter implements Gfo_evt_itm, gplx.core.lists.ComparerA for (int i = 0; i < len; ++i) { byte[] lang = langs[i]; Wdata_lang_sorter_itm itm = new Wdata_lang_sorter_itm(i, lang); - hash.Add_if_dupe_use_1st(lang, itm); + hash.AddIfDupeUse1st(lang, itm); } } public int compare(Object lhsObj, Object rhsObj) { @@ -48,7 +49,7 @@ public class Wdata_lang_sorter implements Gfo_evt_itm, gplx.core.lists.ComparerA Sort_wdoc_list(Bool_.N, wdoc.Alias_list()); } private void Sort_wdoc_list(boolean is_slink, Ordered_hash list) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Wdata_lang_sortable itm = (Wdata_lang_sortable)list.Get_at(i); if (is_slink) { @@ -61,7 +62,7 @@ public class Wdata_lang_sorter implements Gfo_evt_itm, gplx.core.lists.ComparerA } } private int Sort_calc(Wdata_lang_sortable data_itm) { - Wdata_lang_sorter_itm sort_itm = (Wdata_lang_sorter_itm)hash.Get_by(data_itm.Lang_code()); + Wdata_lang_sorter_itm sort_itm = (Wdata_lang_sorter_itm)hash.GetByOrNull(data_itm.Lang_code()); int new_sort = sort_itm == null ? Sort_none : sort_itm.Sort(); data_itm.Lang_sort_(new_sort); return new_sort; diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_langtext_itm.java b/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_langtext_itm.java index ddd5e1ab0..38477cb4d 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_langtext_itm.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/core/Wdata_langtext_itm.java @@ -13,8 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.core; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; -import gplx.langs.jsons.*; +package gplx.xowa.xtns.wbases.core; import gplx.*; public class Wdata_langtext_itm implements Wdata_lang_sortable { public Wdata_langtext_itm(byte[] lang, byte[] text) {this.lang = lang; this.text = text;} public byte[] Lang() {return lang;} private final byte[] lang; @@ -32,7 +31,7 @@ public class Wdata_langtext_itm implements Wdata_lang_sortable { if (list == null) return null; int langs_len = langs.length; for (int i = 0; i < langs_len; ++i) { - Object itm_obj = list.Get_by(langs[i]); + Object itm_obj = list.GetByOrNull(langs[i]); if (itm_obj != null) return (Wdata_langtext_itm)itm_obj; } return null; diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_pid_tbl.java b/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_pid_tbl.java index 7d21cd78f..4b8b4a94c 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_pid_tbl.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_pid_tbl.java @@ -13,11 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; -import gplx.dbs.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.core.*; +package gplx.xowa.xtns.wbases.dbs; import gplx.*; import gplx.xowa.*; +import gplx.dbs.*; +import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.wikis.data.*; public class Wbase_pid_tbl implements Rls_able { - private final String tbl_name; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_src_lang, fld_src_ttl, fld_trg_ttl; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert; Wbase_pid_tbl(Db_conn conn, boolean schema_is_1) { @@ -25,9 +26,9 @@ public class Wbase_pid_tbl implements Rls_able { String fld_prefix = ""; if (schema_is_1) {tbl_name = "wdata_pids"; fld_prefix = "wp_";} else {tbl_name = "wbase_pid";} - fld_src_lang = flds.Add_str(fld_prefix + "src_lang", 255); - fld_src_ttl = flds.Add_str(fld_prefix + "src_ttl", 512); - fld_trg_ttl = flds.Add_str(fld_prefix + "trg_ttl", 512); + fld_src_lang = flds.AddStr(fld_prefix + "src_lang", 255); + fld_src_ttl = flds.AddStr(fld_prefix + "src_ttl", 512); + fld_trg_ttl = flds.AddStr(fld_prefix + "trg_ttl", 512); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_qid_tbl.java b/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_qid_tbl.java index 96ce7bca7..f5d2fc9c4 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_qid_tbl.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Wbase_qid_tbl.java @@ -13,12 +13,12 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.dbs; import gplx.*; import gplx.xowa.*; import gplx.dbs.*; -import gplx.xowa.wikis.data.*; import gplx.xowa.xtns.wbases.core.*; +import gplx.xowa.wikis.data.*; public class Wbase_qid_tbl implements Rls_able { private final Object thread_lock = new Object(); - private final String tbl_name; private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final String tbl_name; private final DbmetaFldList flds = new DbmetaFldList(); private final String fld_src_wiki, fld_src_ns, fld_src_ttl, fld_trg_ttl; private final Db_conn conn; private Db_stmt stmt_select, stmt_insert; private boolean src_ttl_has_spaces; @@ -28,10 +28,10 @@ public class Wbase_qid_tbl implements Rls_able { String fld_prefix = ""; if (schema_is_1) {tbl_name = "wdata_qids"; fld_prefix = "wq_";} else {tbl_name = "wbase_qid";} - fld_src_wiki = flds.Add_str(fld_prefix + "src_wiki", 255); - fld_src_ns = flds.Add_int(fld_prefix + "src_ns"); - fld_src_ttl = flds.Add_str(fld_prefix + "src_ttl", 512); - fld_trg_ttl = flds.Add_str(fld_prefix + "trg_ttl", 512); + fld_src_wiki = flds.AddStr(fld_prefix + "src_wiki", 255); + fld_src_ns = flds.AddInt(fld_prefix + "src_ns"); + fld_src_ttl = flds.AddStr(fld_prefix + "src_ttl", 512); + fld_trg_ttl = flds.AddStr(fld_prefix + "trg_ttl", 512); conn.Rls_reg(this); } public void Create_tbl() {conn.Meta_tbl_create(Dbmeta_tbl_itm.New(tbl_name, flds));} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Xowb_prop_tbl.java b/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Xowb_prop_tbl.java index 3330860ed..0f23f09ec 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Xowb_prop_tbl.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/dbs/Xowb_prop_tbl.java @@ -13,19 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.dbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; -import gplx.dbs.*; import gplx.dbs.utls.*; +package gplx.xowa.xtns.wbases.dbs; import gplx.*; +import gplx.dbs.*; import gplx.xowa.xtns.wbases.claims.enums.*; public class Xowb_prop_tbl implements Db_tbl { - private final Dbmeta_fld_list flds = new Dbmeta_fld_list(); + private final DbmetaFldList flds = new DbmetaFldList(); private final String fld__wbp_pid, fld__wbp_datatype; private final Db_conn conn; private Db_stmt stmt_insert; public Xowb_prop_tbl(Db_conn conn) { this.conn = conn; this.tbl_name = "wbase_prop"; - this.fld__wbp_pid = flds.Add_str_pkey("wbp_pid", 16); // EX: "p1"; NOTE: String, not int to conform to wbase_pid - this.fld__wbp_datatype = flds.Add_int("wbp_datatype"); // EX: 12=commonsMedia; SEE:Wbase_claim_type_ + this.fld__wbp_pid = flds.AddStrPkey("wbp_pid", 16); // EX: "p1"; NOTE: String, not int to conform to wbase_pid + this.fld__wbp_datatype = flds.AddInt("wbp_datatype"); // EX: 12=commonsMedia; SEE:Wbase_claim_type_ conn.Rls_reg(this); } public String Tbl_name() {return tbl_name;} private final String tbl_name; diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__claim_grp.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__claim_grp.java index 880f8a3df..2839549e5 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__claim_grp.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__claim_grp.java @@ -1,22 +1,23 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; +import gplx.xowa.xtns.wbases.*; import gplx.core.brys.fmtrs.*; import gplx.xowa.langs.*; -import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; +import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.enums.*; import gplx.xowa.xtns.wbases.claims.itms.*; import gplx.xowa.apps.apis.xowa.html.*; class Wdata_fmtr__claim_grp implements gplx.core.brys.Bfr_arg { private Wdata_fmtr__claim_tbl fmtr_tbl = new Wdata_fmtr__claim_tbl(); private boolean is_empty; @@ -32,8 +33,8 @@ class Wdata_fmtr__claim_grp implements gplx.core.brys.Bfr_arg { fmtr_tbl.Init_by_lang(lang, msgs); } public void Init_by_wdoc(byte[] ttl, Ordered_hash list) { - int list_count = list.Count(); - this.is_empty = list.Count() == 0; if (is_empty) return; + int list_count = list.Len(); + this.is_empty = list.Len() == 0; if (is_empty) return; toc_data.Make(list_count); fmtr_tbl.Init_by_wdoc(ttl, list); } @@ -64,7 +65,7 @@ class Wdata_fmtr__claim_tbl implements gplx.core.brys.Bfr_arg { this.ttl = ttl; } public void Bfr_arg__add(Bry_bfr bfr) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Wbase_claim_grp grp = (Wbase_claim_grp)list.Get_at(i); if (grp.Len() == 0) continue; // NOTE: group will be empty when claims are empty; EX: "claims": []; PAGE:wd.p:585; DATE:2014-10-03 diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__langtext_tbl.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__langtext_tbl.java index 33df7b929..7902e3c5e 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__langtext_tbl.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__langtext_tbl.java @@ -13,10 +13,11 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.core.brys.fmtrs.*; import gplx.langs.htmls.*; -import gplx.xowa.langs.*; import gplx.xowa.wikis.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.apps.apis.xowa.html.*; +import gplx.xowa.langs.*; +import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.apps.apis.xowa.html.*; class Wdata_fmtr__langtext_tbl implements gplx.core.brys.Bfr_arg { private Wdata_toc_data toc_data; private Wdata_lang_sorter lang_sorter; private Xoapi_toggle_itm toggle_itm; private Wdata_fmtr__langtext_row fmtr_row; private byte[] col_hdr_lang_name, col_hdr_lang_code, col_hdr_text; private int list_len; @@ -30,7 +31,7 @@ class Wdata_fmtr__langtext_tbl implements gplx.core.brys.Bfr_arg { toggle_itm.Init_msgs(msgs.Toggle_title_y(), msgs.Toggle_title_n()); } public void Init_by_wdoc(Ordered_hash list) { - this.list_len = list.Count(); if (list_len == 0) return; + this.list_len = list.Len(); if (list_len == 0) return; toc_data.Make(list_len); list.Sort_by(lang_sorter); fmtr_row.Init_by_page(list); @@ -60,7 +61,7 @@ class Wdata_fmtr__langtext_row_base implements gplx.core.brys.Bfr_arg, Wdata_fmt private Ordered_hash list; public void Init_by_page(Ordered_hash list) {this.list = list;} public void Bfr_arg__add(Bry_bfr bfr) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Wdata_langtext_itm itm = (Wdata_langtext_itm)list.Get_at(i); Xol_lang_stub lang_itm = Xol_lang_stub_.Get_by_key_or_intl(itm.Lang()); @@ -95,7 +96,7 @@ class Wdata_fmtr__alias_row implements gplx.core.brys.Bfr_arg, Wdata_fmtr__langt private Ordered_hash list; public void Init_by_page(Ordered_hash list) {this.list = list;} public void Bfr_arg__add(Bry_bfr bfr) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Wdata_alias_itm itm = (Wdata_alias_itm)list.Get_at(i); byte[][] vals_ary = itm.Vals(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__oview_tbl.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__oview_tbl.java index e1efb4cbe..e0d0304a5 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__oview_tbl.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__oview_tbl.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; +import gplx.xowa.xtns.wbases.*; import gplx.core.brys.fmtrs.*; import gplx.langs.htmls.encoders.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.apps.apis.xowa.xtns.*; @@ -39,7 +40,7 @@ class Wdata_fmtr__oview_tbl implements gplx.core.brys.Bfr_arg { byte[][] oview_alias = Alias_get_or_empty(wdoc.Alias_list(), core_langs); byte[] aliases_hdr = oview_alias == Bry_.Ary_empty ? hdr_alias_n : hdr_alias_y; fmtr_aliases.Init_by_itm(oview_alias); - Wdata_sitelink_itm slink = (Wdata_sitelink_itm)wdoc.Slink_list().Get_by(wikibase_api.Link_wikis()); + Wdata_sitelink_itm slink = (Wdata_sitelink_itm)wdoc.Slink_list().GetByOrNull(wikibase_api.Link_wikis()); if (slink != null) { oview_label = slink_fmtr.Bld_bry_many(tmp_bfr, slink.Domain_info().Domain_bry(), href_encoder.Encode(slink.Name()), oview_label); } @@ -66,7 +67,7 @@ class Wdata_fmtr__oview_tbl implements gplx.core.brys.Bfr_arg { if (list == null) return Bry_.Ary_empty; int langs_len = langs.length; for (int i = 0; i < langs_len; ++i) { - Object itm_obj = list.Get_by(langs[i]); + Object itm_obj = list.GetByOrNull(langs[i]); if (itm_obj != null) { Wdata_alias_itm itm = (Wdata_alias_itm)itm_obj; return itm.Vals(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__slink.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__slink.java index 56e7f2cac..7625ba7ef 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__slink.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__slink.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.core.brys.fmtrs.*; import gplx.langs.htmls.encoders.*; import gplx.langs.htmls.*; import gplx.xowa.langs.*; import gplx.xowa.xtns.wbases.core.*; @@ -25,7 +25,7 @@ class Wdata_fmtr__slink_grp implements gplx.core.brys.Bfr_arg { } public void Init_by_lang(Wdata_hwtr_msgs msgs) {fmtr_tbl.Init_by_lang(msgs);} public void Init_by_wdoc(Ordered_hash list) { - this.is_empty = list.Count() == 0; if (is_empty) return; + this.is_empty = list.Len() == 0; if (is_empty) return; fmtr_tbl.Init_by_wdoc(list); } public void Bfr_arg__add(Bry_bfr bfr) { @@ -68,7 +68,7 @@ class Wdata_fmtr__slink_tbl implements gplx.core.brys.Bfr_arg { Wdata_slink_grp.Sift(grps, list); for (int i = 0; i < Wdata_slink_grp.Idx__len; ++i) { Wdata_slink_grp grp = grps[i]; - int itms_count = grp.Rows().Count(); + int itms_count = grp.Rows().Len(); if (itms_count == 0) continue; grp.Toc_data().Make(itms_count); grp.Rows().Sort_by(lang_sorter); @@ -77,7 +77,7 @@ class Wdata_fmtr__slink_tbl implements gplx.core.brys.Bfr_arg { public void Bfr_arg__add(Bry_bfr bfr) { for (int i = 0; i < Wdata_slink_grp.Idx__len; ++i) { Wdata_slink_grp grp = grps[i]; - if (grp.Rows().Count() == 0) continue; + if (grp.Rows().Len() == 0) continue; fmtr_row.Init_by_page(grp.Rows()); Xoapi_toggle_itm toggle_itm = grp.Toggle_itm(); fmtr.Bld_bfr_many(bfr, grp.Toc_data().Href(), grp.Toc_data().Text(), msgs.Langtext_col_lang_name(), msgs.Langtext_col_lang_code(), msgs.Slink_col_hdr_text(), toggle_itm.Html_toggle_btn(), toggle_itm.Html_toggle_hdr(), fmtr_row); @@ -106,7 +106,7 @@ class Wdata_fmtr__slink_row implements gplx.core.brys.Bfr_arg { } public void Init_by_page(Ordered_hash list) {this.list = list;} public void Bfr_arg__add(Bry_bfr bfr) { - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Wdata_sitelink_itm itm = (Wdata_sitelink_itm)list.Get_at(i); Xow_domain_itm domain_info = itm.Domain_info(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__toc_div.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__toc_div.java index 1c307ce6e..63cfe343e 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__toc_div.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_fmtr__toc_div.java @@ -13,9 +13,9 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; +import gplx.xowa.xtns.wbases.*; import gplx.core.brys.fmtrs.*; -import gplx.langs.htmls.encoders.*; import gplx.xowa.wikis.pages.wtxts.*; class Wdata_fmtr__toc_div implements gplx.core.brys.Bfr_arg { private final List_adp itms = List_adp_.New(); private final Wdata_fmtr__toc_itm fmtr_itm = new Wdata_fmtr__toc_itm(); @@ -24,9 +24,9 @@ class Wdata_fmtr__toc_div implements gplx.core.brys.Bfr_arg { public void Init_by_wdoc(Wdata_doc wdoc) {itms.Clear();} public void Add(Wdata_toc_data toc_data) {itms.Add(toc_data);} public void Bfr_arg__add(Bry_bfr bfr) { - int itms_len = itms.Count(); + int itms_len = itms.Len(); if (itms_len <= Xopg_toc_mgr.Hdrs_min) return; - fmtr_itm.Init_by_itm((Wdata_toc_data[])itms.To_ary_and_clear(Wdata_toc_data.class)); + fmtr_itm.Init_by_itm((Wdata_toc_data[])itms.ToAryAndClear(Wdata_toc_data.class)); fmtr.Bld_bfr_many(bfr, tbl_hdr, fmtr_itm); } private final Bry_fmtr fmtr = Bry_fmtr.new_(String_.Concat_lines_nl_skip_last diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_mgr.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_mgr.java index e0d006772..2a86ab17d 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_mgr.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; +import gplx.xowa.xtns.wbases.*; import gplx.core.primitives.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.xtns.wbases.claims.*; import gplx.xowa.xtns.wbases.claims.itms.*; public class Wdata_lbl_mgr { @@ -27,7 +28,7 @@ public class Wdata_lbl_mgr { public List_adp Queue() {return queue;} private List_adp queue = List_adp_.New(); @gplx.Internal protected void Wkr_(Wdata_lbl_wkr v) {this.wkr = v;} private Wdata_lbl_wkr wkr; public Wdata_lbl_itm Get_itm__ttl(byte[] ttl) { - Wdata_lbl_itm rv = (Wdata_lbl_itm)ttl_hash.Get_by(ttl); + Wdata_lbl_itm rv = (Wdata_lbl_itm)ttl_hash.GetByOrNull(ttl); if (rv == null) Gfo_usr_dlg_.Instance.Warn_many("", "", "wdata.hwtr:unknown entity; ttl=~{0}", String_.new_u8(ttl)); // NOTE: should not happen return rv; } @@ -39,7 +40,7 @@ public class Wdata_lbl_mgr { public byte[] Get_text__pid(int id) {return Get_text(Bool_.Y, id);} private byte[] Get_text(boolean is_pid, int id) { Hash_adp hash = is_pid ? pid_hash : qid_hash; - Wdata_lbl_itm rv_itm = (Wdata_lbl_itm)hash.Get_by(int_hash_key.Val_(id)); + Wdata_lbl_itm rv_itm = (Wdata_lbl_itm)hash.GetByOrNull(int_hash_key.Val_(id)); if (rv_itm != null) return rv_itm.Text(); // found; return lbl Gfo_usr_dlg_.Instance.Warn_many("", "", "wdata.hwtr:unknown entity; is_pid=~{0} id=~{1}", Yn.To_str(is_pid), id); // NOTE: should not happen return Wdata_lbl_itm.Make_ttl(is_pid, id); // missing; return ttl; EX: "Property:P1", "Q1"; @@ -64,10 +65,10 @@ public class Wdata_lbl_mgr { queue.Add(itm); } public void Resolve(Ordered_hash found) { - int len = queue.Count(); + int len = queue.Len(); for (int i = 0; i < len; ++i) { Wdata_lbl_itm pending_itm = (Wdata_lbl_itm)queue.Get_at(i); - Wdata_langtext_itm found_itm = (Wdata_langtext_itm)found.Get_by(pending_itm.Ttl()); + Wdata_langtext_itm found_itm = (Wdata_langtext_itm)found.GetByOrNull(pending_itm.Ttl()); if (found_itm != null) pending_itm.Load_vals(found_itm.Lang(), found_itm.Text()); } @@ -75,7 +76,7 @@ public class Wdata_lbl_mgr { } public void Gather_labels(Wdata_doc wdoc, Wdata_lang_sorter sorter) { Ordered_hash claim_list = wdoc.Claim_list(); - int len = claim_list.Count(); + int len = claim_list.Len(); for (int i = 0; i < len; ++i) { Wbase_claim_grp grp = (Wbase_claim_grp)claim_list.Get_at(i); int grp_len = grp.Len(); @@ -117,7 +118,7 @@ public class Wdata_lbl_mgr { } } Ordered_hash slink_list = wdoc.Slink_list(); - len = slink_list.Count(); + len = slink_list.Len(); for (int i = 0; i < len; ++i) { Wdata_sitelink_itm itm = (Wdata_sitelink_itm)slink_list.Get_at(i); byte[][] badges = itm.Badges(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_wkr_wiki.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_wkr_wiki.java index d13c39085..a2942a259 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_wkr_wiki.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_lbl_wkr_wiki.java @@ -1,19 +1,20 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.wbases.*; import gplx.xowa.langs.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.apps.apis.xowa.xtns.*; public class Wdata_lbl_wkr_wiki implements Wdata_lbl_wkr { @@ -22,7 +23,7 @@ public class Wdata_lbl_wkr_wiki implements Wdata_lbl_wkr { public Wdata_lbl_wkr_wiki(Xoapi_wikibase wikibase_api, Wdata_wiki_mgr wdata_mgr) {this.wikibase_api = wikibase_api; this.wdata_mgr = wdata_mgr;} public void Resolve(Wdata_lbl_mgr lbl_mgr, Wdata_lang_sorter sorter) { List_adp queue = lbl_mgr.Queue(); - int len = queue.Count(); + int len = queue.Len(); for (int i = 0; i < len; ++i) { Wdata_lbl_itm itm = (Wdata_lbl_itm)queue.Get_at(i); Wdata_doc wdoc = wdata_mgr.Doc_mgr.Get_by_xid_or_null(itm.Ttl()); @@ -31,7 +32,7 @@ public class Wdata_lbl_wkr_wiki implements Wdata_lbl_wkr { continue; // handle incomplete wikidata dumps; DATE:2015-06-11 } Ordered_hash labels = wdoc.Label_list(); - if (labels.Count() == 0) continue; + if (labels.Len() == 0) continue; labels.Sort_by(sorter); Wdata_langtext_itm label = Wdata_langtext_itm.Get_itm_or_null(wdoc.Label_list(), wikibase_api.Core_langs()); if (label == null) @@ -39,7 +40,7 @@ public class Wdata_lbl_wkr_wiki implements Wdata_lbl_wkr { else { itm.Load_vals(label.Lang(), label.Text()); if (itm.Text_en_enabled()) { - Wdata_langtext_itm en_label = (Wdata_langtext_itm)labels.Get_by(Xol_lang_itm_.Key_en); + Wdata_langtext_itm en_label = (Wdata_langtext_itm)labels.GetByOrNull(Xol_lang_itm_.Key_en); itm.Text_en_(en_label == null ? Bry_.Empty : en_label.Text()); } } diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_slink_grp.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_slink_grp.java index 8ab860800..1e39d5e9f 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_slink_grp.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_slink_grp.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.hwtrs; import gplx.*; import gplx.xowa.xtns.wbases.core.*; import gplx.xowa.apps.apis.xowa.html.*; import gplx.xowa.wikis.domains.*; class Wdata_slink_grp { @@ -28,7 +28,7 @@ class Wdata_slink_grp { public static void Sift(Wdata_slink_grp[] rv, Ordered_hash list) { for (int i = 0; i < Idx__len; ++i) rv[i].Rows().Clear(); - int list_len = list.Count(); + int list_len = list.Len(); for (int i = 0; i < list_len; ++i) { Wdata_sitelink_itm itm = (Wdata_sitelink_itm)list.Get_at(i); int idx = Idx_by_tid(itm.Domain_info().Domain_type_id()); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_db_cmd.java b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_db_cmd.java index d25f2a8f3..b331b322e 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_db_cmd.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_db_cmd.java @@ -139,7 +139,7 @@ abstract class Wdata_tbl_base { insert_stmt = this.Make_insert_stmt(conn); } public static void Exec_insert_kvs(Db_stmt stmt, int page_id, Ordered_hash hash) { - int len = hash.Count(); + int len = hash.Len(); for (int i = 0; i < len; i++) { Json_kv kv = (Json_kv)hash.Get_at(i); stmt.Clear() @@ -181,7 +181,7 @@ class Wdata_alias_tbl extends Wdata_tbl_base { @Override public String[] Fld_ary() {return new String[] {Fld_page_id, Fld_lang_key, Fld_val};} @Override public void Exec_insert_by_wdoc(byte[] lang_key, Wdata_wiki_mgr wdata_mgr, int page_id, Wdata_doc wdoc) { Ordered_hash hash = wdoc.Alias_list(); - int len = hash.Count(); + int len = hash.Len(); Db_stmt insert_stmt = this.Insert_stmt(); for (int i = 0; i < len; i++) { Json_kv kv = (Json_kv)hash.Get_at(i); @@ -237,7 +237,7 @@ class Wdata_link_tbl extends Wdata_tbl_base { @Override public String[] Fld_ary() {return new String[] {Fld_page_id, Fld_wiki_key, Fld_val};} @Override public void Exec_insert_by_wdoc(byte[] lang_key, Wdata_wiki_mgr wdata_mgr, int page_id, Wdata_doc wdoc) { Ordered_hash hash = wdoc.Slink_list(); - int len = hash.Count(); + int len = hash.Len(); Db_stmt insert_stmt = this.Insert_stmt(); for (int i = 0; i < len; i++) { Json_kv kv = (Json_kv)hash.Get_at(i); @@ -291,7 +291,7 @@ class Wbase_claim_tbl extends Wdata_tbl_base { if (visitor == null) visitor = new Xob_wdata_db_visitor(wdata_mgr); visitor.Init(lang_key); Ordered_hash list = wdoc.Claim_list(); - int list_len = list.Count(); + int list_len = list.Len(); for (int i = 0; i < list_len; i++) { Wbase_claim_grp claim_grp = (Wbase_claim_grp)list.Get_at(i); int itms_len = claim_grp.Len(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid.java b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid.java index 87df7b44a..4de5673f6 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid.java @@ -94,12 +94,12 @@ public class Xob_wdata_pid extends Xob_itm_dump_base implements Xob_page_wkr, Gf // add datatype byte[] datatype = jdoc.Root_nde().Get_as_bry(Wdata_dict_mainsnak.Itm__datatype.Key_str()); - Wbase_claim_type claim_type = (Wbase_claim_type)datatype_hash.Get_by_or_fail(datatype); + Wbase_claim_type claim_type = (Wbase_claim_type)datatype_hash.GetByOrFail(datatype); tbl__prop.Insert_cmd_by_batch(pid, claim_type.Tid()); // add langs Ordered_hash list = wdoc_parser.Parse_langvals(pid, jdoc, Bool_.Y); - int len = list.Count(); + int len = list.Len(); for (int i = 0; i < len; ++i) { Wdata_langtext_itm label = (Wdata_langtext_itm)list.Get_at(i); tbl__pid.Insert_cmd_by_batch(label.Lang(), label.Text(), pid); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid_tst.java b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid_tst.java index cd047f08a..caff11ffb 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_pid_tst.java @@ -13,11 +13,28 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; -import org.junit.*; import gplx.core.tests.*; -import gplx.*; import gplx.dbs.*; -import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; -import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; +package gplx.xowa.xtns.wbases.imports; import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.Byte_ascii; +import gplx.Io_mgr; +import gplx.Io_url_; +import gplx.List_adp; +import gplx.List_adp_; +import gplx.Object_; +import gplx.String_; +import gplx.Type_; +import gplx.core.tests.Gftest; +import gplx.dbs.Db_conn; +import gplx.dbs.Db_conn_bldr; +import gplx.dbs.Db_rdr; +import gplx.dbs.Db_rdr_; +import gplx.dbs.DbmetaFldItm; +import gplx.dbs.DbmetaFldList; +import gplx.dbs.DbmetaFldType; +import gplx.xowa.bldrs.Xobldr_fxt; +import gplx.xowa.xtns.wbases.Wdata_wiki_mgr; +import org.junit.Before; +import org.junit.Test; public class Xob_wdata_pid_tst { private Db_conn conn; private final Xobldr_fxt fxt = new Xobldr_fxt().Ctor_mem(); @@ -38,21 +55,21 @@ public class Xob_wdata_pid_tst { , fxt.New_page_wo_date(1, "Property:P1", Xob_wdata_tst_utl.Json("p1", "label", String_.Ary("en", "p1_en", "fr", "p1_fr"))) ); - db_tester.Test__select_tbl(conn, "wbase_pid", new Dbmeta_fld_list().Bld_str("src_lang").Bld_str("src_ttl").Bld_str("trg_ttl") + db_tester.Test__select_tbl(conn, "wbase_pid", new DbmetaFldList().BldStr("src_lang").BldStr("src_ttl").BldStr("trg_ttl") , Object_.Ary("en", "p2_en", "p2") , Object_.Ary("fr", "p2_fr", "p2") , Object_.Ary("en", "p1_en", "p1") , Object_.Ary("fr", "p1_fr", "p1") ); - db_tester.Test__select_tbl(conn, "wbase_prop", new Dbmeta_fld_list().Bld_str("wbp_pid").Bld_int("wbp_datatype") + db_tester.Test__select_tbl(conn, "wbase_prop", new DbmetaFldList().BldStr("wbp_pid").BldInt("wbp_datatype") , Object_.Ary("p2", 12) , Object_.Ary("p1", 12) ); } } class Gfo_db_tester { - public void Test__select_tbl(Db_conn conn, String tbl, Dbmeta_fld_list flds, Object[]... expd_rows) { + public void Test__select_tbl(Db_conn conn, String tbl, DbmetaFldList flds, Object[]... expd_rows) { // get actl List_adp actl_list = List_adp_.New(); Db_rdr rdr = Db_rdr_.Empty; @@ -63,10 +80,10 @@ class Gfo_db_tester { actl_list.Add(actl_row); for (int i = 0; i < flds.Len(); i++) { Object val = rdr.Read_at(i); - int val_tid = Dbmeta_fld_tid.Get_by_obj(val); - Dbmeta_fld_itm fld = flds.Get_at(i); - if (val_tid != fld.Type().Tid_ansi()) - actl_row[i] = Object_.Xto_str_strict_or_null_mark(val) + "|shouldBe=" + String_.new_u8(fld.Type().Name()) + "|was=" + Type_.Name_by_obj(val); + int val_tid = DbmetaFldType.GetTypeIdByObj(val); + DbmetaFldItm fld = flds.GetAt(i); + if (val_tid != fld.Type().Tid()) + actl_row[i] = Object_.Xto_str_strict_or_null_mark(val) + "|shouldBe=" + fld.Type().Name() + "|was=" + Type_.Name_by_obj(val); else actl_row[i] = val; } @@ -75,17 +92,17 @@ class Gfo_db_tester { finally { rdr.Rls(); } - Object[][] actl_rows = (Object[][])actl_list.To_ary_and_clear(Object[].class); + Object[][] actl_rows = (Object[][])actl_list.ToAryAndClear(Object[].class); // validate expd datatypes for (Object[] expd_row : expd_rows) { int len = expd_row.length; for (int i = 0; i < len; i++) { Object val = expd_row[i]; - int val_tid = Dbmeta_fld_tid.Get_by_obj(val); - Dbmeta_fld_itm fld = flds.Get_at(i); - if (val_tid != fld.Type().Tid_ansi()) - expd_row[i] = Object_.Xto_str_strict_or_null_mark(val) + "|shouldBe=" + String_.new_u8(fld.Type().Name()) + "|was=" + Type_.Name_by_obj(val); + int val_tid = DbmetaFldType.GetTypeIdByObj(val); + DbmetaFldItm fld = flds.GetAt(i); + if (val_tid != fld.Type().Tid()) + expd_row[i] = Object_.Xto_str_strict_or_null_mark(val) + "|shouldBe=" + fld.Type().Name() + "|was=" + Type_.Name_by_obj(val); } } Gftest.Eq__ary(To_str_ary(expd_rows), To_str_ary(actl_rows), "rows mismatch"); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid.java b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid.java index bcb7ef6b1..35670cb49 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid.java @@ -76,7 +76,7 @@ public class Xob_wdata_qid extends Xob_itm_dump_base implements Xob_page_wkr, Gf byte[] qid = wdoc_parser.Parse_qid(jdoc); Bry_bfr tmp_bfr = Bry_bfr_.Reset(255); Ordered_hash sitelinks = wdoc_parser.Parse_sitelinks(qid, jdoc); - int sitelinks_len = sitelinks.Count(); if (sitelinks_len == 0) return; // no subs; return; + int sitelinks_len = sitelinks.Len(); if (sitelinks_len == 0) return; // no subs; return; for (int i = 0; i < sitelinks_len; i++) { // iterate sitelinks Wdata_sitelink_itm sitelink = (Wdata_sitelink_itm)sitelinks.Get_at(i); byte[] sitelink_site = sitelink.Site(), sitelink_ttl = sitelink.Name(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid_tst.java b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid_tst.java index 03e518eca..d382790b1 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/imports/Xob_wdata_qid_tst.java @@ -13,18 +13,19 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.imports; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; -import org.junit.*; import gplx.core.tests.*; -import gplx.*; import gplx.dbs.*; -import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.wikis.nss.*; -import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wkrs.*; +package gplx.xowa.xtns.wbases.imports; import gplx.*; +import gplx.xowa.xtns.wbases.*; +import org.junit.*; +import gplx.dbs.*; +import gplx.xowa.wikis.nss.*; +import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.wms.sites.*; public class Xob_wdata_qid_tst { private Db_conn conn; private final Xobldr_fxt fxt = new Xobldr_fxt().Ctor_mem(); private Xob_wdata_qid wkr; private final Gfo_db_tester db_tester = new Gfo_db_tester(); - private final Dbmeta_fld_list flds__wbase_qid = new Dbmeta_fld_list().Bld_str("src_wiki").Bld_int("src_ns").Bld_str("src_ttl").Bld_str("trg_ttl"); + private final DbmetaFldList flds__wbase_qid = new DbmetaFldList().BldStr("src_wiki").BldInt("src_ns").BldStr("src_ttl").BldStr("trg_ttl"); @Before public void init() { Io_mgr.Instance.InitEngine_mem(); Db_conn_bldr.Instance.Reg_default_mem(); diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/imports/json/Io_stream_rdr_mgr.java b/400_xowa/src/gplx/xowa/xtns/wbases/imports/json/Io_stream_rdr_mgr.java index 89da94c64..a1e46673c 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/imports/json/Io_stream_rdr_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/imports/json/Io_stream_rdr_mgr.java @@ -13,7 +13,7 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.imports.json; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; import gplx.xowa.xtns.wbases.imports.*; +package gplx.xowa.xtns.wbases.imports.json; import gplx.*; import gplx.core.ios.*; import gplx.core.ios.streams.*; import gplx.core.criterias.*; import gplx.core.envs.*; class Io_stream_rdr_mgr { public static Io_stream_rdr Get_rdr_or_null(Io_url src_fil, Io_url src_dir, Io_stream_unzip_mgr unzip_mgr, String... filter_ary) { @@ -44,7 +44,7 @@ class Io_stream_rdr_mgr { // get files and check each file for match IoItmFil rv = null; IoItmHash itm_hash = Io_mgr.Instance.QueryDir_args(dir).ExecAsItmHash(); - int len = itm_hash.Count(); + int len = itm_hash.Len(); for (int i = 0; i < len; ++i) { IoItm_base itm = itm_hash.Get_at(i); for (int j = 0; j < match_ary_len; ++j) { diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_claims_parser_v2.java b/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_claims_parser_v2.java index e23e2237f..62de5605f 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_claims_parser_v2.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_claims_parser_v2.java @@ -1,170 +1,170 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.parsers; - -import gplx.Bry_; -import gplx.Byte_; -import gplx.Err_; -import gplx.List_adp; -import gplx.List_adp_; -import gplx.String_; -import gplx.core.primitives.Int_obj_ref; -import gplx.langs.jsons.Json_ary; -import gplx.langs.jsons.Json_itm; -import gplx.langs.jsons.Json_kv; -import gplx.langs.jsons.Json_nde; -import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp; -import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp_list; -import gplx.xowa.xtns.wbases.claims.Wbase_references_grp; -import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_rank_; -import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_type_; -import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_value_type_; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_base; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_value; -import gplx.xowa.xtns.wbases.core.Wdata_dict_claim; -import gplx.xowa.xtns.wbases.core.Wdata_dict_datavalue; -import gplx.xowa.xtns.wbases.core.Wdata_dict_mainsnak; -import gplx.xowa.xtns.wbases.core.Wdata_dict_reference; - -class Wdata_claims_parser_v2 { - private final Wbase_claim_factory factory = new Wbase_claim_factory(); - public void Make_claim_itms(byte[] qid, List_adp claim_itms_list, byte[] src, Json_kv claim_grp) { - Json_ary claim_itms_ary = Json_ary.cast_or_null(claim_grp.Val()); - int claim_itms_len = claim_itms_ary.Len(); - int pid = Parse_pid(claim_grp.Key().Data_bry()); - for (int i = 0; i < claim_itms_len; ++i) { - Json_nde claim_itm_nde = Json_nde.Cast(claim_itms_ary.Get_at(i)); - Wbase_claim_base itm = Parse_claim_itm(qid, claim_itm_nde, pid); - if (itm != null) // HACK: itm can be null if value is "somevalue"; DATE:2014-09-20 - claim_itms_list.Add(itm); - } - } - private Wbase_claim_base Parse_claim_itm(byte[] qid, Json_nde nde, int pid) { - int len = nde.Len(); - byte rank_tid = Wbase_claim_rank_.Tid__unknown; - Wbase_claim_base claim_itm = null; Wbase_claim_grp_list qualifiers = null; int[] qualifiers_order = null; Wbase_references_grp[] snaks_grp = null; - for (int i = 0; i < len; ++i) { - Json_kv sub = Json_kv.Cast(nde.Get_at(i)); - byte tid = Wdata_dict_claim.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; - switch (tid) { - case Wdata_dict_claim.Tid__mainsnak: claim_itm = Parse_mainsnak(qid, Json_nde.Cast(sub.Val()), pid); break; - case Wdata_dict_claim.Tid__rank: rank_tid = Wbase_claim_rank_.Reg.Get_tid_or(sub.Val().Data_bry(), Wbase_claim_rank_.Tid__unknown); break; - case Wdata_dict_claim.Tid__references: snaks_grp = Parse_references(qid, Json_ary.cast_or_null(sub.Val())); break; - case Wdata_dict_claim.Tid__qualifiers: qualifiers = Parse_qualifiers(qid, Json_nde.Cast(sub.Val())); break; - case Wdata_dict_claim.Tid__qualifiers_order: qualifiers_order = Parse_pid_order(Json_ary.cast_or_null(sub.Val())); break; - case Wdata_dict_claim.Tid__type: break; // ignore: "statement" - case Wdata_dict_claim.Tid__id: break; // ignore: "Q2$F909BD1C-D34D-423F-9ED2-3493663321AF" - } - } - if (claim_itm != null) { - claim_itm.Rank_tid_(rank_tid); - if (qualifiers != null) claim_itm.Qualifiers_(qualifiers); - if (qualifiers_order != null) claim_itm.Qualifiers_order_(qualifiers_order); - if (snaks_grp != null) claim_itm.References_(snaks_grp); - } - return claim_itm; - } - public Wbase_references_grp[] Parse_references(byte[] qid, Json_ary owner) { - int len = owner.Len(); - Wbase_references_grp[] rv = new Wbase_references_grp[len]; - for (int i = 0; i < len; ++i) { - Json_nde grp_nde = Json_nde.Cast(owner.Get_at(i)); - rv[i] = Parse_references_grp(qid, grp_nde); - } - return rv; - } - private Wbase_references_grp Parse_references_grp(byte[] qid, Json_nde owner) { - byte[] hash = null; - Wbase_claim_grp_list snaks = null; - int[] snaks_order = null; - int len = owner.Len(); - for (int i = 0; i < len; ++i) { - Json_kv sub = Json_kv.Cast(owner.Get_at(i)); - byte tid = Wdata_dict_reference.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; - switch (tid) { - case Wdata_dict_reference.Tid__hash: hash = sub.Val_as_bry(); break; - case Wdata_dict_reference.Tid__snaks: snaks = Parse_qualifiers(qid, Json_nde.Cast(sub.Val())); break; - case Wdata_dict_reference.Tid__snaks_order: snaks_order = Parse_pid_order(Json_ary.cast_or_null(sub.Val())); break; - } - } - return new Wbase_references_grp(hash, snaks, snaks_order); - } - public Wbase_claim_grp_list Parse_qualifiers(byte[] qid, Json_nde qualifiers_nde) { - Wbase_claim_grp_list rv = new Wbase_claim_grp_list(); - if (qualifiers_nde == null) return rv; // NOTE:sometimes references can have 0 snaks; return back an empty Wbase_claim_grp_list, not null; PAGE:Птичкин,_Евгений_Николаевич; DATE:2015-02-16 - int len = qualifiers_nde.Len(); - for (int i = 0; i < len; ++i) { - Json_kv qualifier_kv = Json_kv.Cast(qualifiers_nde.Get_at(i)); - int pid = Parse_pid(qualifier_kv.Key().Data_bry()); - Wbase_claim_grp claims_grp = Parse_props_grp(qid, pid, Json_ary.cast_or_null(qualifier_kv.Val())); - rv.Add(claims_grp); - } - return rv; - } - public int[] Parse_pid_order(Json_ary ary) { - int len = ary.Len(); - int[] rv = new int[len]; - for (int i = 0; i < len; ++i) { - Json_itm pid_itm = ary.Get_at(i); - rv[i] = Parse_pid(pid_itm.Data_bry()); - } - return rv; - } - private Wbase_claim_grp Parse_props_grp(byte[] qid, int pid, Json_ary props_ary) { - List_adp list = List_adp_.New(); - int len = props_ary.Len(); - for (int i = 0; i < len; ++i) { - Json_nde qualifier_nde = Json_nde.Cast(props_ary.Get_at(i)); - Wbase_claim_base qualifier_itm = Parse_mainsnak(qid, qualifier_nde, pid); - list.Add(qualifier_itm); - } - return new Wbase_claim_grp(Int_obj_ref.New(pid), (Wbase_claim_base[])list.To_ary_and_clear(Wbase_claim_base.class)); - } - public Wbase_claim_base Parse_mainsnak(byte[] qid, Json_nde nde, int pid) { - int len = nde.Len(); - byte snak_tid = Byte_.Max_value_127; - for (int i = 0; i < len; ++i) { - Json_kv sub = Json_kv.Cast(nde.Get_at(i)); - byte tid = Wdata_dict_mainsnak.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; - switch (tid) { - case Wdata_dict_mainsnak.Tid__snaktype: snak_tid = Wbase_claim_value_type_.Reg.Get_tid_or_fail(sub.Val().Data_bry()); break; - case Wdata_dict_mainsnak.Tid__datavalue: return Parse_datavalue(qid, pid, snak_tid, Json_nde.Cast(sub.Val())); - case Wdata_dict_mainsnak.Tid__datatype: break; // ignore: has values like "wikibase-property"; EX: www.wikidata.org/wiki/Property:P397; DATE:2015-06-12 - case Wdata_dict_mainsnak.Tid__property: break; // ignore: pid already available above - case Wdata_dict_mainsnak.Tid__hash: break; // ignore: "84487fc3f93b4f74ab1cc5a47d78f596f0b49390" - } - } - return new Wbase_claim_value(pid, Wbase_claim_type_.Tid__unknown, snak_tid); // NOTE: mainsnak can be null, especially for qualifiers; PAGE:Q2!P576; DATE:2014-09-20 - } - public Wbase_claim_base Parse_datavalue(byte[] qid, int pid, byte snak_tid, Json_nde nde) { - int len = nde.Len(); - Json_itm value_itm = null; byte value_tid = Wbase_claim_type_.Tid__unknown; - for (int i = 0; i < len; ++i) { - Json_kv sub = Json_kv.Cast(nde.Get_at(i)); - byte tid = Wdata_dict_datavalue.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; - switch (tid) { - case Wdata_dict_datavalue.Tid__type: value_tid = Wbase_claim_type_.Get_tid_or_unknown(sub.Val().Data_bry()); break; - case Wdata_dict_datavalue.Tid__value: value_itm = sub.Val(); break; - case Wdata_dict_datavalue.Tid__error: break; // ignore: "Can only construct GlobeCoordinateValue with a String globe parameter" - } - } - return factory.Parse(qid, pid, snak_tid, nde, value_tid, value_itm); - } - private static int Parse_pid(byte[] pid_bry) { - int rv = Bry_.To_int_or(pid_bry, 1, pid_bry.length, -1); if (rv == -1) throw Err_.new_wo_type("invalid pid", "pid", String_.new_u8(pid_bry)); - return rv; - } -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.parsers; + +import gplx.Bry_; +import gplx.Byte_; +import gplx.Err_; +import gplx.List_adp; +import gplx.List_adp_; +import gplx.String_; +import gplx.core.primitives.Int_obj_ref; +import gplx.langs.jsons.Json_ary; +import gplx.langs.jsons.Json_itm; +import gplx.langs.jsons.Json_kv; +import gplx.langs.jsons.Json_nde; +import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp; +import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp_list; +import gplx.xowa.xtns.wbases.claims.Wbase_references_grp; +import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_rank_; +import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_type_; +import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_value_type_; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_base; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_value; +import gplx.xowa.xtns.wbases.core.Wdata_dict_claim; +import gplx.xowa.xtns.wbases.core.Wdata_dict_datavalue; +import gplx.xowa.xtns.wbases.core.Wdata_dict_mainsnak; +import gplx.xowa.xtns.wbases.core.Wdata_dict_reference; + +class Wdata_claims_parser_v2 { + private final Wbase_claim_factory factory = new Wbase_claim_factory(); + public void Make_claim_itms(byte[] qid, List_adp claim_itms_list, byte[] src, Json_kv claim_grp) { + Json_ary claim_itms_ary = Json_ary.cast_or_null(claim_grp.Val()); + int claim_itms_len = claim_itms_ary.Len(); + int pid = Parse_pid(claim_grp.Key().Data_bry()); + for (int i = 0; i < claim_itms_len; ++i) { + Json_nde claim_itm_nde = Json_nde.Cast(claim_itms_ary.Get_at(i)); + Wbase_claim_base itm = Parse_claim_itm(qid, claim_itm_nde, pid); + if (itm != null) // HACK: itm can be null if value is "somevalue"; DATE:2014-09-20 + claim_itms_list.Add(itm); + } + } + private Wbase_claim_base Parse_claim_itm(byte[] qid, Json_nde nde, int pid) { + int len = nde.Len(); + byte rank_tid = Wbase_claim_rank_.Tid__unknown; + Wbase_claim_base claim_itm = null; Wbase_claim_grp_list qualifiers = null; int[] qualifiers_order = null; Wbase_references_grp[] snaks_grp = null; + for (int i = 0; i < len; ++i) { + Json_kv sub = Json_kv.Cast(nde.Get_at(i)); + byte tid = Wdata_dict_claim.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; + switch (tid) { + case Wdata_dict_claim.Tid__mainsnak: claim_itm = Parse_mainsnak(qid, Json_nde.Cast(sub.Val()), pid); break; + case Wdata_dict_claim.Tid__rank: rank_tid = Wbase_claim_rank_.Reg.Get_tid_or(sub.Val().Data_bry(), Wbase_claim_rank_.Tid__unknown); break; + case Wdata_dict_claim.Tid__references: snaks_grp = Parse_references(qid, Json_ary.cast_or_null(sub.Val())); break; + case Wdata_dict_claim.Tid__qualifiers: qualifiers = Parse_qualifiers(qid, Json_nde.Cast(sub.Val())); break; + case Wdata_dict_claim.Tid__qualifiers_order: qualifiers_order = Parse_pid_order(Json_ary.cast_or_null(sub.Val())); break; + case Wdata_dict_claim.Tid__type: break; // ignore: "statement" + case Wdata_dict_claim.Tid__id: break; // ignore: "Q2$F909BD1C-D34D-423F-9ED2-3493663321AF" + } + } + if (claim_itm != null) { + claim_itm.Rank_tid_(rank_tid); + if (qualifiers != null) claim_itm.Qualifiers_(qualifiers); + if (qualifiers_order != null) claim_itm.Qualifiers_order_(qualifiers_order); + if (snaks_grp != null) claim_itm.References_(snaks_grp); + } + return claim_itm; + } + public Wbase_references_grp[] Parse_references(byte[] qid, Json_ary owner) { + int len = owner.Len(); + Wbase_references_grp[] rv = new Wbase_references_grp[len]; + for (int i = 0; i < len; ++i) { + Json_nde grp_nde = Json_nde.Cast(owner.Get_at(i)); + rv[i] = Parse_references_grp(qid, grp_nde); + } + return rv; + } + private Wbase_references_grp Parse_references_grp(byte[] qid, Json_nde owner) { + byte[] hash = null; + Wbase_claim_grp_list snaks = null; + int[] snaks_order = null; + int len = owner.Len(); + for (int i = 0; i < len; ++i) { + Json_kv sub = Json_kv.Cast(owner.Get_at(i)); + byte tid = Wdata_dict_reference.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; + switch (tid) { + case Wdata_dict_reference.Tid__hash: hash = sub.Val_as_bry(); break; + case Wdata_dict_reference.Tid__snaks: snaks = Parse_qualifiers(qid, Json_nde.Cast(sub.Val())); break; + case Wdata_dict_reference.Tid__snaks_order: snaks_order = Parse_pid_order(Json_ary.cast_or_null(sub.Val())); break; + } + } + return new Wbase_references_grp(hash, snaks, snaks_order); + } + public Wbase_claim_grp_list Parse_qualifiers(byte[] qid, Json_nde qualifiers_nde) { + Wbase_claim_grp_list rv = new Wbase_claim_grp_list(); + if (qualifiers_nde == null) return rv; // NOTE:sometimes references can have 0 snaks; return back an empty Wbase_claim_grp_list, not null; PAGE:Птичкин,_Евгений_Николаевич; DATE:2015-02-16 + int len = qualifiers_nde.Len(); + for (int i = 0; i < len; ++i) { + Json_kv qualifier_kv = Json_kv.Cast(qualifiers_nde.Get_at(i)); + int pid = Parse_pid(qualifier_kv.Key().Data_bry()); + Wbase_claim_grp claims_grp = Parse_props_grp(qid, pid, Json_ary.cast_or_null(qualifier_kv.Val())); + rv.Add(claims_grp); + } + return rv; + } + public int[] Parse_pid_order(Json_ary ary) { + int len = ary.Len(); + int[] rv = new int[len]; + for (int i = 0; i < len; ++i) { + Json_itm pid_itm = ary.Get_at(i); + rv[i] = Parse_pid(pid_itm.Data_bry()); + } + return rv; + } + private Wbase_claim_grp Parse_props_grp(byte[] qid, int pid, Json_ary props_ary) { + List_adp list = List_adp_.New(); + int len = props_ary.Len(); + for (int i = 0; i < len; ++i) { + Json_nde qualifier_nde = Json_nde.Cast(props_ary.Get_at(i)); + Wbase_claim_base qualifier_itm = Parse_mainsnak(qid, qualifier_nde, pid); + list.Add(qualifier_itm); + } + return new Wbase_claim_grp(Int_obj_ref.New(pid), (Wbase_claim_base[])list.ToAryAndClear(Wbase_claim_base.class)); + } + public Wbase_claim_base Parse_mainsnak(byte[] qid, Json_nde nde, int pid) { + int len = nde.Len(); + byte snak_tid = Byte_.Max_value_127; + for (int i = 0; i < len; ++i) { + Json_kv sub = Json_kv.Cast(nde.Get_at(i)); + byte tid = Wdata_dict_mainsnak.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; + switch (tid) { + case Wdata_dict_mainsnak.Tid__snaktype: snak_tid = Wbase_claim_value_type_.Reg.Get_tid_or_fail(sub.Val().Data_bry()); break; + case Wdata_dict_mainsnak.Tid__datavalue: return Parse_datavalue(qid, pid, snak_tid, Json_nde.Cast(sub.Val())); + case Wdata_dict_mainsnak.Tid__datatype: break; // ignore: has values like "wikibase-property"; EX: www.wikidata.org/wiki/Property:P397; DATE:2015-06-12 + case Wdata_dict_mainsnak.Tid__property: break; // ignore: pid already available above + case Wdata_dict_mainsnak.Tid__hash: break; // ignore: "84487fc3f93b4f74ab1cc5a47d78f596f0b49390" + } + } + return new Wbase_claim_value(pid, Wbase_claim_type_.Tid__unknown, snak_tid); // NOTE: mainsnak can be null, especially for qualifiers; PAGE:Q2!P576; DATE:2014-09-20 + } + public Wbase_claim_base Parse_datavalue(byte[] qid, int pid, byte snak_tid, Json_nde nde) { + int len = nde.Len(); + Json_itm value_itm = null; byte value_tid = Wbase_claim_type_.Tid__unknown; + for (int i = 0; i < len; ++i) { + Json_kv sub = Json_kv.Cast(nde.Get_at(i)); + byte tid = Wdata_dict_datavalue.Reg.Get_tid_or_max_and_log(qid, sub.Key().Data_bry()); if (tid == Byte_.Max_value_127) continue; + switch (tid) { + case Wdata_dict_datavalue.Tid__type: value_tid = Wbase_claim_type_.Get_tid_or_unknown(sub.Val().Data_bry()); break; + case Wdata_dict_datavalue.Tid__value: value_itm = sub.Val(); break; + case Wdata_dict_datavalue.Tid__error: break; // ignore: "Can only construct GlobeCoordinateValue with a String globe parameter" + } + } + return factory.Parse(qid, pid, snak_tid, nde, value_tid, value_itm); + } + private static int Parse_pid(byte[] pid_bry) { + int rv = Bry_.To_int_or(pid_bry, 1, pid_bry.length, -1); if (rv == -1) throw Err_.new_wo_type("invalid pid", "pid", String_.new_u8(pid_bry)); + return rv; + } +} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_fxt_base.java b/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_fxt_base.java index ebd0148ed..c92a75a4e 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_fxt_base.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_fxt_base.java @@ -1,138 +1,138 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.parsers; - -import gplx.Bool_; -import gplx.Bry_; -import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.Int_; -import gplx.List_adp; -import gplx.List_adp_; -import gplx.Object_; -import gplx.Ordered_hash; -import gplx.String_; -import gplx.Tfds; -import gplx.langs.jsons.Json_ary; -import gplx.langs.jsons.Json_doc; -import gplx.langs.jsons.Json_kv; -import gplx.langs.jsons.Json_nde; -import gplx.langs.jsons.Json_parser; -import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp; -import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp_list; -import gplx.xowa.xtns.wbases.claims.Wbase_references_grp; -import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_entity_type_; -import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_type_; -import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_value_type_; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_base; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_entity; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_globecoordinate; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_monolingualtext; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_quantity; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_string; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_time; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_time_; -import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_value; -import gplx.xowa.xtns.wbases.core.Wdata_alias_itm; -import gplx.xowa.xtns.wbases.core.Wdata_langtext_itm; -import gplx.xowa.xtns.wbases.core.Wdata_sitelink_itm; - -abstract class Wdata_doc_parser_fxt_base { - protected Wdata_doc_parser wdoc_parser; - private final Json_parser json_parser = new Json_parser(); - private final Bry_bfr tmp_time_bfr = Bry_bfr_.New(); - public void Init() { - if (wdoc_parser == null) wdoc_parser = Make_parser(); - } - public abstract Wdata_doc_parser Make_parser(); - public Wdata_sitelink_itm Make_sitelink(String site, String name, String... badges) {return new Wdata_sitelink_itm(Bry_.new_u8(site), Bry_.new_u8(name), Bry_.Ary(badges));} - public Wdata_langtext_itm Make_langval(String lang, String text) {return new Wdata_langtext_itm(Bry_.new_u8(lang), Bry_.new_u8(text));} - public Wdata_alias_itm Make_alias(String lang, String... vals) {return new Wdata_alias_itm(Bry_.new_u8(lang), Bry_.Ary(vals));} - public Wbase_claim_base Make_claim_string (int pid, String val) {return new Wbase_claim_string(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(val));} - public Wbase_claim_base Make_claim_entity_qid (int pid, int eid) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__item, Int_.To_bry(eid));} - public Wbase_claim_base Make_claim_entity_pid (int pid, int eid) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__property, Int_.To_bry(eid));} - public Wbase_claim_base Make_claim_entity_lid (int pid, int eid) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__lexeme, Int_.To_bry(eid));} - public Wbase_claim_base Make_claim_entity_fid (int pid, String id) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__form, null, Bry_.new_u8(id));} - public Wbase_claim_base Make_claim_entity_sid (int pid, String id) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__sense, null, Bry_.new_u8(id));} - public Wbase_claim_base Make_claim_monolingualtext (int pid, String lang, String text) {return new Wbase_claim_monolingualtext(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(lang), Bry_.new_u8(text));} - public Wbase_claim_base Make_claim_globecoordinate (int pid, String lat, String lng, String prc) {return new Wbase_claim_globecoordinate(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(lat), Bry_.new_u8(lng), Object_.Bry__null, Bry_.new_u8(prc), Bry_.new_a7("http://www.wikidata.org/entity/Q2"));} - public Wbase_claim_base Make_claim_quantity (int pid, int val, int unit, int ubound, int lbound) {return new Wbase_claim_quantity(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(Int_.To_str(val)), Bry_.new_u8(Int_.To_str(unit)), Bry_.new_u8(Int_.To_str(ubound)), Bry_.new_u8(Int_.To_str(lbound)));} - public Wbase_claim_base Make_claim_time (int pid, String val) {return new Wbase_claim_time(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_time_.To_bry(tmp_time_bfr, val), Wbase_claim_time_.Dflt__timezone.Val_bry(), Wbase_claim_time_.Dflt__before.Val_bry(), Wbase_claim_time_.Dflt__after.Val_bry(), Wbase_claim_time_.Dflt__precision.Val_bry(), Wbase_claim_time_.Dflt__calendarmodel.Val_bry());} - public Wbase_claim_base Make_claim_novalue (int pid) {return new Wbase_claim_value(pid, Wbase_claim_type_.Tid__unknown, Wbase_claim_value_type_.Tid__novalue);} - - public void Test_entity(String raw, String expd) {Tfds.Eq(expd, String_.new_u8(wdoc_parser.Parse_qid(json_parser.Parse_by_apos(raw))));} - public void Test_sitelinks(String raw, Wdata_sitelink_itm... expd) { - Ordered_hash actl_hash = wdoc_parser.Parse_sitelinks(Q1_bry, json_parser.Parse_by_apos(raw)); - Tfds.Eq_ary_str(actl_hash.To_ary(Wdata_sitelink_itm.class), expd); - } - public void Test_labels(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.Y, expd);} - public void Test_descriptions(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.N, expd);} - private void Test_langvals(String raw, boolean labels_or_descriptions, Wdata_langtext_itm... expd) { - Ordered_hash actl_hash = wdoc_parser.Parse_langvals(Q1_bry, json_parser.Parse_by_apos(raw), labels_or_descriptions); - Tfds.Eq_ary_str(actl_hash.To_ary(Wdata_langtext_itm.class), expd); - } - public void Test_aliases(String raw, Wdata_alias_itm... expd) { - Ordered_hash actl_hash = wdoc_parser.Parse_aliases(Q1_bry, json_parser.Parse_by_apos(raw)); - Tfds.Eq_ary_str(actl_hash.To_ary(Wdata_alias_itm.class), expd); - } - public void Test_claims(String raw, Wbase_claim_base... expd) { - Ordered_hash actl_hash = wdoc_parser.Parse_claims(Q1_bry, json_parser.Parse_by_apos(raw)); - List_adp actl_list = Wbase_claim_grp.Xto_list(actl_hash); - Tfds.Eq_ary_str(actl_list.To_ary(Wbase_claim_base.class), expd); - } - public void Test_claims_data(String raw, Wbase_claim_base expd) { - Json_doc jdoc = json_parser.Parse_by_apos(raw); - Wbase_claim_base actl = wdoc_parser.Parse_claims_data(Q1_bry, 1, Wbase_claim_value_type_.Tid__value, jdoc.Root_nde()); - Tfds.Eq(expd.toString(), actl.toString()); - } - public void Test_qualifiers(String raw, Wbase_claim_base... expd_itms) { - Json_doc jdoc = json_parser.Parse_by_apos(raw); - Json_nde qualifiers_nde = Json_nde.Cast(Json_kv.Cast(jdoc.Root_nde().Get_at(0)).Val()); - Wbase_claim_grp_list actl = wdoc_parser.Parse_qualifiers(Q1_bry, qualifiers_nde); - Tfds.Eq_ary_str(expd_itms, To_ary(actl)); - } - public void Test_references(String raw, int[] expd_order, Wbase_claim_base... expd_itms) { - Json_doc jdoc = json_parser.Parse_by_apos(raw); - Json_ary owner = Json_ary.cast_or_null(Json_kv.Cast(jdoc.Root_nde().Get_at(0)).Val()); - Wbase_references_grp[] actl = wdoc_parser.Parse_references(Q1_bry, owner); - Wbase_references_grp actl_grp = actl[0]; - Tfds.Eq_ary(expd_order, actl_grp.Snaks_order()); - Tfds.Eq_ary_str(expd_itms, To_ary(actl_grp.Snaks())); - } - public void Test_pid_order(String raw, int... expd) { - Json_doc jdoc = json_parser.Parse_by_apos(raw); - Json_ary nde = Json_ary.cast_or_null(Json_kv.Cast(jdoc.Root_nde().Get_at(0)).Val()); - int[] actl = wdoc_parser.Parse_pid_order(Q1_bry, nde); - Tfds.Eq_ary(expd, actl); - } - Wbase_claim_base[] To_ary(Wbase_claim_grp_list list) { - List_adp rv = List_adp_.New(); - int list_len = list.Len(); - for (int i = 0; i < list_len; ++i) { - Wbase_claim_grp grp = list.Get_at(i); - int grp_len = grp.Len(); - for (int j = 0; j < grp_len; ++j) { - Wbase_claim_base itm = grp.Get_at(j); - rv.Add(itm); - } - } - return (Wbase_claim_base[])rv.To_ary_and_clear(Wbase_claim_base.class); - } - private static final byte[] Q1_bry = Bry_.new_a7("Q1"); -} -class Wdata_doc_parser_v2_fxt extends Wdata_doc_parser_fxt_base { - @Override public Wdata_doc_parser Make_parser() {return new Wdata_doc_parser_v2();} -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.parsers; + +import gplx.Bool_; +import gplx.Bry_; +import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.Int_; +import gplx.List_adp; +import gplx.List_adp_; +import gplx.Object_; +import gplx.Ordered_hash; +import gplx.String_; +import gplx.Tfds; +import gplx.langs.jsons.Json_ary; +import gplx.langs.jsons.Json_doc; +import gplx.langs.jsons.Json_kv; +import gplx.langs.jsons.Json_nde; +import gplx.langs.jsons.Json_parser; +import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp; +import gplx.xowa.xtns.wbases.claims.Wbase_claim_grp_list; +import gplx.xowa.xtns.wbases.claims.Wbase_references_grp; +import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_entity_type_; +import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_type_; +import gplx.xowa.xtns.wbases.claims.enums.Wbase_claim_value_type_; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_base; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_entity; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_globecoordinate; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_monolingualtext; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_quantity; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_string; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_time; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_time_; +import gplx.xowa.xtns.wbases.claims.itms.Wbase_claim_value; +import gplx.xowa.xtns.wbases.core.Wdata_alias_itm; +import gplx.xowa.xtns.wbases.core.Wdata_langtext_itm; +import gplx.xowa.xtns.wbases.core.Wdata_sitelink_itm; + +abstract class Wdata_doc_parser_fxt_base { + protected Wdata_doc_parser wdoc_parser; + private final Json_parser json_parser = new Json_parser(); + private final Bry_bfr tmp_time_bfr = Bry_bfr_.New(); + public void Init() { + if (wdoc_parser == null) wdoc_parser = Make_parser(); + } + public abstract Wdata_doc_parser Make_parser(); + public Wdata_sitelink_itm Make_sitelink(String site, String name, String... badges) {return new Wdata_sitelink_itm(Bry_.new_u8(site), Bry_.new_u8(name), Bry_.Ary(badges));} + public Wdata_langtext_itm Make_langval(String lang, String text) {return new Wdata_langtext_itm(Bry_.new_u8(lang), Bry_.new_u8(text));} + public Wdata_alias_itm Make_alias(String lang, String... vals) {return new Wdata_alias_itm(Bry_.new_u8(lang), Bry_.Ary(vals));} + public Wbase_claim_base Make_claim_string (int pid, String val) {return new Wbase_claim_string(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(val));} + public Wbase_claim_base Make_claim_entity_qid (int pid, int eid) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__item, Int_.To_bry(eid));} + public Wbase_claim_base Make_claim_entity_pid (int pid, int eid) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__property, Int_.To_bry(eid));} + public Wbase_claim_base Make_claim_entity_lid (int pid, int eid) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__lexeme, Int_.To_bry(eid));} + public Wbase_claim_base Make_claim_entity_fid (int pid, String id) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__form, null, Bry_.new_u8(id));} + public Wbase_claim_base Make_claim_entity_sid (int pid, String id) {return new Wbase_claim_entity(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_entity_type_.Tid__sense, null, Bry_.new_u8(id));} + public Wbase_claim_base Make_claim_monolingualtext (int pid, String lang, String text) {return new Wbase_claim_monolingualtext(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(lang), Bry_.new_u8(text));} + public Wbase_claim_base Make_claim_globecoordinate (int pid, String lat, String lng, String prc) {return new Wbase_claim_globecoordinate(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(lat), Bry_.new_u8(lng), Object_.Bry__null, Bry_.new_u8(prc), Bry_.new_a7("http://www.wikidata.org/entity/Q2"));} + public Wbase_claim_base Make_claim_quantity (int pid, int val, int unit, int ubound, int lbound) {return new Wbase_claim_quantity(pid, Wbase_claim_value_type_.Tid__value, Bry_.new_u8(Int_.To_str(val)), Bry_.new_u8(Int_.To_str(unit)), Bry_.new_u8(Int_.To_str(ubound)), Bry_.new_u8(Int_.To_str(lbound)));} + public Wbase_claim_base Make_claim_time (int pid, String val) {return new Wbase_claim_time(pid, Wbase_claim_value_type_.Tid__value, Wbase_claim_time_.To_bry(tmp_time_bfr, val), Wbase_claim_time_.Dflt__timezone.Val_bry(), Wbase_claim_time_.Dflt__before.Val_bry(), Wbase_claim_time_.Dflt__after.Val_bry(), Wbase_claim_time_.Dflt__precision.Val_bry(), Wbase_claim_time_.Dflt__calendarmodel.Val_bry());} + public Wbase_claim_base Make_claim_novalue (int pid) {return new Wbase_claim_value(pid, Wbase_claim_type_.Tid__unknown, Wbase_claim_value_type_.Tid__novalue);} + + public void Test_entity(String raw, String expd) {Tfds.Eq(expd, String_.new_u8(wdoc_parser.Parse_qid(json_parser.Parse_by_apos(raw))));} + public void Test_sitelinks(String raw, Wdata_sitelink_itm... expd) { + Ordered_hash actl_hash = wdoc_parser.Parse_sitelinks(Q1_bry, json_parser.Parse_by_apos(raw)); + Tfds.Eq_ary_str(actl_hash.To_ary(Wdata_sitelink_itm.class), expd); + } + public void Test_labels(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.Y, expd);} + public void Test_descriptions(String raw, Wdata_langtext_itm... expd) {Test_langvals(raw, Bool_.N, expd);} + private void Test_langvals(String raw, boolean labels_or_descriptions, Wdata_langtext_itm... expd) { + Ordered_hash actl_hash = wdoc_parser.Parse_langvals(Q1_bry, json_parser.Parse_by_apos(raw), labels_or_descriptions); + Tfds.Eq_ary_str(actl_hash.To_ary(Wdata_langtext_itm.class), expd); + } + public void Test_aliases(String raw, Wdata_alias_itm... expd) { + Ordered_hash actl_hash = wdoc_parser.Parse_aliases(Q1_bry, json_parser.Parse_by_apos(raw)); + Tfds.Eq_ary_str(actl_hash.To_ary(Wdata_alias_itm.class), expd); + } + public void Test_claims(String raw, Wbase_claim_base... expd) { + Ordered_hash actl_hash = wdoc_parser.Parse_claims(Q1_bry, json_parser.Parse_by_apos(raw)); + List_adp actl_list = Wbase_claim_grp.Xto_list(actl_hash); + Tfds.Eq_ary_str(actl_list.ToAry(Wbase_claim_base.class), expd); + } + public void Test_claims_data(String raw, Wbase_claim_base expd) { + Json_doc jdoc = json_parser.Parse_by_apos(raw); + Wbase_claim_base actl = wdoc_parser.Parse_claims_data(Q1_bry, 1, Wbase_claim_value_type_.Tid__value, jdoc.Root_nde()); + Tfds.Eq(expd.toString(), actl.toString()); + } + public void Test_qualifiers(String raw, Wbase_claim_base... expd_itms) { + Json_doc jdoc = json_parser.Parse_by_apos(raw); + Json_nde qualifiers_nde = Json_nde.Cast(Json_kv.Cast(jdoc.Root_nde().Get_at(0)).Val()); + Wbase_claim_grp_list actl = wdoc_parser.Parse_qualifiers(Q1_bry, qualifiers_nde); + Tfds.Eq_ary_str(expd_itms, To_ary(actl)); + } + public void Test_references(String raw, int[] expd_order, Wbase_claim_base... expd_itms) { + Json_doc jdoc = json_parser.Parse_by_apos(raw); + Json_ary owner = Json_ary.cast_or_null(Json_kv.Cast(jdoc.Root_nde().Get_at(0)).Val()); + Wbase_references_grp[] actl = wdoc_parser.Parse_references(Q1_bry, owner); + Wbase_references_grp actl_grp = actl[0]; + Tfds.Eq_ary(expd_order, actl_grp.Snaks_order()); + Tfds.Eq_ary_str(expd_itms, To_ary(actl_grp.Snaks())); + } + public void Test_pid_order(String raw, int... expd) { + Json_doc jdoc = json_parser.Parse_by_apos(raw); + Json_ary nde = Json_ary.cast_or_null(Json_kv.Cast(jdoc.Root_nde().Get_at(0)).Val()); + int[] actl = wdoc_parser.Parse_pid_order(Q1_bry, nde); + Tfds.Eq_ary(expd, actl); + } + Wbase_claim_base[] To_ary(Wbase_claim_grp_list list) { + List_adp rv = List_adp_.New(); + int list_len = list.Len(); + for (int i = 0; i < list_len; ++i) { + Wbase_claim_grp grp = list.Get_at(i); + int grp_len = grp.Len(); + for (int j = 0; j < grp_len; ++j) { + Wbase_claim_base itm = grp.Get_at(j); + rv.Add(itm); + } + } + return (Wbase_claim_base[])rv.ToAryAndClear(Wbase_claim_base.class); + } + private static final byte[] Q1_bry = Bry_.new_a7("Q1"); +} +class Wdata_doc_parser_v2_fxt extends Wdata_doc_parser_fxt_base { + @Override public Wdata_doc_parser Make_parser() {return new Wdata_doc_parser_v2();} +} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_v1.java b/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_v1.java index e1d23b011..9ed177583 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_v1.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/parsers/Wdata_doc_parser_v1.java @@ -128,7 +128,7 @@ public class Wdata_doc_parser_v1 implements Wdata_doc_parser { full_list.Sort(); Ordered_hash rv = Ordered_hash_.New(); List_adp temp_itms = List_adp_.New(); int prv_pid = -1; - int len = full_list.Count(); + int len = full_list.Len(); for (int i = 0; i < len; ++i) { Wbase_claim_base claim_itm = (Wbase_claim_base)full_list.Get_at(i); int cur_pid = claim_itm.Pid(); @@ -141,9 +141,9 @@ public class Wdata_doc_parser_v1 implements Wdata_doc_parser { return rv; } private static void Claims_list_to_hash__add(Ordered_hash rv, int pid, List_adp temp_itms) { - if (temp_itms.Count() == 0) return; // NOTE: will be empty when claims are empty; EX: "claims": []; PAGE:wd.p:585; DATE:2014-10-03 + if (temp_itms.Len() == 0) return; // NOTE: will be empty when claims are empty; EX: "claims": []; PAGE:wd.p:585; DATE:2014-10-03 Int_obj_ref claim_grp_key = Int_obj_ref.New(pid); - Wbase_claim_grp claim_grp = new Wbase_claim_grp(claim_grp_key, (Wbase_claim_base[])temp_itms.To_ary_and_clear(Wbase_claim_base.class)); + Wbase_claim_grp claim_grp = new Wbase_claim_grp(claim_grp_key, (Wbase_claim_base[])temp_itms.ToAryAndClear(Wbase_claim_base.class)); rv.Add(claim_grp_key, claim_grp); } private Wbase_claim_base Make_claim_itm(byte[] src, Json_nde prop_nde) { diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_external_lang_links_data.java b/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_external_lang_links_data.java index 4fb915702..a730566a4 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_external_lang_links_data.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/pfuncs/Wdata_external_lang_links_data.java @@ -13,14 +13,14 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.pfuncs; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.pfuncs; import gplx.*; import gplx.xowa.xtns.pfuncs.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*; public class Wdata_external_lang_links_data { private List_adp langs_list = List_adp_.New(); private Hash_adp_bry langs_hash = Hash_adp_bry.ci_a7(); // ASCII:lang_code public boolean Enabled() {return enabled;} private boolean enabled; public Wdata_external_lang_links_data Enabled_(boolean v) {enabled = v; return this;} public boolean Sort() {return sort;} public Wdata_external_lang_links_data Sort_(boolean v) {sort = v; return this;} private boolean sort; - public int Langs_len() {return langs_list.Count();} + public int Langs_len() {return langs_list.Len();} public Wdata_external_lang_links_data Langs_add(byte[] v) {langs_hash.Add(v, v); langs_list.Add(v); return this;} public byte[] Langs_get_at(int i) {return (byte[])langs_list.Get_at(i);} public boolean Langs_hide(byte[] src, int bgn, int end) { diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_doc_mgr.java b/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_doc_mgr.java index efdf300f0..498c195d0 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_doc_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_doc_mgr.java @@ -1,176 +1,176 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.stores; - -import gplx.Bry_; -import gplx.Bry_bfr; -import gplx.Bry_bfr_; -import gplx.Err_; -import gplx.Gfo_usr_dlg_; -import gplx.Ordered_hash; -import gplx.Ordered_hash_; -import gplx.String_; -import gplx.core.logs.Gfo_log_wtr; -import gplx.langs.jsons.Json_doc; -import gplx.langs.jsons.Json_nde; -import gplx.langs.jsons.Json_parser; -import gplx.xowa.Xoa_ttl; -import gplx.xowa.Xoae_page; -import gplx.xowa.Xowe_wiki; -import gplx.xowa.xtns.wbases.Wdata_doc; -import gplx.xowa.xtns.wbases.Wdata_wiki_mgr; -import gplx.xowa.xtns.wbases.core.Wbase_pid; - -public class Wbase_doc_mgr { - private final Wdata_wiki_mgr wbase_mgr; - private final Wbase_qid_mgr qid_mgr; - private Wbase_doc_cache doc_cache; - private final Object thread_lock = new Object(); - private final Ordered_hash wbase_db_hash = Ordered_hash_.New_bry(); - private final Gfo_log_wtr wbase_db_log; - private final Json_parser jsonParser = new Json_parser(); - public Wbase_doc_mgr(Wdata_wiki_mgr wbase_mgr, Wbase_qid_mgr qid_mgr) { - this.wbase_mgr = wbase_mgr; - this.qid_mgr = qid_mgr; - this.doc_cache = new Wbase_doc_cache__hash(); - this.wbase_db_log = Gfo_log_wtr.New_dflt("wbase", "db_log_{0}.csv"); - } - public void Enabled_(boolean v) {this.enabled = v;} private boolean enabled; - public void Cache__init(String cache_type, long cache_max, long compress_size, long used_weight) { - if (String_.Eq(cache_type, "null")) doc_cache = new Wbase_doc_cache__null(); - else if (String_.Eq(cache_type, "hash")) doc_cache = new Wbase_doc_cache__hash(); - else if (String_.Eq(cache_type, "mru" )) doc_cache = new Wbase_doc_cache__mru(cache_max, compress_size, used_weight); - else throw Err_.new_unhandled_default(cache_type); - } - public void Cleanup() { - doc_cache.Term(); - wbase_db_log__flush(); - } - private void wbase_db_log__flush() { - int len = wbase_db_hash.Len(); - Bry_bfr tmp_bfr = Bry_bfr_.New(); - for (int i = 0; i < len; i++) { - Wbase_db_log_itm itm = (Wbase_db_log_itm)wbase_db_hash.Get_at(i); - tmp_bfr.Add(itm.Ttl()); - tmp_bfr.Add_byte_pipe().Add_int_variable(itm.Count()); - tmp_bfr.Add_byte_pipe().Add_int_variable(itm.Elapsed()); - tmp_bfr.Add_byte_nl(); - wbase_db_log.Write(tmp_bfr); - } - wbase_db_log.Flush(); - } - public void Clear() { - synchronized (thread_lock) { // LOCK:app-level - doc_cache.Clear(); - } - } - public Wdata_doc Get_by_ttl_or_null(Xowe_wiki wiki, Xoa_ttl ttl) { // "enwiki", "Earth" -> "Q2" wdoc - byte[] qid_bry = qid_mgr.Get_qid_or_null(wiki, ttl); // EX: "enwiki", "Earth" -> "Q2" - return qid_bry == null ? null : this.Get_by_exact_id_or_null(qid_bry); - } - public Wdata_doc Get_by_xid_or_null(byte[] xid) {return Get_by_loose_id_or_null(Wbase_pid.Prepend_property_if_needed(xid));}// scribunto passes either p1 or q1; convert p1 to "Property:p1" - public Wdata_doc Get_by_loose_id_or_null(byte[] ttl_bry) { - return Get_by_exact_id_or_null(ttl_bry); - } - public Wdata_doc Get_by_exact_id_or_null(byte[] ttl_bry) {// must correct case and ns; EX:"Q2" or "Property:P1"; not "q2" or "P2" - // load from cache - Wdata_doc rv = null; - synchronized (thread_lock) { - rv = doc_cache.Get_or_null(ttl_bry); - if (rv == null) { - // load from db - rv = Load_wdoc_or_null(ttl_bry); - if (rv == null) return null; // page not found - Add(ttl_bry, rv);// NOTE: use ttl_bry, not rv.Qid; allows subsequent lookups to skip this redirect cycle - } - } - return rv; - } - private Wdata_doc Load_wdoc_or_null(byte[] ttl_bry) { // EX:"Q2" or "Property:P1" - if (!enabled) return null; - - // loggging - Wbase_db_log_itm wbase_db_itm = (Wbase_db_log_itm)wbase_db_hash.Get_by(ttl_bry); - if (wbase_db_itm == null) { - wbase_db_itm = new Wbase_db_log_itm(ttl_bry); - wbase_db_hash.Add(ttl_bry, wbase_db_itm); - } - long time_bgn = gplx.core.envs.System_.Ticks(); - - Wdata_doc rv = null; - synchronized (thread_lock) { // LOCK:app-level; jdoc_parser; moved synchronized higher up; DATE:2016-09-03 - byte[] cur_ttl_bry = ttl_bry; - int load_count = -1; - while (load_count < 2) { // limit to 2 tries (i.e.: 1 redirect) - // parse ttl; note that "q2" will get parsed to "Q2" b/c of ns casing - Xoa_ttl cur_ttl = wbase_mgr.Wdata_wiki().Ttl_parse(cur_ttl_bry); - if (cur_ttl == null) { - Gfo_usr_dlg_.Instance.Warn_many("", "", "invalid wbase ttl: orig=~{0} cur=~{1}", ttl_bry, cur_ttl_bry); - break; - } - - // get page - Xoae_page page = wbase_mgr.Wdata_wiki().Data_mgr().Load_page_by_ttl(cur_ttl); - if (!page.Db().Page().Exists()) break; - - // parse jdoc - Json_doc jdoc = jsonParser.Parse(page.Db().Text().Text_bry()); - if (jdoc == null) { - Gfo_usr_dlg_.Instance.Warn_many("", "", "invalid jdoc for ttl: orig=~{0} cur=~{1}", ttl_bry, cur_ttl_bry); - break; - } - - // check for redirect; EX: {"entity":"Q22350516","redirect":"Q21006972"}; PAGE:fr.w:Tour_du_Táchira_2016; DATE:2016-08-13 - Json_nde jdoc_root = jdoc.Root_nde(); - byte[] redirect_ttl = jdoc_root.Get_as_bry_or(Bry__redirect, null); - if (redirect_ttl != null) { - cur_ttl_bry = redirect_ttl; - load_count++; - continue; - } - - // is json doc, and not a redirect; return - rv = new Wdata_doc(wbase_mgr, jdoc, cur_ttl_bry); - break; - } - if (rv == null && load_count >= 2) - Gfo_usr_dlg_.Instance.Warn_many("", "", "too many redirects for ttl: orig=~{0} cur=~{1}", ttl_bry, cur_ttl_bry); - } - - wbase_db_itm.Update(gplx.core.envs.System_.Ticks__elapsed_in_frac(time_bgn)); - return rv; - } - private static final byte[] Bry__redirect = Bry_.new_a7("redirect"); - - public void Add(byte[] full_db, Wdata_doc page) { // TEST: - synchronized (thread_lock) { // LOCK:app-level - if (doc_cache.Get_or_null(full_db) == null) - doc_cache.Add(full_db, page); - } - } -} -class Wbase_db_log_itm { - public Wbase_db_log_itm(byte[] ttl) { - this.ttl = ttl; - } - public byte[] Ttl() {return ttl;} private final byte[] ttl; - public int Count() {return count;} private int count; - public int Elapsed() {return elapsed;} private int elapsed; - public void Update(int elapsed_diff) { - count++; - this.elapsed += elapsed_diff; - } -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.stores; + +import gplx.Bry_; +import gplx.Bry_bfr; +import gplx.Bry_bfr_; +import gplx.Err_; +import gplx.Gfo_usr_dlg_; +import gplx.Ordered_hash; +import gplx.Ordered_hash_; +import gplx.String_; +import gplx.core.logs.Gfo_log_wtr; +import gplx.langs.jsons.Json_doc; +import gplx.langs.jsons.Json_nde; +import gplx.langs.jsons.Json_parser; +import gplx.xowa.Xoa_ttl; +import gplx.xowa.Xoae_page; +import gplx.xowa.Xowe_wiki; +import gplx.xowa.xtns.wbases.Wdata_doc; +import gplx.xowa.xtns.wbases.Wdata_wiki_mgr; +import gplx.xowa.xtns.wbases.core.Wbase_pid; + +public class Wbase_doc_mgr { + private final Wdata_wiki_mgr wbase_mgr; + private final Wbase_qid_mgr qid_mgr; + private Wbase_doc_cache doc_cache; + private final Object thread_lock = new Object(); + private final Ordered_hash wbase_db_hash = Ordered_hash_.New_bry(); + private final Gfo_log_wtr wbase_db_log; + private final Json_parser jsonParser = new Json_parser(); + public Wbase_doc_mgr(Wdata_wiki_mgr wbase_mgr, Wbase_qid_mgr qid_mgr) { + this.wbase_mgr = wbase_mgr; + this.qid_mgr = qid_mgr; + this.doc_cache = new Wbase_doc_cache__hash(); + this.wbase_db_log = Gfo_log_wtr.New_dflt("wbase", "db_log_{0}.csv"); + } + public void Enabled_(boolean v) {this.enabled = v;} private boolean enabled; + public void Cache__init(String cache_type, long cache_max, long compress_size, long used_weight) { + if (String_.Eq(cache_type, "null")) doc_cache = new Wbase_doc_cache__null(); + else if (String_.Eq(cache_type, "hash")) doc_cache = new Wbase_doc_cache__hash(); + else if (String_.Eq(cache_type, "mru" )) doc_cache = new Wbase_doc_cache__mru(cache_max, compress_size, used_weight); + else throw Err_.new_unhandled_default(cache_type); + } + public void Cleanup() { + doc_cache.Term(); + wbase_db_log__flush(); + } + private void wbase_db_log__flush() { + int len = wbase_db_hash.Len(); + Bry_bfr tmp_bfr = Bry_bfr_.New(); + for (int i = 0; i < len; i++) { + Wbase_db_log_itm itm = (Wbase_db_log_itm)wbase_db_hash.Get_at(i); + tmp_bfr.Add(itm.Ttl()); + tmp_bfr.Add_byte_pipe().Add_int_variable(itm.Count()); + tmp_bfr.Add_byte_pipe().Add_int_variable(itm.Elapsed()); + tmp_bfr.Add_byte_nl(); + wbase_db_log.Write(tmp_bfr); + } + wbase_db_log.Flush(); + } + public void Clear() { + synchronized (thread_lock) { // LOCK:app-level + doc_cache.Clear(); + } + } + public Wdata_doc Get_by_ttl_or_null(Xowe_wiki wiki, Xoa_ttl ttl) { // "enwiki", "Earth" -> "Q2" wdoc + byte[] qid_bry = qid_mgr.Get_qid_or_null(wiki, ttl); // EX: "enwiki", "Earth" -> "Q2" + return qid_bry == null ? null : this.Get_by_exact_id_or_null(qid_bry); + } + public Wdata_doc Get_by_xid_or_null(byte[] xid) {return Get_by_loose_id_or_null(Wbase_pid.Prepend_property_if_needed(xid));}// scribunto passes either p1 or q1; convert p1 to "Property:p1" + public Wdata_doc Get_by_loose_id_or_null(byte[] ttl_bry) { + return Get_by_exact_id_or_null(ttl_bry); + } + public Wdata_doc Get_by_exact_id_or_null(byte[] ttl_bry) {// must correct case and ns; EX:"Q2" or "Property:P1"; not "q2" or "P2" + // load from cache + Wdata_doc rv = null; + synchronized (thread_lock) { + rv = doc_cache.Get_or_null(ttl_bry); + if (rv == null) { + // load from db + rv = Load_wdoc_or_null(ttl_bry); + if (rv == null) return null; // page not found + Add(ttl_bry, rv);// NOTE: use ttl_bry, not rv.Qid; allows subsequent lookups to skip this redirect cycle + } + } + return rv; + } + private Wdata_doc Load_wdoc_or_null(byte[] ttl_bry) { // EX:"Q2" or "Property:P1" + if (!enabled) return null; + + // loggging + Wbase_db_log_itm wbase_db_itm = (Wbase_db_log_itm)wbase_db_hash.GetByOrNull(ttl_bry); + if (wbase_db_itm == null) { + wbase_db_itm = new Wbase_db_log_itm(ttl_bry); + wbase_db_hash.Add(ttl_bry, wbase_db_itm); + } + long time_bgn = gplx.core.envs.System_.Ticks(); + + Wdata_doc rv = null; + synchronized (thread_lock) { // LOCK:app-level; jdoc_parser; moved synchronized higher up; DATE:2016-09-03 + byte[] cur_ttl_bry = ttl_bry; + int load_count = -1; + while (load_count < 2) { // limit to 2 tries (i.e.: 1 redirect) + // parse ttl; note that "q2" will get parsed to "Q2" b/c of ns casing + Xoa_ttl cur_ttl = wbase_mgr.Wdata_wiki().Ttl_parse(cur_ttl_bry); + if (cur_ttl == null) { + Gfo_usr_dlg_.Instance.Warn_many("", "", "invalid wbase ttl: orig=~{0} cur=~{1}", ttl_bry, cur_ttl_bry); + break; + } + + // get page + Xoae_page page = wbase_mgr.Wdata_wiki().Data_mgr().Load_page_by_ttl(cur_ttl); + if (!page.Db().Page().Exists()) break; + + // parse jdoc + Json_doc jdoc = jsonParser.Parse(page.Db().Text().Text_bry()); + if (jdoc == null) { + Gfo_usr_dlg_.Instance.Warn_many("", "", "invalid jdoc for ttl: orig=~{0} cur=~{1}", ttl_bry, cur_ttl_bry); + break; + } + + // check for redirect; EX: {"entity":"Q22350516","redirect":"Q21006972"}; PAGE:fr.w:Tour_du_Táchira_2016; DATE:2016-08-13 + Json_nde jdoc_root = jdoc.Root_nde(); + byte[] redirect_ttl = jdoc_root.Get_as_bry_or(Bry__redirect, null); + if (redirect_ttl != null) { + cur_ttl_bry = redirect_ttl; + load_count++; + continue; + } + + // is json doc, and not a redirect; return + rv = new Wdata_doc(wbase_mgr, jdoc, cur_ttl_bry); + break; + } + if (rv == null && load_count >= 2) + Gfo_usr_dlg_.Instance.Warn_many("", "", "too many redirects for ttl: orig=~{0} cur=~{1}", ttl_bry, cur_ttl_bry); + } + + wbase_db_itm.Update(gplx.core.envs.System_.Ticks__elapsed_in_frac(time_bgn)); + return rv; + } + private static final byte[] Bry__redirect = Bry_.new_a7("redirect"); + + public void Add(byte[] full_db, Wdata_doc page) { // TEST: + synchronized (thread_lock) { // LOCK:app-level + if (doc_cache.Get_or_null(full_db) == null) + doc_cache.Add(full_db, page); + } + } +} +class Wbase_db_log_itm { + public Wbase_db_log_itm(byte[] ttl) { + this.ttl = ttl; + } + public byte[] Ttl() {return ttl;} private final byte[] ttl; + public int Count() {return count;} private int count; + public int Elapsed() {return elapsed;} private int elapsed; + public void Update(int elapsed_diff) { + count++; + this.elapsed += elapsed_diff; + } +} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_prop_mgr.java b/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_prop_mgr.java index 2457665e9..9c0cfeda8 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_prop_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_prop_mgr.java @@ -1,19 +1,19 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2017 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa.xtns.wbases.stores; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2017 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa.xtns.wbases.stores; import gplx.*; import gplx.xowa.xtns.wbases.core.*; public class Wbase_prop_mgr { // lang-agnostic registry of props; EX: "p15" -> commonsmedia private Ordered_hash cache; @@ -30,7 +30,7 @@ public class Wbase_prop_mgr { // lang-agnostic registry of props; EX: "p15" -> c if (init_needed) Init(); if (cache == null) return null; pid = Wbase_pid.Ucase_pid_as_str(pid); - String rv = (String)cache.Get_by(pid); + String rv = (String)cache.GetByOrNull(pid); if (rv == null) { Gfo_usr_dlg_.Instance.Warn_many("", "", "wbase:could not find datatype for pid; pid=~{0} url=~{1}", pid, page_url); } diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_qid_mgr.java b/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_qid_mgr.java index 9e2221449..a1227ac2d 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_qid_mgr.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/stores/Wbase_qid_mgr.java @@ -13,11 +13,10 @@ The terms of each license can be found in the source code repository: GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ -package gplx.xowa.xtns.wbases.stores; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.wbases.*; +package gplx.xowa.xtns.wbases.stores; import gplx.*; import gplx.xowa.*; +import gplx.xowa.xtns.wbases.*; import gplx.core.primitives.*; import gplx.xowa.wikis.domains.*; -import gplx.xowa.wikis.data.*; -import gplx.xowa.xtns.wbases.dbs.*; public class Wbase_qid_mgr {// EX: "enwiki|0|Earth" -> "Q2" private final Wdata_wiki_mgr wbase_mgr; private final Hash_adp_bry cache = Hash_adp_bry.cs(); @@ -40,7 +39,7 @@ public class Wbase_qid_mgr {// EX: "enwiki|0|Earth" -> "Q2" // get from cache synchronized (cache) { - byte[] rv = (byte[])cache.Get_by(key); + byte[] rv = (byte[])cache.GetByOrNull(key); if (rv == null) { // get from db rv = wbase_mgr.Wdata_wiki().Db_mgr().Load_mgr().Load_qid(wdata_wiki_abrv, ttl.Ns().Id(), ttl.Page_db()); diff --git a/400_xowa/src/gplx/xowa/xtns/wikias/Random_selection_xnde.java b/400_xowa/src/gplx/xowa/xtns/wikias/Random_selection_xnde.java index a49cf7a7c..70a09f15a 100644 --- a/400_xowa/src/gplx/xowa/xtns/wikias/Random_selection_xnde.java +++ b/400_xowa/src/gplx/xowa/xtns/wikias/Random_selection_xnde.java @@ -14,9 +14,8 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt */ package gplx.xowa.xtns.wikias; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; -import gplx.xowa.htmls.*; import gplx.xowa.htmls.core.htmls.*; +import gplx.xowa.htmls.core.htmls.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.htmls.*; import gplx.xowa.parsers.tmpls.*; -import gplx.core.btries.*; import gplx.langs.htmls.*; import gplx.langs.htmls.docs.*; public class Random_selection_xnde implements Xox_xnde, Mwh_atr_itm_owner2 { private byte[] val = Bry_.Empty; @@ -68,7 +67,7 @@ public class Random_selection_xnde implements Xox_xnde, Mwh_atr_itm_owner2 { } } if (weight_total == 0) return; // empty will be 0 - this.options_ary = (Rndsel_option_itm[])option_list.To_ary_and_clear(Rndsel_option_itm.class); + this.options_ary = (Rndsel_option_itm[])option_list.ToAryAndClear(Rndsel_option_itm.class); // randomly select option_bry from all