Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.10.2.1

Browse Source
This commit is contained in:
gnosygnu
2014-10-13 00:13:41 -04:00
parent cd5a440404
commit d6561b3c1f
514 changed files with 1899 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
400_xowa/src_140_lang/gplx/xowa/Xol_csv_parser.java
View File

@@ -31,7 +31,7 @@ public class Xol_csv_parser {
}
}
}
public byte[] Load(byte[] src, int bgn, int end) {Load(tmp_bfr, src, bgn, end); return tmp_bfr.XtoAryAndClear();}
public byte[] Load(byte[] src, int bgn, int end) {Load(tmp_bfr, src, bgn, end); return tmp_bfr.Xto_bry_and_clear();}
public void Load(Bry_bfr bfr, byte[] src) {Load(bfr, src, 0, src.length);}
public void Load(Bry_bfr bfr, byte[] src, int bgn, int end) {
for (int i = bgn; i < end; i++) {

4
400_xowa/src_140_lang/gplx/xowa/Xol_csv_parser_tst.java
View File

@@ -31,11 +31,11 @@ class Xol_csv_parser_fxt {
public void Clear() {}
public void Tst_save(String raw, String expd) {
parser.Save(tmp_bfr, Bry_.new_utf8_(raw));
Tfds.Eq(expd, tmp_bfr.XtoStrAndClear());
Tfds.Eq(expd, tmp_bfr.Xto_str_and_clear());
}
public void Tst_load(String expd, String raw_str) {
byte[] raw = Bry_.new_utf8_(raw_str);
parser.Load(tmp_bfr, raw, 0, raw.length);
Tfds.Eq(expd, tmp_bfr.XtoStrAndClear());
Tfds.Eq(expd, tmp_bfr.Xto_str_and_clear());
}
}

205
400_xowa/src_140_lang/gplx/xowa/Xol_fragment_mgr.java
View File

@@ -1,205 +0,0 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012 gnosygnu@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa; import gplx.*;
import gplx.xowa.langs.msgs.*;
public class Xol_fragment_mgr implements GfoInvkAble {
public Xol_fragment_mgr(Xol_lang lang) {this.lang = lang;} private Xol_lang lang;
public byte[] Html_js_wikidata() {if (html_js_wikidata == null) html_js_wikidata = Html_js_wikidata_init(); return html_js_wikidata;} private byte[] html_js_wikidata;
private byte[] Html_js_wikidata_init() {
Xow_wiki wdata_wiki = lang.App().Wiki_mgr().Wdata_mgr().Wdata_wiki();
if (wdata_wiki != null) wdata_wiki.Init_assert();
Bry_bfr bfr = lang.App().Utl_bry_bfr_mkr().Get_b512();
html_js_wikidata_fmtr.Bld_bfr_many(bfr
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_languages)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_toc)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_labels)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_aliasesHead)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_descriptions)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_claims)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_json)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_language)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_wiki)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_label)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_aliases)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_description)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_link)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_property)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_value)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_references)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_qualifiers)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_symbol_comma_separator)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_symbol_word_separator)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_symbol_parentheses)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_jan)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_feb)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_mar)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_apr)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_may)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_jun)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_jul)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_aug)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_sep)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_oct)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_nov)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_dte_month_abrv_dec)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_duration_ago)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_novalue)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_somevalue)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wiki)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wiktionary)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wikisource)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wikivoyage)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wikiquote)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wikibooks)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wikiversity)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_wikinews)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_links_special)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_plus)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_minus)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_plusminus)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_degree)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_minute)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_second)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_north)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_south)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_west)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_east)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_meters)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_julian)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_decade)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_century)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_millenium)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_years1e4)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_years1e5)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_years1e6)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_years1e7)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_years1e8)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_years1e9)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_bc)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_inTime)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_wikibase_diffview_rank)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_preferred)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_normal)
, Html_js_wikidata_val(wdata_wiki, Xol_msg_itm_.Id_xowa_wikidata_deprecated)
, lang.App().Fsys_mgr().Root_dir().To_http_file_str()
);
return bfr.Mkr_rls().XtoAryAndClear();
}
private byte[] Html_js_wikidata_val(Xow_wiki wdata_wiki, int id) {
Xol_msg_itm msg = lang.Msg_mgr().Itm_by_id_or_null(id);
byte[] rv = wdata_wiki == null ? msg.Val() : Xol_msg_mgr_.Get_msg_val(wdata_wiki, lang, msg.Key(), Bry_.Ary_empty);
if (Bry_finder.Find_fwd(rv, Byte_ascii.Apos) != Bry_.NotFound)
rv = Bry_.Replace(rv, Bry_find, Bry_repl);
return rv;
} private static final byte[] Bry_find = new byte[] {Byte_ascii.Apos}, Bry_repl = new byte[] {Byte_ascii.Backslash, Byte_ascii.Apos};
private Bry_fmtr html_js_wikidata_fmtr = Bry_fmtr.new_(String_.Concat_lines_nl
( " <script>"
, " var xowa_wikidata_i18n = {"
, " 'languages' : '~{languages}',"
, " 'toc' : '~{toc}',"
, " 'labels' : '~{labels}',"
, " 'aliasesHead' : '~{aliasesHead}',"
, " 'descriptions' : '~{descriptions}',"
, " 'links' : '~{links}',"
, " 'claims' : '~{claims}',"
, " 'json' : '~{json}',"
, " 'language' : '~{language}',"
, " 'wiki' : '~{wiki}',"
, " 'label' : '~{label}',"
, " 'aliases' : '~{aliases}',"
, " 'description' : '~{description}',"
, " 'link' : '~{link}',"
, " 'property' : '~{property}',"
, " 'value' : '~{value}',"
, " 'references' : '~{references}',"
, " 'qualifiers' : '~{qualifiers}',"
, " 'comma-separator' : '~{comma_separator}',"
, " 'word-separator' : '~{word_separator}',"
, " 'parentheses' : '~{parentheses}',"
, " 'jan' : '~{jan}',"
, " 'feb' : '~{feb}',"
, " 'mar' : '~{mar}',"
, " 'apr' : '~{apr}',"
, " 'may' : '~{may}',"
, " 'jun' : '~{jun}',"
, " 'jul' : '~{jul}',"
, " 'aug' : '~{aug}',"
, " 'sep' : '~{sep}',"
, " 'oct' : '~{oct}',"
, " 'nov' : '~{nov}',"
, " 'dec' : '~{dec}',"
, " 'ago' : '~{ago}',"
, " 'novalue' : '~{novalue}',"
, " 'somevalue' : '~{somevalue}',"
, " 'links-wiki' : '~{links_wiki}',"
, " 'links-wiktionary' : '~{links_wiktionary}',"
, " 'links-wikisource' : '~{links_wikisource}',"
, " 'links-wikivoyage' : '~{links_wikivoyage}',"
, " 'links-wikiquote' : '~{links_wikiquote}',"
, " 'links-wikibooks' : '~{links_wikibooks}',"
, " 'links-wikiversity' : '~{links_wikiversity}',"
, " 'links-wikinews' : '~{links_wikinews}',"
, " 'links-special' : '~{links_special}',"
, " 'plus' : '~{plus}',"
, " 'minus' : '~{minus}',"
, " 'plusminus' : '~{plusminus}',"
, " 'degree' : '~{degree}',"
, " 'minute' : '~{minute}',"
, " 'second' : '~{second}',"
, " 'north' : '~{north}',"
, " 'south' : '~{south}',"
, " 'west' : '~{west}',"
, " 'east' : '~{east}',"
, " 'meters' : '~{meters}',"
, " 'julian' : '~{julian}',"
, " 'decade' : '~{decade}',"
, " 'century' : '~{century}',"
, " 'millenium' : '~{millenium}',"
, " 'years1e4' : '~{years1e4}',"
, " 'years1e5' : '~{years1e5}',"
, " 'years1e6' : '~{years1e6}',"
, " 'years1e7' : '~{years1e7}',"
, " 'years1e8' : '~{years1e8}',"
, " 'years1e9' : '~{years1e9}',"
, " 'bc' : '~{bc}',"
, " 'inTime' : '~{inTime}',"
, " 'rank' : '~{rank}',"
, " 'preferred' : '~{preferred}',"
, " 'normal' : '~{normal}',"
, " 'deprecated' : '~{deprecated}'"
, " };"
, " </script>"
// , " <script src=\"~{app_root_dir}bin/any/javascript/xowa/wikidata/wikidata.js\" type='text/javascript'></script>"
)
, "languages", "toc", "labels", "aliasesHead", "descriptions", "links", "claims", "json", "language", "wiki", "label", "aliases", "description", "link", "property", "value", "references", "qualifiers"
, "comma_separator", "word_separator", "parentheses", "jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec", "ago", "novalue", "somevalue"
, "links_wiki", "links_wiktionary", "links_wikisource", "links_wikivoyage", "links_wikiquote", "links_wikibooks", "links_wikiversity", "links_wikinews", "links_special"
, "plus", "minus", "plusminus", "degree", "minute", "second", "north", "south", "west", "east", "meters", "julian"
, "decade", "century", "millenium", "years1e4", "years1e5", "years1e6", "years1e7", "years1e8", "years1e9", "bc", "inTime"
, "rank", "preferred", "normal", "deprecated"
, "app_root_dir"
);
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_html_js_wikidata_fmt_)) html_js_wikidata_fmtr.Fmt_(m.ReadBry("v"));
else if (ctx.Match(k, Invk_html_js_wikidata)) return this.Html_js_wikidata();
else return GfoInvkAble_.Rv_unhandled;
return this;
}
public static final String Invk_html_js_wikidata_fmt_ = "html_js_wikidata_fmt_", Invk_html_js_wikidata = "html_js_wikidata";
}

