diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java index 1a14bcc70..e018f3896 100644 --- a/400_xowa/src/gplx/xowa/Xoa_app_.java +++ b/400_xowa/src/gplx/xowa/Xoa_app_.java @@ -1,58 +1,58 @@ -/* -XOWA: the XOWA Offline Wiki Application -Copyright (C) 2012-2020 gnosygnu@gmail.com - -XOWA is licensed under the terms of the General Public License (GPL) Version 3, -or alternatively under the terms of the Apache License Version 2.0. - -You may use XOWA according to either of these licenses as is most appropriate -for your project on a case-by-case basis. - -The terms of each license can be found in the source code repository: - -GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt -Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt -*/ -package gplx.xowa; - -import gplx.Err_; -import gplx.Gfo_usr_dlg; -import gplx.Gfo_usr_dlg__gui_; -import gplx.Gfo_usr_dlg__log_base; -import gplx.Gfo_usr_dlg_base; -import gplx.core.log_msgs.Gfo_msg_grp; -import gplx.core.log_msgs.Gfo_msg_grp_; -import gplx.xowa.apps.boots.Xoa_boot_mgr; -import gplx.xowa.apps.boots.Xoa_cmd_arg_mgr; -import gplx.xowa.guis.views.boots.Xog_error_win; - -public class Xoa_app_ { - public static void Run(String... args) { - Xoa_cmd_arg_mgr arg_mgr = Xoa_cmd_arg_mgr.new_(); - try { - Xoa_boot_mgr boot_mgr = new Xoa_boot_mgr(); - boot_mgr.Run(args, arg_mgr); - } catch (Error e) { - if (arg_mgr.App_type().Tid_is_gui()) - Xog_error_win.Run(Err_.Message_lang(e), Err_.Trace_lang(e)); - else - throw e; - } - } - public static final String Name = "xowa"; - public static final int Version_id = 555; - public static final String Version = "4.6.10.2008"; - public static final String Build_date_fmt = "yyyy-MM-dd HH:mm:ss"; - public static String Build_date = "2012-12-30 00:00:00"; - public static String User_agent = ""; - public static String Op_sys_str; - - public static Gfo_usr_dlg Usr_dlg() {return usr_dlg;} public static void Usr_dlg_(Gfo_usr_dlg v) {usr_dlg = v;} private static Gfo_usr_dlg usr_dlg; - public static Gfo_usr_dlg New__usr_dlg__console() { - Gfo_usr_dlg rv = new Gfo_usr_dlg_base(new Gfo_usr_dlg__log_base(), Gfo_usr_dlg__gui_.Console); - rv.Log_wkr().Queue_enabled_(true); - return rv; - } - - public static final Gfo_msg_grp Nde = Gfo_msg_grp_.prj_(Name); -} +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012-2020 gnosygnu@gmail.com + +XOWA is licensed under the terms of the General Public License (GPL) Version 3, +or alternatively under the terms of the Apache License Version 2.0. + +You may use XOWA according to either of these licenses as is most appropriate +for your project on a case-by-case basis. + +The terms of each license can be found in the source code repository: + +GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt +Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt +*/ +package gplx.xowa; + +import gplx.Err_; +import gplx.Gfo_usr_dlg; +import gplx.Gfo_usr_dlg__gui_; +import gplx.Gfo_usr_dlg__log_base; +import gplx.Gfo_usr_dlg_base; +import gplx.core.log_msgs.Gfo_msg_grp; +import gplx.core.log_msgs.Gfo_msg_grp_; +import gplx.xowa.apps.boots.Xoa_boot_mgr; +import gplx.xowa.apps.boots.Xoa_cmd_arg_mgr; +import gplx.xowa.guis.views.boots.Xog_error_win; + +public class Xoa_app_ { + public static void Run(String... args) { + Xoa_cmd_arg_mgr arg_mgr = Xoa_cmd_arg_mgr.new_(); + try { + Xoa_boot_mgr boot_mgr = new Xoa_boot_mgr(); + boot_mgr.Run(args, arg_mgr); + } catch (Error e) { + if (arg_mgr.App_type().Tid_is_gui()) + Xog_error_win.Run(Err_.Message_lang(e), Err_.Trace_lang(e)); + else + throw e; + } + } + public static final String Name = "xowa"; + public static final int Version_id = 556; + public static final String Version = "4.6.11.2009"; + public static final String Build_date_fmt = "yyyy-MM-dd HH:mm:ss"; + public static String Build_date = "2012-12-30 00:00:00"; + public static String User_agent = ""; + public static String Op_sys_str; + + public static Gfo_usr_dlg Usr_dlg() {return usr_dlg;} public static void Usr_dlg_(Gfo_usr_dlg v) {usr_dlg = v;} private static Gfo_usr_dlg usr_dlg; + public static Gfo_usr_dlg New__usr_dlg__console() { + Gfo_usr_dlg rv = new Gfo_usr_dlg_base(new Gfo_usr_dlg__log_base(), Gfo_usr_dlg__gui_.Console); + rv.Log_wkr().Queue_enabled_(true); + return rv; + } + + public static final Gfo_msg_grp Nde = Gfo_msg_grp_.prj_(Name); +} diff --git a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_visitor__html_wtr_tst.java b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_visitor__html_wtr_tst.java index ca05e64de..1fd69af04 100644 --- a/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_visitor__html_wtr_tst.java +++ b/400_xowa/src/gplx/xowa/xtns/wbases/hwtrs/Wdata_visitor__html_wtr_tst.java @@ -85,21 +85,21 @@ public class Wdata_visitor__html_wtr_tst { .Init_resolved_qid(2, "Earth") .Test_claim_val ( fxt.Wdata_fxt().Make_claim_geo(1, "51.5072222", "-0.1275", ".000027777", "123", "http://www.wikidata.org/entity/Q2") - , "0°7'39"S, 51°30'26"E (Earth)" + , "0°7'38.99"S, 51°30'26.01"E (Earth)" ); } @Test public void Globecoordinate__globe__null() { fxt .Test_claim_val ( fxt.Wdata_fxt().Make_claim_geo(1, "51.5072222", "-0.1275", ".000027777", "null", "") - , "0°7'39"S, 51°30'26"E" + , "0°7'38.99"S, 51°30'26.01"E" ); } @Test public void Globecoordinate__precision__0() { // PURPOSE: 0 precision was causing divide by 0 error; PAGE:ru.w:Лысково_(Калужская_область) DATE:2016-11-24 fxt .Test_claim_val ( fxt.Wdata_fxt().Make_claim_geo(1, "51.5072222", "-0.1275", "0", "null", "") - , "0°6'S, 51°30'E" + , "0°7'39"S, 51°30'26"E" ); } } diff --git a/xowa.home.version b/xowa.home.version index f26b42075..3c11094d4 100644 --- a/xowa.home.version +++ b/xowa.home.version @@ -1 +1 @@ -http_server_disable_special +release_v4.6.11.2009