1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

'v3.3.4.1'

This commit is contained in:
gnosygnu
2016-03-27 23:44:59 -04:00
parent de67253a9c
commit baaef32df2
903 changed files with 13339 additions and 8695 deletions

View File

@@ -83,13 +83,13 @@ public class Xow_ns implements GfoInvkAble {
if (aliases == null) aliases = Ordered_hash_.New();
aliases.Add_if_dupe_use_1st(alias, alias);
} private Ordered_hash aliases;
public KeyVal[] Aliases_as_scrib_ary() { // NOTE: intended for Scrib_lib_site; DATE:2014-02-15
if (aliases == null) return KeyVal_.Ary_empty;
public Keyval[] Aliases_as_scrib_ary() { // NOTE: intended for Scrib_lib_site; DATE:2014-02-15
if (aliases == null) return Keyval_.Ary_empty;
int len = aliases.Count();
KeyVal[] rv = new KeyVal[len];
Keyval[] rv = new Keyval[len];
for (int i = 0; i < len; i++) {
String alias = (String)aliases.Get_at(i);
rv[i] = KeyVal_.int_(i + List_adp_.Base1, alias);
rv[i] = Keyval_.int_(i + List_adp_.Base1, alias);
}
return rv;
}

View File

@@ -83,7 +83,7 @@ public class Xow_ns_mgr implements GfoInvkAble, gplx.core.lists.ComparerAble {
}
public void Aliases_clear() {aliases.Clear();}
public Xow_ns_mgr Aliases_add(int ns_id, String name) {
KeyVal kv = KeyVal_.new_(name, Int_obj_val.new_(ns_id));
Keyval kv = Keyval_.new_(name, Int_obj_val.new_(ns_id));
aliases.Add_if_dupe_use_nth(name, kv);
return this;
}
@@ -108,7 +108,7 @@ public class Xow_ns_mgr implements GfoInvkAble, gplx.core.lists.ComparerAble {
}
int aliases_len = aliases.Count();
for (int i = 0; i < aliases_len; i++) {
KeyVal kv = (KeyVal)aliases.Get_at(i);
Keyval kv = (Keyval)aliases.Get_at(i);
int ns_id = ((Int_obj_val)kv.Val()).Val();
Xow_ns ns = Ids_get_or_null(ns_id); if (ns == null) continue; // happens when alias exists, but not ns; EX: test has Image alias, but not File alias; should not happen "live" but don't want to fail
ns.Aliases_add(kv.Key()); // register alias with official ns; EX: "Image" will be placed in "File"'s .Aliases