Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

v2.8.3.1

Browse Source
This commit is contained in:
gnosygnu 2015-08-17 02:09:16 -04:00
parent 34c34f227c
commit df10db140c
421 changed files with 4867 additions and 2429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
100_core/src/gplx/Err.java
View File

@ -47,7 +47,7 @@ public class Err extends RuntimeException {
public String To_str__full() {return To_str(Bool_.N, Bool_.Y);}
public String To_str__log() {return To_str(Bool_.Y, Bool_.Y);}
public String To_str__msg_only(){
return msgs_idx == 0 ? "<<MISSING ERROR MESSAGE>>" : msgs_ary[0].To_str(); // take 1st message only
return msgs_idx == 0 ? "<<MISSING ERROR MESSAGE>>" : msgs_ary[0].To_str_wo_type(); // take 1st message only
}
public String To_str__top_wo_args() {
return msgs_idx == 0 ? "<<MISSING ERROR MESSAGE>>" : msgs_ary[0].To_str_wo_args();

11
100_core/src/gplx/Err_.java
View File

@ -50,17 +50,18 @@ public class Err_ {
}
public static String Message_lang(Exception e) {return e.getMessage();}
public static String Trace_lang(Exception e) {
String rv = "";
StackTraceElement[] ary = e.getStackTrace();
public static String Trace_lang(Exception e) {return Trace_lang_exec(e.getStackTrace());}
public static String Trace_lang(Error e) {return Trace_lang_exec(e.getStackTrace());}
private static String Trace_lang_exec(StackTraceElement[] ary) {
String rv = "";
int len = ary.length;
for (int i = 0; i < len; i++) {
if (i != 0) rv += "\n";
rv += ary[i].toString();
}
return rv;
}
public static boolean Type_match(Exception e, String type) {
}
public static boolean Type_match(Exception e, String type) {
Err exc = Err_.as_(e);
return exc == null ? false : exc.Type_match(type);
}

20
100_core/src/gplx/core/btries/Btrie_fast_mgr.java
View File

@ -110,11 +110,11 @@ public class Btrie_fast_mgr {
}
return dirty ? tmp_bfr.Xto_bry_and_clear() : src;
}
public static Btrie_fast_mgr cs_() {return new Btrie_fast_mgr(false);}
public static Btrie_fast_mgr ci_ascii_() {return new Btrie_fast_mgr(true);}
public static Btrie_fast_mgr cs() {return new Btrie_fast_mgr(Bool_.N);}
public static Btrie_fast_mgr ci_a7() {return new Btrie_fast_mgr(Bool_.Y);}
public static Btrie_fast_mgr new_(boolean case_any) {return new Btrie_fast_mgr(case_any);}
Btrie_fast_mgr(boolean caseAny) {
root = new ByteTrieItm_fast(Byte_.Zero, null, caseAny);
Btrie_fast_mgr(boolean case_any) {
root = new ByteTrieItm_fast(Byte_.Zero, null, case_any);
}
}
class ByteTrieItm_fast {
@ -122,7 +122,7 @@ class ByteTrieItm_fast {
public byte Key_byte() {return key_byte;} private byte key_byte;
public Object Val() {return val;} public void Val_set(Object val) {this.val = val;} Object val;
public boolean Ary_is_empty() {return ary_is_empty;} private boolean ary_is_empty;
public boolean CaseAny() {return caseAny;} public ByteTrieItm_fast CaseAny_(boolean v) {caseAny = v; return this;} private boolean caseAny;
public boolean CaseAny() {return case_any;} public ByteTrieItm_fast CaseAny_(boolean v) {case_any = v; return this;} private boolean case_any;
public void Clear() {
val = null;
for (int i = 0; i < 256; i++) {
@ -135,22 +135,22 @@ class ByteTrieItm_fast {
ary_is_empty = true;
}
public ByteTrieItm_fast Ary_find(byte b) {
int key_byte = (caseAny && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
int key_byte = (case_any && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
return ary[key_byte];
}
public ByteTrieItm_fast Ary_add(byte b, Object val) {
int key_byte = (caseAny && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
ByteTrieItm_fast rv = new ByteTrieItm_fast(b, val, caseAny);
int key_byte = (case_any && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
ByteTrieItm_fast rv = new ByteTrieItm_fast(b, val, case_any);
ary[key_byte] = rv;
++ary_len;
ary_is_empty = false;
return rv;
}
public void Ary_del(byte b) {
int key_byte = (caseAny && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
int key_byte = (case_any && (b > 64 && b < 91) ? b + 32 : b) & 0xff;// PATCH.JAVA:need to convert to unsigned byte
ary[key_byte] = null;
--ary_len;
ary_is_empty = ary_len == 0;
} int ary_len = 0;
public ByteTrieItm_fast(byte key_byte, Object val, boolean caseAny) {this.key_byte = key_byte; this.val = val; this.caseAny = caseAny;}
public ByteTrieItm_fast(byte key_byte, Object val, boolean case_any) {this.key_byte = key_byte; this.val = val; this.case_any = case_any;}
}

2
100_core/src/gplx/core/btries/Btrie_fast_mgr_tst.java
View File

@ -59,7 +59,7 @@ public class Btrie_fast_mgr_tst {
class Btrie_fast_mgr_fxt {
private Btrie_fast_mgr trie;
public void Clear() {
trie = Btrie_fast_mgr.cs_();
trie = Btrie_fast_mgr.cs();
Init_add( 1 , Byte_ascii.Ltr_a);
Init_add(123 , Byte_ascii.Ltr_a, Byte_ascii.Ltr_b, Byte_ascii.Ltr_c);
}

2
100_core/src/gplx/core/btries/Btrie_slim_itm_tst.java
View File

@ -44,6 +44,6 @@ public class Btrie_slim_itm_tst {
Object actl = actl_itm == null ? null : actl_itm.Val();
Tfds.Eq(expd, actl);
}
private void run_Add(byte... ary) {for (byte b : ary) itm.Ary_add(b, Char_.XtoStr((char)b));}
private void run_Add(byte... ary) {for (byte b : ary) itm.Ary_add(b, Char_.To_str((char)b));}
private void run_Del(byte... ary) {for (byte b : ary) itm.Ary_del(b);}
}

2
100_core/src/gplx/core/criterias/Criteria.java
View File

@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.core.criterias; import gplx.*; import gplx.core.*;
public interface Criteria extends XtoStrAble {
public interface Criteria extends To_str_able {
byte Tid();
boolean Matches(Object obj);
void Val_from_args(Hash_adp args);

2
100_core/src/gplx/core/criterias/Criteria_between.java
View File

@ -28,7 +28,7 @@ public class Criteria_between implements Criteria {
}
public Comparable Lhs() {return lhs;} private Comparable lhs;
public Comparable Rhs() {return rhs;} private Comparable rhs;
public String XtoStr() {return String_.Concat_any("BETWEEN ", lhs, " AND ", rhs);}
public String To_str() {return String_.Concat_any("BETWEEN ", lhs, " AND ", rhs);}
public boolean Matches(Object compObj) {
Comparable comp = CompareAble_.as_(compObj);
int lhsResult = CompareAble_.CompareComparables(lhs, comp);

6
100_core/src/gplx/core/criterias/Criteria_bool_base.java
View File

@ -22,7 +22,7 @@ public abstract class Criteria_bool_base implements Criteria {
public abstract boolean Matches(Object curVal);
public void Val_from_args(Hash_adp args) {lhs.Val_from_args(args); rhs.Val_from_args(args);}
public void Val_as_obj_(Object v) {throw Err_.new_unimplemented();}
public String XtoStr() {return String_.Concat(lhs.XtoStr(), " ", this.op_literal, " ", rhs.XtoStr());}
public String To_str() {return String_.Concat(lhs.To_str(), " ", this.op_literal, " ", rhs.To_str());}
public String Op_literal() {return op_literal;} private String op_literal;
public Criteria Lhs() {return lhs;} private Criteria lhs;
public Criteria Rhs() {return rhs;} private Criteria rhs;
@ -44,7 +44,7 @@ class Criteria_const implements Criteria {
public boolean Matches(Object comp) {return val;} private final boolean val;
public void Val_from_args(Hash_adp args) {;}
public void Val_as_obj_(Object v) {throw Err_.new_unimplemented();}
public String XtoStr() {return String_.Concat(" IS ", Bool_.Xto_str_lower(val));}
public String To_str() {return String_.Concat(" IS ", Bool_.Xto_str_lower(val));}
}
class Criteria_not implements Criteria {
private final Criteria criteria;
@ -53,5 +53,5 @@ class Criteria_not implements Criteria {
public boolean Matches(Object obj) {return !criteria.Matches(obj);}
public void Val_from_args(Hash_adp args) {criteria.Val_from_args(args);}
public void Val_as_obj_(Object v) {criteria.Val_as_obj_(v);}
public String XtoStr() {return String_.Concat_any(" NOT ", criteria.XtoStr());}
public String To_str() {return String_.Concat_any(" NOT ", criteria.To_str());}
}

2
100_core/src/gplx/core/criterias/Criteria_comp.java
View File

@ -27,7 +27,7 @@ public class Criteria_comp implements Criteria {
Comparable comp = CompareAble_.as_(compObj);
return CompareAble_.Is(comp_mode, comp, val);
}
public String XtoStr() {return String_.Concat_any(XtoSymbol(), " ", val);}
public String To_str() {return String_.Concat_any(XtoSymbol(), " ", val);}
public String XtoSymbol() {
String comp_sym = comp_mode < CompareAble_.Same ? "<" : ">";
String eq_sym = comp_mode % 2 == CompareAble_.Same ? "=" : "";

2
100_core/src/gplx/core/criterias/Criteria_eq.java
View File

@ -29,6 +29,6 @@ public class Criteria_eq implements Criteria {
boolean rv = Object_.Eq(val, comp);
return negated ? !rv : rv;
}
public String XtoStr() {return String_.Concat_any("= ", val);}
public String To_str() {return String_.Concat_any("= ", val);}
public static Criteria_eq as_(Object obj) {return obj instanceof Criteria_eq ? (Criteria_eq)obj : null;}
}

2
100_core/src/gplx/core/criterias/Criteria_fld.java
View File

@ -33,7 +33,7 @@ public class Criteria_fld implements Criteria {
Object comp = GfoInvkAble_.InvkCmd(invk, key);
return crt.Matches(comp);
}
public String XtoStr() {return String_.Concat(key, " ", crt.XtoStr());}
public String To_str() {return String_.Concat(key, " ", crt.To_str());}
public static final String Key_null = null;
public static Criteria_fld as_(Object obj) {return obj instanceof Criteria_fld ? (Criteria_fld)obj : null;}
public static Criteria_fld new_(String key, Criteria crt) {return new Criteria_fld(key, crt);}

2
100_core/src/gplx/core/criterias/Criteria_in.java
View File

@ -41,6 +41,6 @@ public class Criteria_in implements Criteria {
}
return negated ? !rv : rv;
}
public String XtoStr() {return String_.Concat_any("IN ", String_.Concat_any(ary));}
public String To_str() {return String_.Concat_any("IN ", String_.Concat_any(ary));}
public static Criteria_in as_(Object obj) {return obj instanceof Criteria_in ? (Criteria_in)obj : null;}
}

2
100_core/src/gplx/core/criterias/Criteria_ioMatch.java
View File

@ -29,7 +29,7 @@ public class Criteria_ioMatch implements Criteria { // EX: url IOMATCH '*.xml|*.
boolean rv = pattern.Matches(comp.XtoCaseNormalized());
return match ? rv : !rv;
}
public String XtoStr() {return String_.Concat_any("IOMATCH ", pattern);}
public String To_str() {return String_.Concat_any("IOMATCH ", pattern);}
public static final String TokenName = "IOMATCH";
public static Criteria_ioMatch as_(Object obj) {return obj instanceof Criteria_ioMatch ? (Criteria_ioMatch)obj : null;}

2
100_core/src/gplx/core/criterias/Criteria_like.java
View File

@ -31,6 +31,6 @@ public class Criteria_like implements Criteria {
boolean rv = pattern.Matches(comp);
return negated ? !rv : rv;
}
public String XtoStr() {return String_.Concat_any("LIKE ", pattern);}
public String To_str() {return String_.Concat_any("LIKE ", pattern);}
public static Criteria_like as_(Object obj) {return obj instanceof Criteria_like ? (Criteria_like)obj : null;}
}

2
100_core/src/gplx/core/regxs/Regx_adp__tst.java
View File

@ -84,7 +84,7 @@ public class Regx_adp__tst implements TfdsEqListItmStr {
}
return rv.To_str_ary();
}
public String XtoStr(Object curObj, Object expdObj) {
public String To_str(Object curObj, Object expdObj) {
Regx_match cur = (Regx_match)curObj, expd = (Regx_match)expdObj;
String rv = "bgn=" + cur.Find_bgn();
if (expd != null && expd.Find_len() != Int_.MinValue) rv += " len=" + cur.Find_len();

2
100_core/src/gplx/core/regxs/Regx_bldr.java
View File

@ -30,7 +30,7 @@ public class Regx_bldr {
sb.Add(Regx_bldr.Tkn_Escape);
sb.Add(c);
}
return sb.XtoStr();
return sb.To_str();
}
public static boolean RegxChar_chk(char c) {
return

12
100_core/src/gplx/core/strings/String_bldr.java
View File

@ -31,7 +31,7 @@ public interface String_bldr {
String_bldr Add_spr_unless_first(String s, String spr, int i);
String_bldr Clear();
String Xto_str_and_clear();
String XtoStr();
String To_str();
int Count();
String_bldr Add(byte[] v);
String_bldr Add(String s);
@ -71,12 +71,12 @@ abstract class String_bldr_base implements String_bldr {
}
public String_bldr Clear() {Del(0, Count()); return this;}
public String Xto_str_and_clear() {
String rv = XtoStr();
String rv = To_str();
Clear();
return rv;
}
@Override public String toString() {return XtoStr();}
public abstract String XtoStr();
@Override public String toString() {return To_str();}
public abstract String To_str();
public abstract int Count();
public abstract String_bldr Add_at(int idx, String s);
public abstract String_bldr Add(byte[] v);
@ -89,7 +89,7 @@ abstract class String_bldr_base implements String_bldr {
}
class String_bldr_thread_single extends String_bldr_base {
private java.lang.StringBuilder sb = new java.lang.StringBuilder();
@Override public String XtoStr() {return sb.toString();}
@Override public String To_str() {return sb.toString();}
@Override public int Count() {return sb.length();}
@Override public String_bldr Add_at(int idx, String s) {sb.insert(idx, s); return this;}
@Override public String_bldr Add(byte[] v) {sb.append(String_.new_u8(v)); return this;}
@ -102,7 +102,7 @@ class String_bldr_thread_single extends String_bldr_base {
}
class String_bldr_thread_multiple extends String_bldr_base {
private java.lang.StringBuffer sb = new java.lang.StringBuffer();
@Override public String XtoStr() {return sb.toString();}
@Override public String To_str() {return sb.toString();}
@Override public int Count() {return sb.length();}
@Override public String_bldr Add_at(int idx, String s) {sb.insert(idx, s); return this;}
@Override public String_bldr Add(byte[] v) {sb.append(String_.new_u8(v)); return this;}

4
100_core/src_100_interface/gplx/RlsAble_.java
View File

@ -19,4 +19,8 @@ package gplx;
public class RlsAble_ {
public static RlsAble as_(Object obj) {return obj instanceof RlsAble ? (RlsAble)obj : null;}
public static RlsAble cast_(Object obj) {try {return (RlsAble)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, RlsAble.class, obj);}}
public static final RlsAble Null = new RlsAble__noop();
}
class RlsAble__noop implements RlsAble {
public void Rls() {}
}

16
100_core/src_100_interface/gplx/SrlAble_.java
View File

@ -19,18 +19,18 @@ package gplx;
import gplx.core.strings.*;
public class SrlAble_ {
public static SrlAble as_(Object obj) {return obj instanceof SrlAble ? (SrlAble)obj : null;}
public static String XtoStr(GfoMsg owner) {
public static String To_str(GfoMsg owner) {
String_bldr sb = String_bldr_.new_();
XtoStr(owner, sb, 0, false);
return sb.XtoStr();
To_str(owner, sb, 0, false);
return sb.To_str();
}
public static String XtoStr(Object o) {
public static String To_str(Object o) {
SrlAble s = SrlAble_.as_(o); if (s == null) return Object_.Xto_str_strict_or_null_mark(o);
GfoMsg m = GfoMsg_.new_parse_("root");
s.Srl(m);
return XtoStr(m);
return To_str(m);
}
static void XtoStr(GfoMsg owner, String_bldr sb, int depth, boolean indentOn) {
static void To_str(GfoMsg owner, String_bldr sb, int depth, boolean indentOn) {
String indent = String_.Repeat(" ", depth * 4);
if (indentOn) sb.Add(indent);
sb.Add(owner.Key()).Add(":");
@ -46,7 +46,7 @@ public class SrlAble_ {
}
else if (subsCount == 1) {
sb.Add("{");
XtoStr(owner.Subs_getAt(0), sb, depth + 1, false);
To_str(owner.Subs_getAt(0), sb, depth + 1, false);
sb.Add("}");
return;
}
@ -55,7 +55,7 @@ public class SrlAble_ {
if (subsCount > 1) sb.Add_char_crlf();
for (int i = 0; i < subsCount; i++) {
GfoMsg sub = owner.Subs_getAt(i);
XtoStr(sub, sb, depth + 1, true);
To_str(sub, sb, depth + 1, true);
sb.Add_char_crlf();
}
sb.Add(indent);

2
100_core/src_100_interface/gplx/SrlAble__tst.java
View File

@ -61,6 +61,6 @@ public class SrlAble__tst {
)
);
}
void tst_Srl_(GfoMsg m, String expd) {Tfds.Eq(expd, SrlAble_.XtoStr(m));}
void tst_Srl_(GfoMsg m, String expd) {Tfds.Eq(expd, SrlAble_.To_str(m));}
}
//class SrlAble__tst

4
100_core/src_100_interface/gplx/XtoStrAble.java → 100_core/src_100_interface/gplx/To_str_able.java
View File

@ -16,6 +16,6 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx;
public interface XtoStrAble {
String XtoStr();
public interface To_str_able {
String To_str();
}

4
100_core/src_100_interface/gplx/XtoStrAble_.java → 100_core/src_100_interface/gplx/To_str_able_.java
View File

@ -16,6 +16,6 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx;
public class XtoStrAble_ {
public static XtoStrAble as_(Object obj) {return obj instanceof XtoStrAble ? (XtoStrAble)obj : null;}
class To_str_able_ {
public static To_str_able as_(Object obj) {return obj instanceof To_str_able ? (To_str_able)obj : null;}
}

4
100_core/src_110_primitive/gplx/Array_.java
View File

@ -62,12 +62,12 @@ public class Array_ {
CopyTo(src, 0, trg, 0, copy_len);
return trg;
}
public static String XtoStr(Object ary) {
public static String To_str(Object ary) {
String_bldr sb = String_bldr_.new_();
int ary_len = Len(ary);
for (int i = 0; i < ary_len; i++)
sb.Add_obj(Get(ary, i)).Add_char_nl();
return sb.XtoStr();
return sb.To_str();
}
public static int Len(Object ary) {return Array.getLength(ary);}
public static final int LenAry(Object[] ary) {return ary == null ? 0 : ary.length;}

1
100_core/src_110_primitive/gplx/Bry_bfr.java
View File

@ -495,6 +495,7 @@ public class Bry_bfr {
return this;
}
public boolean Eq(byte b) {return bfr_len == 1 && bfr[0] == b;}
public byte[] Xto_bry(int bgn, int end) {return bfr_len == 0 ? Bry_.Empty : Bry_.Mid(bfr, bgn, end);}
public byte[] Xto_bry() {return bfr_len == 0 ? Bry_.Empty : Bry_.Mid(bfr, 0, bfr_len);}
public byte[] Xto_bry_and_reset(int v) {
byte[] rv = Xto_bry();

2
100_core/src_110_primitive/gplx/Bry_fmtr.java
View File

@ -113,7 +113,7 @@ public class Bry_fmtr {
else
rv.Add(itm.DatStr());
}
return rv.XtoStr();
return rv.To_str();
} private Bry_fmtr_itm[] itms; int itms_len;
public byte[] Missing_bgn() {return missing_bgn;} public Bry_fmtr Missing_bgn_(byte[] v) {missing_bgn = v; return this;} private byte[] missing_bgn = missing_bgn_static; static byte[] missing_bgn_static = Bry_.new_u8("~{"), missing_end_static = Bry_.new_u8("}");
public byte[] Missing_end() {return missing_end;} public Bry_fmtr Missing_end_(byte[] v) {missing_end = v; return this;} private byte[] missing_end = missing_end_static;

8
100_core/src_110_primitive/gplx/Char_.java
View File

@ -65,11 +65,11 @@ public class Char_ {
if (itm == match) return true;
return false;
}
public static String XtoStr(char[] ary, int pos, int length) {return new String(ary, pos, length);}
public static byte[] XtoByteAry(int v) {return Bry_.new_u8(Char_.XtoStr((char)v));}
public static String To_str(char[] ary, int pos, int length) {return new String(ary, pos, length);}
public static byte[] XtoByteAry(int v) {return Bry_.new_u8(Char_.To_str((char)v));}
public static char XbyInt(int i) {return (char)i;}
public static String XtoStr(int b) {return XtoStr((char)b);}
public static String XtoStr(char c) {return String.valueOf(c);}
public static String To_str(int b) {return To_str((char)b);}
public static String To_str(char c) {return String.valueOf(c);}
public static byte XtoByte(char c) {return (byte)c;}
public static char cast_(Object o) {try {return (Character)o;} catch(Exception e) {throw Err_.new_type_mismatch_w_exc(e, char.class, o);}}
public static char parse_(String raw) {try {return raw.charAt(0);} catch(Exception exc) {throw Err_.new_parse_exc(exc, char.class, raw);}}

11
100_core/src_110_primitive/gplx/Int_.java
View File

@ -198,18 +198,19 @@ public class Int_ implements GfoInvkAble {
return -1;
}
}
public static String Xto_str_hex(int v) {
public static String Xto_str_hex(int v) {return Xto_str_hex(Bool_.Y, Bool_.Y, v);}
public static String Xto_str_hex(boolean zero_pad, boolean upper, int v) {
String rv = Integer.toHexString(v);
int rvLen = String_.Len(rv);
if (rvLen < 8) rv = String_.Repeat("0", 8 - rvLen) + rv;
return String_.Upper(rv);
int rv_len = String_.Len(rv);
if (zero_pad && rv_len < 8) rv = String_.Repeat("0", 8 - rv_len) + rv;
return upper ? String_.Upper(rv) : rv;
}
public static String Xto_str(int[] ary) {return Xto_str(ary, " ");}
public static String Xto_str(int[] ary, String dlm) {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < ary.length; i++)
sb.Add_spr_unless_first(Int_.Xto_str(ary[i]), dlm, i);
return sb.XtoStr();
return sb.To_str();
}
public static int[] Ary_parse(String raw_str, int reqd_len, int[] or) {
byte[] raw_bry = Bry_.new_a7(raw_str);

26
100_core/src_110_primitive/gplx/String_.java
View File

@ -238,7 +238,7 @@ public class String_ implements GfoInvkAble {
for (int i = 0; i < padLen; i++)
sb.Add(pad);
if (bgn) sb.Add(s);
return sb.XtoStr();
return sb.To_str();
}
public static String TrimEnd(String s) {if (s == null) return null;
int len = String_.Len(s);
@ -258,7 +258,7 @@ public class String_ implements GfoInvkAble {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < count; i++)
sb.Add(s);
return sb.XtoStr();
return sb.To_str();
}
public static String Insert(String s, int pos, String toInsert) {
if (pos < 0 || pos >= String_.Len(s)) throw Err_.new_wo_type("String_.Insert failed; pos invalid", "pos", pos, "s", s, "toInsert", toInsert);
@ -272,15 +272,15 @@ public class String_ implements GfoInvkAble {
String_bldr sb = String_bldr_.new_();
for (String val : ary)
sb.Add(val);
return sb.XtoStr();
return sb.To_str();
}
public static String Concat_any(Object... ary) {
String_bldr sb = String_bldr_.new_();
for (Object val : ary)
sb.Add_obj(val);
return sb.XtoStr();
return sb.To_str();
}
public static String ConcatWith_any(String separator, Object... ary) {
public static String Concat_with_obj(String separator, Object... ary) {
String_bldr sb = String_bldr_.new_();
int aryLen = Array_.Len(ary);
for (int i = 0; i < aryLen; i++) {
@ -288,7 +288,7 @@ public class String_ implements GfoInvkAble {
Object val = ary[i];
sb.Add_obj(Object_.Xto_str_strict_or_empty(val));
}
return sb.XtoStr();
return sb.To_str();
}
public static String Concat_with_str(String spr, String... ary) {
String_bldr sb = String_bldr_.new_();
@ -297,13 +297,13 @@ public class String_ implements GfoInvkAble {
if (i != 0) sb.Add(spr);
sb.Add_obj(ary[i]);
}
return sb.XtoStr();
return sb.To_str();
}
public static String Concat_lines_crlf(String... values) {
String_bldr sb = String_bldr_.new_();
for (String val : values)
sb.Add(val).Add(String_.CrLf);
return sb.XtoStr();
return sb.To_str();
}
public static String Concat_lines_crlf_skipLast(String... values) {
String_bldr sb = String_bldr_.new_();
@ -311,13 +311,13 @@ public class String_ implements GfoInvkAble {
if (sb.Count() != 0) sb.Add(String_.CrLf);
sb.Add(val);
}
return sb.XtoStr();
return sb.To_str();
}
public static String Concat_lines_nl(String... values) {
String_bldr sb = String_bldr_.new_();
for (String val : values)
sb.Add(val).Add("\n");
return sb.XtoStr();
return sb.To_str();
}
public static String Concat_lines_nl_skip_last(String... ary) {
String_bldr sb = String_bldr_.new_();
@ -326,7 +326,7 @@ public class String_ implements GfoInvkAble {
sb.Add(ary[i]);
if (i != ary_end) sb.Add("\n");
}
return sb.XtoStr();
return sb.To_str();
}
public static String[] Ary(String... ary) {return ary;}
@ -344,7 +344,7 @@ public class String_ implements GfoInvkAble {
String_bldr sb = String_bldr_.new_();
for (String s : ary)
sb.Add(s).Add(";");
return sb.XtoStr();
return sb.To_str();
}
public static final String[] Ary_empty = new String[0];
public static String[] Split(String raw, char dlm) {return Split(raw, dlm, false);}
@ -419,7 +419,7 @@ public class String_ implements GfoInvkAble {
}
if (Len(numberStr) > 0) // unclosed bracket; add bracketBgn and whatever is in numberStr; ex: "{0"
sb.Add(bracketBgn).Add(numberStr);
return sb.XtoStr();
return sb.To_str();
}
static String[] Split_do(String s, String spr, boolean skipChar13) {
if (String_.Eq(s, "") // "".Split('a') return array with one member: ""

4
100_core/src_110_primitive/gplx/String__tst.java
View File

@ -153,11 +153,11 @@ public class String__tst {
// acceptance
tst_Split("this\r\nis\na\rtest\r\n.", "\r\n", "this", "is\na\rtest", ".");
} void tst_Split(String text, String separator, String... expd) {Tfds.Eq_ary(expd, String_.Split(text, separator));}
@Test public void ConcatWith_any() {
@Test public void Concat_with_obj() {
tst_ConcatWith_any("a|b", "|", "a", "b"); // do not append final delimiter
tst_ConcatWith_any("a||c", "|", "a", null, "c"); // null
tst_ConcatWith_any("a|b", "|", Object_.Ary("a", "b")); // pass array as arg
} void tst_ConcatWith_any(String expd, String delimiter, Object... array) {Tfds.Eq(expd, String_.ConcatWith_any(delimiter, array));}
} void tst_ConcatWith_any(String expd, String delimiter, Object... array) {Tfds.Eq(expd, String_.Concat_with_obj(delimiter, array));}
@Test public void Compare_byteAry() {
tst_Compare_byteAry("a", "a", CompareAble_.Same);
tst_Compare_byteAry("a", "b", CompareAble_.Less);

2
100_core/src_120_basicDataType/gplx/EnmMgr.java
View File

@ -59,7 +59,7 @@ public class EnmMgr {
if (cur > 0 // cur is non-Modifier; NOTE: check needed for args that are just a Modifier;
|| sb.Count() == 0) // cur is IptKey.None; cur == 0, but sb.length will also be 0
AppendRaw(sb, cur);
return sb.XtoStr();
return sb.To_str();
}
void AppendRaw(String_bldr sb, int key) {
String raw = (String)valRegy.Get_by(key);

2
100_core/src_120_basicDataType/gplx/Guid_adp.java
View File

@ -17,6 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx;
public class Guid_adp {
public String XtoStr() {return guid.toString();}
public String To_str() {return guid.toString();}
public Guid_adp(java.util.UUID guid) {this.guid = guid;} java.util.UUID guid;
}

2
100_core/src_120_basicDataType/gplx/Guid_adp__tst.java
View File

@ -23,6 +23,6 @@ public class Guid_adp__tst {
}
void tst_parse_(String s) {
Guid_adp uuid = Guid_adp_.parse_(s);
Tfds.Eq(uuid.XtoStr(), s);
Tfds.Eq(uuid.To_str(), s);
}
}

2
100_core/src_120_basicDataType/gplx/Io_url.java
View File

@ -82,7 +82,7 @@ public class Io_url implements CompareAble, EqAble, ParseAble, GfoInvkAble { //_
if (isFil && i == len - 1) break; // do not add closing backslash if last term
sb.Add(info.DirSpr());
}
return Io_url_.new_inf_(sb.XtoStr(), info);
return Io_url_.new_inf_(sb.To_str(), info);
}
public Object ParseAsObj(String raw) {return Io_url_.new_any_(raw);}
@Override public String toString() {return raw;}

6
100_core/src_120_basicDataType/gplx/KeyVal.java
View File

@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx;
public class KeyVal implements XtoStrAble {
public class KeyVal implements To_str_able {
@gplx.Internal protected KeyVal(byte key_tid, Object k, Object v) {this.key_tid = key_tid; key = k; val = v;}
public String Key() {return Object_.Xto_str_strict_or_null(key);}
public byte Key_tid() {return key_tid;} private byte key_tid;
@ -26,6 +26,6 @@ public class KeyVal implements XtoStrAble {
public String Val_to_str_or_empty() {return Object_.Xto_str_strict_or_empty(val);}
public String Val_to_str_or_null() {return Object_.Xto_str_strict_or_null(val);}
public byte[] Val_to_bry() {return Bry_.new_u8(Object_.Xto_str_strict_or_null(val));}
@Override public String toString() {return XtoStr();}
public String XtoStr() {return Key() + "=" + Object_.Xto_str_strict_or_null_mark(val);}
@Override public String toString() {return To_str();}
public String To_str() {return Key() + "=" + Object_.Xto_str_strict_or_null_mark(val);}
}

4
100_core/src_120_basicDataType/gplx/KeyValList.java
View File

@ -23,14 +23,14 @@ public class KeyValList {//20101217
public KeyVal GetAt(int i) {return (KeyVal)list.Get_at(i);}
public KeyValList Add(String key, Object val) {list.Add(KeyVal_.new_(key, val)); return this;}
public KeyVal[] Xto_bry() {return (KeyVal[])list.To_ary(KeyVal.class);}
public String XtoStr() {
public String To_str() {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < list.Count(); i++) {
KeyVal kv = (KeyVal)list.Get_at(i);
sb.Add_spr_unless_first(kv.Key(), " ", i);
sb.Add("=").Add(kv.Val_to_str_or_empty());
}
return sb.XtoStr();
return sb.To_str();
}
public static KeyValList args_(String key, Object val) {return new KeyValList().Add(key, val);}
}

2
100_core/src_120_basicDataType/gplx/KeyVal_.java
View File

@ -53,7 +53,7 @@ public class KeyVal_ {
sb.Add(Object_.Xto_str_strict_or_null_mark(itm_val));
sb.Add_char_nl();
}
return sb.XtoStr();
return sb.To_str();
}
public static Object Ary_get_by_key_or_null(KeyVal[] ary, String key) {
int len = ary.length;

4
100_core/src_120_basicDataType/gplx/RandomAdp.java
View File

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx;
import java.util.*;
public class RandomAdp {
private final Random under;
public RandomAdp(Random v) {this.under = v;}
public int Next(int max) {return under.nextInt(max);}
public RandomAdp(Random v) {under = v;}
Random under;
}

10
100_core/src_120_basicDataType/gplx/TimeSpanAdp.java
View File

@ -46,13 +46,13 @@ public class TimeSpanAdp implements CompareAble, EqAble {
TimeSpanAdp comp = TimeSpanAdp_.cast_(o); if (comp == null) return false;
return fracs == comp.fracs;
}
@Override public String toString() {return XtoStr(TimeSpanAdp_.Fmt_Default);}
@Override public String toString() {return To_str(TimeSpanAdp_.Fmt_Default);}
@Override public boolean equals(Object obj) {TimeSpanAdp comp = TimeSpanAdp_.cast_(obj); return Object_.Eq(fracs, comp.fracs);}
@Override public int hashCode() {return super.hashCode();}
public String XtoStr() {return TimeSpanAdp_.XtoStr(fracs, TimeSpanAdp_.Fmt_Default);}
public String XtoStr(String format) {
return TimeSpanAdp_.XtoStr(fracs, format);
public String To_str() {return TimeSpanAdp_.To_str(fracs, TimeSpanAdp_.Fmt_Default);}
public String To_str(String format) {
return TimeSpanAdp_.To_str(fracs, format);
}
public String XtoStrUiAbbrv() {
if (fracs == 0) return "0" + UnitAbbrv(0);
@ -70,7 +70,7 @@ public class TimeSpanAdp implements CompareAble, EqAble {
if (sb.Count() != 0) sb.Add(" ");
sb.Add_obj(unit).Add(UnitAbbrv(i));
}
return sb.XtoStr();
return sb.To_str();
}
String UnitAbbrv(int i) {
switch (i) {

4
100_core/src_120_basicDataType/gplx/TimeSpanAdp_.java
View File

@ -80,7 +80,7 @@ public class TimeSpanAdp_ {
}
return sign * (val_f + (val_s * Divisors[1]) + (val_m * Divisors[2]) + (val_h * Divisors[3]));
}
@gplx.Internal protected static String XtoStr(long frc, String fmt) {
@gplx.Internal protected static String To_str(long frc, String fmt) {
String_bldr sb = String_bldr_.new_();
int[] units = Split_long(frc, Divisors);
@ -119,7 +119,7 @@ public class TimeSpanAdp_ {
sb.Add(Int_.Xto_str_pad_bgn_zero(val, zeros));
first = false;
}
return sb.XtoStr();
return sb.To_str();
}
@gplx.Internal protected static int[] Split_long(long fracs, int[] divisors) {
int divLength = Array_.Len(divisors);

20
100_core/src_120_basicDataType/gplx/TimeSpanAdp_xtoStr_tst.java
View File

@ -18,28 +18,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx;
import org.junit.*;
public class TimeSpanAdp_xtoStr_tst {
@Test public void Zero() {
@Test public void Zero() {
tst_Default(0, "0");
}
@Test public void MinuteSeconds() {
@Test public void MinuteSeconds() {
tst_Default(77000, "1:17");
}
@Test public void ZeroSuppression() {
@Test public void ZeroSuppression() {
tst_Default(660000, "11:00"); //fractional 0 and leading 0s are suppressed; i.e.: not 00:11:00.000
}
@Test public void HourTest() {
@Test public void HourTest() {
tst_Default(3723987, "1:02:03.987");
}
@Test public void NegSeconds() {
@Test public void NegSeconds() {
tst_Default(-2000, "-2");
}
@Test public void NegMins() {
@Test public void NegMins() {
tst_Default(-60000, "-1:00");
}
@Test public void NegHours() {
@Test public void NegHours() {
tst_Default(-3723981, "-1:02:03.981");
}
@Test public void ZeroPadding() {
@Test public void ZeroPadding() {
tst_ZeroPadding("0", "00:00:00.000");
tst_ZeroPadding("1:02:03.123", "01:02:03.123");
tst_ZeroPadding("1", "00:00:01.000");
@ -48,12 +48,12 @@ public class TimeSpanAdp_xtoStr_tst {
}
void tst_Default(long fractionals, String expd) {
TimeSpanAdp ts = TimeSpanAdp_.fracs_(fractionals);
String actl = ts.XtoStr(TimeSpanAdp_.Fmt_Default);
String actl = ts.To_str(TimeSpanAdp_.Fmt_Default);
Tfds.Eq(expd, actl);
}
void tst_ZeroPadding(String val, String expd) {
TimeSpanAdp timeSpan = TimeSpanAdp_.parse_(val);
String actl = timeSpan.XtoStr(TimeSpanAdp_.Fmt_PadZeros);
String actl = timeSpan.To_str(TimeSpanAdp_.Fmt_PadZeros);
Tfds.Eq(expd, actl);
}
}

6
100_core/src_140_list/gplx/Hash_adp_bry.java
View File

@ -49,6 +49,12 @@ public class Hash_adp_bry extends gplx.lists.Hash_adp_base implements Hash_adp {
}
return this;
}
public Hash_adp_bry Add_many_bry(byte[]... ary) {
int ary_len = ary.length;
for (int i = 0; i < ary_len; i++)
Add_bry_bry(ary[i]);
return this;
}
@Override protected void Add_base(Object key, Object val) {
byte[] key_bry = (byte[])key;
Hash_adp_bry_itm_base key_itm = proto.New();

2
100_core/src_140_list/gplx/Ordered_hash_base.java
View File

@ -73,7 +73,7 @@ public class Ordered_hash_base extends Hash_adp_base implements Ordered_hash, Gf
.Add(":").Add(ordered.Get_at(i).toString())
.Add(Op_sys.Cur().Nl_str());
}
return sb.XtoStr();
return sb.To_str();
}
public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) {
if (ctx.Match(k, Invk_SetKeyOnly)) {

20
100_core/src_140_list/gplx/lists/Hash_adp_base.java
View File

@ -19,7 +19,7 @@ package gplx.lists; import gplx.*;
public abstract class Hash_adp_base implements Hash_adp {
public boolean Has(Object key) {return Has_base(key);}
public Object Get_by(Object key) {return Fetch_base(key);}
public Object Get_by_or_fail(Object key) {return FetchOrFail_base(key);}
public Object Get_by_or_fail(Object key) {return Get_by_or_fail_base(key);}
public Object Get_by_or_new(Object key, NewAble proto) {
Object rv = Fetch_base(key);
if (rv == null) {
@ -40,18 +40,18 @@ public abstract class Hash_adp_base implements Hash_adp {
return true;
}
@gplx.Virtual public void Del(Object key) {Del_base(key);}
protected Object FetchOrFail_base(Object key) {
protected Object Get_by_or_fail_base(Object key) {
if (key == null) throw Err_.new_wo_type("key cannot be null");
if (!Has_base(key)) throw Err_.new_wo_type("key not found", "key", key);
return Fetch_base(key);
}
java.util.Hashtable hash = new java.util.Hashtable();
@gplx.Virtual public int Count() {return hash.size();}
@gplx.Virtual public void Clear() {hash.clear();}
@gplx.Virtual protected void Add_base(Object key, Object val) {hash.put(key, val);}
@gplx.Virtual protected void Del_base(Object key) {hash.remove(key);}
@gplx.Virtual protected boolean Has_base(Object key) {return hash.containsKey(key);}
@gplx.Virtual protected Object Fetch_base(Object key) {return hash.get(key);}
@gplx.Virtual public java.util.Iterator iterator() {return hash.values().iterator();}
private final java.util.Hashtable hash = new java.util.Hashtable();
@gplx.Virtual public int Count() {return hash.size();}
@gplx.Virtual public void Clear() {hash.clear();}
@gplx.Virtual protected void Add_base(Object key, Object val) {hash.put(key, val);}
@gplx.Virtual protected void Del_base(Object key) {hash.remove(key);}
@gplx.Virtual protected boolean Has_base(Object key) {return hash.containsKey(key);}
@gplx.Virtual protected Object Fetch_base(Object key) {return hash.get(key);}
@gplx.Virtual public java.util.Iterator iterator() {return hash.values().iterator();}
}

6
100_core/src_150_text/gplx/texts/CharStream.java
View File

@ -48,14 +48,14 @@ public class CharStream {
if (rv) pos++;
return rv;
}
public String XtoStr() {return Char_.XtoStr(ary, 0, len);}
public String To_str() {return Char_.To_str(ary, 0, len);}
public String XtoStrAtCur(int length) {
length = (pos + length > len) ? len - pos : length;
return Char_.XtoStr(ary, pos, length);
return Char_.To_str(ary, pos, length);
}
public String Xto_str_by_pos(int bgn, int end) {
if (bgn < 0) bgn = 0; if (end > len - 1) end = len - 1;
return Char_.XtoStr(ary, bgn, end - bgn + 1);
return Char_.To_str(ary, bgn, end - bgn + 1);
}
public static CharStream pos0_(String text) {
CharStream rv = new CharStream();

6
100_core/src_150_text/gplx/texts/CharStream_tst.java
View File

@ -21,13 +21,13 @@ public class CharStream_tst {
@Before public void setup() {
stream = CharStream.pos0_("abcdefgh");
}
@Test public void XtoStr() {
Tfds.Eq(stream.XtoStr(), "abcdefgh");
@Test public void To_str() {
Tfds.Eq(stream.To_str(), "abcdefgh");
}
@Test public void CurrentText() {
stream.MoveNextBy(1);
Tfds.Eq(stream.XtoStrAtCur(2), "bc");
Tfds.Eq(stream.XtoStr(), "abcdefgh");
Tfds.Eq(stream.To_str(), "abcdefgh");
}
@Test public void CurrentText_outOfBounds() {
stream.MoveNextBy(7);

2
100_core/src_150_text/gplx/texts/HexDecUtl.java
View File

@ -49,7 +49,7 @@ public class HexDecUtl {
int rv = parse_or_(raw, -1); if (rv == -1) throw Err_.new_parse("HexDec", "raw");
return rv;
}
public static String XtoStr(int val, int pad) {
public static String To_str(int val, int pad) {
char[] ary = new char[8]; int idx = 8; // 8 is max len of hexString; (2^4 * 8); EX: int.MaxValue = 7FFFFFFF
do {
int byt = val % 16;

4
100_core/src_150_text/gplx/texts/HexDecUtl_tst.java
View File

@ -30,7 +30,7 @@ public class HexDecUtl_tst {
tst_XtoInt("7FFFFFFF", Int_.MaxValue);
tst_XtoInt_bry("100", 256);
}
@Test public void XtoStr() {
@Test public void To_str() {
tst_XtoStr(0, "0");
tst_XtoStr(15, "F");
tst_XtoStr(16, "10");
@ -57,7 +57,7 @@ public class HexDecUtl_tst {
private void tst_XtoInt_bry(String raw, int expd) {Tfds.Eq(expd, HexDecUtl.parse_or_(Bry_.new_a7(raw), -1));}
private void tst_XtoStr(int val, String expd) {tst_XtoStr(val, 0, expd);}
private void tst_XtoStr(int val, int pad, String expd) {
String actl = HexDecUtl.XtoStr(val, pad);
String actl = HexDecUtl.To_str(val, pad);
Tfds.Eq(expd, actl);
}
}

2
100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_.java
View File

@ -46,7 +46,7 @@ public class RegxPatn_cls_ioMatch_ {
sb.Add(c);
}
sb.Add(Regx_bldr.Tkn_LineEnd);
return sb.XtoStr();
return sb.To_str();
}
public static final String InvalidCharacters = "|*?\"<>"; // : / \ are omitted b/c they will cause full paths to fail
public static final String ValidCharacters = Regx_bldr.Excludes(InvalidCharacters);

2
100_core/src_150_text/gplx/texts/RegxPatn_cls_like_.java
View File

@ -58,6 +58,6 @@ public class RegxPatn_cls_like_ {
sb.Add(c);
}
sb.Add(Regx_bldr.Tkn_LineEnd);
return sb.XtoStr();
return sb.To_str();
}
}

2
100_core/src_150_text/gplx/texts/StringTableBldr.java
View File

@ -36,7 +36,7 @@ public class StringTableBldr {
cols.Add(i, col);
return col;
}
public String XtoStr() {
public String To_str() {
sb.Clear();
for (int rowI = 0; rowI < rows.Count(); rowI++) {
String[] row = (String[])rows.Get_at(rowI);

4
100_core/src_150_text/gplx/texts/StringTableBldr_tst.java
View File

@ -53,7 +53,7 @@ public class StringTableBldr_tst {
);
}
void tst_XtoStr(String... expdLines) {
String expd = String_.ConcatWith_any(String_.CrLf, (Object[])expdLines);
Tfds.Eq(expd, bldr.XtoStr());
String expd = String_.Concat_with_obj(String_.CrLf, (Object[])expdLines);
Tfds.Eq(expd, bldr.To_str());
}
}

2
100_core/src_200_io/gplx/ios/IoEnginePool.java
View File

@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.ios; import gplx.*;
public class IoEnginePool {
private final Hash_adp hash = Hash_adp_.new_();
public void Add_if_dupe_use_nth(IoEngine engine) {
hash.Del(engine.Key());
hash.Add(engine.Key(), engine);
@ -25,7 +26,6 @@ public class IoEnginePool {
IoEngine rv = (IoEngine)hash.Get_by(key);
return rv == null ? IoEngine_.Mem : rv; // rv == null when url is null or empty; return Mem which should be a noop; DATE:2013-06-04
}
Hash_adp hash = Hash_adp_.new_();
public static final IoEnginePool _ = new IoEnginePool();
IoEnginePool() {
this.Add_if_dupe_use_nth(IoEngine_.Sys);

4
100_core/src_200_io/gplx/ios/IoEngine_xrg_recycleFil.java
View File

@ -30,7 +30,7 @@ public class IoEngine_xrg_recycleFil extends IoEngine_xrg_fil_affects1_base {
String dayName = time.XtoStr_fmt("yyyyMMdd"), timeName = time.XtoStr_fmt("hhmmssfff");
String rootDirStr = ConcatWith_ary(this.Url().Info().DirSpr(), rootDirNames);
Io_url recycleDir = this.Url().OwnerRoot().GenSubDir_nest(rootDirStr, dayName);
String uuidStr = uuid_include ? uuid.XtoStr() : "";
String uuidStr = uuid_include ? uuid.To_str() : "";
return recycleDir.GenSubFil_ary(appName, ";", timeName, ";", uuidStr, ";", String_.LimitToFirst(this.Url().NameAndExt(), 128));
}
String ConcatWith_ary(String separator, List_adp ary) {
@ -41,7 +41,7 @@ public class IoEngine_xrg_recycleFil extends IoEngine_xrg_fil_affects1_base {
Object val = ary.Get_at(i);
sb.Add_obj(Object_.Xto_str_strict_or_empty(val));
}
return sb.XtoStr();
return sb.To_str();
}
@Override public void Exec() {
IoEnginePool._.Get_by(this.Url().Info().EngineKey()).RecycleFil(this);

4
100_core/src_200_io/gplx/ios/IoRecycleBin.java
View File

@ -26,12 +26,12 @@ public class IoRecycleBin {
int listCount = list.Count(); if (listCount > 1) throw Err_.new_wo_type("found more than 1 url", "count", list.Count());
Io_url trgUrl = (Io_url)list.Get_at(0);
IoEngine_xrg_xferFil.move_(url, trgUrl).ReadOnlyFails_(true).Overwrite_(false).Exec();
IoEngine_xrg_saveFilStr.new_(FetchRegistryUrl(url), sb.XtoStr()).Exec();
IoEngine_xrg_saveFilStr.new_(FetchRegistryUrl(url), sb.To_str()).Exec();
}
public void Regy_add(IoEngine_xrg_recycleFil xrg) {
Io_url url = xrg.RecycleUrl();
Io_url regyUrl = FetchRegistryUrl(url);
String text = String_.ConcatWith_any("|", url.NameAndExt_noDirSpr(), xrg.Url().GenRelUrl_orEmpty(url.OwnerRoot()), xrg.Uuid().XtoStr(), xrg.AppName(), xrg.Time());
String text = String_.Concat_with_obj("|", url.NameAndExt_noDirSpr(), xrg.Url().GenRelUrl_orEmpty(url.OwnerRoot()), xrg.Uuid().To_str(), xrg.AppName(), xrg.Time());
IoEngine_xrg_saveFilStr.new_(regyUrl, text).Append_().Exec();
}
public List_adp Regy_search(Io_url url, String_bldr sb) {

2
100_core/src_200_io/gplx/ios/IoUrlInfo.java
View File

@ -131,7 +131,7 @@ class IoUrlInfo_wnt extends IoUrlInfo_base {
@Override public boolean Match(String raw) {return String_.Len(raw) > 1 && String_.CharAt(raw, 1) == ':';} // 2nd char is :; assumes 1 letter drives
@Override public String XtoRootName(String raw, int rawLen) {
return rawLen == 3 && String_.CharAt(raw, 1) == ':' // only allow single letter drives; ex: C:\; note, CharAt(raw, 1) to match Match
? Char_.XtoStr(String_.CharAt(raw, 0))
? Char_.To_str(String_.CharAt(raw, 0))
: null;
}
public static final IoUrlInfo_wnt _ = new IoUrlInfo_wnt(); IoUrlInfo_wnt() {}

4
100_core/src_200_io/gplx/ios/IoUrlTypeRegy.java
View File

@ -54,7 +54,7 @@ class IoUrlTypeGrp implements GfoInvkAble {
for (int i = 0; i < m.Args_count(); i++) {
String s = m.ReadStr("v");
if (list.Has(s)) {
ctx.Write_warn(UsrMsg.new_("itm already has filter").Add("key", key).Add("filter", s).XtoStr());
ctx.Write_warn(UsrMsg.new_("itm already has filter").Add("key", key).Add("filter", s).To_str());
list.Del(s);
}
list.Add(s, s);
@ -67,7 +67,7 @@ class IoUrlTypeGrp implements GfoInvkAble {
for (int i = 0; i < list.Count(); i++)
sb.Add_spr_unless_first((String)list.Get_at(i), " ", i);
sb.Add("}");
return sb.XtoStr();
return sb.To_str();
}
else if (ctx.Match(k, Invk_Clear)) {if (ctx.Deny()) return this; list.Clear();}
else return GfoInvkAble_.Rv_unhandled;

2
100_core/src_200_io/gplx/ios/Io_size__tst.java
View File

@ -34,7 +34,7 @@ public class Io_size__tst {
// fxt.Test_XtoLongFail("1.1"); // DELETED:do not check for fractional bytes; EX: 10.7 GB DATE:2015-01-06
// fxt.Test_XtoLongFail("1.51 kb");
}
@Test public void XtoStr() {
@Test public void To_str() {
fxt.Test_XtoStr(1, "1.000 B");
fxt.Test_XtoStr(1024, "1.000 KB");
fxt.Test_XtoStr(1536, "1.500 KB");

9
100_core/src_210_env/gplx/Env_.java
View File

@ -87,10 +87,15 @@ public class Env_ {
);
return String_.Format(fmt, programName);
}
public static String Env_prop__user_language() {return Env_prop(Env_prop_key__user_language);}
public static String Env_prop__user_language() {return Env_prop(Env_prop_key__user_language);}
public static String Env_prop__java_version() {return Env_prop(Env_prop_key__java_version);}
public static String Env_prop(String key) {
return System.getProperty(key);
} static final String Env_prop_key__user_language = "user.language";
}
private static final String
Env_prop_key__user_language = "user.language"
, Env_prop_key__java_version = "java.version"
;
public static void Term_add(GfoInvkAble invk, String cmd) {
Thread_adp thread = Thread_adp_.invk_(invk, cmd);
Runtime.getRuntime().addShutdownHook(thread.Under_thread());

5
100_core/src_210_env/gplx/Op_sys.java
View File

@ -18,12 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx;
public class Op_sys {
Op_sys(byte tid, byte sub_tid, String os_name, byte bitness, String nl_str, byte fsys_dir_spr_byte, boolean fsys_case_match) {
this.tid = tid; this.sub_tid = sub_tid; this.os_name = os_name; this.bitness = bitness; this.nl_str = nl_str; this.fsys_dir_spr_byte = fsys_dir_spr_byte; this.fsys_dir_spr_str = Char_.XtoStr((char)fsys_dir_spr_byte); this.fsys_case_match = fsys_case_match;
this.tid = tid; this.sub_tid = sub_tid; this.os_name = os_name; this.bitness = bitness; this.nl_str = nl_str; this.fsys_dir_spr_byte = fsys_dir_spr_byte; this.fsys_dir_spr_str = Char_.To_str((char)fsys_dir_spr_byte); this.fsys_case_match = fsys_case_match;
}
public byte Tid() {return tid;} private final byte tid;
public byte Sub_tid() {return sub_tid;} private final byte sub_tid;
public String Os_name() {return os_name;} private String os_name;
public byte Bitness() {return bitness;} private final byte bitness;
public String Bitness_str() {return (bitness == Bitness_32 ? "32" : "64");}
public String Nl_str() {return nl_str;} private final String nl_str;
public String Fsys_dir_spr_str() {return fsys_dir_spr_str;} private final String fsys_dir_spr_str;
public byte Fsys_dir_spr_byte() {return fsys_dir_spr_byte;} private final byte fsys_dir_spr_byte;
@ -34,7 +35,7 @@ public class Op_sys {
public boolean Tid_is_lnx() {return tid == Tid_lnx;}
public boolean Tid_is_osx() {return tid == Tid_osx;}
public boolean Tid_is_drd() {return tid == Tid_drd;}
public String Xto_str() {return os_name + (bitness == Bitness_32 ? "32" : "64");}
public String To_str() {return os_name + Bitness_str();}
public static final byte Tid_nil = 0, Tid_wnt = 1, Tid_lnx = 2, Tid_osx = 3, Tid_drd = 4;
public static final byte Sub_tid_unknown = 0, Sub_tid_win_xp = 1, Sub_tid_win_7 = 2, Sub_tid_win_8 = 3;

4
100_core/src_210_env/gplx/ProcessAdp.java
View File

@ -274,7 +274,7 @@ public class ProcessAdp implements GfoInvkAble, RlsAble {
for (int i = 0; i < len; i++) {
char c = String_.CharAt(args_str, i);
if (c == ' ' && !in_quotes) { // space encountered; assume arg done
list.Add(sb.XtoStr());
list.Add(sb.To_str());
sb.Clear();
}
else if (c == '"') // NOTE: ProcessBuilder seems to have issues with quotes; do not call sb.Add()
@ -282,7 +282,7 @@ public class ProcessAdp implements GfoInvkAble, RlsAble {
else
sb.Add(c);
}
if (sb.Has_some()) list.Add(sb.XtoStr());
if (sb.Has_some()) list.Add(sb.To_str());
return list.To_str_ary();
}
}

2
100_core/src_300_classXtn/gplx/ClassXtnPool.java
View File

@ -19,7 +19,7 @@ package gplx;
import gplx.lists.*;
public class ClassXtnPool extends Hash_adp_base {
public void Add(ClassXtn typx) {Add_base(typx.Key(), typx);}
public ClassXtn Get_by_or_fail(String key) {return (ClassXtn)FetchOrFail_base(key);}
public ClassXtn Get_by_or_fail(String key) {return (ClassXtn)Get_by_or_fail_base(key);}
public static final ClassXtnPool _ = new ClassXtnPool();
public static final String Format_null = "";

2
100_core/src_300_classXtn/gplx/TimeSpanAdpClassXtn.java
View File

@ -22,7 +22,7 @@ public class TimeSpanAdpClassXtn extends ClassXtn_base implements ClassXtn {
public Object DefaultValue() {return TimeSpanAdp_.Zero;}
@Override public Object ParseOrNull(String raw) {return TimeSpanAdp_.parse_(raw);}
@Override public Object XtoDb(Object obj) {return TimeSpanAdp_.cast_(obj).TotalSecs();}
@Override public String XtoUi(Object obj, String fmt) {return TimeSpanAdp_.cast_(obj).XtoStr(fmt);}
@Override public String XtoUi(Object obj, String fmt) {return TimeSpanAdp_.cast_(obj).To_str(fmt);}
public boolean Eq(Object lhs, Object rhs) {try {return TimeSpanAdp_.cast_(lhs).Eq(rhs);} catch (Exception e) {Err_.Noop(e); return false;}}
public static final TimeSpanAdpClassXtn _ = new TimeSpanAdpClassXtn(); TimeSpanAdpClassXtn() {} // added to ClassXtnPool by default
}

2
100_core/src_310_gfoNde/gplx/GfoFldList.java
View File

@ -23,5 +23,5 @@ public interface GfoFldList {
GfoFld Get_at(int i);
GfoFld FetchOrNull(String key);
GfoFldList Add(String key, ClassXtn c);
String XtoStr();
String To_str();
}

6
100_core/src_310_gfoNde/gplx/GfoFldList_.java
View File

@ -42,13 +42,13 @@ class GfoFldList_base implements GfoFldList {
idxs.Add(key, idxs.Count());
return this;
}
public String XtoStr() {
public String To_str() {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < hash.Count(); i++) {
GfoFld fld = this.Get_at(i);
sb.Add(fld.Key()).Add("|");
}
return sb.XtoStr();
return sb.To_str();
}
Ordered_hash hash = Ordered_hash_.new_(); Hash_adp idxs = Hash_adp_.new_(); // PERF: idxs used for Idx_of; need to recalc if Del ever added
}
@ -59,5 +59,5 @@ class GfoFldList_null implements GfoFldList {
public GfoFld Get_at(int i) {return GfoFld.Null;}
public GfoFld FetchOrNull(String key) {return null;}
public GfoFldList Add(String key, ClassXtn typx) {return this;}
public String XtoStr() {return "<<GfoFldList_.Null>>";}
public String To_str() {return "<<GfoFldList_.Null>>";}
}

4
100_core/src_310_gfoNde/gplx/GfoNde.java
View File

@ -30,14 +30,14 @@ public class GfoNde implements GfoInvkAble {
public GfoNdeList Subs() {return subs;} GfoNdeList subs = GfoNdeList_.new_();
public GfoFldList SubFlds() {return subFlds;} GfoFldList subFlds = GfoFldList_.new_();
public void XtoStr_wtr(DataWtr wtr) {XtoStr_wtr(this, wtr);}// TEST
public String XtoStr() {
public String To_str() {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < aryLen; i++) {
String key = i >= flds.Count() ? "<< NULL " + i + " >>" : flds.Get_at(i).Key();
String val = i >= aryLen ? "<< NULL " + i + " >>" : Object_.Xto_str_strict_or_null_mark(ary[i]);
sb.Add(key).Add("=").Add(val);
}
return sb.XtoStr();
return sb.To_str();
}
int IndexOfOrFail(String key) {
int i = flds.Idx_of(key);

2
100_core/src_311_gfoObj/gplx/GfoMsg.java
View File

@ -19,7 +19,7 @@ package gplx;
public interface GfoMsg {
String Key();
GfoMsg CloneNew();
String XtoStr();
String To_str();
GfoMsg Clear();
GfoMsg Parse_(boolean v);

16
100_core/src_311_gfoObj/gplx/GfoMsg_.java
View File

@ -199,7 +199,7 @@ class GfoMsg_base implements GfoMsg {
KeyVal rv = (KeyVal)this.Args_getAt(i);
sb.Add_fmt("{0};", rv.Key());
}
return sb.XtoStr();
return sb.To_str();
}
public GfoMsg CloneNew() {
GfoMsg_base rv = new GfoMsg_base().ctor_(key, parse);
@ -220,12 +220,12 @@ class GfoMsg_base implements GfoMsg {
protected List_adp args;
List_adp subs;
public String XtoStr() {
public String To_str() {
String_bldr sb = String_bldr_.new_();
XtoStr(sb, new XtoStrWkr_gplx(), this);
To_str(sb, new XtoStrWkr_gplx(), this);
return sb.Xto_str_and_clear();
}
void XtoStr(String_bldr sb, XtoStrWkr wkr, GfoMsg m) {
void To_str(String_bldr sb, XtoStrWkr wkr, GfoMsg m) {
sb.Add(m.Key());
if (m.Subs_count() == 0) {
sb.Add(":");
@ -236,7 +236,7 @@ class GfoMsg_base implements GfoMsg {
if (!first) sb.Add(" ");
sb.Add(kv.Key());
sb.Add("='");
sb.Add(wkr.XtoStr(kv.Val()));
sb.Add(wkr.To_str(kv.Val()));
sb.Add("'");
first = false;
}
@ -244,7 +244,7 @@ class GfoMsg_base implements GfoMsg {
}
else {
sb.Add(".");
XtoStr(sb, wkr, m.Subs_getAt(0));
To_str(sb, wkr, m.Subs_getAt(0));
}
}
@ -253,10 +253,10 @@ class GfoMsg_base implements GfoMsg {
static final String_obj_val Nil = String_obj_val.new_("<<NOT FOUND>>");
}
interface XtoStrWkr {
String XtoStr(Object o);
String To_str(Object o);
}
class XtoStrWkr_gplx implements XtoStrWkr {
public String XtoStr(Object o) {
public String To_str(Object o) {
if (o == null) return "<<NULL>>";
Class<?> type = ClassAdp_.ClassOf_obj(o);
String rv = null;

2
100_core/src_311_gfoObj/gplx/GfoMsg_tst.java
View File

@ -33,7 +33,7 @@ public class GfoMsg_tst {
mok.Str0 = "b";
tst_Msg(GfoInvkXtoStr.ReadMsg(mok, Mok.Invk_Cmd0), "Mok.Cmd0:bool0='y' int0='2' str0='b';");
}
void tst_Msg(GfoMsg m, String expd) {Tfds.Eq(expd, m.XtoStr());}
void tst_Msg(GfoMsg m, String expd) {Tfds.Eq(expd, m.To_str());}
class Mok implements GfoInvkAble {
public boolean Bool0;
public int Int0;

2
100_core/src_330_store/gplx/DataRdr.java
View File

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx;
import gplx.core.strings.*;
public interface DataRdr extends SrlMgr, RlsAble {
String NameOfNode(); String XtoStr();
String NameOfNode(); String To_str();
Io_url Uri(); void Uri_set(Io_url s);
Hash_adp EnvVars();
boolean Parse(); void Parse_set(boolean v);

4
100_core/src_330_store/gplx/DataRdr_.java
View File

@ -23,13 +23,13 @@ public class DataRdr_ {
public static DataRdr cast_(Object obj) {try {return (DataRdr)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, DataRdr.class, obj);}}
}
class DataRdr_null implements DataRdr {
public String NameOfNode() {return XtoStr();} public String XtoStr() {return "<< NULL READER >>";}
public String NameOfNode() {return To_str();} public String To_str() {return "<< NULL READER >>";}
public boolean Type_rdr() {return true;}
public Hash_adp EnvVars() {return Hash_adp_.Noop;}
public Io_url Uri() {return Io_url_.Empty;} public void Uri_set(Io_url s) {}
public boolean Parse() {return parse;} public void Parse_set(boolean v) {parse = v;} private boolean parse;
public int FieldCount() {return 0;}
public String KeyAt(int i) {return XtoStr();}
public String KeyAt(int i) {return To_str();}
public Object ReadAt(int i) {return null;}
public KeyVal KeyValAt(int i) {return KeyVal_.new_(this.KeyAt(i), this.ReadAt(i));}
public Object Read(String name) {return null;}

2
100_core/src_330_store/gplx/DataWtr.java
View File

@ -28,5 +28,5 @@ public interface DataWtr extends SrlMgr {
void WriteLeafEnd();
void Clear();
String XtoStr();
String To_str();
}

2
100_core/src_330_store/gplx/DataWtr_.java
View File

@ -31,7 +31,7 @@ class DataWtr_null implements DataWtr {
public void WriteNodeEnd() {}
public void WriteLeafEnd() {}
public void Clear() {}
public String XtoStr() {return "";}
public String To_str() {return "";}
public Object StoreRoot(SrlObj root, String key) {return null;}
public boolean SrlBoolOr(String key, boolean v) {return v;}
public byte SrlByteOr(String key, byte v) {return v;}

2
100_core/src_330_store/gplx/stores/DataRdr_mem.java
View File

@ -50,7 +50,7 @@ public class DataRdr_mem extends DataRdr_base implements GfoNdeRdr {
boolean hasFirst = subRdr.MoveNextPeer();
return (hasFirst) ? subRdr : DataRdr_.Null;
}
public String XtoStr() {return cur.XtoStr();}
public String To_str() {return cur.To_str();}
public void Rls() {this.cur = null; this.peerList = null;}
@Override public SrlMgr SrlMgr_new(Object o) {return new DataRdr_mem();}
GfoNdeList Peers_get() {

2
100_core/src_330_store/gplx/stores/xmls/XmlDataRdr.java
View File

@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
package gplx.stores.xmls; import gplx.*; import gplx.stores.*;
import gplx.xmls.*; /*Xpath_*/
public class XmlDataRdr extends DataRdr_base implements DataRdr {
@Override public String NameOfNode() {return nde.Name();} public String XtoStr() {return nde.Xml_outer();}
@Override public String NameOfNode() {return nde.Name();} public String To_str() {return nde.Xml_outer();}
@Override public int FieldCount() {return nde.Atrs() == null ? 0 : nde.Atrs().Count();} // nde.Attributes == null when nde is XmlText; ex: <node>val</node>
@Override public String KeyAt(int i) {return nde.Atrs().Get_at(i).Name();}
@Override public Object ReadAt(int i) {

4
100_core/src_330_store/gplx/stores/xmls/XmlDataWtr_.java
View File

@ -45,11 +45,11 @@ class XmlDataWtr extends DataWtr_base implements DataWtr {
public void WriteTableBgn(String name, GfoFldList fields) {this.WriteXmlNodeBegin(name);}
@Override public void WriteNodeBgn(String nodeName) {this.WriteXmlNodeBegin(nodeName);}
@Override public void WriteNodeEnd() {this.WriteXmlNodeEnd();}
public String XtoStr() {
public String To_str() {
while (names.Count() > 0) {
WriteXmlNodeEnd();
}
return sb.XtoStr();
return sb.To_str();
// while (nde.ParentNode != null)
// WriteXmlNodeEnd(); // close all open ndes automatically
// return doc.OuterXml;

2
100_core/src_340_dsv/gplx/stores/dsvs/DsvDataRdr_.java
View File

@ -190,7 +190,7 @@ class DsvTblBldr {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < tkns.Count(); i++)
sb.Add((String)tkns.Get_at(i));
layout.HeaderList().Add_Comment(sb.XtoStr());
layout.HeaderList().Add_Comment(sb.To_str());
tkns.Clear();
}
}

4
100_core/src_340_dsv/gplx/stores/dsvs/DsvDataWtr.java
View File

@ -38,7 +38,7 @@ public class DsvDataWtr extends DataWtr_base implements DataWtr {
}
@Override public void WriteNodeEnd() {}
public void Clear() {sb.Clear();}
public String XtoStr() {return sb.XtoStr();}
public String To_str() {return sb.To_str();}
void WriteTableName(String tableName) {
sb.WriteFld(tableName);
sb.WriteCmd(sym.TblNameSym());
@ -64,7 +64,7 @@ public class DsvDataWtr extends DataWtr_base implements DataWtr {
}
class DsvStringBldr {
public void Clear() {sb.Clear();}
public String XtoStr() {return sb.XtoStr();}
public String To_str() {return sb.To_str();}
public void WriteCmd(String cmd) {
WriteFld(sym.CmdSequence(), true);
WriteFld(cmd);

2
100_core/src_340_dsv/gplx/stores/dsvs/DsvDataWtr_csv_tst.java
View File

@ -93,7 +93,7 @@ class DsvDataWtr_fxt {
public void tst_XtoStr(DsvDataWtr wtr, GfoNde root, String expd) {
wtr.Clear();
root.XtoStr_wtr(wtr);
String actl = wtr.XtoStr();
String actl = wtr.To_str();
Tfds.Eq(expd, actl);
}
public static DsvDataWtr_fxt new_() {return new DsvDataWtr_fxt();} DsvDataWtr_fxt() {}

6
100_core/src_400_gfs/gplx/GfsCoreHelp.java
View File

@ -26,7 +26,7 @@ class GfsCoreHelp implements GfoInvkAble {
GfsRegyItm itm = (GfsRegyItm)core.Root_as_regy().Get_at(i);
sb.Add_spr_unless_first(itm.Key(), String_.CrLf, i);
}
return sb.XtoStr();
return sb.To_str();
}
else return Exec(ctx, core.Root_as_regy(), path);
}
@ -35,7 +35,7 @@ class GfsCoreHelp implements GfoInvkAble {
String_bldr sb = String_bldr_.new_();
for (int j = 0; j < i; j++)
sb.Add_spr_unless_first(itmAry[j], ".", j);
return Err_Unhandled(sb.XtoStr(), itmAry[i]);
return Err_Unhandled(sb.To_str(), itmAry[i]);
}
static Object Exec(GfsCtx rootCtx, GfoInvkAble rootInvk, String path) {
String[] itmAry = String_.Split(path, ".");
@ -60,7 +60,7 @@ class GfsCoreHelp implements GfoInvkAble {
String s = (String)ctx.Help_browseList().Get_at(i);
sb.Add_spr_unless_first(s, String_.CrLf, i);
}
return sb.XtoStr();
return sb.To_str();
}
}
public static GfsCoreHelp as_(Object obj) {return obj instanceof GfsCoreHelp ? (GfsCoreHelp)obj : null;}

2
100_core/src_400_gfs/gplx/GfsCtx.java
View File

@ -42,7 +42,7 @@ public class GfsCtx {
}
public boolean Write_note(String fmt, Object... ary) {UsrDlg_._.Note(fmt, ary); return false;}
public boolean Write_warn(String fmt, Object... ary) {UsrDlg_._.Note("! " + fmt, ary); return false;}
public boolean Write_stop(UsrMsg umsg) {UsrDlg_._.Note("* " + umsg.XtoStr()); return false;}
public boolean Write_stop(UsrMsg umsg) {UsrDlg_._.Note("* " + umsg.To_str()); return false;}
public boolean Write_stop(String fmt, Object... ary) {UsrDlg_._.Note("* " + fmt, ary); return false;}
public boolean Deny() {return deny;} private boolean deny;
public static final GfsCtx _ = new GfsCtx();

5
100_core/src_420_usrMsg/gplx/Gfo_usr_dlg_.java
View File

@ -24,6 +24,11 @@ public class Gfo_usr_dlg_ {
test = new Gfo_usr_dlg_base(Gfo_usr_dlg__log_.Noop, Gfo_usr_dlg__gui_.Test);
return test;
} private static Gfo_usr_dlg_base test;
public static Gfo_usr_dlg Test_console() {
if (test_console == null)
test_console = new Gfo_usr_dlg_base(Gfo_usr_dlg__log_.Noop, Gfo_usr_dlg__gui_.Console);
return test_console;
} private static Gfo_usr_dlg_base test_console;
}
class Gfo_usr_dlg_noop implements Gfo_usr_dlg {
public boolean Canceled() {return false;} public void Canceled_y_() {} public void Canceled_n_() {}

6
100_core/src_420_usrMsg/gplx/Gfo_usr_dlg__gui_.java
View File

@ -19,7 +19,7 @@ package gplx;
import gplx.core.consoles.*; import gplx.core.strings.*;
public class Gfo_usr_dlg__gui_ {
public static final Gfo_usr_dlg__gui Noop = new Gfo_usr_dlg__gui_noop();
public static final Gfo_usr_dlg__gui Console = new Gfo_usr_dlg__gui_console();
public static final Gfo_usr_dlg__gui Console = new Gfo_usr_dlg__gui_console();
public static final Gfo_usr_dlg__gui Test = new Gfo_usr_dlg__gui_test();
}
class Gfo_usr_dlg__gui_noop implements Gfo_usr_dlg__gui {
@ -31,11 +31,11 @@ class Gfo_usr_dlg__gui_noop implements Gfo_usr_dlg__gui {
public void Write_stop(String text) {}
}
class Gfo_usr_dlg__gui_console implements Gfo_usr_dlg__gui {
private final Console_adp__sys console = Console_adp__sys.I;
public void Clear() {}
public String_ring Prog_msgs() {return ring;} String_ring ring = new String_ring().Max_(0);
public String_ring Prog_msgs() {return ring;} private final String_ring ring = new String_ring().Max_(0);
public void Write_prog(String text) {console.Write_tmp(text);}
public void Write_note(String text) {console.Write_str_w_nl(text);}
public void Write_warn(String text) {console.Write_str_w_nl(text);}
public void Write_stop(String text) {console.Write_str_w_nl(text);}
Console_adp__sys console = Console_adp__sys.I;
}

8
100_core/src_420_usrMsg/gplx/UsrMsg.java
View File

@ -29,9 +29,9 @@ public class UsrMsg {
args.Add_if_dupe_use_nth(k, KeyVal_.new_(k, v));
return this;
}
public String XtoStrSingleLine() {return XtoStr(" ");}
public String XtoStr() {return XtoStr(Op_sys.Cur().Nl_str());}
String XtoStr(String spr) {
public String XtoStrSingleLine() {return To_str(" ");}
public String To_str() {return To_str(Op_sys.Cur().Nl_str());}
String To_str(String spr) {
if (hdr == null) {
GfoMsg m = GfoMsg_.new_cast_(cmd);
for (int i = 0; i < args.Count(); i++) {
@ -47,7 +47,7 @@ public class UsrMsg {
sb.Add_spr_unless_first("", " ", i);
sb.Add_fmt("{0}={1}", kv.Key(), kv.Val(), spr);
}
return sb.XtoStr();
return sb.To_str();
}
public static UsrMsg fmt_(String hdr, Object... ary) {
UsrMsg rv = new UsrMsg();

2
100_core/src_420_usrMsg/gplx/UsrMsgWkr_console.java
View File

@ -19,7 +19,7 @@ package gplx;
import gplx.core.consoles.*;
public class UsrMsgWkr_console implements UsrMsgWkr {
public void ExecUsrMsg(int type, UsrMsg umsg) {
String text = umsg.XtoStr();
String text = umsg.To_str();
if (type == UsrMsgWkr_.Type_Warn)
text = "!!!!" + text;
else if (type == UsrMsgWkr_.Type_Stop)

2
100_core/src_420_usrMsg/gplx/UsrMsgWkr_test.java
View File

@ -23,7 +23,7 @@ public class UsrMsgWkr_test implements UsrMsgWkr {
public boolean HasWarn(UsrMsg um) {
for (int i = 0; i < msgs.Count(); i++) {
UsrMsg found = (UsrMsg)msgs.Get_at(i);
if (String_.Eq(um.XtoStr(), found.XtoStr())) return true;
if (String_.Eq(um.To_str(), found.To_str())) return true;
}
return false;
}

8
100_core/src_800_tst/gplx/PerfLogMgr_fxt.java
View File

@ -39,16 +39,16 @@ public class PerfLogMgr_fxt {
String_bldr sb = String_bldr_.new_();
for (Object itmObj : entries) {
PerfLogItm itm = (PerfLogItm)itmObj;
sb.Add(itm.XtoStr()).Add_char_crlf();
sb.Add(itm.To_str()).Add_char_crlf();
}
Io_mgr.I.AppendFilStr(url, sb.XtoStr());
Io_mgr.I.AppendFilStr(url, sb.To_str());
entries.Clear();
}
List_adp entries = List_adp_.new_(); PerfLogTmr tmr = PerfLogTmr.new_(); Io_url url = Io_url_.Empty;
public static final PerfLogMgr_fxt _ = new PerfLogMgr_fxt(); PerfLogMgr_fxt() {}
class PerfLogItm {
public String XtoStr() {
String secondsStr = TimeSpanAdp_.XtoStr(milliseconds, TimeSpanAdp_.Fmt_Default);
public String To_str() {
String secondsStr = TimeSpanAdp_.To_str(milliseconds, TimeSpanAdp_.Fmt_Default);
secondsStr = String_.PadBgn(secondsStr, 7, "0"); // 7=000.000; left-aligns all times
return String_.Concat(secondsStr, "|", text);
}

20
100_core/src_800_tst/gplx/Tfds.java
View File

@ -40,8 +40,8 @@ public class Tfds { // URL:doc/gplx.tfds/Tfds.txt
public static void Eq_str(String expd, byte[] actl) {Eq_wkr(expd, String_.new_u8(actl), true, EmptyStr);}
public static void Eq_bry(String expd, byte[] actl) {Eq_wkr(expd, String_.new_u8(actl), true, EmptyStr);}
public static void Eq_bry(byte[] expd, byte[] actl) {Eq_wkr(String_.new_u8(expd), String_.new_u8(actl), true, EmptyStr);}
public static void Eq_str_intf(XtoStrAble expd, XtoStrAble actl, String msg) {Eq_wkr(expd.XtoStr(), actl.XtoStr(), true, msg);}
public static void Eq_str_intf(XtoStrAble expd, XtoStrAble actl) {Eq_wkr(expd.XtoStr(), actl.XtoStr(), true, String_.Empty);}
public static void Eq_str_intf(To_str_able expd, To_str_able actl, String msg) {Eq_wkr(expd.To_str(), actl.To_str(), true, msg);}
public static void Eq_str_intf(To_str_able expd, To_str_able actl) {Eq_wkr(expd.To_str(), actl.To_str(), true, String_.Empty);}
public static void Eq_str_lines(String lhs, String rhs) {Eq_str_lines(lhs, rhs, EmptyStr);}
public static void Eq_str_lines(String lhs, String rhs, String note) {
if (lhs == null && rhs == null) return; // true
@ -117,15 +117,15 @@ public class Tfds { // URL:doc/gplx.tfds/Tfds.txt
for (int i = 0; i < lhsLen; i++) {
Object lhs = lhsList.Get_at(i);
Object rhs = i >= rhsLen ? null : rhsList.Get_at(i);
String lhsStr = xtoStr.XtoStr(lhs, lhs);
String rhsStr = rhs == null ? "<<N/A>>" : xtoStr.XtoStr(rhs, lhs);
String lhsStr = xtoStr.To_str(lhs, lhs);
String rhsStr = rhs == null ? "<<N/A>>" : xtoStr.To_str(rhs, lhs);
boolean isEq = Object_.Eq(lhsStr, rhsStr); if (!isEq) pass = false;
Eq_ary_wkr_addItm(list, i, isEq, lhsStr, rhsStr);
}
for (int i = lhsLen; i < rhsLen; i++) {
String lhsStr = "<<N/A>>";
Object rhs = rhsList.Get_at(i);
String rhsStr = xtoStr.XtoStr(rhs, null);
String rhsStr = xtoStr.To_str(rhs, null);
Eq_ary_wkr_addItm(list, i, false, lhsStr, rhsStr);
pass = false;
}
@ -169,11 +169,11 @@ public class Tfds { // URL:doc/gplx.tfds/Tfds.txt
int aryLen = Array_.Len(ary);
for (int i = 0; i < aryLen; i++)
sb.Add_many("'", Object_.Xto_str_strict_or_null_mark(ary[i]), "'", " ");
WriteText(sb.XtoStr() + String_.CrLf);
WriteText(sb.To_str() + String_.CrLf);
}
}
class TfdsEqListItmStr_cls_default implements TfdsEqListItmStr {
public String XtoStr(Object cur, Object actl) {
public String To_str(Object cur, Object actl) {
return Object_.Xto_str_strict_or_null_mark(cur);
}
public static final TfdsEqListItmStr_cls_default _ = new TfdsEqListItmStr_cls_default(); TfdsEqListItmStr_cls_default() {}
@ -221,7 +221,7 @@ class TfdsMsgBldr {
// String itmComparison = (String)obj;
// sb.Add_fmt_line("{0}{1}", "\t\t", itmComparison);
// }
return WrapMsg(sb.XtoStr());
return WrapMsg(sb.To_str());
}
String CustomMsg_xtoStr(String customMsg) {
return (customMsg == EmptyStr)
@ -231,8 +231,8 @@ class TfdsMsgBldr {
public String Obj_xtoStr(Object obj) {
String s = String_.as_(obj);
if (s != null) return String_.Concat("'", s, "'"); // if Object is String, put quotes around it for legibility
XtoStrAble xtoStrAble = XtoStrAble_.as_(obj);
if (xtoStrAble != null) return xtoStrAble.XtoStr();
To_str_able xtoStrAble = To_str_able_.as_(obj);
if (xtoStrAble != null) return xtoStrAble.To_str();
return Object_.Xto_str_strict_or_null_mark(obj);
}
String WrapMsg(String text) {

2
100_core/src_800_tst/gplx/TfdsEqListItmStr.java
View File

@ -17,5 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx;
public interface TfdsEqListItmStr {
String XtoStr(Object cur, Object actl);
String To_str(Object cur, Object actl);
}

2
100_core/src_900_xml/gplx/Base85_utl.java
View File

@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx;
public class Base85_utl {
public static String XtoStr(int val, int minLen) {return String_.new_u8(XtoStrByAry(val, null, 0, minLen));}
public static String To_str(int val, int minLen) {return String_.new_u8(XtoStrByAry(val, null, 0, minLen));}
public static byte[] XtoStrByAry(int val, int minLen) {return XtoStrByAry(val, null, 0, minLen);}
public static byte[] XtoStrByAry(int val, byte[] ary, int aryPos, int minLen) {
int strLen = DigitCount(val);

4
100_core/src_900_xml/gplx/Base85_utl_tst.java
View File

@ -30,7 +30,7 @@ public class Base85_utl_tst {
tst_Log( 52200625, 5);
tst_Log(Int_.MaxValue, 5);
} void tst_Log(int val, int expd) {Tfds.Eq(expd, Base85_utl.DigitCount(val));}
@Test public void XtoStr() {
@Test public void To_str() {
tst_XtoStr( 0, "!");
tst_XtoStr( 84, "u");
tst_XtoStr( 85, "\"!");
@ -42,7 +42,7 @@ public class Base85_utl_tst {
tst_XtoStr( 52200625, "\"!!!!");
}
void tst_XtoStr(int val, String expd) {
String actl = Base85_utl.XtoStr(val, 0);
String actl = Base85_utl.To_str(val, 0);
Tfds.Eq(expd, actl);
Tfds.Eq(val, Base85_utl.XtoIntByStr(expd));
}

2
100_core/src_900_xml/gplx/HierStrBldr.java
View File

@ -44,7 +44,7 @@ public class HierStrBldr {
for (int i = 0; i < multipleAry.length; i++)
sb.Add_fmt(dirFmt, Int_.Xto_str_fmt(multipleAry[i], numFmt));
sb.Add_fmt(filFmt, Int_.Xto_str_fmt(idx, numFmt));
return sb.XtoStr();
return sb.To_str();
}
public HierStrBldr Ctor_io(Io_url root, String dirFmt, String filFmt, String numFmt, int... filCountMaxs) {
this.Ctor(root.Raw(), dirFmt + dirSpr, filFmt, numFmt, filCountMaxs);

4
100_core/tst/gplx/TfdsTstr_fxt.java
View File

@ -64,7 +64,7 @@ public class TfdsTstr_fxt {
sb.Add_fmt_line("{0}{1} {2}", errorKey, String_.PadEnd("", nameLenMax, " "), itm.Actl());
}
sb.Add(String_.Repeat("_", 80));
throw Err_.new_wo_type(sb.XtoStr());
throw Err_.new_wo_type(sb.To_str());
}
List_adp list = List_adp_.new_();
public static TfdsTstr_fxt new_() {return new TfdsTstr_fxt();} TfdsTstr_fxt() {}
@ -83,7 +83,7 @@ class TfdsTstrItm {
if (i != 0) sb.Add(".");
sb.Add((String)list.Get_at(i));
}
subName = sb.XtoStr();
subName = sb.To_str();
}
public int CompareResult() {return compareResult;} public TfdsTstrItm CompareResult_(int val) {compareResult = val; return this;} int compareResult;
public boolean Compare() {

2
100_core/tst/gplx/stores/xmls/XmlDataWtr_tst.java
View File

@ -89,7 +89,7 @@ public class XmlDataWtr_tst {
}
void tst_XStr(XmlDataWtr wtr, String... parts) {
String expd = String_.Concat(parts);
Tfds.Eq(expd, wtr.XtoStr());
Tfds.Eq(expd, wtr.To_str());
}
XmlDataWtr wtr;
}

4
110_gfml/src_100_tkn/gplx/gfml/GfmlTkn.java
View File

@ -32,7 +32,7 @@ class GfmlTknAry_ {
String_bldr sb = String_bldr_.new_();
for (GfmlTkn tkn : ary)
sb.Add(tkn.Raw());
return sb.XtoStr();
return sb.To_str();
}
@gplx.Internal protected static String XtoVal(GfmlTkn[] ary) {return XtoVal(ary, 0, ary.length);}
static String XtoVal(GfmlTkn[] ary, int bgn, int end) {
@ -41,6 +41,6 @@ class GfmlTknAry_ {
GfmlTkn tkn = ary[i];
sb.Add(tkn.Val());
}
return sb.XtoStr();
return sb.To_str();
}
}

4
110_gfml/src_200_type/gplx/gfml/GfmlFld.java
View File

@ -28,8 +28,8 @@ public class GfmlFld {
rv.defaultTkn = defaultTkn; // FIXME: defaultTkn.clone_()
return rv;
}
public String XtoStr() {String_bldr sb = String_bldr_.new_(); this.XtoStr(sb); return sb.Xto_str_and_clear();}
public void XtoStr(String_bldr sb) {sb.Add_fmt("name={0} typeKey={1}", name, typeKey);}
public String To_str() {String_bldr sb = String_bldr_.new_(); this.To_str(sb); return sb.Xto_str_and_clear();}
public void To_str(String_bldr sb) {sb.Add_fmt("name={0} typeKey={1}", name, typeKey);}
public static final GfmlFld Null = new_(false, GfmlItmKeys.NullKey, GfmlType_.AnyKey);
public static GfmlFld new_(boolean name_isKey, String name, String typeKey) {

2
110_gfml/src_300_gdoc/gplx/gfml/GfmlAtr.java
View File

@ -25,7 +25,7 @@ public class GfmlAtr implements GfmlItm {
public int SubObjs_Count() {return subObjs.Count();}
public GfmlObj SubObjs_GetAt(int i) {return (GfmlObj)subObjs.Get_at(i);} GfmlObjList subObjs = GfmlObjList.new_(); // PERF?: make capacity 3 instead of 8
public void SubObjs_Add(GfmlObj o) {subObjs.Add(o);}
public String XtoStr() {return String_.Concat(this.Key(), "=", this.DatTkn().Val());}
public String To_str() {return String_.Concat(this.Key(), "=", this.DatTkn().Val());}
@gplx.Internal protected void Key_set(String v) {keyTkn = GfmlTkn_.val_(v);} // used for 1 test
public static GfmlAtr as_(Object obj) {return obj instanceof GfmlAtr ? (GfmlAtr)obj : null;}

4
110_gfml/src_300_gdoc/gplx/gfml/GfmlDocPos.java
View File

@ -52,7 +52,7 @@ public class GfmlDocPos implements CompareAble {
int newIdx = ary[oldLen - 1];
return new GfmlDocPos(newAry, newIdx);
}
@Override public String toString() {return path;} public String XtoStr() {return path;}
@Override public String toString() {return path;} public String To_str() {return path;}
void MakePath() {
String_bldr sb = String_bldr_.new_();
for (int i = 0; i < ary.length; i++) {
@ -60,7 +60,7 @@ public class GfmlDocPos implements CompareAble {
sb.Add("_");
}
sb.Add(idx);
path = sb.XtoStr();
path = sb.To_str();
}
int[] ary; int idx;
@gplx.Internal protected GfmlDocPos(int[] ary, int idx) {this.ary = ary; this.idx = idx;}

2
110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java
View File

@ -39,7 +39,7 @@ class GfmlUsrMsgs {
Err rv = Err_.new_wo_type("gfml parse error");
for (int i = 0; i < bldr.Doc().UsrMsgs().Count(); i++) {
UsrMsg um = (UsrMsg)bldr.Doc().UsrMsgs().Get_at(i);
rv.Args_add("err" + Int_.Xto_str(i), um.XtoStr());
rv.Args_add("err" + Int_.Xto_str(i), um.To_str());
}
return rv;
}

2
110_gfml/src_300_gdoc/gplx/gfml/GfmlItm.java
View File

@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package gplx.gfml; import gplx.*;
public interface GfmlItm extends GfmlObj, XtoStrAble {
public interface GfmlItm extends GfmlObj, To_str_able {
GfmlTkn KeyTkn(); String Key(); // Key() is alternative to Key().Val()
GfmlType Type();
boolean KeyedSubObj();

2
110_gfml/src_300_gdoc/gplx/gfml/GfmlNde.java
View File

@ -40,7 +40,7 @@ public class GfmlNde implements GfmlItm {
public GfmlDocPos DocPos() {return docPos;} GfmlDocPos docPos = GfmlDocPos_.Null;
public GfmlItmKeys SubKeys() {return subKeys;} GfmlItmKeys subKeys = GfmlItmKeys.new_();
public GfmlItmHnds SubHnds() {return subHnds;} GfmlItmHnds subHnds = GfmlItmHnds.new_();
public String XtoStr() {return GfmlDocWtr_.xtoStr_(this);}
public String To_str() {return GfmlDocWtr_.xtoStr_(this);}
public void UpdateNde(String hnd) {
for (int i = 0; i < subHnds.Count(); i++) {
GfmlNde nde = (GfmlNde)subHnds.Get_at(i);

Some files were not shown because too many files have changed in this diff Show More