v2.9.2.1

100_core/src/gplx/core/btries/Btrie_u8_itm.java

@@ -60,7 +60,7 @@ class Btrie_u8_itm {
 			byte[] asymmetric_bry = case_itm.Asymmetric_bry();
 			if (asymmetric_bry != null) {											// case_itm has asymmetry_bry; only itms in Xol_case_itm_ that are created with Tid_upper and Tid_lower will be non-null
 				rv.asymmetric_bry = asymmetric_bry;									// set itm to asymmetric_bry; EX: for İ, asymmetric_bry = i
-				nxts.Add_bry_obj(asymmetric_bry, rv);								// add the asymmetric_bry to the hash; in above example, this allows "i" to match "İ"
+//					nxts.Add_bry_obj(asymmetric_bry, rv);								// add the asymmetric_bry to the hash; in above example, this allows "i" to match "İ"
 			}
 		}
 		return rv;

100_core/src_140_list/gplx/Hash_adp_bry.java

@@ -148,7 +148,8 @@ class Hash_adp_bry_itm_ci_u8 extends Hash_adp_bry_itm_base {
 			}
 			else {							// known itm; use its hash_code
 				b_int = itm.Hashcode_lo();
-				i += itm.Len_lo() - 1;
+				int b_len = Utf8_.Len_of_char_by_1st_byte(b);	// NOTE: must calc b_len for langs with asymmetric upper / lower; PAGE:tr.w:Zvishavane DATE:2015-09-07
+				i += b_len - 1;
 			}
 			rv = (31 * rv) + b_int;
 		}
@@ -176,7 +177,7 @@ class Hash_adp_bry_itm_ci_u8 extends Hash_adp_bry_itm_base {
 				if (!Bry_.Match(src, src_c_bgn, src_c_end, trg, trg_c_bgn, trg_c_end)) return false;// syms do not match; return false;
 			}
 			else {
-				if (!src_c_itm.Eq_lo(trg_c_itm)) return false;										// lower-case hash-codes don't match; return false;
+				if (src_c_itm.Utf8_id_lo() != trg_c_itm.Utf8_id_lo()) return false;					// lower-case utf8-ids don't match; return false; NOTE: using utf8-ids instead of hash-code to handle asymmetric brys; DATE:2015-09-07
 			}
 			src_c_bgn = src_c_end;
 			trg_c_bgn = trg_c_end;

100_core/src_150_text/gplx/intl/Gfo_case_itm.java

@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.intl; import gplx.*;
 public interface Gfo_case_itm {
-	boolean Eq_lo(Gfo_case_itm itm);
 	int Hashcode_lo();
 	int Len_lo();
 	byte[] Asymmetric_bry();
+	int Utf8_id_lo();	// lower-case byte or byte[] as single utf8 int
 }

400_xowa/.classpath

@@ -1,24 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src_040_io"/>
 	<classpathentry kind="src" path="src_060_utl"/>
-	<classpathentry kind="src" path="src_100_app"/>
 	<classpathentry kind="src" path="src_120_wiki"/>
-	<classpathentry kind="src" path="src_121_wiki_data"/>
 	<classpathentry kind="src" path="src_140_lang"/>
-	<classpathentry kind="src" path="src_160_file"/>
-	<classpathentry kind="src" path="src_161_meta"/>
 	<classpathentry kind="src" path="src_200_bldr"/>
 	<classpathentry kind="src" path="src_210_bldr_core"/>
-	<classpathentry kind="src" path="src_240_install"/>
-	<classpathentry kind="src" path="src_300_html"/>
-	<classpathentry kind="src" path="src_400_parser"/>
-	<classpathentry kind="src" path="src_405_tkn"/>
-	<classpathentry kind="src" path="src_409_tkn_misc"/>
-	<classpathentry kind="src" path="src_440_lnki"/>
-	<classpathentry kind="src" path="src_490_xnde"/>
-	<classpathentry kind="src" path="src_500_tmpl"/>
 	<classpathentry kind="src" path="xtn"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/100_core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/150_gfui"/>

400_xowa/src/gplx/core/btries/Btrie_u8_mgr_tst.java

