mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
v2.8.3.1
This commit is contained in:
@@ -32,7 +32,7 @@ class IptKeyChain implements IptArg {
|
||||
IptArg itm = ary[i];
|
||||
sb.Add_spr_unless_first(itm.Key(), ",", i);
|
||||
}
|
||||
key = sb.XtoStr();
|
||||
key = sb.To_str();
|
||||
}
|
||||
public static IptKeyChain parse_(String raw) {
|
||||
String[] itms = String_.Split(raw, ",");
|
||||
|
||||
@@ -219,7 +219,7 @@ class IptBndListItm implements SrlAble {
|
||||
IptBnd bnd = (IptBnd)list.Get_at(i);
|
||||
try {bnd.Exec(evData);}
|
||||
catch (Exception exc) {
|
||||
UsrDlg_._.Stop(UsrMsg.new_("Error while processing event").Add("bnd", SrlAble_.XtoStr(bnd)).Add("exc", Err_.Message_lang(exc)));
|
||||
UsrDlg_._.Stop(UsrMsg.new_("Error while processing event").Add("bnd", SrlAble_.To_str(bnd)).Add("exc", Err_.Message_lang(exc)));
|
||||
return false;
|
||||
}
|
||||
if (evData.CancelIteration) break;
|
||||
|
||||
@@ -53,7 +53,7 @@ public class IptBndMgr_tst {
|
||||
IptEventData evData = IptEventData.new_(null, IptArg_.EventType_default(arg), arg, null, null);
|
||||
under.Process(evData);
|
||||
}
|
||||
Tfds.Eq(expd, output.XtoStr());
|
||||
Tfds.Eq(expd, output.To_str());
|
||||
return this;
|
||||
}
|
||||
String_bldr output = String_bldr_.new_();
|
||||
|
||||
@@ -38,7 +38,7 @@ public class IptBnd_ {
|
||||
String_bldr sb = String_bldr_.new_();
|
||||
for (int i = 0; i < ary.Count(); i++)
|
||||
sb.Add_spr_unless_first(((IptArg)ary.Get_at(i)).Key(), "|", i);
|
||||
return sb.XtoStr();
|
||||
return sb.To_str();
|
||||
}
|
||||
}
|
||||
class IptBnd_invk implements IptBnd {
|
||||
|
||||
@@ -21,7 +21,7 @@ public class IptKey implements IptArg {
|
||||
public String Key() {return key;} private final String key;
|
||||
public int Val() {return val;} private final int val;
|
||||
public boolean Eq(IptArg comp) {return String_.Eq(key, comp.Key());}
|
||||
public String XtoUiStr() {return IptKeyStrMgr._.XtoStr(this);}
|
||||
public String XtoUiStr() {return IptKeyStrMgr._.To_str(this);}
|
||||
public IptKey Add(IptKey comp) {return IptKey_.add_(this, comp);}
|
||||
public boolean Mod_shift() {return Enm_.HasInt(val, IptKey_.Shift.Val());}
|
||||
public boolean Mod_ctrl() {return Enm_.HasInt(val, IptKey_.Ctrl.Val());}
|
||||
|
||||
@@ -22,7 +22,7 @@ class IptKeyStrMgr {
|
||||
IptKey rv = charKeys[charVal];
|
||||
return (rv == null) ? IptKey_.None : rv;
|
||||
}
|
||||
public String XtoStr(IptKey key) {
|
||||
public String To_str(IptKey key) {
|
||||
if (literals == null) Init();
|
||||
Object rv = literals.Get_by(key.Val());
|
||||
return rv == null ? String_.Empty : (String)rv;
|
||||
@@ -62,7 +62,7 @@ class IptKeyStrMgr {
|
||||
Reg(lowerKey, lowerChr);
|
||||
Reg(upperKey, upperChr);
|
||||
}
|
||||
void Reg(IptKey k, char c) {Reg(k, Char_.XtoStr(c), (int)c);}
|
||||
void Reg(IptKey k, char c) {Reg(k, Char_.To_str(c), (int)c);}
|
||||
void Reg(IptKey k, String s, int charVal) {
|
||||
int v = k.Val();
|
||||
literals.Add(v, s);
|
||||
|
||||
Reference in New Issue
Block a user