mirror of
https://github.com/gnosygnu/xowa.git
synced 2026-03-02 03:49:30 +00:00
'v3.5.1.1'
This commit is contained in:
@@ -31,6 +31,7 @@ class Mem_html extends GxwTextMemo_lang implements Gxw_html { public void Html_
|
||||
public byte Html_doc_html_load_tid() {return html_doc_html_load_tid;} private byte html_doc_html_load_tid;
|
||||
public void Html_doc_html_load_tid_(byte v) {html_doc_html_load_tid = v;}
|
||||
public String Html_js_eval_script(String script) {return "";}
|
||||
public String Html_js_send_json(String name, String data) {return "";}
|
||||
String ExtractAtr(String key, String txt, int pos) {
|
||||
int key_pos = String_.FindBwd(txt, key, pos); if (key_pos == String_.Find_none) return null;
|
||||
int q0 = String_.FindFwd(txt, "\"", key_pos); if (q0 == String_.Find_none) return null;
|
||||
|
||||
@@ -318,6 +318,7 @@ class Swt_kit_mode {
|
||||
class Swt_gui_cmd implements GfuiInvkCmd, Runnable {
|
||||
private final Swt_kit kit; private final Gfo_usr_dlg usr_dlg; private final Display display; private final GfoInvkAble target; private final boolean async;
|
||||
private GfsCtx invk_ctx; private int invk_ikey; private String invk_key; private GfoMsg invk_msg;
|
||||
private Object rv_obj;
|
||||
public Swt_gui_cmd(Swt_kit kit, Gfo_usr_dlg usr_dlg, Display display, GfoInvkAble target, boolean async) {
|
||||
this.kit = kit; this.usr_dlg = usr_dlg; this.display = display; this.target = target; this.async = async;
|
||||
}
|
||||
@@ -330,11 +331,11 @@ class Swt_gui_cmd implements GfuiInvkCmd, Runnable {
|
||||
try {display.syncExec(this);}
|
||||
finally {kit.Kit_sync_cmd_del(this);}
|
||||
}
|
||||
return this;
|
||||
return rv_obj;
|
||||
}
|
||||
@Override public void run() {
|
||||
synchronized (this) {// needed for Special:Search and async; DATE:2015-04-23
|
||||
try {target.Invk(invk_ctx, invk_ikey, invk_key, invk_msg);}
|
||||
try {rv_obj = target.Invk(invk_ctx, invk_ikey, invk_key, invk_msg);}
|
||||
catch (Exception e) {
|
||||
if (kit.Kit_mode__term()) return; // NOTE: if shutting down, don't warn; warn will try to write to status.bar, which will fail b/c SWT is shutting down; failures will try to write to status.bar again, causing StackOverflow exception; DATE:2014-05-04
|
||||
usr_dlg.Warn_many("", "", "fatal error while running; key=~{0} err=~{1}", invk_key, Err_.Message_gplx_full(e));
|
||||
|
||||
Reference in New Issue
Block a user