117
400_xowa/src_140_lang/gplx/xowa/Xol_fragment_mgr_tst.java
View File

@@ -1,117 +0,0 @@
/*
XOWA: the XOWA Offline Wiki Application
Copyright (C) 2012 gnosygnu@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.xowa; import gplx.*;
import org.junit.*;
public class Xol_fragment_mgr_tst {
private Xol_fragment_mgr_fxt fxt = new Xol_fragment_mgr_fxt();
@Before public void init() {fxt.Clear();}
@Test public void Html_wikidata() {
fxt.Test_fragment(Xol_fragment_mgr.Invk_html_js_wikidata, String_.Concat_lines_nl
( " <script>"
, " var xowa_wikidata_i18n = {"
, " 'languages' : 'en',"
, " 'toc' : 'Contents',"
, " 'labels' : 'Labels',"
, " 'aliasesHead' : 'Aliases',"
, " 'descriptions' : 'Descriptions',"
, " 'links' : 'Links',"
, " 'claims' : 'Claims',"
, " 'json' : 'JSON',"
, " 'language' : 'language',"
, " 'wiki' : 'wiki',"
, " 'label' : 'label',"
, " 'aliases' : 'aliases',"
, " 'description' : 'description',"
, " 'link' : 'link',"
, " 'property' : 'property',"
, " 'value' : 'value',"
, " 'references' : 'references',"
, " 'qualifiers' : 'qualifiers',"
, " 'comma-separator' : ', ',"
, " 'word-separator' : ' ',"
, " 'parentheses' : '($1)',"
, " 'jan' : 'Jan',"
, " 'feb' : 'Feb',"
, " 'mar' : 'Mar',"
, " 'apr' : 'Apr',"
, " 'may' : 'May',"
, " 'jun' : 'Jun',"
, " 'jul' : 'Jul',"
, " 'aug' : 'Aug',"
, " 'sep' : 'Sep',"
, " 'oct' : 'Oct',"
, " 'nov' : 'Nov',"
, " 'dec' : 'Dec',"
, " 'ago' : '$1 ago',"
, " 'novalue' : '—',"
, " 'somevalue' : '?',"
, " 'links-wiki' : 'Links (Wikipedia)',"
, " 'links-wiktionary' : 'Links (Wiktionary)',"
, " 'links-wikisource' : 'Links (Wikisource)',"
, " 'links-wikivoyage' : 'Links (Wikivoyage)',"
, " 'links-wikiquote' : 'Links (Wikiquote)',"
, " 'links-wikibooks' : 'Links (Wikibooks)',"
, " 'links-wikiversity' : 'Links (Wikiversity)',"
, " 'links-wikinews' : 'Links (Wikinews)',"
, " 'links-special' : 'Links (special wikis)',"
, " 'plus' : '+',"
, " 'minus' : '−',"
, " 'plusminus' : '±',"
, " 'degree' : '°',"
, " 'minute' : '′',"
, " 'second' : '″',"
, " 'north' : 'N',"
, " 'south' : 'S',"
, " 'west' : 'W',"
, " 'east' : 'E',"
, " 'meters' : '" + String_.new_utf8_(Xol_msg_itm_.Bry_nbsp) + "m',"
, " 'julian' : '<sup>jul</sup>',"
, " 'decade' : '$10s',"
, " 'century' : '$1. century',"
, " 'millenium' : '$1. millenium',"
, " 'years1e4' : '$10,000 years',"
, " 'years1e5' : '$100,000 years',"
, " 'years1e6' : '$1 million years',"
, " 'years1e7' : '$10 million years',"
, " 'years1e8' : '$100 million years',"
, " 'years1e9' : '$1 billion years',"
, " 'bc' : '$1 BC',"
, " 'inTime' : 'in $1',"
, " 'rank' : 'rank',"
, " 'preferred' : 'preferred',"
, " 'normal' : 'normal',"
, " 'deprecated' : 'deprecated'"
, " };"
, " </script>"
// , " <script src=\"file:///mem/xowa/bin/any/javascript/xowa/wikidata/wikidata.js\" type='text/javascript'></script>"
));
}
}
class Xol_fragment_mgr_fxt {
public void Clear() {
if (lang == null) {
Xoa_app app = Xoa_app_fxt.app_();
lang = app.User().Lang();
// wiki = Xoa_app_fxt.wiki_tst_(app);
}
} private Xol_lang lang;
public void Test_fragment(String key, String expd) {
byte[] actl = (byte[])GfoInvkAble_.InvkCmd(lang.Fragment_mgr(), key);
Tfds.Eq_str_lines(expd, String_.new_utf8_(actl));
}
}

2
400_xowa/src_140_lang/gplx/xowa/Xol_kwd_parse_data.java
View File

@@ -73,7 +73,7 @@ public class Xol_kwd_parse_data {
break;
}
}
return dirty ? tmp.XtoAryAndClear() : raw;
return dirty ? tmp.Xto_bry_and_clear() : raw;
}
public static final byte Strip_none = 0, Strip_bgn = 1, Strip_end = 2;
}

2
400_xowa/src_140_lang/gplx/xowa/Xol_lang.java
View File

@@ -28,7 +28,6 @@ public class Xol_lang implements GfoInvkAble {
ns_names = new Xol_ns_grp(this); ns_aliases = new Xol_ns_grp(this);
keyword_mgr = new Xol_kwd_mgr(this);
message_mgr = new Xol_msg_mgr(this, true);
fragment_mgr = new Xol_fragment_mgr(this);
specials_mgr = new Xol_specials_mgr(this);
case_mgr = Env_.Mode_testing() ? Xol_case_mgr_.Ascii() : Xol_case_mgr_.Utf8(); // NOTE: if test load ascii b/c utf8 is large; NOTE: placed here b/c tests do not call load; DATE:2014-07-04
if (lang_id != Xol_lang_itm_.Id_en) fallback_bry_ary = Fallback_bry_ary__en; // NOTE: do not set fallback_ary for en to en, else recursive loop
@@ -66,7 +65,6 @@ public class Xol_lang implements GfoInvkAble {
public byte[][] Fallback_bry_ary() {return fallback_bry_ary;} private byte[][] fallback_bry_ary = Bry_.Ary_empty;
public Xol_vnt_mgr Vnt_mgr() {return vnt_mgr;} private Xol_vnt_mgr vnt_mgr;
public Xol_cnv_mgr Cnv_mgr() {return cnv_mgr;} private Xol_cnv_mgr cnv_mgr;
public Xol_fragment_mgr Fragment_mgr() {return fragment_mgr;} private Xol_fragment_mgr fragment_mgr;
public Xol_num_mgr Num_mgr() {return num_mgr;} private Xol_num_mgr num_mgr;
public Xol_grammar Grammar() {return grammar;} private Xol_grammar grammar;
public Xol_plural Plural() {return plural;} private Xol_plural plural;

6
400_xowa/src_140_lang/gplx/xowa/Xol_lang_srl.java
View File

@@ -44,7 +44,7 @@ public class Xol_lang_srl {
if (last) break;
++pos;
}
return (Xow_ns[])rv.XtoAry(Xow_ns.class);
return (Xow_ns[])rv.Xto_ary(Xow_ns.class);
} private static final String GRP_KEY = "xowa.lang.srl";
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;
@@ -81,7 +81,7 @@ public class Xol_lang_srl {
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
int cur_id = Xol_kwd_grp_.Id_by_bry(cur_key); if (cur_id == -1) throw Err_mgr._.fmt_(GRP_KEY, "invalid_keyword", "key does not have id: ~{0}", cur_id);
Xol_kwd_grp grp = keyword_mgr.Get_or_new(cur_id);
grp.Srl_load(cur_cs, (byte[][])cur_words.XtoAry(byte[].class));
grp.Srl_load(cur_cs, (byte[][])cur_words.Xto_ary(byte[].class));
}
fld_bgn = pos + 1;
fld_idx = 0;
@@ -93,7 +93,7 @@ public class Xol_lang_srl {
if (last) break;
++pos;
}
// return (Xol_kwd_grp[])rv.XtoAry(typeof(Xol_kwd_grp));
// return (Xol_kwd_grp[])rv.Xto_ary(typeof(Xol_kwd_grp));
}
public static void Load_messages(Xol_msg_mgr msg_mgr, byte[] src) {
int src_len = src.length, pos = 0, fld_bgn = 0;

22
400_xowa/src_140_lang/gplx/xowa/Xol_lang_srl_tst.java
View File

@@ -236,23 +236,23 @@ class Xol_lang_srl_fxt {
}
public void Run_save_ns_grp(Xol_ns_grp grp, String invk, String raw) {
Xol_lang_srl.Save_ns_grps(bldr, grp, invk);
Tfds.Eq_str_lines("." + raw, bldr.Bfr().XtoStrAndClear());
Tfds.Eq_str_lines("." + raw, bldr.Bfr().Xto_str_and_clear());
}
public void Run_save_kwd_mgr(Xol_kwd_mgr kwd_mgr, String invk, String raw) {
Xol_lang_srl.Save_keywords(bldr, kwd_mgr);
Tfds.Eq_str_lines("." + raw, bldr.Bfr().XtoStrAndClear());
Tfds.Eq_str_lines("." + raw, bldr.Bfr().Xto_str_and_clear());
}
public void Run_save_msg_mgr(Xol_msg_mgr msg_mgr, String invk, String raw) {
Xol_lang_srl.Save_messages(bldr, msg_mgr, true);
Tfds.Eq_str_lines("." + raw, bldr.Bfr().XtoStrAndClear());
Tfds.Eq_str_lines("." + raw, bldr.Bfr().Xto_str_and_clear());
}
public void Run_save_num_mgr(Xol_num_mgr num_mgr, String raw) {
Xol_lang_srl.Save_num_mgr(bldr, num_mgr);
Tfds.Eq_str_lines(raw, bldr.Bfr().XtoStrAndClear());
Tfds.Eq_str_lines(raw, bldr.Bfr().Xto_str_and_clear());
}
public void Run_save_specials_mgr(Xol_specials_mgr specials_mgr, String invk, String raw) {
Xol_lang_srl.Save_specials(bldr, specials_mgr);
Tfds.Eq_str_lines("." + raw, bldr.Bfr().XtoStrAndClear());
Tfds.Eq_str_lines("." + raw, bldr.Bfr().Xto_str_and_clear());
}
public void Tst_num_fmt(String raw, String expd) {Tfds.Eq(expd, String_.new_utf8_(lang.Num_mgr().Format_num(Bry_.new_utf8_(raw))));}
public void Tst_keywords(Xol_kwd_mgr kwd_mgr, Xol_kwd_grp... ary) {
@@ -275,7 +275,7 @@ class Xol_lang_srl_fxt {
sb.Add(itm.Aliases()[j]).Add_char_nl();
}
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
private Xol_specials_itm[] Xto_ary(Xol_specials_mgr specials_mgr) {
int len = specials_mgr.Count();
@@ -290,7 +290,7 @@ class Xol_lang_srl_fxt {
Xow_ns ns = ary[i];
sb.Add(ns.Id()).Add("|").Add(ns.Name_str()).Add_char_nl();
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
Xow_ns[] Xto_ary(Xol_ns_grp ary) {
int len = ary.Len();
@@ -307,7 +307,7 @@ class Xol_lang_srl_fxt {
if (kwd_grp == null) continue;
rv.Add(kwd_grp);
}
return (Xol_kwd_grp[])rv.XtoAry(Xol_kwd_grp.class);
return (Xol_kwd_grp[])rv.Xto_ary(Xol_kwd_grp.class);
}
String Xto_str(Xol_kwd_grp[] ary) {
int len = ary.length;
@@ -321,7 +321,7 @@ class Xol_lang_srl_fxt {
}
sb.Add_char_nl();
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
Xol_msg_itm[] Xto_ary(Xol_msg_mgr msg_mgr) {
int len = msg_mgr.Itms_max();
@@ -331,7 +331,7 @@ class Xol_lang_srl_fxt {
if (itm == null || !itm.Dirty()) continue;
rv.Add(itm);
}
return (Xol_msg_itm[])rv.XtoAry(Xol_msg_itm.class);
return (Xol_msg_itm[])rv.Xto_ary(Xol_msg_itm.class);
}
String Xto_str(Xol_msg_itm[] ary) {
int len = ary.length;
@@ -339,7 +339,7 @@ class Xol_lang_srl_fxt {
Xol_msg_itm itm = ary[i];
sb.Add(itm.Key()).Add("|").Add(itm.Val()).Add_char_nl();
}
return sb.XtoStrAndClear();
return sb.Xto_str_and_clear();
}
private static String_bldr sb = String_bldr_.new_();
}

4
400_xowa/src_140_lang/gplx/xowa/Xol_msg_itm.java
View File

@@ -32,12 +32,12 @@ public class Xol_msg_itm {
public byte[] Fmt(Bry_bfr bfr, Object... args) {
tmp_fmtr.Fmt_(val);
tmp_fmtr.Bld_bfr_many(bfr, args);
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
} static Bry_fmtr tmp_fmtr = Bry_fmtr.tmp_();
public byte[] Fmt_tmp(Bry_bfr bfr, byte[] tmp_val, Object... args) {
tmp_fmtr.Fmt_(tmp_val);
tmp_fmtr.Bld_bfr_many(bfr, args);
return bfr.XtoAryAndClear();
return bfr.Xto_bry_and_clear();
}
public static final byte Src_null = 0, Src_lang = 1, Src_wiki = 2, Src_missing = 3;
}