Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00
Code Issues Projects Releases Wiki Activity

v1.8.1.1

Browse Source
This commit is contained in:
gnosygnu
2014-08-03 23:31:22 -04:00
parent 7b6e65b088
commit fb8c06c560
191 changed files with 1869 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
400_xowa/src_240_install/gplx/threads/Gfo_thread_cmd_download.java
View File

@@ -54,8 +54,9 @@ public class Gfo_thread_cmd_download implements Gfo_thread_cmd {
private void Download() {
download_pass = true;
if (!xrg.Exec()) {
kit.Ask_ok(GRP_KEY, "download.fail", "download failed. Please select 'read from file' if you've already downloaded a dump: url=~{0} error=~{1}", src, Err_.Message_gplx_brief(xrg.Rslt_err()));
xrg.Prog_running_(false);
download_pass = false;
kit.Ask_ok(GRP_KEY, "download.fail", "download failed. Please select 'read from file' if you've already downloaded a dump: url=~{0} error=~{1}", src, xrg.Rslt_err_str());
}
} boolean download_pass = true;
protected gplx.ios.IoEngine_xrg_downloadFil xrg = Io_mgr._.DownloadFil_args("", Io_url_.Null);

7
400_xowa/src_240_install/gplx/xowa/Xoi_cmd_base.java
View File

@@ -48,7 +48,12 @@ abstract class Xoi_cmd_base implements Gfo_thread_cmd {
bldr.Cmd_mgr().Clear();
Process_async_init(app, wiki, bldr);
bldr.Pause_at_end_(false);
bldr.Run();
try {bldr.Run();}
catch (Exception e) {
running = false;
install_mgr.Cmd_mgr().Working_n_();
throw Err_.err_(e, "error during import: ~{0}", Err_.Message_hdr_or_message(e));
}
app.Gui_wtr().Prog_none("", "clear", "");
app.Gui_wtr().Note_none("", "clear", "");
Process_async_done(app, wiki, bldr);

2
400_xowa/src_240_install/gplx/xowa/Xoi_cmd_mgr.java
View File

@@ -22,7 +22,7 @@ public class Xoi_cmd_mgr implements GfoInvkAble {
public Xoi_cmd_mgr(Xoi_setup_mgr install_mgr) {this.app = install_mgr.App(); this.install_mgr = install_mgr;} private Xoa_app app; Xoi_setup_mgr install_mgr;
public Xoa_app App() {return app;}
public void Canceled_y_() {canceled = true;} private boolean canceled = false;
public boolean Working() {return working;} private boolean working;
public boolean Working() {return working;} public void Working_n_() {working = false;} private boolean working;
private void Process_async(Gfo_thread_cmd cmd) {
byte init_rslt = cmd.Async_init();
if (init_rslt == Gfo_thread_cmd_.Init_ok) {