@@ -53,7 +53,7 @@ public class Btrie_u8_mgr_tst {
 		fxt.Init_add(Bry_.new_u8("i")	, "1");
 		fxt.Test_match("i"	, "1");				// exact=y
 		fxt.Test_match("I"	, "1");				// upper=y
-		fxt.Test_match("İ"	, null);			// utf_8=n; note that a trie with "i" doesn't match a src with "İ" even though "İ" lower-cases to "i"
+		fxt.Test_match("İ"	, "1");				// utf_8=y; note that "i" matches "İ" b/c hash is case-insensitive and "İ" lower-cases to "i"; DATE:2015-09-07
 	}
 	@Test  public void Utf8_asymmetric_multiple() {	// PURPOSE: problems in original implementation of Hash_adp_bry and uneven source / target counts;
 		fxt.Init_add(Bry_.new_u8("İİ")	, "1");

400_xowa/src/gplx/core/html/parsers/Gfo_html_parser.java

@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
 import gplx.core.btries.*; import gplx.core.primitives.*;
 import gplx.xowa.*;
+import gplx.xowa.parsers.xndes.*;
 class Gfo_html_parser {
 	private final Gfo_msg_log msg_log = Gfo_msg_log.Test();
 	private final Xop_xatr_parser xatr_parser = new Xop_xatr_parser();

400_xowa/src/gplx/core/html/parsers/Xob_html_tkn.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.core.html.parsers; import gplx.*; import gplx.core.*; import gplx.core.html.*;
 import gplx.xowa.*;
+import gplx.xowa.parsers.xndes.*;
 interface Gfo_html_tkn {
 	int Tid();
 	byte[] Key();

400_xowa/src/gplx/core/json/Json_wtr.java

@@ -16,6 +16,7 @@ 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.core.json; import gplx.*; import gplx.core.*;
+import gplx.core.primitives.*;
 public class Json_wtr {
 	private final Bry_bfr bfr = Bry_bfr.new_(255);
 	private final Int_ary idx_stack = new Int_ary(4);
@@ -71,6 +72,10 @@ public class Json_wtr {
 		Write_grp_end(Bool_.N, Sym_ary_end);
 		return Write_nl();
 	}
+	public Json_wtr Kv_bool_as_mw(String key, boolean val)	{
+		if (val) Kv_bry(key, Bry_.Empty);	// if true, write 'key:""'; if false, write nothing
+		return this;
+	}
 	public Json_wtr Kv_bool(String key, boolean val)		{return Kv_bool(Bry_.new_u8(key), val);}
 	public Json_wtr Kv_bool(byte[] key, boolean val)		{return Kv_raw(key, val ? Bool_.True_bry : Bool_.False_bry);}
 	public Json_wtr Kv_int(String key, int val)			{return Kv_raw(Bry_.new_u8(key), Int_.Xto_bry(val));}
@@ -180,6 +185,7 @@ public class Json_wtr {
 		Write_grp_end(Bool_.N, Sym_ary_end);
 	}
 	private void Write_str(byte[] bry) {
+		if (bry == null) {bfr.Add(Object_.Bry__null); return;}
 		int len = bry.length;
 		bfr.Add_byte(opt_quote_byte);
 		for (int i = 0; i < len; ++i) {

400_xowa/src/gplx/core/net/Gfo_inet_conn.java

@@ -15,7 +15,9 @@ 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.*;
-public interface Xobl_data_itm {
-	void Srl_save(Bry_bfr bfr);
+package gplx.core.net; import gplx.*; import gplx.core.*;
+public interface Gfo_inet_conn {
+	void		Clear();
+	void		Upload_data(byte[] url, byte[] data);
+	byte[]		Download_data(byte[] url);
 }

400_xowa/src/gplx/core/net/Gfo_inet_conn_.java

@@ -0,0 +1,34 @@
+/*
+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.core.net; import gplx.*; import gplx.core.*;
+public class Gfo_inet_conn_ {
+	public static Gfo_inet_conn new_mem_hash() {return new Gfo_inet_conn__mem__hash();}
+	public static Gfo_inet_conn new_mem_pile() {return new Gfo_inet_conn__mem__pile();}
+}
+class Gfo_inet_conn__mem__hash implements Gfo_inet_conn {
+	private final Hash_adp_bry hash = Hash_adp_bry.cs();
+	public void		Clear() {hash.Clear();}
+	public void		Upload_data(byte[] url, byte[] data) {hash.Add(url, data);}
+	public byte[]	Download_data(byte[] url) {return (byte[])hash.Get_by(url);}
+}
+class Gfo_inet_conn__mem__pile implements Gfo_inet_conn {
+	private final List_adp pile = List_adp_.new_();
+	public void		Clear() {pile.Clear();}
+	public void		Upload_data(byte[] url, byte[] data) {pile.Add(data);}
+	public byte[]	Download_data(byte[] url) {return (byte[])List_adp_.Pop_last(pile);}
+}

400_xowa/src/gplx/core/primitives/Bry_ary.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Bry_ary {
 	private byte[][] ary; private int len, max;
 	public Bry_ary(int max) {

400_xowa/src/gplx/core/primitives/Bry_cache.java

@@ -15,8 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
-import gplx.core.primitives.*;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Bry_cache {
 	public byte[] Get_or_new(String v) {return Get_or_new(Bry_.new_u8(v));}
 	public byte[] Get_or_new(byte[] v) {

400_xowa/src/gplx/core/primitives/Int_2_ref.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_2_ref {
 	public Int_2_ref() {}
 	public Int_2_ref(int v0, int v1) {Val_all_(v0, v1);}

400_xowa/src/gplx/core/primitives/Int_2_val.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_2_val {
 	public Int_2_val(int v0, int v1) {val_0 = v0; val_1 = v1;}
 	public int Val_0() {return val_0;} final int val_0;

400_xowa/src/gplx/core/primitives/Int_ary.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_ary {
 	private int[] ary; private int len, max;
 	public Int_ary(int max) {
@@ -30,6 +30,10 @@ public class Int_ary {
 		len = 0;
 	}
 	public int Len() {return len;}
+	public int Get_at_or_fail(int i) {
+		if (i > -1 && i < len) return ary[i];
+		else throw Err_.new_("core.int_ary", "index is invalid", "i", i, "len", len);
+	}
 	public void Add(int v) {
 		if (len == max) {
 			int new_max = max * 2;
@@ -48,21 +52,20 @@ public class Int_ary {
 		--len;
 		return rv;
 	}
-	public int Idx_of(int key) {
+	public int Idx_of(int find) {
 		for (int i = len - 1; i > -1; --i) {
-			int val = ary[i];
-			if (val == key) return i;
+			if (ary[i] == find) return i;
 		}
-		return -1;
+		return Not_found;
 	}
-	public boolean Del_by_key_from_end(int key) {
-		int key_idx = Idx_of(key); if (key_idx == -1) return false;
+	public boolean Del_from_end(int find) {
+		int find_idx = Idx_of(find); if (find_idx == Not_found) return false;
 		int last_idx = len - 1;
-		for (int i = key_idx; i < last_idx; ++i)
+		for (int i = find_idx; i < last_idx; ++i)
 			ary[i] = ary[i + 1];
 		ary[last_idx] = 0;
 		--len;
 		return true;
 	}
-	public int Get_at(int i) {return ary[i];}
+	public static final int Not_found = -1;
 }

400_xowa/src/gplx/core/primitives/Int_ary_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_ary_parser extends Obj_ary_parser_base {
 	Number_parser parser = new Number_parser(); int[] ary; int ary_idx;
 	public int[] Parse_ary(String str, byte dlm) {byte[] bry = Bry_.new_u8(str); return Parse_ary(bry, 0, bry.length, dlm);}

400_xowa/src/gplx/core/primitives/Int_ary_parser_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 import org.junit.*;
 public class Int_ary_parser_tst {
 	@Test  public void Many()		{tst_ints("1,2,3,4,5"		, 0, 9, Int_.Ary(1, 2, 3, 4, 5));}

400_xowa/src/gplx/core/primitives/Int_list.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.core.primitives; import gplx.*; import gplx.core.*;
 public class Int_list {
 	private int[] ary = Int_.Ary_empty; private int ary_len, ary_max;
 	public void Add(int uid) {

400_xowa/src/gplx/ios/Io_zip_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.ios; import gplx.*;
 public interface Io_zip_mgr {
 	void Zip_fil(Io_url src_fil, Io_url trg_fil);
 	byte[] Zip_bry(byte[] src, int bgn, int len);

400_xowa/src/gplx/ios/Io_zip_mgr_base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.ios; import gplx.*;
 import java.io.*;
 import java.util.zip.*;
 public class Io_zip_mgr_base implements Io_zip_mgr {

400_xowa/src/gplx/ios/Io_zip_mgr_mok.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.ios; import gplx.*;
 public class Io_zip_mgr_mok implements Io_zip_mgr {
 	public void Zip_fil(Io_url src_fil, Io_url trg_fil) {
 		byte[] src_bry = Io_mgr.I.LoadFilBry(src_fil);

400_xowa/src/gplx/ios/Io_zip_mgr_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx;
+package gplx.ios; import gplx.*;
 import org.junit.*;
 public class Io_zip_mgr_tst {
 	@Test  public void Zip_unzip() {

400_xowa/src/gplx/xowa/Xoa_app_.java

@@ -58,7 +58,7 @@ public class Xoa_app_ {
 		}
 	}
 	public static final String Name = "xowa";
-	public static final String Version = "2.9.1.1";
+	public static final String Version = "2.9.2.1";
 	public static String Build_date = "2012-12-30 00:00:00";
 	public static String Op_sys_str;
 	public static String User_agent = "";

400_xowa/src/gplx/xowa/Xoa_page.java

@@ -16,6 +16,7 @@ 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.pages.*;
 public interface Xoa_page {
 	Xow_wiki				Wiki();
 	Xoa_url					Url();

400_xowa/src/gplx/xowa/Xoa_ttl.java

@@ -16,7 +16,8 @@ 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.core.primitives.*; import gplx.core.btries.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.langs.cases.*;
+import gplx.core.primitives.*; import gplx.core.btries.*; import gplx.xowa.wikis.xwikis.*; import gplx.xowa.langs.cases.*;
+import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.miscs.*; import gplx.xowa.wikis.ttls.*;
 public class Xoa_ttl {	// PAGE:en.w:http://en.wikipedia.org/wiki/Help:Link; REF.MW: Ttl.php|secureAndSplit;
 	public Xow_ns Ns() {return ns;} private Xow_ns ns;
 	public boolean ForceLiteralLink() {return forceLiteralLink;} private boolean forceLiteralLink;

400_xowa/src/gplx/xowa/Xoae_app.java

@@ -19,14 +19,15 @@ package gplx.xowa; import gplx.*;
 import gplx.core.btries.*; import gplx.core.flds.*; import gplx.ios.*; import gplx.core.threads.*; import gplx.core.json.*;
 import gplx.xowa.apps.*; import gplx.xowa.apps.caches.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.apis.*; import gplx.xowa.apps.metas.*; import gplx.xowa.urls.encoders.*; import gplx.xowa.apps.progs.*;
 import gplx.xowa.langs.*; import gplx.xowa.specials.*; import gplx.xowa.cfgs2.*;
-import gplx.xowa.bldrs.css.*;
-import gplx.xowa.files.caches.*; import gplx.xowa.files.imgs.*;
+import gplx.xowa.bldrs.css.*; import gplx.xowa.bldrs.installs.*;
+import gplx.xowa.files.*; import gplx.xowa.files.caches.*; import gplx.xowa.files.imgs.*;
 import gplx.xowa.wikis.*; import gplx.xowa.users.*; import gplx.xowa.gui.*; import gplx.xowa.cfgs.*; import gplx.xowa.ctgs.*; import gplx.xowa.html.tocs.*; import gplx.xowa.fmtrs.*; import gplx.xowa.html.*;
 import gplx.xowa.html.hrefs.*; import gplx.xowa.html.wtrs.*; import gplx.xowa.html.ns_files.*; import gplx.xowa.html.bridges.*;
-import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.tblws.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.xndes.*;
 import gplx.xowa.xtns.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.math.*;
-import gplx.xowa.parsers.logs.*; import gplx.xowa.servers.tcp.*; import gplx.xowa.servers.http.*;
+import gplx.xowa.parsers.utils.*; import gplx.xowa.parsers.logs.*; import gplx.xowa.servers.tcp.*; import gplx.xowa.servers.http.*;
 import gplx.xowa.wmfs.*;
+import gplx.xowa.tdbs.*; import gplx.xowa.tdbs.hives.*;
 public class Xoae_app implements Xoa_app, GfoInvkAble {
 	public Xoae_app(Gfo_usr_dlg usr_dlg, Xoa_app_type app_type, Io_url root_dir, Io_url wiki_dir, Io_url file_dir, Io_url user_dir, Io_url css_dir, String bin_dir_name) {
 		Xoa_app_.Usr_dlg_(usr_dlg);
@@ -104,7 +105,6 @@ public class Xoae_app implements Xoa_app, GfoInvkAble {
 	public Xoa_hive_mgr			Hive_mgr() {return hive_mgr;} private Xoa_hive_mgr hive_mgr;
 	public Xop_sanitizer		Sanitizer() {return sanitizer;} private Xop_sanitizer sanitizer;
 	public Xop_xatr_parser		Xatr_parser() {return xatr_parser;} private Xop_xatr_parser xatr_parser = new Xop_xatr_parser();
-	public Xop_xnde_tag_regy	Xnde_tag_regy() {return xnde_tag_regy;} private Xop_xnde_tag_regy xnde_tag_regy = new Xop_xnde_tag_regy();
 	public Xof_math_subst_regy	Math_subst_regy() {return math_subst_regy;} private Xof_math_subst_regy math_subst_regy = new Xof_math_subst_regy();
 	public Xoa_prog_mgr			Prog_mgr() {return prog_mgr;} private final Xoa_prog_mgr prog_mgr = new Xoa_prog_mgr();
 	public Gfo_async_mgr		Async_mgr() {return async_mgr;} private Gfo_async_mgr async_mgr = new Gfo_async_mgr();

400_xowa/src/gplx/xowa/Xoae_page.java

@@ -19,6 +19,7 @@ package gplx.xowa; import gplx.*;
 import gplx.xowa.gui.*; import gplx.xowa.gui.views.*; import gplx.xowa.html.*; import gplx.xowa.pages.*;
 import gplx.xowa.files.*; import gplx.xowa.files.xfers.*; import gplx.xowa.xtns.cite.*; import gplx.xowa.xtns.wdatas.*; import gplx.xowa.parsers.lnkis.redlinks.*; import gplx.xowa.html.tocs.*;
 import gplx.xowa.html.modules.popups.*; import gplx.xowa.html.hdumps.pages.*; import gplx.xowa.xtns.wdatas.pfuncs.*;
+import gplx.xowa.parsers.*;
 public class Xoae_page implements Xoa_page {
 	Xoae_page(Xowe_wiki wiki, Xoa_ttl ttl) {
 		this.wiki = wiki; this.ttl = ttl;

400_xowa/src/gplx/xowa/Xop_fxt.java

@@ -16,8 +16,10 @@ 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.*; import gplx.xowa.html.*; import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.lists.*; import gplx.xowa.parsers.paras.*;
-import gplx.xowa.files.exts.*;
+import gplx.xowa.langs.*; import gplx.xowa.html.*;
+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.files.exts.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.tdbs.hives.*;
 public class Xop_fxt {
 	public Xop_fxt() {
 		Xoae_app app = Xoa_app_fxt.app_();
@@ -90,8 +92,8 @@ public class Xop_fxt {
 	public Xop_apos_tkn_chkr tkn_apos_(int cmd) 					{return new Xop_apos_tkn_chkr().Apos_cmd_(cmd);}
 	public Xop_tkn_chkr_base tkn_html_ref_(String v) 				{return new Xop_html_txt_tkn_chkr().Html_ref_key_(v);}
 	public Xop_tkn_chkr_base tkn_html_ncr_(int v) 					{return new Xop_html_num_tkn_chkr().Html_ncr_val_(v);}
-	@gplx.Internal protected Xop_ignore_tkn_chkr tkn_comment_(int bgn, int end)		{return tkn_ignore_(bgn, end, Xop_ignore_tkn.Ignore_tid_comment);}
-	@gplx.Internal protected Xop_ignore_tkn_chkr tkn_ignore_(int bgn, int end, byte t){return (Xop_ignore_tkn_chkr)new Xop_ignore_tkn_chkr().Ignore_tid_(t).Src_rng_(bgn, end);}
+	public Xop_ignore_tkn_chkr tkn_comment_(int bgn, int end)		{return tkn_ignore_(bgn, end, Xop_ignore_tkn.Ignore_tid_comment);}
+	public Xop_ignore_tkn_chkr tkn_ignore_(int bgn, int end, byte t){return (Xop_ignore_tkn_chkr)new Xop_ignore_tkn_chkr().Ignore_tid_(t).Src_rng_(bgn, end);}
 	public Xop_tkn_chkr_hr   tkn_hr_(int bgn, int end)				{return new Xop_tkn_chkr_hr(bgn, end).Hr_len_(Xop_hr_lxr.Hr_len);}
 	public Xop_tblw_tb_tkn_chkr tkn_tblw_tb_(int bgn, int end) 		{return (Xop_tblw_tb_tkn_chkr)new Xop_tblw_tb_tkn_chkr().Src_rng_(bgn, end);}
 	public Xop_tblw_tc_tkn_chkr tkn_tblw_tc_(int bgn, int end) 		{return (Xop_tblw_tc_tkn_chkr)new Xop_tblw_tc_tkn_chkr().Src_rng_(bgn, end);}
@@ -121,17 +123,17 @@ public class Xop_fxt {
 	public Xop_tkn_chkr_lnke tkn_lnke_(int bgn, int end)			{return new Xop_tkn_chkr_lnke(bgn, end);}
 	public Xop_lnki_tkn_chkr tkn_lnki_()							{return tkn_lnki_(-1, -1);}
 	public Xop_lnki_tkn_chkr tkn_lnki_(int bgn, int end)			{return (Xop_lnki_tkn_chkr)new Xop_lnki_tkn_chkr().Src_rng_(bgn, end);}
-	@gplx.Internal protected Xop_arg_itm_tkn_chkr	tkn_arg_itm_(Xop_tkn_chkr_base... subs) {return (Xop_arg_itm_tkn_chkr)new Xop_arg_itm_tkn_chkr().Subs_(subs);}
-	@gplx.Internal protected Xop_arg_nde_tkn_chkr	tkn_arg_nde_()						{return tkn_arg_nde_(String_.Pos_neg1, String_.Pos_neg1);}
-	@gplx.Internal protected Xop_arg_nde_tkn_chkr	tkn_arg_nde_(int bgn, int end)		{return (Xop_arg_nde_tkn_chkr)new Xop_arg_nde_tkn_chkr().Src_rng_(bgn, end);}
-	@gplx.Internal protected Xop_arg_nde_tkn_chkr tkn_arg_val_(Xop_tkn_chkr_base... subs) {
+	public Xop_arg_itm_tkn_chkr		tkn_arg_itm_(Xop_tkn_chkr_base... subs) {return (Xop_arg_itm_tkn_chkr)new Xop_arg_itm_tkn_chkr().Subs_(subs);}
+	public Xop_arg_nde_tkn_chkr		tkn_arg_nde_()						{return tkn_arg_nde_(String_.Pos_neg1, String_.Pos_neg1);}
+	public Xop_arg_nde_tkn_chkr		tkn_arg_nde_(int bgn, int end)		{return (Xop_arg_nde_tkn_chkr)new Xop_arg_nde_tkn_chkr().Src_rng_(bgn, end);}
+	public Xop_arg_nde_tkn_chkr		tkn_arg_val_(Xop_tkn_chkr_base... subs) {
 		Xop_arg_nde_tkn_chkr rv = new Xop_arg_nde_tkn_chkr();
 		Xop_arg_itm_tkn_chkr val = new Xop_arg_itm_tkn_chkr();
 		val.Subs_(subs);
 		rv.Val_tkn_(val);
 		return rv;
 	}
-	@gplx.Internal protected Xop_arg_nde_tkn_chkr tkn_arg_val_txt_(int bgn, int end) {
+	public Xop_arg_nde_tkn_chkr tkn_arg_val_txt_(int bgn, int end) {
 		Xop_arg_nde_tkn_chkr rv = new Xop_arg_nde_tkn_chkr();
 		Xop_arg_itm_tkn_chkr itm = new Xop_arg_itm_tkn_chkr();
 		rv.Val_tkn_(itm);
@@ -145,8 +147,8 @@ public class Xop_fxt {
 		itm.Src_rng_(bgn, end).Subs_(tkn_txt_(bgn, end));
 		return rv;
 	}
-	@gplx.Internal protected Xot_invk_tkn_chkr tkn_tmpl_invk_(int bgn, int end) {return (Xot_invk_tkn_chkr)new Xot_invk_tkn_chkr().Src_rng_(bgn, end);}
-	@gplx.Internal protected Xot_invk_tkn_chkr tkn_tmpl_invk_w_name(int bgn, int end, int name_bgn, int name_end) {
+	public Xot_invk_tkn_chkr tkn_tmpl_invk_(int bgn, int end) {return (Xot_invk_tkn_chkr)new Xot_invk_tkn_chkr().Src_rng_(bgn, end);}
+	public Xot_invk_tkn_chkr tkn_tmpl_invk_w_name(int bgn, int end, int name_bgn, int name_end) {
 		Xot_invk_tkn_chkr rv = new Xot_invk_tkn_chkr();
 		rv.Src_rng_(bgn, end);
 		rv.Name_tkn_(tkn_arg_key_txt_(name_bgn, name_end));

400_xowa/src/gplx/xowa/apps/Xoa_app_eval.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps; import gplx.*; import gplx.xowa.*;
 public class Xoa_app_eval implements Bry_fmtr_eval_mgr {
 	public boolean Enabled() {return enabled;} public void Enabled_(boolean v) {enabled = v;} private boolean enabled = true;
 	public byte[] Eval(byte[] cmd) {

400_xowa/src/gplx/xowa/apps/Xoa_app_eval_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps; import gplx.*; import gplx.xowa.*;
 import org.junit.*;
 import gplx.xowa.apps.*;
 public class Xoa_app_eval_tst {

400_xowa/src/gplx/xowa/apps/Xoa_cur.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps; import gplx.*; import gplx.xowa.*;
 import gplx.xowa.gui.views.*;
 public class Xoa_cur implements GfoInvkAble {
 	public Xoa_cur(Xoae_app app) {this.app = app;} private Xoae_app app;

400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps; import gplx.*; import gplx.xowa.*;
 import gplx.xowa.langs.*;
 public class Xoa_sys_cfg implements GfoInvkAble {
 	private Xoae_app app;

400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_grp.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps.langs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*;
 interface Xoac_lang_obj {}
 public class Xoac_lang_grp implements Cfg_nde_obj, Xoac_lang_obj {
 	public Xoac_lang_grp(byte[] key) {this.key_bry = key; this.name_bry = key_bry;}

400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_grp_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps.langs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*;
 import org.junit.*; import gplx.xowa.langs.*;
 public class Xoac_lang_grp_tst {
 	Xoac_lang_grp_fxt fxt = new Xoac_lang_grp_fxt();

400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_itm.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.apps.langs; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*;
 public class Xoac_lang_itm implements Cfg_nde_obj, Xoac_lang_obj {
 	public Xoac_lang_itm(byte[] key) {this.key_bry = key; local_name_bry = key_bry; uid = uid_next++;} static int uid_next = 0;
 	public Xoac_lang_grp Grp() {return grp;} public Xoac_lang_itm Grp_(Xoac_lang_grp v) {grp = v; return this;} private Xoac_lang_grp grp;

400_xowa/src/gplx/xowa/apps/metas/Xoa_meta_mgr.java

@@ -16,9 +16,29 @@ 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.apps.metas; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*;
+import gplx.xowa.wmfs.data.*;
 public class Xoa_meta_mgr {
+	private final Xoa_app app;
+	private final Hash_adp_bry ns__hash = Hash_adp_bry.cs();
+	private Site_core_db core_db;
 	public Xoa_meta_mgr(Xoa_app app) {
-		this.ns_mgr = new Xoa_ns_mgr(app);
+		this.app = app;
+	}
+	public void Ns__add(byte[] wiki_domain, Xow_ns_mgr ns_mgr) {ns__hash.Add(wiki_domain, ns_mgr);}	// TEST:public
+	public Xow_ns_mgr Ns__get_or_load(byte[] wiki_domain) {
+		Xow_ns_mgr rv = (Xow_ns_mgr)ns__hash.Get_by_bry(wiki_domain);
+		if (rv == null) {
+			Core_db__assert();
+			rv = core_db.Load_namespace(wiki_domain);
+			Ns__add(wiki_domain, rv);
+		}
+		return rv;
+	}
+	public void Init_by_wiki(Xow_wiki wiki) {
+		Core_db__assert();
+		core_db.Load_extensiontag(wiki.Domain_itm(), wiki.Mw_parser_mgr().Xnde_tag_regy());
+	}
+	private void Core_db__assert() {
+		if (core_db == null) core_db = new Site_core_db(app.Fsys_mgr().Cfg_site_meta_fil());
 	}
-	public Xoa_ns_mgr Ns_mgr() {return ns_mgr;} private final Xoa_ns_mgr ns_mgr;
 }

400_xowa/src/gplx/xowa/apps/metas/Xoa_ns_mgr.java

@@ -1,40 +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.apps.metas; import gplx.*; import gplx.xowa.*; import gplx.xowa.apps.*;
-import gplx.dbs.*;
-import gplx.xowa.langs.cases.*;
-import gplx.xowa.wikis.domains.*;
-import gplx.xowa.wmfs.data.*;
-public class Xoa_ns_mgr {
-	private final Xoa_app app;
-	private final Hash_adp_bry hash = Hash_adp_bry.cs();
-	private Site_core_db core_db;
-	public Xoa_ns_mgr(Xoa_app app) {
-		this.app = app;
-	}
-	public void Add(byte[] wiki_domain, Xow_ns_mgr ns_mgr) {hash.Add(wiki_domain, ns_mgr);}	// TEST:
-	public Xow_ns_mgr Get_or_load(byte[] wiki_domain) {
-		Xow_ns_mgr rv = (Xow_ns_mgr)hash.Get_by_bry(wiki_domain);
-		if (rv == null) {
-			if (core_db == null) core_db = new Site_core_db(app.Fsys_mgr().Cfg_site_meta_fil());
-			rv = core_db.Load_ns(wiki_domain);
-			Add(wiki_domain, rv);
-		}
-		return rv;
-	}
-}

400_xowa/src/gplx/xowa/bldrs/Xob_sql_dump_base.java

@@ -15,8 +15,9 @@ 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.core.flds.*; import gplx.ios.*; import gplx.xowa.bldrs.*; import gplx.xowa.tdbs.*;
+package gplx.xowa.bldrs; import gplx.*; import gplx.xowa.*;
+import gplx.core.flds.*; import gplx.ios.*; import gplx.xowa.tdbs.*;
+import gplx.xowa.bldrs.sqls.*;
 public abstract class Xob_sql_dump_base extends Xob_itm_dump_base implements Xob_cmd, GfoInvkAble {
 	private final Sql_file_parser parser = new Sql_file_parser(); private boolean fail = false;
 	public abstract String Cmd_key();

400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cfgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.strings.*;
+import gplx.xowa.wikis.xwikis.cfgs.*;
 public class Xob_wiki_cfg_bldr implements GfoInvkAble {
 	public Xob_wiki_cfg_bldr(Xob_bldr bldr) {this.app = bldr.App();} private Xoae_app app;
 	public void Exec() {

400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java

@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.bldrs.cmds; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.dbs.*; import gplx.xowa.wikis.caches.*; import gplx.xowa.bldrs.cmds.files.*; import gplx.xowa.files.origs.*;
 import gplx.xowa.wikis.data.*; import gplx.xowa.dbs.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*;
 public abstract class Xob_dump_mgr_base extends Xob_itm_basic_base implements Xob_cmd, GfoInvkAble {
 	private Xob_dump_src_id page_src;
 	private Xowd_db_mgr db_fsys_mgr; protected Xop_parser parser; protected Xop_ctx ctx; protected Xop_root_tkn root;
@@ -176,9 +177,7 @@ public abstract class Xob_dump_mgr_base extends Xob_itm_basic_base implements Xo
 		usr_dlg.Note_many("", "", "done: ~{0} ~{1}", exec_count, Decimal_adp_.divide_safe_(exec_count, Env_.TickCount_elapsed_in_sec(time_bgn)).To_str("#,###.000"));
 	}
 	private void Free() {
-		ctx.App().Free_mem(true);
-		gplx.xowa.xtns.scribunto.Scrib_core.Core_invalidate();
-		wiki.Cache_mgr().Free_mem_all();
+		Xow_wiki_.Rls_mem(wiki, true);
 	}
 	protected void Reset_db_y_() {this.reset_db = true;}
 	@Override public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_base.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.core.brys.*; import gplx.ios.*; import gplx.xowa.ctgs.*;
+import gplx.xowa.bldrs.sqls.*;
 public abstract class Xob_categorylinks_base extends Xob_sql_dump_base implements Sql_file_parser_cmd {
 	private DateAdp_parser date_parser = DateAdp_parser.new_(); private Sql_file_parser sql_parser; Uca_trie trie; private Bry_bfr uca_bfr = Bry_bfr.reset_(255);		
 	public abstract Io_sort_cmd Make_sort_cmd(Sql_file_parser sql_parser);

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql.java

@@ -16,7 +16,8 @@ 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.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
-import gplx.ios.*; import gplx.xowa.bldrs.*;
+import gplx.ios.*;
+import gplx.xowa.bldrs.sqls.*;
 public class Xob_categorylinks_sql extends Xob_categorylinks_base {
 	private Db_idx_mode idx_mode = Db_idx_mode.Itm_end;
 	public Xob_categorylinks_sql(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki); this.make_fil_len = Io_mgr.Len_mb;}

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql_make.java

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.core.flds.*; import gplx.ios.*; import gplx.dbs.*; import gplx.xowa.dbs.*; import gplx.xowa.ctgs.*; 
-import gplx.xowa.bldrs.*;
+import gplx.xowa.bldrs.sqls.*;
 import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*;
 public class Xob_categorylinks_sql_make implements Io_make_cmd {
 	private Gfo_usr_dlg usr_dlg; private final Xowe_wiki wiki; private final Db_idx_mode idx_mode; private Xowd_db_mgr core_db_mgr;

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_txt.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.ios.*;
+import gplx.xowa.bldrs.sqls.*;
 public class Xob_categorylinks_txt extends Xob_categorylinks_base {
 	public Xob_categorylinks_txt(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki); this.make_fil_len = Io_mgr.Len_mb;}
 	@Override public String Cmd_key() {return Xob_cmd_keys.Key_tdb_text_cat_link;}

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_base.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.ios.*;
+import gplx.xowa.bldrs.sqls.*;
 public abstract class Xoctg_hiddencat_parser_base extends Xob_sql_dump_base implements Sql_file_parser_cmd {
 	public Xoctg_hiddencat_parser_base Ctor(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki); this.make_fil_len = Io_mgr.Len_mb; return this;}
 	@Override public String Sql_file_name() {return "page_props";}

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_sql.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.dbs.*; import gplx.xowa.dbs.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.bldrs.sqls.*;
 import gplx.xowa.wikis.data.*;
 public class Xoctg_hiddencat_parser_sql extends Xoctg_hiddencat_parser_base {
 	private Xowd_cat_core_tbl tbl;

400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_txt.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.ios.*;
+import gplx.xowa.bldrs.sqls.*;
 public class Xoctg_hiddencat_parser_txt extends Xoctg_hiddencat_parser_base {
 	public Xoctg_hiddencat_parser_txt(Xob_bldr bldr, Xowe_wiki wiki) {this.Ctor(bldr, wiki);}
 	@Override public String Cmd_key() {return Xob_cmd_keys.Key_tdb_cat_hidden_sql;}

400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java

@@ -19,7 +19,8 @@ package gplx.xowa.bldrs.cmds.files; import gplx.*; import gplx.xowa.*; import gp
 import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.pages.*;
 import gplx.xowa.files.*;
 import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*;
-import gplx.xowa.parsers.lnkis.redlinks.*; import gplx.xowa.parsers.logs.*; import gplx.xowa.html.hdumps.bldrs.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.wdatas.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.logs.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.lnkis.redlinks.*; import gplx.xowa.parsers.xndes.*;
+import gplx.xowa.html.hdumps.bldrs.*; import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.wdatas.*;
 import gplx.fsdb.meta.*; import gplx.xowa.files.fsdb.*; import gplx.fsdb.*;
 public class Xob_lnki_temp_wkr extends Xob_dump_mgr_base implements Xopg_redlink_logger {
 	private Xob_lnki_temp_tbl tbl; private boolean wdata_enabled = true, xtn_ref_enabled = true, gen_html, gen_hdump;
@@ -60,7 +61,7 @@ public class Xob_lnki_temp_wkr extends Xob_dump_mgr_base implements Xopg_redlink
 		if (!xtn_ref_enabled) gplx.xowa.xtns.cite.References_nde.Enabled = false;
 		gplx.xowa.xtns.gallery.Gallery_xnde.Log_wkr = log_mgr.Make_wkr().Save_src_str_(Bool_.Y);
 		gplx.xowa.xtns.imaps.Imap_xnde.Log_wkr = log_mgr.Make_wkr();
-		gplx.xowa.Xop_xnde_wkr.Timeline_log_wkr = log_mgr.Make_wkr();
+		gplx.xowa.parsers.xndes.Xop_xnde_wkr.Timeline_log_wkr = log_mgr.Make_wkr();
 		gplx.xowa.xtns.scores.Score_xnde.Log_wkr = log_mgr.Make_wkr();
 		gplx.xowa.xtns.hieros.Hiero_xnde.Log_wkr = log_mgr.Make_wkr();
 		gplx.xowa.xtns.math.Math_nde.Log_wkr = log_mgr.Make_wkr();

400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_regy_update_cmd.java

@@ -32,7 +32,7 @@ public class Xob_xfer_regy_update_cmd extends Xob_itm_basic_base implements Xob_
 		this.Update_status(make_db_provider);
 	}
 	private void Copy_atrs_to_make_db(Db_conn make_db_provider) {
-		wiki.File_mgr().Init_file_mgr_by_load(wiki);
+		wiki.File_mgr().Init_file_mgr_by_load(wiki);	// NOTE: this gets current fsdb to update from xfer_regy; this never uses -prv/ or /prv/ databases; DATE:2015-09-10
 		Fsm_mnt_itm fsdb_abc_mgr = wiki.File_mgr().Fsdb_mgr().Mnt_mgr().Mnts__get_main();		// 0 = fsdb.main
 		Db_conn conn = fsdb_abc_mgr.Atr_mgr().Db__core().Conn();								// 0 = fsdb.atr.00
 		Io_url fsdb_atr_url = ((gplx.dbs.engines.sqlite.Sqlite_conn_info)conn.Conn_info()).Url();

400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_cmd_orig.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.dbs.*; import gplx.xowa.dbs.*; import gplx.xowa.files.*; import gplx.xowa.files.exts.*;	
+import gplx.xowa.parsers.lnkis.*;
 public class Xob_xfer_temp_cmd_orig extends Xob_itm_basic_base implements Xob_cmd {
 	private byte[] ext_rules_key = Bry_.Empty;
 	public Xob_xfer_temp_cmd_orig(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki);}

400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.dbs.*; import gplx.xowa.files.*;
+import gplx.xowa.parsers.lnkis.*;
 class Xob_xfer_temp_itm {
 	public int Lnki_id() {return lnki_id;} private int lnki_id;
 	public int Lnki_tier_id() {return lnki_tier_id;} private int lnki_tier_id;

400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm_tst.java

@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package gplx.xowa.bldrs.cmds.files; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import org.junit.*;
 import gplx.stores.*; import gplx.xowa.files.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.parsers.lnkis.*;
 public class Xob_xfer_temp_itm_tst {
 	private Xob_xfer_temp_itm_fxt fxt = new Xob_xfer_temp_itm_fxt();
 	@Before public void init() {fxt.Reset();}

400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_cmd.java

@@ -18,7 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 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.*;
 import gplx.dbs.*; import gplx.ios.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.bldrs.cmds.wikis.*;
 import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.dbs.*; 
-import gplx.xowa.wikis.*; import gplx.xowa.bldrs.filters.dansguardians.*; import gplx.xowa.apis.xowa.bldrs.imports.*;	
+import gplx.xowa.wikis.*; import gplx.xowa.bldrs.filters.dansguardians.*; import gplx.xowa.apis.xowa.bldrs.imports.*;
+import gplx.xowa.parsers.utils.*;
 public class Xob_page_cmd extends Xob_itm_basic_base implements Xobd_wkr, GfoInvkAble {
 	private Xowd_db_mgr db_mgr; private Db_idx_mode idx_mode = Db_idx_mode.Itm_end; private Xowd_page_tbl page_core_tbl; private Io_stream_zip_mgr text_zip_mgr; private byte text_zip_tid;
 	private Xop_redirect_mgr redirect_mgr; private Xob_redirect_tbl redirect_tbl; private boolean redirect_id_enabled;

400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 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.*;
 import gplx.dbs.*;
+import gplx.xowa.bldrs.sqls.*;
 import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*;
 public class Xob_pagelinks_parser_cmd extends Xob_sql_dump_base implements Sql_file_parser_cmd {
 	private Db_conn core_conn;

400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_calc_stats_cmd.java

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.texts.tdbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.bldrs.cmds.texts.*;
-import gplx.xowa.tdbs.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.tdbs.*; import gplx.xowa.tdbs.hives.*; import gplx.xowa.wikis.data.tbls.*;
 public class Xob_calc_stats_cmd extends Xob_itm_basic_base implements Xob_cmd {
 	public Xob_calc_stats_cmd(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki);}
 	public String Cmd_key() {return Xob_cmd_keys.Key_tdb_calc_stats;}

400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_page_txt.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.texts.tdbs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.bldrs.cmds.texts.*;
 import gplx.ios.*; import gplx.xowa.tdbs.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.parsers.utils.*;
 public class Xob_page_txt extends Xob_itm_dump_base implements Xobd_wkr, GfoInvkAble {
 	public Xob_page_txt(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki);}
 	public String Wkr_key() {return Xob_cmd_keys.Key_tdb_make_page;}

400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java

@@ -16,7 +16,8 @@ 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.bldrs.cmds.utils; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
-import gplx.xowa.bldrs.*; import gplx.xowa.tdbs.*;
+import gplx.ios.*; import gplx.xowa.bldrs.sqls.*;
+import gplx.xowa.tdbs.*;
 public class Xob_deploy_zip_cmd extends Xob_itm_basic_base implements Xob_cmd {
 	public Xob_deploy_zip_cmd(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki);}
 	public String Cmd_key() {return Xob_cmd_keys.Key_deploy_zip;}

400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_image_cmd.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.wikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.dbs.*; import gplx.ios.*; import gplx.xowa.files.*;
+import gplx.xowa.bldrs.sqls.*;
 public class Xob_image_cmd extends Xob_itm_dump_base implements Xob_cmd, GfoInvkAble, Sql_file_parser_cmd {
 	private Db_conn conn = null; private Db_stmt stmt = null;
 	private Xob_image_tbl tbl_image = new Xob_image_tbl();

400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_redirect_cmd.java

@@ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.cmds.wikis; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*;
 import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.xowa.dbs.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.parsers.utils.*;
 public class Xob_redirect_cmd extends Xob_dump_mgr_base {		
 	private Db_conn conn; private Xob_redirect_tbl redirect_tbl;
 	private Xodb_mgr_sql db_mgr; private Xop_redirect_mgr redirect_mgr; private Url_encoder encoder;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_base.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*; import gplx.xowa.bldrs.*;
 import gplx.xowa.wikis.domains.*;
 import gplx.xowa.wmfs.dumps.*;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_dumpfile.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*;
 class Xoi_cmd_dumpfile {
 	public byte[] Domain() {return domain;} private byte[] domain;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_dumpfile_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import org.junit.*;
 public class Xoi_cmd_dumpfile_tst {		
 	@Before public void init() {fxt.Clear();} private Xoi_cmd_dumpfile_fxt fxt = new Xoi_cmd_dumpfile_fxt();

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_imageMagick_download.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.gfui.*;
 import gplx.core.threads.*;
 class Xoi_cmd_imageMagick_download extends Gfo_thread_cmd_download implements Gfo_thread_cmd {//		private static final byte[] Bry_windows_zip = Bry_.new_a7("-windows.zip");

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*;
 public class Xoi_cmd_mgr implements GfoInvkAble {
 	List_adp cmds = List_adp_.new_();

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_download.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.gfui.*;
 import gplx.core.threads.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.utils.*;
 import gplx.xowa.wmfs.dumps.*;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_goto_page.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*;
 class Xoi_cmd_wiki_goto_page extends Gfo_thread_cmd_base implements Gfo_thread_cmd {
 	public Xoi_cmd_wiki_goto_page(Xoae_app app, String page) {this.app = app; this.page = page; this.Ctor(app.Usr_dlg(), app.Gui_mgr().Kit());} private Xoae_app app; String page;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_image_cfg.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*;
 class Xoi_cmd_wiki_image_cfg extends Gfo_thread_cmd_replace implements Gfo_thread_cmd {	public Xoi_cmd_wiki_image_cfg(Xoae_app app, Io_url url) {this.app = app; super.Init(app.Usr_dlg(), app.Gui_mgr().Kit(), url);} private Xoae_app app;
 	@Override public void Async_run() {

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*; import gplx.xowa.bldrs.*; import gplx.xowa.gui.views.*; import gplx.xowa.bldrs.cmds.utils.*;
 import gplx.xowa.html.hrefs.*;
 class Xoi_cmd_wiki_import implements Gfo_thread_cmd {

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import org.junit.*;
 import gplx.core.consoles.*;
 import gplx.brys.*; import gplx.core.threads.*; import gplx.xowa.setup.maints.*; import gplx.xowa.xtns.wdatas.imports.*;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_unzip.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.gfui.*;
 import gplx.core.threads.*;
 class Xoi_cmd_wiki_unzip extends Gfo_thread_cmd_unzip implements Gfo_thread_cmd {	public static final String KEY_dump = "wiki.unzip";

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_zip.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.core.threads.*;
 import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.utils.*;
 class Xoi_cmd_wiki_zip implements Gfo_thread_cmd {

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.ios.*;
 import gplx.xowa.wmfs.dumps.*;
 public class Xoi_dump_mgr implements GfoInvkAble {

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_mirror_parser.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 public class Xoi_mirror_parser {
 	public String[] Parse(String raw_str) {
 		if (String_.Len_eq_0(raw_str)) return String_.Ary_empty;

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_mirror_parser_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import org.junit.*;
 public class Xoi_mirror_parser_tst {
 	@Test  public void Basic() {

400_xowa/src/gplx/xowa/bldrs/installs/Xoi_setup_mgr.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import gplx.gfui.*; import gplx.xowa.setup.addons.*;
 import gplx.xowa.setup.maints.*;
 public class Xoi_setup_mgr implements GfoInvkAble {

400_xowa/src/gplx/xowa/bldrs/installs/Xow_cfg_wiki_core.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 public class Xow_cfg_wiki_core {
 	public Xow_cfg_wiki_core(Xowe_wiki wiki) {this.wiki = wiki;} private Xowe_wiki wiki;
 	public void Save() {

400_xowa/src/gplx/xowa/bldrs/installs/Xow_cfg_wiki_core_tst.java

@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.installs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
 import org.junit.*;
 public class Xow_cfg_wiki_core_tst {
 	Xow_cfg_wiki_core_fxt fxt = new Xow_cfg_wiki_core_fxt();

400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang.java

@@ -16,7 +16,8 @@ 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.bldrs.langs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
-import gplx.xowa.apps.fsys.*; import gplx.xowa.langs.*;
+import gplx.xowa.apps.fsys.*; import gplx.xowa.apps.langs.*;
+import gplx.xowa.langs.*;
 public class Xobc_utl_make_lang implements GfoInvkAble {
 	private final Xoa_lang_mgr lang_mgr; private final Xoa_fsys_mgr fsys_mgr; Xol_mw_lang_parser lang_parser;
 	public Xobc_utl_make_lang(Xoa_lang_mgr lang_mgr, Xoa_fsys_mgr fsys_mgr, Gfo_msg_log msg_log) {

400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang_kwds.java

@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 package gplx.xowa.bldrs.langs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
-import gplx.xowa.langs.*;
+import gplx.xowa.langs.*; import gplx.xowa.apps.langs.*;
 public class Xobc_utl_make_lang_kwds implements GfoInvkAble, 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;}