diff --git a/100_core/src/gplx/core/btries/Btrie_u8_itm.java b/100_core/src/gplx/core/btries/Btrie_u8_itm.java
index e18442475..24e3ae289 100644
--- a/100_core/src/gplx/core/btries/Btrie_u8_itm.java
+++ b/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;
diff --git a/100_core/src_140_list/gplx/Hash_adp_bry.java b/100_core/src_140_list/gplx/Hash_adp_bry.java
index ed2e9d7cb..e151894b0 100644
--- a/100_core/src_140_list/gplx/Hash_adp_bry.java
+++ b/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;
diff --git a/100_core/src_150_text/gplx/intl/Gfo_case_itm.java b/100_core/src_150_text/gplx/intl/Gfo_case_itm.java
index dadf370b9..1842f860c 100644
--- a/100_core/src_150_text/gplx/intl/Gfo_case_itm.java
+++ b/100_core/src_150_text/gplx/intl/Gfo_case_itm.java
@@ -17,8 +17,8 @@ along with this program. If not, see .
*/
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
}
diff --git a/400_xowa/.classpath b/400_xowa/.classpath
index c4e9e51ba..fbb3e43c3 100644
--- a/400_xowa/.classpath
+++ b/400_xowa/.classpath
@@ -1,24 +1,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/400_xowa/src/gplx/core/btries/Btrie_u8_mgr_tst.java b/400_xowa/src/gplx/core/btries/Btrie_u8_mgr_tst.java
index 7291cb559..8cd8ac637 100644
--- a/400_xowa/src/gplx/core/btries/Btrie_u8_mgr_tst.java
+++ b/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");
diff --git a/400_xowa/src/gplx/core/html/parsers/Gfo_html_parser.java b/400_xowa/src/gplx/core/html/parsers/Gfo_html_parser.java
index 1b1e4b335..ec4e9491e 100644
--- a/400_xowa/src/gplx/core/html/parsers/Gfo_html_parser.java
+++ b/400_xowa/src/gplx/core/html/parsers/Gfo_html_parser.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
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();
diff --git a/400_xowa/src/gplx/core/html/parsers/Xob_html_tkn.java b/400_xowa/src/gplx/core/html/parsers/Xob_html_tkn.java
index ac7267ae9..b38704e84 100644
--- a/400_xowa/src/gplx/core/html/parsers/Xob_html_tkn.java
+++ b/400_xowa/src/gplx/core/html/parsers/Xob_html_tkn.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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();
diff --git a/400_xowa/src/gplx/core/json/Json_wtr.java b/400_xowa/src/gplx/core/json/Json_wtr.java
index 6e6c26288..05e794436 100644
--- a/400_xowa/src/gplx/core/json/Json_wtr.java
+++ b/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 .
*/
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) {
diff --git a/400_xowa/src_121_wiki_data/gplx/xowa/Xobl_data_itm.java b/400_xowa/src/gplx/core/net/Gfo_inet_conn.java
similarity index 78%
rename from 400_xowa/src_121_wiki_data/gplx/xowa/Xobl_data_itm.java
rename to 400_xowa/src/gplx/core/net/Gfo_inet_conn.java
index 802e5728f..3af2df8c8 100644
--- a/400_xowa/src_121_wiki_data/gplx/xowa/Xobl_data_itm.java
+++ b/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 .
*/
-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);
}
diff --git a/400_xowa/src/gplx/core/net/Gfo_inet_conn_.java b/400_xowa/src/gplx/core/net/Gfo_inet_conn_.java
new file mode 100644
index 000000000..a1c017678
--- /dev/null
+++ b/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 .
+*/
+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);}
+}
diff --git a/400_xowa/src_060_utl/gplx/Bry_ary.java b/400_xowa/src/gplx/core/primitives/Bry_ary.java
similarity index 94%
rename from 400_xowa/src_060_utl/gplx/Bry_ary.java
rename to 400_xowa/src/gplx/core/primitives/Bry_ary.java
index 6f16d2af9..ae2ca8363 100644
--- a/400_xowa/src_060_utl/gplx/Bry_ary.java
+++ b/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 .
*/
-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) {
diff --git a/400_xowa/src_060_utl/gplx/Bry_cache.java b/400_xowa/src/gplx/core/primitives/Bry_cache.java
similarity index 93%
rename from 400_xowa/src_060_utl/gplx/Bry_cache.java
rename to 400_xowa/src/gplx/core/primitives/Bry_cache.java
index 2d23b6c03..8de98734c 100644
--- a/400_xowa/src_060_utl/gplx/Bry_cache.java
+++ b/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 .
*/
-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) {
diff --git a/400_xowa/src_060_utl/gplx/Int_2_ref.java b/400_xowa/src/gplx/core/primitives/Int_2_ref.java
similarity index 95%
rename from 400_xowa/src_060_utl/gplx/Int_2_ref.java
rename to 400_xowa/src/gplx/core/primitives/Int_2_ref.java
index a2e2381a5..69077ef0f 100644
--- a/400_xowa/src_060_utl/gplx/Int_2_ref.java
+++ b/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 .
*/
-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);}
diff --git a/400_xowa/src_060_utl/gplx/Int_2_val.java b/400_xowa/src/gplx/core/primitives/Int_2_val.java
similarity index 94%
rename from 400_xowa/src_060_utl/gplx/Int_2_val.java
rename to 400_xowa/src/gplx/core/primitives/Int_2_val.java
index f70e56ce2..604cd1f76 100644
--- a/400_xowa/src_060_utl/gplx/Int_2_val.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src_060_utl/gplx/Int_ary.java b/400_xowa/src/gplx/core/primitives/Int_ary.java
similarity index 73%
rename from 400_xowa/src_060_utl/gplx/Int_ary.java
rename to 400_xowa/src/gplx/core/primitives/Int_ary.java
index d9ae4a9c0..dec9c2e66 100644
--- a/400_xowa/src_060_utl/gplx/Int_ary.java
+++ b/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 .
*/
-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;
}
diff --git a/400_xowa/src_060_utl/gplx/Int_ary_parser.java b/400_xowa/src/gplx/core/primitives/Int_ary_parser.java
similarity index 94%
rename from 400_xowa/src_060_utl/gplx/Int_ary_parser.java
rename to 400_xowa/src/gplx/core/primitives/Int_ary_parser.java
index 6244d8de1..a033286c2 100644
--- a/400_xowa/src_060_utl/gplx/Int_ary_parser.java
+++ b/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 .
*/
-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);}
diff --git a/400_xowa/src_060_utl/gplx/Int_ary_parser_tst.java b/400_xowa/src/gplx/core/primitives/Int_ary_parser_tst.java
similarity index 93%
rename from 400_xowa/src_060_utl/gplx/Int_ary_parser_tst.java
rename to 400_xowa/src/gplx/core/primitives/Int_ary_parser_tst.java
index b20eb60f9..5baffcff9 100644
--- a/400_xowa/src_060_utl/gplx/Int_ary_parser_tst.java
+++ b/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 .
*/
-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));}
diff --git a/400_xowa/src_060_utl/gplx/Int_list.java b/400_xowa/src/gplx/core/primitives/Int_list.java
similarity index 93%
rename from 400_xowa/src_060_utl/gplx/Int_list.java
rename to 400_xowa/src/gplx/core/primitives/Int_list.java
index 1af56e28f..90108ac19 100644
--- a/400_xowa/src_060_utl/gplx/Int_list.java
+++ b/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 .
*/
-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) {
diff --git a/400_xowa/src_040_io/gplx/ios/BinaryHeap_Io_line_rdr.java b/400_xowa/src/gplx/ios/BinaryHeap_Io_line_rdr.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/BinaryHeap_Io_line_rdr.java
rename to 400_xowa/src/gplx/ios/BinaryHeap_Io_line_rdr.java
diff --git a/400_xowa/src_040_io/gplx/ios/BinaryHeap_Io_line_rdr_tst.java b/400_xowa/src/gplx/ios/BinaryHeap_Io_line_rdr_tst.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/BinaryHeap_Io_line_rdr_tst.java
rename to 400_xowa/src/gplx/ios/BinaryHeap_Io_line_rdr_tst.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_buffer_rdr.java b/400_xowa/src/gplx/ios/Io_buffer_rdr.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_buffer_rdr.java
rename to 400_xowa/src/gplx/ios/Io_buffer_rdr.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_buffer_rdr_tst.java b/400_xowa/src/gplx/ios/Io_buffer_rdr_tst.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_buffer_rdr_tst.java
rename to 400_xowa/src/gplx/ios/Io_buffer_rdr_tst.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_fil_chkr.java b/400_xowa/src/gplx/ios/Io_fil_chkr.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_fil_chkr.java
rename to 400_xowa/src/gplx/ios/Io_fil_chkr.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_line_rdr.java b/400_xowa/src/gplx/ios/Io_line_rdr.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_line_rdr.java
rename to 400_xowa/src/gplx/ios/Io_line_rdr.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_line_rdr_key_gen.java b/400_xowa/src/gplx/ios/Io_line_rdr_key_gen.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_line_rdr_key_gen.java
rename to 400_xowa/src/gplx/ios/Io_line_rdr_key_gen.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_line_rdr_key_gen_.java b/400_xowa/src/gplx/ios/Io_line_rdr_key_gen_.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_line_rdr_key_gen_.java
rename to 400_xowa/src/gplx/ios/Io_line_rdr_key_gen_.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_line_rdr_tst.java b/400_xowa/src/gplx/ios/Io_line_rdr_tst.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_line_rdr_tst.java
rename to 400_xowa/src/gplx/ios/Io_line_rdr_tst.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_make_cmd.java b/400_xowa/src/gplx/ios/Io_make_cmd.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_make_cmd.java
rename to 400_xowa/src/gplx/ios/Io_make_cmd.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort.java b/400_xowa/src/gplx/ios/Io_sort.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort.java
rename to 400_xowa/src/gplx/ios/Io_sort.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_cmd.java b/400_xowa/src/gplx/ios/Io_sort_cmd.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_cmd.java
rename to 400_xowa/src/gplx/ios/Io_sort_cmd.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_filCmd.java b/400_xowa/src/gplx/ios/Io_sort_filCmd.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_filCmd.java
rename to 400_xowa/src/gplx/ios/Io_sort_filCmd.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_fil_basic.java b/400_xowa/src/gplx/ios/Io_sort_fil_basic.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_fil_basic.java
rename to 400_xowa/src/gplx/ios/Io_sort_fil_basic.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_misc_tst.java b/400_xowa/src/gplx/ios/Io_sort_misc_tst.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_misc_tst.java
rename to 400_xowa/src/gplx/ios/Io_sort_misc_tst.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_split_itm.java b/400_xowa/src/gplx/ios/Io_sort_split_itm.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_split_itm.java
rename to 400_xowa/src/gplx/ios/Io_sort_split_itm.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_split_itm_sorter.java b/400_xowa/src/gplx/ios/Io_sort_split_itm_sorter.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_split_itm_sorter.java
rename to 400_xowa/src/gplx/ios/Io_sort_split_itm_sorter.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_sort_tst.java b/400_xowa/src/gplx/ios/Io_sort_tst.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_sort_tst.java
rename to 400_xowa/src/gplx/ios/Io_sort_tst.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_url_gen.java b/400_xowa/src/gplx/ios/Io_url_gen.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_url_gen.java
rename to 400_xowa/src/gplx/ios/Io_url_gen.java
diff --git a/400_xowa/src_040_io/gplx/ios/Io_url_gen_.java b/400_xowa/src/gplx/ios/Io_url_gen_.java
similarity index 100%
rename from 400_xowa/src_040_io/gplx/ios/Io_url_gen_.java
rename to 400_xowa/src/gplx/ios/Io_url_gen_.java
diff --git a/400_xowa/src_060_utl/gplx/Io_zip_mgr.java b/400_xowa/src/gplx/ios/Io_zip_mgr.java
similarity index 96%
rename from 400_xowa/src_060_utl/gplx/Io_zip_mgr.java
rename to 400_xowa/src/gplx/ios/Io_zip_mgr.java
index db8f1c71b..84646a41d 100644
--- a/400_xowa/src_060_utl/gplx/Io_zip_mgr.java
+++ b/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 .
*/
-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);
diff --git a/400_xowa/src_060_utl/gplx/Io_zip_mgr_base.java b/400_xowa/src/gplx/ios/Io_zip_mgr_base.java
similarity index 97%
rename from 400_xowa/src_060_utl/gplx/Io_zip_mgr_base.java
rename to 400_xowa/src/gplx/ios/Io_zip_mgr_base.java
index b69cc065c..1517e8c9f 100644
--- a/400_xowa/src_060_utl/gplx/Io_zip_mgr_base.java
+++ b/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 .
*/
-package gplx;
+package gplx.ios; import gplx.*;
import java.io.*;
import java.util.zip.*;
public class Io_zip_mgr_base implements Io_zip_mgr {
diff --git a/400_xowa/src_060_utl/gplx/Io_zip_mgr_mok.java b/400_xowa/src/gplx/ios/Io_zip_mgr_mok.java
similarity index 97%
rename from 400_xowa/src_060_utl/gplx/Io_zip_mgr_mok.java
rename to 400_xowa/src/gplx/ios/Io_zip_mgr_mok.java
index 8c22a20a9..375551371 100644
--- a/400_xowa/src_060_utl/gplx/Io_zip_mgr_mok.java
+++ b/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 .
*/
-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);
diff --git a/400_xowa/src_060_utl/gplx/Io_zip_mgr_tst.java b/400_xowa/src/gplx/ios/Io_zip_mgr_tst.java
similarity index 95%
rename from 400_xowa/src_060_utl/gplx/Io_zip_mgr_tst.java
rename to 400_xowa/src/gplx/ios/Io_zip_mgr_tst.java
index ca06f712b..beb64b255 100644
--- a/400_xowa/src_060_utl/gplx/Io_zip_mgr_tst.java
+++ b/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 .
*/
-package gplx;
+package gplx.ios; import gplx.*;
import org.junit.*;
public class Io_zip_mgr_tst {
@Test public void Zip_unzip() {
diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java
index c7ff20d3b..24b0de4d4 100644
--- a/400_xowa/src/gplx/xowa/Xoa_app_.java
+++ b/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 = "";
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoa_page.java b/400_xowa/src/gplx/xowa/Xoa_page.java
similarity index 96%
rename from 400_xowa/src_300_html/gplx/xowa/Xoa_page.java
rename to 400_xowa/src/gplx/xowa/Xoa_page.java
index a644a11a7..86328a214 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoa_page.java
+++ b/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 .
*/
package gplx.xowa; import gplx.*;
+import gplx.xowa.pages.*;
public interface Xoa_page {
Xow_wiki Wiki();
Xoa_url Url();
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoa_page_.java b/400_xowa/src/gplx/xowa/Xoa_page_.java
similarity index 100%
rename from 400_xowa/src_300_html/gplx/xowa/Xoa_page_.java
rename to 400_xowa/src/gplx/xowa/Xoa_page_.java
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java b/400_xowa/src/gplx/xowa/Xoa_ttl.java
similarity index 97%
rename from 400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java
rename to 400_xowa/src/gplx/xowa/Xoa_ttl.java
index 3b22d1dc8..78d23c808 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xoa_ttl.java
+++ b/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 .
*/
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;
diff --git a/400_xowa/src/gplx/xowa/Xoae_app.java b/400_xowa/src/gplx/xowa/Xoae_app.java
index c5ac4dcff..f17a55d36 100644
--- a/400_xowa/src/gplx/xowa/Xoae_app.java
+++ b/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();
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoae_page.java b/400_xowa/src/gplx/xowa/Xoae_page.java
similarity index 98%
rename from 400_xowa/src_300_html/gplx/xowa/Xoae_page.java
rename to 400_xowa/src/gplx/xowa/Xoae_page.java
index d61744225..a45347744 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoae_page.java
+++ b/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;
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_fxt.java b/400_xowa/src/gplx/xowa/Xop_fxt.java
similarity index 91%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_fxt.java
rename to 400_xowa/src/gplx/xowa/Xop_fxt.java
index 4a58b8afa..85afc13d6 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_fxt.java
+++ b/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 .
*/
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));
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoa_app_eval.java b/400_xowa/src/gplx/xowa/apps/Xoa_app_eval.java
similarity index 93%
rename from 400_xowa/src_300_html/gplx/xowa/Xoa_app_eval.java
rename to 400_xowa/src/gplx/xowa/apps/Xoa_app_eval.java
index 2b25b8481..c742d08f7 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoa_app_eval.java
+++ b/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 .
*/
-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) {
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoa_app_eval_tst.java b/400_xowa/src/gplx/xowa/apps/Xoa_app_eval_tst.java
similarity index 94%
rename from 400_xowa/src_300_html/gplx/xowa/Xoa_app_eval_tst.java
rename to 400_xowa/src/gplx/xowa/apps/Xoa_app_eval_tst.java
index 05b52cdcf..5e8a38f53 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoa_app_eval_tst.java
+++ b/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 .
*/
-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 {
diff --git a/400_xowa/src_100_app/gplx/xowa/Xoa_cur.java b/400_xowa/src/gplx/xowa/apps/Xoa_cur.java
similarity index 95%
rename from 400_xowa/src_100_app/gplx/xowa/Xoa_cur.java
rename to 400_xowa/src/gplx/xowa/apps/Xoa_cur.java
index 8f2af11b4..aa7d8ad46 100644
--- a/400_xowa/src_100_app/gplx/xowa/Xoa_cur.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src_100_app/gplx/xowa/Xoa_sys_cfg.java b/400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java
similarity index 97%
rename from 400_xowa/src_100_app/gplx/xowa/Xoa_sys_cfg.java
rename to 400_xowa/src/gplx/xowa/apps/Xoa_sys_cfg.java
index 0d4b90006..0fce72dab 100644
--- a/400_xowa/src_100_app/gplx/xowa/Xoa_sys_cfg.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src_100_app/gplx/xowa/Xoac_lang_grp.java b/400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_grp.java
similarity index 95%
rename from 400_xowa/src_100_app/gplx/xowa/Xoac_lang_grp.java
rename to 400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_grp.java
index 7b65d0532..9037180ef 100644
--- a/400_xowa/src_100_app/gplx/xowa/Xoac_lang_grp.java
+++ b/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 .
*/
-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;}
diff --git a/400_xowa/src_100_app/gplx/xowa/Xoac_lang_grp_tst.java b/400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_grp_tst.java
similarity index 96%
rename from 400_xowa/src_100_app/gplx/xowa/Xoac_lang_grp_tst.java
rename to 400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_grp_tst.java
index cbd10bba6..1b6865a3e 100644
--- a/400_xowa/src_100_app/gplx/xowa/Xoac_lang_grp_tst.java
+++ b/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 .
*/
-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();
diff --git a/400_xowa/src_100_app/gplx/xowa/Xoac_lang_itm.java b/400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_itm.java
similarity index 95%
rename from 400_xowa/src_100_app/gplx/xowa/Xoac_lang_itm.java
rename to 400_xowa/src/gplx/xowa/apps/langs/Xoac_lang_itm.java
index e732a7d4b..55bae7375 100644
--- a/400_xowa/src_100_app/gplx/xowa/Xoac_lang_itm.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src/gplx/xowa/apps/metas/Xoa_meta_mgr.java b/400_xowa/src/gplx/xowa/apps/metas/Xoa_meta_mgr.java
index 623bcfce7..b6edc6e41 100644
--- a/400_xowa/src/gplx/xowa/apps/metas/Xoa_meta_mgr.java
+++ b/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 .
*/
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;
}
diff --git a/400_xowa/src/gplx/xowa/apps/metas/Xoa_ns_mgr.java b/400_xowa/src/gplx/xowa/apps/metas/Xoa_ns_mgr.java
deleted file mode 100644
index f457c8cd9..000000000
--- a/400_xowa/src/gplx/xowa/apps/metas/Xoa_ns_mgr.java
+++ /dev/null
@@ -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 .
-*/
-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;
- }
-}
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Xob_sql_dump_base.java b/400_xowa/src/gplx/xowa/bldrs/Xob_sql_dump_base.java
similarity index 92%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Xob_sql_dump_base.java
rename to 400_xowa/src/gplx/xowa/bldrs/Xob_sql_dump_base.java
index 6cfa028e7..52dab3e67 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Xob_sql_dump_base.java
+++ b/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 .
*/
-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();
diff --git a/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr.java b/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr.java
index 346ae0141..e8e89a9c4 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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() {
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 03e12e0b2..0bd826806 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
@@ -18,6 +18,7 @@ along with this program. If not, see .
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) {
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_base.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_base.java
index 101f57f51..65a5c7e9f 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_base.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_base.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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);
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql.java
index 06a6b5565..43a4eeb65 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql.java
+++ b/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 .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql_make.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql_make.java
index cb15a0610..b91b24f96 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql_make.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_sql_make.java
@@ -17,7 +17,7 @@ along with this program. If not, see .
*/
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;
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_txt.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_txt.java
index 2c7e3675e..ea4f404b4 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_txt.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xob_categorylinks_txt.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_base.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_base.java
index a64b2556a..ef1918fdb 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_base.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_base.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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";}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_sql.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_sql.java
index ef5d456f3..c9c0cd8b8 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_sql.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_sql.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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;
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_txt.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_txt.java
index e1252554a..a6bb81f91 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_txt.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_hiddencat_parser_txt.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java
index 7a4d4767c..c67c88e5a 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java
+++ b/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();
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_regy_update_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_regy_update_cmd.java
index f6fcf6d55..aca45a44d 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_regy_update_cmd.java
+++ b/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();
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_cmd_orig.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_cmd_orig.java
index 76d035c3d..f6ef05e3d 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_cmd_orig.java
+++ b/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 .
*/
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);}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm.java
index 5bda0d11e..302befe25 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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;
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm_tst.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm_tst.java
index 6c2957710..ab4cc9b3e 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_xfer_temp_itm_tst.java
+++ b/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 .
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();}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_cmd.java
index 559b106fe..6af5e726b 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_cmd.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_page_cmd.java
@@ -18,7 +18,8 @@ along with this program. If not, see .
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;
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java
index 92043b389..1820ee37c 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java
+++ b/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 .
*/
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;
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_calc_stats_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_calc_stats_cmd.java
index 1bd244926..ea84d5257 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_calc_stats_cmd.java
+++ b/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 .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_page_txt.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_page_txt.java
index f71dea021..1f98540a1 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_page_txt.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/tdbs/Xob_page_txt.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java
index e37e2e31f..a5cc2db60 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java
+++ b/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 .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_image_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_image_cmd.java
index 1a504635a..549c44a90 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_image_cmd.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_image_cmd.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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();
diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_redirect_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_redirect_cmd.java
index 6b5deb0f1..d96bd808a 100644
--- a/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_redirect_cmd.java
+++ b/400_xowa/src/gplx/xowa/bldrs/cmds/wikis/Xob_redirect_cmd.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
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;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_base.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_base.java
similarity index 96%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_base.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_base.java
index 3ec8c5521..1f2da6bfa 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_base.java
+++ b/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 .
*/
-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.*;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_dumpfile.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_dumpfile.java
similarity index 94%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_dumpfile.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_dumpfile.java
index 0152fe96f..9e533eb32 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_dumpfile.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_dumpfile_tst.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_dumpfile_tst.java
similarity index 95%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_dumpfile_tst.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_dumpfile_tst.java
index 3ca75decb..c0d551006 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_dumpfile_tst.java
+++ b/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 .
*/
-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();
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_imageMagick_download.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_imageMagick_download.java
similarity index 96%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_imageMagick_download.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_imageMagick_download.java
index 395e11d91..a971be19b 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_imageMagick_download.java
+++ b/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 .
*/
-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");
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_mgr.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java
similarity index 97%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_mgr.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_mgr.java
index 5e46e9d06..1ecf50b9c 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_mgr.java
+++ b/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 .
*/
-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_();
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_download.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_download.java
similarity index 95%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_download.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_download.java
index d8d963a1a..55d030168 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_download.java
+++ b/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 .
*/
-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.*;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_goto_page.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_goto_page.java
similarity index 93%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_goto_page.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_goto_page.java
index 3af1a1ab6..20007bda1 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_goto_page.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_image_cfg.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_image_cfg.java
similarity index 92%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_image_cfg.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_image_cfg.java
index 688e4182e..92e0cbdd7 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_image_cfg.java
+++ b/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 .
*/
-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() {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_import.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java
similarity index 97%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_import.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_import.java
index c3c41dcc8..73ea69971 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_import.java
+++ b/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 .
*/
-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 {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_tst.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java
similarity index 96%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_tst.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_tst.java
index 23a095d07..da1ec2f83 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_tst.java
+++ b/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 .
*/
-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.*;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_unzip.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_unzip.java
similarity index 95%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_unzip.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_unzip.java
index dbb4235fa..f4f68bc96 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_unzip.java
+++ b/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 .
*/
-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";
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_zip.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_zip.java
similarity index 96%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_zip.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_cmd_wiki_zip.java
index 56ce6515f..0927598cb 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_cmd_wiki_zip.java
+++ b/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 .
*/
-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 {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_dump_mgr.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java
similarity index 97%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_dump_mgr.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_dump_mgr.java
index 52d68b05c..04106e554 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_dump_mgr.java
+++ b/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 .
*/
-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 {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_mirror_parser.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_mirror_parser.java
similarity index 94%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_mirror_parser.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_mirror_parser.java
index 7e4ad993c..867ddbbeb 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_mirror_parser.java
+++ b/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 .
*/
-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;
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_mirror_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_mirror_parser_tst.java
similarity index 95%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_mirror_parser_tst.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_mirror_parser_tst.java
index 9e9637665..4a9528b0f 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_mirror_parser_tst.java
+++ b/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 .
*/
-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() {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xoi_setup_mgr.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xoi_setup_mgr.java
similarity index 94%
rename from 400_xowa/src_240_install/gplx/xowa/Xoi_setup_mgr.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xoi_setup_mgr.java
index 0a04e5a63..16449c6dc 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xoi_setup_mgr.java
+++ b/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 .
*/
-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 {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xow_cfg_wiki_core.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xow_cfg_wiki_core.java
similarity index 95%
rename from 400_xowa/src_240_install/gplx/xowa/Xow_cfg_wiki_core.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xow_cfg_wiki_core.java
index d5a47fea0..79c5181c9 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xow_cfg_wiki_core.java
+++ b/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 .
*/
-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() {
diff --git a/400_xowa/src_240_install/gplx/xowa/Xow_cfg_wiki_core_tst.java b/400_xowa/src/gplx/xowa/bldrs/installs/Xow_cfg_wiki_core_tst.java
similarity index 95%
rename from 400_xowa/src_240_install/gplx/xowa/Xow_cfg_wiki_core_tst.java
rename to 400_xowa/src/gplx/xowa/bldrs/installs/Xow_cfg_wiki_core_tst.java
index cad12ce0a..c8732276e 100644
--- a/400_xowa/src_240_install/gplx/xowa/Xow_cfg_wiki_core_tst.java
+++ b/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 .
*/
-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();
diff --git a/400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang.java b/400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang.java
index e235d5fc6..4983562bb 100644
--- a/400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang.java
+++ b/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 .
*/
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) {
diff --git a/400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang_kwds.java b/400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang_kwds.java
index 523f3f78f..27a7eb605 100644
--- a/400_xowa/src/gplx/xowa/bldrs/langs/Xobc_utl_make_lang_kwds.java
+++ b/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 .
*/
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;}
diff --git a/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser_tst.java
index dbcb343d3..b104820cd 100644
--- a/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser_tst.java
+++ b/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser_tst.java
@@ -17,7 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.bldrs.langs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
import org.junit.*;
-import gplx.intl.*;
+import gplx.intl.*; import gplx.xowa.parsers.lnkis.*;
public class Xol_mw_lang_parser_tst {
@Before public void init() {fxt.Clear();} private Xol_mw_lang_parser_fxt fxt = new Xol_mw_lang_parser_fxt();
@Test public void Core_keywords() {
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser.java b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser.java
similarity index 96%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser.java
rename to 400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser.java
index db0a2a008..fcbcb6dee 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser.java
+++ b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
import gplx.core.flds.*; import gplx.ios.*;
public class Sql_file_parser {
public Io_url Src_fil() {return src_fil;} public Sql_file_parser Src_fil_(Io_url v) {src_fil = v; return this;} Io_url src_fil;
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_cmd.java b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_cmd.java
similarity index 93%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_cmd.java
rename to 400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_cmd.java
index 625b4e87d..5c9f3b3bb 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_cmd.java
+++ b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_cmd.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
import gplx.core.strings.*;
public interface Sql_file_parser_cmd {
void Exec(byte[] src, byte[] fld_key, int fld_idx, int fld_bgn, int fld_end, Bry_bfr file_bfr, Sql_file_parser_data data);
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_data.java b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_data.java
similarity index 91%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_data.java
rename to 400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_data.java
index 6f5348935..53f56243c 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_data.java
+++ b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_data.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
public class Sql_file_parser_data {
public boolean Cancel_row() {return cancel_row;}
public Sql_file_parser_data Cancel_row_n_() {cancel_row = false; return this;}
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_tst.java
similarity index 95%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_tst.java
rename to 400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_tst.java
index 94bd4e351..d3c0969e4 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_file_parser_tst.java
+++ b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_file_parser_tst.java
@@ -15,9 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import org.junit.*;
-import gplx.ios.*;
+package gplx.xowa.bldrs.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
+import org.junit.*; import gplx.ios.*;
public class Sql_file_parser_tst {
Sql_file_parser_fxt fxt = new Sql_file_parser_fxt();
@Before public void init() {fxt.Clear();}
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_fld_mgr.java b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_fld_mgr.java
similarity index 95%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Sql_fld_mgr.java
rename to 400_xowa/src/gplx/xowa/bldrs/sqls/Sql_fld_mgr.java
index 61c24658d..2c228fc62 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_fld_mgr.java
+++ b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_fld_mgr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
import gplx.ios.*;
class Sql_fld_mgr {
public int Count() {return hash.Count();}
diff --git a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_fld_mgr_tst.java b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_fld_mgr_tst.java
similarity index 92%
rename from 400_xowa/src_210_bldr_core/gplx/xowa/Sql_fld_mgr_tst.java
rename to 400_xowa/src/gplx/xowa/bldrs/sqls/Sql_fld_mgr_tst.java
index 18fce5430..90609116f 100644
--- a/400_xowa/src_210_bldr_core/gplx/xowa/Sql_fld_mgr_tst.java
+++ b/400_xowa/src/gplx/xowa/bldrs/sqls/Sql_fld_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.bldrs.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*;
import org.junit.*;
public class Sql_fld_mgr_tst {
Sql_fld_mgr_fxt fxt = new Sql_fld_mgr_fxt();
diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java
index 784af6bd8..4c3bc8e44 100644
--- a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java
+++ b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java
@@ -16,7 +16,9 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.dbs; import gplx.*; import gplx.xowa.*;
-import gplx.core.primitives.*; import gplx.core.brys.*; import gplx.core.flds.*; import gplx.xowa.bldrs.cmds.ctgs.*; import gplx.xowa.ctgs.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa.specials.search.*; import gplx.xowa.tdbs.*;
+import gplx.core.primitives.*; import gplx.core.brys.*; import gplx.core.flds.*; import gplx.xowa.bldrs.cmds.ctgs.*; import gplx.xowa.ctgs.*; import gplx.xowa.specials.search.*;
+import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.tdbs.*; import gplx.xowa.tdbs.hives.*;
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();
diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_page_rdr__tdb.java b/400_xowa/src/gplx/xowa/dbs/Xodb_page_rdr__tdb.java
index 5bb84eb46..60a0eb065 100644
--- a/400_xowa/src/gplx/xowa/dbs/Xodb_page_rdr__tdb.java
+++ b/400_xowa/src/gplx/xowa/dbs/Xodb_page_rdr__tdb.java
@@ -16,8 +16,9 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.dbs; import gplx.*; import gplx.xowa.*;
-import gplx.ios.*; import gplx.xowa.tdbs.*;
+import gplx.ios.*;
import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.tdbs.*; import gplx.xowa.tdbs.hives.*;
public class Xodb_page_rdr__tdb implements Xodb_page_rdr {
private final Xow_ns_mgr ns_mgr; private final Xotdb_fsys_mgr fsys_mgr;
private int cur_ns_ord = -1; private Xow_ns cur_ns; private Io_url[] cur_file_ary; private Io_url cur_file; private int cur_file_idx = -1;
diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_save_mgr_txt.java b/400_xowa/src/gplx/xowa/dbs/Xodb_save_mgr_txt.java
index bf1648471..0e8e97944 100644
--- a/400_xowa/src/gplx/xowa/dbs/Xodb_save_mgr_txt.java
+++ b/400_xowa/src/gplx/xowa/dbs/Xodb_save_mgr_txt.java
@@ -16,7 +16,9 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.dbs; import gplx.*; import gplx.xowa.*;
-import gplx.xowa.wikis.domains.*; import gplx.xowa.tdbs.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.wikis.domains.*; import gplx.xowa.wikis.data.tbls.*;
+import gplx.xowa.parsers.utils.*;
+import gplx.xowa.tdbs.*; import gplx.xowa.tdbs.hives.*;
public class Xodb_save_mgr_txt implements Xodb_save_mgr {
public Xodb_save_mgr_txt(Xowe_wiki wiki, Xodb_load_mgr_txt load_mgr) {
this.wiki = wiki;
@@ -108,3 +110,12 @@ public class Xodb_save_mgr_txt implements Xodb_save_mgr {
private Xowd_page_itm tmp_page = new Xowd_page_itm();
public static final int File_idx_unknown = -1;
}
+class Bry_comparer_fld_last implements gplx.lists.ComparerAble {
+ public int compare(Object lhsObj, Object rhsObj) {
+ byte[] lhs = (byte[])lhsObj, rhs = (byte[])rhsObj;
+ int lhs_bgn = Bry_finder.Find_bwd(lhs, Byte_ascii.Pipe); if (lhs_bgn == Bry_.NotFound) lhs_bgn = -1;
+ int rhs_bgn = Bry_finder.Find_bwd(rhs, Byte_ascii.Pipe); if (rhs_bgn == Bry_.NotFound) rhs_bgn = -1;
+ return Bry_.Compare(lhs, lhs_bgn + 1, lhs.length, rhs, rhs_bgn + 1, rhs.length);
+ }
+ public static final Bry_comparer_fld_last _ = new Bry_comparer_fld_last();
+}
diff --git a/400_xowa/src_160_file/gplx/xowa/Xoa_repo_mgr.java b/400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java
similarity index 96%
rename from 400_xowa/src_160_file/gplx/xowa/Xoa_repo_mgr.java
rename to 400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java
index 4262580f4..155aeb21f 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xoa_repo_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/Xoa_repo_mgr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
import gplx.xowa.apps.fsys.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.repos.*;
public class Xoa_repo_mgr implements GfoInvkAble {
private final Xoa_fsys_mgr app_fsys; private final Xof_rule_mgr ext_rule_mgr;
diff --git a/400_xowa/src_160_file/gplx/xowa/Xof_cfg_download.java b/400_xowa/src/gplx/xowa/files/Xof_cfg_download.java
similarity index 96%
rename from 400_xowa/src_160_file/gplx/xowa/Xof_cfg_download.java
rename to 400_xowa/src/gplx/xowa/files/Xof_cfg_download.java
index d74d1f796..fcf6dc0e1 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xof_cfg_download.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_cfg_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
public class Xof_cfg_download implements GfoInvkAble {
public Xof_cfg_download() {
this.enabled = true; // CFG: set to false b/c some tests only do parsing [[File:A.png]] and repos are not set up
diff --git a/400_xowa/src_160_file/gplx/xowa/Xof_file_mgr.java b/400_xowa/src/gplx/xowa/files/Xof_file_mgr.java
similarity index 96%
rename from 400_xowa/src_160_file/gplx/xowa/Xof_file_mgr.java
rename to 400_xowa/src/gplx/xowa/files/Xof_file_mgr.java
index cbec10cc3..9dfcb99bf 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xof_file_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_file_mgr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
import gplx.dbs.*; import gplx.xowa2.files.commons.*; import gplx.xowa.xtns.math.*;
import gplx.xowa.wmfs.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.caches.*; import gplx.xowa.files.imgs.*;
public class Xof_file_mgr implements GfoInvkAble {
diff --git a/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java b/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java
index 06eabdbdf..fc519ea0f 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
import gplx.ios.*;
import gplx.xowa.files.gui.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xof_fsdb_itm implements Xof_file_itm {
private int lnki_upright_patch;
public byte[] Lnki_wiki_abrv() {return lnki_wiki_abrv;} private byte[] lnki_wiki_abrv;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm_fxt.java b/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm_fxt.java
index cce654800..66ea860d9 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm_fxt.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_fsdb_itm_fxt.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
import gplx.xowa.wikis.domains.*;
import gplx.xowa.files.repos.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xof_fsdb_itm_fxt {
private byte[] wiki_abrv;
private byte[] lnki_ttl;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_img_size.java b/400_xowa/src/gplx/xowa/files/Xof_img_size.java
index 3d964e3a7..d329ed6fd 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_img_size.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_img_size.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 .
*/
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xof_img_size {
public int Html_w() {return html_w;} private int html_w;
public int Html_h() {return html_h;} private int html_h;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java b/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java
index 52aee3897..1ff239380 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
-import org.junit.*; import gplx.xowa.files.*;
+import org.junit.*; import gplx.xowa.files.*; import gplx.xowa.parsers.lnkis.*;
public class Xof_img_size_tst {
private final Xof_img_size_fxt fxt = new Xof_img_size_fxt();
@Before public void init() {
diff --git a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java
index 2855e7755..10b318daa 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm.java
@@ -16,7 +16,10 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
+import gplx.core.primitives.*;
import gplx.xowa.files.gui.*; import gplx.xowa.files.repos.*;
+import gplx.xowa.tdbs.metas.*;
+import gplx.xowa.parsers.utils.*;
public class Xof_xfer_itm implements Xof_file_itm {
public Xof_xfer_itm() {
lnki_type = orig_repo_id = Byte_.Max_value_127;
diff --git a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_.java b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_.java
index 641751214..b2b3810bc 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_.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 .
*/
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
-import gplx.gfui.*;
+import gplx.core.primitives.*;
+import gplx.gfui.*; import gplx.xowa.parsers.lnkis.*;
public class Xof_xfer_itm_ {
public static void Calc_xfer_size(Int_2_ref rv, byte lnki_type, int thumb_default_w, int file_w, int file_h, int lnki_w, int lnki_h, boolean lnki_thumb, double lnki_upright, Xof_ext ext, int exec_tid) {
boolean ext_is_svg = ext.Id_is_svg();
diff --git a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java
index b9c3d65a5..43f0bc43f 100644
--- a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java
+++ b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java
@@ -16,8 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
-import org.junit.*;
-import gplx.gfui.*; import gplx.xowa.files.*;
+import org.junit.*; import gplx.core.primitives.*; import gplx.gfui.*; import gplx.xowa.files.*; import gplx.xowa.parsers.lnkis.*;
public class Xof_xfer_itm_tst {
@Before public void init() {fxt.ini();} Xof_xfer_itm_fxt fxt = new Xof_xfer_itm_fxt();
@Test public void Box() {tst_Calc_view("40,50" , "40,40" , "40,40");} // EX:[[File:Crystal Clear app kedit.svg|50x40px]]
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 9610d1995..b0c50c3c7 100644
--- a/400_xowa/src/gplx/xowa/files/Xow_file_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/Xow_file_mgr.java
@@ -19,6 +19,7 @@ package gplx.xowa.files; import gplx.*; import gplx.xowa.*;
import gplx.dbs.*; 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.tdbs.metas.*;
public class Xow_file_mgr implements GfoInvkAble {
private Xof_wkr_mgr wkr_mgr;
public Xow_file_mgr(Xowe_wiki wiki) {
diff --git a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_ext__png_tst.java b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_ext__png_tst.java
index a6905eea9..8a3003e8b 100644
--- a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_ext__png_tst.java
+++ b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_ext__png_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.files.fsdb.tsts; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*;
-import org.junit.*;
+import org.junit.*; import gplx.xowa.parsers.lnkis.*;
public class Xof_file_ext__png_tst {
@Before public void init() {fxt.Reset();} private final Xof_file_fxt fxt = new Xof_file_fxt();
@After public void term() {fxt.Rls();}
diff --git a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java
index e2aebfc48..16b12e6d4 100644
--- a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java
+++ b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java
@@ -19,6 +19,7 @@ package gplx.xowa.files.fsdb.tsts; import gplx.*; import gplx.xowa.*; import gpl
import gplx.fsdb.*; import gplx.fsdb.meta.*; import gplx.dbs.*; import gplx.xowa.files.origs.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.cnvs.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.gui.*;
import gplx.xowa.wikis.domains.*; import gplx.xowa.files.repos.*; import gplx.xowa.wikis.data.*;
import gplx.fsdb.data.*;
+import gplx.xowa.parsers.lnkis.*;
class Xof_file_fxt {
private Xoae_app app; private Xof_fsdb_mgr__sql fsdb_mgr; private Xowe_wiki wiki; private Xof_orig_mgr orig_mgr;
private final Fsd_thm_itm tmp_thm = Fsd_thm_itm.new_(); private final Fsd_img_itm tmp_img = new Fsd_img_itm();
diff --git a/400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java b/400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java
index 7a9190ef9..c05f3ab79 100644
--- a/400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/gui/Js_img_mgr.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.files.gui; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
import gplx.xowa.xtns.gallery.*;
import gplx.xowa.files.fsdb.*; import gplx.xowa.gui.views.*;
+import gplx.xowa.parsers.lnkis.*;
public class Js_img_mgr {
public static void Update_img(Xoa_page page, Xog_js_wkr js_wkr, Xof_file_itm itm) {
Js_img_mgr.Update_img(page, js_wkr, itm.Html_img_wkr(), itm.Html_uid(), itm.Lnki_type(), itm.Html_elem_tid(), itm.Html_w(), itm.Html_h(), itm.Html_view_url(), itm.Orig_w(), itm.Orig_h(), itm.Html_orig_url(), itm.Orig_ttl(), itm.Html_gallery_mgr_h());
diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl_tst.java b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl_tst.java
index 6227e0b36..081e7906a 100644
--- a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl_tst.java
+++ b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_tbl_tst.java
@@ -19,6 +19,7 @@ package gplx.xowa.files.origs; import gplx.*; import gplx.xowa.*; import gplx.xo
import org.junit.*;
import gplx.dbs.*; import gplx.xowa.*;
import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xof_orig_tbl_tst {
@Before public void init() {fxt.Clear();} private Xof_orig_tbl_fxt fxt = new Xof_orig_tbl_fxt();
@Test public void Select_in() {
diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__xo_meta.java b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__xo_meta.java
index d37c50618..42580489b 100644
--- a/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__xo_meta.java
+++ b/400_xowa/src/gplx/xowa/files/origs/Xof_orig_wkr__xo_meta.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
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.tdbs.metas.*;
public class Xof_orig_wkr__xo_meta implements Xof_orig_wkr {
private final Io_url wiki_meta_dir; private final byte dir_spr_byte; private final Bry_bfr url_bfr = Bry_bfr.new_(255);
private final Gfo_fld_rdr meta_rdr = Gfo_fld_rdr.xowa_(); private final Xof_meta_thumb_parser parser = new Xof_meta_thumb_parser();
diff --git a/400_xowa/src_160_file/gplx/xowa/Xofw_file_finder_rslt.java b/400_xowa/src/gplx/xowa/files/repos/Xofw_file_finder_rslt.java
similarity index 90%
rename from 400_xowa/src_160_file/gplx/xowa/Xofw_file_finder_rslt.java
rename to 400_xowa/src/gplx/xowa/files/repos/Xofw_file_finder_rslt.java
index 627de3d87..9d1ee2a99 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xofw_file_finder_rslt.java
+++ b/400_xowa/src/gplx/xowa/files/repos/Xofw_file_finder_rslt.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.files.repos; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
+import gplx.xowa.parsers.utils.*;
public class Xofw_file_finder_rslt {
public byte[] Ttl() {return ttl;} private byte[] ttl;
public byte[] Redirect() {return redirect;} private byte[] redirect;
diff --git a/400_xowa/src_160_file/gplx/xowa/Xofw_wiki_finder.java b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_finder.java
similarity index 90%
rename from 400_xowa/src_160_file/gplx/xowa/Xofw_wiki_finder.java
rename to 400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_finder.java
index 4f777a600..34b56810d 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xofw_wiki_finder.java
+++ b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_finder.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.files.repos; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
import gplx.xowa.wikis.*; import gplx.xowa.files.*; import gplx.xowa.files.repos.*;
public interface Xofw_wiki_finder {
void Find(List_adp repo_pairs, Xof_xfer_itm file);
diff --git a/400_xowa/src_160_file/gplx/xowa/Xofw_wiki_wkr_base.java b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_base.java
similarity index 95%
rename from 400_xowa/src_160_file/gplx/xowa/Xofw_wiki_wkr_base.java
rename to 400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_base.java
index eeedab30d..37a44461c 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xofw_wiki_wkr_base.java
+++ b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.files.repos; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
import gplx.xowa.wikis.*; import gplx.xowa.files.*; import gplx.xowa.files.repos.*; 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) {
diff --git a/400_xowa/src_160_file/gplx/xowa/Xofw_wiki_wkr_mock.java b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_mock.java
similarity index 92%
rename from 400_xowa/src_160_file/gplx/xowa/Xofw_wiki_wkr_mock.java
rename to 400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_mock.java
index 7623f3f87..89929c607 100644
--- a/400_xowa/src_160_file/gplx/xowa/Xofw_wiki_wkr_mock.java
+++ b/400_xowa/src/gplx/xowa/files/repos/Xofw_wiki_wkr_mock.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import gplx.xowa.files.*;
+package gplx.xowa.files.repos; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
+import gplx.xowa.files.*; import gplx.xowa.tdbs.metas.*;
public class Xofw_wiki_wkr_mock implements Xofw_wiki_finder {
int repo_idx; byte[] repo_wiki_key;
public Xofw_wiki_wkr_mock Clear_en_wiki() {return Clear(1, Bry_en_wiki);}
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 6ccd2f3c0..d87f4a089 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
@@ -18,6 +18,8 @@ along with this program. If not, see .
package gplx.xowa.files.repos; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
import gplx.xowa.files.xfers.*;
import gplx.xowa.wikis.domains.*;
+import gplx.xowa.parsers.utils.*;
+import gplx.xowa.tdbs.metas.*;
public class Xowe_repo_mgr implements Xow_repo_mgr, GfoInvkAble {
private Xowe_wiki wiki; private final List_adp repos = List_adp_.new_();
public Xowe_repo_mgr(Xowe_wiki wiki) {
diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_mgr.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_mgr.java
index 4346ea8b5..31f4b8b7c 100644
--- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_mgr.java
+++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_mgr.java
@@ -19,6 +19,7 @@ package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xo
import gplx.core.primitives.*; import gplx.gfui.*;
import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.exts.*; import gplx.xowa.files.downloads.*;
import gplx.xowa.wmfs.*; import gplx.xowa.wmfs.apis.*;
+import gplx.xowa.tdbs.metas.*;
public class Xof_xfer_mgr {
public Xof_xfer_mgr(Xof_file_mgr file_mgr, Xowmf_mgr wmf_mgr) {this.file_mgr = file_mgr; this.wmf_mgr = wmf_mgr;} private final Xof_file_mgr file_mgr; private final Xowmf_mgr wmf_mgr;
public Xof_xfer_rslt Rslt() {return rslt;} private Xof_xfer_rslt rslt = new Xof_xfer_rslt();
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 abea9714f..5f7ef8162 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
@@ -19,6 +19,7 @@ package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xo
import gplx.core.primitives.*;
import gplx.xowa.files.*; import gplx.xowa.files.fsdb.*; import gplx.xowa.files.bins.*; import gplx.xowa.files.origs.*;
import gplx.xowa.files.gui.*;
+import gplx.xowa.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.neg1_();
diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_fxt.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_fxt.java
index 77f372e8a..b0b55a895 100644
--- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_fxt.java
+++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_fxt.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
import gplx.core.primitives.*; import gplx.dbs.*;
import gplx.ios.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.files.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xof_xfer_queue_html_fxt extends Xof_xfer_queue_base_fxt {
private final Xof_xfer_queue queue = new Xof_xfer_queue();
@Override public void Clear(boolean src_repo_is_wmf) {
diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_offline_tst.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_offline_tst.java
index d4c1d26a6..6945e5fc9 100644
--- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_offline_tst.java
+++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_offline_tst.java
@@ -16,8 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
-import org.junit.*;
-import gplx.xowa.files.*;
+import org.junit.*; import gplx.xowa.files.*; import gplx.xowa.parsers.lnkis.*;
public class Xof_xfer_queue_html_offline_tst {
Xof_xfer_queue_html_fxt fxt = new Xof_xfer_queue_html_fxt();
@Before public void init() {fxt.Clear(true); fxt.Src_commons_repo().Tarball_(true); fxt.Src_en_wiki_repo().Tarball_(true);}
diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_wmf_api_tst.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_wmf_api_tst.java
index 0c3a6f3f7..2486f2032 100644
--- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_wmf_api_tst.java
+++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_html_wmf_api_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.files.xfers; import gplx.*; import gplx.xowa.*; import gplx.xowa.files.*;
-import org.junit.*;
+import org.junit.*; import gplx.xowa.parsers.lnkis.*;
public class Xof_xfer_queue_html_wmf_api_tst {
private final Xof_xfer_queue_html_fxt fxt = new Xof_xfer_queue_html_fxt();
@Before public void init() {fxt.Clear(true); fxt.Src_commons_repo().Wmf_api_(true); fxt.Src_en_wiki_repo().Wmf_api_(true);}
diff --git a/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java b/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java
index 500713b2f..7485c26da 100644
--- a/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java
+++ b/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.gui.urls; import gplx.*; import gplx.xowa.*; import gplx.xowa.gui.*;
import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xof_orig_file_downloader {
public static Xof_fsdb_itm Make_fsdb(Xowe_wiki wiki, byte[] lnki_ttl, Xof_img_size img_size, Xof_url_bldr url_bldr) {
Xof_fsdb_itm fsdb = new Xof_fsdb_itm();
diff --git a/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java b/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java
index a1aabcd38..d944ea555 100644
--- a/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java
+++ b/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java
@@ -18,7 +18,7 @@ along with this program. If not, see .
package gplx.xowa.gui.urls; import gplx.*; import gplx.xowa.*; import gplx.xowa.gui.*;
import gplx.core.net.*;
import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.origs.*;
-import gplx.xowa.html.hrefs.*;
+import gplx.xowa.html.hrefs.*; import gplx.xowa.html.doms.*;
import gplx.xowa.gui.views.*;
public class Xog_url_wkr {
private final Xoa_url tmp_url = Xoa_url.blank();
diff --git a/400_xowa/src/gplx/xowa/gui/views/Load_page_wkr.java b/400_xowa/src/gplx/xowa/gui/views/Load_page_wkr.java
index 00dad2220..ef4a9cd8e 100644
--- a/400_xowa/src/gplx/xowa/gui/views/Load_page_wkr.java
+++ b/400_xowa/src/gplx/xowa/gui/views/Load_page_wkr.java
@@ -38,7 +38,7 @@ public class Load_page_wkr implements Gfo_thread_wkr {
Xoae_app app = wiki.Appe();
app.Usr_dlg().Log_many("", "", "page.load: url=~{0}", url.To_str());
if (Env_.System_memory_free() < app.Sys_cfg().Free_mem_when()) // check if low in memory
- app.Free_mem(false); // clear caches (which will clear bry_bfr_mkr)
+ Xow_wiki_.Rls_mem(wiki, false); // clear caches (which will clear bry_bfr_mkr)
else // not low in memory
app.Utl__bfr_mkr().Clear(); // clear bry_bfr_mkr only; NOTE: call before page parse, not when page is first added, else threading errors; DATE:2014-05-30
this.page = wiki.Load_page_by_ttl(url, ttl, wiki.Lang(), tab, false);
diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java
index 382d38163..94e55cb75 100644
--- a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java
+++ b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.gui.views; import gplx.*; import gplx.xowa.*; import gplx.xowa.gui.*;
import gplx.gfui.*; import gplx.xowa.html.*; import gplx.xowa.pages.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*;
public class Xog_tab_itm_edit_mgr {
public static void Save(Xog_tab_itm tab, boolean quick_save) {
if (tab.View_mode() != Xopg_view_mode.Tid_edit) return; // exit if not edit; handles ctrl+s being pressed in read/html modes
diff --git a/400_xowa/src/gplx/xowa/html/Xoh_html_mgr.java b/400_xowa/src/gplx/xowa/html/Xoh_html_mgr.java
index 4f9451db1..e77d7125f 100644
--- a/400_xowa/src/gplx/xowa/html/Xoh_html_mgr.java
+++ b/400_xowa/src/gplx/xowa/html/Xoh_html_mgr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html; import gplx.*; import gplx.xowa.*;
import gplx.xowa.html.tidy.*; import gplx.xowa.html.utils.*; import gplx.xowa.html.skins.*;
+import gplx.xowa.parsers.xndes.*;
public class Xoh_html_mgr implements GfoInvkAble {
public Xoh_html_mgr(Xoae_app app) {
js_cleaner = new Xoh_js_cleaner(app);
diff --git a/400_xowa/src/gplx/xowa/html/Xoh_html_wtr.java b/400_xowa/src/gplx/xowa/html/Xoh_html_wtr.java
index 4e5588aae..f24d9fac8 100644
--- a/400_xowa/src/gplx/xowa/html/Xoh_html_wtr.java
+++ b/400_xowa/src/gplx/xowa/html/Xoh_html_wtr.java
@@ -19,7 +19,7 @@ package gplx.xowa.html; import gplx.*; import gplx.xowa.*;
import gplx.core.primitives.*; import gplx.core.net.*;
import gplx.core.btries.*; import gplx.html.*;
import gplx.xowa.wikis.domains.*;
-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.html.lnkis.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.paras.*;
+import gplx.xowa.parsers.*; 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.html.lnkis.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.paras.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.miscs.*;
import gplx.xowa.xtns.*; import gplx.xowa.xtns.dynamicPageList.*; import gplx.xowa.xtns.math.*; import gplx.xowa.langs.vnts.*; import gplx.xowa.xtns.cite.*; import gplx.xowa.html.hzips.*;
public class Xoh_html_wtr {
private Xowe_wiki wiki; private Xoae_app app; private Xoae_page page; private Xop_xatr_whitelist_mgr whitelist_mgr;
diff --git a/400_xowa/src/gplx/xowa/html/Xoh_html_wtr_escaper.java b/400_xowa/src/gplx/xowa/html/Xoh_html_wtr_escaper.java
index 4a14541df..94b2ef9ba 100644
--- a/400_xowa/src/gplx/xowa/html/Xoh_html_wtr_escaper.java
+++ b/400_xowa/src/gplx/xowa/html/Xoh_html_wtr_escaper.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 .
*/
package gplx.xowa.html; import gplx.*; import gplx.xowa.*;
-import gplx.core.btries.*; import gplx.html.*; import gplx.xowa.parsers.amps.*;
+import gplx.core.btries.*; import gplx.html.*;
+import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.xndes.*;
public class Xoh_html_wtr_escaper {
public static byte[] Escape(Xop_amp_mgr amp_mgr, Bry_bfr tmp_bfr, byte[] src) {
Escape(amp_mgr, tmp_bfr, src, 0, src.length, true, false);
diff --git a/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr.java b/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr.java
index c15dc182d..75eacb69f 100644
--- a/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr.java
+++ b/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.html; import gplx.*; import gplx.xowa.*;
import gplx.html.*; import gplx.xowa.html.portal.*; import gplx.xowa.pages.skins.*; import gplx.xowa.pages.*;
import gplx.xowa.wikis.*; import gplx.xowa.wikis.domains.*; import gplx.xowa.gui.*; import gplx.xowa.xtns.wdatas.*; import gplx.xowa.langs.vnts.*;
+import gplx.xowa.parsers.*;
public class Xoh_page_wtr_wkr implements Bry_fmtr_arg {
private Xop_ctx ctx; private Xoae_page page; private Bry_bfr tmp_bfr = Bry_bfr.reset_(255);
private byte[] root_dir_bry;
diff --git a/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_.java b/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_.java
index 835a87713..f0044c6ec 100644
--- a/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_.java
+++ b/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html; import gplx.*; import gplx.xowa.*;
import gplx.html.*; import gplx.xowa.xtns.relatedSites.*;
+import gplx.xowa.parsers.utils.*;
public class Xoh_page_wtr_wkr_ {
public static byte[] Bld_page_content_sub(Xoae_app app, Xowe_wiki wiki, Xoae_page page, Bry_bfr tmp_bfr) {
byte[] subpages = app.Html_mgr().Page_mgr().Subpages_bldr().Bld(wiki.Ns_mgr(), page.Ttl());
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoh_dom_.java b/400_xowa/src/gplx/xowa/html/doms/Xoh_dom_.java
similarity index 96%
rename from 400_xowa/src_300_html/gplx/xowa/Xoh_dom_.java
rename to 400_xowa/src/gplx/xowa/html/doms/Xoh_dom_.java
index d21a3fc45..feb0bf6bb 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoh_dom_.java
+++ b/400_xowa/src/gplx/xowa/html/doms/Xoh_dom_.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.html.doms; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.html.*;
public class Xoh_dom_ {
private static final byte[] Lt_bry = Bry_.new_a7("<"), Space_bry = Bry_.new_a7(" ");
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoh_dom_tst.java b/400_xowa/src/gplx/xowa/html/doms/Xoh_dom_tst.java
similarity index 95%
rename from 400_xowa/src_300_html/gplx/xowa/Xoh_dom_tst.java
rename to 400_xowa/src/gplx/xowa/html/doms/Xoh_dom_tst.java
index f98459e81..586fa20e1 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoh_dom_tst.java
+++ b/400_xowa/src/gplx/xowa/html/doms/Xoh_dom_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.html.doms; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import org.junit.*;
public class Xoh_dom_tst {
@Test public void Find_atr() {
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoh_find.java b/400_xowa/src/gplx/xowa/html/doms/Xoh_find.java
similarity index 94%
rename from 400_xowa/src_300_html/gplx/xowa/Xoh_find.java
rename to 400_xowa/src/gplx/xowa/html/doms/Xoh_find.java
index 2d4ced394..c61f68335 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoh_find.java
+++ b/400_xowa/src/gplx/xowa/html/doms/Xoh_find.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.html.doms; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
public class Xoh_find {
public int Tag_bgn() {return tag_bgn;} public Xoh_find Tag_bgn_(int v) {tag_bgn = v; return this;} private int tag_bgn;
public int Tag_end() {return tag_end;} public Xoh_find Tag_end_(int v) {tag_end = v; return this;} private int tag_end;
diff --git a/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_rdr.java b/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_rdr.java
index 7c63b9425..138540095 100644
--- a/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_rdr.java
+++ b/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_rdr.java
@@ -19,6 +19,7 @@ package gplx.xowa.html.hdumps; import gplx.*; import gplx.xowa.*; import gplx.xo
import gplx.xowa.html.heads.*; import gplx.xowa.html.hdumps.data.*; import gplx.xowa.html.hzips.*; import gplx.xowa.html.hdumps.abrvs.*; import gplx.xowa.html.hdumps.pages.*;
import gplx.xowa.pages.*; import gplx.xowa.pages.skins.*;
import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; import gplx.xowa2.gui.*;
+import gplx.xowa.parsers.*;
public class Xohd_hdump_rdr {
private final Bry_bfr_mkr bfr_mkr; private final Xow_hzip_mgr hzip_mgr;
private final Xohd_abrv_mgr abrv_mgr; private final Xohd_page_html_mgr__load load_mgr;
diff --git a/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_wtr_tst.java b/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_wtr_tst.java
index b2916db5e..31a0e31b8 100644
--- a/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_wtr_tst.java
+++ b/400_xowa/src/gplx/xowa/html/hdumps/Xohd_hdump_wtr_tst.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.html.hdumps; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import org.junit.*; import gplx.xowa.files.*;
import gplx.xowa.html.hdumps.core.*; import gplx.xowa.html.hdumps.data.*; import gplx.xowa.html.hdumps.pages.*; import gplx.xowa.xtns.hieros.*; import gplx.xowa.xtns.gallery.*;
+import gplx.xowa.parsers.*;
public class Xohd_hdump_wtr_tst {
@Before public void init() {fxt.Clear();} private Xohd_hdump_wtr_fxt fxt = new Xohd_hdump_wtr_fxt();
// @Test public void Image_full() {
diff --git a/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java b/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java
index 297680b55..c1546d67a 100644
--- a/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java
+++ b/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.html.hdumps.abrvs; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; import gplx.xowa.html.hdumps.*;
-import org.junit.*; import gplx.core.primitives.*; import gplx.xowa.html.hdumps.core.*; import gplx.xowa.html.hdumps.data.*; import gplx.xowa.files.*;
+import org.junit.*; import gplx.core.primitives.*; import gplx.xowa.html.hdumps.core.*; import gplx.xowa.html.hdumps.data.*; import gplx.xowa.files.*; import gplx.xowa.parsers.lnkis.*;
import gplx.xowa2.gui.*;
public class Xohd_abrv_mgr_tst {
@Before public void init() {
diff --git a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java
index eb6acdc78..43ea8336c 100644
--- a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java
+++ b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java
@@ -18,6 +18,7 @@ along with this program. If not, see .
package gplx.xowa.html.hzips; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.core.primitives.*; import gplx.core.brys.*; import gplx.core.btries.*;
import gplx.html.*; import gplx.xowa.wikis.ttls.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xow_hzip_itm__anchor {
private Xow_hzip_mgr hzip_mgr; private Xow_ttl_parser ttl_parser; private Byte_obj_ref xtid_ref = Byte_obj_ref.zero_();
private Bry_rdr bry_rdr = new Bry_rdr();
diff --git a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_mgr_fxt.java b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_mgr_fxt.java
index a69c33eb4..9087b57e2 100644
--- a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_mgr_fxt.java
+++ b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_mgr_fxt.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 .
*/
package gplx.xowa.html.hzips; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
+import gplx.xowa.parsers.*;
class Xow_hzip_mgr_fxt {
private Bry_bfr bfr = Bry_bfr.reset_(Io_mgr.Len_mb); private Xow_hzip_mgr hzip_mgr; private Xowe_wiki wiki;
private Xodump_stats_itm stats = new Xodump_stats_itm(); private final Ordered_hash redlink_uids = Ordered_hash_.new_();
diff --git a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java
index 3836ba2db..1de09f31a 100644
--- a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java
+++ b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java
@@ -20,6 +20,7 @@ import gplx.core.threads.*; import gplx.xowa.xtns.pfuncs.ifs.*; import gplx.xowa
import gplx.core.json.*;
import gplx.xowa.html.js.*;
import gplx.xowa.gui.views.*;
+import gplx.xowa.parsers.*;
public class Xoh_js_cbk implements GfoInvkAble {
private Xoae_app app;
private Xog_html_itm html_itm;
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_html_fmtr__base.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_html_fmtr__base.java
index 6b39d8255..92e9fa98d 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_html_fmtr__base.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_html_fmtr__base.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.xowa.files.*; import gplx.xowa.html.hdumps.abrvs.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xoh_file_html_fmtr__base implements Xoh_file_img_wkr {
private final Xoh_arg_img_core arg_img_core;
private Bry_bfr scratch_bfr = Bry_bfr.reset_(128);
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_mgr.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_mgr.java
index 9df1ff7b4..5d02097d4 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_mgr.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_mgr.java
@@ -18,6 +18,8 @@ along with this program. If not, see .
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.core.primitives.*;
import gplx.xowa.files.*; import gplx.xowa.files.xfers.*; import gplx.xowa.parsers.lnkis.*;
+import gplx.xowa.parsers.*;
+import gplx.xowa.tdbs.metas.*;
public class Xoh_file_mgr {
private final Xowe_wiki wiki;
public Xoh_file_mgr(Xowe_wiki wiki, Xow_html_mgr html_mgr, Xoh_html_wtr html_wtr) {
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr__basic.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr__basic.java
index 8702063e3..8d2b86cca 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr__basic.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr__basic.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.html.*; import gplx.xowa.files.*; import gplx.xowa.html.hdumps.core.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*;
public class Xoh_file_wtr__basic {
private final Xowe_wiki wiki; private final Xow_html_mgr html_mgr; private final Xoh_html_wtr html_wtr; private final Bry_bfr_mkr bfr_mkr; private final Bry_bfr scratch_bfr = Bry_bfr.reset_(Io_mgr.Len_kb);
private final Xoh_lnki_text_fmtr media_alt_fmtr, caption_fmtr;
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_text_fmtr.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_text_fmtr.java
index aa9418fcf..2a847e39d 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_text_fmtr.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_text_fmtr.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 .
*/
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
+import gplx.xowa.parsers.*;
public class Xoh_lnki_text_fmtr implements Bry_fmtr_arg { // formats alt or caption
private final Bry_bfr_mkr bfr_mkr; private final Xoh_html_wtr html_wtr;
private Xop_ctx ctx; private Xoh_wtr_ctx hctx; private byte[] src; private Xop_tkn_itm text_tkn; private Bry_fmtr fmtr;
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr.java
index 5a459bdc6..eb6272d61 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr.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 .
*/
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.tmpls.*;
public class Xoh_lnki_title_fmtr implements Bry_fmtr_arg {
public Xoh_lnki_title_fmtr Set(byte[] src, Xop_tkn_itm tkn) {this.src = src; this.tkn = tkn; return this;}
public void XferAry(Bry_bfr bfr, int idx) {
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr_tst.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr_tst.java
index 3c22e9edd..f56c9444d 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr_tst.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_title_fmtr_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
-import org.junit.*;
+import org.junit.*; import gplx.xowa.parsers.*;
public class Xoh_lnki_title_fmtr_tst {
@Before public void init() {fxt.Clear();} private Xoh_lnki_title_fmtr_fxt fxt = new Xoh_lnki_title_fmtr_fxt();
@Test public void Basic() {
diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_wtr.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_wtr.java
index 88c7f65e5..6f0f1c031 100644
--- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_wtr.java
+++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_wtr.java
@@ -16,8 +16,9 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.html.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
-import gplx.html.*; import gplx.xowa.files.*; import gplx.xowa.parsers.lnkis.redlinks.*; import gplx.xowa.users.history.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.xtns.relatedSites.*;
+import gplx.html.*; import gplx.xowa.files.*; import gplx.xowa.users.history.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.xtns.relatedSites.*;
import gplx.xowa.wikis.xwikis.*; import gplx.xowa.xtns.wdatas.core.*; import gplx.xowa.html.hzips.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*; import gplx.xowa.parsers.lnkis.redlinks.*;
public class Xoh_lnki_wtr {
private Xoae_app app; private Xowe_wiki wiki; private Xoae_page page; private Xop_ctx ctx;
private Xoh_html_wtr_cfg cfg;
diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_anchor_finder.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_anchor_finder.java
index e20584956..8f5b812d1 100644
--- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_anchor_finder.java
+++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_anchor_finder.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 .
*/
package gplx.xowa.html.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; import gplx.xowa.html.modules.*;
+import gplx.xowa.parsers.*;
class Xow_popup_anchor_finder {
private byte[] src, find;
private int src_len, nl_lhs;
diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java
index 34107028c..e1c529349 100644
--- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java
+++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java
@@ -19,7 +19,8 @@ package gplx.xowa.html.modules.popups; import gplx.*; import gplx.xowa.*; import
import gplx.core.btries.*;
import gplx.xowa.wikis.domains.*;
import gplx.xowa.apis.xowa.html.modules.*; import gplx.xowa.html.modules.popups.keeplists.*;
-import gplx.xowa.gui.views.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.tblws.*;
+import gplx.xowa.gui.views.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.tmpls.*;
public class Xow_popup_parser {
private Xoae_app app; private Xowe_wiki wiki; private Xop_parser parser;
private Btrie_fast_mgr tmpl_trie, wtxt_trie; private Xop_tkn_mkr tkn_mkr;
diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java
index 0117f05b1..ea57417a7 100644
--- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java
+++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; import gplx.xowa.html.modules.*;
import gplx.xowa.apis.xowa.html.modules.*;
+import gplx.xowa.parsers.*;
public class Xow_popup_parser_data {
public int Tmpl_max() {return tmpl_max;} private int tmpl_max;
public int Words_needed_val() {return words_needed_val;} private int words_needed_val;
diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_word.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_word.java
index 23d7aa9ac..de6be382e 100644
--- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_word.java
+++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_word.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 .
*/
package gplx.xowa.html.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; import gplx.xowa.html.modules.*;
+import gplx.xowa.parsers.*;
public class Xow_popup_word {
public Xow_popup_word(int tid, int bfr_bgn, int idx, int bgn, int end, Xop_tkn_itm tkn) {this.tid = tid; this.bfr_bgn = bfr_bgn; this.idx = idx; this.bgn = bgn; this.end = end; this.tkn = tkn;}
public int Tid() {return tid;} private int tid;
diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_wrdx_mkr.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_wrdx_mkr.java
index f178d71e8..f34303814 100644
--- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_wrdx_mkr.java
+++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_wrdx_mkr.java
@@ -17,7 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; import gplx.xowa.html.modules.*;
import gplx.html.*;
-import gplx.xowa.parsers.lnkes.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkes.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*;
public class Xow_popup_wrdx_mkr {
private boolean skip_space;
private Xop_tkn_itm prv_tkn_seen, prv_tkn_added;
diff --git a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page__other_resolutions.java b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page__other_resolutions.java
index a3feddacc..861d3c328 100644
--- a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page__other_resolutions.java
+++ b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page__other_resolutions.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 .
*/
package gplx.xowa.html.ns_files; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
-import gplx.xowa.files.*; import gplx.xowa.files.repos.*;
+import gplx.core.primitives.*;
+import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.parsers.lnkis.*;
class Xoh_file_page__other_resolutions implements Bry_fmtr_arg {
private Xow_repo_mgr repo_mgr; private Xof_file_itm orig_itm; private Xoh_file_page_wtr file_page;
private final Xof_img_size img_size = new Xof_img_size(); private final Xof_url_bldr url_bldr = Xof_url_bldr.new_v2();
diff --git a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page_wtr.java b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page_wtr.java
index 3e9f59f93..8705c9576 100644
--- a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page_wtr.java
+++ b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_file_page_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 .
*/
package gplx.xowa.html.ns_files; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
+import gplx.core.primitives.*;
public class Xoh_file_page_wtr {
public int Main_img_w() {return 800;}
public int Main_img_h() {return 600;}
diff --git a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr.java b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr.java
index 6a67678cb..a77573eed 100644
--- a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr.java
+++ b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr.java
@@ -19,6 +19,7 @@ package gplx.xowa.html.ns_files; import gplx.*; import gplx.xowa.*; import gplx.
import gplx.core.primitives.*;
import gplx.xowa.html.*; import gplx.xowa.html.lnkis.*;
import gplx.xowa.files.*; import gplx.xowa.files.repos.*; import gplx.xowa.files.xfers.*; import gplx.xowa.files.origs.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*;
public class Xoh_ns_file_page_mgr implements Bry_fmtr_arg {
private Xoa_ttl ttl; private Xoh_file_page_wtr html_wtr; private final Xoh_file_page__other_resolutions alt_wtr = new Xoh_file_page__other_resolutions();
private final Bry_bfr tmp_bfr = Bry_bfr.new_();
diff --git a/400_xowa/src/gplx/xowa/html/sidebar/Xowh_sidebar_mgr.java b/400_xowa/src/gplx/xowa/html/sidebar/Xowh_sidebar_mgr.java
index 565a41491..8327f3f31 100644
--- a/400_xowa/src/gplx/xowa/html/sidebar/Xowh_sidebar_mgr.java
+++ b/400_xowa/src/gplx/xowa/html/sidebar/Xowh_sidebar_mgr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html.sidebar; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.core.btries.*; import gplx.xowa.langs.msgs.*;
+import gplx.xowa.parsers.lnkis.*;
public class Xowh_sidebar_mgr implements GfoInvkAble {
public Xowh_sidebar_mgr(Xowe_wiki wiki) {this.wiki = wiki;} private Xowe_wiki wiki;
public int Grps_len() {return grps.Count();} List_adp grps = List_adp_.new_();
diff --git a/400_xowa/src/gplx/xowa/html/tocs/Xow_hdr_mgr.java b/400_xowa/src/gplx/xowa/html/tocs/Xow_hdr_mgr.java
index a4bf6985c..6439a0b5c 100644
--- a/400_xowa/src/gplx/xowa/html/tocs/Xow_hdr_mgr.java
+++ b/400_xowa/src/gplx/xowa/html/tocs/Xow_hdr_mgr.java
@@ -17,7 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.html.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
import gplx.core.primitives.*; import gplx.xowa.urls.encoders.*;
-import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.hdrs.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*;
public class Xow_hdr_mgr {
private final Url_encoder_mgr encoder_mgr; private final Xoae_page page;
private final Hash_adp hdrs_hash = Hash_adp_.new_(); private final Bry_bfr hdrs_bfr = Bry_bfr.reset_(255); private final Bry_obj_ref hdrs_ref = Bry_obj_ref.null_();
diff --git a/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr.java b/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr.java
index f557bfd44..bed043084 100644
--- a/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr.java
+++ b/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.html.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
-import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.hdrs.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.hdrs.*; import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.lnkis.*;
public class Xow_toc_mgr implements Bry_fmtr_arg {
private static final int Toc_levels = 32; // assume 6 max levels * 5 max heading (9999.); add 2 for good measure
private Xoae_page page; private Xop_toc_itm[] path_ary; private Bry_bfr path_bfr = Bry_bfr.reset_(Toc_levels);
diff --git a/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr_tst.java b/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr_tst.java
index 6c24e10a6..95f0ff353 100644
--- a/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr_tst.java
+++ b/400_xowa/src/gplx/xowa/html/tocs/Xow_toc_mgr_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.html.tocs; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*;
-import org.junit.*;
+import org.junit.*; import gplx.xowa.parsers.*;
public class Xow_toc_mgr_tst {
private Xow_toc_mgr_fxt fxt = new Xow_toc_mgr_fxt();
@Before public void init() {fxt.Clear();}
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 18b50432e..7afa063b4 100644
--- a/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java
+++ b/400_xowa/src/gplx/xowa/langs/Xoa_lang_mgr.java
@@ -17,7 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs; import gplx.*; import gplx.xowa.*;
import gplx.intl.*;
-import gplx.xowa.apps.fsys.*; import gplx.xowa.bldrs.langs.*; import gplx.xowa.langs.vnts.*;
+import gplx.xowa.apps.fsys.*; import gplx.xowa.apps.langs.*; import gplx.xowa.bldrs.langs.*; import gplx.xowa.langs.vnts.*;
public class Xoa_lang_mgr implements GfoInvkAble {
private final Xoa_fsys_mgr fsys_mgr; private final Gfo_msg_log msg_log; private final Xol_lang lang_en;
private final Ordered_hash hash = Ordered_hash_.new_bry_(); private final Hash_adp_bry fallback_regy = Hash_adp_bry.cs();
diff --git a/400_xowa/src/gplx/xowa/langs/Xol_func_name_itm.java b/400_xowa/src/gplx/xowa/langs/Xol_func_name_itm.java
index ce4d8c3ab..14bb7d6b9 100644
--- a/400_xowa/src/gplx/xowa/langs/Xol_func_name_itm.java
+++ b/400_xowa/src/gplx/xowa/langs/Xol_func_name_itm.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 .
*/
package gplx.xowa.langs; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.tmpls.*;
public class Xol_func_name_itm {
public byte Tid() {return tid;} private byte tid = Xot_defn_.Tid_null;
public Xot_defn Func() {return func;} private Xot_defn func = Xot_defn_.Null;
diff --git a/400_xowa/src/gplx/xowa/langs/Xol_func_name_regy.java b/400_xowa/src/gplx/xowa/langs/Xol_func_name_regy.java
index 41f997e8a..7cc3187f4 100644
--- a/400_xowa/src/gplx/xowa/langs/Xol_func_name_regy.java
+++ b/400_xowa/src/gplx/xowa/langs/Xol_func_name_regy.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs; import gplx.*; import gplx.xowa.*;
import gplx.core.btries.*; import gplx.intl.*; import gplx.xowa.xtns.pfuncs.*;
+import gplx.xowa.parsers.tmpls.*;
public class Xol_func_name_regy {
private final Xoa_lang_mgr lang_mgr; private final Xol_lang lang;
private final Xol_func_name_itm finder = new Xol_func_name_itm();
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 1c24a3ba2..474730f67 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
@@ -38,6 +38,7 @@ class Xol_case_itm_byt implements Xol_case_itm {
}
}
public byte Tid() {return tid;} private byte tid;
+ public boolean Is_single_byte() {return true;}
public byte[] Src_ary() {return src_ary;} private byte[] src_ary;
public byte[] Trg_ary() {return trg_ary;} private byte[] trg_ary;
public byte Src_byte() {return src_byte;} private byte src_byte;
@@ -47,11 +48,7 @@ class Xol_case_itm_byt implements Xol_case_itm {
public void Case_reuse_upper(byte[] ary, int bgn, int len) {ary[bgn] = upper_byte;}
public void Case_reuse_lower(byte[] ary, int bgn, int len) {ary[bgn] = lower_byte;}
public Xol_case_itm Clone() {return new Xol_case_itm_byt(tid, src_byte, trg_byte);}
- public int Utf8_id_lower() {return lower_byte;}
- public boolean Eq_lo(Gfo_case_itm trg_obj) {
- Xol_case_itm_byt trg_itm = (Xol_case_itm_byt)trg_obj;
- return lower_byte == trg_itm.lower_byte;
- }
+ public int Utf8_id_lo() {return lower_byte;}
public int Hashcode_lo() {return lower_byte;}
public int Len_lo() {return 1;}
public byte[] Asymmetric_bry() {return null;}
@@ -69,6 +66,7 @@ class Xol_case_itm_bry implements Xol_case_itm {
hashcode_ci_lo = Bry_obj_ref.CalcHashCode(lower_ary, 0, len_lo);
}
public byte Tid() {return tid;} public Xol_case_itm_bry Tid_(byte v) {tid = v; return this;} private byte tid;
+ public boolean Is_single_byte() {return false;}
public byte[] Src_ary() {return src_ary;} private byte[] src_ary;
public byte[] Trg_ary() {return trg_ary;} private byte[] trg_ary;
public void Case_build_upper(Bry_bfr bfr) {bfr.Add(upper_ary);} private byte[] upper_ary;
@@ -84,10 +82,6 @@ class Xol_case_itm_bry implements Xol_case_itm {
public Xol_case_itm Clone() {return new Xol_case_itm_bry(tid, src_ary, trg_ary);}
public int Len_lo() {return len_lo;} private int len_lo;
public int Utf8_id_lo() {return utf8_id_lo;} private int utf8_id_lo;
- public boolean Eq_lo(Gfo_case_itm trg_obj) {
- Xol_case_itm_bry trg_itm = (Xol_case_itm_bry)trg_obj;
- return utf8_id_lo == trg_itm.utf8_id_lo;
- }
public byte[] Asymmetric_bry() {return asymmetric_bry;} private byte[] asymmetric_bry;
public int Hashcode_lo() {return hashcode_ci_lo;} private int hashcode_ci_lo;
}
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 6d8cf97ea..bac6a6228 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
@@ -39,6 +39,13 @@ public class Xol_case_mgr_tst {
fxt.Test_reuse_1st_upper("É");
fxt.Lower("Ι", "ι"); // PURPOSE:test reversal; PAGE:en.d:ἀρχιερεύς DATE:2014-09-02
}
+ @Test public void Turkish_redirect() { // PURPOSE: lowercase redirect should match uppercase for asymmetric brys; PAGE:tr.w:Zvishavane DATE:2015-09-07
+ Hash_adp_bry hash = Hash_adp_bry.c__u8(Bool_.N, Xol_case_mgr_.U8());
+ byte[] upper = Bry_.new_u8("YÖNLENDİRME");
+ byte[] lower = Bry_.new_u8("yönlendirme");
+ hash.Add(upper, upper); // add upper to hash
+ Tfds.Eq_bry(upper, (byte[])hash.Get_by_bry(lower)); // get upper by using lower
+ }
// @Test public void Hack() {
// Xol_case_itm[] ary = Xol_case_mgr_.Utf_8;
// Bry_bfr bfr = Bry_bfr.new_();
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 f85b1fd0e..f3c74e9f8 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
@@ -16,6 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.langs.durations; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
+import gplx.xowa.parsers.*;
public class Xol_duration_mgr {
private Xol_msg_itm[] interval_msgs = null;
public Xol_duration_mgr(Xol_lang lang) {this.lang = lang;} private Xol_lang lang;
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 ac0cc7c3c..c76911f9e 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
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.langs.msgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
-import gplx.php.*;
+import gplx.php.*; import gplx.xowa.parsers.*;
public class Xol_msg_mgr_ {
// public static String Get_msg_val_gui_or_null(Xol_lang lang, byte[] pre, byte[] key, byte[] suf) {
// String rv = Get_msg_val_gui_or_null(lang, pre, key, suf);
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_eqgt_tkn.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_eqgt_tkn.java
index 780673082..3bb5cc76c 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_eqgt_tkn.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_eqgt_tkn.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 .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
+import gplx.xowa.parsers.*;
public class Xop_vnt_eqgt_tkn extends Xop_tkn_itm_base {
public Xop_vnt_eqgt_tkn(int bgn, int end) {this.Tkn_ini_pos(false, bgn, end);}
@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_vnt_eqgt;}
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_flag_parser.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_flag_parser.java
index a59aec8f5..63efcfa0d 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_flag_parser.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_flag_parser.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
import gplx.core.btries.*;
+import gplx.xowa.parsers.*;
class Xop_vnt_flag_parser {
private Xop_vnt_flag_lang_bldr flag_lang_bldr;
public Xop_vnt_flag_parser(Xol_vnt_mgr vnt_mgr) {flag_lang_bldr = new Xop_vnt_flag_lang_bldr(vnt_mgr);}
@@ -26,7 +27,7 @@ class Xop_vnt_flag_parser {
public int Rslt_tkn_pos() {return rslt_tkn_pos;} private int rslt_tkn_pos;
public int Rslt_pipe_last() {return rslt_pipe_last;} private int rslt_pipe_last;
public Xop_vnt_flag[] Rslt_flags() {return rslt_flags;} private Xop_vnt_flag[] rslt_flags;
- public void Parse(Xowe_wiki wiki, Xop_vnt_tkn vnt_tkn, int pipe_tkn_count, byte[] src) {
+ public void Parse(Xowe_wiki wiki, Xoa_url page_url, Xop_vnt_tkn vnt_tkn, int pipe_tkn_count, byte[] src) {
this.Clear();
rslt_flags = new Xop_vnt_flag[pipe_tkn_count];
int rv_idx = 0;
@@ -52,7 +53,7 @@ class Xop_vnt_flag_parser {
case Xop_tkn_itm_.Tid_newLine: // skip ws
break;
default:
- wiki.Appe().Usr_dlg().Log_many("", "", "unknown tkn in vnt flag; tid=~{0} txt=~{1}", sub.Tkn_tid(), String_.new_u8(src, sub.Src_bgn(), sub.Src_end()));
+ wiki.Appe().Usr_dlg().Log_many("", "", "unknown tkn in vnt flag; url=~{0} tid=~{1} txt=~{2}", page_url.To_str(), sub.Tkn_tid(), String_.new_u8(src, sub.Src_bgn(), sub.Src_end()));
flag_bfr.Add_mid(src, sub.Src_bgn(), sub.Src_end());
break;
}
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_html_wtr.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_html_wtr.java
index 1180c1556..9800a02bd 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_html_wtr.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_html_wtr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
import gplx.xowa.html.*;
+import gplx.xowa.parsers.*;
public class Xop_vnt_html_wtr {
public static void Write(Bry_bfr bfr, Xoh_html_wtr html_wtr, Xop_ctx ctx, Xoh_wtr_ctx hctx, Xoae_page page, byte[] src, Xop_vnt_tkn vnt) {
byte[] cur_lang_vnt = ctx.Wiki().Lang().Vnt_mgr().Cur_vnt();
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_.java
index d598990a6..219ff3d2c 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
import gplx.core.btries.*;
+import gplx.xowa.parsers.*;
public class Xop_vnt_lxr_ {
public static void set_(Xowe_wiki wiki) {
Btrie_fast_mgr wiki_trie = wiki.Parser().Wtxt_trie();
@@ -75,7 +76,7 @@ class Xop_vnt_lxr_end implements Xop_lxr {
int rule_subs_bgn = 0;
int pipe_tkn_count = vnt_tkn.Vnt_pipe_tkn_count();
if (pipe_tkn_count > 0) {
- flag_parser.Parse(wiki, vnt_tkn, pipe_tkn_count, src);
+ flag_parser.Parse(wiki, ctx.Cur_page().Url(), vnt_tkn, pipe_tkn_count, src);
vnt_flag_ary = flag_parser.Rslt_flags();
rule_subs_bgn = flag_parser.Rslt_tkn_pos();
vnt_tkn.Vnt_pipe_idx_last_(flag_parser.Rslt_pipe_last());
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_tst.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_tst.java
index 070d4f43d..f863b151c 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_tst.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_lxr_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
-import org.junit.*;
+import org.junit.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.miscs.*;
public class Xop_vnt_lxr_tst {
private Xop_vnt_lxr_fxt fxt = new Xop_vnt_lxr_fxt();
@Before public void init() {fxt.Clear();}
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rule.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rule.java
index 3fe3c60f8..1874fa3fc 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rule.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rule.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 .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
+import gplx.xowa.parsers.*;
public class Xop_vnt_rule extends Xop_tkn_itm_base {
public Xop_vnt_rule(byte[] rule_macro, byte[] rule_lang, Xop_tkn_itm[] rule_subs) {this.rule_macro = rule_macro; this.rule_lang = rule_lang; this.rule_subs = rule_subs;}
@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_vnt_rule;}
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rules_parser.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rules_parser.java
index a31d8c4c1..71a6d13eb 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rules_parser.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_rules_parser.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
import gplx.core.btries.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.miscs.*;
class Xop_vnt_rules_parser {
private byte mode;
private Xop_vnt_tkn vnt_tkn;
diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_tkn.java b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_tkn.java
index d179d5d99..e185cae3e 100644
--- a/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_tkn.java
+++ b/400_xowa/src/gplx/xowa/langs/vnts/Xop_vnt_tkn.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.langs.vnts; import gplx.*; import gplx.xowa.*; import gplx.xowa.langs.*;
import gplx.xowa.html.*;
+import gplx.xowa.parsers.*;
public class Xop_vnt_tkn extends Xop_tkn_itm_base {
public Xop_vnt_tkn(int bgn, int end) {
this.Tkn_ini_pos(false, bgn, end);
diff --git a/400_xowa/src_300_html/gplx/xowa/Xoa_page__commons_mgr.java b/400_xowa/src/gplx/xowa/pages/Xoa_page__commons_mgr.java
similarity index 94%
rename from 400_xowa/src_300_html/gplx/xowa/Xoa_page__commons_mgr.java
rename to 400_xowa/src/gplx/xowa/pages/Xoa_page__commons_mgr.java
index 8141f4a95..9b6d92a76 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xoa_page__commons_mgr.java
+++ b/400_xowa/src/gplx/xowa/pages/Xoa_page__commons_mgr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.pages; import gplx.*; import gplx.xowa.*;
public class Xoa_page__commons_mgr {
public boolean Xowa_mockup() {return xowa_mockup;} public void Xowa_mockup_(boolean v) {xowa_mockup = v;} private boolean xowa_mockup;
public Xow_wiki Source_wiki() {return source_wiki;} public void Source_wiki_(Xow_wiki v) {source_wiki = v;} private Xow_wiki source_wiki;
diff --git a/400_xowa/src/gplx/xowa/pages/Xopg_tmpl_prepend_mgr.java b/400_xowa/src/gplx/xowa/pages/Xopg_tmpl_prepend_mgr.java
index 7b831b27f..323450a31 100644
--- a/400_xowa/src/gplx/xowa/pages/Xopg_tmpl_prepend_mgr.java
+++ b/400_xowa/src/gplx/xowa/pages/Xopg_tmpl_prepend_mgr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.pages; import gplx.*; import gplx.xowa.*;
import gplx.core.btries.*;
+import gplx.xowa.parsers.*; import gplx.xowa.parsers.tmpls.*;
public class Xopg_tmpl_prepend_mgr {
private Bry_bfr[] stack = Bry_bfr_.Ary_empty; private int stack_len, stack_max;
public void Clear() {
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx.java b/400_xowa/src/gplx/xowa/parsers/Xop_ctx.java
similarity index 95%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_ctx.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_ctx.java
index f5295e67b..f9d8e1501 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_ctx.java
@@ -15,18 +15,19 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import gplx.core.btries.*; import gplx.xowa.gui.*; import gplx.xowa.xtns.lst.*;
import gplx.xowa.xtns.scribunto.*; import gplx.xowa.xtns.wdatas.*;
-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.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.logs.*; import gplx.xowa.html.modules.popups.keeplists.*;
public class Xop_ctx {
private Xop_ctx_wkr[] wkrs = new Xop_ctx_wkr[] {};
Xop_ctx(Xowe_wiki wiki, Xoae_page page) {
this.app = wiki.Appe(); this.msg_log = app.Msg_log();
this.wiki = wiki; this.cur_page = page;
- wkrs = new Xop_ctx_wkr[] {para, apos, xnde, list, lnki, hdr, amp, lnke, tblw, invk};
+ this.wkrs = new Xop_ctx_wkr[] {para, apos, xnde, list, lnki, hdr, amp, lnke, tblw, invk};
for (Xop_ctx_wkr wkr : wkrs) wkr.Ctor_ctx(this);
+ this.xnde_tag_regy = wiki.Mw_parser_mgr().Xnde_tag_regy();
}
public Xoae_app App() {return app;} private Xoae_app app;
public Xowe_wiki Wiki() {return wiki;} private Xowe_wiki wiki;
@@ -46,6 +47,7 @@ public class Xop_ctx {
public Xop_xnde_wkr Xnde() {return xnde;} private Xop_xnde_wkr xnde = new Xop_xnde_wkr();
public Xot_invk_wkr Invk() {return invk;} private Xot_invk_wkr invk = new Xot_invk_wkr();
public Xop_curly_wkr Curly() {return curly;} private Xop_curly_wkr curly = new Xop_curly_wkr();
+ public Xop_xnde_tag_regy Xnde_tag_regy() {return xnde_tag_regy;} private final Xop_xnde_tag_regy xnde_tag_regy; // PERF:demeter
public boolean Tmpl_load_enabled() {return tmpl_load_enabled;} public void Tmpl_load_enabled_(boolean v) {tmpl_load_enabled = v;} private boolean tmpl_load_enabled = true;
public int Tmpl_tkn_max() {return tmpl_tkn_max;} public void Tmpl_tkn_max_(int v) {tmpl_tkn_max = v;} private int tmpl_tkn_max = Int_.Max_value;
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx_.java b/400_xowa/src/gplx/xowa/parsers/Xop_ctx_.java
similarity index 94%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_ctx_.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_ctx_.java
index 7bd824481..cec9f9256 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx_.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_ctx_.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public class Xop_ctx_ {
public static String Page_as_str(Xop_ctx ctx) {return String_.new_u8(ctx.Cur_page().Ttl().Full_db());}
public static String Src_limit_and_escape_nl(byte[] src, int bgn, int limit) {
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx__tst.java b/400_xowa/src/gplx/xowa/parsers/Xop_ctx__tst.java
similarity index 94%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_ctx__tst.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_ctx__tst.java
index 2b707cef2..41513231c 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx__tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_ctx__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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import org.junit.*;
public class Xop_ctx__tst {
@Before public void init() {fxt.Clear();} private Xop_ctx__fxt fxt = new Xop_ctx__fxt();
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx_wkr.java b/400_xowa/src/gplx/xowa/parsers/Xop_ctx_wkr.java
similarity index 78%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_ctx_wkr.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_ctx_wkr.java
index dd256cca5..2a7fd6ab4 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_ctx_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_ctx_wkr.java
@@ -15,15 +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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public interface Xop_ctx_wkr {
void Ctor_ctx(Xop_ctx ctx);
void Page_bgn(Xop_ctx ctx, Xop_root_tkn root);
void Page_end(Xop_ctx ctx, Xop_root_tkn root, byte[] src, int src_len);
}
-interface Xop_arg_wkr {
- boolean Args_add(Xop_ctx ctx, byte[] src, Xop_tkn_itm tkn, Arg_nde_tkn arg, int arg_idx);
-}
-class Xop_arg_wkr_ {
- public static final int Typ_lnki = 0, Typ_tmpl = 1, Typ_prm = 2;
-}
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_lxr.java b/400_xowa/src/gplx/xowa/parsers/Xop_lxr.java
similarity index 93%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_lxr.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_lxr.java
index 16ed5f043..d3de3c477 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_lxr.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_lxr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import gplx.core.btries.*;
public interface Xop_lxr {
byte Lxr_tid();
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_lxr_.java b/400_xowa/src/gplx/xowa/parsers/Xop_lxr_.java
similarity index 95%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_lxr_.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_lxr_.java
index 8121c84a7..8ecc13b1b 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_lxr_.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_lxr_.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public class Xop_lxr_ {
public static final byte
Tid_pipe = 0, Tid_space = 1, Tid_nbsp = 2, Tid_tab = 3, Tid_nl = 4, Tid_amp = 5, Tid_apos = 6, Tid_colon = 7, Tid_lnki_bgn = 8, Tid_lnki_end = 9
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_lxr_mgr.java b/400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java
similarity index 90%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_lxr_mgr.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java
index 6f4d52616..e686ba736 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_lxr_mgr.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_lxr_mgr.java
@@ -15,9 +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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import gplx.core.btries.*;
-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.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 Xop_lxr[] ary;
public Xop_lxr_mgr(Xop_lxr[] ary) {this.ary = ary;}
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_parser.java b/400_xowa/src/gplx/xowa/parsers/Xop_parser.java
similarity index 96%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_parser.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_parser.java
index bc81f87c8..9be1236dc 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_parser.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_parser.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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import gplx.core.btries.*;
+import gplx.xowa.parsers.xndes.*; import gplx.xowa.parsers.tmpls.*;
public class Xop_parser { // NOTE: parsers are reused; do not keep any read-write state
private Xowe_wiki wiki;
public Xop_parser(Xowe_wiki wiki, Xop_lxr_mgr tmpl_lxr_mgr, Xop_lxr_mgr wtxt_lxr_mgr) {
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_parser_.java b/400_xowa/src/gplx/xowa/parsers/Xop_parser_.java
similarity index 95%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_parser_.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_parser_.java
index 64e91c375..fcc6cd518 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_parser_.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import gplx.xowa.langs.vnts.*;
public class Xop_parser_ {
public static final byte Parse_tid_null = 0, Parse_tid_tmpl = 1, Parse_tid_page_tmpl = 2, Parse_tid_page_wiki = 3;
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_parser__tst.java b/400_xowa/src/gplx/xowa/parsers/Xop_parser__tst.java
similarity index 94%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_parser__tst.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_parser__tst.java
index 25507b74d..3b505ead8 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_parser__tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
import org.junit.*;
public class Xop_parser__tst {
@Before public void init() {fxt.Clear();} private Xop_parser__fxt fxt = new Xop_parser__fxt();
diff --git a/400_xowa/src_409_tkn_misc/gplx/xowa/Xop_root_tkn.java b/400_xowa/src/gplx/xowa/parsers/Xop_root_tkn.java
similarity index 94%
rename from 400_xowa/src_409_tkn_misc/gplx/xowa/Xop_root_tkn.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_root_tkn.java
index f42a31a59..95a91d479 100644
--- a/400_xowa/src_409_tkn_misc/gplx/xowa/Xop_root_tkn.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_root_tkn.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public class Xop_root_tkn extends Xop_tkn_itm_base {
@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_root;}
public byte[] Root_src() {return root_src;} public Xop_root_tkn Root_src_(byte[] v) {root_src = v; return this;} private byte[] root_src = Bry_.Empty;
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_tkn_chkr_base.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_chkr_base.java
similarity index 97%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_tkn_chkr_base.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_chkr_base.java
index 69164a4d1..5203ed127 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_tkn_chkr_base.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_chkr_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public class Xop_tkn_chkr_base implements Tst_chkr {
@gplx.Virtual public Class> TypeOf() {return Xop_tkn_itm.class;}
@gplx.Virtual public byte Tkn_tid() {return Byte_.Max_value_127;}
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_grp.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_grp.java
similarity index 94%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_grp.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_grp.java
index df53245bf..b757b8838 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_grp.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public interface Xop_tkn_grp {
int Subs_len();
Xop_tkn_itm Subs_get(int i);
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm.java
similarity index 93%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm.java
index 12be6aa16..9e2208441 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.tmpls.*;
public interface Xop_tkn_itm extends Xop_tkn_grp {
byte Tkn_tid();
Xop_tkn_itm Tkn_ini_pos(boolean immutable, int bgn, int end);
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm_.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm_.java
similarity index 93%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm_.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm_.java
index 642be1294..60fcbd746 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm_.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public class Xop_tkn_itm_ {
public static final Xop_tkn_itm[] Ary_empty = new Xop_tkn_itm[0];
public static final byte
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm_base.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm_base.java
similarity index 96%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm_base.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm_base.java
index 4704a3f18..ebd186d59 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_itm_base.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_itm_base.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.tmpls.*;
public abstract class Xop_tkn_itm_base implements Xop_tkn_itm {
public abstract byte Tkn_tid();
public Xop_tkn_grp Tkn_grp() {return grp == null ? this : grp;} private Xop_tkn_grp grp; // NOTE: not sure about this; need to handle null refs when tkns are manipulated but not yet added to a group
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_mkr.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java
similarity index 97%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_mkr.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java
index 352355e1e..028063a04 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_mkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_mkr.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-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.xtns.cite.*; import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.paras.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
+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.xtns.cite.*; 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_tkn_mkr {
Xop_space_tkn space_tkn_immutable = new Xop_space_tkn(true, -1, -1);
public Xop_root_tkn Root(byte[] raw) {return new Xop_root_tkn().Root_src_(raw);}
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_null.java b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_null.java
similarity index 95%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_null.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_tkn_null.java
index 083ed194e..4f8320d4b 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_tkn_null.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_tkn_null.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.tmpls.*;
public class Xop_tkn_null implements Xop_tkn_itm {
public byte Tkn_tid() {return Xop_tkn_itm_.Tid_null;}
public boolean Tkn_immutable() {return true;}
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_txt_tkn.java b/400_xowa/src/gplx/xowa/parsers/Xop_txt_tkn.java
similarity index 95%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_txt_tkn.java
rename to 400_xowa/src/gplx/xowa/parsers/Xop_txt_tkn.java
index e24bd4ede..11f66bfb2 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_txt_tkn.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xop_txt_tkn.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
public class Xop_txt_tkn extends Xop_tkn_itm_base {
public Xop_txt_tkn(int bgn, int end) {this.Tkn_ini_pos(false, bgn, end);}
@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_txt;}
diff --git a/400_xowa/src/gplx/xowa/xtns/math/parsers/Mwm_tkn.java b/400_xowa/src/gplx/xowa/parsers/Xow_mw_parser_mgr.java
similarity index 62%
rename from 400_xowa/src/gplx/xowa/xtns/math/parsers/Mwm_tkn.java
rename to 400_xowa/src/gplx/xowa/parsers/Xow_mw_parser_mgr.java
index dad7b273b..4f70150d6 100644
--- a/400_xowa/src/gplx/xowa/xtns/math/parsers/Mwm_tkn.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xow_mw_parser_mgr.java
@@ -15,16 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa.xtns.math.parsers; import gplx.*; import gplx.xowa.*; import gplx.xowa.xtns.*; import gplx.xowa.xtns.math.*;
-interface Mwm_tkn {
- int Tid();
- Mwm_tkn__root Root();
- int Uid();
- int Src_bgn();
- int Src_end();
- void Src_end_(int v);
- Mwm_tkn Init(Mwm_tkn__root root, int tid, int uid, int src_bgn, int src_end);
- int Subs__len();
- Mwm_tkn Subs__get_at(int i);
- void To_bry(Bry_bfr bfr, int indent);
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.xndes.*;
+public class Xow_mw_parser_mgr {
+ public Xop_xnde_tag_regy Xnde_tag_regy() {return xnde_tag_regy;} private final Xop_xnde_tag_regy xnde_tag_regy = new Xop_xnde_tag_regy();
}
diff --git a/400_xowa/src_120_wiki/gplx/xowa/Xow_utl_mgr.java b/400_xowa/src/gplx/xowa/parsers/Xow_utl_mgr.java
similarity index 83%
rename from 400_xowa/src_120_wiki/gplx/xowa/Xow_utl_mgr.java
rename to 400_xowa/src/gplx/xowa/parsers/Xow_utl_mgr.java
index daaa1178b..736c69233 100644
--- a/400_xowa/src_120_wiki/gplx/xowa/Xow_utl_mgr.java
+++ b/400_xowa/src/gplx/xowa/parsers/Xow_utl_mgr.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.lnkes.*; import gplx.xowa.parsers.paras.*;
+package gplx.xowa.parsers; import gplx.*; import gplx.xowa.*;
+import gplx.xowa.parsers.apos.*; import gplx.xowa.parsers.amps.*; import gplx.xowa.parsers.lists.*; import gplx.xowa.parsers.lnkes.*; 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 Xow_utl_mgr {
public Xow_utl_mgr(Xowe_wiki wiki) {this.wiki = wiki;} private Xowe_wiki wiki;
public Xop_parser Anchor_encode_parser() {
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_num_tkn_chkr.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_num_tkn_chkr.java
new file mode 100644
index 000000000..8c733ac00
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_num_tkn_chkr.java
@@ -0,0 +1,28 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+public class Xop_html_num_tkn_chkr extends Xop_tkn_chkr_base {
+ @Override public Class> TypeOf() {return Xop_amp_tkn_num.class;}
+ @Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_html_ncr;}
+ public int Html_ncr_val() {return html_ncr_val;} public Xop_html_num_tkn_chkr Html_ncr_val_(int v) {html_ncr_val = v; return this;} private int html_ncr_val = -1;
+ @Override public int Chk_hook(Tst_mgr mgr, String path, Object actl_obj, int err) {
+ Xop_amp_tkn_num actl = (Xop_amp_tkn_num)actl_obj;
+ err += mgr.Tst_val(html_ncr_val == -1, path, "html_ncr_val", html_ncr_val, actl.Val());
+ return err;
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_txt_tkn_chkr.java b/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_txt_tkn_chkr.java
new file mode 100644
index 000000000..e9e4c744f
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/amps/Xop_html_txt_tkn_chkr.java
@@ -0,0 +1,28 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.parsers.amps; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+public class Xop_html_txt_tkn_chkr extends Xop_tkn_chkr_base {
+ @Override public Class> TypeOf() {return Xop_amp_tkn_txt.class;}
+ @Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_html_ref;}
+ public String Html_ref_key() {return html_ref_key;} public Xop_html_txt_tkn_chkr Html_ref_key_(String v) {html_ref_key = v; return this;} private String html_ref_key;
+ @Override public int Chk_hook(Tst_mgr mgr, String path, Object actl_obj, int err) {
+ Xop_amp_tkn_txt actl = (Xop_amp_tkn_txt)actl_obj;
+ err += mgr.Tst_val(html_ref_key == null, path, "html_ref_key", html_ref_key, String_.new_u8(actl.Xml_name_bry()));
+ return err;
+ }
+}
diff --git a/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java b/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java
index e522577b0..837aa488c 100644
--- a/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/hdrs/Xop_hdr_wkr.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 .
*/
package gplx.xowa.parsers.hdrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import gplx.xowa.parsers.xndes.*;
public class Xop_hdr_wkr implements Xop_ctx_wkr {
public void Ctor_ctx(Xop_ctx ctx) {}
public void Page_bgn(Xop_ctx ctx, Xop_root_tkn root) {}
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_colon_lxr.java b/400_xowa/src/gplx/xowa/parsers/lists/Xop_colon_lxr.java
similarity index 92%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_colon_lxr.java
rename to 400_xowa/src/gplx/xowa/parsers/lists/Xop_colon_lxr.java
index 371593c13..520ae3cf3 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_colon_lxr.java
+++ b/400_xowa/src/gplx/xowa/parsers/lists/Xop_colon_lxr.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import gplx.core.btries.*; import gplx.xowa.parsers.lists.*;
+package gplx.xowa.parsers.lists; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import gplx.core.btries.*;
public class Xop_colon_lxr implements Xop_lxr {
public byte Lxr_tid() {return Xop_lxr_.Tid_colon;}
public void Init_by_wiki(Xowe_wiki wiki, Btrie_fast_mgr core_trie) {core_trie.Add(Byte_ascii.Colon, this);}
diff --git a/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java b/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java
index 2371e896e..ae54f77e6 100644
--- a/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/lists/Xop_list_wkr.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.parsers.lists; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-import gplx.xowa.parsers.tblws.*;
+import gplx.xowa.parsers.tblws.*; import gplx.xowa.parsers.xndes.*;
public class Xop_list_wkr implements Xop_ctx_wkr {
private int listId = 0; byte[] curSymAry = new byte[Max_list_depth]; int curSymLen = 0; byte[] prvSymAry = Bry_.Empty;
private HierPosAryBldr posBldr = new HierPosAryBldr(Max_list_depth);
diff --git a/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr_brack_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr_brack_tst.java
index c924760e0..a1b65cac0 100644
--- a/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr_brack_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr_brack_tst.java
@@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
package gplx.xowa.parsers.lnkes; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
-import org.junit.*;
+import org.junit.*; import gplx.xowa.parsers.xndes.*;
public class Xop_lnke_wkr_brack_tst {
@Before public void init() {fxt.Reset();} private Xop_fxt fxt = new Xop_fxt();
@Test public void Brace_noText() {
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_tkn_chkr_lnke.java b/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_tkn_chkr_lnke.java
similarity index 93%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_tkn_chkr_lnke.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkes/Xop_tkn_chkr_lnke.java
index a8610bf84..399a2a0a3 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_tkn_chkr_lnke.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_tkn_chkr_lnke.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 .
*/
-package gplx.xowa; import gplx.*;
-import gplx.xowa.parsers.lnkes.*;
+package gplx.xowa.parsers.lnkes; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
public class Xop_tkn_chkr_lnke extends Xop_tkn_chkr_base {
@Override public Class> TypeOf() {return Xop_lnke_tkn.class;}
@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_lnke;}
diff --git a/400_xowa/src_300_html/gplx/xowa/Xop_link_parser.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_link_parser.java
similarity index 96%
rename from 400_xowa/src_300_html/gplx/xowa/Xop_link_parser.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_link_parser.java
index e80477686..7466cf93e 100644
--- a/400_xowa/src_300_html/gplx/xowa/Xop_link_parser.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_link_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.core.net.*; import gplx.xowa.wikis.xwikis.*;
import gplx.xowa.html.*; import gplx.xowa.html.lnkis.*; import gplx.xowa.html.hrefs.*;
public class Xop_link_parser {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_align_h.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_align_h.java
similarity index 91%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_align_h.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_align_h.java
index e4a903021..88142e316 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_align_h.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_align_h.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
public class Xop_lnki_align_h {
public static final byte Null = 0, None = 1, Left = 2, Center = 3, Right = 4;
public static final byte[][] Html_names = new byte[][]
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_arg_parser.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_arg_parser.java
similarity index 97%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_arg_parser.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_arg_parser.java
index 2810d2518..85553ad02 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_arg_parser.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_arg_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.core.primitives.*; import gplx.core.btries.*;
import gplx.xowa.langs.numbers.*;
public class Xop_lnki_arg_parser {
diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_log.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_log.java
new file mode 100644
index 000000000..eb9cc653d
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_log.java
@@ -0,0 +1,28 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+public class Xop_lnki_log {
+ private static final Gfo_msg_grp owner = Gfo_msg_grp_.new_(Xoa_app_.Nde, "lnki");
+ public static final Gfo_msg_itm
+ Upright_val_is_invalid = Gfo_msg_itm_.new_warn_(owner, "upright_val_is_invalid")
+ , Escaped_lnki = Gfo_msg_itm_.new_warn_(owner, "escaped_lnki")
+ , Key_is_empty = Gfo_msg_itm_.new_warn_(owner, "key_is_empty")
+ , Ext_is_missing = Gfo_msg_itm_.new_warn_(owner, "ext_is_missing")
+ , Invalid_ttl = Gfo_msg_itm_.new_warn_(owner, "invalid_ttl")
+ ;
+}
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_lxr_bgn.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_lxr_bgn.java
similarity index 93%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_lxr_bgn.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_lxr_bgn.java
index cb805f1d3..50186491a 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_lxr_bgn.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_lxr_bgn.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import gplx.core.btries.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import gplx.core.btries.*; import gplx.xowa.parsers.tmpls.*;
public class Xop_lnki_lxr_bgn implements Xop_lxr {
public byte Lxr_tid() {return Xop_lxr_.Tid_lnki_bgn;}
public void Init_by_wiki(Xowe_wiki wiki, Btrie_fast_mgr core_trie) {core_trie.Add(Xop_tkn_.Lnki_bgn, this);}
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_lxr_end.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_lxr_end.java
similarity index 88%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_lxr_end.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_lxr_end.java
index 9d9ad41e6..641c169fd 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_lxr_end.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_lxr_end.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import gplx.core.btries.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import gplx.core.btries.*; import gplx.xowa.parsers.tmpls.*;
public class Xop_lnki_lxr_end implements Xop_lxr {
public byte Lxr_tid() {return Xop_lxr_.Tid_lnki_end;}
public void Init_by_wiki(Xowe_wiki wiki, Btrie_fast_mgr core_trie) {core_trie.Add(Xop_tkn_.Lnki_end, this);}
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_tkn.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_tkn.java
similarity index 97%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_tkn.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_tkn.java
index b675a9bac..bb83bd5c5 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_tkn.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_tkn.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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.xowa.files.*; import gplx.xowa.html.*; import gplx.xowa.html.lnkis.*; import gplx.xowa.xtns.pfuncs.ttls.*;
+import gplx.xowa.parsers.tmpls.*;
public class Xop_lnki_tkn extends Xop_tkn_itm_base {
@Override public byte Tkn_tid() {return tkn_tid;} private byte tkn_tid = Xop_tkn_itm_.Tid_lnki;
public void Tkn_tid_to_txt() {tkn_tid = Xop_tkn_itm_.Tid_txt;}
diff --git a/400_xowa/src_400_parser/gplx/xowa/Xop_lnki_tkn_chkr.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_tkn_chkr.java
similarity index 97%
rename from 400_xowa/src_400_parser/gplx/xowa/Xop_lnki_tkn_chkr.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_tkn_chkr.java
index 0a23fb771..bd8de6f5b 100644
--- a/400_xowa/src_400_parser/gplx/xowa/Xop_lnki_tkn_chkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_tkn_chkr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.xowa.files.*;
public class Xop_lnki_tkn_chkr extends Xop_tkn_chkr_base {
@Override public Class> TypeOf() {return Xop_lnki_tkn.class;}
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_type.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_type.java
similarity index 95%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_type.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_type.java
index 320db20e7..49ebca35c 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_type.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_type.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
public class Xop_lnki_type {
public static final byte Id_null = 0, Id_none = 1, Id_frameless = 2, Id_frame = 4, Id_thumb = 8;
public static boolean Id_is_thumbable(byte id) {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr.java
similarity index 97%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr.java
index 51c96f0c1..b8e84d279 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr.java
@@ -15,9 +15,10 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.core.btries.*;
import gplx.xowa.wikis.*; import gplx.xowa.parsers.lnkis.redlinks.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.xtns.relatedSites.*;
+import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.miscs.*;
public class Xop_lnki_wkr implements Xop_ctx_wkr, Xop_arg_wkr {
private Arg_bldr arg_bldr = Arg_bldr._;
private Number_parser number_parser = new Number_parser();
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr_.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr_.java
similarity index 95%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr_.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr_.java
index 90f8a8ced..eae7644d1 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr_.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr_.java
@@ -15,9 +15,10 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.core.primitives.*; import gplx.core.btries.*;
-import gplx.xowa.wikis.*; import gplx.xowa.parsers.lnkis.redlinks.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.xtns.relatedSites.*;
+import gplx.xowa.wikis.*; import gplx.xowa.xtns.pfuncs.ttls.*; import gplx.xowa.xtns.relatedSites.*;
+import gplx.xowa.parsers.tmpls.*; import gplx.xowa.parsers.lnkis.redlinks.*;
public class Xop_lnki_wkr_ {
private static final Int_obj_ref rel2abs_tid = Int_obj_ref.zero_();
public static final int Invalidate_lnki_len = 128;
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__basic_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java
similarity index 97%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__basic_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java
index 8cde8d433..7de62d1f7 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__basic_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__basic_tst.java
@@ -15,9 +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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
-import gplx.xowa.langs.cases.*; import gplx.xowa.parsers.paras.*;
+import gplx.xowa.langs.cases.*; import gplx.xowa.parsers.paras.*; import gplx.xowa.wikis.ttls.*;
public class Xop_lnki_wkr__basic_tst {
@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private Xop_fxt fxt = new Xop_fxt();
@Test public void Basic() {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__ctg_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__ctg_tst.java
similarity index 95%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__ctg_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__ctg_tst.java
index 043af4a94..fbbf96c67 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__ctg_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__ctg_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
import gplx.xowa.langs.cases.*;
public class Xop_lnki_wkr__ctg_tst {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__invalid_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__invalid_tst.java
similarity index 94%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__invalid_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__invalid_tst.java
index 5b5f44bc3..787c781d6 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__invalid_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__invalid_tst.java
@@ -15,9 +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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
-import gplx.xowa.langs.cases.*;
+import gplx.xowa.langs.cases.*; import gplx.xowa.wikis.ttls.*;
public class Xop_lnki_wkr__invalid_tst {
@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private Xop_fxt fxt = new Xop_fxt();
@Test public void Ignore_invalid_url_encodings() { // PURPOSE: if url encoding is invalid, still render lnki as ; EX: fr.w:Bordetella;
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__link_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__link_tst.java
similarity index 97%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__link_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__link_tst.java
index 9792ca857..4bc58c2d3 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__link_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__link_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
import gplx.xowa.langs.cases.*;
public class Xop_lnki_wkr__link_tst {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__pre_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__pre_tst.java
similarity index 95%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__pre_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__pre_tst.java
index b1ec1c818..2b0ce5a9a 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__pre_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__pre_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
import gplx.xowa.langs.cases.*;
public class Xop_lnki_wkr__pre_tst {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__size_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__size_tst.java
similarity index 94%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__size_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__size_tst.java
index 8b3163ca5..9fbc44327 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__size_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__size_tst.java
@@ -15,8 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
-import org.junit.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import org.junit.*; import gplx.xowa.parsers.xndes.*;
public class Xop_lnki_wkr__size_tst {
@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private final Xop_fxt fxt = new Xop_fxt();
@Test public void Width__w__ws() {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__subpage_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__subpage_tst.java
similarity index 94%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__subpage_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__subpage_tst.java
index 38ad51ed4..14af291a0 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__subpage_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__subpage_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
public class Xop_lnki_wkr__subpage_tst {
@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private Xop_fxt fxt = new Xop_fxt();
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__uncommon_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__uncommon_tst.java
similarity index 96%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__uncommon_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__uncommon_tst.java
index ef16f0adb..f43ae77ec 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__uncommon_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__uncommon_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
import gplx.xowa.langs.cases.*;
public class Xop_lnki_wkr__uncommon_tst {
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__video_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__video_tst.java
similarity index 93%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__video_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__video_tst.java
index f9fca27dd..185f9574c 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__video_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__video_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*; import gplx.xowa.files.*;
public class Xop_lnki_wkr__video_tst {
@Before public void init() {fxt.Reset(); fxt.Init_para_n_();} private Xop_fxt fxt = new Xop_fxt();
diff --git a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__xwiki_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_tst.java
similarity index 96%
rename from 400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__xwiki_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_tst.java
index 506d51059..efd67ef0c 100644
--- a/400_xowa/src_440_lnki/gplx/xowa/Xop_lnki_wkr__xwiki_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/Xop_lnki_wkr__xwiki_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.lnkis; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
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();
diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java b/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java
index 0c51b83cd..f5053bb8c 100644
--- a/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.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 .
*/
package gplx.xowa.parsers.lnkis.redlinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*;
+import gplx.core.primitives.*;
import gplx.xowa.wikis.data.tbls.*;
import gplx.xowa.langs.vnts.*; import gplx.xowa.gui.views.*; import gplx.xowa.pages.*; import gplx.xowa.html.hdumps.core.*;
+import gplx.xowa.parsers.tmpls.*;
public class Xog_redlink_mgr implements GfoInvkAble {
private Xog_win_itm win; private Xog_html_itm html_itm; private Xowe_wiki wiki; private Xoae_page page;
private Xopg_redlink_lnki_list redlink_lnki_list; private List_adp lnki_list; private boolean log_enabled; private Gfo_usr_dlg usr_dlg; private int thread_id;
diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xopg_redlink_idx_list.java b/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xopg_redlink_idx_list.java
index 9c371057a..fbece6f1c 100644
--- a/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xopg_redlink_idx_list.java
+++ b/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xopg_redlink_idx_list.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 .
*/
package gplx.xowa.parsers.lnkis.redlinks; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*; import gplx.xowa.parsers.lnkis.*;
+import gplx.core.primitives.*;
public class Xopg_redlink_idx_list {
private final Int_list list = new Int_list();
public int Len() {return list.Len();}
diff --git a/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java b/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java
index 95f91efac..7e766ceb5 100644
--- a/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java
+++ b/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java
@@ -17,6 +17,7 @@ along with this program. If not, see .
*/
package gplx.xowa.parsers.logs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.dbs.*;
+import gplx.xowa.parsers.xndes.*;
public class Xop_log_basic_wkr implements GfoInvkAble {
private Xop_log_mgr log_mgr; private Xop_log_basic_tbl log_tbl;
private boolean save_page_ttl, save_log_time, save_args_len, save_args_str;
diff --git a/400_xowa/src_405_tkn/gplx/xowa/Xop_bry_tkn.java b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_bry_tkn.java
similarity index 88%
rename from 400_xowa/src_405_tkn/gplx/xowa/Xop_bry_tkn.java
rename to 400_xowa/src/gplx/xowa/parsers/miscs/Xop_bry_tkn.java
index d3c69df58..8a8a40292 100644
--- a/400_xowa/src_405_tkn/gplx/xowa/Xop_bry_tkn.java
+++ b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_bry_tkn.java
@@ -15,7 +15,8 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.miscs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+import gplx.xowa.parsers.tmpls.*;
public class Xop_bry_tkn extends Xop_tkn_itm_base {
public Xop_bry_tkn(int bgn, int end, byte[] val) {this.val = val; this.Tkn_ini_pos(false, bgn, end);}
@Override public byte Tkn_tid() {return Xop_tkn_itm_.Tid_bry;}
diff --git a/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_log.java b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_log.java
new file mode 100644
index 000000000..2377eff52
--- /dev/null
+++ b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_log.java
@@ -0,0 +1,24 @@
+/*
+XOWA: the XOWA Offline Wiki Application
+Copyright (C) 2012 gnosygnu@gmail.com
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see .
+*/
+package gplx.xowa.parsers.miscs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
+public class Xop_comm_log {
+ private static final Gfo_msg_grp owner = Gfo_msg_grp_.new_(Xoa_app_.Nde, "comment");
+ public static final Gfo_msg_itm
+ Eos = Gfo_msg_itm_.new_warn_(owner, "eos")
+ ;
+}
diff --git a/400_xowa/src_409_tkn_misc/gplx/xowa/Xop_comm_lxr.java b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_lxr.java
similarity index 94%
rename from 400_xowa/src_409_tkn_misc/gplx/xowa/Xop_comm_lxr.java
rename to 400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_lxr.java
index aa72c8d04..273a908cc 100644
--- a/400_xowa/src_409_tkn_misc/gplx/xowa/Xop_comm_lxr.java
+++ b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_lxr.java
@@ -15,7 +15,7 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.miscs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import gplx.core.btries.*; import gplx.xowa.parsers.paras.*;
public class Xop_comm_lxr implements Xop_lxr {
public byte Lxr_tid() {return Xop_lxr_.Tid_comment;}
@@ -26,7 +26,7 @@ public class Xop_comm_lxr implements Xop_lxr {
int end_pos = Bry_finder.Find_fwd(src, End_ary, cur_pos, src_len); // search for "-->" // NOTE: do not reuse cur_pos, else cur_pos may become -1 and fatal error in ctx.Msg_log() below; DATE:2014-06-08
int rhs_bgn = end_pos;
if (end_pos == Bry_finder.Not_found) { // "-->" not found
- ctx.Msg_log().Add_itm_none(Xop_comment_log.Eos, src, bgn_pos, cur_pos);
+ ctx.Msg_log().Add_itm_none(Xop_comm_log.Eos, src, bgn_pos, cur_pos);
cur_pos = src_len; // gobble up rest of content
}
else
diff --git a/400_xowa/src_409_tkn_misc/gplx/xowa/Xop_comm_lxr_tst.java b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_lxr_tst.java
similarity index 91%
rename from 400_xowa/src_409_tkn_misc/gplx/xowa/Xop_comm_lxr_tst.java
rename to 400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_lxr_tst.java
index b9f604326..4eecac0a5 100644
--- a/400_xowa/src_409_tkn_misc/gplx/xowa/Xop_comm_lxr_tst.java
+++ b/400_xowa/src/gplx/xowa/parsers/miscs/Xop_comm_lxr_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 .
*/
-package gplx.xowa; import gplx.*;
+package gplx.xowa.parsers.miscs; import gplx.*; import gplx.xowa.*; import gplx.xowa.parsers.*;
import org.junit.*;
public class Xop_comm_lxr_tst {
private Xop_fxt fxt = new Xop_fxt();
@@ -23,7 +23,7 @@ public class Xop_comm_lxr_tst {
fxt.Test_parse_page_all_str("ac", "ac");
}
@Test public void Err() {
- fxt.Init_log_(Xop_comment_log.Eos).Test_parse_page_all_str(" will have key of " will have key of "