mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v1.7.3.1
This commit is contained in:
@@ -32,4 +32,5 @@ public class Io_zip_mgr_mok implements Io_zip_mgr {
|
||||
}
|
||||
public void Unzip_to_dir(Io_url src_fil, Io_url trg_dir) {}
|
||||
private static final byte[] Bry_zipped = Bry_.new_utf8_("zipped:");
|
||||
public static final Io_zip_mgr_mok _ = new Io_zip_mgr_mok(); Io_zip_mgr_mok() {}
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ class Tst_chkr_null implements Tst_chkr {
|
||||
public Class<?> TypeOf() {return Object.class;}
|
||||
public int Chk(Tst_mgr mgr, String path, Object actl) {
|
||||
mgr.Results().Add(Tst_itm.fail_("!=", path, "<cast type>", "<NULL TYPE>", ClassAdp_.NameOf_obj(actl)));
|
||||
// mgr.Results().Add(Tst_itm.fail_("!=", path, "<cast value>", "<NULL VAL>", Object_.XtoStr_OrNull(actl)));
|
||||
// mgr.Results().Add(Tst_itm.fail_("!=", path, "<cast value>", "<NULL VAL>", Object_.Xto_str_strict_or_null(actl)));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ public class Tst_mgr {
|
||||
if (actl_obj == null || !ClassAdp_.IsAssignableFrom(expd_obj.TypeOf(), actl_obj.getClass())) {
|
||||
results.Add(Tst_itm.fail_("!=", path, "<cast type>", ClassAdp_.NameOf_type(expd_obj.TypeOf()), actl_type));
|
||||
return 1;
|
||||
// results.Add(Tst_itm.fail_("!=", path, "<cast value>", Object_.XtoStr_OrNull(expd_obj.ValueOf()), Object_.XtoStr_OrNull(actl_obj)));
|
||||
// results.Add(Tst_itm.fail_("!=", path, "<cast value>", Object_.Xto_str_strict_or_null(expd_obj.ValueOf()), Object_.Xto_str_strict_or_null(actl_obj)));
|
||||
}
|
||||
else {
|
||||
return expd_obj.Chk(this, path, actl_obj);
|
||||
@@ -83,7 +83,7 @@ public class Tst_mgr {
|
||||
int len = Array_.Len(ary);
|
||||
for (int i = 0; i < len; i++) {
|
||||
Object itm = Array_.FetchAt(ary, i);
|
||||
ary_sb.Add(Object_.XtoStr_OrNullStr(itm)).Add(",");
|
||||
ary_sb.Add(Object_.Xto_str_strict_or_null_mark(itm)).Add(",");
|
||||
}
|
||||
return ary_sb.XtoStrAndClear();
|
||||
} String_bldr ary_sb = String_bldr_.new_();
|
||||
@@ -119,8 +119,8 @@ class Tst_itm {
|
||||
public static Tst_itm eq_(boolean skip, String path, String name, Object expd, Object actl) {
|
||||
boolean pass = skip ? true : Object_.Eq(expd, actl);
|
||||
String comp = pass ? "==" : "!=";
|
||||
String expd_str = Object_.XtoStr_OrNullStr(expd);
|
||||
String actl_str = Object_.XtoStr_OrNullStr(actl);
|
||||
String expd_str = Object_.Xto_str_strict_or_null_mark(expd);
|
||||
String actl_str = Object_.Xto_str_strict_or_null_mark(actl);
|
||||
if (skip) expd_str = actl_str;
|
||||
return new_(skip, pass, comp, path, name, expd_str, actl_str);
|
||||
}
|
||||
|
||||
@@ -31,6 +31,15 @@ public class Url_encoder implements Url_encoder_interface {
|
||||
}
|
||||
decode_ary[primary_encode_marker] = hex;
|
||||
}
|
||||
public void Itms_raw_diff_many(byte primary_encode_marker, int... ary) {
|
||||
Url_encoder_itm_hex hex = new Url_encoder_itm_hex(primary_encode_marker);
|
||||
int ary_len = ary.length;
|
||||
for (int i = 0; i < ary_len; i++) {
|
||||
encode_ary[ary[i]] = hex;
|
||||
decode_ary[ary[i]] = hex;
|
||||
}
|
||||
decode_ary[primary_encode_marker] = hex;
|
||||
}
|
||||
public void Itms_decode_marker(byte decode_marker) {
|
||||
Url_encoder_itm_hex hex = new Url_encoder_itm_hex(decode_marker);
|
||||
decode_ary[decode_marker & 0xff] = hex;// PATCH.JAVA:need to convert to unsigned byte
|
||||
@@ -207,6 +216,15 @@ public class Url_encoder implements Url_encoder_interface {
|
||||
rv.anchor_encoder = new_html_id_();
|
||||
return rv;
|
||||
}
|
||||
public static Url_encoder new_html_href_quotes_() {
|
||||
Url_encoder rv = new Url_encoder();
|
||||
rv.Itms_ini(Byte_ascii.Percent);
|
||||
rv.Itms_raw_same_rng(0, 255); // default everything to same;
|
||||
rv.Itms_raw_diff_many(Byte_ascii.Percent
|
||||
, Byte_ascii.Apos, Byte_ascii.Quote, Byte_ascii.Lt, Byte_ascii.Gt); // encode ', ", <, >
|
||||
rv.Itms_raw_diff(Byte_ascii.Space, Byte_ascii.Underline); // convert " " to "_"
|
||||
return rv;
|
||||
}
|
||||
public static Url_encoder url_comma() {
|
||||
Url_encoder rv = new Url_encoder();
|
||||
rv.Itms_ini(Byte_ascii.Percent);
|
||||
|
||||
Reference in New Issue
Block a user