From 5fc4eb41ece359300300029977ef4dd0812b87b0 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Sun, 30 Aug 2015 22:57:59 -0400 Subject: [PATCH] v2.8.5.1 --- 100_core/.classpath | 4 +- 100_core/src/gplx/core/brys/Bry_rdr.java | 4 +- .../src/gplx/core/btries/Btrie_slim_mgr.java | 6 +- .../src/gplx/core/criterias/Criteria_.java | 4 +- .../core/criterias/Criteria_bool_base.java | 2 +- .../core/criterias/Criteria_ioItm_tst.java | 2 +- .../gplx/core/criterias/Criteria_ioMatch.java | 2 +- .../gplx/core/primitives/Bool_obj_ref.java | 2 +- .../gplx/core/primitives/Bool_obj_val.java | 4 +- .../src/gplx/core/regxs/Regx_adp__tst.java | 4 +- 100_core/src_000_err/gplx/Gfo_msg_itm_.java | 2 +- 100_core/src_100_interface/gplx/RlsAble_.java | 2 +- .../gplx/Bool_.java | 22 +-- .../gplx/Byte_.java | 11 +- .../gplx/Byte__tst.java | 0 .../gplx/Byte_ascii.java | 0 .../gplx/Char_.java | 4 +- .../gplx/Double_.java | 6 +- .../gplx/Double__tst.java | 0 .../gplx/Float_.java | 4 +- .../gplx/Int_.java | 34 ++--- .../gplx/Int__tst.java | 14 +- .../gplx/Int_ary_.java | 12 +- .../gplx/Int_ary__tst.java | 0 .../gplx/Long_.java | 24 +-- .../gplx/Long__tst.java | 4 +- .../gplx/Short_.java | 2 +- .../gplx/Yn.java | 12 +- .../gplx/Array_.java | 0 .../gplx/Array__tst.java | 0 .../gplx/Decimal_adp.java | 1 - .../gplx/Decimal_adp_.java | 4 +- .../gplx/Decimal_adp__tst.java | 8 +- .../gplx/Guid_adp.java | 2 +- .../gplx/Guid_adp_.java | 4 +- .../gplx/Guid_adp__tst.java | 4 +- .../gplx/Object_.java | 5 +- .../gplx/Object__tst.java | 0 .../gplx/String_.java | 10 +- .../gplx/String__tst.java | 0 .../src_120_basicDataType/gplx/DateAdp.java | 4 +- .../src_120_basicDataType/gplx/DateAdp_.java | 2 +- .../src_120_basicDataType/gplx/EnmMgr.java | 6 +- .../src_120_basicDataType/gplx/Io_url_.java | 2 +- .../src_120_basicDataType/gplx/KeyVal.java | 11 +- .../src_120_basicDataType/gplx/KeyVal_.java | 23 ++- .../src_120_basicDataType/gplx/Math_.java | 2 +- .../src_120_basicDataType/gplx/Math__tst.java | 2 +- .../gplx/TimeSpanAdp.java | 6 +- .../gplx/TimeSpanAdp_.java | 6 +- .../gplx/TimeSpanAdp__parse_tst.java | 2 +- .../gplx/TimeSpanAdp_basic_tst.java | 8 +- .../gplx/TimeSpanAdp_xtoStr_tst.java | 2 +- .../gplx/Bry_.java | 12 +- .../gplx/Bry__tst.java | 14 +- .../gplx/Bry_bfr.java | 30 ++-- .../gplx/Bry_bfr_.java | 0 .../gplx/Bry_bfr_mkr.java | 0 .../gplx/Bry_bfr_mkr_tst.java | 0 .../gplx/Bry_bfr_tst.java | 10 +- .../gplx/Bry_finder.java | 0 .../gplx/Bry_finder_tst.java | 0 .../gplx/Bry_fmtr.java | 0 .../gplx/Bry_fmtr_arg.java | 0 .../gplx/Bry_fmtr_arg_.java | 0 .../gplx/Bry_fmtr_arg_fmtr_objs.java | 0 .../gplx/Bry_fmtr_eval_mgr.java | 0 .../gplx/Bry_fmtr_eval_mgr_.java | 0 .../gplx/Bry_fmtr_eval_mgr_gfs.java | 0 .../gplx/Bry_fmtr_itm.java | 0 .../gplx/Bry_fmtr_tst.java | 0 .../gplx/Bry_fmtr_vals.java | 0 .../gplx/brys/Bry_fmtr_arg_ary_dim2.java | 0 .../gplx/brys/Bry_fmtr_arg_bfr.java | 0 .../gplx/brys/Bry_fmtr_arg_bfr_preserve.java | 0 .../gplx/brys/Bry_fmtr_arg_bry.java | 0 .../gplx/brys/Bry_fmtr_arg_byt.java | 0 .../gplx/brys/Bry_fmtr_arg_decimal_int.java | 0 .../gplx/brys/Bry_fmtr_arg_fmtr.java | 0 .../gplx/brys/Bry_fmtr_arg_int.java | 2 +- .../gplx/brys/Bry_fmtr_arg_time.java | 0 .../gplx/brys/Bry_fmtr_arg_time_tst.java | 0 100_core/src_140_list/gplx/List_adp_tst.java | 2 +- 100_core/src_150_text/gplx/intl/Utf16_.java | 4 +- 100_core/src_150_text/gplx/intl/Utf8_.java | 4 +- .../src_150_text/gplx/texts/HexDecUtl.java | 10 +- .../gplx/texts/HexDecUtl_tst.java | 8 +- .../gplx/texts/RegxPatn_cls_ioMatch_.java | 8 +- .../gplx/texts/RegxPatn_cls_ioMatch_tst.java | 2 +- .../gplx/texts/RegxPatn_cls_like_.java | 2 +- .../gplx/texts/RegxPatn_cls_like_tst.java | 4 +- .../gplx/texts/StringTableCol.java | 6 +- .../src_160_hash/gplx/security/HashAlgo_.java | 2 +- .../src_200_io/gplx/ios/IoEngine_system.java | 4 +- .../gplx/ios/IoEngine_xrg_queryDir.java | 2 +- .../src_200_io/gplx/ios/IoItmClassXtn.java | 2 +- 100_core/src_200_io/gplx/ios/Io_size_.java | 10 +- .../src_200_io/gplx/ios/Io_size__tst.java | 8 +- .../gplx/ios/Io_stream_rdr_tst.java | 4 +- 100_core/src_210_env/gplx/Type_adp_.java | 25 ++-- .../src_300_classXtn/gplx/BoolClassXtn.java | 2 +- .../src_300_classXtn/gplx/ByteClassXtn.java | 6 +- .../gplx/DateAdpClassXtn.java | 6 +- .../gplx/DecimalAdpClassXtn.java | 6 +- .../src_300_classXtn/gplx/DoubleClassXtn.java | 4 +- .../src_300_classXtn/gplx/FloatClassXtn.java | 4 +- .../src_300_classXtn/gplx/IntClassXtn.java | 6 +- .../src_300_classXtn/gplx/IoUrlClassXtn.java | 6 +- .../src_300_classXtn/gplx/LongClassXtn.java | 6 +- .../src_300_classXtn/gplx/StringClassXtn.java | 2 +- .../gplx/TimeSpanAdpClassXtn.java | 8 +- 100_core/src_310_gfoNde/gplx/GfoFldList_.java | 2 +- .../src_311_gfoObj/gplx/GfoInvkAble_.java | 2 +- 100_core/src_311_gfoObj/gplx/GfoMsg_.java | 56 +++---- 100_core/src_330_store/gplx/DataRdr_.java | 6 +- .../gplx/stores/DataRdr_base.java | 36 ++--- .../src_330_store/gplx/stores/GfoNdeRdr_.java | 2 +- .../gplx/stores/xmls/XmlDataRdr.java | 2 +- .../gplx/stores/dsvs/DsvStoreLayout.java | 2 +- 100_core/src_800_tst/gplx/Tfds.java | 1 + 100_core/src_900_xml/gplx/Base85_utl_tst.java | 2 +- 100_core/src_900_xml/gplx/xmls/XmlDoc_.java | 2 +- .../src_900_xml/gplx/xmls/XmlDoc_tst.java | 10 +- .../gplx/xmls/XmlFileSplitter.java | 6 +- .../src_900_xml/gplx/xmls/Xpath__tst.java | 2 +- .../ios/IoEngine_fil_basic_memory_tst.java | 2 +- .../ios/IoEngine_fil_basic_system_tst.java | 2 +- .../gplx/ios/IoEngine_xrg_recycleFil_tst.java | 2 +- 110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java | 6 +- 110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java | 2 +- 110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java | 4 +- .../gplx/gfml/GfmlStringHighlighter.java | 2 +- .../src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java | 2 +- .../gplx/gfml/GfmlDataWtrOpts.java | 2 +- 110_gfml/tst/gplx/gfml/z901_perf_tst.java | 2 +- 140_dbs/src/gplx/dbs/Db_conn.java | 4 +- 140_dbs/src/gplx/dbs/Db_conn_.java | 2 +- 140_dbs/src/gplx/dbs/Db_conn_info_.java | 2 +- 140_dbs/src/gplx/dbs/Db_conn_pool.java | 2 +- 140_dbs/src/gplx/dbs/Db_rdr_.java | 4 +- 140_dbs/src/gplx/dbs/Db_rdr__basic.java | 12 +- .../dbs/engines/mems/Db_conn_info__mem.java | 2 +- .../gplx/dbs/engines/mems/Db_rdr__mem.java | 12 +- .../dbs/engines/mysql/Mysql_conn_info.java | 2 +- .../engines/postgres/Postgres_conn_info.java | 2 +- .../dbs/engines/sqlite/Sqlite_conn_info.java | 4 +- .../dbs/engines/sqlite/Sqlite_engine.java | 8 +- .../dbs/engines/tdbs/TdbConnectInfo_tst.java | 4 +- .../src/gplx/dbs/engines/tdbs/TdbDelete.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbEngine.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbFile.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbFlush.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbInsert.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbSelect.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbTable.java | 2 +- .../src/gplx/dbs/engines/tdbs/TdbUpdate.java | 2 +- .../gplx/dbs/engines/tdbs/Tdb_conn_info.java | 2 +- .../dbs/metas/parsers/Meta_parser__fld.java | 6 +- .../metas/parsers/Meta_parser__fld_tst.java | 4 +- .../metas/parsers/Meta_parser__tbl_tst.java | 2 +- 140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java | 2 +- 140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java | 18 +-- 140_dbs/src/gplx/dbs/qrys/Db_qry_sql_tst.java | 2 +- .../src/gplx/dbs/sqls/Sql_qry_wtr_ansi.java | 2 +- .../gplx/dbs/sqls/Sql_qry_wtr_iosql_tst.java | 2 +- .../src/gplx/dbs/sqls/Sql_select_fld_.java | 6 +- .../src_100_basic/gplx/gfui/GfuiAlign_.java | 8 +- .../gplx/gfui/GfuiBorderEdge.java | 2 +- .../src_100_basic/gplx/gfui/PointAdp_.java | 10 +- .../src_100_basic/gplx/gfui/RectAdpF.java | 2 +- .../src_100_basic/gplx/gfui/RectAdp_.java | 6 +- .../src_100_basic/gplx/gfui/SizeAdpF.java | 2 +- .../src_100_basic/gplx/gfui/SizeAdpF_.java | 10 +- .../src_100_basic/gplx/gfui/SizeAdp_.java | 12 +- .../gplx/gfui/ColorAdp_.java | 20 +-- .../gplx/gfui/ColorAdp__tst.java | 6 +- .../src_110_draw_core/gplx/gfui/FontAdp.java | 2 +- .../gplx/gfui/FontStyleAdp_.java | 8 +- .../src_110_draw_core/gplx/gfui/PenAdp_.java | 2 +- .../gplx/gfui/SolidBrushAdp_.java | 2 +- .../gplx/gfui/GfuiBorderMgr.java | 2 +- .../gplx/gfui/GfxStringData.java | 2 +- .../gplx/gfui/PaintArgs.java | 2 +- 150_gfui/src_200_ipt/gplx/gfui/IptArg.java | 4 +- 150_gfui/src_200_ipt/gplx/gfui/IptArg_.java | 24 +-- .../src_200_ipt/gplx/gfui/IptBnd_chkBox.java | 4 +- .../src_200_ipt/gplx/gfui/IptBnd_txt_cmd.java | 4 +- .../gplx/gfui/IptBnd_txt_range.java | 14 +- .../gplx/gfui/IptBnd_upDownRange.java | 6 +- .../src_200_ipt/gplx/gfui/IptCfg_tst.java | 2 +- .../src_200_ipt/gplx/gfui/IptEventData.java | 4 +- .../src_200_ipt/gplx/gfui/IptEvtDataKey.java | 2 +- .../gplx/gfui/IptEvtDataKeyHeld.java | 2 +- .../gplx/gfui/IptEvtDataMouse.java | 2 +- 150_gfui/src_200_ipt/gplx/gfui/IptKey_.java | 6 +- .../src_200_ipt/gplx/gfui/IptKey__tst.java | 4 +- .../src_200_ipt/gplx/gfui/IptMouseBtn_.java | 2 +- .../src_200_ipt/gplx/gfui/IptMouseWheel_.java | 4 +- .../gplx/gfui/GxwTextBox_lang.java | 2 +- .../gplx/gfui/GxwTextMemo_lang.java | 2 +- .../gplx/gfui/GfuiFocusXferBnd.java | 8 +- .../src_400_win/gplx/gfui/GfuiMenuBar.java | 4 +- .../gplx/gfui/GfuiWinKeyCmdMgr.java | 4 +- 150_gfui/src_400_win/gplx/gfui/GfuiWin_.java | 2 +- .../gplx/gfui/GfuiElemBase.java | 4 +- .../gplx/gfui/GfuiElemBase_.java | 2 +- .../src_410_box_core/gplx/gfui/GfuiElem_.java | 2 +- .../gplx/gfui/GfuiBtnClickBnd.java | 4 +- .../src_420_box_basic/gplx/gfui/GfuiBtn_.java | 2 +- .../gplx/gfui/GfuiChkBox_.java | 2 +- .../gplx/gfui/GfuiTextBox_.java | 2 +- .../gplx/gfui/DataBndr_whenEvt_execCmd.java | 2 +- .../gplx/gfui/GfuiMoveElemBnd.java | 2 +- 150_gfui/src_500_tab/gplx/gfui/TabBnd.java | 8 +- 150_gfui/src_500_tab/gplx/gfui/TabBox_.java | 2 +- 150_gfui/src_600_adp/gplx/gfui/IconAdp.java | 5 +- 150_gfui/src_600_adp/gplx/gfui/ImageAdp_.java | 6 +- .../src_600_adp/gplx/gfui/ScreenAdp_.java | 6 +- .../src_700_env/gplx/gfui/Gfui_dlg_msg.java | 2 +- 150_gfui/src_700_env/gplx/gfui/Swt_kit.java | 4 +- 150_gfui/tst/gplx/gfui/GfxItm_base.java | 2 +- 150_gfui/tst/gplx/gfui/GfxLineItm.java | 2 +- 150_gfui/tst/gplx/gfui/IptArg_parser_tst.java | 8 +- 150_gfui/tst/gplx/gfui/ScreenAdp_tst.java | 4 +- 150_gfui/xtn/gplx/gfui/Swt_html.java | 4 +- .../src/gplx/cache/Gfo_cache_mgr_bry.java | 2 +- 400_xowa/src/gplx/core/brys/Bry_rdr_tst.java | 2 +- 400_xowa/src/gplx/core/json/Json_ary.java | 8 +- 400_xowa/src/gplx/core/json/Json_doc.java | 25 ++-- 400_xowa/src/gplx/core/json/Json_doc_srl.java | 4 +- 400_xowa/src/gplx/core/json/Json_doc_tst.java | 9 +- 400_xowa/src/gplx/core/json/Json_doc_wtr.java | 4 +- 400_xowa/src/gplx/core/json/Json_factory.java | 4 +- 400_xowa/src/gplx/core/json/Json_grp.java | 2 +- 400_xowa/src/gplx/core/json/Json_itm.java | 103 +++---------- 400_xowa/src/gplx/core/json/Json_itm_.java | 5 +- 400_xowa/src/gplx/core/json/Json_itm_int.java | 12 +- 400_xowa/src/gplx/core/json/Json_itm_str.java | 78 ++++++++++ 400_xowa/src/gplx/core/json/Json_itm_tmp.java | 6 +- 400_xowa/src/gplx/core/json/Json_kv.java | 12 +- .../src/gplx/core/json/Json_kv_ary_srl.java | 18 +-- .../gplx/core/json/Json_kv_ary_srl_tst.java | 8 +- 400_xowa/src/gplx/core/json/Json_nde.java | 16 +- 400_xowa/src/gplx/core/json/Json_parser.java | 56 ++++--- .../src/gplx/core/json/Json_parser_tst.java | 6 +- 400_xowa/src/gplx/core/json/Json_wtr.java | 26 ++-- .../src/gplx/core/lists/Binary_search_.java | 2 +- 400_xowa/src/gplx/dbs/cfgs/Db_cfg_itm.java | 14 +- 400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java | 10 +- 400_xowa/src/gplx/php/Php_parser_tst.java | 4 +- 400_xowa/src/gplx/php/Php_srl_parser.java | 8 +- 400_xowa/src/gplx/php/Php_tkn.java | 2 +- 400_xowa/src/gplx/xowa/Xoa_app.java | 2 + 400_xowa/src/gplx/xowa/Xoa_app_.java | 2 +- 400_xowa/src/gplx/xowa/Xoa_url_.java | 9 +- 400_xowa/src/gplx/xowa/Xoae_app.java | 6 +- 400_xowa/src/gplx/xowa/apis/Xoapi_root.java | 2 +- .../xowa/apis/xowa/html/Xoapi_toggle_itm.java | 2 +- .../apis/xowa/html/modules/Xoapi_popups.java | 12 +- .../src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java | 2 + .../gplx/xowa/apps/versions/Xoa_version_.java | 2 +- .../src/gplx/xowa/bldrs/Xob_cmd_keys.java | 1 + 400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java | 1 + .../gplx/xowa/bldrs/aria2/Aria2_lib_mgr.java | 2 +- .../bldrs/cfgs/Xob_wiki_cfg_bldr_tst.java | 4 +- .../xowa/bldrs/cmds/Xob_dump_mgr_base.java | 8 +- .../bldrs/cmds/ctgs/Xoctg_link_idx_wkr.java | 4 +- .../xowa/bldrs/cmds/files/Xob_bin_db_itm.java | 6 +- .../cmds/files/Xob_diff_regy_exec_cmd.java | 2 +- .../bldrs/cmds/files/Xob_fsdb_make_cmd.java | 6 +- .../bldrs/cmds/files/Xob_lnki_temp_wkr.java | 7 +- .../texts/sqls/Xob_pagelinks_parser_cmd.java | 72 +++++++++ .../texts/sqls/Xob_pagelinks_parser_tst.java | 61 ++++++++ .../bldrs/cmds/utils/Xob_cleanup_cmd.java | 2 +- .../bldrs/cmds/utils/Xob_deploy_zip_cmd.java | 2 +- .../bldrs/cmds/utils/Xob_site_meta_cmd.java | 2 +- .../filters/dansguardians/Dg_match_mgr.java | 4 +- .../filters/dansguardians/Dg_parser.java | 4 +- .../xowa/bldrs/langs/Json_itm_wkr__base.java | 4 +- .../xowa/bldrs/langs/Xol_mw_lang_parser.java | 8 +- .../gplx/xowa/bldrs/syncs/Xob_sync_itm.java | 6 +- .../bldrs/wiki_cfgs/Xoi_wiki_props_alias.java | 2 +- .../bldrs/wiki_cfgs/Xoi_wiki_props_api.java | 2 +- .../wiki_cfgs/Xoi_wiki_props_api_tst.java | 2 +- .../bldrs/wiki_cfgs/Xoi_wiki_props_ns.java | 2 +- .../xowa/bldrs/xmls/Xob_siteinfo_parser.java | 6 +- .../src/gplx/xowa/cfgs/Xoa_cfg_grp_tid.java | 2 +- 400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_mgr.java | 2 +- .../gplx/xowa/cfgs/gui/Xocfg_pref_mgr.java | 2 +- .../gplx/xowa/cfgs2/Xocfg_bnd_itm_srl.java | 2 +- .../src/gplx/xowa/ctgs/Xoctg_html_mgr.java | 8 +- .../gplx/xowa/ctgs/Xoctg_html_mgr_tst.java | 6 +- .../src/gplx/xowa/ctgs/Xoctg_idx_mgr.java | 4 +- .../gplx/xowa/ctgs/Xoctg_pagelist_itms.java | 2 +- .../src/gplx/xowa/dbs/Xodb_load_mgr_sql.java | 8 +- .../gplx/xowa/dbs/Xodb_load_mgr_sql_tst.java | 4 +- .../src/gplx/xowa/dbs/Xodb_load_mgr_txt.java | 2 +- .../src/gplx/xowa/dbs/Xodb_upgrade_mgr.java | 2 +- .../src/gplx/xowa/files/Xof_img_size_tst.java | 2 +- .../src/gplx/xowa/files/Xof_xfer_itm_tst.java | 6 +- .../files/bins/Xof_bin_wkr__fsdb_sql.java | 2 +- .../gplx/xowa/files/caches/Xou_cache_mgr.java | 4 +- .../xowa/files/fsdb/tsts/Xof_file_fxt.java | 2 +- .../imgs/Xof_img_wkr_query_img_size.java | 2 +- .../xowa/files/origs/Xof_wiki_finder.java | 2 +- .../files/xfers/Xof_xfer_queue_base_fxt.java | 2 +- .../src/gplx/xowa/fmtrs/Xoa_fmtr_itm.java | 2 +- 400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java | 2 +- .../xowa/gui/history/Xog_history_mgr.java | 2 +- .../gui/history/Xog_history_stack_tst.java | 2 +- .../gplx/xowa/gui/menus/dom/Xog_mnu_bldr.java | 2 +- .../gui/urls/Xof_orig_file_downloader.java | 2 +- .../src/gplx/xowa/gui/urls/Xog_url_wkr.java | 2 +- .../src/gplx/xowa/gui/views/Rect_ref.java | 4 +- .../src/gplx/xowa/gui/views/Xog_html_itm.java | 2 +- .../xowa/gui/views/Xog_launcher_tabs.java | 4 +- .../gplx/xowa/gui/views/Xog_layout_box.java | 26 ++-- .../src/gplx/xowa/gui/views/Xog_tab_itm.java | 2 +- .../xowa/gui/views/Xog_tab_itm_edit_mgr.java | 4 +- .../src/gplx/xowa/gui/views/Xog_tab_mgr.java | 6 +- .../src/gplx/xowa/gui/views/Xog_win_itm.java | 9 +- .../src/gplx/xowa/gui/views/Xog_win_itm_.java | 3 +- 400_xowa/src/gplx/xowa/html/Xoh_cfg_file.java | 2 +- .../gplx/xowa/html/Xoh_page_wtr_wkr_tst.java | 6 +- 400_xowa/src/gplx/xowa/html/Xow_html_mgr.java | 4 +- .../xowa/html/bridges/Bridge_cmd_mgr.java | 6 +- .../xowa/html/bridges/Bridge_msg_bldr.java | 4 +- .../xowa/html/bridges/Xoh_bridge_mgr.java | 4 +- .../html/hdumps/abrvs/Xohd_abrv_mgr_tst.java | 6 +- .../xowa/html/hrefs/Xoh_href_wtr_tst.java | 2 +- .../gplx/xowa/html/hzips/Xow_hzip_int_.java | 6 +- .../xowa/html/hzips/Xow_hzip_int__tst.java | 2 +- .../xowa/html/hzips/Xow_hzip_itm__anchor.java | 7 +- .../html/hzips/Xow_hzip_itm__anchor_tst.java | 5 + .../src/gplx/xowa/html/js/Xoh_js_cbk.java | 10 +- .../src/gplx/xowa/html/js/Xoh_js_cbk_tst.java | 6 +- .../html/js/Xoh_js_cbk_wdata_labels_tst.java | 8 +- .../lnkis/Xoh_file_wtr_audio_video_tst.java | 28 ++-- .../html/lnkis/Xoh_file_wtr_basic_tst.java | 10 +- .../html/lnkis/Xoh_file_wtr_media_tst.java | 2 +- .../html/modules/popups/Xow_popup_itm.java | 2 +- .../html/modules/popups/Xow_popup_mgr.java | 4 +- .../html/modules/popups/Xow_popup_parser.java | 2 +- .../modules/popups/Xow_popup_parser_data.java | 2 +- .../modules/popups/Xow_popup_parser_tst.java | 2 +- .../ns_files/Xoh_ns_file_page_mgr_tst.java | 8 +- .../html/portal/Xoa_available_wikis_mgr.java | 2 +- .../html/portal/Xoh_page_body_cls_tst.java | 2 +- .../html/portal/Xoh_subpages_bldr_tst.java | 2 +- .../xowa/html/portal/Xow_portal_mgr_tst.java | 2 +- .../src/gplx/xowa/html/wtrs/Xoh_img_path.java | 10 +- .../gplx/xowa/html/wtrs/Xoh_lnki_bldr.java | 2 +- .../gplx/xowa/langs/cnvs/Xol_cnv_mgr_tst.java | 4 +- .../gplx/xowa/langs/msgs/Xol_msg_mgr_.java | 4 +- .../src/gplx/xowa/langs/vnts/Xol_vnt_mgr.java | 2 +- .../xowa/parsers/lnkes/Xoh_lnke_wtr_tst.java | 2 +- .../gplx/xowa/parsers/lnkes/Xop_lnke_wkr.java | 2 +- .../lnkis/redlinks/Xog_redlink_mgr.java | 2 +- .../xowa/parsers/logs/Xop_log_basic_wkr.java | 1 + .../parsers/paras/Xop_para_wkr_basic_tst.java | 2 +- .../src/gplx/xowa/parsers/utils/Xop_util.java | 2 +- .../xowa/servers/http/Http_server_mgr.java | 2 +- .../gplx/xowa/servers/tcp/Xosrv_server.java | 8 +- .../xowa/setup/maints/Wmf_latest_parser.java | 2 +- .../setup/maints/Wmf_latest_parser_tst.java | 2 +- 400_xowa/src/gplx/xowa/specials/Xows_mgr.java | 4 +- .../specials/allPages/Xows_page_allpages.java | 4 +- .../allPages/Xows_page_allpages_tst.java | 2 +- .../xowa/specials/movePage/Move_page.java | 6 +- .../gplx/xowa/specials/nearby/Nearby_mgr.java | 4 +- .../randoms/Xop_randomRootPage_page.java | 2 +- .../randoms/Xop_randomRootPage_page_tst.java | 2 +- .../search/Xog_search_suggest_cmd.java | 4 +- .../xowa/specials/search/Xosrh_core_tst.java | 4 +- .../search/Xosrh_rslt_itm_sorter.java | 2 +- .../search/Xow_domain_sorter__manual_tid.java | 2 +- .../xowa/specials/search/Xows_arg_mgr.java | 2 +- .../gplx/xowa/specials/search/Xows_core.java | 2 +- .../xowa/specials/search/Xows_db_wkr.java | 2 +- .../specials/search/Xows_html_wkr_tst.java | 6 +- .../xowa/specials/search/Xows_ns_mgr.java | 4 +- .../specials/search/Xows_page__search.java | 2 +- .../xowa/diags/Xows_cmd__file_check.java | 8 +- .../src/gplx/xowa/tdbs/Xotdb_fsys_mgr.java | 2 +- .../src/gplx/xowa/urls/Xoa_url_parser.java | 19 ++- .../urls/Xoa_url_parser__url_bar_tst.java | 8 + .../gplx/xowa/urls/Xoa_url_parser_fxt.java | 3 +- .../src/gplx/xowa/users/Xoc_layout_mgr.java | 2 +- .../src/gplx/xowa/users/Xou_fsys_mgr.java | 1 - 400_xowa/src/gplx/xowa/users/Xou_user_.java | 2 +- .../src/gplx/xowa/users/Xouc_window_mgr.java | 4 +- 400_xowa/src/gplx/xowa/users/Xoue_user.java | 2 +- .../src/gplx/xowa/users/Xous_window_mgr.java | 2 +- .../bmks}/Dbui_tbl_itm__bmk.java | 2 +- .../xowa/users/bmks/Xoud_bmk_itm_tbl.java | 2 +- .../bmks}/Xows_bmk_page.java | 4 +- .../src/gplx/xowa/users/data/Xou_db_file.java | 2 +- .../src/gplx/xowa/users/data/Xou_db_mgr.java | 3 +- .../gplx/xowa/users/data/Xoud_cfg_mgr.java | 2 +- .../gplx/xowa/users/data/Xoud_opt_scope.java | 2 +- .../gplx/xowa/users/data/Xoud_user_tbl.java | 4 +- .../history}/Dbui_tbl_itm__history.java | 2 +- .../xowa/users/history/Xou_history_mgr.java | 2 +- .../users/history/Xou_history_mgr_tst.java | 2 +- .../{data => history}/Xoud_history_mgr.java | 8 +- .../{data => history}/Xoud_history_row.java | 2 +- .../Xoud_history_special.java | 3 +- .../{data => history}/Xoud_history_tbl.java | 3 +- .../gplx/xowa/users/prefs/Prefs_mgr_tst.java | 2 +- .../wikis/data/Xow_page_fetcher_wiki.java | 2 +- .../xowa/wikis/data/tbls/Xowd_page_itm.java | 2 +- .../xowa/wikis/data/tbls/Xowd_page_tbl.java | 2 +- .../wikis/data/tbls/Xowd_pagelinks_tbl.java | 37 +++++ .../data/tbls/Xowd_pagelinks_temp_tbl.java | 45 ++++++ .../wikis/data/tbls/Xowd_site_ns_tbl.java | 2 +- .../wikis/data/tbls/Xowd_xowa_db_tbl.java | 2 +- .../gplx/xowa/wikis/domains/Xow_abrv_xo_.java | 2 +- .../xowa/wikis/ttls/Xow_ttl__i18n_tst.java | 10 +- .../src/gplx/xowa/wikis/ttls/Xow_ttl_fxt.java | 10 +- .../xowa/wikis/xwikis/Xow_lang_mgr_fxt.java | 2 +- .../xowa/wikis/xwikis/Xow_lang_mgr_tst.java | 8 +- .../xowa/wmfs/apis/Xowm_rev_meta_api.java | 71 +++++++++ .../data/Json_parser__list_nde__base.java | 10 +- .../src/gplx/xowa/wmfs/data/Site_core_db.java | 2 +- .../gplx/xowa/wmfs/data/Site_json_parser.java | 6 +- .../xowa/wmfs/data/Site_json_parser_tst.java | 10 +- .../gplx/xowa/wmfs/data/Site_meta_itm.java | 7 +- .../xowa/xtns/dynamicPageList/Dpl_itm.java | 16 +- .../xowa/xtns/dynamicPageList/Dpl_xnde.java | 6 +- .../xtns/dynamicPageList/Dpl_xnde_tst.java | 2 +- .../xowa/xtns/gallery/Gallery_html_wtr.java | 2 +- .../xowa/xtns/gallery/Gallery_itm_parser.java | 4 +- .../xowa/xtns/gallery/Gallery_mgr_base.java | 2 +- .../xowa/xtns/geoCrumbs/Geoc_isin_func.java | 2 +- .../src/gplx/xowa/xtns/hieros/Hiero_xnde.java | 3 +- .../gplx/xowa/xtns/imaps/Imap_desc_tid.java | 2 +- .../src/gplx/xowa/xtns/imaps/Imap_parser.java | 2 +- .../xtns/imaps/Imap_xnde_html_all_tst.java | 8 +- .../xowa/xtns/insiders/Insider_html_bldr.java | 2 +- .../src/gplx/xowa/xtns/lst/Lst_pfunc_wkr.java | 2 +- .../src/gplx/xowa/xtns/math/Math_nde.java | 3 + .../xowa/xtns/math/parsers/Math_func_itm.java | 124 ++++++++++++++++ .../math/parsers/Math_func_ml_parser.java | 73 +++++++++ .../gplx/xowa/xtns/math/parsers/Mwm_ctx.java | 21 +++ .../gplx/xowa/xtns/math/parsers/Mwm_lxr.java | 2 + .../xtns/math/parsers/Mwm_lxr__brack.java | 35 +++++ .../xtns/math/parsers/Mwm_lxr__curly.java | 10 +- .../xowa/xtns/math/parsers/Mwm_parser.java | 15 +- .../xtns/math/parsers/Mwm_parser_tst.java | 41 ++++-- .../xowa/xtns/math/parsers/Mwm_root_ary.java | 3 + .../xowa/xtns/math/parsers/Mwm_root_reg.java | 27 ++-- .../xowa/xtns/math/parsers/Mwm_root_sub.java | 4 + .../gplx/xowa/xtns/math/parsers/Mwm_tkn.java | 1 + .../gplx/xowa/xtns/math/parsers/Mwm_tkn_.java | 18 ++- .../xowa/xtns/math/parsers/Mwm_tkn__leaf.java | 1 + .../xowa/xtns/math/parsers/Mwm_tkn__node.java | 6 + .../xowa/xtns/math/parsers/Mwm_tkn__root.java | 23 ++- .../xowa/xtns/math/parsers/Mwm_tkn_mkr.java | 4 +- .../xowa/xtns/math/parsers/Mwm_trie_bldr.java | 3 + .../xtns/pfuncs/exprs/Pfunc_expr_ops.java | 2 +- .../xtns/pfuncs/exprs/Pfunc_expr_tst.java | 2 +- .../xtns/pfuncs/ifs/Pfunc_ifexist_mgr.java | 2 +- .../xtns/pfuncs/pages/Pfunc_rev_props.java | 2 +- .../pfuncs/stringutils/Pfunc_replace.java | 2 +- .../xtns/pfuncs/stringutils/Pfunc_sub.java | 6 +- .../pfuncs/times/Pft_func_time_basic_tst.java | 2 +- .../xtns/pfuncs/times/Pxd_itm_month_name.java | 6 +- .../xowa/xtns/pfuncs/times/Pxd_parser.java | 4 +- .../gplx/xowa/xtns/pfuncs/ttls/Pfunc_ns.java | 4 +- .../xtns/pfuncs/ttls/Pfunc_titleparts.java | 10 +- .../gplx/xowa/xtns/pfuncs/ttls/Pfunc_ttl.java | 2 +- .../xtns/proofreadPage/Pp_index_parser.java | 2 +- .../xowa/xtns/proofreadPage/Pp_pages_nde.java | 18 +-- .../xtns/relatedArticles/Articles_func.java | 2 +- .../relatedSites/Sites_html_bldr_tst.java | 2 +- .../xowa/xtns/scribunto/Scrib_core_fxt.java | 6 +- .../xtns/scribunto/Scrib_invoke_func.java | 2 +- .../xtns/scribunto/Scrib_invoke_func_fxt.java | 10 +- .../xowa/xtns/scribunto/Scrib_kv_utl_.java | 6 +- .../xowa/xtns/scribunto/Scrib_proc_args.java | 26 ++-- .../scribunto/engines/luaj/Luaj_value.java | 10 +- .../engines/process/Process_engine.java | 2 +- .../engines/process/Process_send_wtr.java | 6 +- .../engines/process/Process_server_mock.java | 4 +- .../engines/process/Process_stream_rdr.java | 4 +- .../xtns/scribunto/errs/Scrib_err_mgr.java | 2 +- .../xowa/xtns/scribunto/libs/Kv_ary_utl.java | 82 +++++++++++ .../scribunto/libs/Scrib_lib_language.java | 4 +- .../scribunto/libs/Scrib_lib_message.java | 4 +- .../xtns/scribunto/libs/Scrib_lib_mw.java | 24 +-- .../xtns/scribunto/libs/Scrib_lib_text.java | 36 +++-- .../libs/Scrib_lib_text__json_util.java | 54 +++++-- .../scribunto/libs/Scrib_lib_text_tst.java | 138 +++++++++++++----- .../xtns/scribunto/libs/Scrib_lib_title.java | 22 +-- .../scribunto/libs/Scrib_lib_title_tst.java | 4 +- .../xtns/scribunto/libs/Scrib_lib_uri.java | 2 +- .../scribunto/libs/Scrib_lib_ustring.java | 4 +- .../libs/Scrib_lib_ustring__lib_tst.java | 2 +- .../scribunto/libs/Scrib_lib_wikibase.java | 2 +- .../libs/Scrib_lib_wikibase_srl_tst.java | 2 +- .../libs/Scrib_lib_wikibase_srl_visitor.java | 4 +- .../scribunto/libs/Scrib_regx_converter.java | 4 +- .../xtns/translates/Xop_languages_xnde.java | 6 +- .../translates/Xop_mylanguage_page_tst.java | 2 +- .../gplx/xowa/xtns/wdatas/Wdata_doc_wtr.java | 4 +- .../gplx/xowa/xtns/wdatas/Wdata_wiki_mgr.java | 12 +- .../xowa/xtns/wdatas/Wdata_wiki_mgr_fxt.java | 7 +- .../xowa/xtns/wdatas/Wdata_wiki_mgr_tst.java | 2 +- .../xtns/wdatas/Wdata_xwiki_link_wtr.java | 2 +- .../xtns/wdatas/Wdata_xwiki_link_wtr_tst.java | 8 +- .../core/Wdata_claim_itm_globecoordinate.java | 3 +- .../wdatas/core/Wdata_claim_itm_quantity.java | 2 +- .../wdatas/core/Wdata_claim_itm_time.java | 12 +- .../xowa/xtns/wdatas/core/Wdata_date.java | 2 +- .../xtns/wdatas/core/Wdata_lang_sorter.java | 4 +- .../xtns/wdatas/hwtrs/Wdata_fmtr__json.java | 2 +- .../wdatas/imports/Io_stream_rdr_mgr.java | 2 +- .../xtns/wdatas/imports/Xob_wdata_db_cmd.java | 6 +- .../parsers/Wdata_claims_parser_v2.java | 44 +++--- .../parsers/Wdata_doc_parser_fxt_base.java | 39 ++--- .../wdatas/parsers/Wdata_doc_parser_v1.java | 58 ++++---- .../wdatas/parsers/Wdata_doc_parser_v2.java | 36 ++--- .../specials/Wdata_itemByTitle_page.java | 2 +- .../specials/Wdata_itemByTitle_page_tst.java | 2 +- 400_xowa/src/gplx/xowa2/apps/Xoav_app.java | 6 +- 400_xowa/src_060_utl/gplx/App_cmd_arg.java | 4 +- .../src_060_utl/gplx/Gfo_usr_dlg_fmt.java | 2 +- 400_xowa/src_060_utl/gplx/Int_2_ref.java | 10 +- 400_xowa/src_060_utl/gplx/Int_2_val.java | 6 +- 400_xowa/src_060_utl/gplx/Int_ary.java | 22 +++ 400_xowa/src_060_utl/gplx/Number_parser.java | 4 +- .../src_060_utl/gplx/Number_parser_tst.java | 16 +- 400_xowa/src_060_utl/gplx/StatRng.java | 20 +-- .../src_100_app/gplx/xowa/Xoa_sys_cfg.java | 2 +- .../src_120_wiki/gplx/xowa/Xow_html_util.java | 4 +- 400_xowa/src_120_wiki/gplx/xowa/Xow_ns_.java | 2 +- .../src_120_wiki/gplx/xowa/Xow_ns_case_.java | 2 +- .../src_120_wiki/gplx/xowa/Xow_ns_mgr.java | 16 +- .../gplx/xowa/Xow_ns_mgr_tst.java | 2 +- .../src_120_wiki/gplx/xowa/Xow_ns_tst.java | 2 +- .../gplx/xowa/Xow_wiki_props.java | 2 +- .../src_120_wiki/gplx/xowa/Xow_wiki_tst.java | 2 +- .../gplx/xowa/Xowc_xtn_pages.java | 10 +- .../gplx/xowa/Xowc_xtn_pages_tst.java | 2 +- .../src_120_wiki/gplx/xowa/Xowe_wiki.java | 4 +- .../gplx/xowa/Xow_data_mgr.java | 2 +- .../gplx/xowa/Xow_data_mgr_tst.java | 6 +- .../gplx/xowa/Xowd_hive_mgr_tst.java | 2 +- .../src_140_lang/gplx/xowa/Xol_font_info.java | 2 +- .../src_140_lang/gplx/xowa/Xol_lang_srl.java | 4 +- .../gplx/xowa/Xol_msg_mgr_tst.java | 2 +- .../gplx/xowa/Xofo_lnki_parser.java | 8 +- .../gplx/xowa/Xofw_wiki_wkr_base.java | 4 +- .../src_200_bldr/gplx/xowa/Xob_stat_itm.java | 2 +- .../gplx/xowa/Xoi_dump_mgr.java | 2 +- .../gplx/xowa/Xow_cfg_wiki_core.java | 6 +- .../gplx/xowa/Xop_link_parser.java | 2 +- .../src_400_parser/gplx/xowa/Xoa_ttl.java | 6 +- .../src_400_parser/gplx/xowa/Xop_ctx.java | 4 +- .../src_400_parser/gplx/xowa/Xop_fxt.java | 8 +- .../gplx/xowa/Xop_lnki_tkn_chkr.java | 12 +- .../gplx/xowa/Xop_redirect_mgr.java | 2 +- .../gplx/xowa/Xop_redirect_mgr_tst.java | 2 +- .../gplx/xowa/Xop_lnki_align_h.java | 2 +- .../gplx/xowa/Xop_lnki_arg_parser.java | 2 +- .../src_440_lnki/gplx/xowa/Xop_lnki_wkr_.java | 4 +- .../gplx/xowa/Xop_lnki_wkr__basic_tst.java | 4 +- .../gplx/xowa/Xop_lnki_wkr__pre_tst.java | 2 +- .../gplx/xowa/Xop_lnki_wkr__size_tst.java | 4 +- .../src_490_xnde/gplx/xowa/Xop_xnde_tkn.java | 2 +- .../src_490_xnde/gplx/xowa/Xop_xnde_wkr.java | 2 +- .../gplx/xowa/Xot_defn_trace_brief_tst.java | 2 +- .../src_500_tmpl/gplx/xowa/Xot_invk_mock.java | 2 +- .../src_500_tmpl/gplx/xowa/Xot_invk_temp.java | 4 +- .../src_500_tmpl/gplx/xowa/Xot_invk_tkn.java | 8 +- .../src_500_tmpl/gplx/xowa/Xot_tmpl_wtr.java | 2 +- .../en.wikipedia.org-file-user.xowa | Bin 57344 -> 0 bytes .../en.wikipedia.org-file.xowa | Bin 57344 -> 0 bytes .../en.wikipedia.org-text.xowa | Bin 36864 -> 36864 bytes 579 files changed, 2460 insertions(+), 1564 deletions(-) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Bool_.java (70%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Byte_.java (82%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Byte__tst.java (100%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Byte_ascii.java (100%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Char_.java (90%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Double_.java (89%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Double__tst.java (100%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Float_.java (81%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Int_.java (90%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Int__tst.java (91%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Int_ary_.java (88%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Int_ary__tst.java (100%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Long_.java (82%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Long__tst.java (95%) rename 100_core/{src_110_primitive => src_100_types_primitive}/gplx/Short_.java (84%) rename 100_core/{src_120_basicDataType => src_100_types_primitive}/gplx/Yn.java (87%) rename 100_core/{src_110_primitive => src_101_types_object}/gplx/Array_.java (100%) rename 100_core/{src_110_primitive => src_101_types_object}/gplx/Array__tst.java (100%) rename 100_core/{src_120_basicDataType => src_101_types_object}/gplx/Decimal_adp.java (98%) rename 100_core/{src_120_basicDataType => src_101_types_object}/gplx/Decimal_adp_.java (91%) rename 100_core/{src_120_basicDataType => src_101_types_object}/gplx/Decimal_adp__tst.java (91%) rename 100_core/{src_120_basicDataType => src_101_types_object}/gplx/Guid_adp.java (99%) rename 100_core/{src_120_basicDataType => src_101_types_object}/gplx/Guid_adp_.java (82%) rename 100_core/{src_120_basicDataType => src_101_types_object}/gplx/Guid_adp__tst.java (91%) rename 100_core/{src_110_primitive => src_101_types_object}/gplx/Object_.java (91%) rename 100_core/{src_110_primitive => src_101_types_object}/gplx/Object__tst.java (100%) rename 100_core/{src_110_primitive => src_101_types_object}/gplx/String_.java (95%) rename 100_core/{src_110_primitive => src_101_types_object}/gplx/String__tst.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_.java (96%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry__tst.java (95%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_bfr.java (94%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_bfr_.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_bfr_mkr.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_bfr_mkr_tst.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_bfr_tst.java (95%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_finder.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_finder_tst.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_arg.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_arg_.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_arg_fmtr_objs.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_eval_mgr.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_eval_mgr_.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_eval_mgr_gfs.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_itm.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_tst.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/Bry_fmtr_vals.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_ary_dim2.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_bfr.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_bfr_preserve.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_bry.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_byt.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_decimal_int.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_fmtr.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_int.java (89%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_time.java (100%) rename 100_core/{src_110_primitive => src_130_brys}/gplx/brys/Bry_fmtr_arg_time_tst.java (100%) create mode 100644 400_xowa/src/gplx/core/json/Json_itm_str.java create mode 100644 400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java create mode 100644 400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_tst.java rename 400_xowa/src/gplx/xowa/{specials/xowa/bookmarks => users/bmks}/Dbui_tbl_itm__bmk.java (96%) rename 400_xowa/src/gplx/xowa/{specials/xowa/bookmarks => users/bmks}/Xows_bmk_page.java (86%) rename 400_xowa/src/gplx/xowa/{specials/xowa/bookmarks => users/history}/Dbui_tbl_itm__history.java (95%) rename 400_xowa/src/gplx/xowa/users/{data => history}/Xoud_history_mgr.java (88%) rename 400_xowa/src/gplx/xowa/users/{data => history}/Xoud_history_row.java (92%) rename 400_xowa/src/gplx/xowa/users/{data => history}/Xoud_history_special.java (89%) rename 400_xowa/src/gplx/xowa/users/{data => history}/Xoud_history_tbl.java (94%) create mode 100644 400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_tbl.java create mode 100644 400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_temp_tbl.java create mode 100644 400_xowa/src/gplx/xowa/wmfs/apis/Xowm_rev_meta_api.java create mode 100644 400_xowa/src/gplx/xowa/xtns/math/parsers/Math_func_itm.java create mode 100644 400_xowa/src/gplx/xowa/xtns/math/parsers/Math_func_ml_parser.java create mode 100644 400_xowa/src/gplx/xowa/xtns/math/parsers/Mwm_ctx.java create mode 100644 400_xowa/src/gplx/xowa/xtns/math/parsers/Mwm_lxr__brack.java create mode 100644 400_xowa/src/gplx/xowa/xtns/scribunto/libs/Kv_ary_utl.java delete mode 100644 tst/400_xowa/root/wiki/en.wikipedia.org/en.wikipedia.org-file-user.xowa delete mode 100644 tst/400_xowa/root/wiki/en.wikipedia.org/en.wikipedia.org-file.xowa diff --git a/100_core/.classpath b/100_core/.classpath index 4e608068e..15992ab0e 100644 --- a/100_core/.classpath +++ b/100_core/.classpath @@ -3,8 +3,10 @@ - + + + diff --git a/100_core/src/gplx/core/brys/Bry_rdr.java b/100_core/src/gplx/core/brys/Bry_rdr.java index 0618206c9..657f5ee77 100644 --- a/100_core/src/gplx/core/brys/Bry_rdr.java +++ b/100_core/src/gplx/core/brys/Bry_rdr.java @@ -27,7 +27,7 @@ public class Bry_rdr { public void Pos_add(int v) {pos += v;} public boolean Pos_is_eos() {return pos == src_len;} public void Pos_add_one() {++pos;} - public int Or_int() {return or_int;} public void Or_int_(int v) {or_int = v;} private int or_int = Int_.MinValue; + public int Or_int() {return or_int;} public void Or_int_(int v) {or_int = v;} private int or_int = Int_.Min_value; public byte[] Or_bry() {return or_bry;} public void Or_bry_(byte[] v) {or_bry = v;} private byte[] or_bry; public int Find_fwd(byte find) {return Bry_finder.Find_fwd(src, find, pos);} public int Find_fwd_ws() {return Bry_finder.Find_fwd_until_ws(src, pos, src_len);} @@ -99,7 +99,7 @@ public class Bry_rdr { public double Read_double_to_pipe() {return Read_double_to(Byte_ascii.Pipe);} public double Read_double_to(byte to_char) { byte[] double_bry = Read_bry_to(to_char); - return Double_.parse_(String_.new_a7(double_bry)); // double will never have utf8 + return Double_.parse(String_.new_a7(double_bry)); // double will never have utf8 } @gplx.Virtual public Bry_rdr Skip_ws() { while (pos < src_len) { diff --git a/100_core/src/gplx/core/btries/Btrie_slim_mgr.java b/100_core/src/gplx/core/btries/Btrie_slim_mgr.java index 73c92a47e..5767d434b 100644 --- a/100_core/src/gplx/core/btries/Btrie_slim_mgr.java +++ b/100_core/src/gplx/core/btries/Btrie_slim_mgr.java @@ -41,6 +41,7 @@ public class Btrie_slim_mgr implements Btrie_mgr { } } public Btrie_slim_mgr Add_bry_tid(byte[] bry, byte tid) {return (Btrie_slim_mgr)Add_obj(bry, Byte_obj_val.new_(tid));} + public Btrie_slim_mgr Add_bry_int(byte[] key, int val) {return (Btrie_slim_mgr)Add_obj(key, Int_obj_val.new_(val));} public Btrie_slim_mgr Add_str_byte(String key, byte val) {return (Btrie_slim_mgr)Add_obj(Bry_.new_u8(key), Byte_obj_val.new_(val));} public Btrie_slim_mgr Add_str_int(String key, int val) {return (Btrie_slim_mgr)Add_obj(Bry_.new_u8(key), Int_obj_val.new_(val));} public Btrie_slim_mgr Add_bry(String key, String val) {return (Btrie_slim_mgr)Add_obj(Bry_.new_u8(key), Bry_.new_u8(val));} @@ -55,11 +56,12 @@ public class Btrie_slim_mgr implements Btrie_mgr { Add_obj(Bry_.new_u8(ary[i]), bval); return this; } - public Btrie_slim_mgr Add_many_int(int val, String... ary) { + public Btrie_slim_mgr Add_many_int(int val, String... ary) {return Add_many_int(val, Bry_.Ary(ary));} + public Btrie_slim_mgr Add_many_int(int val, byte[]... ary) { int len = ary.length; Int_obj_val obj = Int_obj_val.new_(val); for (int i = 0; i < len; i++) - Add_obj(Bry_.new_u8(ary[i]), obj); + Add_obj(ary[i], obj); return this; } public Btrie_slim_mgr Add_stub(String key, byte val) {byte[] bry = Bry_.new_u8(key); return (Btrie_slim_mgr)Add_obj(bry, new Btrie_itm_stub(val, bry));} diff --git a/100_core/src/gplx/core/criterias/Criteria_.java b/100_core/src/gplx/core/criterias/Criteria_.java index 4a048dae8..093882c7f 100644 --- a/100_core/src/gplx/core/criterias/Criteria_.java +++ b/100_core/src/gplx/core/criterias/Criteria_.java @@ -47,7 +47,7 @@ public class Criteria_ { public static Criteria mte_(Comparable val) {return new Criteria_comp(CompareAble_.MoreOrSame, val);} public static Criteria between_(Comparable lhs, Comparable rhs) {return new Criteria_between(false, lhs, rhs);} public static Criteria between_(boolean negated, Comparable lhs, Comparable rhs) {return new Criteria_between(negated, lhs, rhs);} - public static Criteria like_(String pattern) {return new Criteria_like(false, RegxPatn_cls_like_.parse_(pattern, RegxPatn_cls_like.EscapeDefault));} - public static Criteria liken_(String pattern) {return new Criteria_like(true, RegxPatn_cls_like_.parse_(pattern, RegxPatn_cls_like.EscapeDefault));} + public static Criteria like_(String pattern) {return new Criteria_like(false, RegxPatn_cls_like_.parse(pattern, RegxPatn_cls_like.EscapeDefault));} + public static Criteria liken_(String pattern) {return new Criteria_like(true, RegxPatn_cls_like_.parse(pattern, RegxPatn_cls_like.EscapeDefault));} public static final byte Tid_custom = 0, Tid_const = 1, Tid_not = 2, Tid_and = 3, Tid_or = 4, Tid_eq = 5, Tid_between = 6, Tid_in = 7, Tid_like = 8, Tid_comp = 9, Tid_wrapper = 10, Tid_iomatch = 11, Tid_db_obj_ary = 12; } diff --git a/100_core/src/gplx/core/criterias/Criteria_bool_base.java b/100_core/src/gplx/core/criterias/Criteria_bool_base.java index b5aa9a3bb..a6dddcae2 100644 --- a/100_core/src/gplx/core/criterias/Criteria_bool_base.java +++ b/100_core/src/gplx/core/criterias/Criteria_bool_base.java @@ -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 To_str() {return String_.Concat(" IS ", Bool_.Xto_str_lower(val));} + public String To_str() {return String_.Concat(" IS ", Bool_.To_str_lower(val));} } class Criteria_not implements Criteria { private final Criteria criteria; diff --git a/100_core/src/gplx/core/criterias/Criteria_ioItm_tst.java b/100_core/src/gplx/core/criterias/Criteria_ioItm_tst.java index 35c3dd69e..d2c1f2154 100644 --- a/100_core/src/gplx/core/criterias/Criteria_ioItm_tst.java +++ b/100_core/src/gplx/core/criterias/Criteria_ioItm_tst.java @@ -37,7 +37,7 @@ public class Criteria_ioItm_tst { tst_Match(false, crt, fil.ModifiedTime_(DateAdp_.parse_gplx("2000-12-31"))); } @Test public void IoMatch() { - Criteria crt = Criteria_ioMatch.parse_(true, "*.txt", false); + Criteria crt = Criteria_ioMatch.parse(true, "*.txt", false); CriteriaFxt fx_crt = new CriteriaFxt(); fx_crt.tst_Matches(crt, Io_url_.new_any_("file.txt")); fx_crt.tst_MatchesNot(crt, Io_url_.new_any_("file.xml")); diff --git a/100_core/src/gplx/core/criterias/Criteria_ioMatch.java b/100_core/src/gplx/core/criterias/Criteria_ioMatch.java index ca8a237d4..f1603af6d 100644 --- a/100_core/src/gplx/core/criterias/Criteria_ioMatch.java +++ b/100_core/src/gplx/core/criterias/Criteria_ioMatch.java @@ -33,5 +33,5 @@ public class Criteria_ioMatch implements Criteria { // EX: url IOMATCH '*.xml|*. public static final String TokenName = "IOMATCH"; public static Criteria_ioMatch as_(Object obj) {return obj instanceof Criteria_ioMatch ? (Criteria_ioMatch)obj : null;} - public static Criteria_ioMatch parse_(boolean match, String raw, boolean caseSensitive) {return new Criteria_ioMatch(match, RegxPatn_cls_ioMatch_.parse_(raw, caseSensitive));} + public static Criteria_ioMatch parse(boolean match, String raw, boolean caseSensitive) {return new Criteria_ioMatch(match, RegxPatn_cls_ioMatch_.parse(raw, caseSensitive));} } diff --git a/100_core/src/gplx/core/primitives/Bool_obj_ref.java b/100_core/src/gplx/core/primitives/Bool_obj_ref.java index 353caba1b..d775ba3a6 100644 --- a/100_core/src/gplx/core/primitives/Bool_obj_ref.java +++ b/100_core/src/gplx/core/primitives/Bool_obj_ref.java @@ -25,7 +25,7 @@ public class Bool_obj_ref { public Bool_obj_ref Val_n_() {val = false; return this;} public Bool_obj_ref Val_(boolean v) {val = v; return this;} public Bool_obj_ref Val_toggle_() {val = !val; return this;} - @Override public String toString() {return Bool_.Xto_str_lower(val);} + @Override public String toString() {return Bool_.To_str_lower(val);} public static Bool_obj_ref n_() {return new_(false);} public static Bool_obj_ref y_() {return new_(true);} public static Bool_obj_ref new_(boolean val) { diff --git a/100_core/src/gplx/core/primitives/Bool_obj_val.java b/100_core/src/gplx/core/primitives/Bool_obj_val.java index 12c48c8da..648a36687 100644 --- a/100_core/src/gplx/core/primitives/Bool_obj_val.java +++ b/100_core/src/gplx/core/primitives/Bool_obj_val.java @@ -24,8 +24,8 @@ public class Bool_obj_val { , False = new Bool_obj_val(0) , True = new Bool_obj_val(1) ; - public static Bool_obj_val read_(Object o) {String s = String_.as_(o); return s == null ? (Bool_obj_val)o : parse_(s);} - public static Bool_obj_val parse_(String raw) { + public static Bool_obj_val read_(Object o) {String s = String_.as_(o); return s == null ? (Bool_obj_val)o : parse(s);} + public static Bool_obj_val parse(String raw) { if (String_.Eq(raw, "y")) return Bool_obj_val.True; else if (String_.Eq(raw, "n")) return Bool_obj_val.False; else if (String_.Eq(raw, "")) return Bool_obj_val.Null; diff --git a/100_core/src/gplx/core/regxs/Regx_adp__tst.java b/100_core/src/gplx/core/regxs/Regx_adp__tst.java index 42fab6e83..e8a5b6d20 100644 --- a/100_core/src/gplx/core/regxs/Regx_adp__tst.java +++ b/100_core/src/gplx/core/regxs/Regx_adp__tst.java @@ -60,7 +60,7 @@ public class Regx_adp__tst implements TfdsEqListItmStr { rv[i] = match_(bgnAry[i]); return rv; } - Regx_match match_(int bgn) {return match_(bgn, Int_.MinValue);} + Regx_match match_(int bgn) {return match_(bgn, Int_.Min_value);} Regx_match match_(int bgn, int len) {return new Regx_match(true, bgn, bgn + len, Regx_group.Ary_empty);} void tst_Matches(String find, String input, Regx_match... expd) { List_adp expdList = Array_.XtoList(expd); @@ -87,7 +87,7 @@ public class Regx_adp__tst implements TfdsEqListItmStr { 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(); + if (expd != null && expd.Find_len() != Int_.Min_value) rv += " len=" + cur.Find_len(); return rv; } } diff --git a/100_core/src_000_err/gplx/Gfo_msg_itm_.java b/100_core/src_000_err/gplx/Gfo_msg_itm_.java index f3321d6b0..e416722f1 100644 --- a/100_core/src_000_err/gplx/Gfo_msg_itm_.java +++ b/100_core/src_000_err/gplx/Gfo_msg_itm_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx; public class Gfo_msg_itm_ { public static final byte Cmd_null = 0, Cmd_log = 1, Cmd_note = 2, Cmd_warn = 3, Cmd_stop = 4, Cmd_fail = 5; - public static final byte[][] CmdBry = new byte[][] {Bry_.new_a7("null"), Bry_.new_a7("log"), Bry_.new_a7("note"), Bry_.new_a7("warn"), Bry_.new_a7("stop"), Bry_.new_a7("fail")}; + public static final byte[][] CmdBry = new byte[][] {Object_.Bry__null, Bry_.new_a7("log"), Bry_.new_a7("note"), Bry_.new_a7("warn"), Bry_.new_a7("stop"), Bry_.new_a7("fail")}; public static Gfo_msg_itm new_note_(Gfo_msg_grp owner, String key) {return new_(owner, Cmd_note, key, key);} public static Gfo_msg_itm new_fail_(Gfo_msg_grp owner, String key, String fmt) {return new_(owner, Cmd_warn, key, fmt);} public static Gfo_msg_itm new_warn_(Gfo_msg_grp owner, String key) {return new_(owner, Cmd_warn, key, key);} diff --git a/100_core/src_100_interface/gplx/RlsAble_.java b/100_core/src_100_interface/gplx/RlsAble_.java index 1ee71dbd0..d36bdb853 100644 --- a/100_core/src_100_interface/gplx/RlsAble_.java +++ b/100_core/src_100_interface/gplx/RlsAble_.java @@ -18,7 +18,7 @@ along with this program. If not, see . 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 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 { diff --git a/100_core/src_110_primitive/gplx/Bool_.java b/100_core/src_100_types_primitive/gplx/Bool_.java similarity index 70% rename from 100_core/src_110_primitive/gplx/Bool_.java rename to 100_core/src_100_types_primitive/gplx/Bool_.java index 1d38cddc4..d7d9d1d6b 100644 --- a/100_core/src_110_primitive/gplx/Bool_.java +++ b/100_core/src_100_types_primitive/gplx/Bool_.java @@ -22,28 +22,28 @@ public class Bool_ implements GfoInvkAble { public static final boolean N = false , Y = true; public static final byte N_byte = 0 , Y_byte = 1 , __byte = 127; public static final int N_int = 0 , Y_int = 1 , __int = -1; - public static final String N_str = "n" , Y_str = "y"; - public static final byte[] Y_bry = new byte[] {Byte_ascii.Ltr_y}, N_bry = new byte[] {Byte_ascii.Ltr_n}; + public static final byte[] N_bry = new byte[] {Byte_ascii.Ltr_n}, Y_bry = new byte[] {Byte_ascii.Ltr_y}; public static final String True_str = "true", False_str = "false"; public static final byte[] True_bry = Bry_.new_a7(True_str), False_bry = Bry_.new_a7(False_str); - public static boolean cast_(Object obj) {try {return (Boolean)obj;} catch (Exception e) {throw Err_.new_type_mismatch_w_exc(e, boolean.class, obj);}} - public static boolean cast_or_(Object obj, boolean v) {try {return (Boolean)obj;} catch (Exception e) {Err_.Noop(e); return v;}} - public static boolean By_int(int v) {return v != 0;} - public static boolean parse_(String raw) { - if ( String_.Eq(raw, "true") + public static boolean cast(Object obj) {try {return (Boolean)obj;} catch (Exception e) {throw Err_.new_type_mismatch_w_exc(e, boolean.class, obj);}} + public static boolean cast_or(Object obj, boolean v) {try {return (Boolean)obj;} catch (Exception e) {Err_.Noop(e); return v;}} + public static boolean parse(String raw) { + if ( String_.Eq(raw, True_str) || String_.Eq(raw, "True") // needed for Store_Wtr(){boolVal.toString();} ) return true; else if ( String_.Eq(raw, "false") - || String_.Eq(raw, "False") + || String_.Eq(raw, False_str) ) return false; throw Err_.new_parse_type(boolean.class, raw); } - public static byte Xto_byte(boolean v) {return v ? Y_byte : N_byte;} - public static int Xto_int(boolean v) {return v ? 1 : 0;} - public static String Xto_str_lower(boolean v) {return v ? "true" : "false";} + public static boolean By_int(int v) {return v == Y_int;} + public static int To_int(boolean v) {return v ? Y_int : N_int;} + public static byte To_byte(boolean v) {return v ? Y_byte : N_byte;} + public static String To_str_lower(boolean v) {return v ? True_str : False_str;} public static final boolean[] Ary_empty = new boolean[0]; + public static final Bool_ Gfs = new Bool_(); public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_to_str)) { diff --git a/100_core/src_110_primitive/gplx/Byte_.java b/100_core/src_100_types_primitive/gplx/Byte_.java similarity index 82% rename from 100_core/src_110_primitive/gplx/Byte_.java rename to 100_core/src_100_types_primitive/gplx/Byte_.java index 06297dec1..c719d967a 100644 --- a/100_core/src_110_primitive/gplx/Byte_.java +++ b/100_core/src_100_types_primitive/gplx/Byte_.java @@ -24,13 +24,12 @@ public class Byte_ { , Min_value = Byte.MIN_VALUE , Max_value_127 = 127 ; - public static byte cast_(Object o) {try {return (Byte)o;} catch (Exception e) {throw Err_.new_type_mismatch_w_exc(e, byte.class, o);}} - public static byte parse_(String raw) {return Byte.parseByte(raw);} - public static byte parse_or_(String raw, byte or) { + public static byte cast(Object o) {try {return (Byte)o;} catch (Exception e) {throw Err_.new_type_mismatch_w_exc(e, byte.class, o);}} + public static byte parse(String raw) {return Byte.parseByte(raw);} + public static byte parse_or(String raw, byte or) { if (raw == null) return or; - try { - return parse_(raw); - } catch (Exception e) {Err_.Noop(e); return or;} + try {return parse(raw);} + catch (Exception e) {Err_.Noop(e); return or;} } public static byte By_int(int v) {return v > 127 ? (byte)(v - 256) : (byte)v;} // PERF?: (byte)(v & 0xff) public static int Xto_int(byte v) {return v < 0 ? (int)v + 256 : v;} diff --git a/100_core/src_110_primitive/gplx/Byte__tst.java b/100_core/src_100_types_primitive/gplx/Byte__tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Byte__tst.java rename to 100_core/src_100_types_primitive/gplx/Byte__tst.java diff --git a/100_core/src_110_primitive/gplx/Byte_ascii.java b/100_core/src_100_types_primitive/gplx/Byte_ascii.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Byte_ascii.java rename to 100_core/src_100_types_primitive/gplx/Byte_ascii.java diff --git a/100_core/src_110_primitive/gplx/Char_.java b/100_core/src_100_types_primitive/gplx/Char_.java similarity index 90% rename from 100_core/src_110_primitive/gplx/Char_.java rename to 100_core/src_100_types_primitive/gplx/Char_.java index 06697e788..d3d67454d 100644 --- a/100_core/src_110_primitive/gplx/Char_.java +++ b/100_core/src_100_types_primitive/gplx/Char_.java @@ -72,6 +72,6 @@ public class Char_ { 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);}} + 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);}} } diff --git a/100_core/src_110_primitive/gplx/Double_.java b/100_core/src_100_types_primitive/gplx/Double_.java similarity index 89% rename from 100_core/src_110_primitive/gplx/Double_.java rename to 100_core/src_100_types_primitive/gplx/Double_.java index 2ec5fb87d..d26644125 100644 --- a/100_core/src_110_primitive/gplx/Double_.java +++ b/100_core/src_100_types_primitive/gplx/Double_.java @@ -29,11 +29,11 @@ public class Double_ { , Inf_pos_bry = Bry_.new_a7("INF") ; public static boolean IsNaN(double v) {return Double.isNaN(v);} - public static double cast_(Object o) {try {return (Double)o;} catch(Exception e) {throw Err_.new_type_mismatch_w_exc(e, double.class, o);}} - public static double parse_(String raw) {try {return Double.parseDouble(raw);} catch(Exception e) {throw Err_.new_parse_exc(e, double.class, raw);}} + public static double cast(Object o) {try {return (Double)o;} catch(Exception e) {throw Err_.new_type_mismatch_w_exc(e, double.class, o);}} + public static double parse(String raw) {try {return Double.parseDouble(raw);} catch(Exception e) {throw Err_.new_parse_exc(e, double.class, raw);}} public static double parse_or(String raw, double v) {try {return Double.parseDouble(raw);} catch(Exception e) {Err_.Noop(e); return v;}} public static double coerce_(Object v) { - try {String s = String_.as_(v); return s == null ? Double_.cast_(v) : Double_.parse_(s);} + try {String s = String_.as_(v); return s == null ? Double_.cast(v) : Double_.parse(s);} catch (Exception e) {throw Err_.new_cast(e, double.class, v);} } public static String Xto_str(double v) { diff --git a/100_core/src_110_primitive/gplx/Double__tst.java b/100_core/src_100_types_primitive/gplx/Double__tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Double__tst.java rename to 100_core/src_100_types_primitive/gplx/Double__tst.java diff --git a/100_core/src_110_primitive/gplx/Float_.java b/100_core/src_100_types_primitive/gplx/Float_.java similarity index 81% rename from 100_core/src_110_primitive/gplx/Float_.java rename to 100_core/src_100_types_primitive/gplx/Float_.java index 933552241..fb9c8f6a8 100644 --- a/100_core/src_110_primitive/gplx/Float_.java +++ b/100_core/src_100_types_primitive/gplx/Float_.java @@ -21,8 +21,8 @@ public class Float_ { public static final Class Cls_ref_type = Float.class; public static final float NaN = Float.NaN;; public static boolean IsNaN(float v) {return Float.isNaN(v);} - public static float cast_(Object obj) {try {return (Float)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, float.class, obj);}} - public static float parse_(String raw) {try {return Float.parseFloat(raw);} catch(Exception exc) {throw Err_.new_parse_exc(exc, float.class, raw);}} + public static float cast(Object obj) {try {return (Float)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, float.class, obj);}} + public static float parse(String raw) {try {return Float.parseFloat(raw);} catch(Exception exc) {throw Err_.new_parse_exc(exc, float.class, raw);}} public static String Xto_str(float v) { int v_int = (int)v; return v - v_int == 0 ? Int_.Xto_str(v_int) : Float.toString(v); diff --git a/100_core/src_110_primitive/gplx/Int_.java b/100_core/src_100_types_primitive/gplx/Int_.java similarity index 90% rename from 100_core/src_110_primitive/gplx/Int_.java rename to 100_core/src_100_types_primitive/gplx/Int_.java index 9e080e8e0..ea75622d9 100644 --- a/100_core/src_110_primitive/gplx/Int_.java +++ b/100_core/src_100_types_primitive/gplx/Int_.java @@ -23,9 +23,9 @@ public class Int_ implements GfoInvkAble { public static final int Base1 = 1; public static final int Const_dlm_len = 1; public static final int Const_position_after_char = 1; - public static final int Null = Int_.MinValue; + public static final int Null = Int_.Min_value; public static int coerce_(Object v) { - try {String s = String_.as_(v); return s == null ? Int_.cast_(v) : Int_.parse_(s);} + try {String s = String_.as_(v); return s == null ? Int_.cast(v) : Int_.parse(s);} catch (Exception e) {throw Err_.new_cast(e, int.class, v);} } public static int[] Ary_empty = new int[0]; @@ -50,13 +50,7 @@ public class Int_ implements GfoInvkAble { return rv; } public static boolean Bounds_chk(int bgn, int end, int len) {return bgn > -1 && end < len;} - public static final int - MinValue = Integer.MIN_VALUE - , MaxValue = Integer.MAX_VALUE - , Neg1 = -1 - , Neg1_count = -1 - ; - public static int parse_or_(String raw, int or) { + public static int parse_or(String raw, int or) { if (raw == null) return or; int rawLen = String_.Len(raw); if (rawLen == 0) return or; int rv = 0, tmp = 0, factor = 1; @@ -115,11 +109,11 @@ public class Int_ implements GfoInvkAble { if (v == 0) return 0; int sign = 1; if (v < 0) { - if (v == Int_.MinValue) return -9; // NOTE: Int_.MinValue * -1 = Int_.MinValue + if (v == Int_.Min_value) return -9; // NOTE: Int_.Min_value * -1 = Int_.Min_value v *= -1; sign = -1; } - int rv = Log10AryLen - 2; // rv will only happen when v == Int_.MaxValue + int rv = Log10AryLen - 2; // rv will only happen when v == Int_.Max_value int bgn = 0; if (v > 1000) { // optimization to reduce number of ops to < 5 bgn = 3; @@ -129,7 +123,7 @@ public class Int_ implements GfoInvkAble { if (v < Log10Ary[i]) {rv = i - 1; break;} } return rv * sign; - } public static int[] Log10Ary = new int[] {1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, Int_.MaxValue}; public static int Log10AryLen = 11; + } public static int[] Log10Ary = new int[] {1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000, Int_.Max_value}; public static int Log10AryLen = 11; public Int_ FailIfNeg1(String key, int val) { if (val < 0) throw Err_.new_wo_type("key must be >= 0", "key", key, "val", val); return this; @@ -154,10 +148,10 @@ public class Int_ implements GfoInvkAble { if (bgn) bfr.Add_int_fixed(val, len); // NOTE: neg handled above return bfr.Xto_str(); } - public static int read_(Object o) {String s = String_.as_(o); return s != null ? Int_.parse_(s) : Int_.cast_(o);} - public static int parse_(String raw) {try {return Integer.parseInt(raw);} catch(Exception e) {throw Err_.new_parse_exc(e, int.class, raw);}} - public static int cast_(Object obj) {try {return (Integer)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, int.class, obj);}} - public static int cast_or_(Object obj, int or) {try {return (Integer)obj;} catch(Exception e) {Err_.Noop(e); return or;}} + public static int read_(Object o) {String s = String_.as_(o); return s != null ? Int_.parse(s) : Int_.cast(o);} + public static int parse(String raw) {try {return Integer.parseInt(raw);} catch(Exception e) {throw Err_.new_parse_exc(e, int.class, raw);}} + public static int cast(Object obj) {try {return (Integer)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, int.class, obj);}} + public static int cast_or(Object obj, int or) {try {return (Integer)obj;} catch(Exception e) {Err_.Noop(e); return or;}} public static int Xby_double_(double v) {return (int)v;} public static String Xto_str(int v) {return new Integer(v).toString();} public static String Xto_str_fmt(int v, String fmt) {return new java.text.DecimalFormat(fmt).format(v);} @@ -254,8 +248,14 @@ public class Int_ implements GfoInvkAble { int len = ary.length; int[] rv = new int[len]; for (int i = 0; i < len; i++) - rv[i] = Int_.parse_(ary[i]); + rv[i] = Int_.parse(ary[i]); return rv; } public static byte[] Xto_bry(int v) {return Bry_.new_a7(Xto_str(v));} + public static final int + Min_value = Integer.MIN_VALUE + , Max_value = Integer.MAX_VALUE + , Neg1 = -1 + , Neg1_count = -1 + ; } diff --git a/100_core/src_110_primitive/gplx/Int__tst.java b/100_core/src_100_types_primitive/gplx/Int__tst.java similarity index 91% rename from 100_core/src_110_primitive/gplx/Int__tst.java rename to 100_core/src_100_types_primitive/gplx/Int__tst.java index 478f8208a..f96890019 100644 --- a/100_core/src_110_primitive/gplx/Int__tst.java +++ b/100_core/src_100_types_primitive/gplx/Int__tst.java @@ -31,7 +31,7 @@ public class Int__tst { tst_ParseOr("", -1); // empty tst_ParseOr("123", 123); // single tst_ParseOr("1a", -1); // fail - } void tst_ParseOr(String raw, int expd) {Tfds.Eq(expd, Int_.parse_or_(raw, -1));} + } void tst_ParseOr(String raw, int expd) {Tfds.Eq(expd, Int_.parse_or(raw, -1));} @Test public void Between() { tst_Between(1, 0, 2, true); // simple true tst_Between(3, 0, 2, false); // simple false @@ -53,7 +53,7 @@ public class Int__tst { tst_Log10(100, 2); tst_Log10(1000000, 6); tst_Log10(1000000000, 9); - tst_Log10(Int_.MaxValue, 9); + tst_Log10(Int_.Max_value, 9); } @Test public void Log10_neg() { tst_Log10(-1, 0); @@ -61,8 +61,8 @@ public class Int__tst { tst_Log10(-100, -2); tst_Log10(-1000000, -6); tst_Log10(-1000000000, -9); - tst_Log10(Int_.MinValue, -9); - tst_Log10(Int_.MinValue + 1, -9); + tst_Log10(Int_.Min_value, -9); + tst_Log10(Int_.Min_value + 1, -9); } void tst_Log10(int val, int expd) {Tfds.Eq(expd, Int_.Log10(val));} @Test public void DigitCount() { @@ -94,7 +94,7 @@ public class Int__tst { tst_Log10( 123456789, 8); tst_Log10( 1000000000, 9); tst_Log10( 1234567890, 9); - tst_Log10(Int_.MaxValue, 9); + tst_Log10(Int_.Max_value, 9); } @Test public void Xto_int_hex_tst() { Xto_int_hex("007C", 124); @@ -104,8 +104,8 @@ public class Int__tst { Ary_parse__tst("123,321,213" , 3, Int_.Ary_empty, 123, 321, 213); Ary_parse__tst(" 1, 2,3" , 3, Int_.Ary_empty, 1, 2, 3); Ary_parse__tst("-1,+2,-3" , 3, Int_.Ary_empty, -1, 2, -3); - Ary_parse__tst(Int_.Xto_str(Int_.MinValue) , 1, Int_.Ary_empty, Int_.MinValue); - Ary_parse__tst(Int_.Xto_str(Int_.MaxValue) , 1, Int_.Ary_empty, Int_.MaxValue); + Ary_parse__tst(Int_.Xto_str(Int_.Min_value) , 1, Int_.Ary_empty, Int_.Min_value); + Ary_parse__tst(Int_.Xto_str(Int_.Max_value) , 1, Int_.Ary_empty, Int_.Max_value); Ary_parse__tst("1,2" , 1, Int_.Ary_empty); Ary_parse__tst("1" , 2, Int_.Ary_empty); Ary_parse__tst("a" , 1, Int_.Ary_empty); diff --git a/100_core/src_110_primitive/gplx/Int_ary_.java b/100_core/src_100_types_primitive/gplx/Int_ary_.java similarity index 88% rename from 100_core/src_110_primitive/gplx/Int_ary_.java rename to 100_core/src_100_types_primitive/gplx/Int_ary_.java index d0fa50d28..c73f41e75 100644 --- a/100_core/src_110_primitive/gplx/Int_ary_.java +++ b/100_core/src_100_types_primitive/gplx/Int_ary_.java @@ -25,15 +25,15 @@ public class Int_ary_ { int pos = 0; int num_bgn = -1, num_end = -1; boolean itm_done = false, itm_is_rng = false; - int rng_bgn = Int_.MinValue; + int rng_bgn = Int_.Min_value; while (true) { boolean pos_is_last = pos == raw_len; if ( itm_done || pos_is_last ) { if (num_bgn == -1) return or; // empty itm; EX: "1,"; "1,,2" - int num = Bry_.To_int_or(src, num_bgn, num_end, Int_.MinValue); - if (num == Int_.MinValue) return or; // not a number; parse failed + int num = Bry_.To_int_or(src, num_bgn, num_end, Int_.Min_value); + if (num == Int_.Min_value) return or; // not a number; parse failed if (rv_len == 0) { // rv not init'd rv_len = (raw_len / 2) + 1; // default rv_len to len of String / 2; + 1 to avoid fraction rounding down rv = new int[rv_len]; @@ -56,7 +56,7 @@ public class Int_ary_ { } num_bgn = num_end = -1; itm_done = itm_is_rng = false; - rng_bgn = Int_.MinValue; + rng_bgn = Int_.Min_value; if (pos_is_last) break; } byte b = src[pos]; @@ -77,8 +77,8 @@ public class Int_ary_ { case Byte_ascii.Dash: if (pos == raw_len -1) return or; // eos; EX: "1-" if (num_bgn == -1) return or; // no rng_bgn; EX: "-2" - rng_bgn = Bry_.To_int_or(src, num_bgn, pos, Int_.MinValue); - if (rng_bgn == Int_.MinValue) return or; + rng_bgn = Bry_.To_int_or(src, num_bgn, pos, Int_.Min_value); + if (rng_bgn == Int_.Min_value) return or; num_bgn = -1; itm_is_rng = true; break; diff --git a/100_core/src_110_primitive/gplx/Int_ary__tst.java b/100_core/src_100_types_primitive/gplx/Int_ary__tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Int_ary__tst.java rename to 100_core/src_100_types_primitive/gplx/Int_ary__tst.java diff --git a/100_core/src_110_primitive/gplx/Long_.java b/100_core/src_100_types_primitive/gplx/Long_.java similarity index 82% rename from 100_core/src_110_primitive/gplx/Long_.java rename to 100_core/src_100_types_primitive/gplx/Long_.java index 5b40b24fe..415f2eff1 100644 --- a/100_core/src_110_primitive/gplx/Long_.java +++ b/100_core/src_100_types_primitive/gplx/Long_.java @@ -19,36 +19,32 @@ package gplx; public class Long_ { public static final String Cls_val_name = "long"; public static final Class Cls_ref_type = Long.class; - public static final long - MinValue = Long.MIN_VALUE - , MaxValue = Long.MAX_VALUE - ; public static final int Log10Ary_len = 21; public static long[] Log10Ary = new long[] { 1, 10, 100, 1000, 10000 , 100000, 1000000, 10000000, 100000000, 1000000000 , Long_.Pow(10, 10), Long_.Pow(10, 11), Long_.Pow(10, 12), Long_.Pow(10, 13), Long_.Pow(10, 14) , Long_.Pow(10, 15), Long_.Pow(10, 16), Long_.Pow(10, 17), Long_.Pow(10, 18), Long_.Pow(10, 19) - , Long_.MaxValue + , Long_.Max_value }; - public static long parse_(String raw) {try {return Long.parseLong(raw);} catch(Exception e) {throw Err_.new_parse_exc(e, long.class, raw);}} - public static long cast_(Object obj) {try {return (Long)obj;} catch(Exception e) {throw Err_.new_type_mismatch_w_exc(e, long.class, obj);}} + public static long parse(String raw) {try {return Long.parseLong(raw);} catch(Exception e) {throw Err_.new_parse_exc(e, long.class, raw);}} + public static long cast(Object obj) {try {return (Long)obj;} catch(Exception e) {throw Err_.new_type_mismatch_w_exc(e, long.class, obj);}} public static long coerce_(Object v) { - try {String s = String_.as_(v); return s == null ? Long_.cast_(v) : Long_.parse_(s);} + try {String s = String_.as_(v); return s == null ? Long_.cast(v) : Long_.parse(s);} catch (Exception e) {throw Err_.new_cast(e, long.class, v);} } public static long Xby_int(int v) {return (long)v;} public static String Xto_str(long v) {return Long.toString(v);} public static String Xto_str_PadBgn(long v, int reqdPlaces) {return String_.Pad(Xto_str(v), reqdPlaces, "0", true);} // ex: 1, 3 returns 001 - public static long parse_or_(String raw, long or) { + public static long parse_or(String raw, long or) { if (raw == null) return or; try { int rawLen = String_.Len(raw); if (raw == null || rawLen == 0) return or; long rv = 0, factor = 1; int tmp = 0; for (int i = rawLen; i > 0; i--) { - tmp = Char_.To_int_or(String_.CharAt(raw, i - 1), Int_.MinValue); - if (tmp == Int_.MinValue) return or; + tmp = Char_.To_int_or(String_.CharAt(raw, i - 1), Int_.Min_value); + if (tmp == Int_.Min_value) return or; rv += (tmp * factor); factor *= 10; } @@ -90,7 +86,7 @@ public class Long_ { public static int DigitCount(long v) { int adj = Int_.Base1; if (v < 0) { - if (v == Long_.MinValue) return 19; // NOTE: Long_.MinValue * -1 = Long_.MinValue + if (v == Long_.Min_value) return 19; // NOTE: Long_.Min_value * -1 = Long_.Min_value v *= -1; ++adj; } @@ -105,6 +101,10 @@ public class Long_ { public static long Int_merge(int hi, int lo) {return (long)hi << 32 | (lo & 0xFFFFFFFFL);} public static int Int_split_lo(long v) {return (int)(v);} public static int Int_split_hi(long v) {return (int)(v >> 32);} + public static final long + Min_value = Long.MIN_VALUE + , Max_value = Long.MAX_VALUE + ; } /* alternate for Int_merge; does not work in java public static long MergeInts(int lo, int hi) {return (uint)(hi << 32) | (lo & 0xffffffff);} diff --git a/100_core/src_110_primitive/gplx/Long__tst.java b/100_core/src_100_types_primitive/gplx/Long__tst.java similarity index 95% rename from 100_core/src_110_primitive/gplx/Long__tst.java rename to 100_core/src_100_types_primitive/gplx/Long__tst.java index dc1c4aa99..21294d06e 100644 --- a/100_core/src_110_primitive/gplx/Long__tst.java +++ b/100_core/src_100_types_primitive/gplx/Long__tst.java @@ -42,8 +42,8 @@ public class Long__tst { Tfds.Eq(hi, Long_.Int_split_hi(expd)); Tfds.Eq(lo, Long_.Int_split_lo(expd)); } - @Test public void parse_or_() { + @Test public void parse_or() { parse_or_tst("10000000000", 10000000000L); } - void parse_or_tst(String raw, long expd) {Tfds.Eq(expd, Long_.parse_or_(raw, -1));} + void parse_or_tst(String raw, long expd) {Tfds.Eq(expd, Long_.parse_or(raw, -1));} } diff --git a/100_core/src_110_primitive/gplx/Short_.java b/100_core/src_100_types_primitive/gplx/Short_.java similarity index 84% rename from 100_core/src_110_primitive/gplx/Short_.java rename to 100_core/src_100_types_primitive/gplx/Short_.java index ceba279bd..660d2ea3b 100644 --- a/100_core/src_110_primitive/gplx/Short_.java +++ b/100_core/src_100_types_primitive/gplx/Short_.java @@ -18,5 +18,5 @@ along with this program. If not, see . package gplx; public class Short_ { public static final Class Cls_ref_type = Short.class; - public static short cast_(Object obj) {try {return (Short)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, short.class, obj);}} + public static short cast(Object obj) {try {return (Short)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, short.class, obj);}} } diff --git a/100_core/src_120_basicDataType/gplx/Yn.java b/100_core/src_100_types_primitive/gplx/Yn.java similarity index 87% rename from 100_core/src_120_basicDataType/gplx/Yn.java rename to 100_core/src_100_types_primitive/gplx/Yn.java index 0d22d989b..bdb33509c 100644 --- a/100_core/src_120_basicDataType/gplx/Yn.java +++ b/100_core/src_100_types_primitive/gplx/Yn.java @@ -23,14 +23,14 @@ public class Yn { else if (String_.Eq(v, N)) return false; else return or; } - public static boolean parse_or_n_(String v) {return parse_or_(v, false);} + public static boolean parse_or_n_(String v) {return parse_or(v, false);} public static int parse_as_int(String v) { if (v == null) return Bool_.__int; else if (String_.Eq(v, "y")) return Bool_.Y_int; else if (String_.Eq(v, "n")) return Bool_.N_int; else return Bool_.__int; } - public static boolean parse_or_(String v, boolean or) { + public static boolean parse_or(String v, boolean or) { int v_int = parse_as_int(v); switch (v_int) { case Bool_.N_int: return false; @@ -39,7 +39,7 @@ public class Yn { default: throw Err_.new_unhandled(v_int); } } - public static boolean parse_(String v) { + public static boolean parse(String v) { int v_int = parse_as_int(v); if (v_int == Bool_.__int) Err_.new_unhandled(v); return v_int == Bool_.Y_int; @@ -66,13 +66,13 @@ public class Yn { } public static boolean store_bool_or(SrlMgr mgr, String key, boolean or) { String v = mgr.SrlStrOr(key, ""); - return mgr.Type_rdr() ? parse_or_(v, or) : or; + return mgr.Type_rdr() ? parse_or(v, or) : or; } - public static boolean coerce_(Object o) {String s = String_.as_(o); return s != null ? parse_or_(s, false) : Bool_.cast_(o);} + public static boolean coerce_(Object o) {String s = String_.as_(o); return s != null ? parse_or(s, false) : Bool_.cast(o);} public static boolean readOrFalse_(DataRdr rdr, String key) {return read_(rdr, key, false);} public static boolean readOrTrue_(DataRdr rdr, String key) {return read_(rdr, key, true);} static boolean read_(DataRdr rdr, String key, boolean or) { String v = rdr.ReadStrOr(key, null); - return parse_or_(v, or); + return parse_or(v, or); } } \ No newline at end of file diff --git a/100_core/src_110_primitive/gplx/Array_.java b/100_core/src_101_types_object/gplx/Array_.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Array_.java rename to 100_core/src_101_types_object/gplx/Array_.java diff --git a/100_core/src_110_primitive/gplx/Array__tst.java b/100_core/src_101_types_object/gplx/Array__tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Array__tst.java rename to 100_core/src_101_types_object/gplx/Array__tst.java diff --git a/100_core/src_120_basicDataType/gplx/Decimal_adp.java b/100_core/src_101_types_object/gplx/Decimal_adp.java similarity index 98% rename from 100_core/src_120_basicDataType/gplx/Decimal_adp.java rename to 100_core/src_101_types_object/gplx/Decimal_adp.java index b8602e811..da8de7853 100644 --- a/100_core/src_120_basicDataType/gplx/Decimal_adp.java +++ b/100_core/src_101_types_object/gplx/Decimal_adp.java @@ -22,7 +22,6 @@ import java.math.RoundingMode; import java.text.DecimalFormat; public class Decimal_adp implements CompareAble { public int compareTo(Object obj) {Decimal_adp comp = (Decimal_adp)obj; return under.compareTo(comp.under);} - protected Decimal_adp(BigDecimal v) {this.under = v;} private final BigDecimal under; protected Decimal_adp(int v) {this.under = new BigDecimal(v);} public Object Under() {return under;} diff --git a/100_core/src_120_basicDataType/gplx/Decimal_adp_.java b/100_core/src_101_types_object/gplx/Decimal_adp_.java similarity index 91% rename from 100_core/src_120_basicDataType/gplx/Decimal_adp_.java rename to 100_core/src_101_types_object/gplx/Decimal_adp_.java index 09fb3930c..aa84fd911 100644 --- a/100_core/src_120_basicDataType/gplx/Decimal_adp_.java +++ b/100_core/src_101_types_object/gplx/Decimal_adp_.java @@ -32,7 +32,7 @@ import java.math.BigDecimal; import java.math.MathContext; import java.math.Roun int pow10 = XtoPow10(frc); return divide_((num * (pow10)) + frc, pow10); } - public static Decimal_adp cast_(Object obj) {return (Decimal_adp)obj;} + public static Decimal_adp cast(Object obj) {return (Decimal_adp)obj;} static int XtoPow10(int v) { if (v > -1 && v < 10) return 10; else if (v > 9 && v < 100) return 100; @@ -53,5 +53,5 @@ import java.math.BigDecimal; import java.math.MathContext; import java.math.Roun public static Decimal_adp divide_(long lhs, long rhs) { return new Decimal_adp(new BigDecimal(lhs).divide(new BigDecimal(rhs), Gplx_rounding_context)); } public static Decimal_adp int_(int v) {return new Decimal_adp(new BigDecimal(v));} public static Decimal_adp long_(long v) {return new Decimal_adp(new BigDecimal(v));} public static Decimal_adp float_(float v) {return new Decimal_adp(new BigDecimal(v));} public static Decimal_adp double_(double v) {return new Decimal_adp(new BigDecimal(v));} public static Decimal_adp double_thru_str_(double v) {return new Decimal_adp(BigDecimal.valueOf(v));} - public static Decimal_adp db_(Object v) {return new Decimal_adp((BigDecimal)v);} public static Decimal_adp parse_(String raw) {return new Decimal_adp(new BigDecimal(raw));} public static Decimal_adp pow_10_(int v) {return new Decimal_adp(new BigDecimal(1).scaleByPowerOfTen(v));} + public static Decimal_adp db_(Object v) {return new Decimal_adp((BigDecimal)v);} public static Decimal_adp parse(String raw) {return new Decimal_adp(new BigDecimal(raw));} public static Decimal_adp pow_10_(int v) {return new Decimal_adp(new BigDecimal(1).scaleByPowerOfTen(v));} public static final MathContext RoundDownContext = new MathContext(0, RoundingMode.DOWN); public static final MathContext Gplx_rounding_context = new MathContext(14, RoundingMode.HALF_UP); // changed from 28 to 14; DATE:2015-07-31 } diff --git a/100_core/src_120_basicDataType/gplx/Decimal_adp__tst.java b/100_core/src_101_types_object/gplx/Decimal_adp__tst.java similarity index 91% rename from 100_core/src_120_basicDataType/gplx/Decimal_adp__tst.java rename to 100_core/src_101_types_object/gplx/Decimal_adp__tst.java index 901f6a40e..de4f44d52 100644 --- a/100_core/src_120_basicDataType/gplx/Decimal_adp__tst.java +++ b/100_core/src_101_types_object/gplx/Decimal_adp__tst.java @@ -35,7 +35,7 @@ public class Decimal_adp__tst { fxt.Test_parts(1, 23, "1.23"); fxt.Test_parts(123, 4567, "123.4567"); } - @Test public void parse_() { + @Test public void parse() { fxt.Test_parse("1", "1"); fxt.Test_parse("1.2", "1.2"); fxt.Test_parse("0.1", "0.1"); @@ -78,10 +78,10 @@ class Decimal_adp__fxt { public void Test_divide(int lhs, int rhs, String expd) {Tfds.Eq(expd, Decimal_adp_.divide_(lhs, rhs).To_str());} public void Test_base_1000(int val, String expd) {Tfds.Eq(expd, Decimal_adp_.base1000_(val).To_str());} public void Test_parts(int num, int fracs, String expd) {Tfds.Eq(expd, Decimal_adp_.parts_(num, fracs).To_str());} - public void Test_parse(String raw, String expd) {Tfds.Eq(expd, Decimal_adp_.parse_(raw).To_str());} - public void Test_truncate_decimal(String raw, String expd) {Tfds.Eq(Decimal_adp_.parse_(expd).To_str(), Decimal_adp_.parse_(raw).Truncate().To_str());} + public void Test_parse(String raw, String expd) {Tfds.Eq(expd, Decimal_adp_.parse(raw).To_str());} + public void Test_truncate_decimal(String raw, String expd) {Tfds.Eq(Decimal_adp_.parse(expd).To_str(), Decimal_adp_.parse(raw).Truncate().To_str());} public void Test_frac_1000(int lhs, int rhs, int expd) {Tfds.Eq(expd, Decimal_adp_.divide_(lhs, rhs).Frac_1000());} public void Test_comp_lt(int lhsNum, int lhsFrc, int rhs, boolean expd) {Tfds.Eq(expd, Decimal_adp_.parts_(lhsNum, lhsFrc).Comp_lt(rhs));} public void Test_to_str_fmt(int l, int r, String fmt, String expd) {Tfds.Eq(expd, Decimal_adp_.divide_(l, r).To_str(fmt));} - public void Test_round(String raw, int places, String expd) {Tfds.Eq_str(expd, Decimal_adp_.parse_(raw).Round(places).To_str(), "round");} + public void Test_round(String raw, int places, String expd) {Tfds.Eq_str(expd, Decimal_adp_.parse(raw).Round(places).To_str(), "round");} } diff --git a/100_core/src_120_basicDataType/gplx/Guid_adp.java b/100_core/src_101_types_object/gplx/Guid_adp.java similarity index 99% rename from 100_core/src_120_basicDataType/gplx/Guid_adp.java rename to 100_core/src_101_types_object/gplx/Guid_adp.java index 2abe4054d..f157c31ac 100644 --- a/100_core/src_120_basicDataType/gplx/Guid_adp.java +++ b/100_core/src_101_types_object/gplx/Guid_adp.java @@ -17,6 +17,6 @@ along with this program. If not, see . */ package gplx; public class Guid_adp { - public String To_str() {return guid.toString();} public Guid_adp(java.util.UUID guid) {this.guid = guid;} java.util.UUID guid; + public String To_str() {return guid.toString();} } \ No newline at end of file diff --git a/100_core/src_120_basicDataType/gplx/Guid_adp_.java b/100_core/src_101_types_object/gplx/Guid_adp_.java similarity index 82% rename from 100_core/src_120_basicDataType/gplx/Guid_adp_.java rename to 100_core/src_101_types_object/gplx/Guid_adp_.java index 7cda6af35..4bd2e26e1 100644 --- a/100_core/src_120_basicDataType/gplx/Guid_adp_.java +++ b/100_core/src_101_types_object/gplx/Guid_adp_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx; public class Guid_adp_ { public static final String Cls_ref_name = "Guid"; - public static final Guid_adp Empty = parse_("00000000-0000-0000-0000-000000000000"); + public static final Guid_adp Empty = parse("00000000-0000-0000-0000-000000000000"); public static Guid_adp new_() {return new Guid_adp(java.util.UUID.randomUUID());} - public static Guid_adp parse_(String s) {return new Guid_adp(java.util.UUID.fromString(s));} + public static Guid_adp parse(String s) {return new Guid_adp(java.util.UUID.fromString(s));} } \ No newline at end of file diff --git a/100_core/src_120_basicDataType/gplx/Guid_adp__tst.java b/100_core/src_101_types_object/gplx/Guid_adp__tst.java similarity index 91% rename from 100_core/src_120_basicDataType/gplx/Guid_adp__tst.java rename to 100_core/src_101_types_object/gplx/Guid_adp__tst.java index f51c7733b..3f13caff5 100644 --- a/100_core/src_120_basicDataType/gplx/Guid_adp__tst.java +++ b/100_core/src_101_types_object/gplx/Guid_adp__tst.java @@ -18,11 +18,11 @@ along with this program. If not, see . package gplx; import org.junit.*; public class Guid_adp__tst { - @Test public void parse_() { + @Test public void parse() { tst_parse_("467ffb41-cdfe-402f-b22b-be855425784b"); } void tst_parse_(String s) { - Guid_adp uuid = Guid_adp_.parse_(s); + Guid_adp uuid = Guid_adp_.parse(s); Tfds.Eq(uuid.To_str(), s); } } diff --git a/100_core/src_110_primitive/gplx/Object_.java b/100_core/src_101_types_object/gplx/Object_.java similarity index 91% rename from 100_core/src_110_primitive/gplx/Object_.java rename to 100_core/src_101_types_object/gplx/Object_.java index c86783fbd..4b6cf59d7 100644 --- a/100_core/src_110_primitive/gplx/Object_.java +++ b/100_core/src_101_types_object/gplx/Object_.java @@ -39,8 +39,9 @@ public class Object_ { Class c = Type_adp_.ClassOf_obj(v); if (Type_adp_.Eq(c, String_.Cls_ref_type)) return (String)v; else if (Type_adp_.Eq(c, Bry_.Cls_ref_type)) return String_.new_u8((byte[])v); - else if (Type_adp_.Eq(c, Bool_.Cls_ref_type)) return Bool_.cast_(v) ? Bool_.True_str : Bool_.False_str; // always return "true" / "false" - else if (Type_adp_.Eq(c, Double_.Cls_ref_type)) return Double_.Xto_str_loose(Double_.cast_(v)); + else if (Type_adp_.Eq(c, Bool_.Cls_ref_type)) return Bool_.cast(v) ? Bool_.True_str : Bool_.False_str; // always return "true" / "false" + else if (Type_adp_.Eq(c, Double_.Cls_ref_type)) return Double_.Xto_str_loose(Double_.cast(v)); else return v.toString(); } + public static final byte[] Bry__null = Bry_.new_a7("null"); } \ No newline at end of file diff --git a/100_core/src_110_primitive/gplx/Object__tst.java b/100_core/src_101_types_object/gplx/Object__tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Object__tst.java rename to 100_core/src_101_types_object/gplx/Object__tst.java diff --git a/100_core/src_110_primitive/gplx/String_.java b/100_core/src_101_types_object/gplx/String_.java similarity index 95% rename from 100_core/src_110_primitive/gplx/String_.java rename to 100_core/src_101_types_object/gplx/String_.java index 7b392b98e..e218adb88 100644 --- a/100_core/src_110_primitive/gplx/String_.java +++ b/100_core/src_101_types_object/gplx/String_.java @@ -23,7 +23,7 @@ public class String_ implements GfoInvkAble { public static final String Cls_val_name = "str" + "ing"; public static final int Find_none = -1, Pos_neg1 = -1; public static final String Null = null, Empty = "", Null_mark = "<>", Tab = "\t", Lf = "\n", CrLf = "\r\n"; - public static String cast_(Object v) {return (String)v;} + public static String cast(Object v) {return (String)v;} public static String as_(Object obj) {return obj instanceof String ? (String)obj : null;} public static String new_a7(byte[] v) {return v == null ? null : new_a7(v, 0, v.length);} public static String new_a7(byte[] v, int bgn, int end) { @@ -385,8 +385,8 @@ public class String_ implements GfoInvkAble { numberStr = ""; } else if (c == bracketEnd) { - int aryIdx = Int_.parse_or_(numberStr, Int_.MinValue); - if (aryIdx != Int_.MinValue && Int_.Between(aryIdx, 0, aryLength - 1)) // check (a) aryIdx is num; (b) aryIdx is in bounds + int aryIdx = Int_.parse_or(numberStr, Int_.Min_value); + if (aryIdx != Int_.Min_value && Int_.Between(aryIdx, 0, aryLength - 1)) // check (a) aryIdx is num; (b) aryIdx is in bounds aryVal = Object_.Xto_str_strict_or_empty(ary[aryIdx]); else aryVal = String_.Concat_any(bracketBgn, numberStr, bracketEnd); // not valid, just add String @@ -488,9 +488,9 @@ public class String_ implements GfoInvkAble { public static String Replace_by_pos(String v, int del_bgn, int del_end, String repl) { return String_.Mid(v, 0, del_bgn) + repl + String_.Mid(v, del_end, String_.Len(v)); } - public static String read_(Object obj) {// NOTE: same as cast_; for consistent readability only + public static String read_(Object obj) {// NOTE: same as cast; for consistent readability only String rv = as_(obj); - if (rv == null && obj != null) throw Err_.new_type_mismatch(String.class, obj); // NOTE: obj != null needed; EX: cast_(null) --> null + if (rv == null && obj != null) throw Err_.new_type_mismatch(String.class, obj); // NOTE: obj != null needed; EX: cast(null) --> null return rv; } public static String[] Ary(byte[]... ary) { diff --git a/100_core/src_110_primitive/gplx/String__tst.java b/100_core/src_101_types_object/gplx/String__tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/String__tst.java rename to 100_core/src_101_types_object/gplx/String__tst.java diff --git a/100_core/src_120_basicDataType/gplx/DateAdp.java b/100_core/src_120_basicDataType/gplx/DateAdp.java index d08e5587e..cb4232cc6 100644 --- a/100_core/src_120_basicDataType/gplx/DateAdp.java +++ b/100_core/src_120_basicDataType/gplx/DateAdp.java @@ -69,7 +69,7 @@ public class DateAdp implements CompareAble, GfoInvkAble { public String XtoStr_fmt_yyyy_MM_dd_HH_mm() {return XtoStr_fmt("yyyy-MM-dd HH:mm");} public String XtoStr_fmt_yyyy_MM_dd_HH_mm_ss() {return XtoStr_fmt("yyyy-MM-dd HH:mm:ss");} public String XtoStr_fmt_iso_8561() {return XtoStr_fmt("yyyy-MM-dd HH:mm:ss");} - public static int Timezone_offset_test = Int_.MinValue; + public static int Timezone_offset_test = Int_.Min_value; public Calendar UnderDateTime() {return under;} Calendar under; public int Year() {return under.get(Calendar.YEAR);} public int Month() {return under.get(Calendar.MONTH) + Month_base0adj;} @@ -80,7 +80,7 @@ public class DateAdp implements CompareAble, GfoInvkAble { public int DayOfWeek() {return under.get(Calendar.DAY_OF_WEEK) - 1;} // -1 : Base0; NOTE: dotnet/php is also Sunday=0 public int DayOfYear() {return under.get(Calendar.DAY_OF_YEAR);} public int Timezone_offset() { - return Timezone_offset_test == Int_.MinValue // Timezone_offset_test not over-ridden + return Timezone_offset_test == Int_.Min_value // Timezone_offset_test not over-ridden ? 0 // ? under.getTimeZone().getOffset(this.Timestamp_unix()) / 1000 // divide by 1000 to convert from ms to seconds : Timezone_offset_test diff --git a/100_core/src_120_basicDataType/gplx/DateAdp_.java b/100_core/src_120_basicDataType/gplx/DateAdp_.java index fba8bcb66..1681132af 100644 --- a/100_core/src_120_basicDataType/gplx/DateAdp_.java +++ b/100_core/src_120_basicDataType/gplx/DateAdp_.java @@ -46,7 +46,7 @@ public class DateAdp_ implements GfoInvkAble { int f = ary_len > 6 ? ary[6] : 0; return new DateAdp(y, M, d, h, m, s, f); } - public static DateAdp cast_(Object arg) {try {return (DateAdp)arg;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, DateAdp.class, arg);}} + public static DateAdp cast(Object arg) {try {return (DateAdp)arg;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, DateAdp.class, arg);}} public static DateAdp parse_iso8561_or(String raw, DateAdp or) { try {return parse_iso8561(raw);} catch (Exception e) {Err_.Noop(e); return or;} diff --git a/100_core/src_120_basicDataType/gplx/EnmMgr.java b/100_core/src_120_basicDataType/gplx/EnmMgr.java index ff5cbb945..8a1b37e08 100644 --- a/100_core/src_120_basicDataType/gplx/EnmMgr.java +++ b/100_core/src_120_basicDataType/gplx/EnmMgr.java @@ -21,7 +21,7 @@ public class EnmMgr { public String BitRngSpr() {return bitRngSpr;} public EnmMgr BitRngSpr_(String val) {bitRngSpr = val; return this;} private String bitRngSpr = "+"; public String Prefix() {return prefix;} public EnmMgr Prefix_(String val) {prefix = val; return this;} private String prefix; public int BitRngBgn() {return bitRngBgn;} public EnmMgr BitRngBgn_(int val) {bitRngBgn = val; return this;} int bitRngBgn = 1; - public int BitRngEnd() {return bitRngEnd;} public EnmMgr BitRngEnd_(int val) {bitRngEnd = val; return this;} int bitRngEnd = Int_.MaxValue; + public int BitRngEnd() {return bitRngEnd;} public EnmMgr BitRngEnd_(int val) {bitRngEnd = val; return this;} int bitRngEnd = Int_.Max_value; public void RegObj(int val, String raw, Object o) { rawRegy.Add(raw, val); valRegy.Add(val, raw); @@ -36,9 +36,9 @@ public class EnmMgr { if (prefix != null) term = String_.Replace(term, prefix, ""); int cur = -1; if (String_.Has_at_bgn(term, "#")) - cur = Int_.parse_(String_.Mid(term, 1)); + cur = Int_.parse(String_.Mid(term, 1)); else - cur = Int_.cast_(rawRegy.Get_by(term)); + cur = Int_.cast(rawRegy.Get_by(term)); rv |= cur; } return rv; diff --git a/100_core/src_120_basicDataType/gplx/Io_url_.java b/100_core/src_120_basicDataType/gplx/Io_url_.java index 76fe6084e..88383d3ba 100644 --- a/100_core/src_120_basicDataType/gplx/Io_url_.java +++ b/100_core/src_120_basicDataType/gplx/Io_url_.java @@ -22,7 +22,7 @@ public class Io_url_ { public static final Io_url NullPtr = null; public static final Io_url Parser = new Io_url("", IoUrlInfo_.Nil); public static Io_url as_(Object obj) {return obj instanceof Io_url ? (Io_url)obj : null;} - public static Io_url cast_(Object obj) {try {return (Io_url)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, Io_url.class, obj);}} + public static Io_url cast(Object obj) {try {return (Io_url)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, Io_url.class, obj);}} public static Io_url Usr() { if (usr_dir == null) { switch (Op_sys.Cur().Tid()) { diff --git a/100_core/src_120_basicDataType/gplx/KeyVal.java b/100_core/src_120_basicDataType/gplx/KeyVal.java index 4bea51870..db8b45e67 100644 --- a/100_core/src_120_basicDataType/gplx/KeyVal.java +++ b/100_core/src_120_basicDataType/gplx/KeyVal.java @@ -16,16 +16,17 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ package gplx; -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 class KeyVal implements To_str_able { + @gplx.Internal protected KeyVal(int key_tid, Object key, Object val) {this.key_tid = key_tid; this.key = key; this.val = val;} public String Key() {return Object_.Xto_str_strict_or_null(key);} - public byte Key_tid() {return key_tid;} private byte key_tid; + public int Key_tid() {return key_tid;} private int key_tid; public Object Key_as_obj() {return key;} private Object key; - public KeyVal Key_(Object v) {this.key = v; return this;} - public Object Val() {return val;} public KeyVal Val_(Object v) {val = v; return this;} private Object val; + public Object Val() {return val;} private Object val; 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));} + public KeyVal Key_(Object v) {this.key = v; return this;} + public KeyVal Val_(Object v) {this.val = v; return this;} @Override public String toString() {return To_str();} public String To_str() {return Key() + "=" + Object_.Xto_str_strict_or_null_mark(val);} } diff --git a/100_core/src_120_basicDataType/gplx/KeyVal_.java b/100_core/src_120_basicDataType/gplx/KeyVal_.java index 4ad9393e0..000e814ec 100644 --- a/100_core/src_120_basicDataType/gplx/KeyVal_.java +++ b/100_core/src_120_basicDataType/gplx/KeyVal_.java @@ -40,7 +40,7 @@ public class KeyVal_ { rv[i] = vals[i - vals_bgn]; return rv; } - public static String Ary_x_to_str(KeyVal... ary) { + public static String Ary_to_str(KeyVal... ary) { String_bldr sb = String_bldr_.new_(); int len = ary.length; for (int i = 0; i < len; i++) { @@ -48,7 +48,7 @@ public class KeyVal_ { sb.Add(itm.Key()).Add("="); Object itm_val = itm.Val(); if (Type_adp_.Eq_typeSafe(itm_val, KeyVal[].class)) - sb.Add(Ary_x_to_str((KeyVal[])itm_val)); + sb.Add(Ary_to_str((KeyVal[])itm_val)); else sb.Add(Object_.Xto_str_strict_or_null_mark(itm_val)); sb.Add_char_nl(); @@ -63,12 +63,12 @@ public class KeyVal_ { } return null; } - public static String Ary_xto_str_nested(KeyVal... ary) { + public static String Ary_to_str_nested(KeyVal... ary) { Bry_bfr bfr = Bry_bfr.new_(); - Ary_xto_str_nested(bfr, 0, ary); + Ary_to_str_nested(bfr, 0, ary); return bfr.Xto_str_and_clear(); } - private static void Ary_xto_str_nested(Bry_bfr bfr, int indent, KeyVal[] ary) { + private static void Ary_to_str_nested(Bry_bfr bfr, int indent, KeyVal[] ary) { int len = ary.length; for (int i = 0; i < len; ++i) { KeyVal itm = ary[i]; @@ -82,11 +82,11 @@ public class KeyVal_ { Class val_type = Type_adp_.ClassOf_obj(val); if (Type_adp_.Eq(val_type, KeyVal[].class)) { // val is KeyVal[]; recurse bfr.Add_byte_nl(); // add nl : "\n" - Ary_xto_str_nested(bfr, indent + 1, (KeyVal[])val); + Ary_to_str_nested(bfr, indent + 1, (KeyVal[])val); continue; // don't add \n below } else if (Type_adp_.Eq(val_type, Bool_.Cls_ref_type)) { // val is boolean - boolean val_as_bool = Bool_.cast_(val); + boolean val_as_bool = Bool_.cast(val); bfr.Add(val_as_bool ? Bool_.True_bry : Bool_.False_bry); // add "true" or "false"; don't call toString } else @@ -96,9 +96,8 @@ public class KeyVal_ { } } public static KeyVal as_(Object obj) {return obj instanceof KeyVal ? (KeyVal)obj : null;} - public static KeyVal new_(String key) {return new KeyVal(KeyVal_.Key_tid_str, key, key);} - public static KeyVal new_(String key, Object val) {return new KeyVal(KeyVal_.Key_tid_str, key, val);} - public static KeyVal int_(int key, Object val) {return new KeyVal(KeyVal_.Key_tid_int, key, val);} - public static KeyVal obj_(Object key, Object val) {return new KeyVal(KeyVal_.Key_tid_obj, key, val);} - public static final byte Key_tid_obj = 0, Key_tid_str = 1, Key_tid_int = 2; + public static KeyVal new_(String key) {return new KeyVal(Type_adp_.Tid__str, key, key);} + public static KeyVal new_(String key, Object val) {return new KeyVal(Type_adp_.Tid__str, key, val);} + public static KeyVal int_(int key, Object val) {return new KeyVal(Type_adp_.Tid__int, key, val);} + public static KeyVal obj_(Object key, Object val) {return new KeyVal(Type_adp_.Tid__obj, key, val);} } diff --git a/100_core/src_120_basicDataType/gplx/Math_.java b/100_core/src_120_basicDataType/gplx/Math_.java index 1d42eb32c..e5f0bd779 100644 --- a/100_core/src_120_basicDataType/gplx/Math_.java +++ b/100_core/src_120_basicDataType/gplx/Math_.java @@ -40,7 +40,7 @@ public class Math_ { public static float Abs(float val) {return val > 0 ? val : val * -1;} public static double Abs_double(double val) {return val > 0 ? val : val * -1;} public static int Log10(int val) { - if (val <= 0) return Int_.MinValue; + if (val <= 0) return Int_.Min_value; int rv = -1, baseVal = 10; while (val != 0) { val = (val / baseVal); diff --git a/100_core/src_120_basicDataType/gplx/Math__tst.java b/100_core/src_120_basicDataType/gplx/Math__tst.java index 983cf8015..d89e7af1a 100644 --- a/100_core/src_120_basicDataType/gplx/Math__tst.java +++ b/100_core/src_120_basicDataType/gplx/Math__tst.java @@ -24,7 +24,7 @@ public class Math__tst { tst_Abs(0, 0); } void tst_Abs(int val, int expd) {Tfds.Eq(expd, Math_.Abs(val));} @Test public void Log10() { - tst_Log10(0, Int_.MinValue); + tst_Log10(0, Int_.Min_value); tst_Log10(9, 0); tst_Log10(10, 1); tst_Log10(99, 1); diff --git a/100_core/src_120_basicDataType/gplx/TimeSpanAdp.java b/100_core/src_120_basicDataType/gplx/TimeSpanAdp.java index 700f76728..7c4033f82 100644 --- a/100_core/src_120_basicDataType/gplx/TimeSpanAdp.java +++ b/100_core/src_120_basicDataType/gplx/TimeSpanAdp.java @@ -41,13 +41,13 @@ public class TimeSpanAdp implements CompareAble, EqAble { } public TimeSpanAdp Subtract(TimeSpanAdp val) {return new TimeSpanAdp(fracs - val.fracs);} - public int compareTo(Object obj) {TimeSpanAdp comp = TimeSpanAdp_.cast_(obj); return CompareAble_.Compare_obj(fracs, comp.fracs);} + public int compareTo(Object obj) {TimeSpanAdp comp = TimeSpanAdp_.cast(obj); return CompareAble_.Compare_obj(fracs, comp.fracs);} public boolean Eq(Object o) { - TimeSpanAdp comp = TimeSpanAdp_.cast_(o); if (comp == null) return false; + TimeSpanAdp comp = TimeSpanAdp_.cast(o); if (comp == null) return false; return fracs == comp.fracs; } @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 boolean equals(Object obj) {TimeSpanAdp comp = TimeSpanAdp_.cast(obj); return Object_.Eq(fracs, comp.fracs);} @Override public int hashCode() {return super.hashCode();} public String To_str() {return TimeSpanAdp_.To_str(fracs, TimeSpanAdp_.Fmt_Default);} diff --git a/100_core/src_120_basicDataType/gplx/TimeSpanAdp_.java b/100_core/src_120_basicDataType/gplx/TimeSpanAdp_.java index 012e796e0..f4b45a604 100644 --- a/100_core/src_120_basicDataType/gplx/TimeSpanAdp_.java +++ b/100_core/src_120_basicDataType/gplx/TimeSpanAdp_.java @@ -34,8 +34,8 @@ public class TimeSpanAdp_ { return TimeSpanAdp_.fracs_(fracs); } public static TimeSpanAdp from_(long bgn) {return TimeSpanAdp_.fracs_(Env_.TickCount() - bgn);} - public static final long parse_null = Long_.MinValue; - public static TimeSpanAdp parse_(String raw) { + public static final long parse_null = Long_.Min_value; + public static TimeSpanAdp parse(String raw) { byte[] bry = Bry_.new_u8(raw); long fracs = parse_to_fracs(bry, 0, bry.length, false); return fracs == parse_null ? null : TimeSpanAdp_.fracs_(fracs); @@ -157,6 +157,6 @@ public class TimeSpanAdp_ { @gplx.Internal protected static final int Idx_Hour = 3; static int[] ZeroPadding = {3, 2, 2, 2,}; static String[] Sprs = {".", MajorDelimiter, MajorDelimiter, "",}; - public static TimeSpanAdp cast_(Object arg) {try {return (TimeSpanAdp)arg;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TimeSpanAdp.class, arg);}} + public static TimeSpanAdp cast(Object arg) {try {return (TimeSpanAdp)arg;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TimeSpanAdp.class, arg);}} public static final double Ratio_f_to_s = 1000; } diff --git a/100_core/src_120_basicDataType/gplx/TimeSpanAdp__parse_tst.java b/100_core/src_120_basicDataType/gplx/TimeSpanAdp__parse_tst.java index 586fb6d5d..6baef9442 100644 --- a/100_core/src_120_basicDataType/gplx/TimeSpanAdp__parse_tst.java +++ b/100_core/src_120_basicDataType/gplx/TimeSpanAdp__parse_tst.java @@ -48,7 +48,7 @@ public class TimeSpanAdp__parse_tst { tst_Parse(" 01 : 02 : 03 . 987", 3723987); // whitespace } void tst_Parse(String text, long expd) { - TimeSpanAdp val = TimeSpanAdp_.parse_(text); + TimeSpanAdp val = TimeSpanAdp_.parse(text); Tfds.Eq(expd, val.Fracs()); } } diff --git a/100_core/src_120_basicDataType/gplx/TimeSpanAdp_basic_tst.java b/100_core/src_120_basicDataType/gplx/TimeSpanAdp_basic_tst.java index cb13d5283..03c4d1dce 100644 --- a/100_core/src_120_basicDataType/gplx/TimeSpanAdp_basic_tst.java +++ b/100_core/src_120_basicDataType/gplx/TimeSpanAdp_basic_tst.java @@ -68,14 +68,14 @@ public class TimeSpanAdp_basic_tst { tst_XtoStrUiAbbrv("00:00:03.000", "3s 0f"); tst_XtoStrUiAbbrv("11:22:33.444", "11h 22m 33s 444f"); tst_XtoStrUiAbbrv("00:00:00.000", "0f"); - } void tst_XtoStrUiAbbrv(String raw, String expd) {Tfds.Eq(expd, TimeSpanAdp_.parse_(raw).XtoStrUiAbbrv());} + } void tst_XtoStrUiAbbrv(String raw, String expd) {Tfds.Eq(expd, TimeSpanAdp_.parse(raw).XtoStrUiAbbrv());} void tst_AddUnit(String valRaw, int unitIdx, int delta, String expdRaw) { - TimeSpanAdp val = TimeSpanAdp_.parse_(valRaw); + TimeSpanAdp val = TimeSpanAdp_.parse(valRaw); TimeSpanAdp actl = val.Add_unit(unitIdx, delta); - Tfds.Eq(TimeSpanAdp_.parse_(expdRaw), actl); + Tfds.Eq(TimeSpanAdp_.parse(expdRaw), actl); } void tst_Units(String text, int... expd) { - TimeSpanAdp val = TimeSpanAdp_.parse_(text); + TimeSpanAdp val = TimeSpanAdp_.parse(text); int hour = 0, min = 0, sec = 0, frac = 0; int[] ary = val.Units(); hour = ary[TimeSpanAdp_.Idx_Hour]; min = ary[TimeSpanAdp_.Idx_Min]; sec = ary[TimeSpanAdp_.Idx_Sec]; frac = ary[TimeSpanAdp_.Idx_Frac]; diff --git a/100_core/src_120_basicDataType/gplx/TimeSpanAdp_xtoStr_tst.java b/100_core/src_120_basicDataType/gplx/TimeSpanAdp_xtoStr_tst.java index f55fe9a34..9d33d2ef9 100644 --- a/100_core/src_120_basicDataType/gplx/TimeSpanAdp_xtoStr_tst.java +++ b/100_core/src_120_basicDataType/gplx/TimeSpanAdp_xtoStr_tst.java @@ -52,7 +52,7 @@ public class TimeSpanAdp_xtoStr_tst { Tfds.Eq(expd, actl); } void tst_ZeroPadding(String val, String expd) { - TimeSpanAdp timeSpan = TimeSpanAdp_.parse_(val); + TimeSpanAdp timeSpan = TimeSpanAdp_.parse(val); String actl = timeSpan.To_str(TimeSpanAdp_.Fmt_PadZeros); Tfds.Eq(expd, actl); } diff --git a/100_core/src_110_primitive/gplx/Bry_.java b/100_core/src_130_brys/gplx/Bry_.java similarity index 96% rename from 100_core/src_110_primitive/gplx/Bry_.java rename to 100_core/src_130_brys/gplx/Bry_.java index 1a9197a78..25b6dceb0 100644 --- a/100_core/src_110_primitive/gplx/Bry_.java +++ b/100_core/src_130_brys/gplx/Bry_.java @@ -606,7 +606,7 @@ public class Bry_ { else return new byte[] {b3}; } public static boolean To_bool_by_int(byte[] ary) { - int rv = To_int_or(ary, null, 0, ary.length, Int_.MinValue); + int rv = To_int_or(ary, null, 0, ary.length, Int_.Min_value); switch (rv) { case 0: return false; case 1: return true; @@ -615,8 +615,8 @@ public class Bry_ { } public static byte To_int_as_byte(byte[] ary, int bgn, int end, byte or) {return (byte)To_int_or(ary, bgn, end, or);} public static int To_int(byte[] ary) { - int rv = To_int_or(ary, null, 0, ary.length, Int_.MinValue); - if (rv == Int_.MinValue) throw Err_.new_wo_type("could not parse to int", "val", String_.new_u8(ary)); + int rv = To_int_or(ary, null, 0, ary.length, Int_.Min_value); + if (rv == Int_.Min_value) throw Err_.new_wo_type("could not parse to int", "val", String_.new_u8(ary)); return rv; } public static int To_int_or_neg1(byte[] ary) {return To_int_or(ary, null, 0, ary.length, -1);} @@ -741,10 +741,10 @@ public class Bry_ { } return To_int_or(ary, bgn, end_num, or); } - public static double To_double(byte[] ary, int bgn, int end) {return Double_.parse_(String_.new_u8(ary, bgn, end));} + public static double To_double(byte[] ary, int bgn, int end) {return Double_.parse(String_.new_u8(ary, bgn, end));} public static double To_double_or(byte[] bry, double or) {return Double_.parse_or(String_.new_u8(bry, 0, bry.length), or);} public static double To_double_or(byte[] ary, int bgn, int end, double or) {return Double_.parse_or(String_.new_u8(ary, bgn, end), or);} - public static Decimal_adp To_decimal(byte[] ary, int bgn, int end) {return Decimal_adp_.parse_(String_.new_u8(ary, bgn, end));} + public static Decimal_adp To_decimal(byte[] ary, int bgn, int end) {return Decimal_adp_.parse(String_.new_u8(ary, bgn, end));} public static final byte Dlm_fld = (byte)'|', Dlm_row = (byte)'\n', Dlm_quote = (byte)'"', Dlm_null = 0, Ascii_zero = 48; public static final String Fmt_csvDte = "yyyyMMdd HHmmss.fff"; public static DateAdp ReadCsvDte(byte[] ary, Int_obj_ref posRef, byte lkp) {// ASSUME: fmt = yyyyMMdd HHmmss.fff @@ -880,7 +880,7 @@ public class Bry_ { return Replace(bfr, src, find, repl, 0, src.length); } public static byte[] Replace(Bry_bfr bfr, byte[] src, byte[] find, byte[] repl) {return Replace(bfr, src, find, repl, 0, src.length);} - public static byte[] Replace(Bry_bfr bfr, byte[] src, byte[] find, byte[] repl, int src_bgn, int src_end) {return Replace(bfr, src, find, repl, src_bgn, src_end, Int_.MaxValue);} + public static byte[] Replace(Bry_bfr bfr, byte[] src, byte[] find, byte[] repl, int src_bgn, int src_end) {return Replace(bfr, src, find, repl, src_bgn, src_end, Int_.Max_value);} public static byte[] Replace(Bry_bfr bfr, byte[] src, byte[] find, byte[] repl, int src_bgn, int src_end, int limit) { int pos = src_bgn; boolean dirty = false; diff --git a/100_core/src_110_primitive/gplx/Bry__tst.java b/100_core/src_130_brys/gplx/Bry__tst.java similarity index 95% rename from 100_core/src_110_primitive/gplx/Bry__tst.java rename to 100_core/src_130_brys/gplx/Bry__tst.java index 9c0220e82..1fd04c4bd 100644 --- a/100_core/src_110_primitive/gplx/Bry__tst.java +++ b/100_core/src_130_brys/gplx/Bry__tst.java @@ -37,7 +37,7 @@ public class Bry__tst { tst_XtoStrBytesByInt(10, 1, 0); tst_XtoStrBytesByInt(321, 3, 2, 1); tst_XtoStrBytesByInt(-321, Bry_.Byte_NegSign, 3, 2, 1); - tst_XtoStrBytesByInt(Int_.MaxValue, 2,1,4,7,4,8,3,6,4,7); + tst_XtoStrBytesByInt(Int_.Max_value, 2,1,4,7,4,8,3,6,4,7); } void tst_XtoStrBytesByInt(int val, int... expdAryAsInt) { byte[] expd = new byte[expdAryAsInt.length]; @@ -101,11 +101,11 @@ public class Bry__tst { @Test public void XtoInt() { tst_XtoInt("1", 1); tst_XtoInt("123", 123); - tst_XtoInt("a", Int_.MinValue, Int_.MinValue); - tst_XtoInt("-1", Int_.MinValue, -1); - tst_XtoInt("-123", Int_.MinValue, -123); - tst_XtoInt("123-1", Int_.MinValue, Int_.MinValue); - tst_XtoInt("+123", Int_.MinValue, 123); + tst_XtoInt("a", Int_.Min_value, Int_.Min_value); + tst_XtoInt("-1", Int_.Min_value, -1); + tst_XtoInt("-123", Int_.Min_value, -123); + tst_XtoInt("123-1", Int_.Min_value, Int_.Min_value); + tst_XtoInt("+123", Int_.Min_value, 123); tst_XtoInt("", -1); } void tst_XtoInt(String val, int expd) {tst_XtoInt(val, -1, expd);} @@ -135,7 +135,7 @@ public class Bry__tst { } void tst_ReadCsvDte(String raw) {Tfds.Eq_date(DateAdp_.parse_fmt(raw, Bry_.Fmt_csvDte), Bry_.ReadCsvDte(Bry_.new_u8(raw + "|"), Int_obj_ref.zero_(), (byte)'|'));} @Test public void ReadCsvInt() { tst_ReadCsvInt("1234567890"); - } void tst_ReadCsvInt(String raw) {Tfds.Eq(Int_.parse_(raw), Bry_.ReadCsvInt(Bry_.new_u8(raw + "|"), Int_obj_ref.zero_(), (byte)'|'));} + } void tst_ReadCsvInt(String raw) {Tfds.Eq(Int_.parse(raw), Bry_.ReadCsvInt(Bry_.new_u8(raw + "|"), Int_obj_ref.zero_(), (byte)'|'));} @Test public void Trim() { Trim_tst("a b c", 1, 4, "b"); Trim_tst("a c", 1, 3, ""); diff --git a/100_core/src_110_primitive/gplx/Bry_bfr.java b/100_core/src_130_brys/gplx/Bry_bfr.java similarity index 94% rename from 100_core/src_110_primitive/gplx/Bry_bfr.java rename to 100_core/src_130_brys/gplx/Bry_bfr.java index 416ffd56a..816976fb2 100644 --- a/100_core/src_110_primitive/gplx/Bry_bfr.java +++ b/100_core/src_130_brys/gplx/Bry_bfr.java @@ -218,7 +218,7 @@ public class Bry_bfr { } for (int i = 0; i < arySlots; i++) { int logIdx = arySlots - i - 1; - int div = logIdx < Int_.Log10AryLen ? Int_.Log10Ary[logIdx] : Int_.MaxValue; + int div = logIdx < Int_.Log10AryLen ? Int_.Log10Ary[logIdx] : Int_.Max_value; bfr[aryBgn + i] = (byte)((val / div) + 48); val %= div; } @@ -240,7 +240,7 @@ public class Bry_bfr { } for (int i = 0; i < arySlots; i++) { int logIdx = arySlots - i - 1; - long div = logIdx < Long_.Log10Ary_len ? Long_.Log10Ary[logIdx] : Long_.MaxValue; + long div = logIdx < Long_.Log10Ary_len ? Long_.Log10Ary[logIdx] : Long_.Max_value; bfr[aryBgn + i] = (byte)((val / div) + 48); val %= div; } @@ -393,16 +393,16 @@ public class Bry_bfr { if (o == null) return this; // treat null as empty String; Class o_type = o.getClass(); if (o_type == byte[].class) Add((byte[])o); - else if (o_type == Integer.class) Add_int_variable(Int_.cast_(o)); - else if (o_type == Byte.class) Add_byte(Byte_.cast_(o)); - else if (o_type == Long.class) Add_long_variable(Long_.cast_(o)); + else if (o_type == Integer.class) Add_int_variable(Int_.cast(o)); + else if (o_type == Byte.class) Add_byte(Byte_.cast(o)); + else if (o_type == Long.class) Add_long_variable(Long_.cast(o)); else if (o_type == String.class) Add_str((String)o); else if (o_type == Bry_bfr.class) Add_bfr_and_preserve((Bry_bfr)o); else if (o_type == DateAdp.class) Add_dte((DateAdp)o); else if (o_type == Io_url.class) Add(((Io_url)o).RawBry()); - else if (o_type == Boolean.class) Add_yn(Bool_.cast_(o)); - else if (o_type == Double.class) Add_double(Double_.cast_(o)); - else if (o_type == Float.class) Add_float(Float_.cast_(o)); + else if (o_type == Boolean.class) Add_yn(Bool_.cast(o)); + else if (o_type == Double.class) Add_double(Double_.cast(o)); + else if (o_type == Float.class) Add_float(Float_.cast(o)); else ((Bry_fmtr_arg)o).XferAry(this, 0); return this; } @@ -410,16 +410,16 @@ public class Bry_bfr { if (o == null) return this; // treat null as empty String; Class o_type = o.getClass(); if (o_type == byte[].class) Add((byte[])o); - else if (o_type == Integer.class) Add_int_variable(Int_.cast_(o)); - else if (o_type == Byte.class) Add_byte(Byte_.cast_(o)); - else if (o_type == Long.class) Add_long_variable(Long_.cast_(o)); + else if (o_type == Integer.class) Add_int_variable(Int_.cast(o)); + else if (o_type == Byte.class) Add_byte(Byte_.cast(o)); + else if (o_type == Long.class) Add_long_variable(Long_.cast(o)); else if (o_type == String.class) Add_str((String)o); else if (o_type == Bry_bfr.class) Add_bfr_and_preserve((Bry_bfr)o); else if (o_type == DateAdp.class) Add_dte((DateAdp)o); else if (o_type == Io_url.class) Add(((Io_url)o).RawBry()); - else if (o_type == Boolean.class) Add_bool(Bool_.cast_(o)); - else if (o_type == Double.class) Add_double(Double_.cast_(o)); - else if (o_type == Float.class) Add_float(Float_.cast_(o)); + else if (o_type == Boolean.class) Add_bool(Bool_.cast(o)); + else if (o_type == Double.class) Add_double(Double_.cast(o)); + else if (o_type == Float.class) Add_float(Float_.cast(o)); else ((Bry_fmtr_arg)o).XferAry(this, 0); return this; } @@ -533,7 +533,7 @@ public class Bry_bfr { if (!Byte_ascii.Is_num(b)) return or; long dif = (b - Byte_ascii.Num_0 ) * mult; long new_val = rv + dif; - if (new_val > Int_.MaxValue) return or; // if number is > 2^32 consider error (int overflow); return or; DATE:2014-06-10 + if (new_val > Int_.Max_value) return or; // if number is > 2^32 consider error (int overflow); return or; DATE:2014-06-10 rv = new_val; mult *= 10; } diff --git a/100_core/src_110_primitive/gplx/Bry_bfr_.java b/100_core/src_130_brys/gplx/Bry_bfr_.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_bfr_.java rename to 100_core/src_130_brys/gplx/Bry_bfr_.java diff --git a/100_core/src_110_primitive/gplx/Bry_bfr_mkr.java b/100_core/src_130_brys/gplx/Bry_bfr_mkr.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_bfr_mkr.java rename to 100_core/src_130_brys/gplx/Bry_bfr_mkr.java diff --git a/100_core/src_110_primitive/gplx/Bry_bfr_mkr_tst.java b/100_core/src_130_brys/gplx/Bry_bfr_mkr_tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_bfr_mkr_tst.java rename to 100_core/src_130_brys/gplx/Bry_bfr_mkr_tst.java diff --git a/100_core/src_110_primitive/gplx/Bry_bfr_tst.java b/100_core/src_130_brys/gplx/Bry_bfr_tst.java similarity index 95% rename from 100_core/src_110_primitive/gplx/Bry_bfr_tst.java rename to 100_core/src_130_brys/gplx/Bry_bfr_tst.java index d10a364ed..72f180579 100644 --- a/100_core/src_110_primitive/gplx/Bry_bfr_tst.java +++ b/100_core/src_130_brys/gplx/Bry_bfr_tst.java @@ -64,12 +64,12 @@ public class Bry_bfr_tst { } void tst_Add_float(float v) { bb.Add_float(v); - Tfds.Eq(v, Float_.parse_(String_.new_u8(bb.Xto_bry()))); + Tfds.Eq(v, Float_.parse(String_.new_u8(bb.Xto_bry()))); } void Add_int_variable(int val) { bb.Clear(); bb.Add_int_variable(val); - Tfds.Eq(val, Int_.parse_(String_.new_u8(bb.Xto_bry()))); + Tfds.Eq(val, Int_.parse(String_.new_u8(bb.Xto_bry()))); } @Test public void Add_int_fixed_len3() {tst_Add_int_fixed(123, 3, "123");} @Test public void Add_int_fixed_pad_1() {tst_Add_int_fixed(2, 1, "2");} @@ -137,12 +137,12 @@ public class Bry_bfr_tst { } @Test public void XtoInt() { tst_XtoInt("123", 123); - tst_XtoInt("a", Int_.MinValue); - tst_XtoInt("9999999999", Int_.MinValue); + tst_XtoInt("a", Int_.Min_value); + tst_XtoInt("9999999999", Int_.Min_value); } void tst_XtoInt(String raw, int expd) { bb.Add_str(raw); - Tfds.Eq(expd, bb.XtoIntAndClear(Int_.MinValue)); + Tfds.Eq(expd, bb.XtoIntAndClear(Int_.Min_value)); } static long Pow38_to(int year, int month, int day, int hour, int minute, int second, int frac) { return ((long)year) << 26 diff --git a/100_core/src_110_primitive/gplx/Bry_finder.java b/100_core/src_130_brys/gplx/Bry_finder.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_finder.java rename to 100_core/src_130_brys/gplx/Bry_finder.java diff --git a/100_core/src_110_primitive/gplx/Bry_finder_tst.java b/100_core/src_130_brys/gplx/Bry_finder_tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_finder_tst.java rename to 100_core/src_130_brys/gplx/Bry_finder_tst.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr.java b/100_core/src_130_brys/gplx/Bry_fmtr.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr.java rename to 100_core/src_130_brys/gplx/Bry_fmtr.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_arg.java b/100_core/src_130_brys/gplx/Bry_fmtr_arg.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_arg.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_arg.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_arg_.java b/100_core/src_130_brys/gplx/Bry_fmtr_arg_.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_arg_.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_arg_.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_arg_fmtr_objs.java b/100_core/src_130_brys/gplx/Bry_fmtr_arg_fmtr_objs.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_arg_fmtr_objs.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_arg_fmtr_objs.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr.java b/100_core/src_130_brys/gplx/Bry_fmtr_eval_mgr.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_eval_mgr.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr_.java b/100_core/src_130_brys/gplx/Bry_fmtr_eval_mgr_.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr_.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_eval_mgr_.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr_gfs.java b/100_core/src_130_brys/gplx/Bry_fmtr_eval_mgr_gfs.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_eval_mgr_gfs.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_eval_mgr_gfs.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_itm.java b/100_core/src_130_brys/gplx/Bry_fmtr_itm.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_itm.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_itm.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_tst.java b/100_core/src_130_brys/gplx/Bry_fmtr_tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_tst.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_tst.java diff --git a/100_core/src_110_primitive/gplx/Bry_fmtr_vals.java b/100_core/src_130_brys/gplx/Bry_fmtr_vals.java similarity index 100% rename from 100_core/src_110_primitive/gplx/Bry_fmtr_vals.java rename to 100_core/src_130_brys/gplx/Bry_fmtr_vals.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_ary_dim2.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_ary_dim2.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_ary_dim2.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_ary_dim2.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_bfr.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_bfr.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_bfr.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_bfr.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_bfr_preserve.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_bfr_preserve.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_bfr_preserve.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_bfr_preserve.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_bry.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_bry.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_bry.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_bry.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_byt.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_byt.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_byt.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_byt.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_decimal_int.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_decimal_int.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_decimal_int.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_decimal_int.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_fmtr.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_fmtr.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_fmtr.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_fmtr.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_int.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_int.java similarity index 89% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_int.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_int.java index 9c8bcc597..001270e19 100644 --- a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_int.java +++ b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_int.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ package gplx.brys; import gplx.*; public class Bry_fmtr_arg_int implements Bry_fmtr_arg { - public Bry_fmtr_arg_int Data_(int v) {val = Int_.cast_(v); val_digits = Int_.DigitCount(val); return this;} + public Bry_fmtr_arg_int Data_(int v) {val = Int_.cast(v); val_digits = Int_.DigitCount(val); return this;} public void XferAry(Bry_bfr trg, int idx) {trg.Add_int_fixed(val, val_digits);} public Bry_fmtr_arg_int(int v) {this.val = v; this.val_digits = Int_.DigitCount(v);} int val, val_digits; } diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_time.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_time.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_time.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_time.java diff --git a/100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_time_tst.java b/100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_time_tst.java similarity index 100% rename from 100_core/src_110_primitive/gplx/brys/Bry_fmtr_arg_time_tst.java rename to 100_core/src_130_brys/gplx/brys/Bry_fmtr_arg_time_tst.java diff --git a/100_core/src_140_list/gplx/List_adp_tst.java b/100_core/src_140_list/gplx/List_adp_tst.java index a86bfcc3a..86e0f4640 100644 --- a/100_core/src_140_list/gplx/List_adp_tst.java +++ b/100_core/src_140_list/gplx/List_adp_tst.java @@ -161,7 +161,7 @@ public class List_adp_tst { list.Shuffle(); int hasMovedCount = 0; for (int i = 0; i < list.Count(); i++) { - int val = Int_.cast_(list.Get_at(i)); + int val = Int_.cast(list.Get_at(i)); if (val != i) hasMovedCount++; } Tfds.Eq_true(hasMovedCount > 0, "all documents have the same index"); // NOTE: may still fail occasionally (1%) diff --git a/100_core/src_150_text/gplx/intl/Utf16_.java b/100_core/src_150_text/gplx/intl/Utf16_.java index ac599de40..181d7cddc 100644 --- a/100_core/src_150_text/gplx/intl/Utf16_.java +++ b/100_core/src_150_text/gplx/intl/Utf16_.java @@ -53,8 +53,8 @@ public class Utf16_ { public static byte[] Encode_hex_to_bry(String raw) {return Encode_hex_to_bry(Bry_.new_a7(raw));} public static byte[] Encode_hex_to_bry(byte[] raw) { if (raw == null) return null; - int int_val = gplx.texts.HexDecUtl.parse_or_(raw, Int_.MinValue); - return int_val == Int_.MinValue ? null : Encode_int_to_bry(int_val); + int int_val = gplx.texts.HexDecUtl.parse_or(raw, Int_.Min_value); + return int_val == Int_.Min_value ? null : Encode_int_to_bry(int_val); } public static byte[] Encode_int_to_bry(int c) { int bry_len = Len_by_int(c); diff --git a/100_core/src_150_text/gplx/intl/Utf8_.java b/100_core/src_150_text/gplx/intl/Utf8_.java index cf948351b..0c93d90ac 100644 --- a/100_core/src_150_text/gplx/intl/Utf8_.java +++ b/100_core/src_150_text/gplx/intl/Utf8_.java @@ -75,7 +75,7 @@ public class Utf8_ { } int cur_char = Utf16_.Decode_to_int(bry, cur_char_pos0); nxt_char = Increment_char(cur_char); - if (nxt_char != Int_.MinValue) { + if (nxt_char != Int_.Min_value) { byte[] nxt_char_as_bry = Utf16_.Encode_int_to_bry(nxt_char); bry = Bry_.Add(Bry_.Mid(bry, 0, cur_char_pos0), nxt_char_as_bry); return bry; @@ -104,7 +104,7 @@ public class Utf8_ { if (!Codepoint_valid(cur)) continue; return cur; } - return Int_.MinValue; + return Int_.Min_value; } private static boolean Codepoint_valid(int v) { return Character.isDefined(v); diff --git a/100_core/src_150_text/gplx/texts/HexDecUtl.java b/100_core/src_150_text/gplx/texts/HexDecUtl.java index 858196963..1c8dec345 100644 --- a/100_core/src_150_text/gplx/texts/HexDecUtl.java +++ b/100_core/src_150_text/gplx/texts/HexDecUtl.java @@ -17,7 +17,7 @@ along with this program. If not, see . */ package gplx.texts; import gplx.*; public class HexDecUtl { - public static int parse_or_(String raw, int or) { + public static int parse_or(String raw, int or) { int rv = 0; int digit; int factor = 1, rawLen = String_.Len(raw); for (int i = rawLen - 1; i >= 0; i--) { digit = XtoInt(String_.CharAt(raw, i)); @@ -27,8 +27,8 @@ public class HexDecUtl { } return rv; } - public static int parse_or_(byte[] raw, int or) {return parse_or_(raw, 0, raw.length, or);} - public static int parse_or_(byte[] raw, int bgn, int end, int or) { + public static int parse_or(byte[] raw, int or) {return parse_or(raw, 0, raw.length, or);} + public static int parse_or(byte[] raw, int bgn, int end, int or) { int rv = 0; int factor = 1; byte b = Byte_.Max_value_127; for (int i = end - 1; i >= bgn; i--) { @@ -45,8 +45,8 @@ public class HexDecUtl { } return rv; } - public static int parse_(String raw) { - int rv = parse_or_(raw, -1); if (rv == -1) throw Err_.new_parse("HexDec", "raw"); + public static int parse(String raw) { + int rv = parse_or(raw, -1); if (rv == -1) throw Err_.new_parse("HexDec", "raw"); return rv; } public static String To_str(int val, int pad) { diff --git a/100_core/src_150_text/gplx/texts/HexDecUtl_tst.java b/100_core/src_150_text/gplx/texts/HexDecUtl_tst.java index 9288279c8..c7d3416da 100644 --- a/100_core/src_150_text/gplx/texts/HexDecUtl_tst.java +++ b/100_core/src_150_text/gplx/texts/HexDecUtl_tst.java @@ -27,7 +27,7 @@ public class HexDecUtl_tst { tst_XtoInt("FF", 255); tst_XtoInt("100", 256); tst_XtoInt("0a", 10); - tst_XtoInt("7FFFFFFF", Int_.MaxValue); + tst_XtoInt("7FFFFFFF", Int_.Max_value); tst_XtoInt_bry("100", 256); } @Test public void To_str() { @@ -36,7 +36,7 @@ public class HexDecUtl_tst { tst_XtoStr(16, "10"); tst_XtoStr(32, "20"); tst_XtoStr(255, "FF"); - tst_XtoStr(Int_.MaxValue, "7FFFFFFF"); + tst_XtoStr(Int_.Max_value, "7FFFFFFF"); tst_XtoStr(15, 2, "0F"); tst_XtoStr(15, 3, "00F"); @@ -51,10 +51,10 @@ public class HexDecUtl_tst { Tfds.Eq(expd, String_.new_a7(bry)); } private void tst_XtoInt(String raw, int expd) { - int actl = HexDecUtl.parse_(raw); + int actl = HexDecUtl.parse(raw); Tfds.Eq(expd, actl); } - private void tst_XtoInt_bry(String raw, int expd) {Tfds.Eq(expd, HexDecUtl.parse_or_(Bry_.new_a7(raw), -1));} + 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.To_str(val, pad); diff --git a/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_.java b/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_.java index fb4356bed..7b5fbd6ba 100644 --- a/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_.java +++ b/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_.java @@ -20,11 +20,11 @@ import gplx.core.strings.*; import gplx.core.regxs.*; public class RegxPatn_cls_ioMatch_ { public static final String Wildcard = "*"; public static final String OrDelimiter = "|"; - public static final RegxPatn_cls_ioMatch All = RegxPatn_cls_ioMatch_.parse_(Wildcard, false); + public static final RegxPatn_cls_ioMatch All = RegxPatn_cls_ioMatch_.parse(Wildcard, false); public static final String ImpossiblePath = "<>"; //"<>" should be an impossible url; NOTE: do not pick * or | or : or \ - public static final RegxPatn_cls_ioMatch None = RegxPatn_cls_ioMatch_.parse_(RegxPatn_cls_ioMatch_.ImpossiblePath, false); - public static RegxPatn_cls_ioMatch cast_(Object obj) {try {return (RegxPatn_cls_ioMatch)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, RegxPatn_cls_ioMatch.class, obj);}} - public static RegxPatn_cls_ioMatch parse_(String raw, boolean caseSensitive) { + public static final RegxPatn_cls_ioMatch None = RegxPatn_cls_ioMatch_.parse(RegxPatn_cls_ioMatch_.ImpossiblePath, false); + public static RegxPatn_cls_ioMatch cast(Object obj) {try {return (RegxPatn_cls_ioMatch)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, RegxPatn_cls_ioMatch.class, obj);}} + public static RegxPatn_cls_ioMatch parse(String raw, boolean caseSensitive) { String compiled = RegxPatn_cls_ioMatch_.Compile(raw); return new RegxPatn_cls_ioMatch(raw, compiled, caseSensitive); } diff --git a/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_tst.java b/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_tst.java index b2f2d1ee4..0e861543b 100644 --- a/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_tst.java +++ b/100_core/src_150_text/gplx/texts/RegxPatn_cls_ioMatch_tst.java @@ -51,7 +51,7 @@ public class RegxPatn_cls_ioMatch_tst { tst_Matches("file.cs", "File.cS", true); // pass: diff case } void tst_Matches(String regx, String raw, boolean expd) { - RegxPatn_cls_ioMatch pattern = RegxPatn_cls_ioMatch_.parse_(regx, false); + RegxPatn_cls_ioMatch pattern = RegxPatn_cls_ioMatch_.parse(regx, false); boolean actl = pattern.Matches(raw); Tfds.Eq(expd, actl); } diff --git a/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_.java b/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_.java index c43a0e697..62d17faa2 100644 --- a/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_.java +++ b/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.texts; import gplx.*; import gplx.core.strings.*; import gplx.core.regxs.*; public class RegxPatn_cls_like_ { - public static RegxPatn_cls_like parse_(String regxRaw, char escape) { + public static RegxPatn_cls_like parse(String regxRaw, char escape) { String regx = Compile(regxRaw, escape); return new RegxPatn_cls_like(regxRaw, regx, escape); } diff --git a/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_tst.java b/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_tst.java index 791b45cb0..a21aa590a 100644 --- a/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_tst.java +++ b/100_core/src_150_text/gplx/texts/RegxPatn_cls_like_tst.java @@ -74,12 +74,12 @@ public class RegxPatn_cls_like_tst { } void tst_Match(String raw, String regx, boolean expd) {tst_Match(raw, regx, RegxPatn_cls_like.EscapeDefault, expd);} void tst_Match(String raw, String regx, char escape, boolean expd) { - RegxPatn_cls_like like = RegxPatn_cls_like_.parse_(regx, escape); + RegxPatn_cls_like like = RegxPatn_cls_like_.parse(regx, escape); boolean actl = like.Matches(raw); Tfds.Eq(expd, actl, "raw={0} regx={1} expd={2}", raw, regx, expd); } void tst_EscapeRegxChar(char regexChar) { - RegxPatn_cls_like like = RegxPatn_cls_like_.parse_(Object_.Xto_str_strict_or_empty(regexChar), '|'); + RegxPatn_cls_like like = RegxPatn_cls_like_.parse(Object_.Xto_str_strict_or_empty(regexChar), '|'); Tfds.Eq(true, like.Matches(Object_.Xto_str_strict_or_empty(regexChar))); Tfds.Eq(false, like.Matches("a")); // catches errors for improper escaping of wildcard } diff --git a/100_core/src_150_text/gplx/texts/StringTableCol.java b/100_core/src_150_text/gplx/texts/StringTableCol.java index 7f2e16a9d..184990856 100644 --- a/100_core/src_150_text/gplx/texts/StringTableCol.java +++ b/100_core/src_150_text/gplx/texts/StringTableCol.java @@ -18,8 +18,8 @@ along with this program. If not, see . package gplx.texts; import gplx.*; public class StringTableCol { public StringTableColAlign Halign() {return halign;} public StringTableCol Halign_(StringTableColAlign val) {halign = val; return this;} StringTableColAlign halign = StringTableColAlign.Left; - public int LengthMax() {return lengthMax;} int lengthMax = Int_.MinValue; - public int LengthMin() {return lengthMin;} int lengthMin = Int_.MaxValue; + public int LengthMax() {return lengthMax;} int lengthMax = Int_.Min_value; + public int LengthMin() {return lengthMin;} int lengthMin = Int_.Max_value; public void AdjustFor(String s) { int length = String_.Len(s); if (length > lengthMax) lengthMax = length; @@ -35,5 +35,5 @@ public class StringTableCol { } public static StringTableCol new_() {return new StringTableCol();} StringTableCol() {} public static StringTableCol as_(Object obj) {return obj instanceof StringTableCol ? (StringTableCol)obj : null;} - public static StringTableCol cast_(Object obj) {try {return (StringTableCol)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, StringTableCol.class, obj);}} + public static StringTableCol cast(Object obj) {try {return (StringTableCol)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, StringTableCol.class, obj);}} } diff --git a/100_core/src_160_hash/gplx/security/HashAlgo_.java b/100_core/src_160_hash/gplx/security/HashAlgo_.java index 51dc4960d..3ce82e346 100644 --- a/100_core/src_160_hash/gplx/security/HashAlgo_.java +++ b/100_core/src_160_hash/gplx/security/HashAlgo_.java @@ -27,7 +27,7 @@ public class HashAlgo_ { public static final HashAlgo Md5 = HashAlgo_md5.new_(); public static final HashAlgo Tth192 = HashAlgo_tth192.new_(); public static HashAlgo as_(Object obj) {return obj instanceof HashAlgo ? (HashAlgo)obj : null;} - public static HashAlgo cast_(Object obj) {if (obj == null) return null; HashAlgo rv = as_(obj); if (rv == null) throw Err_.new_type_mismatch(HashAlgo.class, obj); return rv;} + public static HashAlgo cast(Object obj) {if (obj == null) return null; HashAlgo rv = as_(obj); if (rv == null) throw Err_.new_type_mismatch(HashAlgo.class, obj); return rv;} public static HashAlgo fetch_(String key) { if (key == HashAlgo_md5.KEY) return Md5; else if (key == HashAlgo_sha1.KEY) return Sha1; diff --git a/100_core/src_200_io/gplx/ios/IoEngine_system.java b/100_core/src_200_io/gplx/ios/IoEngine_system.java index 72cbaa8f1..c41f0d1d3 100644 --- a/100_core/src_200_io/gplx/ios/IoEngine_system.java +++ b/100_core/src_200_io/gplx/ios/IoEngine_system.java @@ -407,7 +407,7 @@ public class IoEngine_system extends IoEngine_base { src_conn = (HttpURLConnection)src_url.openConnection(); // src_conn.setReadTimeout(5000); // do not set; if file does not exist, will wait 5 seconds before timing out; want to fail immediately String user_agent = xrg.User_agent(); if (user_agent != null) src_conn.setRequestProperty("User-Agent", user_agent); - long content_length = Long_.parse_or_(src_conn.getHeaderField("Content-Length"), IoItmFil.Size_invalid_int); + long content_length = Long_.parse_or(src_conn.getHeaderField("Content-Length"), IoItmFil.Size_invalid_int); xrg.Src_content_length_(content_length); if (xrg.Src_last_modified_query()) // NOTE: only files will have last modified (api calls will not); if no last_modified, then src_conn will throw get nullRef; avoid nullRef xrg.Src_last_modified_(DateAdp_.unixtime_lcl_ms_(src_conn.getLastModified())); @@ -558,7 +558,7 @@ class Io_stream_rdr_http implements Io_stream_rdr { String user_agent = xrg.User_agent(); if (user_agent != null) src_conn.setRequestProperty("User-Agent", user_agent); // NOTE: must be set right after openConnection // src_conn.setReadTimeout(5000); // do not set; if file does not exist, will wait 5 seconds before timing out; want to fail immediately - long content_length = Long_.parse_or_(src_conn.getHeaderField("Content-Length"), IoItmFil.Size_invalid_int); + long content_length = Long_.parse_or(src_conn.getHeaderField("Content-Length"), IoItmFil.Size_invalid_int); xrg.Src_content_length_(content_length); this.len = content_length; if (xrg.Src_last_modified_query()) // NOTE: only files will have last modified (api calls will not); if no last_modified, then src_conn will throw get nullRef; avoid nullRef diff --git a/100_core/src_200_io/gplx/ios/IoEngine_xrg_queryDir.java b/100_core/src_200_io/gplx/ios/IoEngine_xrg_queryDir.java index 25df1a9da..d6ac54e0c 100644 --- a/100_core/src_200_io/gplx/ios/IoEngine_xrg_queryDir.java +++ b/100_core/src_200_io/gplx/ios/IoEngine_xrg_queryDir.java @@ -32,7 +32,7 @@ public class IoEngine_xrg_queryDir { public Console_adp UsrDlg() {return usrDlg;} public IoEngine_xrg_queryDir UsrDlg_(Console_adp val) {usrDlg = val; return this;} Console_adp usrDlg = Console_adp_.Noop; public IoEngine_xrg_queryDir FilPath_(String val) { - Criteria_ioMatch crt = Criteria_ioMatch.parse_(true, val, url.Info().CaseSensitive()); + Criteria_ioMatch crt = Criteria_ioMatch.parse(true, val, url.Info().CaseSensitive()); filCrt = Criteria_fld.new_(IoItm_base_.Prop_Path, crt); return this; } diff --git a/100_core/src_200_io/gplx/ios/IoItmClassXtn.java b/100_core/src_200_io/gplx/ios/IoItmClassXtn.java index d20f299b8..379917c6e 100644 --- a/100_core/src_200_io/gplx/ios/IoItmClassXtn.java +++ b/100_core/src_200_io/gplx/ios/IoItmClassXtn.java @@ -27,6 +27,6 @@ public class IoItmClassXtn extends ClassXtn_base implements ClassXtn { else if (String_.Eq(rawLower, "fil")) return IoItmFil.Type_Fil; else throw Err_.new_unhandled(raw); } - @Override public Object XtoDb(Object obj) {return Int_.cast_(obj);} + @Override public Object XtoDb(Object obj) {return Int_.cast(obj);} public static final IoItmClassXtn _ = new IoItmClassXtn(); IoItmClassXtn() {} } diff --git a/100_core/src_200_io/gplx/ios/Io_size_.java b/100_core/src_200_io/gplx/ios/Io_size_.java index 79186b104..8d3693ac0 100644 --- a/100_core/src_200_io/gplx/ios/Io_size_.java +++ b/100_core/src_200_io/gplx/ios/Io_size_.java @@ -35,13 +35,13 @@ public class Io_size_ { String[] unit = Io_size_.Units[exp_1024]; return val_as_decimal.To_str(val_fmt) + " " + String_.PadBgn(unit[0], 2, unit_pad); } - public static long parse_or_(String raw, long or) { + public static long parse_or(String raw, long or) { if (raw == null || raw == String_.Empty) return or; String[] terms = String_.Split(raw, " "); int termsLen = Array_.Len(terms); if (termsLen > 2) return or; Decimal_adp val = null; - try {val = Decimal_adp_.parse_(terms[0]);} catch (Exception exc) {Err_.Noop(exc); return or;} + try {val = Decimal_adp_.parse(terms[0]);} catch (Exception exc) {Err_.Noop(exc); return or;} int unitPow = 0; if (termsLen > 1) { @@ -88,14 +88,14 @@ public class Io_size_ { public static int Load_int_(GfoMsg m) {return (int)Load_long_(m);} public static long Load_long_(GfoMsg m) { String v = m.ReadStr("v"); - long rv = parse_or_(v, Long_.MinValue); if (rv == Long_.MinValue) throw Err_.new_wo_type("invalid val", "val", v); + long rv = parse_or(v, Long_.Min_value); if (rv == Long_.Min_value) throw Err_.new_wo_type("invalid val", "val", v); return rv; } public static String To_str_mb(long v) {return Long_.Xto_str(v / Io_mgr.Len_mb_long);} public static long To_long_by_int_mb(int v) {return (long)v * Io_mgr.Len_mb_long;} public static long To_long_by_msg_mb(GfoMsg m, long cur) { - long val = m.ReadLongOr("v", Int_.MinValue); - return val == Int_.MinValue ? cur : (val * Io_mgr.Len_mb_long); + long val = m.ReadLongOr("v", Int_.Min_value); + return val == Int_.Min_value ? cur : (val * Io_mgr.Len_mb_long); } } class Io_size_fmtr_arg implements Bry_fmtr_arg { diff --git a/100_core/src_200_io/gplx/ios/Io_size__tst.java b/100_core/src_200_io/gplx/ios/Io_size__tst.java index 510027753..127f86ec1 100644 --- a/100_core/src_200_io/gplx/ios/Io_size__tst.java +++ b/100_core/src_200_io/gplx/ios/Io_size__tst.java @@ -58,12 +58,12 @@ public class Io_size__tst { } } class Io_size__fxt { - public void Test_XtoLong(String raw, long expd) {Tfds.Eq(expd, Io_size_.parse_or_(raw, Long_.MinValue));} + public void Test_XtoLong(String raw, long expd) {Tfds.Eq(expd, Io_size_.parse_or(raw, Long_.Min_value));} public void Test_XtoLongFail(String raw) { - long val = Io_size_.parse_or_(raw, Long_.MinValue); - if (val != Long_.MinValue) Tfds.Fail("expd parse failure; raw=" + raw); + long val = Io_size_.parse_or(raw, Long_.Min_value); + if (val != Long_.Min_value) Tfds.Fail("expd parse failure; raw=" + raw); } - public void Test_Equals(String lhs, String rhs) {Tfds.Eq(Io_size_.parse_or_(lhs, Long_.MinValue), Io_size_.parse_or_(rhs, Long_.MinValue));} + public void Test_Equals(String lhs, String rhs) {Tfds.Eq(Io_size_.parse_or(lhs, Long_.Min_value), Io_size_.parse_or(rhs, Long_.Min_value));} public void Test_XtoStr(long val, String expd) {Tfds.Eq(expd, Io_size_.To_str(val));} public void Test_Xto_str(long val, int exp_1024, String val_fmt, String unit_pad, boolean round_0_to_1, String expd) {Tfds.Eq(expd, Io_size_.To_str(val, exp_1024, val_fmt, unit_pad, round_0_to_1));} } diff --git a/100_core/src_200_io/gplx/ios/Io_stream_rdr_tst.java b/100_core/src_200_io/gplx/ios/Io_stream_rdr_tst.java index 4d0db151f..b72d27fc3 100644 --- a/100_core/src_200_io/gplx/ios/Io_stream_rdr_tst.java +++ b/100_core/src_200_io/gplx/ios/Io_stream_rdr_tst.java @@ -34,9 +34,9 @@ class Io_stream_rdr_fxt { private java.io.InputStream stream; private int stream_bry_len; public void Clear() { - expd_bytes_read = Int_.MinValue; + expd_bytes_read = Int_.Min_value; } - public Io_stream_rdr_fxt Expd_bytes_read(int v) {expd_bytes_read = v; return this;} private int expd_bytes_read = Int_.MinValue; + public Io_stream_rdr_fxt Expd_bytes_read(int v) {expd_bytes_read = v; return this;} private int expd_bytes_read = Int_.Min_value; public Io_stream_rdr_fxt Init_stream(String v) { byte[] stream_bry = Bry_.new_a7(v); stream_bry_len = stream_bry.length; diff --git a/100_core/src_210_env/gplx/Type_adp_.java b/100_core/src_210_env/gplx/Type_adp_.java index e283d91d2..80d7f7d8e 100644 --- a/100_core/src_210_env/gplx/Type_adp_.java +++ b/100_core/src_210_env/gplx/Type_adp_.java @@ -42,9 +42,12 @@ public class Type_adp_ { public static String FullNameOf_type(Class type) {return type.getCanonicalName();} public static String NameOf_type(Class type) {return type.getName();} public static String NameOf_obj(Object obj) {return obj == null ? String_.Null_mark : obj.getClass().getName();} - public static int To_tid(Object o) { + public static int To_tid_obj(Object o) { if (o == null) return Tid__null; Class type = o.getClass(); + return To_tid_type(type); + } + public static int To_tid_type(Class type) { if (Type_adp_.Eq(type, Int_.Cls_ref_type)) return Tid__int; else if (Type_adp_.Eq(type, String_.Cls_ref_type)) return Tid__str; else if (Type_adp_.Eq(type, byte[].class)) return Tid__bry; @@ -55,6 +58,7 @@ public class Type_adp_ { else if (Type_adp_.Eq(type, Decimal_adp_.Cls_ref_type)) return Tid__decimal; else if (Type_adp_.Eq(type, DateAdp_.Cls_ref_type)) return Tid__date; else if (Type_adp_.Eq(type, Float_.Cls_ref_type)) return Tid__float; + else if (Type_adp_.Eq(type, Short_.Cls_ref_type)) return Tid__short; else if (Type_adp_.Eq(type, Char_.Cls_ref_type)) return Tid__char; else return Tid__obj; } @@ -63,14 +67,15 @@ public class Type_adp_ { , Tid__null = 1 , Tid__bool = 2 , Tid__byte = 3 - , Tid__int = 4 - , Tid__long = 5 - , Tid__float = 6 - , Tid__double = 7 - , Tid__char = 8 - , Tid__str = 9 - , Tid__date = 10 - , Tid__decimal = 11 - , Tid__bry = 12 + , Tid__short = 4 + , Tid__int = 5 + , Tid__long = 6 + , Tid__float = 7 + , Tid__double = 8 + , Tid__char = 9 + , Tid__str = 10 + , Tid__bry = 11 + , Tid__date = 12 + , Tid__decimal = 13 ; } diff --git a/100_core/src_300_classXtn/gplx/BoolClassXtn.java b/100_core/src_300_classXtn/gplx/BoolClassXtn.java index 3ae6e25f3..824144e54 100644 --- a/100_core/src_300_classXtn/gplx/BoolClassXtn.java +++ b/100_core/src_300_classXtn/gplx/BoolClassXtn.java @@ -21,7 +21,7 @@ public class BoolClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} @Override public Class UnderClass() {return boolean.class;} public Object DefaultValue() {return false;} - public boolean Eq(Object lhs, Object rhs) {try {return Bool_.cast_(lhs) == Bool_.cast_(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} + public boolean Eq(Object lhs, Object rhs) {try {return Bool_.cast(lhs) == Bool_.cast(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} @Override public Object ParseOrNull(String raw) { if ( String_.Eq(raw, "true") || String_.Eq(raw, "True") // needed for Store_Wtr() {boolVal.toString();} diff --git a/100_core/src_300_classXtn/gplx/ByteClassXtn.java b/100_core/src_300_classXtn/gplx/ByteClassXtn.java index e3d48b4fe..1fd12de27 100644 --- a/100_core/src_300_classXtn/gplx/ByteClassXtn.java +++ b/100_core/src_300_classXtn/gplx/ByteClassXtn.java @@ -21,8 +21,8 @@ public class ByteClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} @Override public Class UnderClass() {return byte.class;} public Object DefaultValue() {return 0;} - public boolean Eq(Object lhs, Object rhs) {try {return Byte_.cast_(lhs) == Byte_.cast_(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} - @Override public Object ParseOrNull(String raw) {return raw == null ? (Object)null : Byte_.parse_(raw);} - @Override public Object XtoDb(Object obj) {return Byte_.cast_(obj);} + public boolean Eq(Object lhs, Object rhs) {try {return Byte_.cast(lhs) == Byte_.cast(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} + @Override public Object ParseOrNull(String raw) {return raw == null ? (Object)null : Byte_.parse(raw);} + @Override public Object XtoDb(Object obj) {return Byte_.cast(obj);} public static final ByteClassXtn _ = new ByteClassXtn(); ByteClassXtn() {} // added to ClassXtnPool by default } \ No newline at end of file diff --git a/100_core/src_300_classXtn/gplx/DateAdpClassXtn.java b/100_core/src_300_classXtn/gplx/DateAdpClassXtn.java index dfadd0e85..ad23d2019 100644 --- a/100_core/src_300_classXtn/gplx/DateAdpClassXtn.java +++ b/100_core/src_300_classXtn/gplx/DateAdpClassXtn.java @@ -18,11 +18,11 @@ along with this program. If not, see . package gplx; public class DateAdpClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "datetime"; - public boolean Eq(Object lhs, Object rhs) {try {return DateAdp_.cast_(lhs).Eq(DateAdp_.cast_(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} + public boolean Eq(Object lhs, Object rhs) {try {return DateAdp_.cast(lhs).Eq(DateAdp_.cast(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} @Override public Class UnderClass() {return DateAdp.class;} public Object DefaultValue() {return DateAdp_.MinValue;} @Override public Object ParseOrNull(String raw) {return DateAdp_.parse_gplx(raw);} - @Override public Object XtoDb(Object obj) {return DateAdp_.cast_(obj).XtoStr_gplx_long();} - @Override public String XtoUi(Object obj, String fmt) {return DateAdp_.cast_(obj).XtoStr_fmt(fmt);} + @Override public Object XtoDb(Object obj) {return DateAdp_.cast(obj).XtoStr_gplx_long();} + @Override public String XtoUi(Object obj, String fmt) {return DateAdp_.cast(obj).XtoStr_fmt(fmt);} public static final DateAdpClassXtn _ = new DateAdpClassXtn(); DateAdpClassXtn() {} // added to ClassXtnPool by default } diff --git a/100_core/src_300_classXtn/gplx/DecimalAdpClassXtn.java b/100_core/src_300_classXtn/gplx/DecimalAdpClassXtn.java index aebc3ad0b..602fd9657 100644 --- a/100_core/src_300_classXtn/gplx/DecimalAdpClassXtn.java +++ b/100_core/src_300_classXtn/gplx/DecimalAdpClassXtn.java @@ -20,8 +20,8 @@ public class DecimalAdpClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "decimal"; // current dsv files reference "decimal" @Override public Class UnderClass() {return Decimal_adp.class;} public Object DefaultValue() {return 0;} - public boolean Eq(Object lhs, Object rhs) {try {return Decimal_adp_.cast_(lhs).Eq(Decimal_adp_.cast_(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} - @Override public Object ParseOrNull(String raw) {return Decimal_adp_.parse_(raw);} - @Override public String XtoUi(Object obj, String fmt) {return Decimal_adp_.cast_(obj).To_str();} + public boolean Eq(Object lhs, Object rhs) {try {return Decimal_adp_.cast(lhs).Eq(Decimal_adp_.cast(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} + @Override public Object ParseOrNull(String raw) {return Decimal_adp_.parse(raw);} + @Override public String XtoUi(Object obj, String fmt) {return Decimal_adp_.cast(obj).To_str();} public static final DecimalAdpClassXtn _ = new DecimalAdpClassXtn(); DecimalAdpClassXtn() {} // added to ClassXtnPool by default } diff --git a/100_core/src_300_classXtn/gplx/DoubleClassXtn.java b/100_core/src_300_classXtn/gplx/DoubleClassXtn.java index 0bcc42366..92f48cd31 100644 --- a/100_core/src_300_classXtn/gplx/DoubleClassXtn.java +++ b/100_core/src_300_classXtn/gplx/DoubleClassXtn.java @@ -20,7 +20,7 @@ public class DoubleClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "double"; @Override public Class UnderClass() {return double.class;} public Object DefaultValue() {return 0;} - public boolean Eq(Object lhs, Object rhs) {try {return Double_.cast_(lhs) == Double_.cast_(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} - @Override public Object ParseOrNull(String raw) {return Double_.parse_(raw);} + public boolean Eq(Object lhs, Object rhs) {try {return Double_.cast(lhs) == Double_.cast(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} + @Override public Object ParseOrNull(String raw) {return Double_.parse(raw);} public static final DoubleClassXtn _ = new DoubleClassXtn(); DoubleClassXtn() {} // added to ClassXtnPool by default } \ No newline at end of file diff --git a/100_core/src_300_classXtn/gplx/FloatClassXtn.java b/100_core/src_300_classXtn/gplx/FloatClassXtn.java index 094b193e6..a8716b30c 100644 --- a/100_core/src_300_classXtn/gplx/FloatClassXtn.java +++ b/100_core/src_300_classXtn/gplx/FloatClassXtn.java @@ -20,7 +20,7 @@ public class FloatClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "float"; @Override public Class UnderClass() {return float.class;} public Object DefaultValue() {return 0;} - public boolean Eq(Object lhs, Object rhs) {try {return Float_.cast_(lhs) == Float_.cast_(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} - @Override public Object ParseOrNull(String raw) {return Float_.parse_(raw);} + public boolean Eq(Object lhs, Object rhs) {try {return Float_.cast(lhs) == Float_.cast(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} + @Override public Object ParseOrNull(String raw) {return Float_.parse(raw);} public static final FloatClassXtn _ = new FloatClassXtn(); FloatClassXtn() {} // added to ClassXtnPool by default } \ No newline at end of file diff --git a/100_core/src_300_classXtn/gplx/IntClassXtn.java b/100_core/src_300_classXtn/gplx/IntClassXtn.java index 565241c55..7e7a151cd 100644 --- a/100_core/src_300_classXtn/gplx/IntClassXtn.java +++ b/100_core/src_300_classXtn/gplx/IntClassXtn.java @@ -20,9 +20,9 @@ public class IntClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "int"; @Override public Class UnderClass() {return Integer.class;} public Object DefaultValue() {return 0;} - @Override public Object ParseOrNull(String raw) {return raw == null ? (Object)null : Int_.parse_(raw);} - public boolean Eq(Object lhs, Object rhs) {try {return Int_.cast_(lhs) == Int_.cast_(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} - @Override public Object XtoDb(Object obj) {return Int_.cast_(obj);} // necessary for enums + @Override public Object ParseOrNull(String raw) {return raw == null ? (Object)null : Int_.parse(raw);} + public boolean Eq(Object lhs, Object rhs) {try {return Int_.cast(lhs) == Int_.cast(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} + @Override public Object XtoDb(Object obj) {return Int_.cast(obj);} // necessary for enums public static final IntClassXtn _ = new IntClassXtn(); IntClassXtn() {} // added to ClassXtnPool by default } diff --git a/100_core/src_300_classXtn/gplx/IoUrlClassXtn.java b/100_core/src_300_classXtn/gplx/IoUrlClassXtn.java index f5fd36340..267c14eaa 100644 --- a/100_core/src_300_classXtn/gplx/IoUrlClassXtn.java +++ b/100_core/src_300_classXtn/gplx/IoUrlClassXtn.java @@ -21,9 +21,9 @@ public class IoUrlClassXtn extends ClassXtn_base implements ClassXtn { @Override public Class UnderClass() {return Io_url.class;} public Object DefaultValue() {return Io_url_.Empty;} @Override public Object ParseOrNull(String raw) {return Io_url_.new_any_(raw);} - @Override public Object XtoDb(Object obj) {return Io_url_.cast_(obj).Raw();} - @Override public String XtoUi(Object obj, String fmt) {return Io_url_.cast_(obj).Raw();} + @Override public Object XtoDb(Object obj) {return Io_url_.cast(obj).Raw();} + @Override public String XtoUi(Object obj, String fmt) {return Io_url_.cast(obj).Raw();} @Override public boolean MatchesClass(Object obj) {return Io_url_.as_(obj) != null;} - public boolean Eq(Object lhs, Object rhs) {try {return Io_url_.cast_(lhs).Eq(Io_url_.cast_(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} + public boolean Eq(Object lhs, Object rhs) {try {return Io_url_.cast(lhs).Eq(Io_url_.cast(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} public static final IoUrlClassXtn _ = new IoUrlClassXtn(); IoUrlClassXtn() {} // added to ClassXtnPool by default } diff --git a/100_core/src_300_classXtn/gplx/LongClassXtn.java b/100_core/src_300_classXtn/gplx/LongClassXtn.java index 5981cd311..54822f534 100644 --- a/100_core/src_300_classXtn/gplx/LongClassXtn.java +++ b/100_core/src_300_classXtn/gplx/LongClassXtn.java @@ -20,8 +20,8 @@ public class LongClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "long"; @Override public Class UnderClass() {return long.class;} public Object DefaultValue() {return 0;} - public boolean Eq(Object lhs, Object rhs) {try {return Long_.cast_(lhs) == Long_.cast_(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} - @Override public Object ParseOrNull(String raw) {return raw == null ? (Object)null : Long_.parse_(raw);} - @Override public Object XtoDb(Object obj) {return Long_.cast_(obj);} // necessary for enums + public boolean Eq(Object lhs, Object rhs) {try {return Long_.cast(lhs) == Long_.cast(rhs);} catch (Exception e) {Err_.Noop(e); return false;}} + @Override public Object ParseOrNull(String raw) {return raw == null ? (Object)null : Long_.parse(raw);} + @Override public Object XtoDb(Object obj) {return Long_.cast(obj);} // necessary for enums public static final LongClassXtn _ = new LongClassXtn(); LongClassXtn() {} // added to ClassXtnPool by default } \ No newline at end of file diff --git a/100_core/src_300_classXtn/gplx/StringClassXtn.java b/100_core/src_300_classXtn/gplx/StringClassXtn.java index 03e9aca95..78434dd44 100644 --- a/100_core/src_300_classXtn/gplx/StringClassXtn.java +++ b/100_core/src_300_classXtn/gplx/StringClassXtn.java @@ -23,6 +23,6 @@ public class StringClassXtn extends ClassXtn_base implements ClassXtn { public Object DefaultValue() {return "";} @Override public Object ParseOrNull(String raw) {return raw;} @Override public String XtoUi(Object obj, String fmt) {return String_.as_(obj);} - public boolean Eq(Object lhs, Object rhs) {try {return String_.Eq(String_.cast_(lhs), String_.cast_(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} + public boolean Eq(Object lhs, Object rhs) {try {return String_.Eq(String_.cast(lhs), String_.cast(rhs));} catch (Exception e) {Err_.Noop(e); return false;}} public static final StringClassXtn _ = new StringClassXtn(); StringClassXtn() {} // added to ClassXtnPool by default } \ No newline at end of file diff --git a/100_core/src_300_classXtn/gplx/TimeSpanAdpClassXtn.java b/100_core/src_300_classXtn/gplx/TimeSpanAdpClassXtn.java index f877a033b..355c2cddf 100644 --- a/100_core/src_300_classXtn/gplx/TimeSpanAdpClassXtn.java +++ b/100_core/src_300_classXtn/gplx/TimeSpanAdpClassXtn.java @@ -20,9 +20,9 @@ public class TimeSpanAdpClassXtn extends ClassXtn_base implements ClassXtn { public String Key() {return Key_const;} public static final String Key_const = "timeSpan"; @Override public Class UnderClass() {return TimeSpanAdp.class;} 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).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;}} + @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).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 } \ No newline at end of file diff --git a/100_core/src_310_gfoNde/gplx/GfoFldList_.java b/100_core/src_310_gfoNde/gplx/GfoFldList_.java index 9535ef31a..82632ffc8 100644 --- a/100_core/src_310_gfoNde/gplx/GfoFldList_.java +++ b/100_core/src_310_gfoNde/gplx/GfoFldList_.java @@ -32,7 +32,7 @@ class GfoFldList_base implements GfoFldList { public boolean Has(String key) {return hash.Has(key);} public int Idx_of(String key) { Object rv = idxs.Get_by(key); - return rv == null ? List_adp_.NotFound : Int_.cast_(rv); + return rv == null ? List_adp_.NotFound : Int_.cast(rv); } public GfoFld Get_at(int i) {return (GfoFld)hash.Get_at(i);} public GfoFld FetchOrNull(String key) {return (GfoFld)hash.Get_by(key);} diff --git a/100_core/src_311_gfoObj/gplx/GfoInvkAble_.java b/100_core/src_311_gfoObj/gplx/GfoInvkAble_.java index 801877f92..df2f24112 100644 --- a/100_core/src_311_gfoObj/gplx/GfoInvkAble_.java +++ b/100_core/src_311_gfoObj/gplx/GfoInvkAble_.java @@ -19,7 +19,7 @@ package gplx; import gplx.core.primitives.*; public class GfoInvkAble_ { public static GfoInvkAble as_(Object obj) {return obj instanceof GfoInvkAble ? (GfoInvkAble)obj : null;} - public static GfoInvkAble cast_(Object obj) {try {return (GfoInvkAble)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfoInvkAble.class, obj);}} + public static GfoInvkAble cast(Object obj) {try {return (GfoInvkAble)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfoInvkAble.class, obj);}} public static final String_obj_val Rv_unhandled = String_obj_val.new_("Unhandled"), Rv_handled = String_obj_val.new_("Handled"), Rv_host = String_obj_val.new_("Host") , Rv_cancel = String_obj_val.new_("Cancel"), Rv_error = String_obj_val.new_("Error"); diff --git a/100_core/src_311_gfoObj/gplx/GfoMsg_.java b/100_core/src_311_gfoObj/gplx/GfoMsg_.java index 34f09fd3b..8021515ba 100644 --- a/100_core/src_311_gfoObj/gplx/GfoMsg_.java +++ b/100_core/src_311_gfoObj/gplx/GfoMsg_.java @@ -123,45 +123,45 @@ class GfoMsg_base implements GfoMsg { return this; } } - args.Add(new KeyVal(KeyVal_.Key_tid_str, k, v)); + args.Add(KeyVal_.new_(k, v)); return this; } public GfoMsg Parse_(boolean v) {parse = v; return this;} public GfoMsg Add(String k, Object v) { if (args == null) args = List_adp_.new_(); - args.Add(new KeyVal(KeyVal_.Key_tid_str, k, v)); + args.Add(KeyVal_.new_(k, v)); return this; } - public boolean ReadBool(String k) {Object rv = ReadOr(k,false); if (rv == Nil) ThrowNotFound(k); return parse ? Yn.parse_or_((String)rv, false) : Bool_.cast_(rv);} - public int ReadInt(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Int_.parse_((String)rv) : Int_.cast_(rv);} - public byte ReadByte(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Byte_.parse_((String)rv) : Byte_.cast_(rv);} - public long ReadLong(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Long_.parse_((String)rv) : Long_.cast_(rv);} - public float ReadFloat(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Float_.parse_((String)rv) : Float_.cast_(rv);} - public double ReadDouble(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Double_.parse_((String)rv) : Double_.cast_(rv);} - public Decimal_adp ReadDecimal(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Decimal_adp_.parse_((String)rv) : Decimal_adp_.cast_(rv);} + public boolean ReadBool(String k) {Object rv = ReadOr(k,false); if (rv == Nil) ThrowNotFound(k); return parse ? Yn.parse_or((String)rv, false) : Bool_.cast(rv);} + public int ReadInt(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Int_.parse((String)rv) : Int_.cast(rv);} + public byte ReadByte(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Byte_.parse((String)rv) : Byte_.cast(rv);} + public long ReadLong(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Long_.parse((String)rv) : Long_.cast(rv);} + public float ReadFloat(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Float_.parse((String)rv) : Float_.cast(rv);} + public double ReadDouble(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Double_.parse((String)rv) : Double_.cast(rv);} + public Decimal_adp ReadDecimal(String k) {Object rv = ReadOr(k, 0) ; if (rv == Nil) ThrowNotFound(k); return parse ? Decimal_adp_.parse((String)rv) : Decimal_adp_.cast(rv);} public String ReadStr(String k) {Object rv = ReadOr(k, null); if (rv == Nil) ThrowNotFound(k); return (String)rv;} - public DateAdp ReadDate(String k) {Object rv = ReadOr(k, null); if (rv == Nil) ThrowNotFound(k); return parse ? DateAdp_.parse_gplx((String)rv) : DateAdp_.cast_(rv);} - public Io_url ReadIoUrl(String k) {Object rv = ReadOr(k, null); if (rv == Nil) ThrowNotFound(k); return parse ? Io_url_.new_any_((String)rv) : Io_url_.cast_(rv);} + public DateAdp ReadDate(String k) {Object rv = ReadOr(k, null); if (rv == Nil) ThrowNotFound(k); return parse ? DateAdp_.parse_gplx((String)rv) : DateAdp_.cast(rv);} + public Io_url ReadIoUrl(String k) {Object rv = ReadOr(k, null); if (rv == Nil) ThrowNotFound(k); return parse ? Io_url_.new_any_((String)rv) : Io_url_.cast(rv);} public Object CastObj(String k) {Object rv = ReadOr(k, null); if (rv == Nil) ThrowNotFound(k); return rv;} - public boolean ReadBoolOr(String k, boolean or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Yn.parse_or_((String)rv, or) : Bool_.cast_(rv);} - public int ReadIntOr(String k, int or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Int_.parse_((String)rv) : Int_.cast_(rv);} - public long ReadLongOr(String k, long or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Long_.parse_((String)rv) : Long_.cast_(rv);} - public float ReadFloatOr(String k, float or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Float_.parse_((String)rv) : Float_.cast_(rv);} - public double ReadDoubleOr(String k,double or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Double_.parse_((String)rv) : Double_.cast_(rv);} - public Decimal_adp ReadDecimalOr(String k,Decimal_adp or) {Object rv = ReadOr(k, or); if (rv == Nil) return or ; return parse ? Decimal_adp_.parse_((String)rv) : Decimal_adp_.cast_(rv);} + public boolean ReadBoolOr(String k, boolean or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Yn.parse_or((String)rv, or) : Bool_.cast(rv);} + public int ReadIntOr(String k, int or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Int_.parse((String)rv) : Int_.cast(rv);} + public long ReadLongOr(String k, long or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Long_.parse((String)rv) : Long_.cast(rv);} + public float ReadFloatOr(String k, float or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Float_.parse((String)rv) : Float_.cast(rv);} + public double ReadDoubleOr(String k,double or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Double_.parse((String)rv) : Double_.cast(rv);} + public Decimal_adp ReadDecimalOr(String k,Decimal_adp or) {Object rv = ReadOr(k, or); if (rv == Nil) return or ; return parse ? Decimal_adp_.parse((String)rv) : Decimal_adp_.cast(rv);} public String ReadStrOr(String k, String or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return (String)rv;} - public DateAdp ReadDateOr(String k, DateAdp or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? DateAdp_.parse_gplx((String)rv) : DateAdp_.cast_(rv);} - public Io_url ReadIoUrlOr(String k, Io_url or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Io_url_.new_any_((String)rv) : Io_url_.cast_(rv);} - public boolean ReadBoolOrFalse(String k) {Object rv = ReadOr(k,false); if (rv == Nil) return false ; return parse ? Yn.parse_or_((String)rv, false) : Bool_.cast_(rv);} - public boolean ReadBoolOrTrue(String k) {Object rv = ReadOr(k, true); if (rv == Nil) return true ; return parse ? Yn.parse_or_((String)rv, true) : Bool_.cast_(rv);} - public boolean ReadYnOrY(String k) {Object rv = ReadOr(k, true); if (rv == Nil) return true ; return parse ? Yn.parse_or_((String)rv, true) : Bool_.cast_(rv);} - public boolean ReadYn(String k) {Object rv = ReadOr(k,false); if (rv == Nil) ThrowNotFound(k); return parse ? Yn.parse_or_((String)rv, false) : Yn.coerce_(rv);} + public DateAdp ReadDateOr(String k, DateAdp or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? DateAdp_.parse_gplx((String)rv) : DateAdp_.cast(rv);} + public Io_url ReadIoUrlOr(String k, Io_url or) {Object rv = ReadOr(k, or) ; if (rv == Nil) return or ; return parse ? Io_url_.new_any_((String)rv) : Io_url_.cast(rv);} + public boolean ReadBoolOrFalse(String k) {Object rv = ReadOr(k,false); if (rv == Nil) return false ; return parse ? Yn.parse_or((String)rv, false) : Bool_.cast(rv);} + public boolean ReadBoolOrTrue(String k) {Object rv = ReadOr(k, true); if (rv == Nil) return true ; return parse ? Yn.parse_or((String)rv, true) : Bool_.cast(rv);} + public boolean ReadYnOrY(String k) {Object rv = ReadOr(k, true); if (rv == Nil) return true ; return parse ? Yn.parse_or((String)rv, true) : Bool_.cast(rv);} + public boolean ReadYn(String k) {Object rv = ReadOr(k,false); if (rv == Nil) ThrowNotFound(k); return parse ? Yn.parse_or((String)rv, false) : Yn.coerce_(rv);} public boolean ReadYn_toggle(String k, boolean cur) { Object rv = ReadOr(k, "!"); if (rv == Nil) ThrowNotFound(k); if (!parse) throw Err_.new_wo_type("only parse supported"); String rv_str = (String)rv; - return (String_.Eq(rv_str, "!")) ? !cur : Yn.parse_(rv_str); + return (String_.Eq(rv_str, "!")) ? !cur : Yn.parse(rv_str); } public byte[] ReadBry(String k) {Object rv = ReadOr(k,false); if (rv == Nil) ThrowNotFound(k); return parse ? Bry_.new_u8((String)rv) : (byte[])rv;} public byte[] ReadBryOr(String k, byte[] or) {Object rv = ReadOr(k, or); if (rv == Nil) return or; return parse ? Bry_.new_u8((String)rv) : (byte[])rv;} @@ -260,10 +260,10 @@ class XtoStrWkr_gplx implements XtoStrWkr { if (o == null) return "<>"; Class type = Type_adp_.ClassOf_obj(o); String rv = null; - if (type == String.class) rv = String_.cast_(o); - else if (Int_.TypeMatch(type)) return Int_.Xto_str(Int_.cast_(o)); - else if (Type_adp_.Eq(type, Bool_.Cls_ref_type)) return Yn.Xto_str(Bool_.cast_(o)); - else if (type == DateAdp.class) return DateAdp_.cast_(o).XtoStr_gplx(); + if (type == String.class) rv = String_.cast(o); + else if (Int_.TypeMatch(type)) return Int_.Xto_str(Int_.cast(o)); + else if (Type_adp_.Eq(type, Bool_.Cls_ref_type)) return Yn.Xto_str(Bool_.cast(o)); + else if (type == DateAdp.class) return DateAdp_.cast(o).XtoStr_gplx(); else rv = Object_.Xto_str_strict_or_empty(o); return String_.Replace(rv, "'", "''"); } diff --git a/100_core/src_330_store/gplx/DataRdr_.java b/100_core/src_330_store/gplx/DataRdr_.java index 701fe01f6..c3557d3f2 100644 --- a/100_core/src_330_store/gplx/DataRdr_.java +++ b/100_core/src_330_store/gplx/DataRdr_.java @@ -20,7 +20,7 @@ import gplx.core.strings.*; public class DataRdr_ { public static final DataRdr Null = new DataRdr_null(); public static DataRdr as_(Object obj) {return obj instanceof DataRdr ? (DataRdr)obj : null;} - public static DataRdr cast_(Object obj) {try {return (DataRdr)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, DataRdr.class, obj);}} + 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 To_str();} public String To_str() {return "<< NULL READER >>";} @@ -37,9 +37,9 @@ class DataRdr_null implements DataRdr { public byte[] ReadBryByStr(String key) {return Bry_.Empty;} public byte[] ReadBryByStrOr(String key, byte[] or) {return or;} public byte[] ReadBry(String key) {return Bry_.Empty;} public byte[] ReadBryOr(String key, byte[] or) {return or;} public char ReadChar(String key) {return Char_.Null;} public char ReadCharOr(String key, char or) {return or;} - public int ReadInt(String key) {return Int_.MinValue;} public int ReadIntOr(String key, int or) {return or;} + public int ReadInt(String key) {return Int_.Min_value;} public int ReadIntOr(String key, int or) {return or;} public boolean ReadBool(String key) {return false;} public boolean ReadBoolOr(String key, boolean or) {return or;} - public long ReadLong(String key) {return Long_.MinValue;} public long ReadLongOr(String key, long or) {return or;} + public long ReadLong(String key) {return Long_.Min_value;} public long ReadLongOr(String key, long or) {return or;} public double ReadDouble(String key) {return Double_.NaN;} public double ReadDoubleOr(String key, double or) {return or;} public float ReadFloat(String key) {return Float_.NaN;} public float ReadFloatOr(String key, float or) {return or;} public byte ReadByte(String key) {return Byte_.Min_value;} public byte ReadByteOr(String key, byte or) {return or;} diff --git a/100_core/src_330_store/gplx/stores/DataRdr_base.java b/100_core/src_330_store/gplx/stores/DataRdr_base.java index 3cd259dc0..703b16c88 100644 --- a/100_core/src_330_store/gplx/stores/DataRdr_base.java +++ b/100_core/src_330_store/gplx/stores/DataRdr_base.java @@ -63,62 +63,62 @@ public abstract class DataRdr_base implements SrlMgr { public int ReadInt(String key) { Object val = Read(key); - try {return (parse) ? Int_.parse_(String_.as_(val)) : Int_.cast_(val);} + try {return (parse) ? Int_.parse(String_.as_(val)) : Int_.cast(val);} catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(int.class, key, val, exc);} } public int ReadIntOr(String key, int or) { Object val = Read(key); if (val == null) return or; - try {return (parse) ? Int_.parse_(String_.as_(val)) : Int_.cast_(val);} + try {return (parse) ? Int_.parse(String_.as_(val)) : Int_.cast(val);} catch (Exception exc) {Err_dataRdr_ReadFailed_useOr(exc, int.class, key, val, or); return or;} } public long ReadLongOr(String key, long or) { Object val = Read(key); if (val == null) return or; - try {return (parse) ? Long_.parse_(String_.as_(val)) : Long_.cast_(val);} + try {return (parse) ? Long_.parse(String_.as_(val)) : Long_.cast(val);} catch (Exception exc) {Err_dataRdr_ReadFailed_useOr(exc, long.class, key, val, or); return or;} } @gplx.Virtual public boolean ReadBool(String key) { Object val = Read(key); - try {return (parse) ? Bool_.cast_(BoolClassXtn._.ParseOrNull(String_.as_(val))) : Bool_.cast_(val);} + try {return (parse) ? Bool_.cast(BoolClassXtn._.ParseOrNull(String_.as_(val))) : Bool_.cast(val);} catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(boolean.class, key, val, exc);} } @gplx.Virtual public boolean ReadBoolOr(String key, boolean or) { Object val = Read(key); if (val == null) return or; - try {return (parse) ? Bool_.parse_(String_.as_(val)) : Bool_.cast_(val);} + try {return (parse) ? Bool_.parse(String_.as_(val)) : Bool_.cast(val);} catch (Exception exc) {Err_dataRdr_ReadFailed_useOr(exc, boolean.class, key, val, or); return or;} } public long ReadLong(String key) { Object val = Read(key); - try {return (parse) ? Long_.parse_(String_.as_(val)) : Long_.cast_(val);} + try {return (parse) ? Long_.parse(String_.as_(val)) : Long_.cast(val);} catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(long.class, key, val, exc);} } public float ReadFloat(String key) { Object val = Read(key); - try {return (parse) ? Float_.parse_(String_.as_(val)) : Float_.cast_(val);} + try {return (parse) ? Float_.parse(String_.as_(val)) : Float_.cast(val);} catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(float.class, key, val, exc);} } public float ReadFloatOr(String key, float or) { Object val = Read(key); if (val == null) return or; - try {return (parse) ? Float_.parse_(String_.as_(val)) : Float_.cast_(val);} + try {return (parse) ? Float_.parse(String_.as_(val)) : Float_.cast(val);} catch (Exception exc) {Err_dataRdr_ReadFailed_useOr(exc, float.class, key, val, or); return or;} } public double ReadDouble(String key) { Object val = Read(key); - try {return (parse) ? Double_.parse_(String_.as_(val)) : Double_.cast_(val);} + try {return (parse) ? Double_.parse(String_.as_(val)) : Double_.cast(val);} catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(double.class, key, val, exc);} } public double ReadDoubleOr(String key, double or) { Object val = Read(key); if (val == null) return or; - try {return (parse) ? Double_.parse_(String_.as_(val)) : Double_.cast_(val);} + try {return (parse) ? Double_.parse(String_.as_(val)) : Double_.cast(val);} catch (Exception exc) {Err_dataRdr_ReadFailed_useOr(exc, double.class, key, val, or); return or;} } @gplx.Virtual public byte ReadByte(String key) { Object val = Read(key); - try {return (parse) ? Byte_.parse_(String_.as_(val)) : Byte_.cast_(val);} + try {return (parse) ? Byte_.parse(String_.as_(val)) : Byte_.cast(val);} catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(byte.class, key, val, exc);} } @gplx.Virtual public byte ReadByteOr(String key, byte or) { Object val = Read(key); if (val == null) return or; - try {return (parse) ? Byte_.parse_(String_.as_(val)) : Byte_.cast_(val);} + try {return (parse) ? Byte_.parse(String_.as_(val)) : Byte_.cast(val);} catch (Exception exc) {Err_dataRdr_ReadFailed_useOr(exc, byte.class, key, val, or); return or;} } @gplx.Virtual public DateAdp ReadDate(String key) { @@ -134,7 +134,7 @@ public abstract class DataRdr_base implements SrlMgr { @gplx.Virtual public Decimal_adp ReadDecimal(String key) { Object val = Read(key); try { - if (parse) return Decimal_adp_.parse_(String_.as_(val)); + if (parse) return Decimal_adp_.parse(String_.as_(val)); Decimal_adp rv = Decimal_adp_.as_(val); return (rv == null) ? Decimal_adp_.db_(val) // HACK: GfoNde_.rdr_ will call ReadAt(int i) on Db_data_rdr; since no Db_data_rdr knows about Decimal_adp, it will always return decimalType @@ -145,7 +145,7 @@ public abstract class DataRdr_base implements SrlMgr { @gplx.Virtual public Decimal_adp ReadDecimalOr(String key, Decimal_adp or) { Object val = Read(key); if (val == null) return or; try { - if (parse) return Decimal_adp_.parse_(String_.as_(val)); + if (parse) return Decimal_adp_.parse(String_.as_(val)); Decimal_adp rv = Decimal_adp_.as_(val); return (rv == null) ? Decimal_adp_.db_(val) // HACK: GfoNde_.rdr_ will call ReadAt(int i) on Db_data_rdr; since no Db_data_rdr knows about Decimal_adp, it will always return decimalType @@ -156,16 +156,16 @@ public abstract class DataRdr_base implements SrlMgr { public char ReadChar(String key) { Object val = Read(key); try { - if (parse) return Char_.parse_(String_.as_(val)); - return Char_.cast_(val); + if (parse) return Char_.parse(String_.as_(val)); + return Char_.cast(val); } catch (Exception exc) {throw Err_dataRdr_ReadFailed_err(char.class, key, val, exc);} } public char ReadCharOr(String key, char or) { Object val = Read(key); if (val == null) return or; try { - if (parse) return Char_.parse_(String_.as_(val)); - return Char_.cast_(val); + if (parse) return Char_.parse(String_.as_(val)); + return Char_.cast(val); } catch (Exception exc) {Err_.Noop(exc); return or;} } diff --git a/100_core/src_330_store/gplx/stores/GfoNdeRdr_.java b/100_core/src_330_store/gplx/stores/GfoNdeRdr_.java index 1697f15b8..a952a8070 100644 --- a/100_core/src_330_store/gplx/stores/GfoNdeRdr_.java +++ b/100_core/src_330_store/gplx/stores/GfoNdeRdr_.java @@ -44,5 +44,5 @@ public class GfoNdeRdr_ { return rv; } public static GfoNdeRdr as_(Object obj) {return obj instanceof GfoNdeRdr ? (GfoNdeRdr)obj : null;} - public static GfoNdeRdr cast_(Object obj) {try {return (GfoNdeRdr)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfoNdeRdr.class, obj);}} + public static GfoNdeRdr cast(Object obj) {try {return (GfoNdeRdr)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfoNdeRdr.class, obj);}} } diff --git a/100_core/src_330_store/gplx/stores/xmls/XmlDataRdr.java b/100_core/src_330_store/gplx/stores/xmls/XmlDataRdr.java index 58391283d..cb9c1b9d6 100644 --- a/100_core/src_330_store/gplx/stores/xmls/XmlDataRdr.java +++ b/100_core/src_330_store/gplx/stores/xmls/XmlDataRdr.java @@ -62,7 +62,7 @@ public class XmlDataRdr extends DataRdr_base implements DataRdr { public String Node_OuterXml() {return nde.Xml_outer();} @Override public SrlMgr SrlMgr_new(Object o) {return new XmlDataRdr();} void LoadString(String raw) { - XmlDoc xdoc = XmlDoc_.parse_(raw); + XmlDoc xdoc = XmlDoc_.parse(raw); XmlNdeList list = Xpath_.SelectElements(xdoc.Root()); ctor_(list, xdoc.Root()); } diff --git a/100_core/src_340_dsv/gplx/stores/dsvs/DsvStoreLayout.java b/100_core/src_340_dsv/gplx/stores/dsvs/DsvStoreLayout.java index f860e8859..b0070c785 100644 --- a/100_core/src_340_dsv/gplx/stores/dsvs/DsvStoreLayout.java +++ b/100_core/src_340_dsv/gplx/stores/dsvs/DsvStoreLayout.java @@ -46,6 +46,6 @@ public class DsvStoreLayout { return rv; } public static DsvStoreLayout as_(Object obj) {return obj instanceof DsvStoreLayout ? (DsvStoreLayout)obj : null;} - public static DsvStoreLayout cast_(Object obj) {try {return (DsvStoreLayout)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, DsvStoreLayout.class, obj);}} + public static DsvStoreLayout cast(Object obj) {try {return (DsvStoreLayout)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, DsvStoreLayout.class, obj);}} public static final String Key_const = "StoreLayoutWtr"; } diff --git a/100_core/src_800_tst/gplx/Tfds.java b/100_core/src_800_tst/gplx/Tfds.java index 3a65d0f2e..6d48b6a6b 100644 --- a/100_core/src_800_tst/gplx/Tfds.java +++ b/100_core/src_800_tst/gplx/Tfds.java @@ -19,6 +19,7 @@ package gplx; import gplx.core.strings.*; import gplx.core.consoles.*; public class Tfds { // URL:doc/gplx.tfds/Tfds.txt public static boolean SkipDb = false; + public static void Eq_bool (boolean expd , boolean actl) {Eq_exec_y(expd, actl, "", Object_.Ary_empty);} public static void Eq_bool (boolean expd , boolean actl, String fmt, Object... args) {Eq_exec_y(expd, actl, fmt, args);} public static void Eq_byte (byte expd , byte actl, String fmt, Object... args) {Eq_exec_y(expd, actl, fmt, args);} public static void Eq_int (int expd , int actl) {Eq_exec_y(expd, actl, "", Object_.Ary_empty);} diff --git a/100_core/src_900_xml/gplx/Base85_utl_tst.java b/100_core/src_900_xml/gplx/Base85_utl_tst.java index 9f38e91dc..a5298c4dc 100644 --- a/100_core/src_900_xml/gplx/Base85_utl_tst.java +++ b/100_core/src_900_xml/gplx/Base85_utl_tst.java @@ -28,7 +28,7 @@ public class Base85_utl_tst { tst_Log( 614125, 4); tst_Log( 52200624, 4); tst_Log( 52200625, 5); - tst_Log(Int_.MaxValue, 5); + tst_Log(Int_.Max_value, 5); } void tst_Log(int val, int expd) {Tfds.Eq(expd, Base85_utl.DigitCount(val));} @Test public void To_str() { tst_XtoStr( 0, "!"); diff --git a/100_core/src_900_xml/gplx/xmls/XmlDoc_.java b/100_core/src_900_xml/gplx/xmls/XmlDoc_.java index 81c8265ac..2e1a44598 100644 --- a/100_core/src_900_xml/gplx/xmls/XmlDoc_.java +++ b/100_core/src_900_xml/gplx/xmls/XmlDoc_.java @@ -34,7 +34,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; public class XmlDoc_ { - public static XmlDoc parse_(String raw) {return new XmlDoc(doc_(raw));} + public static XmlDoc parse(String raw) {return new XmlDoc(doc_(raw));} static Document doc_(String raw) { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder bldr = null; diff --git a/100_core/src_900_xml/gplx/xmls/XmlDoc_tst.java b/100_core/src_900_xml/gplx/xmls/XmlDoc_tst.java index 50c8f71ea..98ac85634 100644 --- a/100_core/src_900_xml/gplx/xmls/XmlDoc_tst.java +++ b/100_core/src_900_xml/gplx/xmls/XmlDoc_tst.java @@ -19,9 +19,9 @@ package gplx.xmls; import gplx.*; import org.junit.*; public class XmlDoc_tst { String xml; XmlDoc xdoc; XmlNde xnde; - @Test public void parse_() { + @Test public void parse() { xml = String_.Concat(""); - xdoc = XmlDoc_.parse_(xml); + xdoc = XmlDoc_.parse(xml); Tfds.Eq("root", xdoc.Root().Name()); Tfds.Eq(true, xdoc.Root().NdeType_element()); } @@ -34,7 +34,7 @@ public class XmlDoc_tst { , "" , "" ); - xdoc = XmlDoc_.parse_(xml); + xdoc = XmlDoc_.parse(xml); xnde = xdoc.Root().SubNdes().Get_at(0); Tfds.Eq("a", xnde.Name()); Tfds.Eq("", xnde.Xml_outer()); @@ -47,7 +47,7 @@ public class XmlDoc_tst { , "" , "" ); - xdoc = XmlDoc_.parse_(xml); + xdoc = XmlDoc_.parse(xml); xnde = xdoc.Root().SubNdes().Get_at(0); Tfds.Eq("a", xnde.Name()); Tfds.Eq("test me", xnde.Text_inner()); @@ -57,7 +57,7 @@ public class XmlDoc_tst { ( "" , "" ); - xdoc = XmlDoc_.parse_(xml); + xdoc = XmlDoc_.parse(xml); XmlAtrList atrs = xdoc.Root().Atrs(); XmlAtr atr = atrs.Get_at(1); tst_Atr(atr, "atr1", "1"); diff --git a/100_core/src_900_xml/gplx/xmls/XmlFileSplitter.java b/100_core/src_900_xml/gplx/xmls/XmlFileSplitter.java index 8594f96c5..b39826eca 100644 --- a/100_core/src_900_xml/gplx/xmls/XmlFileSplitter.java +++ b/100_core/src_900_xml/gplx/xmls/XmlFileSplitter.java @@ -102,7 +102,7 @@ public class XmlFileSplitter { int FindMatchPos(byte[] src, byte[][] wordAry, boolean fwd) { int[] findAry = new int[wordAry.length]; for (int i = 0; i < findAry.length; i++) - findAry[i] = fwd ? -1 : Int_.MaxValue; + findAry[i] = fwd ? -1 : Int_.Max_value; for (int i = 0; i < wordAry.length; i++) { // look at each word in wordAry int srcLen = src.length, srcPos, srcEnd, srcDif; if (fwd) {srcPos = 0; srcEnd = srcLen; srcDif = 1;} @@ -123,13 +123,13 @@ public class XmlFileSplitter { srcPos += srcDif; } } - int best = fwd ? -1 : Int_.MaxValue; + int best = fwd ? -1 : Int_.Max_value; for (int find : findAry) { if ((fwd && find > best) || (!fwd && find < best)) best = find; } - if (best == Int_.MaxValue) best = -1; + if (best == Int_.Max_value) best = -1; return best; } byte[][] XtoByteAry(String[] names) { diff --git a/100_core/src_900_xml/gplx/xmls/Xpath__tst.java b/100_core/src_900_xml/gplx/xmls/Xpath__tst.java index 85ba60488..41a007c5b 100644 --- a/100_core/src_900_xml/gplx/xmls/Xpath__tst.java +++ b/100_core/src_900_xml/gplx/xmls/Xpath__tst.java @@ -37,7 +37,7 @@ public class Xpath__tst { tst_SelectAll(xml, "b/c", 3); } void tst_SelectAll(String raw, String xpath, int expdCount) { - XmlDoc xdoc = XmlDoc_.parse_(raw); + XmlDoc xdoc = XmlDoc_.parse(raw); XmlNdeList xndeList = Xpath_.SelectAll(xdoc.Root(), xpath); Tfds.Eq(expdCount, xndeList.Count()); } diff --git a/100_core/tst/gplx/ios/IoEngine_fil_basic_memory_tst.java b/100_core/tst/gplx/ios/IoEngine_fil_basic_memory_tst.java index 0e67e2532..eb0c2fca6 100644 --- a/100_core/tst/gplx/ios/IoEngine_fil_basic_memory_tst.java +++ b/100_core/tst/gplx/ios/IoEngine_fil_basic_memory_tst.java @@ -45,7 +45,7 @@ public class IoEngine_fil_basic_memory_tst extends IoEngine_fil_basic_base { list.Del_at(0); // remove drive IoEngine_xrg_recycleFil recycleXrg = bin.Send_xrg(fil) .RootDirNames_(list) - .AppName_("gplx.test").Time_(DateAdp_.parse_gplx("20100102_115559123")).Uuid_(Guid_adp_.parse_("467ffb41-cdfe-402f-b22b-be855425784b")); + .AppName_("gplx.test").Time_(DateAdp_.parse_gplx("20100102_115559123")).Uuid_(Guid_adp_.parse("467ffb41-cdfe-402f-b22b-be855425784b")); recycleXrg.Exec(); fx.tst_ExistsPaths(false, fil); fx.tst_ExistsPaths(true, recycleXrg.RecycleUrl()); diff --git a/100_core/tst/gplx/ios/IoEngine_fil_basic_system_tst.java b/100_core/tst/gplx/ios/IoEngine_fil_basic_system_tst.java index 9f467a3b8..ca94650db 100644 --- a/100_core/tst/gplx/ios/IoEngine_fil_basic_system_tst.java +++ b/100_core/tst/gplx/ios/IoEngine_fil_basic_system_tst.java @@ -37,7 +37,7 @@ public class IoEngine_fil_basic_system_tst extends IoEngine_fil_basic_base { List_adp list = root.XtoNames(); list.Del_at(0); // remove drive IoEngine_xrg_recycleFil recycleXrg = bin.Send_xrg(fil) .RootDirNames_(list) - .AppName_("gplx.test").Time_(DateAdp_.parse_gplx("20100102_115559123")).Uuid_(Guid_adp_.parse_("467ffb41-cdfe-402f-b22b-be855425784b")); + .AppName_("gplx.test").Time_(DateAdp_.parse_gplx("20100102_115559123")).Uuid_(Guid_adp_.parse("467ffb41-cdfe-402f-b22b-be855425784b")); recycleXrg.Exec(); fx.tst_ExistsPaths(false, fil); fx.tst_ExistsPaths(true, recycleXrg.RecycleUrl()); diff --git a/100_core/tst/gplx/ios/IoEngine_xrg_recycleFil_tst.java b/100_core/tst/gplx/ios/IoEngine_xrg_recycleFil_tst.java index 36e6493d1..79a7e8c5a 100644 --- a/100_core/tst/gplx/ios/IoEngine_xrg_recycleFil_tst.java +++ b/100_core/tst/gplx/ios/IoEngine_xrg_recycleFil_tst.java @@ -25,7 +25,7 @@ public class IoEngine_xrg_recycleFil_tst { tst_GenRecycleUrl(recycle_(), Io_url_.mem_fil_("mem/z_trash/20100102/gplx.images;115559123;;fil.txt")); tst_GenRecycleUrl(recycle_().Uuid_include_(), Io_url_.mem_fil_("mem/z_trash/20100102/gplx.images;115559123;467ffb41-cdfe-402f-b22b-be855425784b;fil.txt")); } - IoEngine_xrg_recycleFil recycle_() {return IoEngine_xrg_recycleFil.gplx_(Io_url_.mem_fil_("mem/dir/fil.txt")).AppName_("gplx.images").Uuid_(Guid_adp_.parse_("467ffb41-cdfe-402f-b22b-be855425784b")).Time_(DateAdp_.parse_gplx("20100102_115559123"));} + IoEngine_xrg_recycleFil recycle_() {return IoEngine_xrg_recycleFil.gplx_(Io_url_.mem_fil_("mem/dir/fil.txt")).AppName_("gplx.images").Uuid_(Guid_adp_.parse("467ffb41-cdfe-402f-b22b-be855425784b")).Time_(DateAdp_.parse_gplx("20100102_115559123"));} void tst_GenRecycleUrl(IoEngine_xrg_recycleFil xrg, Io_url expd) { Tfds.Eq(expd, xrg.RecycleUrl()); } diff --git a/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java b/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java index 1a7baa476..186503369 100644 --- a/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java +++ b/110_gfml/src_100_tkn/gplx/gfml/GfmlLxr_.java @@ -31,7 +31,7 @@ public class GfmlLxr_ { public static final GfmlLxr Null = new GfmlLxr_null(); public static final String CmdTknChanged_evt = "Changed"; public static GfmlLxr as_(Object obj) {return obj instanceof GfmlLxr ? (GfmlLxr)obj : null;} - public static GfmlLxr cast_(Object obj) {try {return (GfmlLxr)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfmlLxr.class, obj);}} + public static GfmlLxr cast(Object obj) {try {return (GfmlLxr)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfmlLxr.class, obj);}} } class GfmlLxr_null implements GfmlLxr { public String Key() {return "gfml.nullLxr";} @@ -85,7 +85,7 @@ class GfmlLxr_group implements GfmlLxr { sb.Add_mid(stream.Ary(), stream.Pos(), hookLength); stream.MoveNextBy(hookLength); - String found = String_.cast_(trie.FindMatch(stream)); + String found = String_.cast(trie.FindMatch(stream)); if (found == null) break; hookLength = trie.LastMatchCount; } @@ -213,5 +213,5 @@ class GfmlLxr_frame extends GfmlLxr_singleton { GfmlFrame frame; GfmlLxr endLxr return rv; } GfmlLxr_frame() {} public static GfmlLxr_frame as_(Object obj) {return obj instanceof GfmlLxr_frame ? (GfmlLxr_frame)obj : null;} - public static GfmlLxr_frame cast_(Object obj) {try {return (GfmlLxr_frame)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfmlLxr_frame.class, obj);}} + public static GfmlLxr_frame cast(Object obj) {try {return (GfmlLxr_frame)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfmlLxr_frame.class, obj);}} } diff --git a/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java b/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java index b39b47644..ccc2c3482 100644 --- a/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java +++ b/110_gfml/src_100_tkn/gplx/gfml/GfmlTrie.java @@ -21,7 +21,7 @@ public class GfmlTrie { public String[] Symbols() { String[] rv = new String[symbols.Count()]; for (int i = 0; i < rv.length; i++) - rv[i] = String_.cast_(symbols.Get_at(i)); + rv[i] = String_.cast(symbols.Get_at(i)); return rv; } Ordered_hash symbols = Ordered_hash_.new_(); public int LastMatchCount; // PERF: prop is faster than method diff --git a/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java b/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java index c7f136f51..012eeec06 100644 --- a/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java +++ b/110_gfml/src_300_gdoc/gplx/gfml/GfmlDoc_.java @@ -17,8 +17,8 @@ along with this program. If not, see . */ package gplx.gfml; import gplx.*; public class GfmlDoc_ { - public static GfmlDoc parse_any_eol_(String raw) {return parse_(String_.Replace(raw, String_.CrLf, String_.Lf));} - public static GfmlDoc parse_(String raw) { + public static GfmlDoc parse_any_eol_(String raw) {return parse(String_.Replace(raw, String_.CrLf, String_.Lf));} + public static GfmlDoc parse(String raw) { GfmlBldr bldr = GfmlBldr_.default_(); return bldr.XtoGfmlDoc(raw); } diff --git a/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java b/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java index bb5e43682..214f5b9b5 100644 --- a/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java +++ b/110_gfml/src_500_build/gplx/gfml/GfmlStringHighlighter.java @@ -43,7 +43,7 @@ class GfmlStringHighlighter { if (i == 0) rawBfrBgn = bgnPos; // endPos - int nxtMarkPos = nxtMark == GfmlStringHighlighterMarker.Null ? Int_.MaxValue : nxtMark.Pos(); + int nxtMarkPos = nxtMark == GfmlStringHighlighterMarker.Null ? Int_.Max_value : nxtMark.Pos(); endPos = curMark.Pos() + excerptLen; if (endPos >= nxtMarkPos) endPos = nxtMarkPos; if (endPos > rawLen ) endPos = rawLen + 1; diff --git a/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java b/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java index cb4883b83..1ac985738 100644 --- a/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java +++ b/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtr.java @@ -20,7 +20,7 @@ import gplx.lists.*; /*StackAdp*/ public class GfmlDataWtr extends DataWtr_base implements DataWtr { public void InitWtr(String key, Object val) { if (!String_.Eq(key, GfmlDataWtrOpts.Key_const)) return; - GfmlDataWtrOpts layout = GfmlDataWtrOpts.cast_(val); + GfmlDataWtrOpts layout = GfmlDataWtrOpts.cast(val); keyedSpr = layout.KeyedSpr(); indentNodes = layout.IndentNodes(); ignoreNullNames = layout.IgnoreNullNames(); diff --git a/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtrOpts.java b/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtrOpts.java index 2ee7a7f8f..5f0ae9965 100644 --- a/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtrOpts.java +++ b/110_gfml/src_600_rdrWtr/gplx/gfml/GfmlDataWtrOpts.java @@ -23,5 +23,5 @@ public class GfmlDataWtrOpts { public boolean IgnoreNullNames() {return ignoreNullNames;} public GfmlDataWtrOpts IgnoreNullNamesOn_() {ignoreNullNames = true; return this;} private boolean ignoreNullNames; public static final GfmlDataWtrOpts _ = new GfmlDataWtrOpts(); public static GfmlDataWtrOpts new_() {return new GfmlDataWtrOpts();} GfmlDataWtrOpts() {} - public static GfmlDataWtrOpts cast_(Object obj) {try {return (GfmlDataWtrOpts)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfmlDataWtrOpts.class, obj);}} + public static GfmlDataWtrOpts cast(Object obj) {try {return (GfmlDataWtrOpts)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfmlDataWtrOpts.class, obj);}} } diff --git a/110_gfml/tst/gplx/gfml/z901_perf_tst.java b/110_gfml/tst/gplx/gfml/z901_perf_tst.java index 330678ca6..b0ee0154c 100644 --- a/110_gfml/tst/gplx/gfml/z901_perf_tst.java +++ b/110_gfml/tst/gplx/gfml/z901_perf_tst.java @@ -29,7 +29,7 @@ public class z901_perf_tst { // sbXml.Add(longText); // sbXml.Add("/>"); // tmr.Bgn(); -// gplx.xmls.XmlDoc_.parse_(sbXml.To_str()); +// gplx.xmls.XmlDoc_.parse(sbXml.To_str()); // tmr.End_and_print("xml"); // 400 String_bldr sbGfml = String_bldr_.new_(); diff --git a/140_dbs/src/gplx/dbs/Db_conn.java b/140_dbs/src/gplx/dbs/Db_conn.java index 5f2e687f2..d0bd726ac 100644 --- a/140_dbs/src/gplx/dbs/Db_conn.java +++ b/140_dbs/src/gplx/dbs/Db_conn.java @@ -73,8 +73,8 @@ public class Db_conn { Gfo_usr_dlg_.I.Plog_many("", "", "done:" + msg); return rv; } - public int Exec_qry(Db_qry qry) {return Int_.cast_(engine.Exec_as_obj(qry));} - public DataRdr Exec_qry_as_rdr(Db_qry qry) {return DataRdr_.cast_(engine.Exec_as_obj(qry));} + public int Exec_qry(Db_qry qry) {return Int_.cast(engine.Exec_as_obj(qry));} + public DataRdr Exec_qry_as_rdr(Db_qry qry) {return DataRdr_.cast(engine.Exec_as_obj(qry));} public int Exec_sql_args(String sql, Object... args) {return this.Exec_qry(Db_qry_sql.dml_(String_.Format(sql, args)));} public DataRdr Exec_sql_as_rdr(String sql) {return this.Exec_qry_as_rdr(Db_qry_sql.rdr_(sql));} } diff --git a/140_dbs/src/gplx/dbs/Db_conn_.java b/140_dbs/src/gplx/dbs/Db_conn_.java index 9bc6b00d7..3a2a5449c 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_.java +++ b/140_dbs/src/gplx/dbs/Db_conn_.java @@ -27,7 +27,7 @@ public class Db_conn_ { if (rdr.MoveNextPeer()) { Object rv_obj = rdr.ReadAt(0); if (rv_obj != null) // Max(fil_id) will be NULL if tbl is empty - rv = Int_.cast_or_(rv_obj, or); + rv = Int_.cast_or(rv_obj, or); } return rv; } diff --git a/140_dbs/src/gplx/dbs/Db_conn_info_.java b/140_dbs/src/gplx/dbs/Db_conn_info_.java index 8d4e109c5..535e02121 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_info_.java +++ b/140_dbs/src/gplx/dbs/Db_conn_info_.java @@ -21,7 +21,7 @@ import gplx.dbs.engines.mysql.*; import gplx.dbs.engines.postgres.*; public class Db_conn_info_ { public static final Db_conn_info Null = Noop_conn_info.I; public static final Db_conn_info Test = Mysql_conn_info.new_("127.0.0.1", "unit_tests", "root", "mysql7760"); - public static Db_conn_info parse_(String raw) {return Db_conn_info_pool._.Parse(raw);} + public static Db_conn_info parse(String raw) {return Db_conn_info_pool._.Parse(raw);} public static Db_conn_info sqlite_(Io_url url) {return Sqlite_conn_info.load_(url);} public static Db_conn_info tdb_(Io_url url) {return Tdb_conn_info.new_(url);} public static Db_conn_info mem_(String db) {return Db_conn_info__mem.new_(db);} diff --git a/140_dbs/src/gplx/dbs/Db_conn_pool.java b/140_dbs/src/gplx/dbs/Db_conn_pool.java index c4fbb7587..a12261bfc 100644 --- a/140_dbs/src/gplx/dbs/Db_conn_pool.java +++ b/140_dbs/src/gplx/dbs/Db_conn_pool.java @@ -24,7 +24,7 @@ public class Db_conn_pool { public void Del(Db_conn_info url) {conn_hash.Del(url.Xto_api());} public Db_conn Get_or_new__mem(String db) {return Get_or_new(Db_conn_info__mem.new_(db));} public Db_conn Get_or_new__sqlite(Io_url url) {return Get_or_new(Db_conn_info_.sqlite_(url));} - public Db_conn Get_or_new(String s) {return Get_or_new(Db_conn_info_.parse_(s));} + public Db_conn Get_or_new(String s) {return Get_or_new(Db_conn_info_.parse(s));} public Db_conn Get_or_new(Db_conn_info url) { Db_conn rv = (Db_conn)conn_hash.Get_by(url.Xto_api()); if (rv == null) { diff --git a/140_dbs/src/gplx/dbs/Db_rdr_.java b/140_dbs/src/gplx/dbs/Db_rdr_.java index 8dfa50319..106541c31 100644 --- a/140_dbs/src/gplx/dbs/Db_rdr_.java +++ b/140_dbs/src/gplx/dbs/Db_rdr_.java @@ -27,8 +27,8 @@ class Db_rdr__empty implements Db_rdr { public byte Read_byte(String k) {return Byte_.Max_value_127;} public String Read_str(String k) {return String_.Empty;} public DateAdp Read_date_by_str(String k) {return DateAdp_.MinValue;} - public int Read_int(String k) {return Int_.MinValue;} - public long Read_long(String k) {return Long_.MinValue;} + public int Read_int(String k) {return Int_.Min_value;} + public long Read_long(String k) {return Long_.Min_value;} public float Read_float(String k) {return Float_.NaN;} public double Read_double(String k) {return Double_.NaN;} public boolean Read_bool_by_byte(String k) {return false;} diff --git a/140_dbs/src/gplx/dbs/Db_rdr__basic.java b/140_dbs/src/gplx/dbs/Db_rdr__basic.java index fd3b87b4c..7824c3515 100644 --- a/140_dbs/src/gplx/dbs/Db_rdr__basic.java +++ b/140_dbs/src/gplx/dbs/Db_rdr__basic.java @@ -31,12 +31,12 @@ public class Db_rdr__basic implements Db_rdr { @gplx.Virtual public void Save_bry_in_parts(Io_url url, String tbl, String fld, String crt_key, Object crt_val) {throw Err_.new_unimplemented();} @gplx.Virtual public String Read_str(String k) {try {return (String)rdr.getObject(k);} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", String_.Cls_val_name);}} @gplx.Virtual public DateAdp Read_date_by_str(String k) {return DateAdp_.parse_iso8561(Read_str(k));} - @gplx.Virtual public int Read_int(String k) {try {return Int_.cast_(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Int_.Cls_val_name);}} - @gplx.Virtual public long Read_long(String k) {try {return Long_.cast_(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Long_.Cls_val_name);}} - @gplx.Virtual public float Read_float(String k) {try {return Float_.cast_(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Float_.Cls_val_name);}} - @gplx.Virtual public double Read_double(String k) {try {return Double_.cast_(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Double_.Cls_val_name);}} - @gplx.Virtual public byte Read_byte(String k) {try {return Byte_.cast_(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Byte_.Cls_val_name);}} - @gplx.Virtual public boolean Read_bool_by_byte(String k) {try {return Byte_.cast_(rdr.getObject(k)) == 1;} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Bool_.Cls_val_name);}} + @gplx.Virtual public int Read_int(String k) {try {return Int_.cast(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Int_.Cls_val_name);}} + @gplx.Virtual public long Read_long(String k) {try {return Long_.cast(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Long_.Cls_val_name);}} + @gplx.Virtual public float Read_float(String k) {try {return Float_.cast(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Float_.Cls_val_name);}} + @gplx.Virtual public double Read_double(String k) {try {return Double_.cast(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Double_.Cls_val_name);}} + @gplx.Virtual public byte Read_byte(String k) {try {return Byte_.cast(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Byte_.Cls_val_name);}} + @gplx.Virtual public boolean Read_bool_by_byte(String k) {try {return Byte_.cast(rdr.getObject(k)) == 1;} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Bool_.Cls_val_name);}} @gplx.Virtual public Object Read_obj(String k) {try {return rdr.getObject(k);} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "key", k, "type", Object_.Cls_val_name);}} @gplx.Virtual public void Rls() { try {rdr.close();} diff --git a/140_dbs/src/gplx/dbs/engines/mems/Db_conn_info__mem.java b/140_dbs/src/gplx/dbs/engines/mems/Db_conn_info__mem.java index 699481a73..3ec3de7ba 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Db_conn_info__mem.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Db_conn_info__mem.java @@ -24,7 +24,7 @@ public class Db_conn_info__mem extends Db_conn_info__base { return rv; } public static Db_conn_info new_(String database) { - return Db_conn_info_.parse_(Bld_raw + return Db_conn_info_.parse(Bld_raw ( "gplx_key", Tid_const , "database", database )); diff --git a/140_dbs/src/gplx/dbs/engines/mems/Db_rdr__mem.java b/140_dbs/src/gplx/dbs/engines/mems/Db_rdr__mem.java index 325263477..a880c7160 100644 --- a/140_dbs/src/gplx/dbs/engines/mems/Db_rdr__mem.java +++ b/140_dbs/src/gplx/dbs/engines/mems/Db_rdr__mem.java @@ -33,12 +33,12 @@ public class Db_rdr__mem implements Db_rdr { public byte[] Read_bry_by_str(String k) {return Bry_.new_u8_safe((String)row.Get_by(k));} // NOTE: null b/c db can have NULL @gplx.Virtual public void Save_bry_in_parts(Io_url url, String tbl, String fld, String crt_key, Object crt_val) {throw Err_.new_unimplemented();} public DateAdp Read_date_by_str(String k) {return DateAdp_.parse_iso8561((String)row.Get_by(k));} - public byte Read_byte(String k) {return Byte_.cast_(row.Get_by(k));} - public int Read_int(String k) {return Int_.cast_(row.Get_by(k));} - public long Read_long(String k) {return Long_.cast_(row.Get_by(k));} - public float Read_float(String k) {return Float_.cast_(row.Get_by(k));} - public double Read_double(String k) {return Double_.cast_(row.Get_by(k));} - public boolean Read_bool_by_byte(String k) {return Byte_.cast_(row.Get_by(k)) == 1;} + public byte Read_byte(String k) {return Byte_.cast(row.Get_by(k));} + public int Read_int(String k) {return Int_.cast(row.Get_by(k));} + public long Read_long(String k) {return Long_.cast(row.Get_by(k));} + public float Read_float(String k) {return Float_.cast(row.Get_by(k));} + public double Read_double(String k) {return Double_.cast(row.Get_by(k));} + public boolean Read_bool_by_byte(String k) {return Byte_.cast(row.Get_by(k)) == 1;} public Object Read_obj(String k) {return row.Get_by(k);} public void Rls() {} } diff --git a/140_dbs/src/gplx/dbs/engines/mysql/Mysql_conn_info.java b/140_dbs/src/gplx/dbs/engines/mysql/Mysql_conn_info.java index 135ee0800..1e2601778 100644 --- a/140_dbs/src/gplx/dbs/engines/mysql/Mysql_conn_info.java +++ b/140_dbs/src/gplx/dbs/engines/mysql/Mysql_conn_info.java @@ -21,7 +21,7 @@ public class Mysql_conn_info extends Db_conn_info__base { public String Uid() {return uid;} private String uid; public String Pwd() {return pwd;} private String pwd; public static Db_conn_info new_(String server, String database, String uid, String pwd) { - return Db_conn_info_.parse_(Bld_raw + return Db_conn_info_.parse(Bld_raw ( "gplx_key", Tid_const , "server", server , "database", database diff --git a/140_dbs/src/gplx/dbs/engines/postgres/Postgres_conn_info.java b/140_dbs/src/gplx/dbs/engines/postgres/Postgres_conn_info.java index 4eb51c976..f319af364 100644 --- a/140_dbs/src/gplx/dbs/engines/postgres/Postgres_conn_info.java +++ b/140_dbs/src/gplx/dbs/engines/postgres/Postgres_conn_info.java @@ -21,7 +21,7 @@ public class Postgres_conn_info extends Db_conn_info__base { public String Uid() {return uid;} private String uid; public String Pwd() {return pwd;} private String pwd; public static Db_conn_info new_(String server, String database, String uid, String pwd) { - return Db_conn_info_.parse_(Bld_raw + return Db_conn_info_.parse(Bld_raw ( "gplx_key", Tid_const , "server", server , "database", database diff --git a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_conn_info.java b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_conn_info.java index a05b04e16..03f2889c5 100644 --- a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_conn_info.java +++ b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_conn_info.java @@ -28,7 +28,7 @@ public class Sqlite_conn_info extends Db_conn_info__base { return rv; } public static Db_conn_info load_(Io_url url) { - return Db_conn_info_.parse_(Bld_raw + return Db_conn_info_.parse(Bld_raw ( "gplx_key" , Tid_const , "data source" , url.Xto_api() , "version" , "3" @@ -36,7 +36,7 @@ public class Sqlite_conn_info extends Db_conn_info__base { } public static Db_conn_info make_(Io_url url) { Io_mgr.I.CreateDirIfAbsent(url.OwnerDir()); - return Db_conn_info_.parse_(Bld_raw + return Db_conn_info_.parse(Bld_raw ( "gplx_key" , Tid_const , "data source" , url.Xto_api() , "version" , "3" diff --git a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java index 94480f31a..b537edd46 100644 --- a/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java +++ b/140_dbs/src/gplx/dbs/engines/sqlite/Sqlite_engine.java @@ -56,7 +56,7 @@ public class Sqlite_engine extends Db_engine_sql_base { } public static final Sqlite_engine _ = new Sqlite_engine(); } -class Db_rdr__sqlite extends Db_rdr__basic { @Override public byte Read_byte(String k) {try {return (byte)Int_.cast_(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "k", k, "type", Byte_.Cls_val_name);}} +class Db_rdr__sqlite extends Db_rdr__basic { @Override public byte Read_byte(String k) {try {return (byte)Int_.cast(rdr.getObject(k));} catch (Exception e) {throw Err_.new_exc(e, "db", "read failed", "k", k, "type", Byte_.Cls_val_name);}} @Override public boolean Read_bool_by_byte(String k) { try { int val = rdr.getInt(k); @@ -108,14 +108,14 @@ class Sqlite_rdr extends Db_data_rdr { @Override public float ReadFloat(String @Override public boolean ReadBool(String key) {return ReadBoolOr(key, false);} @Override public boolean ReadBoolOr(String key, boolean or) { Object val = Read(key); - return val == null ? or : Int_.cast_(val) == 1; + return val == null ? or : Int_.cast(val) == 1; } @Override public byte ReadByte(String key) {return ReadByteOr(key, Byte_.Zero);} @Override public byte ReadByteOr(String key, byte or) { Object val = Read(key); - return val == null ? or : (byte)Int_.cast_(val); + return val == null ? or : (byte)Int_.cast(val); } - @Override public long ReadLong(String key) {return ReadLongOr(key, Long_.MinValue);} + @Override public long ReadLong(String key) {return ReadLongOr(key, Long_.Min_value);} @Override public long ReadLongOr(String key, long or) { Object val = Read(key); if (val == null) return or; diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbConnectInfo_tst.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbConnectInfo_tst.java index cd17b6da0..7544af517 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbConnectInfo_tst.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbConnectInfo_tst.java @@ -19,11 +19,11 @@ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs import org.junit.*; public class TdbConnectInfo_tst { @Test public void Full() { - Db_conn_info connectInfo = Db_conn_info_.parse_("gplx_key=tdb;url=C:\\dir\\xmpl.tdb;format=dsv;"); + Db_conn_info connectInfo = Db_conn_info_.parse("gplx_key=tdb;url=C:\\dir\\xmpl.tdb;format=dsv;"); tst_Parse(connectInfo, Io_url_.new_any_("C:\\dir\\xmpl.tdb"), "dsv"); } @Test public void DefaultFormat() { - Db_conn_info connectInfo = Db_conn_info_.parse_("gplx_key=tdb;url=C:\\dir\\xmpl.tdb"); // dsv Format inferred + Db_conn_info connectInfo = Db_conn_info_.parse("gplx_key=tdb;url=C:\\dir\\xmpl.tdb"); // dsv Format inferred tst_Parse(connectInfo, Io_url_.new_any_("C:\\dir\\xmpl.tdb"), "dsv"); } void tst_Parse(Db_conn_info connectInfo, Io_url url, String format) { diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java index 7a8bfcd3b..4b43e28c7 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbDelete.java @@ -19,7 +19,7 @@ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs import gplx.core.criterias.*; import gplx.lists.*; /*GfoNde*/ import gplx.dbs.qrys.*; class TdbDeleteWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { - TdbEngine engine = TdbEngine.cast_(engineObj); Db_qry_delete cmd = (Db_qry_delete)cmdObj; + TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_delete cmd = (Db_qry_delete)cmdObj; TdbTable tbl = engine.FetchTbl(cmd.Base_table()); List_adp deleted = List_adp_.new_(); int rv = 0; diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java index 46d6c5fb9..afbb96f0b 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbEngine.java @@ -77,7 +77,7 @@ public class TdbEngine implements Db_engine { wkrs.Add(Db_qry_.Tid_flush, TdbFlushWkr.new_()); } public static TdbEngine as_(Object obj) {return obj instanceof TdbEngine ? (TdbEngine)obj : null;} - public static TdbEngine cast_(Object obj) {try {return (TdbEngine)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TdbEngine.class, obj);}} + public static TdbEngine cast(Object obj) {try {return (TdbEngine)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TdbEngine.class, obj);}} } interface Db_qryWkr { Object Exec(Db_engine engine, Db_qry cmd); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbFile.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbFile.java index 6a4d3be08..9731c527f 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbFile.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbFile.java @@ -27,5 +27,5 @@ public class TdbFile { } public static final int MainFileId = 1; public static TdbFile as_(Object obj) {return obj instanceof TdbFile ? (TdbFile)obj : null;} - public static TdbFile cast_(Object obj) {try {return (TdbFile)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TdbFile.class, obj);}} + public static TdbFile cast(Object obj) {try {return (TdbFile)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TdbFile.class, obj);}} } diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush.java index 75a391b72..0e799d7c5 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbFlush.java @@ -19,7 +19,7 @@ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs import gplx.lists.*; /*GfoNde*/ import gplx.dbs.qrys.*; class TdbFlushWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { - TdbEngine engine = TdbEngine.cast_(engineObj); Db_qry_flush cmd = Db_qry_flush.cast_(cmdObj); + TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_flush cmd = Db_qry_flush.cast(cmdObj); if (Array_.Len(cmd.TableNames()) == 0) engine.FlushAll(); else { diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java index 2f6b17a0d..aa610b3f5 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbInsert.java @@ -19,7 +19,7 @@ package gplx.dbs.engines.tdbs; import gplx.*; import gplx.dbs.*; import gplx.dbs import gplx.lists.*; import gplx.dbs.qrys.*; import gplx.dbs.sqls.*; class TdbInsertWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { - TdbEngine engine = TdbEngine.cast_(engineObj); Db_qry_insert cmd = (Db_qry_insert)cmdObj; + TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_insert cmd = (Db_qry_insert)cmdObj; TdbTable tbl = engine.FetchTbl(cmd.Base_table()); tbl.IsDirty_set(true); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java index 961a1c318..6b378285a 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbSelect.java @@ -20,7 +20,7 @@ import gplx.core.criterias.*; import gplx.dbs.qrys.*; import gplx.dbs.sqls.*; import gplx.lists.*; /*ComparerAble*/ import gplx.stores.*; /*GfoNdeRdr*/ class TdbSelectWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { - TdbEngine engine = TdbEngine.cast_(engineObj); Db_qry__select_cmd cmd = (Db_qry__select_cmd)cmdObj; + TdbEngine engine = TdbEngine.cast(engineObj); Db_qry__select_cmd cmd = (Db_qry__select_cmd)cmdObj; if (cmd.From().Tbls().Count() > 1) throw Err_.new_("gplx.tdbs", "joins not supported for tdbs", "sql", cmd.Xto_sql()); TdbTable tbl = engine.FetchTbl(cmd.From().BaseTable().TblName()); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbTable.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbTable.java index 464860d26..7825fc8ea 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbTable.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbTable.java @@ -61,5 +61,5 @@ public class TdbTable { } DsvStoreLayout layout; public static TdbTable as_(Object obj) {return obj instanceof TdbTable ? (TdbTable)obj : null;} - public static TdbTable cast_(Object obj) {try {return (TdbTable)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TdbTable.class, obj);}} + public static TdbTable cast(Object obj) {try {return (TdbTable)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TdbTable.class, obj);}} } diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java b/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java index 40f9807be..4591ddacc 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/TdbUpdate.java @@ -20,7 +20,7 @@ import gplx.core.criterias.*; import gplx.lists.*; /*GfoNde*/ import gplx.dbs.qrys.*; class TdbUpdateWkr implements Db_qryWkr { public Object Exec(Db_engine engineObj, Db_qry cmdObj) { - TdbEngine engine = TdbEngine.cast_(engineObj); Db_qry_update cmd = (Db_qry_update)cmdObj; + TdbEngine engine = TdbEngine.cast(engineObj); Db_qry_update cmd = (Db_qry_update)cmdObj; int rv = 0; TdbTable tbl = engine.FetchTbl(cmd.Base_table()); diff --git a/140_dbs/src/gplx/dbs/engines/tdbs/Tdb_conn_info.java b/140_dbs/src/gplx/dbs/engines/tdbs/Tdb_conn_info.java index 4736ae7a8..e0ec79303 100644 --- a/140_dbs/src/gplx/dbs/engines/tdbs/Tdb_conn_info.java +++ b/140_dbs/src/gplx/dbs/engines/tdbs/Tdb_conn_info.java @@ -20,7 +20,7 @@ public class Tdb_conn_info extends Db_conn_info__base { public Io_url Url() {return url;} Io_url url; @Override public String Tid() {return Tid_const;} public static final String Tid_const = "tdb"; public static Db_conn_info new_(Io_url url) { - return Db_conn_info_.parse_(Bld_raw + return Db_conn_info_.parse(Bld_raw ( "gplx_key", Tid_const , "url", url.Raw() )); diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld.java b/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld.java index c4de402af..3d57791bf 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld.java @@ -25,13 +25,13 @@ public class Meta_parser__fld { Meta_parser__fld_itm type_itm = (Meta_parser__fld_itm)type_obj; rdr.Pos_add(type_itm.Word().length); int paren_itms_count = type_itm.Paren_itms_count(); - int len_1 = Int_.MinValue, len_2 = Int_.MinValue; + int len_1 = Int_.Min_value, len_2 = Int_.Min_value; if (paren_itms_count > 0) { rdr.Skip_ws().Chk_byte_or_fail(Byte_ascii.Paren_bgn); - len_1 = rdr.Skip_ws().Read_int_to_non_num(); if (len_1 == Int_.MinValue) throw Err_.new_wo_type("invalid fld len_1", "snip", rdr.Mid_by_len_safe(40)); + len_1 = rdr.Skip_ws().Read_int_to_non_num(); if (len_1 == Int_.Min_value) throw Err_.new_wo_type("invalid fld len_1", "snip", rdr.Mid_by_len_safe(40)); if (paren_itms_count == 2) { rdr.Skip_ws().Chk_byte_or_fail(Byte_ascii.Comma); - len_2 = rdr.Skip_ws().Read_int_to_non_num(); if (len_2 == Int_.MinValue) throw Err_.new_wo_type("invalid fld len_2", "snip", rdr.Mid_by_len_safe(40)); + len_2 = rdr.Skip_ws().Read_int_to_non_num(); if (len_2 == Int_.Min_value) throw Err_.new_wo_type("invalid fld len_2", "snip", rdr.Mid_by_len_safe(40)); } rdr.Skip_ws().Chk_byte_or_fail(Byte_ascii.Paren_end); } diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld_tst.java b/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld_tst.java index 7b0a462a6..1a69eb161 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld_tst.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__fld_tst.java @@ -40,8 +40,8 @@ class Meta_parser__fld_fxt { private final Meta_parser__fld fld_parser = new Meta_parser__fld(); private final Sql_bry_rdr rdr = new Sql_bry_rdr(); public void Clear() {} - public Meta_type_itm Make_type(int tid_ansi) {return new Meta_type_itm(tid_ansi, -1, null, Int_.MinValue, Int_.MinValue);} - public Meta_type_itm Make_type(int tid_ansi, int len_1) {return new Meta_type_itm(tid_ansi, -1, null, len_1, Int_.MinValue);} + public Meta_type_itm Make_type(int tid_ansi) {return new Meta_type_itm(tid_ansi, -1, null, Int_.Min_value, Int_.Min_value);} + public Meta_type_itm Make_type(int tid_ansi, int len_1) {return new Meta_type_itm(tid_ansi, -1, null, len_1, Int_.Min_value);} public Meta_type_itm Make_type(int tid_ansi, int len_1, int len_2) {return new Meta_type_itm(tid_ansi, -1, null, len_1, len_2);} public Meta_fld_itm Make_fld(String name, int tid_ansi, int nullable) {return Make_fld(name, tid_ansi, nullable, false, false, null);} public Meta_fld_itm Make_fld(String name, int tid_ansi, int nullable, boolean autonumber, boolean primary_key) {return Make_fld(name, tid_ansi, nullable, false, false, null);} diff --git a/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__tbl_tst.java b/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__tbl_tst.java index 4e263631a..864086c24 100644 --- a/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__tbl_tst.java +++ b/140_dbs/src/gplx/dbs/metas/parsers/Meta_parser__tbl_tst.java @@ -46,7 +46,7 @@ class Meta_parser__tbl_fxt { Meta_tbl_itm rv = new Meta_tbl_itm(tbl_name, "NONE"); int len = fld_names.length; for (int i = 0; i < len; ++i) { - rv.Flds().Add(new Meta_fld_itm(fld_names[i], new Meta_type_itm(Db_meta_fld.Tid_int, Sqlite_tid.Tid_int, Bry_.new_a7("int"), Int_.MinValue, Int_.MinValue))); + rv.Flds().Add(new Meta_fld_itm(fld_names[i], new Meta_type_itm(Db_meta_fld.Tid_int, Sqlite_tid.Tid_int, Bry_.new_a7("int"), Int_.Min_value, Int_.Min_value))); } return rv; } diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java index 6f2263ecf..7a15d1133 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_flush.java @@ -28,7 +28,7 @@ public class Db_qry_flush implements Db_qry { public static Db_qry_flush as_(Object obj) {return obj instanceof Db_qry_flush ? (Db_qry_flush)obj : null;} - public static Db_qry_flush cast_(Object obj) {try {return (Db_qry_flush)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, Db_qry_flush.class, obj);}} + public static Db_qry_flush cast(Object obj) {try {return (Db_qry_flush)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, Db_qry_flush.class, obj);}} public static Db_qry_flush new_(String... ary) { Db_qry_flush rv = new Db_qry_flush(); rv.tableNames = ary; diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java index 93890a8c9..192e5f2da 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_sql.java @@ -37,7 +37,7 @@ public class Db_qry_sql implements Db_qry { return rv; } public static Db_qry_sql as_(Object obj) {return obj instanceof Db_qry_sql ? (Db_qry_sql)obj : null;} - public static Db_qry_sql cast_(Object obj) {try {return (Db_qry_sql)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, Db_qry_sql.class, obj);}} + public static Db_qry_sql cast(Object obj) {try {return (Db_qry_sql)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, Db_qry_sql.class, obj);}} public static String Gen_sql(Db_qry qry, Object... args) { byte[] src = Bry_.new_u8(Sql_qry_wtr_.Gen_placeholder_parameters(qry)); int src_len = src.length; @@ -58,21 +58,21 @@ public class Db_qry_sql implements Db_qry { if (val == null) {bfr.Add(Bry_null); return;} Class val_type = val.getClass(); if (Type_adp_.Eq(val_type, Int_.Cls_ref_type)) - bfr.Add_int_variable(Int_.cast_(val)); + bfr.Add_int_variable(Int_.cast(val)); else if (Type_adp_.Eq(val_type, Bool_.Cls_ref_type)) - bfr.Add_int_fixed(1, Bool_.Xto_int(Bool_.cast_(val))); // NOTE: save boolean to 0 or 1, b/c (a) db may not support bit datatype (sqllite) and (b) avoid i18n issues with "true"/"false" + bfr.Add_int_fixed(1, Bool_.To_int(Bool_.cast(val))); // NOTE: save boolean to 0 or 1, b/c (a) db may not support bit datatype (sqllite) and (b) avoid i18n issues with "true"/"false" else if (Type_adp_.Eq(val_type, Double_.Cls_ref_type)) - bfr.Add_double(Double_.cast_(val)); + bfr.Add_double(Double_.cast(val)); else if (Type_adp_.Eq(val_type, Long_.Cls_ref_type)) - bfr.Add_long_variable(Long_.cast_(val)); + bfr.Add_long_variable(Long_.cast(val)); else if (Type_adp_.Eq(val_type, Float_.Cls_ref_type)) - bfr.Add_float(Float_.cast_(val)); + bfr.Add_float(Float_.cast(val)); else if (Type_adp_.Eq(val_type, Byte_.Cls_ref_type)) - bfr.Add_byte(Byte_.cast_(val)); + bfr.Add_byte(Byte_.cast(val)); else if (Type_adp_.Eq(val_type, DateAdp_.Cls_ref_type)) - bfr.Add_byte_apos().Add_str(DateAdp_.cast_(val).XtoStr_gplx_long()).Add_byte_apos(); + bfr.Add_byte_apos().Add_str(DateAdp_.cast(val).XtoStr_gplx_long()).Add_byte_apos(); else if (Type_adp_.Eq(val_type, Decimal_adp_.Cls_ref_type)) - bfr.Add_str(Decimal_adp_.cast_(val).To_str()); + bfr.Add_str(Decimal_adp_.cast(val).To_str()); else { byte[] val_bry = Bry_.new_u8(Object_.Xto_str_strict_or_null(val)); val_bry = Bry_.Replace(val_bry, Byte_ascii.Apos_bry, Bry_escape_apos); diff --git a/140_dbs/src/gplx/dbs/qrys/Db_qry_sql_tst.java b/140_dbs/src/gplx/dbs/qrys/Db_qry_sql_tst.java index a43631cd7..c81f80c4e 100644 --- a/140_dbs/src/gplx/dbs/qrys/Db_qry_sql_tst.java +++ b/140_dbs/src/gplx/dbs/qrys/Db_qry_sql_tst.java @@ -22,7 +22,7 @@ public class Db_qry_sql_tst { @Test public void Insert() { fxt.Test_qry ( Db_qry_insert.new_("tbl", "k1", "k2", "k3", "k4", "k5", "k6", "k7", "k8", "k9") - , Object_.Ary(123, Bool_.Y, 1.23d, 123L, 123f, Byte_ascii.Num_1, "123", DateAdp_.parse_iso8561("1981-04-05T14:30:30"), Decimal_adp_.parse_("1.23")) + , Object_.Ary(123, Bool_.Y, 1.23d, 123L, 123f, Byte_ascii.Num_1, "123", DateAdp_.parse_iso8561("1981-04-05T14:30:30"), Decimal_adp_.parse("1.23")) , "INSERT INTO tbl (k1, k2, k3, k4, k5, k6, k7, k8, k9) VALUES (123, 1, 1.23, 123, 123, 1, '123', '1981-04-05 14:30:30.000', 1.23)" ); } diff --git a/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_ansi.java b/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_ansi.java index 9a638fcdd..2c6a4de09 100644 --- a/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_ansi.java +++ b/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_ansi.java @@ -155,7 +155,7 @@ public class Sql_qry_wtr_ansi implements Sql_qry_wtr { } Class val_type = val.getClass(); if (val_type == Bool_.Cls_ref_type) - sb.Add_obj(Bool_.Xto_int(Bool_.cast_(val))); // NOTE: save boolean to 0 or 1, b/c (a) db may not support bit datatype (sqllite) and (b) avoid i18n issues with "true"/"false" + sb.Add_obj(Bool_.To_int(Bool_.cast(val))); // NOTE: save boolean to 0 or 1, b/c (a) db may not support bit datatype (sqllite) and (b) avoid i18n issues with "true"/"false" else if ( val_type == Byte_.Cls_ref_type || val_type == Short_.Cls_ref_type || val_type == Int_.Cls_ref_type || val_type == Long_.Cls_ref_type diff --git a/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_iosql_tst.java b/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_iosql_tst.java index adcacc09f..d0c64d33f 100644 --- a/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_iosql_tst.java +++ b/140_dbs/src/gplx/dbs/sqls/Sql_qry_wtr_iosql_tst.java @@ -39,7 +39,7 @@ public class Sql_qry_wtr_iosql_tst { @Test public void Url() { fld = IoItm_base_.Prop_Path; tst_Write("url='C:\\fil.txt'", ioCrt_(fld, Criteria_.eq_("C:\\fil.txt"))); - tst_Write("url IOMATCH '*.txt'", ioCrt_(fld, Criteria_ioMatch.parse_(true, "*.txt", false))); + tst_Write("url IOMATCH '*.txt'", ioCrt_(fld, Criteria_ioMatch.parse(true, "*.txt", false))); } @Test public void Binary() { // parentheses around lhs and rhs diff --git a/140_dbs/src/gplx/dbs/sqls/Sql_select_fld_.java b/140_dbs/src/gplx/dbs/sqls/Sql_select_fld_.java index 522c0b866..113f230a6 100644 --- a/140_dbs/src/gplx/dbs/sqls/Sql_select_fld_.java +++ b/140_dbs/src/gplx/dbs/sqls/Sql_select_fld_.java @@ -42,7 +42,7 @@ class Sql_select_fld_count extends Sql_select_fld_func_base { @Override public void GroupBy_type(GfoFld fld) {this.ValType_set(IntClassXtn._);} @Override public Object GroupBy_eval(Object groupByVal, Object curVal, ClassXtn type) { if (groupByVal == null) return 1; - return Int_.cast_(groupByVal) + 1; + return Int_.cast(groupByVal) + 1; } } class Sql_select_fld_sum extends Sql_select_fld_func_base { @@ -50,8 +50,8 @@ class Sql_select_fld_sum extends Sql_select_fld_func_base { @Override public String XtoSql_functionName() {return "SUM";} @Override public void GroupBy_type(GfoFld fld) {this.ValType_set(IntClassXtn._);} @Override public Object GroupBy_eval(Object groupByVal, Object curVal, ClassXtn type) { - if (groupByVal == null) return Int_.cast_(curVal); - return Int_.cast_(groupByVal) + Int_.cast_(curVal); + if (groupByVal == null) return Int_.cast(curVal); + return Int_.cast(groupByVal) + Int_.cast(curVal); } } class Sql_select_fld_minMax extends Sql_select_fld_func_base { diff --git a/150_gfui/src_100_basic/gplx/gfui/GfuiAlign_.java b/150_gfui/src_100_basic/gplx/gfui/GfuiAlign_.java index 577e1d31c..40c507364 100644 --- a/150_gfui/src_100_basic/gplx/gfui/GfuiAlign_.java +++ b/150_gfui/src_100_basic/gplx/gfui/GfuiAlign_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class GfuiAlign_ implements ParseAble { public static GfuiAlign as_(Object obj) {return obj instanceof GfuiAlign ? (GfuiAlign)obj : null;} - public static GfuiAlign cast_(Object obj) {try {return (GfuiAlign)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiAlign.class, obj);}} + public static GfuiAlign cast(Object obj) {try {return (GfuiAlign)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiAlign.class, obj);}} public static final GfuiAlign Null = new_(0, "nil") , Lo = new_(1, "lo") @@ -31,14 +31,14 @@ public class GfuiAlign_ implements ParseAble { , Right = Hi; static GfuiAlign new_(int v, String s) {return new GfuiAlign(v, s);} public static final GfuiAlign_ Parser = new GfuiAlign_(); - public Object ParseAsObj(String raw) {return parse_(raw);} + public Object ParseAsObj(String raw) {return parse(raw);} public static GfuiAlign val_(int v) { if (v == Lo.Val()) return Lo; else if (v == Mid.Val()) return Mid; else if (v == Hi.Val()) return Hi; else return Null; } - public static GfuiAlign parse_(String raw) { + public static GfuiAlign parse(String raw) { if (String_.Eq(raw, "bot")) return Bot; else if (String_.Eq(raw, "mid")) return Mid; else if (String_.Eq(raw, "top")) return Top; @@ -51,7 +51,7 @@ public class GfuiAlign_ implements ParseAble { } public static int CalcInsideOfAxis(int posEnm, int innerSize, int outerSize) { int rv = 0; - if (posEnm == GfuiAlign_.Null.Val()) rv = Int_.MinValue; + if (posEnm == GfuiAlign_.Null.Val()) rv = Int_.Min_value; else if (posEnm == GfuiAlign_.Lo.Val()) rv = 0; else if (posEnm == GfuiAlign_.Mid.Val()) rv = (outerSize - innerSize) / 2; else if (posEnm == GfuiAlign_.Hi.Val()) rv = outerSize - innerSize; diff --git a/150_gfui/src_100_basic/gplx/gfui/GfuiBorderEdge.java b/150_gfui/src_100_basic/gplx/gfui/GfuiBorderEdge.java index 168162620..6f76fce61 100644 --- a/150_gfui/src_100_basic/gplx/gfui/GfuiBorderEdge.java +++ b/150_gfui/src_100_basic/gplx/gfui/GfuiBorderEdge.java @@ -39,7 +39,7 @@ class GfuiBorderEdge_ { else if (val == GfuiBorderEdge.All.Val()) return All_raw; else throw Err_.new_unhandled(edge); } - public static GfuiBorderEdge parse_(String raw) { + public static GfuiBorderEdge parse(String raw) { if (String_.Eq(raw, Left_raw)) return GfuiBorderEdge.Left; else if (String_.Eq(raw, Right_raw)) return GfuiBorderEdge.Right; else if (String_.Eq(raw, Top_raw)) return GfuiBorderEdge.Top; diff --git a/150_gfui/src_100_basic/gplx/gfui/PointAdp_.java b/150_gfui/src_100_basic/gplx/gfui/PointAdp_.java index 2514babc0..15f0d9145 100644 --- a/150_gfui/src_100_basic/gplx/gfui/PointAdp_.java +++ b/150_gfui/src_100_basic/gplx/gfui/PointAdp_.java @@ -17,16 +17,16 @@ along with this program. If not, see . */ package gplx.gfui; import gplx.*; public class PointAdp_ { - public static final PointAdp Null = new PointAdp(Int_.MinValue, Int_.MinValue); + public static final PointAdp Null = new PointAdp(Int_.Min_value, Int_.Min_value); public static final PointAdp Zero = new PointAdp(0, 0); public static PointAdp as_(Object obj) {return obj instanceof PointAdp ? (PointAdp)obj : null;} - public static PointAdp cast_(Object obj) {try {return (PointAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, PointAdp.class, obj);}} + public static PointAdp cast(Object obj) {try {return (PointAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, PointAdp.class, obj);}} public static PointAdp new_(int x, int y) {return new PointAdp(x, y);} - public static PointAdp coerce_(Object o) {PointAdp rv = PointAdp_.as_(o); return (rv == null) ? parse_((String)o) : rv;} - public static PointAdp parse_(String raw) { + public static PointAdp coerce_(Object o) {PointAdp rv = PointAdp_.as_(o); return (rv == null) ? parse((String)o) : rv;} + public static PointAdp parse(String raw) { try { String[] ary = String_.Split(raw, ","); - return new PointAdp(Int_.parse_(ary[0]), Int_.parse_(ary[1])); + return new PointAdp(Int_.parse(ary[0]), Int_.parse(ary[1])); } catch (Exception exc) {throw Err_.new_parse_exc(exc, PointAdp.class, raw);} } } diff --git a/150_gfui/src_100_basic/gplx/gfui/RectAdpF.java b/150_gfui/src_100_basic/gplx/gfui/RectAdpF.java index bdf26fd36..05bf5ffb9 100644 --- a/150_gfui/src_100_basic/gplx/gfui/RectAdpF.java +++ b/150_gfui/src_100_basic/gplx/gfui/RectAdpF.java @@ -24,7 +24,7 @@ public class RectAdpF { //_20101206 // supports Graphics.MeasureString return comp.x == x && comp.y == y && comp.width == width && comp.height == height; } - public static final RectAdpF Null = new_(Int_.MinValue, Int_.MinValue, Int_.MinValue, Int_.MinValue); + public static final RectAdpF Null = new_(Int_.Min_value, Int_.Min_value, Int_.Min_value, Int_.Min_value); public static RectAdpF new_(float x, float y, float width, float height) { RectAdpF rv = new RectAdpF(); rv.x = x; rv.y = y; rv.width = width; rv.height = height; diff --git a/150_gfui/src_100_basic/gplx/gfui/RectAdp_.java b/150_gfui/src_100_basic/gplx/gfui/RectAdp_.java index 61b03fa08..2d7a45110 100644 --- a/150_gfui/src_100_basic/gplx/gfui/RectAdp_.java +++ b/150_gfui/src_100_basic/gplx/gfui/RectAdp_.java @@ -23,11 +23,11 @@ public class RectAdp_ { public static RectAdp vector_(PointAdp pos, SizeAdp size) {return new RectAdp(pos, size);} public static RectAdp size_(int w, int h) {return new_(0, 0, w, h);} public static RectAdp size_(SizeAdp size) {return new RectAdp(PointAdp_.Zero, size);} - public static RectAdp parse_ws_(String raw) {return parse_(String_.Replace(raw, " ", ""));} - public static RectAdp parse_(String raw) { + public static RectAdp parse_ws_(String raw) {return parse(String_.Replace(raw, " ", ""));} + public static RectAdp parse(String raw) { try { String[] ary = String_.Split(raw, ","); - return RectAdp_.new_(Int_.parse_(ary[0]), Int_.parse_(ary[1]), Int_.parse_(ary[2]), Int_.parse_(ary[3])); + return RectAdp_.new_(Int_.parse(ary[0]), Int_.parse(ary[1]), Int_.parse(ary[2]), Int_.parse(ary[3])); } catch(Exception exc) {throw Err_.new_parse_exc(exc, RectAdp.class, raw);} } public static String Xto_str(RectAdp rect) {return String_.Format("{0},{1},{2},{3}", rect.X(), rect.Y(), rect.Width(), rect.Height());} diff --git a/150_gfui/src_100_basic/gplx/gfui/SizeAdpF.java b/150_gfui/src_100_basic/gplx/gfui/SizeAdpF.java index b2109766f..767a980a3 100644 --- a/150_gfui/src_100_basic/gplx/gfui/SizeAdpF.java +++ b/150_gfui/src_100_basic/gplx/gfui/SizeAdpF.java @@ -19,7 +19,7 @@ package gplx.gfui; import gplx.*; public class SizeAdpF implements ParseAble { public float Width() {return width;} float width; public float Height() {return height;} float height; - public Object ParseAsObj(String raw) {return SizeAdp_.parse_(raw);} + public Object ParseAsObj(String raw) {return SizeAdp_.parse(raw);} @Override public String toString() {return String_.Concat_any(width, ":", height);} @gplx.Internal protected SizeAdpF(float width, float height) {this.width = width; this.height = height;} } diff --git a/150_gfui/src_100_basic/gplx/gfui/SizeAdpF_.java b/150_gfui/src_100_basic/gplx/gfui/SizeAdpF_.java index e97438826..5761230e3 100644 --- a/150_gfui/src_100_basic/gplx/gfui/SizeAdpF_.java +++ b/150_gfui/src_100_basic/gplx/gfui/SizeAdpF_.java @@ -17,17 +17,17 @@ along with this program. If not, see . */ package gplx.gfui; import gplx.*; public class SizeAdpF_ { - public static final SizeAdpF Null = new_(Int_.MinValue, Int_.MinValue); + public static final SizeAdpF Null = new_(Int_.Min_value, Int_.Min_value); public static final SizeAdpF Zero = new_(0, 0); public static final SizeAdpF Parser = new SizeAdpF(0, 0); public static SizeAdpF as_(Object obj) {return obj instanceof SizeAdpF ? (SizeAdpF)obj : null;} public static SizeAdpF new_(float width, float height) {return new SizeAdpF(width, height);} - public static SizeAdpF coerce_(Object obj) {SizeAdpF rv = as_(obj); return rv == null ? parse_((String)obj) : rv;} - public static SizeAdpF parse_(String s) { + public static SizeAdpF coerce_(Object obj) {SizeAdpF rv = as_(obj); return rv == null ? parse((String)obj) : rv;} + public static SizeAdpF parse(String s) { try { String[] ary = String_.Split(s, ","); if (ary.length != 2) throw Err_.new_wo_type("SizeAdf should only have 2 numbers separated by 1 comma"); - float val1 = Float_.parse_(ary[0]); - float val2 = Float_.parse_(ary[1]); + float val1 = Float_.parse(ary[0]); + float val2 = Float_.parse(ary[1]); return new_(val1, val2); } catch (Exception e) {throw Err_.new_parse_exc(e, SizeAdpF.class, s);} } diff --git a/150_gfui/src_100_basic/gplx/gfui/SizeAdp_.java b/150_gfui/src_100_basic/gplx/gfui/SizeAdp_.java index 0e5d5f406..ebb80694e 100644 --- a/150_gfui/src_100_basic/gplx/gfui/SizeAdp_.java +++ b/150_gfui/src_100_basic/gplx/gfui/SizeAdp_.java @@ -17,16 +17,16 @@ along with this program. If not, see . */ package gplx.gfui; import gplx.*; public class SizeAdp_ { - public static final SizeAdp Null = new SizeAdp(Int_.MinValue, Int_.MinValue); + public static final SizeAdp Null = new SizeAdp(Int_.Min_value, Int_.Min_value); public static final SizeAdp Zero = new SizeAdp(0, 0); public static final SizeAdp[] Ary_empty = new SizeAdp[0]; - public static SizeAdp cast_(Object obj) {try {return (SizeAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, SizeAdp.class, obj);}} + public static SizeAdp cast(Object obj) {try {return (SizeAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, SizeAdp.class, obj);}} public static SizeAdp new_(int width, int height) {return new SizeAdp(width, height);} - public static SizeAdp parse_(String raw) {return parse_or_(raw, SizeAdp_.Null);} - public static SizeAdp parse_or_(String raw, SizeAdp or) { + public static SizeAdp parse(String raw) {return parse_or(raw, SizeAdp_.Null);} + public static SizeAdp parse_or(String raw, SizeAdp or) { String[] ary = String_.Split(raw, ","); if (ary.length != 2) return or; - int w = Int_.parse_or_(ary[0], Int_.MinValue); if (w == Int_.MinValue) return or; - int h = Int_.parse_or_(ary[1], Int_.MinValue); if (h == Int_.MinValue) return or; + int w = Int_.parse_or(ary[0], Int_.Min_value); if (w == Int_.Min_value) return or; + int h = Int_.parse_or(ary[1], Int_.Min_value); if (h == Int_.Min_value) return or; return new SizeAdp(w, h); } public static SizeAdp corners_(PointAdp topLeft, PointAdp bottomRight) { diff --git a/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp_.java b/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp_.java index de60a7db1..6d3d3d3d3 100644 --- a/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp_.java +++ b/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp_.java @@ -19,15 +19,15 @@ package gplx.gfui; import gplx.*; import gplx.texts.*; public class ColorAdp_ implements ParseAble { public static ColorAdp as_(Object obj) {return obj instanceof ColorAdp ? (ColorAdp)obj : null;} - public static ColorAdp cast_(Object obj) {try {return (ColorAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, ColorAdp.class, obj);}} + public static ColorAdp cast(Object obj) {try {return (ColorAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, ColorAdp.class, obj);}} public static ColorAdp new_(int a, int r, int g, int b) {return ColorAdp.new_((int)a, (int)r, (int)g, (int)b);} public static final ColorAdp_ Parser = new ColorAdp_(); - public Object ParseAsObj(String raw) {return ColorAdp_.parse_(raw);} + public Object ParseAsObj(String raw) {return ColorAdp_.parse(raw);} public static ColorAdp parseOr_(String raw, ColorAdp or) { ColorAdp rv = parse_internal_(raw); if (rv == null) return or; return rv; } - public static ColorAdp parse_(String raw) { + public static ColorAdp parse(String raw) { ColorAdp rv = parse_internal_(raw); if (rv == null) throw Err_.new_parse_type(ColorAdp.class, raw); return rv; } @@ -63,7 +63,7 @@ public class ColorAdp_ implements ParseAble { int rawLen = String_.Len(raw); for (int i = 1; i < rawLen; i += 2) { // fill ARGB ary by parsing raw 2 at a time; EX: #FFFFFFFF -> 255,255,255,255; NOTE: start at 1 to ignore leading # String hexStr = String_.MidByLen(raw, i, 2); - ary[idx++] = HexDecUtl.parse_(hexStr); + ary[idx++] = HexDecUtl.parse(hexStr); } return ColorAdp.new_(ary[0], ary[1], ary[2], ary[3]); } catch (Exception exc) {throw Err_.new_parse_exc(exc, ColorAdp.class, raw);} @@ -71,7 +71,7 @@ public class ColorAdp_ implements ParseAble { @gplx.Internal protected static ColorAdp parse_int_(String v) { String[] ary = String_.Split(v, ","); switch (ary.length) { - case 1: return new_int_(Int_.parse_(ary[0])); + case 1: return new_int_(Int_.parse(ary[0])); case 3: case 4: return parse_int_ary_(ary); default: throw Err_.new_wo_type("invalid array", "len", ary.length); @@ -81,10 +81,10 @@ public class ColorAdp_ implements ParseAble { int a; int idx = 0; if (ary.length == 3) {idx = 0; a = 255;} - else {idx = 1; a = Int_.parse_(ary[0]);} - int r = Int_.parse_(ary[idx++]); - int g = Int_.parse_(ary[idx++]); - int b = Int_.parse_(ary[idx++]); + else {idx = 1; a = Int_.parse(ary[0]);} + int r = Int_.parse(ary[idx++]); + int g = Int_.parse(ary[idx++]); + int b = Int_.parse(ary[idx++]); return ColorAdp_.new_(a, r, g, b); } public static ColorAdp new_int_(int val) { @@ -94,7 +94,7 @@ public class ColorAdp_ implements ParseAble { int b = ((val) & 255); return ColorAdp.new_(a, r, g, b); } - public static ColorAdp read_(Object o) {String s = String_.as_(o); return s != null ? ColorAdp_.parse_(s) : ColorAdp_.cast_(o);} + public static ColorAdp read_(Object o) {String s = String_.as_(o); return s != null ? ColorAdp_.parse(s) : ColorAdp_.cast(o);} public static final ColorAdp Null = new_( 0, 0, 0, 0) , Black = new_(255, 0, 0, 0) diff --git a/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp__tst.java b/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp__tst.java index 19a0775fa..90033221f 100644 --- a/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp__tst.java +++ b/150_gfui/src_110_draw_core/gplx/gfui/ColorAdp__tst.java @@ -28,10 +28,10 @@ public class ColorAdp__tst { tst_parse_int_(255, 0, 0, 0, 255); tst_parse_int_(65535, 0, 0, 255, 255); tst_parse_int_(16777215, 0, 255, 255, 255); - tst_parse_int_(Int_.MaxValue, 127, 255, 255, 255); + tst_parse_int_(Int_.Max_value, 127, 255, 255, 255); tst_parse_int_(-1, 255, 255, 255, 255); } - @Test public void parse_() { + @Test public void parse() { tst_parse_("0,0,0,0", 0, 0, 0, 0); // parse all ints tst_parse_("0,0,0", 255, 0, 0, 0); // a=255, parse rest tst_parse_("255", 0, 0, 0, 255); // parse as single int @@ -46,7 +46,7 @@ public class ColorAdp__tst { tst_ColorAdp(color, a, r, g, b); Tfds.Eq(color.Value(), val); } - void tst_parse_(String s, int alpha, int red, int green, int blue) {tst_ColorAdp(ColorAdp_.parse_(s), alpha, red, green, blue);} + void tst_parse_(String s, int alpha, int red, int green, int blue) {tst_ColorAdp(ColorAdp_.parse(s), alpha, red, green, blue);} void tst_ColorAdp(ColorAdp color, int alpha, int red, int green, int blue) { TfdsTstr_fxt tstr = TfdsTstr_fxt.new_(); tstr.Eq_str(color.Alpha(), alpha, "alpha"); diff --git a/150_gfui/src_110_draw_core/gplx/gfui/FontAdp.java b/150_gfui/src_110_draw_core/gplx/gfui/FontAdp.java index 6f09aff0a..7dbff37d1 100644 --- a/150_gfui/src_110_draw_core/gplx/gfui/FontAdp.java +++ b/150_gfui/src_110_draw_core/gplx/gfui/FontAdp.java @@ -56,7 +56,7 @@ public class FontAdp implements GfoInvkAble { public static final FontAdp NullPtr = null; public static FontAdp as_(Object obj) {return obj instanceof FontAdp ? (FontAdp)obj : null;} - public static FontAdp cast_(Object obj) {try {return (FontAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, FontAdp.class, obj);}} + public static FontAdp cast(Object obj) {try {return (FontAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, FontAdp.class, obj);}} public static FontAdp new_(String name, float size, FontStyleAdp style) { FontAdp rv = new FontAdp(); rv.name = name; rv.size = size; rv.style = style; diff --git a/150_gfui/src_110_draw_core/gplx/gfui/FontStyleAdp_.java b/150_gfui/src_110_draw_core/gplx/gfui/FontStyleAdp_.java index 0e44c842c..8442596b0 100644 --- a/150_gfui/src_110_draw_core/gplx/gfui/FontStyleAdp_.java +++ b/150_gfui/src_110_draw_core/gplx/gfui/FontStyleAdp_.java @@ -25,9 +25,9 @@ public class FontStyleAdp_ implements ParseAble { , BoldItalic = new FontStyleAdp(3) ; public static final FontStyleAdp_ Parser = new FontStyleAdp_(); - public Object ParseAsObj(String raw) {return FontStyleAdp_.parse_(raw);} + public Object ParseAsObj(String raw) {return FontStyleAdp_.parse(raw);} - public static FontStyleAdp cast_(Object obj) {try {return (FontStyleAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, FontStyleAdp.class, obj);}} + public static FontStyleAdp cast(Object obj) {try {return (FontStyleAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, FontStyleAdp.class, obj);}} public static FontStyleAdp parseOr_(String raw, FontStyleAdp or) { FontStyleAdp rv = parse_internal_(raw); if (rv == null) return or; return rv; @@ -37,11 +37,11 @@ public class FontStyleAdp_ implements ParseAble { v += italic == Bool_obj_val.True ? 2 : 0; return lang_(v); } - public static FontStyleAdp parse_(String raw) { + public static FontStyleAdp parse(String raw) { FontStyleAdp rv = parse_internal_(raw); if (rv == null) throw Err_.new_unhandled(raw); return rv; } - public static FontStyleAdp read_(Object o) {String s = String_.as_(o); return s != null ? FontStyleAdp_.parse_(s) : FontStyleAdp_.cast_(o);} + public static FontStyleAdp read_(Object o) {String s = String_.as_(o); return s != null ? FontStyleAdp_.parse(s) : FontStyleAdp_.cast(o);} static FontStyleAdp parse_internal_(String raw) { if (String_.Eq(raw, "plain")) return FontStyleAdp_.Plain; else if (String_.Eq(raw, "bold")) return FontStyleAdp_.Bold; diff --git a/150_gfui/src_110_draw_core/gplx/gfui/PenAdp_.java b/150_gfui/src_110_draw_core/gplx/gfui/PenAdp_.java index 306d137c6..de473a721 100644 --- a/150_gfui/src_110_draw_core/gplx/gfui/PenAdp_.java +++ b/150_gfui/src_110_draw_core/gplx/gfui/PenAdp_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class PenAdp_ { public static PenAdp as_(Object obj) {return obj instanceof PenAdp ? (PenAdp)obj : null;} - public static PenAdp cast_(Object obj) {try {return (PenAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, PenAdp.class, obj);}} + public static PenAdp cast(Object obj) {try {return (PenAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, PenAdp.class, obj);}} public static PenAdp black_() {return new_(ColorAdp_.Black, 1);} public static PenAdp new_(ColorAdp color) {return new_(color, 1);} public static PenAdp new_(ColorAdp color, float width) {return new PenAdp(color, width);} diff --git a/150_gfui/src_110_draw_core/gplx/gfui/SolidBrushAdp_.java b/150_gfui/src_110_draw_core/gplx/gfui/SolidBrushAdp_.java index 5ab91d347..0a61bb37c 100644 --- a/150_gfui/src_110_draw_core/gplx/gfui/SolidBrushAdp_.java +++ b/150_gfui/src_110_draw_core/gplx/gfui/SolidBrushAdp_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class SolidBrushAdp_ { public static SolidBrushAdp as_(Object obj) {return obj instanceof SolidBrushAdp ? (SolidBrushAdp)obj : null;} - public static SolidBrushAdp cast_(Object obj) {try {return (SolidBrushAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, SolidBrushAdp.class, obj);}} + public static SolidBrushAdp cast(Object obj) {try {return (SolidBrushAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, SolidBrushAdp.class, obj);}} public static final SolidBrushAdp Black = new_(ColorAdp_.Black); public static final SolidBrushAdp White = new_(ColorAdp_.White); public static final SolidBrushAdp Null = new_(ColorAdp_.Null); diff --git a/150_gfui/src_120_draw_objs/gplx/gfui/GfuiBorderMgr.java b/150_gfui/src_120_draw_objs/gplx/gfui/GfuiBorderMgr.java index ccc28afef..5138556a5 100644 --- a/150_gfui/src_120_draw_objs/gplx/gfui/GfuiBorderMgr.java +++ b/150_gfui/src_120_draw_objs/gplx/gfui/GfuiBorderMgr.java @@ -40,7 +40,7 @@ public class GfuiBorderMgr { this.None_(); else { Object[] ary = (Object[])o; - this.Edge_set(GfuiBorderEdge.All, PenAdp_.new_((ColorAdp)ary[1], Float_.cast_(ary[0]))); + this.Edge_set(GfuiBorderEdge.All, PenAdp_.new_((ColorAdp)ary[1], Float_.cast(ary[0]))); } } public void Edge_set(GfuiBorderEdge edge, PenAdp pen) { diff --git a/150_gfui/src_120_draw_objs/gplx/gfui/GfxStringData.java b/150_gfui/src_120_draw_objs/gplx/gfui/GfxStringData.java index 185ec1854..dc78cf29e 100644 --- a/150_gfui/src_120_draw_objs/gplx/gfui/GfxStringData.java +++ b/150_gfui/src_120_draw_objs/gplx/gfui/GfxStringData.java @@ -93,7 +93,7 @@ public class GfxStringData { // } float x = GfuiAlign_.CalcInsideOfAxis(alignH.Val(), (int)width, ownerSize.Width()); float y = 0; int alignVVal = alignV.Val(); float ownerHeight = ownerSize.Height(); - if (alignVVal == GfuiAlign_.Null.Val()) y = Int_.MinValue; + if (alignVVal == GfuiAlign_.Null.Val()) y = Int_.Min_value; else if (alignVVal == GfuiAlign_.Lo.Val()) y = height - descent; else if (alignVVal == GfuiAlign_.Mid.Val()) y = (ownerHeight - (ownerHeight - height) / 2);// - descent; // COMMENT: subtracting descent is theoretically correct, but practically results in text shifted up else if (alignVVal == GfuiAlign_.Hi.Val()) y = ownerHeight - descent; diff --git a/150_gfui/src_120_draw_objs/gplx/gfui/PaintArgs.java b/150_gfui/src_120_draw_objs/gplx/gfui/PaintArgs.java index 8b95feed7..3db0596d6 100644 --- a/150_gfui/src_120_draw_objs/gplx/gfui/PaintArgs.java +++ b/150_gfui/src_120_draw_objs/gplx/gfui/PaintArgs.java @@ -20,7 +20,7 @@ public class PaintArgs { public GfxAdp Graphics() {return graphics;} GfxAdp graphics; public RectAdp ClipRect() {return clipRect;} RectAdp clipRect; - public static PaintArgs cast_(Object obj) {try {return (PaintArgs)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, PaintArgs.class, obj);}} + public static PaintArgs cast(Object obj) {try {return (PaintArgs)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, PaintArgs.class, obj);}} public static PaintArgs new_(GfxAdp graphics, RectAdp clipRect) { PaintArgs rv = new PaintArgs(); rv.graphics = graphics; rv.clipRect = clipRect; diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptArg.java b/150_gfui/src_200_ipt/gplx/gfui/IptArg.java index 76ff9b0d2..72f2bb5c6 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptArg.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptArg.java @@ -34,11 +34,11 @@ class IptKeyChain implements IptArg { } key = sb.To_str(); } - public static IptKeyChain parse_(String raw) { + public static IptKeyChain parse(String raw) { String[] itms = String_.Split(raw, ","); IptArg[] rv = new IptArg[itms.length]; for (int i = 0; i < rv.length; i++) - rv[i] = IptArg_.parse_(String_.Trim(itms[i])); + rv[i] = IptArg_.parse(String_.Trim(itms[i])); return new IptKeyChain(rv); } } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptArg_.java b/150_gfui/src_200_ipt/gplx/gfui/IptArg_.java index 7ba8d44a8..5b4c604cf 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptArg_.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptArg_.java @@ -20,7 +20,7 @@ public class IptArg_ { public static final IptArg[] Ary_empty = new IptArg[0]; public static final IptArg Null = null; public static final String Wildcard_key = "wildcard"; - public static IptArg Wildcard = new IptKey(Int_.MaxValue, Wildcard_key); + public static IptArg Wildcard = new IptKey(Int_.Max_value, Wildcard_key); public static boolean Is_null_or_none(IptArg arg) {return arg == Null || arg == IptKey_.None;} public static IptArg[] Ary(IptArg... v) {return v;} public static IptArg[] parse_ary_or_empty(String v) { @@ -35,28 +35,28 @@ public class IptArg_ { int args_len = args.length; if (args_len == 0) return Ary_empty; IptArg[] rv = new IptArg[args_len]; for (int i = 0; i < args_len; i++) - rv[i] = parse_(String_.Trim(args[i])); + rv[i] = parse(String_.Trim(args[i])); return rv; } - public static IptArg parse_chain_(String raw) {return IptKeyChain.parse_(raw);} + public static IptArg parse_chain_(String raw) {return IptKeyChain.parse(raw);} public static IptArg parse_or_none_(String raw) { try { return String_.Eq(raw, String_.Empty) ? IptKey_.None - : parse_(raw); + : parse(raw); } catch (Exception exc) { // as an "or" proc, handle errors; note that it may accept raw values from cfg files, so invalid input is possible; DATE:2014-06-04 Err_.Noop(exc); return IptKey_.None; } } - public static IptArg parse_(String raw) { - if (String_.Has(raw, ",")) return IptKeyChain.parse_(raw); + public static IptArg parse(String raw) { + if (String_.Has(raw, ",")) return IptKeyChain.parse(raw); String bgn = String_.GetStrBefore(raw, "."); - if (String_.Eq(bgn, "wheel")) return IptMouseWheel_.parse_(raw); - else if (String_.Eq(bgn, "mouse")) return IptMouseBtn_.parse_(raw); - else if (String_.Eq(bgn, "key")) return IptKey_.parse_(raw); - else return IptMacro._.parse_(raw); + if (String_.Eq(bgn, "wheel")) return IptMouseWheel_.parse(raw); + else if (String_.Eq(bgn, "mouse")) return IptMouseBtn_.parse(raw); + else if (String_.Eq(bgn, "key")) return IptKey_.parse(raw); + else return IptMacro._.parse(raw); } // NOTE: the following two methods should theoretically be interface methods, but since they are only used by two procs, they will be handled with if/else @gplx.Internal protected static IptEventType EventType_default(IptArg arg) { @@ -98,7 +98,7 @@ class IptMacro { Reg("mod", "as", IptKey_.add_(IptKey_.Alt, IptKey_.Shift)); Reg("mod", "cas", IptKey_.add_(IptKey_.Ctrl, IptKey_.Alt, IptKey_.Shift)); } - public IptArg parse_(String raw) { + public IptArg parse(String raw) { if (regy == null) Init(); String[] plusAry = String_.Split(raw, "+"); String[] dotAry = String_.Split(plusAry[0], "."); @@ -108,7 +108,7 @@ class IptMacro { IptKey rv = (IptKey)list.Get_by(end); if (rv == null) throw parse_err(raw, "arg not found").Args_add("arg", end); for (int i = 1; i < plusAry.length; i++) { - rv = rv.Add((IptKey)IptKey_.parse_(plusAry[i])); + rv = rv.Add((IptKey)IptKey_.parse(plusAry[i])); } return rv; } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_chkBox.java b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_chkBox.java index dc94b5351..dba832f12 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_chkBox.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_chkBox.java @@ -19,7 +19,7 @@ package gplx.gfui; import gplx.*; public class IptBnd_chkBox implements InjectAble, GfoEvObj { public GfoEvMgr EvMgr() {if (evMgr == null) evMgr = GfoEvMgr.new_(this); return evMgr;} GfoEvMgr evMgr; public void Inject(Object owner) { - chkBox = GfuiChkBox_.cast_(owner); + chkBox = GfuiChkBox_.cast(owner); GfoEvMgr_.Sub(chkBox, "Check_end", this, setCmd); GfoEvMgr_.SubSame(fwd, setEvt, this); } @@ -36,7 +36,7 @@ public class IptBnd_chkBox implements InjectAble, GfoEvObj { GfoEvObj fwd; GfoInvkAble invkAble; String setCmd, setEvt, msgArg; GfuiChkBox chkBox; public static IptBnd_chkBox new_(GfoEvObj src, String setCmd, String setEvt, String msgArg) { IptBnd_chkBox rv = new IptBnd_chkBox(); - rv.fwd = src; rv.invkAble = GfoInvkAble_.cast_(src); rv.setCmd = setCmd; rv.setEvt = setEvt; rv.msgArg = msgArg; + rv.fwd = src; rv.invkAble = GfoInvkAble_.cast(src); rv.setCmd = setCmd; rv.setEvt = setEvt; rv.msgArg = msgArg; return rv; } } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_cmd.java b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_cmd.java index e9ea2c2ec..d5ca3ef5d 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_cmd.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_cmd.java @@ -19,7 +19,7 @@ package gplx.gfui; import gplx.*; public class IptBnd_txt_cmd implements InjectAble, GfoInvkAble, GfoEvObj { public GfoEvMgr EvMgr() {if (evMgr == null) evMgr = GfoEvMgr.new_(this); return evMgr;} GfoEvMgr evMgr; public void Inject(Object owner) { - txtBox = GfuiTextBox_.cast_(owner); + txtBox = GfuiTextBox_.cast(owner); txtBox.TextAlignH_center_(); IptBnd_.cmd_to_(IptCfg_.Null, txtBox, this, TxtBox_exec, IptKey_.Enter); GfoEvMgr_.SubSame(fwd, setEvt, this); @@ -36,7 +36,7 @@ public class IptBnd_txt_cmd implements InjectAble, GfoInvkAble, GfoEvObj { GfuiTextBox txtBox; GfoInvkAble src; GfoEvObj fwd; String setCmd, setEvt; ClassXtn cls; public static IptBnd_txt_cmd new_(GfoEvObj fwd, String setCmd, String setEvt, ClassXtn cls) { IptBnd_txt_cmd rv = new IptBnd_txt_cmd(); - rv.fwd = fwd; rv.src = GfoInvkAble_.cast_(fwd); + rv.fwd = fwd; rv.src = GfoInvkAble_.cast(fwd); rv.setCmd = setCmd; rv.setEvt = setEvt; rv.cls = cls; return rv; } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_range.java b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_range.java index 7750ec691..a36a329c2 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_range.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_txt_range.java @@ -29,7 +29,7 @@ public class IptBnd_txt_range implements InjectAble, GfoInvkAble, GfoEvObj { return this; } KeyVal[] list = null; public void Inject(Object owner) { - txtBox = GfuiTextBox_.cast_(owner); + txtBox = GfuiTextBox_.cast(owner); txtBox.TextAlignH_center_(); IptBnd_.cmd_to_(IptCfg_.Null, txtBox, this, Invk_dec, IptKey_.Down, IptMouseWheel_.Down); IptBnd_.cmd_to_(IptCfg_.Null, txtBox, this, Invk_inc, IptKey_.Up, IptMouseWheel_.Up); @@ -52,14 +52,14 @@ public class IptBnd_txt_range implements InjectAble, GfoInvkAble, GfoEvObj { WhenEvtCmd(list[newVal].Key_as_obj()); } Object UpdateCmd() { - int idx = Int_.MinValue; + int idx = Int_.Min_value; String find = txtBox.Text(); for (int i = 0; i < list.length; i++) { // try to find .Text in list.Vals if (String_.Eq(find, (String)list[i].Val())) idx = i; } - if (idx == Int_.MinValue) { // try to find .Text in list.Keys - int key = Int_.parse_or_(txtBox.Text(), Int_.MinValue); if (key == Int_.MinValue) return GfoInvkAble_.Rv_unhandled; - idx = GetByKey(key); if (idx == Int_.MinValue) return GfoInvkAble_.Rv_unhandled; + if (idx == Int_.Min_value) { // try to find .Text in list.Keys + int key = Int_.parse_or(txtBox.Text(), Int_.Min_value); if (key == Int_.Min_value) return GfoInvkAble_.Rv_unhandled; + idx = GetByKey(key); if (idx == Int_.Min_value) return GfoInvkAble_.Rv_unhandled; } ExecCmd(setCmd, idx); return GfoInvkAble_.Rv_handled; @@ -71,7 +71,7 @@ public class IptBnd_txt_range implements InjectAble, GfoInvkAble, GfoEvObj { WhenEvtCmd(curId); } void WhenEvtCmd(Object id) { - int idx = GetByKey(id); if (idx == Int_.MinValue) return; + int idx = GetByKey(id); if (idx == Int_.Min_value) return; previewIdx = idx; txtBox.Text_(list[idx].Val_to_str_or_empty()); } @@ -84,7 +84,7 @@ public class IptBnd_txt_range implements InjectAble, GfoInvkAble, GfoEvObj { for (int i = 0; i < list.length; i++) { if (Object_.Eq(find, list[i].Key_as_obj())) return i; } - return Int_.MinValue; + return Int_.Min_value; } public static IptBnd_txt_range new_(GfoEvObj propSrc) { IptBnd_txt_range rv = new IptBnd_txt_range(); diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_upDownRange.java b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_upDownRange.java index 2e620c3d5..5e2a53e9d 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptBnd_upDownRange.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptBnd_upDownRange.java @@ -19,7 +19,7 @@ package gplx.gfui; import gplx.*; public class IptBnd_upDownRange implements InjectAble, GfoInvkAble, GfoEvObj { public GfoEvMgr EvMgr() {if (evMgr == null) evMgr = GfoEvMgr.new_(this); return evMgr;} GfoEvMgr evMgr; public void Inject(Object owner) { - txtBox = GfuiTextBox_.cast_(owner); + txtBox = GfuiTextBox_.cast(owner); txtBox.TextAlignH_center_(); if (bndCfg == null) bndCfg = IptCfg_.new_("gplx.gfui.IptBnd_upDownRange"); IptBnd_.cmd_to_(bndCfg, txtBox, this, Invk_TxtBox_dec, IptKey_.Down, IptMouseWheel_.Down); @@ -32,7 +32,7 @@ public class IptBnd_upDownRange implements InjectAble, GfoInvkAble, GfoEvObj { else if (ctx.Match(k, Invk_TxtBox_inc)) ExecCmd(cmd, curVal + 1); else if (ctx.Match(k, Invk_TxtBox_exec)) { Object valObj = IntClassXtn._.ParseOrNull(txtBox.Text()); if (valObj == null) throw Err_.new_wo_type("invalid int", "text", txtBox.Text()); - ExecCmd(doIt, Int_.cast_(valObj)); + ExecCmd(doIt, Int_.cast(valObj)); } else if (ctx.Match(k, evt)) WhenEvt(ctx, m); else return GfoInvkAble_.Rv_unhandled; @@ -51,7 +51,7 @@ public class IptBnd_upDownRange implements InjectAble, GfoInvkAble, GfoEvObj { public static IptBnd_upDownRange new_(GfoEvObj fwd, String cmd, String evt, String arg) {return exec_(fwd, cmd, evt, cmd, arg);} public static IptBnd_upDownRange exec_(GfoEvObj fwd, String cmd, String evt, String doIt, String arg) { IptBnd_upDownRange rv = new IptBnd_upDownRange(); - rv.fwd = fwd; rv.src = GfoInvkAble_.cast_(fwd); + rv.fwd = fwd; rv.src = GfoInvkAble_.cast(fwd); rv.cmd = cmd; rv.evt = evt; rv.doIt = doIt; rv.arg = arg; return rv; } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptCfg_tst.java b/150_gfui/src_200_ipt/gplx/gfui/IptCfg_tst.java index 89ab70099..66bd0b4fd 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptCfg_tst.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptCfg_tst.java @@ -55,7 +55,7 @@ public class IptCfg_tst { box.tst_SendKey(IptKey_.A, 0); } @Test public void Chained() { - cfg.run_GetOrDflt(box, key, IptKeyChain.parse_("key.ctrl+key.a,key.b")); + cfg.run_GetOrDflt(box, key, IptKeyChain.parse("key.ctrl+key.a,key.b")); cfg.run_Set(key, IptKey_.A); box.tst_SendKey(IptKey_.A, 1); } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptEventData.java b/150_gfui/src_200_ipt/gplx/gfui/IptEventData.java index b141d02cd..e68f7eb7b 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptEventData.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptEventData.java @@ -36,7 +36,7 @@ public class IptEventData { } public static IptEventData as_(Object obj) {return obj instanceof IptEventData ? (IptEventData)obj : null;} - public static IptEventData cast_(Object obj) {try {return (IptEventData)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEventData.class, obj);}} + public static IptEventData cast(Object obj) {try {return (IptEventData)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEventData.class, obj);}} @gplx.Internal protected static IptEventData new_(GfuiElem sender, IptEventType eventType, IptArg eventArg, IptEvtDataKey keyData, IptEvtDataMouse mouseData) {return new_(sender, eventType, eventArg, keyData, IptEvtDataKeyHeld.Null, mouseData);} @gplx.Internal protected static IptEventData new_(GfuiElem sender, IptEventType eventType, IptArg eventArg, IptEvtDataKey keyData, IptEvtDataKeyHeld keyPressData, IptEvtDataMouse mouseData) { IptEventData rv = new IptEventData(); @@ -45,5 +45,5 @@ public class IptEventData { rv.keyData = keyData; rv.keyPressData = keyPressData; rv.mouseData = mouseData; return rv; } IptEventData() {} - public static IptEventData ctx_(GfsCtx ctx, GfoMsg m) {return IptEventData.cast_(m.CastObj("iptData"));} + public static IptEventData ctx_(GfsCtx ctx, GfoMsg m) {return IptEventData.cast(m.CastObj("iptData"));} } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKey.java b/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKey.java index 475ebccc1..a304008a3 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKey.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKey.java @@ -21,7 +21,7 @@ public class IptEvtDataKey { public boolean Handled() {return handled;} public void Handled_set(boolean v) {handled = v;} private boolean handled; public static IptEvtDataKey as_(Object obj) {return obj instanceof IptEvtDataKey ? (IptEvtDataKey)obj : null;} - public static IptEvtDataKey cast_(Object obj) {try {return (IptEvtDataKey)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEvtDataKey.class, obj);}} + public static IptEvtDataKey cast(Object obj) {try {return (IptEvtDataKey)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEvtDataKey.class, obj);}} @gplx.Internal protected static final IptEvtDataKey Null = new_(IptKey_.None); @gplx.Internal protected static IptEvtDataKey test_(IptKey keyArg) {return new_(keyArg);} @gplx.Internal protected static IptEvtDataKey int_(int val) { diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKeyHeld.java b/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKeyHeld.java index f1db51a2e..ca46c6b91 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKeyHeld.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataKeyHeld.java @@ -21,7 +21,7 @@ public class IptEvtDataKeyHeld { public boolean Handled() {return handled;} public void Handled_set(boolean v) {handled = v;} private boolean handled; public static IptEvtDataKeyHeld as_(Object obj) {return obj instanceof IptEvtDataKeyHeld ? (IptEvtDataKeyHeld)obj : null;} - public static IptEvtDataKeyHeld cast_(Object obj) {try {return (IptEvtDataKeyHeld)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEvtDataKeyHeld.class, obj);}} + public static IptEvtDataKeyHeld cast(Object obj) {try {return (IptEvtDataKeyHeld)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEvtDataKeyHeld.class, obj);}} @gplx.Internal protected static final IptEvtDataKeyHeld Null = char_((char)0); @gplx.Internal protected static IptEvtDataKeyHeld char_(char c) { IptEvtDataKeyHeld rv = new IptEvtDataKeyHeld(); diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataMouse.java b/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataMouse.java index 278759294..fbd12513c 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataMouse.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptEvtDataMouse.java @@ -22,7 +22,7 @@ public class IptEvtDataMouse { public PointAdp Pos() {return location;} PointAdp location; public static IptEvtDataMouse as_(Object obj) {return obj instanceof IptEvtDataMouse ? (IptEvtDataMouse)obj : null;} - public static IptEvtDataMouse cast_(Object obj) {try {return (IptEvtDataMouse)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEvtDataMouse.class, obj);}} + public static IptEvtDataMouse cast(Object obj) {try {return (IptEvtDataMouse)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptEvtDataMouse.class, obj);}} @gplx.Internal protected static final IptEvtDataMouse Null = IptEvtDataMouse.new_(IptMouseBtn_.None, IptMouseWheel_.None, 0, 0); public static IptEvtDataMouse new_(IptMouseBtn button, IptMouseWheel wheel, int x, int y) { IptEvtDataMouse rv = new IptEvtDataMouse(); diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptKey_.java b/150_gfui/src_200_ipt/gplx/gfui/IptKey_.java index c561e30ca..eee38ab9b 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptKey_.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptKey_.java @@ -23,7 +23,7 @@ public class IptKey_ { public static IptKey[] Ary(IptKey... ary) {return ary;} public static final IptKey[] Ary_empty = new IptKey[0]; public static IptKey as_(Object obj) {return obj instanceof IptKey ? (IptKey)obj : null;} - public static IptKey cast_(Object obj) {try {return (IptKey)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptKey.class, obj);}} + public static IptKey cast(Object obj) {try {return (IptKey)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, IptKey.class, obj);}} public static IptKey add_(IptKey... ary) { if (ary.length == 0) return IptKey_.None; int newVal = ary[0].Val(); @@ -35,10 +35,10 @@ public class IptKey_ { IptKey rv = (IptKey)enm_mgr.Get(val); return (rv == null) ? new_(val, "key_" + Int_.Xto_str(val)) : rv; } - public static IptKey parse_(String raw) {return get_or_new_(enm_mgr.GetVal(raw));} + public static IptKey parse(String raw) {return get_or_new_(enm_mgr.GetVal(raw));} public static IptKey rdr_or_(DataRdr rdr, String key, IptKey or) { String val = rdr.ReadStrOr(key, ""); // NOTE: "" cannot be null, b/c nullRdr returns String.empty - return (String_.Eq(val, "")) ? or : parse_(val); + return (String_.Eq(val, "")) ? or : parse(val); } public static List_adp printableKeys2_(IptKey[] add, IptKey[] del) { List_adp list = List_adp_.new_(); diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptKey__tst.java b/150_gfui/src_200_ipt/gplx/gfui/IptKey__tst.java index 76d51cc57..8f31a9652 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptKey__tst.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptKey__tst.java @@ -25,7 +25,7 @@ public class IptKey__tst { @Test public void To_str__numeric() { fxt.Test_to_str(16777296, "key.#16777296"); } - @Test public void parse_() { + @Test public void parse() { fxt.Test_parse("key.#10", 10); } } @@ -34,6 +34,6 @@ class IptKey__fxt { Tfds.Eq(expd, IptKey_.To_str(keycode)); } public void Test_parse(String raw, int keycode) { - Tfds.Eq(keycode, IptKey_.parse_(raw).Val()); + Tfds.Eq(keycode, IptKey_.parse(raw).Val()); } } diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptMouseBtn_.java b/150_gfui/src_200_ipt/gplx/gfui/IptMouseBtn_.java index 14e0d9049..8c72e8e61 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptMouseBtn_.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptMouseBtn_.java @@ -33,7 +33,7 @@ public class IptMouseBtn_ { , X1 = new IptMouseBtn(Tid_x1 , "mouse.x1") , X2 = new IptMouseBtn(Tid_x2 , "mouse.x2") ; - public static IptMouseBtn parse_(String raw) { + public static IptMouseBtn parse(String raw) { if (String_.Eq(raw, None.Key())) return None; else if (String_.Eq(raw, Left.Key())) return Left; else if (String_.Eq(raw, Right.Key())) return Right; diff --git a/150_gfui/src_200_ipt/gplx/gfui/IptMouseWheel_.java b/150_gfui/src_200_ipt/gplx/gfui/IptMouseWheel_.java index 8d2abfdfc..6376805dd 100644 --- a/150_gfui/src_200_ipt/gplx/gfui/IptMouseWheel_.java +++ b/150_gfui/src_200_ipt/gplx/gfui/IptMouseWheel_.java @@ -21,14 +21,14 @@ public class IptMouseWheel_ { None = new IptMouseWheel("wheel.none") , Up = new IptMouseWheel("wheel.up") , Down = new IptMouseWheel("wheel.down"); - public static IptMouseWheel parse_(String raw) { + public static IptMouseWheel parse(String raw) { if (String_.Eq(raw, None.Key())) return None; else if (String_.Eq(raw, Up.Key())) return Up; else if (String_.Eq(raw, Down.Key())) return Down; else throw Err_.new_parse_type(IptMouseWheel.class, raw); } @gplx.Internal protected static IptMouseWheel api_(Object obj) { - int delta = Int_.cast_(obj); + int delta = Int_.cast(obj); if (delta > 0) return Up; else if (delta < 0) return Down; else return None; diff --git a/150_gfui/src_300_gxw/gplx/gfui/GxwTextBox_lang.java b/150_gfui/src_300_gxw/gplx/gfui/GxwTextBox_lang.java index 09bc54418..053436f85 100644 --- a/150_gfui/src_300_gxw/gplx/gfui/GxwTextBox_lang.java +++ b/150_gfui/src_300_gxw/gplx/gfui/GxwTextBox_lang.java @@ -147,7 +147,7 @@ class GxwTextFld_cls_lang extends JTextField implements GxwTextFld { this.SelBgn_set(0); this.SelLen_set(0); // otherwise will set cursor to end; want to see text start } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, GxwElem_lang.AlignH_cmd)) AlignH_(GfuiAlign_.cast_(m.CastObj("v"))); + if (ctx.Match(k, GxwElem_lang.AlignH_cmd)) AlignH_(GfuiAlign_.cast(m.CastObj("v"))); return this; } public void SendKeyDown(IptKey key) {} diff --git a/150_gfui/src_300_gxw/gplx/gfui/GxwTextMemo_lang.java b/150_gfui/src_300_gxw/gplx/gfui/GxwTextMemo_lang.java index e13d23b4e..a1c16dbdc 100644 --- a/150_gfui/src_300_gxw/gplx/gfui/GxwTextMemo_lang.java +++ b/150_gfui/src_300_gxw/gplx/gfui/GxwTextMemo_lang.java @@ -293,7 +293,7 @@ public class GxwTextMemo_lang extends JScrollPane implements GxwTextMemo { txt_box.setSelectionStart(0); txt_box.setSelectionEnd(0); // else selects whole text and scrolls to end of selection } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, GxwElem_lang.AlignH_cmd)) AlignH_(GfuiAlign_.cast_(m.CastObj("v"))); + if (ctx.Match(k, GxwElem_lang.AlignH_cmd)) AlignH_(GfuiAlign_.cast(m.CastObj("v"))); return txt_box.Invk(ctx, ikey, k, m); } } diff --git a/150_gfui/src_400_win/gplx/gfui/GfuiFocusXferBnd.java b/150_gfui/src_400_win/gplx/gfui/GfuiFocusXferBnd.java index 8ba0534e1..01e09d17a 100644 --- a/150_gfui/src_400_win/gplx/gfui/GfuiFocusXferBnd.java +++ b/150_gfui/src_400_win/gplx/gfui/GfuiFocusXferBnd.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; class GfuiFocusXferBnd implements InjectAble, GfoInvkAble { public void Inject(Object owner) { - GfuiElem elem = GfuiElem_.cast_(owner); + GfuiElem elem = GfuiElem_.cast(owner); IptBnd_.cmd_to_(IptCfg_.Null, elem, this, Invk_FocusNext, IptKey_.Down); IptBnd_.cmd_to_(IptCfg_.Null, elem, this, Invk_FocusPrev, IptKey_.Up); } @@ -28,7 +28,7 @@ class GfuiFocusXferBnd implements InjectAble, GfoInvkAble { GfuiElem target = cur; while (true) { // find next visible elem int cycle = TabBox_.Cycle(fwd, curIdx, allElemsInOwnerWin.Count()); - target = GfuiElem_.cast_(allElemsInOwnerWin.Get_at(cycle)); + target = GfuiElem_.cast(allElemsInOwnerWin.Get_at(cycle)); if (target.Visible()) break; if (cycle == curIdx) break; // either (a) one elem in allElemsInOwnerWin or (b) n elems, and cycled back to start; break, else infinite loop curIdx = cycle; @@ -43,8 +43,8 @@ class GfuiFocusXferBnd implements InjectAble, GfoInvkAble { } } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, Invk_FocusNext)) Focus(GfuiElem_.cast_(ctx.MsgSrc()), true); - else if (ctx.Match(k, Invk_FocusPrev)) Focus(GfuiElem_.cast_(ctx.MsgSrc()), false); + if (ctx.Match(k, Invk_FocusNext)) Focus(GfuiElem_.cast(ctx.MsgSrc()), true); + else if (ctx.Match(k, Invk_FocusPrev)) Focus(GfuiElem_.cast(ctx.MsgSrc()), false); else return GfoInvkAble_.Rv_unhandled; return this; } public static final String Invk_FocusNext = "FocusNext", Invk_FocusPrev = "FocusPrev"; diff --git a/150_gfui/src_400_win/gplx/gfui/GfuiMenuBar.java b/150_gfui/src_400_win/gplx/gfui/GfuiMenuBar.java index ab65df540..d2948e17c 100644 --- a/150_gfui/src_400_win/gplx/gfui/GfuiMenuBar.java +++ b/150_gfui/src_400_win/gplx/gfui/GfuiMenuBar.java @@ -111,7 +111,7 @@ public class GfuiMenuBar implements GfoInvkAble { String keyChar = String_.MidByLen(text, pos + 1, 1); if (!Char_.IsLetterEnglish(String_.CharAt(keyChar, 0))) return ipt; // keyChar is not a character; EX: 'A & B' (keyChar = space) String keyCharRaw = "key." + String_.Lower(keyChar); - ipt = IptKey_.parse_(keyCharRaw); + ipt = IptKey_.parse(keyCharRaw); text = String_.MidByLen(text, 0, pos) + String_.Mid(text, pos + 1); // remove mnemPrefix; ex: &File -> File && key.f itm.Text_(text); return ipt; @@ -241,7 +241,7 @@ class GfuiMenuBarItmType { public int Val() {return val;} int val; public String Name() {return name;} private String name; GfuiMenuBarItmType(int v, String n) {val = v; name = n; regy.Add(n, this);} - public static GfuiMenuBarItmType parse_(String raw) { + public static GfuiMenuBarItmType parse(String raw) { try {return (GfuiMenuBarItmType)regy.Get_by(raw);} catch (Exception e) {Err_.Noop(e); throw Err_.new_parse("GfuiMenuBarItmType", raw);} } diff --git a/150_gfui/src_400_win/gplx/gfui/GfuiWinKeyCmdMgr.java b/150_gfui/src_400_win/gplx/gfui/GfuiWinKeyCmdMgr.java index 342f6da28..2946865cd 100644 --- a/150_gfui/src_400_win/gplx/gfui/GfuiWinKeyCmdMgr.java +++ b/150_gfui/src_400_win/gplx/gfui/GfuiWinKeyCmdMgr.java @@ -43,7 +43,7 @@ class GfuiWinKeyCmdMgr implements GfuiWinOpenAble, GfoInvkAble, GfoEvObj { public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { ctx.Match(k, k); CheckForHotKey(IptEventData.ctx_(ctx, m)); - //boolean handled = CheckForHotKey(IptEventData.cast_(msg.Val())); msg.Fwd_set(!handled); // TOMBSTONE: somehow cause alt-F4 to continue processing and dispose form + //boolean handled = CheckForHotKey(IptEventData.cast(msg.Val())); msg.Fwd_set(!handled); // TOMBSTONE: somehow cause alt-F4 to continue processing and dispose form return this; } @gplx.Internal protected static final String CheckForHotKey_cmd = "CheckForHotKey_cmd"; @@ -56,6 +56,6 @@ class GfuiWinKeyCmdMgr implements GfuiWinOpenAble, GfoInvkAble, GfoEvObj { } public static IptKey ExtractKeyFromText(String raw) { int pos = ExtractPosFromText(raw); if (pos == String_.Find_none) return IptKey_.None; - return IptKey_.parse_("key." + String_.Lower(Char_.To_str(String_.CharAt(raw, pos + 1)))); // pos=& pos; + 1 to get next letter + return IptKey_.parse("key." + String_.Lower(Char_.To_str(String_.CharAt(raw, pos + 1)))); // pos=& pos; + 1 to get next letter } } diff --git a/150_gfui/src_400_win/gplx/gfui/GfuiWin_.java b/150_gfui/src_400_win/gplx/gfui/GfuiWin_.java index 5bf84eed7..74efe429d 100644 --- a/150_gfui/src_400_win/gplx/gfui/GfuiWin_.java +++ b/150_gfui/src_400_win/gplx/gfui/GfuiWin_.java @@ -24,7 +24,7 @@ public class GfuiWin_ { , InitKey_winType_tool = "tool" ; public static GfuiWin as_(Object obj) {return obj instanceof GfuiWin ? (GfuiWin)obj : null;} - public static GfuiWin cast_(Object obj) {try {return (GfuiWin)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiWin.class, obj);}} + public static GfuiWin cast(Object obj) {try {return (GfuiWin)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiWin.class, obj);}} public static GfuiWin app_(String key) {return bld_(key, InitKey_winType_app, KeyValHash.new_());} public static GfuiWin tool_(String key) {return bld_(key, InitKey_winType_tool, KeyValHash.new_()).TaskbarVisible_(false);} public static GfuiWin sub_(String key, GfuiWin ownerWin) { diff --git a/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase.java b/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase.java index b9b9cf10c..7ef473cf6 100644 --- a/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase.java +++ b/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase.java @@ -268,7 +268,7 @@ public class GfuiElemBase implements GfuiElem { underMgr = underElem.Core(); subElems = GfuiElemList.new_(this); textMgr = GfxStringData.new_(this, underElem); - this.Focus_able_(Bool_.cast_(ctorArgs.FetchValOr(GfuiElem_.InitKey_focusAble, true))); + this.Focus_able_(Bool_.cast(ctorArgs.FetchValOr(GfuiElem_.InitKey_focusAble, true))); underMgr.Size_set(SizeAdp_.new_(20, 20)); // NOTE: CS inits to 20,20; JAVA inits to 0,0 } @gplx.Virtual public void ctor_kit_GfuiElemBase(Gfui_kit kit, String key, GxwElem underElem, KeyValHash ctorArgs) { @@ -279,7 +279,7 @@ public class GfuiElemBase implements GfuiElem { underMgr = underElem.Core(); subElems = GfuiElemList.new_(this); textMgr = GfxStringData.new_(this, underElem); - this.Focus_able_(Bool_.cast_(ctorArgs.FetchValOr(GfuiElem_.InitKey_focusAble, true))); + this.Focus_able_(Bool_.cast(ctorArgs.FetchValOr(GfuiElem_.InitKey_focusAble, true))); // underMgr.Size_set(SizeAdp_.new_(20, 20)); // NOTE: CS inits to 20,20; JAVA inits to 0,0 } @gplx.Virtual public GxwElem UnderElem_make(KeyValHash ctorArgs) {return GxwElemFactory_._.control_();} diff --git a/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase_.java b/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase_.java index 8132cfb31..54d279b2b 100644 --- a/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase_.java +++ b/150_gfui/src_410_box_core/gplx/gfui/GfuiElemBase_.java @@ -18,5 +18,5 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class GfuiElemBase_ { public static GfuiElemBase as_(Object obj) {return obj instanceof GfuiElemBase ? (GfuiElemBase)obj : null;} - public static GfuiElemBase cast_(Object obj) {try {return (GfuiElemBase)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiElemBase.class, obj);}} + public static GfuiElemBase cast(Object obj) {try {return (GfuiElemBase)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiElemBase.class, obj);}} } diff --git a/150_gfui/src_410_box_core/gplx/gfui/GfuiElem_.java b/150_gfui/src_410_box_core/gplx/gfui/GfuiElem_.java index ac0413ae0..99d1619f5 100644 --- a/150_gfui/src_410_box_core/gplx/gfui/GfuiElem_.java +++ b/150_gfui/src_410_box_core/gplx/gfui/GfuiElem_.java @@ -21,7 +21,7 @@ public class GfuiElem_ { InitKey_focusAble = "focusAble" , InitKey_ownerWin = "ownerForm"; public static GfuiElem as_(Object obj) {return obj instanceof GfuiElem ? (GfuiElem)obj : null;} - public static GfuiElem cast_(Object obj) {try {return (GfuiElem)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiElem.class, obj);}} + public static GfuiElem cast(Object obj) {try {return (GfuiElem)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiElem.class, obj);}} public static GfuiElemBase sub_(String key, GfuiElem owner) { GfuiElemBase rv = new_(); rv.Owner_(owner, key); diff --git a/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtnClickBnd.java b/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtnClickBnd.java index 13d3ad7f3..145ed9470 100644 --- a/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtnClickBnd.java +++ b/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtnClickBnd.java @@ -18,13 +18,13 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; class GfuiBtnClickBnd implements InjectAble, GfoInvkAble { public void Inject(Object owner) { - GfuiElem elem = GfuiElem_.cast_(owner); + GfuiElem elem = GfuiElem_.cast(owner); IptBnd_.cmd_(IptCfg_.Null, elem, GfuiElemKeys.ActionExec_cmd, IptKey_.Enter, IptKey_.Space); IptBnd_.cmd_(IptCfg_.Null, elem, GfuiElemKeys.Focus_cmd, IptMouseBtn_.Left); IptBnd_.ipt_to_(IptCfg_.Null, elem, this, ExecMouseUp_cmd, IptEventType_.MouseUp, IptMouseBtn_.Left); } void ExecMouseUp(IptEventData iptData) { - GfuiElem elem = GfuiElem_.cast_(iptData.Sender()); + GfuiElem elem = GfuiElem_.cast(iptData.Sender()); int x = iptData.MousePos().X(), y = iptData.MousePos().Y(); SizeAdp buttonSize = elem.Size(); if ( x >= 0 && x <= buttonSize.Width() diff --git a/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtn_.java b/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtn_.java index 1de68ced9..4d1f97969 100644 --- a/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtn_.java +++ b/150_gfui/src_420_box_basic/gplx/gfui/GfuiBtn_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class GfuiBtn_ { public static GfuiBtn as_(Object obj) {return obj instanceof GfuiBtn ? (GfuiBtn)obj : null;} - public static GfuiBtn cast_(Object obj) {try {return (GfuiBtn)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiBtn.class, obj);}} + public static GfuiBtn cast(Object obj) {try {return (GfuiBtn)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiBtn.class, obj);}} public static GfuiBtn msg_(String key, GfuiElem owner, GfoMsg msg) { GfuiBtn rv = new_(key); rv.Owner_(owner); diff --git a/150_gfui/src_420_box_basic/gplx/gfui/GfuiChkBox_.java b/150_gfui/src_420_box_basic/gplx/gfui/GfuiChkBox_.java index 898868313..ddf0e1ad7 100644 --- a/150_gfui/src_420_box_basic/gplx/gfui/GfuiChkBox_.java +++ b/150_gfui/src_420_box_basic/gplx/gfui/GfuiChkBox_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class GfuiChkBox_ { public static GfuiChkBox as_(Object obj) {return obj instanceof GfuiChkBox ? (GfuiChkBox)obj : null;} - public static GfuiChkBox cast_(Object obj) {try {return (GfuiChkBox)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiChkBox.class, obj);}} + public static GfuiChkBox cast(Object obj) {try {return (GfuiChkBox)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiChkBox.class, obj);}} @gplx.Internal protected static GfuiChkBox new_() { GfuiChkBox rv = new GfuiChkBox(); rv.ctor_GfuiBox_base(GfuiElem_.init_focusAble_true_()); diff --git a/150_gfui/src_420_box_basic/gplx/gfui/GfuiTextBox_.java b/150_gfui/src_420_box_basic/gplx/gfui/GfuiTextBox_.java index 1ed81bba6..6b4b7097d 100644 --- a/150_gfui/src_420_box_basic/gplx/gfui/GfuiTextBox_.java +++ b/150_gfui/src_420_box_basic/gplx/gfui/GfuiTextBox_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class GfuiTextBox_ { public static GfuiTextBox as_(Object obj) {return obj instanceof GfuiTextBox ? (GfuiTextBox)obj : null;} - public static GfuiTextBox cast_(Object obj) {try {return (GfuiTextBox)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiTextBox.class, obj);}} + public static GfuiTextBox cast(Object obj) {try {return (GfuiTextBox)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfuiTextBox.class, obj);}} public static final String NewLine = "\n"; public static final String Ctor_Memo = "TextBox_Memo"; diff --git a/150_gfui/src_430_box_custom/gplx/gfui/DataBndr_whenEvt_execCmd.java b/150_gfui/src_430_box_custom/gplx/gfui/DataBndr_whenEvt_execCmd.java index 1533fafbb..ad7aa130e 100644 --- a/150_gfui/src_430_box_custom/gplx/gfui/DataBndr_whenEvt_execCmd.java +++ b/150_gfui/src_430_box_custom/gplx/gfui/DataBndr_whenEvt_execCmd.java @@ -30,7 +30,7 @@ public class DataBndr_whenEvt_execCmd implements InjectAble, GfoInvkAble, GfoEvO return this; } GfoInvkAble getInvk; String getCmd; public void Inject(Object owner) { - setInvk = GfoInvkAble_.cast_(owner); + setInvk = GfoInvkAble_.cast(owner); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, whenEvt)) { diff --git a/150_gfui/src_430_box_custom/gplx/gfui/GfuiMoveElemBnd.java b/150_gfui/src_430_box_custom/gplx/gfui/GfuiMoveElemBnd.java index ccbaceefb..82eb5b98b 100644 --- a/150_gfui/src_430_box_custom/gplx/gfui/GfuiMoveElemBnd.java +++ b/150_gfui/src_430_box_custom/gplx/gfui/GfuiMoveElemBnd.java @@ -55,7 +55,7 @@ public class GfuiMoveElemBnd implements IptBnd, GfoInvkAble, InjectAble { } void ExecKeyDown(IptEventData msg) { PointAdp current = targetElem.Pos(); - PointAdp offset = PointAdp_.cast_(hash.Get_by(msg.EventArg())); + PointAdp offset = PointAdp_.cast(hash.Get_by(msg.EventArg())); targetElem.Pos_(current.Op_add(offset)); } @gplx.Internal protected void Key_set(String key) {this.key = key;} private String key; diff --git a/150_gfui/src_500_tab/gplx/gfui/TabBnd.java b/150_gfui/src_500_tab/gplx/gfui/TabBnd.java index 5cf46c54e..f29dcdfc8 100644 --- a/150_gfui/src_500_tab/gplx/gfui/TabBnd.java +++ b/150_gfui/src_500_tab/gplx/gfui/TabBnd.java @@ -39,7 +39,7 @@ class TabBoxEvt_tabSelectByBtn { } class TabBnd_selectTab implements InjectAble, GfoInvkAble { public void Inject(Object obj) { - tabBox = TabBox_.cast_(obj); + tabBox = TabBox_.cast(obj); IptBnd_.cmd_to_(IptCfg_.Null, tabBox, this, SelectNext_cmd, IptKey_.add_(IptKey_.Ctrl, IptKey_.Tab), IptKey_.add_(IptKey_.Ctrl, IptKey_.PageDown)); IptBnd_.cmd_to_(IptCfg_.Null, tabBox, this, SelectPrev_cmd, IptKey_.add_(IptKey_.Ctrl, IptKey_.Tab, IptKey_.Shift), IptKey_.add_(IptKey_.Ctrl, IptKey_.PageUp)); } @@ -59,7 +59,7 @@ class TabBnd_selectTab implements InjectAble, GfoInvkAble { } class TabBnd_reorderTab implements InjectAble, GfoInvkAble { public void Inject(Object owner) { - GfuiBtn btn = GfuiBtn_.cast_(owner); + GfuiBtn btn = GfuiBtn_.cast(owner); IptBnd_.cmd_to_(IptCfg_.Null, btn, this, MovePrev_cmd, IptKey_.add_(IptKey_.Ctrl, IptKey_.Left)); IptBnd_.cmd_to_(IptCfg_.Null, btn, this, MoveNext_cmd, IptKey_.add_(IptKey_.Ctrl, IptKey_.Right)); } @@ -75,8 +75,8 @@ class TabBnd_reorderTab implements InjectAble, GfoInvkAble { TabBoxEvt_orderChanged.Publish(tabBox, curIdx, newIdx); } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { - if (ctx.Match(k, MoveNext_cmd)) MoveTab(GfuiBtn_.cast_(ctx.MsgSrc()), 1); - else if (ctx.Match(k, MovePrev_cmd)) MoveTab(GfuiBtn_.cast_(ctx.MsgSrc()), -1); + if (ctx.Match(k, MoveNext_cmd)) MoveTab(GfuiBtn_.cast(ctx.MsgSrc()), 1); + else if (ctx.Match(k, MovePrev_cmd)) MoveTab(GfuiBtn_.cast(ctx.MsgSrc()), -1); else return GfoInvkAble_.Rv_unhandled; return this; } public static final String MoveNext_cmd = "MoveNext", MovePrev_cmd = "MovePrev"; diff --git a/150_gfui/src_500_tab/gplx/gfui/TabBox_.java b/150_gfui/src_500_tab/gplx/gfui/TabBox_.java index f7a3f17a2..c0f7ac1e7 100644 --- a/150_gfui/src_500_tab/gplx/gfui/TabBox_.java +++ b/150_gfui/src_500_tab/gplx/gfui/TabBox_.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; public class TabBox_ { public static TabBox as_(Object obj) {return obj instanceof TabBox ? (TabBox)obj : null;} - public static TabBox cast_(Object obj) {try {return (TabBox)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TabBox.class, obj);}} + public static TabBox cast(Object obj) {try {return (TabBox)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, TabBox.class, obj);}} public static TabBox new_() { TabBox rv = new TabBox(); rv.ctor_GfuiBox_base(GfuiElem_.init_focusAble_false_()); diff --git a/150_gfui/src_600_adp/gplx/gfui/IconAdp.java b/150_gfui/src_600_adp/gplx/gfui/IconAdp.java index 714868b77..e96d16338 100644 --- a/150_gfui/src_600_adp/gplx/gfui/IconAdp.java +++ b/150_gfui/src_600_adp/gplx/gfui/IconAdp.java @@ -22,11 +22,12 @@ import java.awt.Image; import java.net.MalformedURLException; import java.net.URL; public class IconAdp { - public Icon UnderIcon() {return icon;} final Icon icon; + public Icon UnderIcon() {return icon;} private final Icon icon; public Image XtoImage() {return ((ImageIcon)icon).getImage();} - public Io_url Url() {return url;} Io_url url = Io_url_.Empty; + public Io_url Url() {return url;} private Io_url url = Io_url_.Empty; IconAdp(Icon icon) {this.icon = icon;} public static IconAdp new_(Icon icon) {return new IconAdp(icon);} + public static IconAdp file_or_blank(Io_url url) {return file_(url);} public static IconAdp file_(Io_url url) { Icon icon = new ImageIcon(url.Xto_api()); IconAdp rv = new IconAdp(icon); diff --git a/150_gfui/src_600_adp/gplx/gfui/ImageAdp_.java b/150_gfui/src_600_adp/gplx/gfui/ImageAdp_.java index 1d582671e..ffc9e2840 100644 --- a/150_gfui/src_600_adp/gplx/gfui/ImageAdp_.java +++ b/150_gfui/src_600_adp/gplx/gfui/ImageAdp_.java @@ -31,7 +31,7 @@ import java.awt.image.BufferedImage; import javax.imageio.ImageIO; public class ImageAdp_ { public static ImageAdp as_(Object obj) {return obj instanceof ImageAdp ? (ImageAdp)obj : null;} - public static ImageAdp cast_(Object obj) {try {return (ImageAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, ImageAdp.class, obj);}} + public static ImageAdp cast(Object obj) {try {return (ImageAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, ImageAdp.class, obj);}} public static final ImageAdp Null = new_(10, 10); public static ImageAdp new_(int width, int height) { // BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); // JAVA: must be TYPE_INT_RGB or else ImageIO.write("bmp") will fail @@ -44,7 +44,7 @@ public class ImageAdp_ { SizeAdp size = null; if (String_.Eq(raw, "")) size = SizeAdp_.Zero; else if (String_.Eq(url.Ext(), ".svg")) size = SizeOf_svg(url); - else size = SizeAdp_.parse_(raw); + else size = SizeAdp_.parse(raw); return new ImageAdp_txt(url, size); } public static SizeAdp SizeOf_svg(Io_url url) {return Gfui_svg_util.QuerySize(url);} @@ -121,6 +121,6 @@ class Gfui_svg_util { if (px != -1) end = px; String str = String_.Mid(xml, bgn, end); pos_ref.Val_(end); - return Double_.parse_(str); + return Double_.parse(str); } } diff --git a/150_gfui/src_600_adp/gplx/gfui/ScreenAdp_.java b/150_gfui/src_600_adp/gplx/gfui/ScreenAdp_.java index 80692507d..8b1afbc9c 100644 --- a/150_gfui/src_600_adp/gplx/gfui/ScreenAdp_.java +++ b/150_gfui/src_600_adp/gplx/gfui/ScreenAdp_.java @@ -23,12 +23,12 @@ import java.awt.Toolkit; public class ScreenAdp_ { public static final ScreenAdp Primary = screen_(0); public static ScreenAdp as_(Object obj) {return obj instanceof ScreenAdp ? (ScreenAdp)obj : null;} - public static ScreenAdp cast_(Object obj) {try {return (ScreenAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, ScreenAdp.class, obj);}} - public static ScreenAdp parse_(String raw) { // ex: {screen{1} + public static ScreenAdp cast(Object obj) {try {return (ScreenAdp)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, ScreenAdp.class, obj);}} + public static ScreenAdp parse(String raw) { // ex: {screen{1} try { raw = String_.Replace(raw, "{screen{", ""); raw = String_.Replace(raw, "}", ""); - return ScreenAdp_.screen_(Int_.parse_(raw)); + return ScreenAdp_.screen_(Int_.parse(raw)); } catch(Exception exc) {throw Err_.new_parse_exc(exc, ScreenAdp.class, raw);} } public static ScreenAdp from_point_(PointAdp pos) {// NOTE: not using FromPoint b/c of plat_wce diff --git a/150_gfui/src_700_env/gplx/gfui/Gfui_dlg_msg.java b/150_gfui/src_700_env/gplx/gfui/Gfui_dlg_msg.java index 9eed1b308..3ea1ac91e 100644 --- a/150_gfui/src_700_env/gplx/gfui/Gfui_dlg_msg.java +++ b/150_gfui/src_700_env/gplx/gfui/Gfui_dlg_msg.java @@ -28,6 +28,6 @@ class Gfui_dlg_msg_null implements Gfui_dlg_msg { public Gfui_dlg_msg Init_ico_(int v) {return this;} public Gfui_dlg_msg Init_btns_(int... ary) {return this;} public boolean Ask(int expd) {return false;} - public int Ask() {return Int_.MinValue;} + public int Ask() {return Int_.Min_value;} public static final Gfui_dlg_msg_null _ = new Gfui_dlg_msg_null(); Gfui_dlg_msg_null() {} } diff --git a/150_gfui/src_700_env/gplx/gfui/Swt_kit.java b/150_gfui/src_700_env/gplx/gfui/Swt_kit.java index be79d5bab..a11b826b9 100644 --- a/150_gfui/src_700_env/gplx/gfui/Swt_kit.java +++ b/150_gfui/src_700_env/gplx/gfui/Swt_kit.java @@ -172,7 +172,7 @@ public class Swt_kit implements Gfui_kit { int args_len = args.length; for (int i = 0; i < args_len; i++) ctor_args.Add(args[i]); - boolean border_on = Bool_.cast_(ctor_args.FetchValOr(GfuiTextBox.CFG_border_on_, true)); + boolean border_on = Bool_.cast(ctor_args.FetchValOr(GfuiTextBox.CFG_border_on_, true)); GxwTextFld under = new Swt_text_w_border(Swt_control_.cast_or_fail(owner), New_color(border_on ? ColorAdp_.LightGray : ColorAdp_.White), ctor_args); GfuiTextBox rv = GfuiTextBox_.kit_(this, key, under, ctor_args); rv.Owner_(owner); @@ -261,7 +261,7 @@ class Swt_shell_close_lnr implements Listener, GfoInvkAble { @Override public void handleEvent(Event event) { if (kit.Kit_mode__term()) return; // NOTE: will be term if called again from wait_for_sync_cmd kit.Kit_mode_(Swt_kit_mode.Tid_term); // NOTE: must mark kit as shutting down, else writing to status_bar will create stack overflow; DATE:2014-05-05 - boolean rslt = Bool_.cast_(kit.Kit_term_cbk().Invk()); // call bgn term + boolean rslt = Bool_.cast(kit.Kit_term_cbk().Invk()); // call bgn term if (!rslt) { event.doit = false; // cbk canceled term; stop close kit.Kit_mode_(Swt_kit_mode.Tid_ready); // reset kit back to "running" mode; diff --git a/150_gfui/tst/gplx/gfui/GfxItm_base.java b/150_gfui/tst/gplx/gfui/GfxItm_base.java index 42ba0a61e..4b207fc43 100644 --- a/150_gfui/tst/gplx/gfui/GfxItm_base.java +++ b/150_gfui/tst/gplx/gfui/GfxItm_base.java @@ -30,5 +30,5 @@ public abstract class GfxItm_base implements GfxItm { pos = posVal; size = sizeVal; } public static GfxItm_base as_(Object obj) {return obj instanceof GfxItm_base ? (GfxItm_base)obj : null;} - public static GfxItm_base cast_(Object obj) {try {return (GfxItm_base)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfxItm_base.class, obj);}} + public static GfxItm_base cast(Object obj) {try {return (GfxItm_base)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfxItm_base.class, obj);}} } diff --git a/150_gfui/tst/gplx/gfui/GfxLineItm.java b/150_gfui/tst/gplx/gfui/GfxLineItm.java index c9b68f5c9..ec57b1c03 100644 --- a/150_gfui/tst/gplx/gfui/GfxLineItm.java +++ b/150_gfui/tst/gplx/gfui/GfxLineItm.java @@ -36,5 +36,5 @@ public class GfxLineItm implements GfxItm { return rv; } GfxLineItm() {} public static GfxLineItm as_(Object obj) {return obj instanceof GfxLineItm ? (GfxLineItm)obj : null;} - public static GfxLineItm cast_(Object obj) {try {return (GfxLineItm)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfxLineItm.class, obj);}} + public static GfxLineItm cast(Object obj) {try {return (GfxLineItm)obj;} catch(Exception exc) {throw Err_.new_type_mismatch_w_exc(exc, GfxLineItm.class, obj);}} } diff --git a/150_gfui/tst/gplx/gfui/IptArg_parser_tst.java b/150_gfui/tst/gplx/gfui/IptArg_parser_tst.java index 677d212a5..5453ebe85 100644 --- a/150_gfui/tst/gplx/gfui/IptArg_parser_tst.java +++ b/150_gfui/tst/gplx/gfui/IptArg_parser_tst.java @@ -26,7 +26,7 @@ public class IptArg_parser_tst { tst_parse_Key_("key.pageUp", IptKey_.PageUp); tst_parse_Key_("key.ctrl", IptKey_.Ctrl); tst_parse_Key_("key.none", IptKey_.None); - } void tst_parse_Key_(String raw, IptKey expd) {Tfds.Eq(expd.Val(), IptKey_.parse_(raw).Val());} + } void tst_parse_Key_(String raw, IptKey expd) {Tfds.Eq(expd.Val(), IptKey_.parse(raw).Val());} @Test public void KbdCmdModifiers() { tst_parse_Key_("key.ctrl+key.enter", IptKey_.Ctrl.Add(IptKey_.Enter)); tst_parse_Key_("key.alt+key.escape", IptKey_.Alt.Add(IptKey_.Escape)); @@ -43,11 +43,11 @@ public class IptArg_parser_tst { tst_parse_MouseBtn_("mouse.middle", IptMouseBtn_.Middle); tst_parse_MouseBtn_("mouse.x1", IptMouseBtn_.X1); tst_parse_MouseBtn_("mouse.x2", IptMouseBtn_.X2); - } void tst_parse_MouseBtn_(String raw, IptMouseBtn expd) {Tfds.Eq(expd, IptMouseBtn_.parse_(raw));} + } void tst_parse_MouseBtn_(String raw, IptMouseBtn expd) {Tfds.Eq(expd, IptMouseBtn_.parse(raw));} @Test public void MouseWheel() { tst_parse_MouseWheel_("wheel.up", IptMouseWheel_.Up); tst_parse_MouseWheel_("wheel.down", IptMouseWheel_.Down); - } void tst_parse_MouseWheel_(String raw, IptMouseWheel expd) {Tfds.Eq(expd, IptMouseWheel_.parse_(raw));} + } void tst_parse_MouseWheel_(String raw, IptMouseWheel expd) {Tfds.Eq(expd, IptMouseWheel_.parse(raw));} @Test public void Mod() { tst_parse_("mod.c", IptKey_.Ctrl); tst_parse_("mod.cs", IptKey_.add_(IptKey_.Ctrl, IptKey_.Shift)); @@ -59,5 +59,5 @@ public class IptArg_parser_tst { tst_parse_("mouse.left", IptMouseBtn_.Left); tst_parse_("wheel.up", IptMouseWheel_.Up); tst_parse_("mod.c", IptKey_.Ctrl); - } void tst_parse_(String raw, IptArg expd) {Tfds.Eq(expd, IptArg_.parse_(raw));} + } void tst_parse_(String raw, IptArg expd) {Tfds.Eq(expd, IptArg_.parse(raw));} } diff --git a/150_gfui/tst/gplx/gfui/ScreenAdp_tst.java b/150_gfui/tst/gplx/gfui/ScreenAdp_tst.java index 7c05245a9..c51ad3bc8 100644 --- a/150_gfui/tst/gplx/gfui/ScreenAdp_tst.java +++ b/150_gfui/tst/gplx/gfui/ScreenAdp_tst.java @@ -18,8 +18,8 @@ along with this program. If not, see . package gplx.gfui; import gplx.*; import org.junit.*; public class ScreenAdp_tst { - @Test public void parse_() { - ScreenAdp actl = ScreenAdp_.parse_("{screen{0}"); + @Test public void parse() { + ScreenAdp actl = ScreenAdp_.parse("{screen{0}"); Tfds.Eq(0, actl.Index()); } @Test public void opposite_() { diff --git a/150_gfui/xtn/gplx/gfui/Swt_html.java b/150_gfui/xtn/gplx/gfui/Swt_html.java index 02dc48205..8f6af04c0 100644 --- a/150_gfui/xtn/gplx/gfui/Swt_html.java +++ b/150_gfui/xtn/gplx/gfui/Swt_html.java @@ -41,7 +41,7 @@ class Swt_html implements Gxw_html, Swt_control, FocusListener { lnr_location = new Swt_html_lnr_location(this); lnr_status = new Swt_html_lnr_status(this); Object browser_tid_obj = ctorArgs.FetchValOr(Swt_kit.Cfg_Html_BrowserType, null); - this.browser_tid = browser_tid_obj == null ? Browser_tid_none : Int_.cast_(browser_tid_obj); + this.browser_tid = browser_tid_obj == null ? Browser_tid_none : Int_.cast(browser_tid_obj); browser = new Browser(owner_control.Under_composite(), browser_tid); core = new Swt_core_cmds_html(this, browser); browser.addKeyListener(new Swt_lnr_key(this)); @@ -75,7 +75,7 @@ class Swt_html implements Gxw_html, Swt_control, FocusListener { public void Html_js_enabled_(boolean v) {browser.setJavascriptEnabled(v);} public void Html_js_cbks_add(String func_name, GfoInvkAble invk) {new Swt_html_func(browser, func_name, invk);} public String Html_js_eval_script(String script) {return Eval_script_as_str(script);} - public boolean Html_js_eval_proc_as_bool(String proc, Object... args) {return Bool_.cast_(Html_js_eval_proc_as_obj(proc, args));} + public boolean Html_js_eval_proc_as_bool(String proc, Object... args) {return Bool_.cast(Html_js_eval_proc_as_obj(proc, args));} public String Html_js_eval_proc_as_str(String proc, Object... args) {return Object_.Xto_str_strict_or_null(Html_js_eval_proc_as_obj(proc, args));} private Object Html_js_eval_proc_as_obj(String proc, Object... args) { Bry_bfr bfr = Bry_bfr.new_(); diff --git a/400_xowa/src/gplx/cache/Gfo_cache_mgr_bry.java b/400_xowa/src/gplx/cache/Gfo_cache_mgr_bry.java index fd3b6eebe..6583aa0fd 100644 --- a/400_xowa/src/gplx/cache/Gfo_cache_mgr_bry.java +++ b/400_xowa/src/gplx/cache/Gfo_cache_mgr_bry.java @@ -40,7 +40,7 @@ class Gfo_cache_itm_comparer implements gplx.lists.ComparerAble { class Io_url_exists_mgr { private gplx.cache.Gfo_cache_mgr_bry cache_mgr = new gplx.cache.Gfo_cache_mgr_bry(); public Io_url_exists_mgr() { - cache_mgr.Compress_max_(Int_.MaxValue); + cache_mgr.Compress_max_(Int_.Max_value); } public boolean Has(Io_url url) { byte[] url_key = url.RawBry(); diff --git a/400_xowa/src/gplx/core/brys/Bry_rdr_tst.java b/400_xowa/src/gplx/core/brys/Bry_rdr_tst.java index f1260f804..ccdcb2c0e 100644 --- a/400_xowa/src/gplx/core/brys/Bry_rdr_tst.java +++ b/400_xowa/src/gplx/core/brys/Bry_rdr_tst.java @@ -24,7 +24,7 @@ public class Bry_rdr_tst { fxt.Test_read_int(12); fxt.Test_read_int(3456); fxt.Test_read_int(789); - fxt.Test_read_int(Int_.MinValue); + fxt.Test_read_int(Int_.Min_value); } @Test public void Int_negative() { fxt.Init_src("-1|-2"); diff --git a/400_xowa/src/gplx/core/json/Json_ary.java b/400_xowa/src/gplx/core/json/Json_ary.java index 42d625d56..e38a0b9a3 100644 --- a/400_xowa/src/gplx/core/json/Json_ary.java +++ b/400_xowa/src/gplx/core/json/Json_ary.java @@ -18,13 +18,13 @@ along with this program. If not, see . package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_ary extends Json_itm_base implements Json_grp { public Json_ary(int src_bgn, int src_end) {this.Ctor(src_bgn, src_end);} - @Override public byte Tid() {return Json_itm_.Tid_array;} + @Override public byte Tid() {return Json_itm_.Tid__ary;} public void Src_end_(int v) {this.src_end = v;} @Override public Object Data() {return null;} @Override public byte[] Data_bry() {return null;} public int Len() {return subs_len;} private int subs_len = 0, subs_max = 0; public Json_nde Get_at_as_nde(int i) { - Json_itm rv = subs[i]; if (rv.Tid() != Json_itm_.Tid_nde) throw Err_.new_("json", "itm is not nde", "type", rv.Tid(), "i", i); + Json_itm rv = subs[i]; if (rv.Tid() != Json_itm_.Tid__nde) throw Err_.new_("json", "itm is not nde", "type", rv.Tid(), "i", i); return (Json_nde)rv; } public Json_itm Get_at(int i) {return subs[i];} @@ -71,9 +71,9 @@ public class Json_ary extends Json_itm_base implements Json_grp { return rv; } private Json_itm[] subs = Json_itm_.Ary_empty; - public static Json_ary cast_or_null(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid_array ? null : (Json_ary)v;} + public static Json_ary cast_or_null(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__ary ? null : (Json_ary)v;} public static Json_ary cast(Json_itm v) { - if (v == null || v.Tid() != Json_itm_.Tid_array) throw Err_.new_("json", "itm is not array"); + if (v == null || v.Tid() != Json_itm_.Tid__ary) throw Err_.new_("json", "itm is not array"); return (Json_ary)v; } } diff --git a/400_xowa/src/gplx/core/json/Json_doc.java b/400_xowa/src/gplx/core/json/Json_doc.java index b5ebfcb73..28c456bc7 100644 --- a/400_xowa/src/gplx/core/json/Json_doc.java +++ b/400_xowa/src/gplx/core/json/Json_doc.java @@ -17,27 +17,28 @@ along with this program. If not, see . */ package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_doc { + private final byte[][] tmp_qry_bry = new byte[1][]; public void Ctor(byte[] src, Json_nde root) {this.src = src; this.root = root;} - public Bry_bfr Bfr() {return bfr;} Bry_bfr bfr = Bry_bfr.new_(); - public Number_parser Utl_num_parser() {return utl_num_parser;} Number_parser utl_num_parser = new Number_parser(); - public byte[] Str_u8_bry() {return str_u8_bry;} private byte[] str_u8_bry = new byte[6]; public byte[] Src() {return src;} private byte[] src; - public Json_nde Root() {return root;} Json_nde root; + public Json_nde Root_nde() {return root;} private Json_nde root; + public Bry_bfr Bfr() {return bfr;} private final Bry_bfr bfr = Bry_bfr.new_(); + public Number_parser Utl_num_parser() {return utl_num_parser;} private final Number_parser utl_num_parser = new Number_parser(); + public byte[] Tmp_u8_bry() {return tmp_u8_bry;} private final byte[] tmp_u8_bry = new byte[6]; // tmp bry[] for decoding sequences like \u0008 public byte[] Get_val_as_bry_or(byte[] qry_bry, byte[] or) {tmp_qry_bry[0] = qry_bry; return Get_val_as_bry_or(tmp_qry_bry, or);} public byte[] Get_val_as_bry_or(byte[][] qry_bry, byte[] or) { Json_itm nde = Find_nde(root, qry_bry, qry_bry.length - 1, 0); - return nde == null || nde.Tid() != Json_itm_.Tid_string ? or : nde.Data_bry(); + return nde == null || nde.Tid() != Json_itm_.Tid__str ? or : nde.Data_bry(); } public String Get_val_as_str_or(byte[] qry_bry, String or) {tmp_qry_bry[0] = qry_bry; return Get_val_as_str_or(tmp_qry_bry, or);} public String Get_val_as_str_or(byte[][] qry_bry, String or) { Json_itm nde = Find_nde(root, qry_bry, qry_bry.length - 1, 0); - return nde == null || nde.Tid() != Json_itm_.Tid_string ? or : (String)nde.Data(); + return nde == null || nde.Tid() != Json_itm_.Tid__str ? or : (String)nde.Data(); } public Json_grp Get_grp(byte[] qry_bry) { tmp_qry_bry[0] = qry_bry; Json_itm rv = Find_nde(root, tmp_qry_bry, 0, 0); if (rv == null) return null; return (Json_grp)rv; - } private byte[][] tmp_qry_bry = new byte[1][]; + } public Json_grp Get_grp(byte[][] qry_bry) { Json_itm rv = Find_nde(root, qry_bry, qry_bry.length - 1, 0); if (rv == null) return null; return (Json_grp)rv; @@ -50,18 +51,12 @@ public class Json_doc { byte[] path = paths[paths_idx]; int subs_len = owner.Len(); for (int i = 0; i < subs_len; i++) { - Json_kv itm = Json_kv.cast_(owner.Get_at(i)); if (itm == null) continue; // ignore simple props, arrays, ndes + Json_kv itm = Json_kv.cast(owner.Get_at(i)); if (itm == null) continue; // ignore simple props, arrays, ndes if (!itm.Key_eq(path)) continue; if (paths_idx == paths_last) return itm.Val(); - Json_nde sub_nde = Json_nde.cast_(itm.Val()); if (sub_nde == null) return null; // match, but has not a nde; exit + Json_nde sub_nde = Json_nde.cast(itm.Val()); if (sub_nde == null) return null; // match, but has not a nde; exit return Find_nde(sub_nde, paths, paths_last, paths_idx + 1); } return null; } - public static Json_doc new_apos_concat_nl(String... ary) {return new_apos_(String_.Concat_lines_nl(ary));} - public static Json_doc new_apos_(String v) {return new_(Bry_.Replace(Bry_.new_u8(v), Byte_ascii.Apos, Byte_ascii.Quote));} - public static Json_doc new_(String v) {return new_(Bry_.new_u8(v));} - public static Json_doc new_(byte[] v) { - synchronized (parser) {return parser.Parse(v);} - } private static final Json_parser parser = new Json_parser(); } diff --git a/400_xowa/src/gplx/core/json/Json_doc_srl.java b/400_xowa/src/gplx/core/json/Json_doc_srl.java index 2c4db6643..6607e27b3 100644 --- a/400_xowa/src/gplx/core/json/Json_doc_srl.java +++ b/400_xowa/src/gplx/core/json/Json_doc_srl.java @@ -61,10 +61,10 @@ public class Json_doc_srl { private void Write_indent() {if (ws_enabled && indent > 0) bfr.Add_byte_repeat(Byte_ascii.Space, indent);} private void Write_str(byte[] v) { if (v == null) - bfr.Add(Bry_null); + bfr.Add(Object_.Bry__null); else bfr.Add_byte(Byte_ascii.Quote).Add(v).Add_byte(Byte_ascii.Quote); - } private static final byte[] Bry_null = Bry_.new_a7("null"); + } private void Write_comma(boolean comma) { if (comma) bfr.Add_byte(Byte_ascii.Comma); diff --git a/400_xowa/src/gplx/core/json/Json_doc_tst.java b/400_xowa/src/gplx/core/json/Json_doc_tst.java index 1aacb0676..ffdbaafe3 100644 --- a/400_xowa/src/gplx/core/json/Json_doc_tst.java +++ b/400_xowa/src/gplx/core/json/Json_doc_tst.java @@ -18,10 +18,9 @@ along with this program. If not, see . package gplx.core.json; import gplx.*; import gplx.core.*; import org.junit.*; public class Json_doc_tst { - Json_qry_mgr_fxt fxt = new Json_qry_mgr_fxt(); - @Before public void init() {} + private final Json_qry_mgr_fxt fxt = new Json_qry_mgr_fxt(); @Test public void Select() { - Json_doc doc = Json_doc.new_apos_(String_.Concat_lines_nl + Json_doc doc = fxt.Make_json ( "{'0':" , " {'0_0':" , " {'0_0_0':'000'" @@ -31,13 +30,15 @@ public class Json_doc_tst { , " }" , " }" , "}" - )); + ); fxt.Test_get_val_as_str(doc, "0/0_0/0_0_0", "000"); fxt.Test_get_val_as_str(doc, "0/0_1/0_1_0", "010"); fxt.Test_get_val_as_str(doc, "x", null); } } class Json_qry_mgr_fxt { + private final Json_parser json_parser = new Json_parser(); + public Json_doc Make_json(String... ary) {return json_parser.Parse_by_apos_ary(ary);} public void Test_get_val_as_str(Json_doc doc, String qry, String expd){ byte[][] qry_bry = Bry_.Split(Bry_.new_u8(qry), Byte_ascii.Slash); Tfds.Eq(expd, doc.Get_val_as_str_or(qry_bry, null)); diff --git a/400_xowa/src/gplx/core/json/Json_doc_wtr.java b/400_xowa/src/gplx/core/json/Json_doc_wtr.java index d589ab338..99aa7cae8 100644 --- a/400_xowa/src/gplx/core/json/Json_doc_wtr.java +++ b/400_xowa/src/gplx/core/json/Json_doc_wtr.java @@ -30,11 +30,11 @@ public class Json_doc_wtr { public Json_doc_wtr New_line() {bfr.Add_byte_nl(); return this;} public Json_doc_wtr Str(byte[] v) { if (v == null) - bfr.Add(Bry_null); + bfr.Add(Object_.Bry__null); else bfr.Add_byte(Byte_ascii.Quote).Add(v).Add_byte(Byte_ascii.Quote); return this; - } private static final byte[] Bry_null = Bry_.new_a7("null"); + } public Json_doc_wtr Int(int v) {bfr.Add_int_variable(v); return this;} public Json_doc_wtr Double(double v) {bfr.Add_double(v); return this;} public Json_doc_wtr Comma() {Indent(); bfr.Add_byte(Byte_ascii.Comma).Add_byte_nl(); return this;} diff --git a/400_xowa/src/gplx/core/json/Json_factory.java b/400_xowa/src/gplx/core/json/Json_factory.java index 4b9ee29bd..a6eb5192e 100644 --- a/400_xowa/src/gplx/core/json/Json_factory.java +++ b/400_xowa/src/gplx/core/json/Json_factory.java @@ -23,7 +23,7 @@ public class Json_factory { public Json_itm_int Int(Json_doc doc, int bgn, int end) {return new Json_itm_int(doc, bgn, end);} public Json_itm Decimal(Json_doc doc, int bgn, int end) {return new Json_itm_decimal(doc, bgn, end);} public Json_itm Str(Json_doc doc, int bgn, int end, boolean exact) {return new Json_itm_str(doc, bgn, end, exact);} - public Json_kv Kv(Json_itm key, Json_itm val) {return new Json_kv(key, val);} - public Json_ary Ary(int bgn, int end) {return new Json_ary(bgn, end);} + public Json_kv Kv(Json_itm key, Json_itm val) {return new Json_kv(key, val);} + public Json_ary Ary(int bgn, int end) {return new Json_ary(bgn, end);} public Json_nde Nde(Json_doc doc, int bgn) {return new Json_nde(doc, bgn);} } diff --git a/400_xowa/src/gplx/core/json/Json_grp.java b/400_xowa/src/gplx/core/json/Json_grp.java index 0dcf4f632..9bd7ab14f 100644 --- a/400_xowa/src/gplx/core/json/Json_grp.java +++ b/400_xowa/src/gplx/core/json/Json_grp.java @@ -24,7 +24,7 @@ public interface Json_grp extends Json_itm { } class Json_grp_ { public static final Json_grp[] Ary_empty = new Json_grp[0]; - public static void Print_nl(Bry_bfr bfr) { // \n\n can be caused by nested groups (EX: "[[]]"); only print 1 + public static void Print_nl(Bry_bfr bfr) { // \n\n can be caused by nested groups (EX: "[[]]"); only print 1 if (bfr.Bfr()[bfr.Len() - 1] != Byte_ascii.Nl) bfr.Add_byte_nl(); } diff --git a/400_xowa/src/gplx/core/json/Json_itm.java b/400_xowa/src/gplx/core/json/Json_itm.java index 2509d1961..a871b58c0 100644 --- a/400_xowa/src/gplx/core/json/Json_itm.java +++ b/400_xowa/src/gplx/core/json/Json_itm.java @@ -17,100 +17,43 @@ along with this program. If not, see . */ package gplx.core.json; import gplx.*; import gplx.core.*; public interface Json_itm { - byte Tid(); - int Src_bgn(); - int Src_end(); - Object Data(); - byte[] Data_bry(); - void Print_as_json(Bry_bfr bfr, int depth); - boolean Data_eq(byte[] comp); + byte Tid(); + int Src_bgn(); + int Src_end(); + Object Data(); + byte[] Data_bry(); + void Print_as_json(Bry_bfr bfr, int depth); + boolean Data_eq(byte[] comp); } class Json_itm_null extends Json_itm_base { Json_itm_null() {this.Ctor(-1, -1);} - @Override public byte Tid() {return Json_itm_.Tid_null;} + @Override public byte Tid() {return Json_itm_.Tid__null;} @Override public Object Data() {return null;} - @Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add(Bry_null);} - @Override public byte[] Data_bry() {return Bry_null;} - private static final byte[] Bry_null = Bry_.new_a7("null"); - public static Json_itm_null Null = new Json_itm_null(); + @Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add(Object_.Bry__null);} + @Override public byte[] Data_bry() {return Object_.Bry__null;} + public static final Json_itm_null Null = new Json_itm_null(); } class Json_itm_bool extends Json_itm_base { - public Json_itm_bool(boolean data) {this.data = data; this.Ctor(-1, -1);} private boolean data; - @Override public byte Tid() {return Json_itm_.Tid_bool;} + private boolean data; + public Json_itm_bool(boolean data) {this.data = data; this.Ctor(-1, -1);} + @Override public byte Tid() {return Json_itm_.Tid__bool;} @Override public Object Data() {return data;} - @Override public byte[] Data_bry() {return data ? Json_itm_.Const_true : Json_itm_.Const_false;} - @Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add(data ? Json_itm_.Const_true: Json_itm_.Const_false);} - public static Json_itm_bool Bool_n = new Json_itm_bool(false), Bool_y = new Json_itm_bool(true); + @Override public byte[] Data_bry() {return data ? Json_itm_.Bry__true : Json_itm_.Bry__false;} + @Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add(data ? Json_itm_.Bry__true: Json_itm_.Bry__false);} + public static final Json_itm_bool Bool_n = new Json_itm_bool(false), Bool_y = new Json_itm_bool(true); } class Json_itm_decimal extends Json_itm_base { - public Json_itm_decimal(Json_doc doc, int src_bgn, int src_end) {this.Ctor(src_bgn, src_end); this.doc = doc;} Json_doc doc; - @Override public byte Tid() {return Json_itm_.Tid_decimal;} + private final Json_doc doc; private Decimal_adp data; private byte[] data_bry; + public Json_itm_decimal(Json_doc doc, int src_bgn, int src_end) {this.Ctor(src_bgn, src_end); this.doc = doc;} + @Override public byte Tid() {return Json_itm_.Tid__decimal;} @Override public Object Data() { if (data == null) - data = Decimal_adp_.parse_(String_.new_a7(this.Data_bry())); + data = Decimal_adp_.parse(String_.new_a7(this.Data_bry())); return data; - } Decimal_adp data; + } @Override public byte[] Data_bry() { if (data_bry == null) data_bry = Bry_.Mid(doc.Src(), this.Src_bgn(), this.Src_end()); return data_bry; - } byte[] data_bry; + } @Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add_mid(doc.Src(), this.Src_bgn(), this.Src_end());} } -class Json_itm_str extends Json_itm_base { - public Json_itm_str(Json_doc doc, int src_bgn, int src_end, boolean exact) {this.Ctor(src_bgn + 1, src_end - 1); this.doc = doc; this.exact = exact;} private boolean exact; Json_doc doc; - @Override public byte Tid() {return Json_itm_.Tid_string;} - @Override public void Print_as_json(Bry_bfr bfr, int depth) { - bfr.Add_byte(Byte_ascii.Quote); - gplx.html.Html_utl.Escape_html_to_bfr(bfr, doc.Src(), this.Src_bgn(), this.Src_end(), true, true, true, true, false); // false to apos for backwards compatibility - bfr.Add_byte(Byte_ascii.Quote); - } - @Override public Object Data() { - if (data_str == null) { - if (data_bry == null) - data_bry = Data_make_bry(); - data_str = String_.new_u8(data_bry); - } - return data_str; - } private String data_str; - @Override public byte[] Data_bry() {if (data_bry == null) data_bry = Data_make_bry(); return data_bry;} - @Override public boolean Data_eq(byte[] comp) { - if (exact) return Bry_.Eq(comp, doc.Src(), this.Src_bgn(), this.Src_end()); - if (data_bry == null) data_bry = Data_make_bry(); - return Bry_.Match(data_bry, comp); - } byte[] data_bry = null; - private byte[] Data_make_bry() { - byte[] src = doc.Src(); int bgn = this.Src_bgn(), end = this.Src_end(); - if (exact) return Bry_.Mid(src, bgn, end); - Bry_bfr bfr = doc.Bfr(); - byte[] utf8_bry = doc.Str_u8_bry(); - for (int i = bgn; i < end; i++) { - byte b = src[i]; - switch (b) { - case Byte_ascii.Backslash: - b = src[++i]; - switch (b) { // NOTE: must properly unescape chars; EX:wd.q:2; DATE:2014-04-23 - case Byte_ascii.Ltr_t: bfr.Add_byte(Byte_ascii.Tab); break; - case Byte_ascii.Ltr_n: bfr.Add_byte(Byte_ascii.Nl); break; - case Byte_ascii.Ltr_r: bfr.Add_byte(Byte_ascii.Cr); break; - case Byte_ascii.Ltr_b: bfr.Add_byte(Byte_ascii.Backfeed); break; - case Byte_ascii.Ltr_f: bfr.Add_byte(Byte_ascii.Formfeed); break; - case Byte_ascii.Ltr_u: - int utf8_val = gplx.texts.HexDecUtl.parse_or_(src, i + 1, i + 5, -1); - int len = gplx.intl.Utf16_.Encode_int(utf8_val, utf8_bry, 0); - bfr.Add_mid(utf8_bry, 0, len); - i += 4; - break; // \uFFFF 4 hex-dec - case Byte_ascii.Backslash: - case Byte_ascii.Slash: - default: - bfr.Add_byte(b); break; // \? " \ / b f n r t - } - break; - default: - bfr.Add_byte(b); - break; - } - } - return bfr.Xto_bry_and_clear(); - } -} diff --git a/400_xowa/src/gplx/core/json/Json_itm_.java b/400_xowa/src/gplx/core/json/Json_itm_.java index 0fed5ee1f..2231d6c7e 100644 --- a/400_xowa/src/gplx/core/json/Json_itm_.java +++ b/400_xowa/src/gplx/core/json/Json_itm_.java @@ -18,9 +18,8 @@ along with this program. If not, see . package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_itm_ { public static final Json_itm[] Ary_empty = new Json_itm[0]; - public static final byte Tid_unknown = 0, Tid_null = 1, Tid_bool = 2, Tid_int = 3, Tid_decimal = 4, Tid_string = 5, Tid_kv = 6, Tid_array = 7, Tid_nde = 8; - public static final byte[][] Names = Bry_.Ary("unknown", "null", "boolean", "int", "decimal", "string", "keyval", "array", "nde"); - public static final byte[] Const_true = Bry_.new_a7("true"), Const_false = Bry_.new_a7("false"), Const_null = Bry_.new_a7("null"); + public static final byte Tid__unknown = 0, Tid__null = 1, Tid__bool = 2, Tid__int = 3, Tid__decimal = 4, Tid__str = 5, Tid__kv = 6, Tid__ary = 7, Tid__nde = 8; + public static final byte[] Bry__true = Bool_.True_bry, Bry__false = Bool_.False_bry, Bry__null = Object_.Bry__null; public static byte[] To_bry(Bry_bfr bfr, Json_itm itm) { if (itm == null) return Bry_.Empty; itm.Print_as_json(bfr, 0); diff --git a/400_xowa/src/gplx/core/json/Json_itm_int.java b/400_xowa/src/gplx/core/json/Json_itm_int.java index 4362aba2e..db97373b6 100644 --- a/400_xowa/src/gplx/core/json/Json_itm_int.java +++ b/400_xowa/src/gplx/core/json/Json_itm_int.java @@ -17,8 +17,10 @@ along with this program. If not, see . */ package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_itm_int extends Json_itm_base { - public Json_itm_int(Json_doc doc, int src_bgn, int src_end) {this.Ctor(src_bgn, src_end); this.doc = doc;} Json_doc doc; - @Override public byte Tid() {return Json_itm_.Tid_int;} + private final Json_doc doc; + private byte[] data_bry; private int data; private boolean data_is_null = true; + public Json_itm_int(Json_doc doc, int src_bgn, int src_end) {this.Ctor(src_bgn, src_end); this.doc = doc;} + @Override public byte Tid() {return Json_itm_.Tid__int;} public int Data_as_int() { if (data_is_null) { data = doc.Utl_num_parser().Parse(doc.Src(), Src_bgn(), Src_end()).Rv_as_int(); @@ -26,8 +28,8 @@ public class Json_itm_int extends Json_itm_base { } return data; } - @Override public Object Data() {return Data_as_int();} int data; boolean data_is_null = true; - @Override public byte[] Data_bry() {if (data_bry == null) data_bry = Bry_.Mid(doc.Src(), this.Src_bgn(), this.Src_end()); return data_bry;} private byte[] data_bry; + @Override public Object Data() {return Data_as_int();} + @Override public byte[] Data_bry() {if (data_bry == null) data_bry = Bry_.Mid(doc.Src(), this.Src_bgn(), this.Src_end()); return data_bry;} @Override public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add_mid(doc.Src(), this.Src_bgn(), this.Src_end());} - public static Json_itm_int cast_(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid_int ? null : (Json_itm_int)v;} + public static Json_itm_int cast(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__int ? null : (Json_itm_int)v;} } diff --git a/400_xowa/src/gplx/core/json/Json_itm_str.java b/400_xowa/src/gplx/core/json/Json_itm_str.java new file mode 100644 index 000000000..32702dffb --- /dev/null +++ b/400_xowa/src/gplx/core/json/Json_itm_str.java @@ -0,0 +1,78 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012 gnosygnu@gmail.com + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +package gplx.core.json; import gplx.*; import gplx.core.*; +class Json_itm_str extends Json_itm_base { + private final boolean exact; private final Json_doc doc; + private String data_str; private byte[] data_bry = null; + public Json_itm_str(Json_doc doc, int src_bgn, int src_end, boolean exact) {this.Ctor(src_bgn + 1, src_end - 1); this.doc = doc; this.exact = exact;} + @Override public byte Tid() {return Json_itm_.Tid__str;} + @Override public void Print_as_json(Bry_bfr bfr, int depth) { + bfr.Add_byte(Byte_ascii.Quote); + gplx.html.Html_utl.Escape_html_to_bfr(bfr, doc.Src(), this.Src_bgn(), this.Src_end(), true, true, true, true, false); // false to apos for backwards compatibility + bfr.Add_byte(Byte_ascii.Quote); + } + @Override public Object Data() { + if (data_str == null) { + if (data_bry == null) + data_bry = Data_make_bry(); + data_str = String_.new_u8(data_bry); + } + return data_str; + } + @Override public byte[] Data_bry() {if (data_bry == null) data_bry = Data_make_bry(); return data_bry;} + @Override public boolean Data_eq(byte[] comp) { + if (exact) return Bry_.Eq(comp, doc.Src(), this.Src_bgn(), this.Src_end()); + if (data_bry == null) data_bry = Data_make_bry(); + return Bry_.Match(data_bry, comp); + } + private byte[] Data_make_bry() { + byte[] src = doc.Src(); int bgn = this.Src_bgn(), end = this.Src_end(); + if (exact) return Bry_.Mid(src, bgn, end); + Bry_bfr bfr = doc.Bfr(); + byte[] utf8_bry = doc.Tmp_u8_bry(); + for (int i = bgn; i < end; i++) { + byte b = src[i]; + switch (b) { + case Byte_ascii.Backslash: + b = src[++i]; + switch (b) { // NOTE: must properly unescape chars; EX:wd.q:2; DATE:2014-04-23 + case Byte_ascii.Ltr_t: bfr.Add_byte(Byte_ascii.Tab); break; + case Byte_ascii.Ltr_n: bfr.Add_byte(Byte_ascii.Nl); break; + case Byte_ascii.Ltr_r: bfr.Add_byte(Byte_ascii.Cr); break; + case Byte_ascii.Ltr_b: bfr.Add_byte(Byte_ascii.Backfeed); break; + case Byte_ascii.Ltr_f: bfr.Add_byte(Byte_ascii.Formfeed); break; + case Byte_ascii.Ltr_u: + int utf8_val = gplx.texts.HexDecUtl.parse_or(src, i + 1, i + 5, -1); + int len = gplx.intl.Utf16_.Encode_int(utf8_val, utf8_bry, 0); + bfr.Add_mid(utf8_bry, 0, len); + i += 4; + break; // \uFFFF 4 hex-dec + case Byte_ascii.Backslash: + case Byte_ascii.Slash: + default: + bfr.Add_byte(b); break; // \? " \ / b f n r t + } + break; + default: + bfr.Add_byte(b); + break; + } + } + return bfr.Xto_bry_and_clear(); + } +} diff --git a/400_xowa/src/gplx/core/json/Json_itm_tmp.java b/400_xowa/src/gplx/core/json/Json_itm_tmp.java index 363a48c69..41cc6868b 100644 --- a/400_xowa/src/gplx/core/json/Json_itm_tmp.java +++ b/400_xowa/src/gplx/core/json/Json_itm_tmp.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ package gplx.core.json; import gplx.*; import gplx.core.*; -public class Json_itm_tmp implements Json_itm { +public class Json_itm_tmp implements Json_itm { // TEST: public Json_itm_tmp(byte tid, String data) {this.tid = tid; this.data = data;} public byte Tid() {return tid;} private byte tid; public byte[] Data_bry() {return Bry_.new_u8(Object_.Xto_str_strict_or_empty(data));} @@ -26,6 +26,6 @@ public class Json_itm_tmp implements Json_itm { public void Print_as_json(Bry_bfr bfr, int depth) {bfr.Add_str(data);} public boolean Data_eq(byte[] comp) {return false;} public void Clear() {} - public static Json_itm new_str_(String v) {return new Json_itm_tmp(Json_itm_.Tid_string, "\"" + v + "\"");} - public static Json_itm new_int_(int v) {return new Json_itm_tmp(Json_itm_.Tid_int, Int_.Xto_str(v));} + public static Json_itm new_str_(String v) {return new Json_itm_tmp(Json_itm_.Tid__str, "\"" + v + "\"");} + public static Json_itm new_int_(int v) {return new Json_itm_tmp(Json_itm_.Tid__int, Int_.Xto_str(v));} } diff --git a/400_xowa/src/gplx/core/json/Json_kv.java b/400_xowa/src/gplx/core/json/Json_kv.java index 437fd3902..c503f91c1 100644 --- a/400_xowa/src/gplx/core/json/Json_kv.java +++ b/400_xowa/src/gplx/core/json/Json_kv.java @@ -18,14 +18,14 @@ along with this program. If not, see . package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_kv extends Json_itm_base { public Json_kv(Json_itm key, Json_itm val) {this.key = key; this.val = val;} - @Override public byte Tid() {return Json_itm_.Tid_kv;} - public Json_itm Key() {return key;} Json_itm key; - public Json_itm Val() {return val;} Json_itm val; - public Json_nde Val_as_nde() {return Json_nde.cast_(val);} - public Json_ary Val_as_ary() {return Json_ary.cast(val);} + @Override public byte Tid() {return Json_itm_.Tid__kv;} + public Json_itm Key() {return key;} private final Json_itm key; + public Json_itm Val() {return val;} private final Json_itm val; public byte[] Key_as_bry() {return key.Data_bry();} public String Key_as_str() {return (String)key.Data();} public byte[] Val_as_bry() {return val.Data_bry();} + public Json_nde Val_as_nde() {return Json_nde.cast(val);} + public Json_ary Val_as_ary() {return Json_ary.cast(val);} public boolean Key_eq(byte[] comp) {return ((Json_itm_str)key).Data_eq(comp);} @Override public Object Data() {return null;} @Override public byte[] Data_bry() {return null;} @@ -35,5 +35,5 @@ public class Json_kv extends Json_itm_base { val.Print_as_json(bfr, depth); } public static final Json_kv[] Ary_empty = new Json_kv[0]; - public static Json_kv cast_(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid_kv ? null : (Json_kv)v;} + public static Json_kv cast(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__kv ? null : (Json_kv)v;} } diff --git a/400_xowa/src/gplx/core/json/Json_kv_ary_srl.java b/400_xowa/src/gplx/core/json/Json_kv_ary_srl.java index 6bc635fc1..734512884 100644 --- a/400_xowa/src/gplx/core/json/Json_kv_ary_srl.java +++ b/400_xowa/src/gplx/core/json/Json_kv_ary_srl.java @@ -19,7 +19,7 @@ package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_kv_ary_srl { public static KeyVal Kv_by_itm(Json_itm itm) { switch (itm.Tid()) { - case Json_itm_.Tid_kv: + case Json_itm_.Tid__kv: Json_kv kv = (Json_kv)itm; return KeyVal_.new_(kv.Key_as_str(), Val_by_itm(kv.Val())); default: @@ -28,14 +28,14 @@ public class Json_kv_ary_srl { } private static Object Val_by_itm(Json_itm itm) { switch (itm.Tid()) { - case Json_itm_.Tid_bool: return Bool_.Xto_str_lower(Bool_.cast_(itm.Data())); - case Json_itm_.Tid_int: - case Json_itm_.Tid_null: - case Json_itm_.Tid_string: - case Json_itm_.Tid_decimal: return itm.Data(); - case Json_itm_.Tid_array: return Val_by_itm_ary((Json_ary)itm); - case Json_itm_.Tid_nde: return Val_by_itm_nde((Json_nde)itm); - case Json_itm_.Tid_kv: // kv should never be val; EX: "a":"b":c; not possible + case Json_itm_.Tid__bool: return Bool_.To_str_lower(Bool_.cast(itm.Data())); + case Json_itm_.Tid__int: + case Json_itm_.Tid__null: + case Json_itm_.Tid__str: + case Json_itm_.Tid__decimal: return itm.Data(); + case Json_itm_.Tid__ary: return Val_by_itm_ary((Json_ary)itm); + case Json_itm_.Tid__nde: return Val_by_itm_nde((Json_nde)itm); + case Json_itm_.Tid__kv: // kv should never be val; EX: "a":"b":c; not possible default: throw Err_.new_unhandled(itm.Tid()); } } diff --git a/400_xowa/src/gplx/core/json/Json_kv_ary_srl_tst.java b/400_xowa/src/gplx/core/json/Json_kv_ary_srl_tst.java index 2a21c99b4..995262ff1 100644 --- a/400_xowa/src/gplx/core/json/Json_kv_ary_srl_tst.java +++ b/400_xowa/src/gplx/core/json/Json_kv_ary_srl_tst.java @@ -23,7 +23,7 @@ public class Json_kv_ary_srl_tst { @Test public void Bool_n() {fxt.Test_parse("{'k0':false}" , fxt.ary_(fxt.kv_bool_("k0", false)));} @Test public void Num() {fxt.Test_parse("{'k0':123}" , fxt.ary_(fxt.kv_int_("k0", 123)));} @Test public void Str() {fxt.Test_parse("{'k0':'v0'}" , fxt.ary_(fxt.kv_str_("k0", "v0")));} - @Test public void Num_dec() {fxt.Test_parse("{'k0':1.23}" , fxt.ary_(fxt.kv_dec_("k0", Decimal_adp_.parse_("1.23"))));} + @Test public void Num_dec() {fxt.Test_parse("{'k0':1.23}" , fxt.ary_(fxt.kv_dec_("k0", Decimal_adp_.parse("1.23"))));} @Test public void Ary_int() {fxt.Test_parse("{'k0':[1,2,3]}" , fxt.ary_(fxt.kv_obj_("k0", fxt.ary_(fxt.kv_int_("1", 1), fxt.kv_int_("2", 2), fxt.kv_int_("3", 3)))));} @Test public void Ary_empty() {fxt.Test_parse("{'k0':[]}" , fxt.ary_(fxt.kv_obj_("k0", fxt.ary_())));} @Test public void Subs_int() {fxt.Test_parse("{'k0':{'k00':1,'k01':2}}" , fxt.ary_(fxt.kv_obj_("k0", fxt.ary_(fxt.kv_int_("k00", 1), fxt.kv_int_("k01", 2)))));} @@ -38,13 +38,13 @@ class Json_kv_ary_srl_fxt { public void Test_parse(String raw_str, KeyVal[] expd) { byte[] raw_bry = Json_parser_tst.Replace_apos(Bry_.new_u8(raw_str)); Json_doc doc = parser.Parse(raw_bry); - KeyVal[] actl = Json_kv_ary_srl.Val_by_itm_nde(doc.Root()); - Tfds.Eq_str_lines(KeyVal_.Ary_x_to_str(expd), KeyVal_.Ary_x_to_str(actl)); + KeyVal[] actl = Json_kv_ary_srl.Val_by_itm_nde(doc.Root_nde()); + Tfds.Eq_str_lines(KeyVal_.Ary_to_str(expd), KeyVal_.Ary_to_str(actl)); } public KeyVal[] ary_(KeyVal... ary) {return ary;} public KeyVal kv_obj_(String key, Object val) {return KeyVal_.new_(key, val);} public KeyVal kv_str_(String key, String val) {return KeyVal_.new_(key, val);} public KeyVal kv_int_(String key, int val) {return KeyVal_.new_(key, val);} - public KeyVal kv_bool_(String key, boolean val) {return KeyVal_.new_(key, Bool_.Xto_str_lower(val));} + public KeyVal kv_bool_(String key, boolean val) {return KeyVal_.new_(key, Bool_.To_str_lower(val));} public KeyVal kv_dec_(String key, Decimal_adp val) {return KeyVal_.new_(key, val.To_str());} } diff --git a/400_xowa/src/gplx/core/json/Json_nde.java b/400_xowa/src/gplx/core/json/Json_nde.java index 23b84aea6..150426dfc 100644 --- a/400_xowa/src/gplx/core/json/Json_nde.java +++ b/400_xowa/src/gplx/core/json/Json_nde.java @@ -19,7 +19,7 @@ package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_nde extends Json_itm_base implements Json_grp { private Json_itm[] subs = Json_itm_.Ary_empty; private int subs_len = 0, subs_max = 0; public Json_nde(Json_doc jdoc, int src_bgn) {this.jdoc = jdoc; this.Ctor(src_bgn, -1);} - @Override public byte Tid() {return Json_itm_.Tid_nde;} + @Override public byte Tid() {return Json_itm_.Tid__nde;} public Json_doc Doc() {return jdoc;} private final Json_doc jdoc; public void Src_end_(int v) {this.src_end = v;} @Override public Object Data() {return null;} @@ -27,21 +27,21 @@ public class Json_nde extends Json_itm_base implements Json_grp { public int Len() {return subs_len;} public Json_kv Get_at_as_kv(int i) { Json_itm rv_itm = Get_at(i); - Json_kv rv = Json_kv.cast_(rv_itm); if (rv == null) throw Err_.new_("json", "sub is not kv", "i", i, "src", Bry_.Mid(jdoc.Src(), this.Src_bgn(), src_end)); + Json_kv rv = Json_kv.cast(rv_itm); if (rv == null) throw Err_.new_("json", "sub is not kv", "i", i, "src", Bry_.Mid(jdoc.Src(), this.Src_bgn(), src_end)); return rv; } public Json_itm Get_at(int i) {return subs[i];} - public Json_kv Get_kv(byte[] key) {return Json_kv.cast_(Get_itm(key));} + public Json_kv Get_kv(byte[] key) {return Json_kv.cast(Get_itm(key));} public Json_nde Get(String key) {return Get(Bry_.new_u8(key));} public Json_nde Get(byte[] key) { - Json_kv kv = Json_kv.cast_(this.Get_itm(key)); if (kv == null) throw Err_.new_("json", "kv not found", "key", key); - Json_nde rv = Json_nde.cast_(kv.Val()); if (rv == null) throw Err_.new_("json", "nde not found", "key", key); + Json_kv kv = Json_kv.cast(this.Get_itm(key)); if (kv == null) throw Err_.new_("json", "kv not found", "key", key); + Json_nde rv = Json_nde.cast(kv.Val()); if (rv == null) throw Err_.new_("json", "nde not found", "key", key); return rv; } public Json_itm Get_itm(byte[] key) { for (int i = 0; i < subs_len; i++) { Json_itm itm = subs[i]; - if (itm.Tid() == Json_itm_.Tid_kv) { + if (itm.Tid() == Json_itm_.Tid__kv) { Json_kv itm_as_kv = (Json_kv)itm; if (Bry_.Eq(key, itm_as_kv.Key().Data_bry())) return itm; @@ -59,7 +59,7 @@ public class Json_nde extends Json_itm_base implements Json_grp { public byte[] Get_bry(byte[] key, byte[] or) { Json_itm kv_obj = Get_itm(key); if (kv_obj == null) return or; // key not found; - if (kv_obj.Tid() != Json_itm_.Tid_kv) return or; // key is not a key_val + if (kv_obj.Tid() != Json_itm_.Tid__kv) return or; // key is not a key_val Json_kv kv = (Json_kv)kv_obj; Json_itm val = kv.Val(); return (val == null) ? or : val.Data_bry(); @@ -96,5 +96,5 @@ public class Json_nde extends Json_itm_base implements Json_grp { Json_grp_.Print_nl(bfr); Json_grp_.Print_indent(bfr, depth); bfr.Add_byte(Byte_ascii.Curly_end).Add_byte_nl(); } - public static Json_nde cast_(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid_nde ? null : (Json_nde)v;} + public static Json_nde cast(Json_itm v) {return v == null || v.Tid() != Json_itm_.Tid__nde ? null : (Json_nde)v;} } diff --git a/400_xowa/src/gplx/core/json/Json_parser.java b/400_xowa/src/gplx/core/json/Json_parser.java index 007962457..a681078c9 100644 --- a/400_xowa/src/gplx/core/json/Json_parser.java +++ b/400_xowa/src/gplx/core/json/Json_parser.java @@ -17,21 +17,30 @@ along with this program. If not, see . */ package gplx.core.json; import gplx.*; import gplx.core.*; public class Json_parser { - public Json_factory Factory() {return factory;} private Json_factory factory = new Json_factory(); - private byte[] src; private int src_len, pos; private Number_parser num_parser = new Number_parser(); - private static final byte[] Bry_bool_rue = Bry_.new_a7("rue"), Bry_bool_alse = Bry_.new_a7("alse"), Bry_null_ull = Bry_.new_a7("ull"); + private byte[] src; private int src_len, pos; private final Number_parser num_parser = new Number_parser(); + public Json_factory Factory() {return factory;} private final Json_factory factory = new Json_factory(); + public Json_doc Parse_by_apos_ary(String... ary) {return Parse_by_apos(String_.Concat_lines_nl(ary));} + public Json_doc Parse_by_apos(String s) {return Parse(Bry_.Replace(Bry_.new_u8(s), Byte_ascii.Apos, Byte_ascii.Quote));} + public Json_doc Parse(String src) {return Parse(Bry_.new_u8(src));} public Json_doc Parse(byte[] src) { - Json_doc doc = new Json_doc(); - this.src = src; this.src_len = src.length; pos = 0; - Skip_ws(); - if (src.length == 0) return null; - if (src[pos] != Byte_ascii.Curly_bgn) return null; - Skip_ws(); -// if (src[pos + 1] != Byte_ascii.Quote) return null; -// throw Err_.new_wo_type("doc must start with {"); - Json_nde root = Make_nde(doc); - doc.Ctor(src, root); - return doc; + synchronized (factory) { + this.src = src; if (src == null) return null; + this.src_len = src.length; if (src_len == 0) return null; + this.pos = 0; + Skip_ws(); + boolean root_is_nde = true; + switch (src[pos]) { + case Byte_ascii.Curly_bgn: root_is_nde = Bool_.Y; break; + case Byte_ascii.Brack_bgn: root_is_nde = Bool_.N; break; + default: return null; + } + Skip_ws(); + Json_doc doc = new Json_doc(); + Json_nde root = Make_nde(doc); + if (root_is_nde) {} + doc.Ctor(src, root); + return doc; + } } private Json_nde Make_nde(Json_doc doc) { ++pos; // brack_bgn @@ -49,7 +58,7 @@ public class Json_parser { } throw Err_.new_wo_type("eos inside nde"); } - Json_itm Make_kv(Json_doc doc) { + private Json_itm Make_kv(Json_doc doc) { Json_itm key = Make_string(doc); Skip_ws(); Chk(Byte_ascii.Colon); @@ -57,7 +66,7 @@ public class Json_parser { Json_itm val = Make_val(doc); return new Json_kv(key, val); } - Json_itm Make_val(Json_doc doc) { + private Json_itm Make_val(Json_doc doc) { while (pos < src_len) { byte b = src[pos]; switch (b) { @@ -75,16 +84,16 @@ public class Json_parser { } throw Err_.new_wo_type("eos reached in val"); } - Json_itm Make_literal(byte[] remainder, int remainder_len, Json_itm singleton) { + private Json_itm Make_literal(byte[] remainder, int remainder_len, Json_itm singleton) { ++pos; // 1st char int literal_end = pos + remainder_len; if (Bry_.Eq(remainder, src, pos, literal_end)) { pos = literal_end; return singleton; } - throw Err_.new_wo_type("invalid literal"); + throw Err_.new_("json.parser", "invalid literal", "excerpt", Bry_.Mid_by_len_safe(src, pos - 1, 16)); } - Json_itm Make_string(Json_doc doc) { + private Json_itm Make_string(Json_doc doc) { int bgn = pos++; // ++: quote_bgn boolean exact = true; while (pos < src_len) { @@ -106,7 +115,7 @@ public class Json_parser { } throw Err_.new_wo_type("eos reached inside quote"); } - Json_itm Make_num(Json_doc doc) { + private Json_itm Make_num(Json_doc doc) { int num_bgn = pos; boolean loop = true; while (loop) { @@ -131,7 +140,7 @@ public class Json_parser { ? factory.Decimal(doc, num_bgn, pos) : factory.Int(doc, num_bgn, pos); } - Json_ary Make_ary(Json_doc doc) { + private Json_ary Make_ary(Json_doc doc) { Json_ary rv = factory.Ary(pos++, pos); // brack_bgn while (pos < src_len) { Skip_ws(); @@ -159,9 +168,10 @@ public class Json_parser { else throw err_(src, pos, "expected '{0}' but got '{1}'", Char_.To_str(expd), Char_.To_str(src[pos])); } - Err err_(byte[] src, int bgn, String fmt, Object... args) {return err_(src, bgn, src.length, fmt, args);} - Err err_(byte[] src, int bgn, int src_len, String fmt, Object... args) { + private Err err_(byte[] src, int bgn, String fmt, Object... args) {return err_(src, bgn, src.length, fmt, args);} + private Err err_(byte[] src, int bgn, int src_len, String fmt, Object... args) { String msg = String_.Format(fmt, args) + " " + Int_.Xto_str(bgn) + " " + String_.new_u8_by_len(src, bgn, 20); return Err_.new_wo_type(msg); } + private static final byte[] Bry_bool_rue = Bry_.new_a7("rue"), Bry_bool_alse = Bry_.new_a7("alse"), Bry_null_ull = Bry_.new_a7("ull"); } diff --git a/400_xowa/src/gplx/core/json/Json_parser_tst.java b/400_xowa/src/gplx/core/json/Json_parser_tst.java index b69e24385..58dad3910 100644 --- a/400_xowa/src/gplx/core/json/Json_parser_tst.java +++ b/400_xowa/src/gplx/core/json/Json_parser_tst.java @@ -58,7 +58,7 @@ class Json_parser_fxt { public Json_kv itm_kv_(String k, String v) {return factory.Kv(itm_str_(k), itm_str_(v));} public Json_kv itm_kv_(String k, int v) {return factory.Kv(itm_str_(k), itm_int_(v));} public Json_kv itm_kv_(String k, boolean v) {return factory.Kv(itm_str_(k), v ? factory.Bool_y() : factory.Bool_n());} - public Json_kv itm_kv_dec_(String k, String v) {return factory.Kv(itm_str_(k), new Json_itm_tmp(Json_itm_.Tid_decimal, v));} + public Json_kv itm_kv_dec_(String k, String v) {return factory.Kv(itm_str_(k), new Json_itm_tmp(Json_itm_.Tid__decimal, v));} public Json_kv itm_kv_(String k, Json_nde v) {return factory.Kv(itm_str_(k), v);} public Json_kv itm_kv_ary_int_(String k, int... v) { Json_ary ary = factory.Ary(-1, -1); @@ -77,7 +77,7 @@ class Json_parser_fxt { public void Test_parse(String raw_str, Json_itm... expd_ary) { byte[] raw = Json_parser_tst.Replace_apos(Bry_.new_u8(raw_str)); Json_doc doc = parser.Parse(raw); - doc.Root().Print_as_json(tmp_bfr, 0); + doc.Root_nde().Print_as_json(tmp_bfr, 0); String actl = tmp_bfr.Xto_str_and_clear(); String expd = Xto_str(raw, doc, expd_ary, 0, expd_ary.length); Tfds.Eq_str_lines(expd, actl, actl); @@ -85,7 +85,7 @@ class Json_parser_fxt { public void Test_parse_val0(String raw_str, Object expd) { byte[] raw = Json_parser_tst.Replace_apos(Bry_.new_u8(raw_str)); Json_doc doc = parser.Parse(raw); - Json_kv kv = Json_kv.cast_(doc.Root().Get_at(0)); // assume root has kv as first sub; EX: {"a":"b"} + Json_kv kv = Json_kv.cast(doc.Root_nde().Get_at(0)); // assume root has kv as first sub; EX: {"a":"b"} Object actl = kv.Val().Data(); // NOTE: Data_bry is escaped val; EX: a\"b has DataBry of a"b Tfds.Eq(expd, actl); } diff --git a/400_xowa/src/gplx/core/json/Json_wtr.java b/400_xowa/src/gplx/core/json/Json_wtr.java index 4cb91bfa8..d32918cb3 100644 --- a/400_xowa/src/gplx/core/json/Json_wtr.java +++ b/400_xowa/src/gplx/core/json/Json_wtr.java @@ -51,8 +51,8 @@ public class Json_wtr { } public Json_wtr Ary_itm_str(String itm) {return Ary_itm_by_type_tid(Type_adp_.Tid__str, itm);} public Json_wtr Ary_itm_bry(byte[] itm) {return Ary_itm_by_type_tid(Type_adp_.Tid__bry, itm);} - public Json_wtr Ary_itm_obj(Object itm) {return Ary_itm_by_type_tid(Type_adp_.To_tid(itm), itm);} - private Json_wtr Ary_itm_by_type_tid(int itm_type_tid, Object itm) { + public Json_wtr Ary_itm_obj(Object itm) {return Ary_itm_by_type_tid(Type_adp_.To_tid_obj(itm), itm);} + public Json_wtr Ary_itm_by_type_tid(int itm_type_tid, Object itm) { Add_indent_itm(ary_itm_is_first); Add_itm_by_tid(itm_type_tid, itm); Add_nl(); @@ -85,6 +85,14 @@ public class Json_wtr { nde_itm_is_first = false; return this; } + public Json_wtr Kv_obj(byte[] key, Object val, int val_tid) { + Add_indent_itm(nde_itm_is_first); + Add_key(key); + Add_itm_by_tid(val_tid, val); + Add_nl(); + nde_itm_is_first = false; + return this; + } public Json_wtr Kv_bfr(String key, Bry_bfr val) { Add_indent_itm(nde_itm_is_first); Add_key(Bry_.new_u8(key)); @@ -115,14 +123,14 @@ public class Json_wtr { bfr.Add_byte_colon(); return this; } - public void Add_itm_by_tid(int type_tid, Object obj) { + private void Add_itm_by_tid(int type_tid, Object obj) { switch (type_tid) { - case Type_adp_.Tid__bool: bfr.Add_bool(Bool_.cast_(obj)); break; - case Type_adp_.Tid__byte: bfr.Add_byte(Byte_.cast_(obj)); break; - case Type_adp_.Tid__int: bfr.Add_int_variable(Int_.cast_(obj)); break; - case Type_adp_.Tid__long: bfr.Add_long_variable(Long_.cast_(obj)); break; - case Type_adp_.Tid__float: bfr.Add_float(Float_.cast_(obj)); break; - case Type_adp_.Tid__double: bfr.Add_double(Double_.cast_(obj)); break; + case Type_adp_.Tid__bool: bfr.Add_bool(Bool_.cast(obj)); break; + case Type_adp_.Tid__byte: bfr.Add_byte(Byte_.cast(obj)); break; + case Type_adp_.Tid__int: bfr.Add_int_variable(Int_.cast(obj)); break; + case Type_adp_.Tid__long: bfr.Add_long_variable(Long_.cast(obj)); break; + case Type_adp_.Tid__float: bfr.Add_float(Float_.cast(obj)); break; + case Type_adp_.Tid__double: bfr.Add_double(Double_.cast(obj)); break; case Type_adp_.Tid__str: Add_itm_bry(Bry_.new_u8((String)obj)); break; case Type_adp_.Tid__bry: Add_itm_bry((byte[])obj); break; case Type_adp_.Tid__char: diff --git a/400_xowa/src/gplx/core/lists/Binary_search_.java b/400_xowa/src/gplx/core/lists/Binary_search_.java index a0a5875c8..a5f989340 100644 --- a/400_xowa/src/gplx/core/lists/Binary_search_.java +++ b/400_xowa/src/gplx/core/lists/Binary_search_.java @@ -47,6 +47,6 @@ public class Binary_search_ { else if (pos > pos_last) pos = pos_last; pos_prv = pos; } - return Int_.MinValue; // should only occur if (a) ary's 0th slot is not ""; or (b) some unknown error + return Int_.Min_value; // should only occur if (a) ary's 0th slot is not ""; or (b) some unknown error } } diff --git a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_itm.java b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_itm.java index ac5fa509d..fb1b831e7 100644 --- a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_itm.java +++ b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_itm.java @@ -23,16 +23,16 @@ public class Db_cfg_itm { public String Val() {return val;} public Db_cfg_itm Val_(String v) {val = v; return this;} private String val; public String To_str_or(String or) {return val == null ? or : val;} public byte[] To_bry_or(byte[] or) {try {return val == null ? or : Bry_.new_u8(val) ;} catch (Exception e) {throw err_parse(e, Bry_.Cls_val_name);}} - public int To_int_or(int or) {try {return val == null ? or : Int_.parse_or_(val, or) ;} catch (Exception e) {throw err_parse(e, Int_.Cls_val_name);}} - public long To_long_or(long or) {try {return val == null ? or : Long_.parse_or_(val, or) ;} catch (Exception e) {throw err_parse(e, Long_.Cls_val_name);}} - public byte To_byte_or(byte or) {try {return val == null ? or : Byte_.parse_or_(val, or) ;} catch (Exception e) {throw err_parse(e, Byte_.Cls_val_name);}} + public int To_int_or(int or) {try {return val == null ? or : Int_.parse_or(val, or) ;} catch (Exception e) {throw err_parse(e, Int_.Cls_val_name);}} + public long To_long_or(long or) {try {return val == null ? or : Long_.parse_or(val, or) ;} catch (Exception e) {throw err_parse(e, Long_.Cls_val_name);}} + public byte To_byte_or(byte or) {try {return val == null ? or : Byte_.parse_or(val, or) ;} catch (Exception e) {throw err_parse(e, Byte_.Cls_val_name);}} public boolean To_yn_or_n() {return To_yn_or(Bool_.N);} public boolean To_yn_or(boolean or) {try {return val == null ? or : Yn.parse_by_char_or(val, or);} catch (Exception e) {throw err_parse(e, Bool_.Cls_val_name);}} public DateAdp To_date_or(DateAdp or) {try {return val == null ? or : DateAdp_.parse_gplx(val) ;} catch (Exception e) {throw err_parse(e, DateAdp_.Cls_ref_name);}} - public Guid_adp To_guid_or(Guid_adp or) {try {return val == null ? or : Guid_adp_.parse_(val) ;} catch (Exception e) {throw err_parse(e, Guid_adp_.Cls_ref_name);}} - public boolean To_bool() {Fail_if_null(); try {return Yn.parse_(val) ;} catch (Exception e) {throw err_parse(e, Bool_.Cls_val_name);}} - public byte To_byte() {Fail_if_null(); try {return Byte_.parse_(val) ;} catch (Exception e) {throw err_parse(e, Byte_.Cls_val_name);}} - public int To_int() {Fail_if_null(); try {return Int_.parse_(val) ;} catch (Exception e) {throw err_parse(e, Int_.Cls_val_name);}} + public Guid_adp To_guid_or(Guid_adp or) {try {return val == null ? or : Guid_adp_.parse(val) ;} catch (Exception e) {throw err_parse(e, Guid_adp_.Cls_ref_name);}} + public boolean To_bool() {Fail_if_null(); try {return Yn.parse(val) ;} catch (Exception e) {throw err_parse(e, Bool_.Cls_val_name);}} + public byte To_byte() {Fail_if_null(); try {return Byte_.parse(val) ;} catch (Exception e) {throw err_parse(e, Byte_.Cls_val_name);}} + public int To_int() {Fail_if_null(); try {return Int_.parse(val) ;} catch (Exception e) {throw err_parse(e, Int_.Cls_val_name);}} public String To_str() {Fail_if_null(); return val;} private void Fail_if_null() {if (val == null) throw Err_.new_wo_type("cfg.val is empty", "grp", grp, "key", key); } private Err err_parse(Exception e, String type) {return Err_.new_wo_type("cfg.val is not parseable", "grp", grp, "key", key, "val", val, "type", type).Trace_ignore_add_1_();} diff --git a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java index d604b2faa..c6d1e59a1 100644 --- a/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java +++ b/400_xowa/src/gplx/dbs/cfgs/Db_cfg_tbl.java @@ -112,12 +112,12 @@ public class Db_cfg_tbl implements RlsAble { public DateAdp Assert_date (String grp, String key, DateAdp or) {String val = Select_str_or(grp, key, null) ; if (val == null) {Insert_date (grp, key, or); return or;} return Parse_date (grp, key, val);} public Guid_adp Assert_guid (String grp, String key, Guid_adp or) {String val = Select_str_or(grp, key, null) ; if (val == null) {Insert_guid (grp, key, or); return or;} return Parse_guid (grp, key, val);} public String Assert_str (String grp, String key, String or) {String val = Select_str_or(grp, key, null) ; if (val == null) {Insert_str (grp, key, or); return or;} return val;} - private boolean Parse_yn (String grp, String key, String val) {try {return Yn.parse_(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Bool_.Cls_val_name);}} - private byte Parse_byte (String grp, String key, String val) {try {return Byte_.parse_(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Byte_.Cls_val_name);}} - private int Parse_int (String grp, String key, String val) {try {return Int_.parse_(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Int_.Cls_val_name);}} - private long Parse_long (String grp, String key, String val) {try {return Long_.parse_(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Long_.Cls_val_name);}} + private boolean Parse_yn (String grp, String key, String val) {try {return Yn.parse(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Bool_.Cls_val_name);}} + private byte Parse_byte (String grp, String key, String val) {try {return Byte_.parse(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Byte_.Cls_val_name);}} + private int Parse_int (String grp, String key, String val) {try {return Int_.parse(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Int_.Cls_val_name);}} + private long Parse_long (String grp, String key, String val) {try {return Long_.parse(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Long_.Cls_val_name);}} private byte[] Parse_bry (String grp, String key, String val) {try {return Bry_.new_u8(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Bry_.Cls_val_name);}} private DateAdp Parse_date (String grp, String key, String val) {try {return DateAdp_.parse_gplx(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, DateAdp_.Cls_ref_name);}} - private Guid_adp Parse_guid (String grp, String key, String val) {try {return Guid_adp_.parse_(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Guid_adp_.Cls_ref_name);}} + private Guid_adp Parse_guid (String grp, String key, String val) {try {return Guid_adp_.parse(val) ;} catch (Exception e) {throw err_parse(e, grp, key, val, Guid_adp_.Cls_ref_name);}} private Err err_parse(Exception e, String grp, String key, String val, String type) {return Err_.new_exc(e, "db", "cfg.val is not parseable", "grp", grp, "key", key, "val", val, "type", type);} } diff --git a/400_xowa/src/gplx/php/Php_parser_tst.java b/400_xowa/src/gplx/php/Php_parser_tst.java index 6db2de360..7ab8f266b 100644 --- a/400_xowa/src/gplx/php/Php_parser_tst.java +++ b/400_xowa/src/gplx/php/Php_parser_tst.java @@ -250,12 +250,12 @@ class Php_tkn_num_chkr extends Php_tkn_chkr_base { public Php_tkn_num_chkr(int src_bgn, int src_end) {this.Src_rng_(src_bgn, src_end);} @Override public Class TypeOf() {return Php_tkn_num.class;} @Override public byte Tkn_tid() {return Php_tkn_.Tid_num;} - public Php_tkn_num_chkr Num_val_int_(int v) {this.num_val_int = v; return this;} private int num_val_int = Int_.MinValue; + public Php_tkn_num_chkr Num_val_int_(int v) {this.num_val_int = v; return this;} private int num_val_int = Int_.Min_value; @Override public int Chk_tkn(Tst_mgr mgr, String path, Php_tkn actl_obj) { Php_tkn_num actl = (Php_tkn_num)actl_obj; int rv = 0; byte[] raw_bry = (byte[])mgr.Vars_get_by_key("raw_bry"); - rv += mgr.Tst_val(num_val_int == Int_.MinValue, path, "num_val_int", num_val_int, actl.Num_val_int(raw_bry)); + rv += mgr.Tst_val(num_val_int == Int_.Min_value, path, "num_val_int", num_val_int, actl.Num_val_int(raw_bry)); return rv; } } diff --git a/400_xowa/src/gplx/php/Php_srl_parser.java b/400_xowa/src/gplx/php/Php_srl_parser.java index eba2d437f..4faea3405 100644 --- a/400_xowa/src/gplx/php/Php_srl_parser.java +++ b/400_xowa/src/gplx/php/Php_srl_parser.java @@ -42,7 +42,7 @@ public class Php_srl_parser { val = Xto_kv_ary(ary); break; case Php_srl_itm_.Tid_function: - val = new gplx.xowa.xtns.scribunto.Scrib_lua_proc(Object_.Xto_str_strict_or_null_mark(key), Int_.cast_(itm_val.Val())); // NOTE: in most cases, key is a STRING (name of ScribFunction); however, for gsub it is an INT (arg_idx) b/c it is passed as a parameter + val = new gplx.xowa.xtns.scribunto.Scrib_lua_proc(Object_.Xto_str_strict_or_null_mark(key), Int_.cast(itm_val.Val())); // NOTE: in most cases, key is a STRING (name of ScribFunction); however, for gsub it is an INT (arg_idx) b/c it is passed as a parameter break; default: val = itm_val.Val(); @@ -111,7 +111,7 @@ public class Php_srl_parser { double double_val = 0; if (String_.Eq(double_str, "INF")) double_val = Double_.Inf_pos; else if (String_.Eq(double_str, "NAN")) double_val = Double_.NaN; - else double_val = Double_.parse_(double_str); + else double_val = Double_.parse(double_str); rv = factory.Double(pos, double_end, double_val); pos = Chk(raw, double_end, Byte_ascii.Semic); break; @@ -147,7 +147,7 @@ public class Php_srl_parser { pos = bgn; pos = Chk(raw, pos + 1, Byte_ascii.Colon); int int_end = Skip_while_num(raw, raw_len, pos, true); - int int_val = Bry_.To_int_or(raw, pos, int_end, Int_.MinValue); + int int_val = Bry_.To_int_or(raw, pos, int_end, Int_.Min_value); pos = int_end; return int_val; } @@ -155,7 +155,7 @@ public class Php_srl_parser { pos = bgn; pos = Chk(raw, pos + 1, Byte_ascii.Colon); int int_end = Skip_while_num(raw, raw_len, pos, true); - int int_val = Bry_.To_int_or(raw, pos, int_end, Int_.MinValue); + int int_val = Bry_.To_int_or(raw, pos, int_end, Int_.Min_value); Php_srl_itm_int rv = factory.Int(pos, int_end, int_val); pos = int_end; return rv; diff --git a/400_xowa/src/gplx/php/Php_tkn.java b/400_xowa/src/gplx/php/Php_tkn.java index 4cd6749b5..3a60759b4 100644 --- a/400_xowa/src/gplx/php/Php_tkn.java +++ b/400_xowa/src/gplx/php/Php_tkn.java @@ -59,7 +59,7 @@ class Php_tkn_var extends Php_tkn_base { class Php_tkn_num extends Php_tkn_base { public Php_tkn_num(int src_bgn, int src_end) {this.Src_rng_(src_bgn, src_end);} @Override public byte Tkn_tid() {return Php_tkn_.Tid_num;} - public int Num_val_int(byte[] src) {return Bry_.To_int_or(src, this.Src_bgn(), this.Src_end(), Int_.MinValue);} + public int Num_val_int(byte[] src) {return Bry_.To_int_or(src, this.Src_bgn(), this.Src_end(), Int_.Min_value);} } class Php_tkn_quote extends Php_tkn_base { public Php_tkn_quote(int src_bgn, int src_end, byte quote_tid) {this.Src_rng_(src_bgn, src_end); this.quote_tid = quote_tid;} diff --git a/400_xowa/src/gplx/xowa/Xoa_app.java b/400_xowa/src/gplx/xowa/Xoa_app.java index 7721afc25..d8af563a2 100644 --- a/400_xowa/src/gplx/xowa/Xoa_app.java +++ b/400_xowa/src/gplx/xowa/Xoa_app.java @@ -17,6 +17,7 @@ along with this program. If not, see . */ package gplx.xowa; import gplx.*; import gplx.ios.*; +import gplx.core.json.*; import gplx.xowa.apps.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.apps.metas.*; import gplx.xowa.apis.*; import gplx.xowa.bldrs.css.*; import gplx.xowa.files.caches.*; import gplx.xowa.files.imgs.*; @@ -46,4 +47,5 @@ public interface Xoa_app { Gfo_usr_dlg Usr_dlg(); Bry_bfr_mkr Utl__bfr_mkr(); Url_encoder_mgr Utl__encoder_mgr(); + Json_parser Utl__json_parser(); } diff --git a/400_xowa/src/gplx/xowa/Xoa_app_.java b/400_xowa/src/gplx/xowa/Xoa_app_.java index e91e47661..887f1b49b 100644 --- a/400_xowa/src/gplx/xowa/Xoa_app_.java +++ b/400_xowa/src/gplx/xowa/Xoa_app_.java @@ -58,7 +58,7 @@ public class Xoa_app_ { } } public static final String Name = "xowa"; - public static final String Version = "2.8.4.1"; + public static final String Version = "2.8.5.1"; public static String Build_date = "2012-12-30 00:00:00"; public static String Op_sys_str; public static String User_agent = ""; diff --git a/400_xowa/src/gplx/xowa/Xoa_url_.java b/400_xowa/src/gplx/xowa/Xoa_url_.java index a2db8b98a..3c567c43d 100644 --- a/400_xowa/src/gplx/xowa/Xoa_url_.java +++ b/400_xowa/src/gplx/xowa/Xoa_url_.java @@ -24,11 +24,12 @@ public class Xoa_url_ { default: return false; } } + public static void Invalid_warn(String url) {Xoa_app_.Usr_dlg().Plog_many("", "", "invalid url; url=~{0}", url);} public static String Main_page__home_str = gplx.xowa.wikis.domains.Xow_domain_itm_.Str__home + gplx.xowa.html.hrefs.Xoh_href_.Str__wiki + gplx.xowa.Xoa_page_.Main_page_str; // EX:home/wiki/Main_Page public static final byte[] - Qarg__redirect = Bry_.new_a7("redirect") - , Qarg__redirect__yes = Bry_.new_a7("yes") - , Qarg__action = Bry_.new_a7("action") - , Qarg__action__edit = Bry_.new_a7("edit") + Qarg__redirect = Bry_.new_a7("redirect") + , Qarg__redirect__yes = Bry_.new_a7("yes") + , Qarg__action = Bry_.new_a7("action") + , Qarg__action__edit = Bry_.new_a7("edit") ; } diff --git a/400_xowa/src/gplx/xowa/Xoae_app.java b/400_xowa/src/gplx/xowa/Xoae_app.java index 7b9e6ce8b..c5ac4dcff 100644 --- a/400_xowa/src/gplx/xowa/Xoae_app.java +++ b/400_xowa/src/gplx/xowa/Xoae_app.java @@ -16,7 +16,7 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ package gplx.xowa; import gplx.*; -import gplx.core.btries.*; import gplx.core.flds.*; import gplx.ios.*; import gplx.core.threads.*; +import gplx.core.btries.*; import gplx.core.flds.*; import gplx.ios.*; import gplx.core.threads.*; import gplx.core.json.*; import gplx.xowa.apps.*; import gplx.xowa.apps.caches.*; import gplx.xowa.apps.fsys.*; import gplx.xowa.apis.*; import gplx.xowa.apps.metas.*; import gplx.xowa.urls.encoders.*; import gplx.xowa.apps.progs.*; import gplx.xowa.langs.*; import gplx.xowa.specials.*; import gplx.xowa.cfgs2.*; import gplx.xowa.bldrs.css.*; @@ -62,6 +62,7 @@ public class Xoae_app implements Xoa_app, GfoInvkAble { cfg_regy = new Xocfg_regy(this); html_mgr = new Xoh_html_mgr(this); this.html__lnki_bldr = new Xoh_lnki_bldr(this, html__href_wtr); + this.html__bridge_mgr = new Xoh_bridge_mgr(utl__json_parser); } public Xoa_app_type App_type() {return app_type;} private final Xoa_app_type app_type; public Xoa_fsys_mgr Fsys_mgr() {return fsys_mgr;} private final Xoa_fsys_mgr fsys_mgr; @@ -72,10 +73,11 @@ public class Xoae_app implements Xoa_app, GfoInvkAble { public Xoh_href_wtr Html__href_wtr() {return html__href_wtr;} private final Xoh_href_wtr html__href_wtr = new Xoh_href_wtr(); public Xoh_lnki_bldr Html__lnki_bldr() {return html__lnki_bldr;} private final Xoh_lnki_bldr html__lnki_bldr; public Xoa_css_extractor Html__css_installer() {return html__css_installer;} private final Xoa_css_extractor html__css_installer = new Xoa_css_extractor(); - public Xoh_bridge_mgr Html__bridge_mgr() {return html__bridge_mgr;} private final Xoh_bridge_mgr html__bridge_mgr = new Xoh_bridge_mgr(); + public Xoh_bridge_mgr Html__bridge_mgr() {return html__bridge_mgr;} private final Xoh_bridge_mgr html__bridge_mgr; public Xowmf_mgr Wmf_mgr() {return wmf_mgr;} private final Xowmf_mgr wmf_mgr = new Xowmf_mgr(); public Bry_bfr_mkr Utl__bfr_mkr() {return Xoa_app_.Utl__bfr_mkr();} public Url_encoder_mgr Utl__encoder_mgr() {return Xoa_app_.Utl__encoder_mgr();} + public Json_parser Utl__json_parser() {return utl__json_parser;} private final Json_parser utl__json_parser = new Json_parser(); public Xoa_meta_mgr Meta_mgr() {return meta_mgr;} private final Xoa_meta_mgr meta_mgr; public boolean Bldr__running() {return bldr__running;} public void Bldr__running_(boolean v) {this.bldr__running = v;} private boolean bldr__running; diff --git a/400_xowa/src/gplx/xowa/apis/Xoapi_root.java b/400_xowa/src/gplx/xowa/apis/Xoapi_root.java index e185d8f83..c0de8ebf9 100644 --- a/400_xowa/src/gplx/xowa/apis/Xoapi_root.java +++ b/400_xowa/src/gplx/xowa/apis/Xoapi_root.java @@ -36,7 +36,7 @@ public class Xoapi_root implements GfoInvkAble { xtns_api.Init_by_kit(app); } public void Init_by_app(Xoae_app app) { - Io_url img_dir = app.Usere().Fsys_mgr().App_img_dir().GenSubDir_nest("window", "portal"); + Io_url img_dir = app.Fsys_mgr().Bin_xowa_file_dir().GenSubDir_nest("app.general"); html_api.Page().Toggle_mgr().Img_dir_(img_dir); usr_api.Init_by_app(app); } diff --git a/400_xowa/src/gplx/xowa/apis/xowa/html/Xoapi_toggle_itm.java b/400_xowa/src/gplx/xowa/apis/xowa/html/Xoapi_toggle_itm.java index 6baf151d2..efc911e8a 100644 --- a/400_xowa/src/gplx/xowa/apis/xowa/html/Xoapi_toggle_itm.java +++ b/400_xowa/src/gplx/xowa/apis/xowa/html/Xoapi_toggle_itm.java @@ -51,7 +51,7 @@ public class Xoapi_toggle_itm implements GfoInvkAble { public byte[] Html_toggle_hdr() {return html_toggle_hdr;} private byte[] html_toggle_hdr; private void Assert_img_src() { if (Img_src_y == null) { - Io_url img_dir = app.Usere().Fsys_mgr().App_img_dir().GenSubDir_nest("window", "portal"); + Io_url img_dir = app.Fsys_mgr().Bin_xowa_file_dir().GenSubDir_nest("app.general"); Img_src_y = img_dir.GenSubFil("twisty_down.png").To_http_file_bry(); Img_src_n = img_dir.GenSubFil("twisty_right.png").To_http_file_bry(); } diff --git a/400_xowa/src/gplx/xowa/apis/xowa/html/modules/Xoapi_popups.java b/400_xowa/src/gplx/xowa/apis/xowa/html/modules/Xoapi_popups.java index 41a2a1da7..40aaf4893 100644 --- a/400_xowa/src/gplx/xowa/apis/xowa/html/modules/Xoapi_popups.java +++ b/400_xowa/src/gplx/xowa/apis/xowa/html/modules/Xoapi_popups.java @@ -197,14 +197,14 @@ public class Xoapi_popups implements GfoInvkAble, GfoEvMgrOwner { , " " , "
" , "
" - , " }'>" - , " }'>" - , " }'>" - , " }'>" + , " }'>" + , " }'>" + , " }'>" + , " }'>" , " }'>" , " }'> " - , " }'>" - , " }'>" + , " }'>" + , " }'>" , "
" , "" )) diff --git a/400_xowa/src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java b/400_xowa/src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java index 0c72b0786..408f15a87 100644 --- a/400_xowa/src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java +++ b/400_xowa/src/gplx/xowa/apps/fsys/Xoa_fsys_mgr.java @@ -26,6 +26,7 @@ public class Xoa_fsys_mgr implements GfoInvkAble { this.bin_plat_dir = root_dir.GenSubDir("bin").GenSubDir(plat_name); this.bin_any_dir = root_dir.GenSubDir("bin").GenSubDir("any"); this.bin_xowa_dir = bin_any_dir.GenSubDir("xowa"); + this.bin_xowa_file_dir = bin_xowa_dir.GenSubDir_nest("file"); this.bin_xtns_dir = bin_xowa_dir.GenSubDir_nest("xtns"); this.cfg_app_fil = bin_xowa_dir.GenSubFil_nest("cfg", "app", "xowa.gfs"); this.cfg_lang_core_dir = bin_xowa_dir.GenSubDir_nest("cfg", "lang", "core"); @@ -40,6 +41,7 @@ public class Xoa_fsys_mgr implements GfoInvkAble { public Io_url Bin_plat_dir() {return bin_plat_dir;} private final Io_url bin_plat_dir; public Io_url Bin_any_dir() {return bin_any_dir;} private final Io_url bin_any_dir; public Io_url Bin_xowa_dir() {return bin_xowa_dir;} private final Io_url bin_xowa_dir; + public Io_url Bin_xowa_file_dir() {return bin_xowa_file_dir;} private final Io_url bin_xowa_file_dir; public Io_url Bin_xtns_dir() {return bin_xtns_dir;} private final Io_url bin_xtns_dir; public Io_url Cfg_lang_core_dir() {return cfg_lang_core_dir;} private final Io_url cfg_lang_core_dir; public Io_url Cfg_wiki_core_dir() {return cfg_wiki_core_dir;} private final Io_url cfg_wiki_core_dir; diff --git a/400_xowa/src/gplx/xowa/apps/versions/Xoa_version_.java b/400_xowa/src/gplx/xowa/apps/versions/Xoa_version_.java index b28359f98..78c4e11d4 100644 --- a/400_xowa/src/gplx/xowa/apps/versions/Xoa_version_.java +++ b/400_xowa/src/gplx/xowa/apps/versions/Xoa_version_.java @@ -30,7 +30,7 @@ public class Xoa_version_ { for (int i = 0; i < lhs_ary_len; ++i) { String lhs_itm = lhs_ary[i]; String rhs_itm = rhs_ary[i]; - int itm_comp = Int_.Compare(Int_.parse_or_(lhs_itm, 0), Int_.parse_or_(rhs_itm, 0)); + int itm_comp = Int_.Compare(Int_.parse_or(lhs_itm, 0), Int_.parse_or(rhs_itm, 0)); if (itm_comp != CompareAble_.Same) return itm_comp; } return CompareAble_.Same; diff --git a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_keys.java b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_keys.java index 1ee8acc03..dd10ba1b5 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_keys.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_keys.java @@ -32,6 +32,7 @@ public class Xob_cmd_keys { , Key_wiki_image = "wiki.image" // "wiki.image" , Key_wiki_page_dump_make = "wiki.page_dump.make" // "file.page_dump" , Key_wiki_page_dump_drop = "wiki.page_dump.drop" + , Key_wiki_pagelink = "wiki.pagelink" , Key_file_lnki_temp = "file.lnki_temp" , Key_file_lnki_regy = "file.lnki_regy" , Key_file_page_regy = "file.page_regy" diff --git a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java index efe81747e..357b12386 100644 --- a/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/Xob_cmd_mgr.java @@ -41,6 +41,7 @@ public class Xob_cmd_mgr implements GfoInvkAble { else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_wiki_page_dump_drop)) return Add(new Xob_page_dump_cmd_drop(bldr, wiki)); else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_wiki_redirect)) return Add(new Xob_redirect_cmd(bldr, wiki)); else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_wiki_image)) return Add(new Xob_image_cmd(bldr, wiki)); + else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_wiki_pagelink)) return Add(new Xob_pagelinks_parser_cmd(bldr, wiki)); else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_file_lnki_temp)) return Add(new Xob_lnki_temp_wkr(bldr, wiki)); else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_file_lnki_regy)) return Add(new Xob_lnki_regy_cmd(bldr, wiki)); else if (String_.Eq(cmd_key, Xob_cmd_keys.Key_file_page_regy)) return Add(new Xob_page_regy_cmd(bldr, wiki)); diff --git a/400_xowa/src/gplx/xowa/bldrs/aria2/Aria2_lib_mgr.java b/400_xowa/src/gplx/xowa/bldrs/aria2/Aria2_lib_mgr.java index 34bf9210e..a56fe8847 100644 --- a/400_xowa/src/gplx/xowa/bldrs/aria2/Aria2_lib_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/aria2/Aria2_lib_mgr.java @@ -21,7 +21,7 @@ public class Aria2_lib_mgr implements GfoInvkAble { public ProcessAdp Lib() {return lib;} private ProcessAdp lib = new ProcessAdp(); public void Init_by_app(Xoae_app app) { Xoa_fsys_eval cmd_eval = app.Url_cmd_eval(); - ProcessAdp.ini_(this, app.Usr_dlg(), lib, cmd_eval, ProcessAdp.Run_mode_sync_block, Int_.MaxValue + ProcessAdp.ini_(this, app.Usr_dlg(), lib, cmd_eval, ProcessAdp.Run_mode_sync_block, Int_.Max_value , "~{<>bin_plat_dir<>}aria2" + Op_sys.Cur().Fsys_dir_spr_str() + "aria2c" , Lib_args_fmt , "wiki_abrv", "wiki_date", "wiki_type"); diff --git a/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr_tst.java b/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr_tst.java index 0e83cd5fc..5c74a32da 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/cfgs/Xob_wiki_cfg_bldr_tst.java @@ -129,14 +129,14 @@ public class Xob_wiki_cfg_bldr_tst { String api = protocol + wiki + "/w/api.php?action=query&format=xml&meta=siteinfo&siprop=namespacealiases"; String xml = String_.new_u8(Io_mgr.I.DownloadFil_args("", null).Trg_engine_key_(trg_engine_key).Exec_as_bry(api)); if (xml == null) continue; // not found - gplx.xmls.XmlDoc xdoc = gplx.xmls.XmlDoc_.parse_(xml); + gplx.xmls.XmlDoc xdoc = gplx.xmls.XmlDoc_.parse(xml); gplx.xmls.XmlNde xnde = gplx.xmls.Xpath_.SelectFirst(xdoc.Root(), "query/namespacealiases"); sb.Add("app.bldr.wiki_cfg_bldr.get('").Add(wiki).Add("').new_cmd_('wiki.ns_mgr.aliases', 'ns_mgr.add_alias_bulk(\"\n"); int xndes_len = xnde.SubNdes().Count(); for (int j = 0; j < xndes_len; j++) { gplx.xmls.XmlNde ns_nde = xnde.SubNdes().Get_at(j); if (!String_.Eq(ns_nde.Name(), "ns")) continue; - int id = Int_.parse_(ns_nde.Atrs().FetchValOr("id", "-1")); + int id = Int_.parse(ns_nde.Atrs().FetchValOr("id", "-1")); String name = String_.Replace(String_.Replace(ns_nde.Text_inner(), " ", "_"), "'", "''"); sb.Add(Int_.Xto_str(id)).Add("|").Add(String_.Trim(name)).Add_char_nl(); } diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java b/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java index f9f675227..03e12e0b2 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/Xob_dump_mgr_base.java @@ -23,9 +23,9 @@ public abstract class Xob_dump_mgr_base extends Xob_itm_basic_base implements Xo private Xowd_db_mgr db_fsys_mgr; protected Xop_parser parser; protected Xop_ctx ctx; protected Xop_root_tkn root; private int[] ns_ary; private Xowd_db_file[] db_ary; private int ns_bgn = -1, db_bgn = -1, pg_bgn = -1; - private int ns_end = -1, db_end = -1, pg_end = Int_.MaxValue; + private int ns_end = -1, db_end = -1, pg_end = Int_.Max_value; private int commit_interval = 1000, progress_interval = 250, cleanup_interval = 2500, select_size = 10 * Io_mgr.Len_mb; - private int exec_count, exec_count_max = Int_.MaxValue; + private int exec_count, exec_count_max = Int_.Max_value; private boolean reset_db = false, exit_after_commit = false, exit_now = false; private boolean load_tmpls; private Xob_dump_bmk_mgr bmk_mgr = new Xob_dump_bmk_mgr(); @@ -67,7 +67,7 @@ public abstract class Xob_dump_mgr_base extends Xob_itm_basic_base implements Xo private long time_bgn; public void Cmd_run() {Exec_ns_ary();} private void Exec_ns_ary() { - if (pg_bgn == Int_.MaxValue) return; + if (pg_bgn == Int_.Max_value) return; if (load_tmpls) Xob_dump_mgr_base_.Load_all_tmpls(usr_dlg, wiki, page_src); time_bgn = Env_.TickCount(); Xob_dump_bmk dump_bmk = new Xob_dump_bmk(); @@ -169,7 +169,7 @@ public abstract class Xob_dump_mgr_base extends Xob_itm_basic_base implements Xo public void Cmd_term() {} public void Cmd_end() { if (!exit_now) - pg_bgn = Int_.MaxValue; + pg_bgn = Int_.Max_value; Exec_commit(-1, -1, -1, Bry_.Empty); Exec_end_hook(); Free(); diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_link_idx_wkr.java b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_link_idx_wkr.java index 515b4e997..2ce464e84 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_link_idx_wkr.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/ctgs/Xoctg_link_idx_wkr.java @@ -18,13 +18,13 @@ along with this program. If not, see . package gplx.xowa.bldrs.cmds.ctgs; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; import gplx.core.flds.*; import gplx.ios.*; import gplx.xowa.ctgs.*; import gplx.xowa.tdbs.*; public class Xoctg_link_idx_wkr extends Xob_idx_base { // NOTE: similar functionality to Xob_make_cmd_site, but more complicated due to p,f,s; not inheriting - Io_url src_link_dir; int make_fil_max = Int_.MinValue; + Io_url src_link_dir; int make_fil_max = Int_.Min_value; public Xoctg_link_idx_wkr(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki);} @Override public String Cmd_key() {return Xob_cmd_keys.Key_tdb_ctg_link_idx;} @Override public void Cmd_bgn_hook() { this.fld_rdr = this.Fld_rdr(); if (src_link_dir == null) src_link_dir = wiki.Fsys_mgr().Tmp_dir().GenSubDir_nest(Xob_cmd_keys.Key_tdb_text_cat_link, "make"); - if (make_fil_max == Int_.MinValue) make_fil_max = Io_mgr.Len_mb; + if (make_fil_max == Int_.Min_value) make_fil_max = Io_mgr.Len_mb; make_link_mgr = new Xoctg_make_link_mgr(usr_dlg, make_fil_max, wiki.Tdb_fsys_mgr()); make_main_mgr = new Xoctg_make_main_mgr(usr_dlg, make_fil_max, wiki.Tdb_fsys_mgr()); Io_mgr.I.DeleteDirDeep_ary(make_link_mgr.Make_dir(), make_main_mgr.Make_dir()); diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_bin_db_itm.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_bin_db_itm.java index b5e1067fa..c58f9c06d 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_bin_db_itm.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_bin_db_itm.java @@ -38,7 +38,7 @@ class Xob_bin_db_itm { public static Xob_bin_db_itm new_v1(Fsm_bin_fil fil) { byte[] name = Bry_.new_u8(fil.Url_rel()); // EX: "fsdb.bin.0000.sqlite3" int ns_id = 0; // assume v1 dbs are all in main ns - int pt_id = Bry_.To_int_or(name, 9 , 13, Int_.MinValue); if (pt_id == Int_.MinValue) throw Err_.new_wo_type("bin_db_itm.parse: invalid pt_id", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); + int pt_id = Bry_.To_int_or(name, 9 , 13, Int_.Min_value); if (pt_id == Int_.Min_value) throw Err_.new_wo_type("bin_db_itm.parse: invalid pt_id", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); return new Xob_bin_db_itm(fil.Id(), fil.Url(), ns_id, pt_id); } public static Xob_bin_db_itm new_v2(Fsm_bin_fil fil) { @@ -50,8 +50,8 @@ class Xob_bin_db_itm { int ns_end = Bry_finder.Find_fwd(name, ns_end_tkn, ns_bgn); if (ns_end == Bry_finder.Not_found) throw Err_.new_wo_type("bin_db_itm.parse: invalid ns_end", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); int pt_bgn = ns_end + ns_end_tkn_len; int pt_end = Bry_finder.Find_fwd(name, pt_end_tkn, pt_bgn); if (pt_end == Bry_finder.Not_found) throw Err_.new_wo_type("bin_db_itm.parse: invalid pt_end", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); - int ns_id = Bry_.To_int_or(name, ns_bgn, ns_end, Int_.MinValue); if (ns_id == Int_.MinValue) throw Err_.new_wo_type("bin_db_itm.parse: invalid ns_id", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); - int pt_id = Bry_.To_int_or(name, pt_bgn, pt_end, Int_.MinValue); if (pt_id == Int_.MinValue) throw Err_.new_wo_type("bin_db_itm.parse: invalid pt_id", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); + int ns_id = Bry_.To_int_or(name, ns_bgn, ns_end, Int_.Min_value); if (ns_id == Int_.Min_value) throw Err_.new_wo_type("bin_db_itm.parse: invalid ns_id", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); + int pt_id = Bry_.To_int_or(name, pt_bgn, pt_end, Int_.Min_value); if (pt_id == Int_.Min_value) throw Err_.new_wo_type("bin_db_itm.parse: invalid pt_id", "name", fil.Url_rel(), "conn", fil.Conn().Conn_info().Xto_raw()); return new Xob_bin_db_itm(fil.Id(), fil.Url(), ns_id, pt_id); } } diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_diff_regy_exec_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_diff_regy_exec_cmd.java index 713424149..44d1c7449 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_diff_regy_exec_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_diff_regy_exec_cmd.java @@ -56,7 +56,7 @@ class Xob_diff_regy_sql_runner { this.url = url; String[] parts = String_.Split(url.NameOnly(), "-"); wiki_domain = parts[0]; - fsdb_db_id = Int_.parse_(parts[1]); + fsdb_db_id = Int_.parse(parts[1]); fsdb_db_tid = Fsdb_db_tid_.Xto_tid(parts[2]); } public void Run_sql(Xoae_app app) { diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_fsdb_make_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_fsdb_make_cmd.java index 9263d45a4..ba4c09fee 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_fsdb_make_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_fsdb_make_cmd.java @@ -28,8 +28,8 @@ public class Xob_fsdb_make_cmd extends Xob_itm_basic_base implements Xob_cmd { private long download_size_max = Io_mgr.Len_mb_long * 5; private int[] download_keep_tier_ids = Int_.Ary(0); private Xobu_poll_mgr poll_mgr; private int poll_interval; private long time_bgn; private int select_interval = 2500, progress_interval = 1, commit_interval = 1, delete_interval = 5000; - private boolean exec_done, resume_enabled; private int exec_count, exec_count_max = Int_.MaxValue, exec_fail, exec_fail_max = 10000; // 115 errors over 900k images - private int tier_id_bmk = -1, tier_id_val = -1; private int page_id_bmk = -1, page_id_val = -1, page_id_end = Int_.MaxValue; private int lnki_id_bmk = -1, lnki_id_val = -1; + private boolean exec_done, resume_enabled; private int exec_count, exec_count_max = Int_.Max_value, exec_fail, exec_fail_max = 10000; // 115 errors over 900k images + private int tier_id_bmk = -1, tier_id_val = -1; private int page_id_bmk = -1, page_id_val = -1, page_id_end = Int_.Max_value; private int lnki_id_bmk = -1, lnki_id_val = -1; private boolean exit_after_commit, exit_now; public Xob_fsdb_make_cmd(Xob_bldr bldr, Xowe_wiki wiki) { this.Cmd_ctor(bldr, wiki); @@ -140,7 +140,7 @@ public class Xob_fsdb_make_cmd extends Xob_itm_basic_base implements Xob_cmd { } else { if (tier_id_bmk == -1) { - tier_id_bmk = Int_.parse_(tier_id_str); + tier_id_bmk = Int_.parse(tier_id_str); usr_dlg.Note_many("", "", "restoring from bmk: tier_id=~{0}", tier_id_bmk); } if (page_id_bmk == -1) { diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java index 18eae1bf0..7a4d4767c 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/files/Xob_lnki_temp_wkr.java @@ -63,6 +63,7 @@ public class Xob_lnki_temp_wkr extends Xob_dump_mgr_base implements Xopg_redlink gplx.xowa.Xop_xnde_wkr.Timeline_log_wkr = log_mgr.Make_wkr(); gplx.xowa.xtns.scores.Score_xnde.Log_wkr = log_mgr.Make_wkr(); gplx.xowa.xtns.hieros.Hiero_xnde.Log_wkr = log_mgr.Make_wkr(); + gplx.xowa.xtns.math.Math_nde.Log_wkr = log_mgr.Make_wkr(); Xof_fsdb_mgr__sql trg_fsdb_mgr = new Xof_fsdb_mgr__sql(); wiki.File__fsdb_mode().Tid_v2_bld_y_(); Fsdb_db_mgr__v2 fsdb_core = Fsdb_db_mgr__v2_bldr.I.Get_or_make(wiki, Bool_.Y); @@ -84,7 +85,7 @@ public class Xob_lnki_temp_wkr extends Xob_dump_mgr_base implements Xopg_redlink log_mgr.Txn_bgn(); } @Override public void Exec_pg_itm_hook(int ns_ord, Xow_ns ns, Xowd_page_itm db_page, byte[] page_src) { - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ns.Gen_ttl(db_page.Ttl_page_db())); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ns.Gen_ttl(db_page.Ttl_page_db())); byte[] ttl_bry = ttl.Page_db(); byte page_tid = Xow_page_tid.Identify(wiki.Domain_tid(), ns.Id(), ttl_bry); if (page_tid != Xow_page_tid.Tid_wikitext) return; // ignore js, css, lua, json @@ -142,7 +143,7 @@ public class Xob_lnki_temp_wkr extends Xob_dump_mgr_base implements Xopg_redlink int lnki_page = lnki.Page(); byte[] ttl_commons = Xto_commons(ns_file_is_case_match_all, commons_wiki, ttl); if ( Xof_lnki_page.Null_n(lnki_page) // page set - && Xof_lnki_time.Null_n(lnki_time)) // thumbtime set + && Xof_lnki_time.Null_n(lnki_time)) // thumbtime set usr_dlg.Warn_many("", "", "page and thumbtime both set; this may be an issue with fsdb: page=~{0} ttl=~{1}", ctx.Cur_page().Ttl().Page_db_as_str(), String_.new_u8(ttl)); if (lnki.Ns_id() == Xow_ns_.Id_media) lnki_src_tid = Xob_lnki_src_tid.Tid_media; @@ -176,7 +177,7 @@ public class Xob_lnki_temp_wkr extends Xob_dump_mgr_base implements Xopg_redlink } public static byte[] Xto_commons(boolean ns_file_is_case_match_all, Xowe_wiki commons_wiki, byte[] ttl_bry) { if (!ns_file_is_case_match_all) return null; // return "" if wiki matches common - Xoa_ttl ttl = Xoa_ttl.parse_(commons_wiki, Xow_ns_.Id_file, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(commons_wiki, Xow_ns_.Id_file, ttl_bry); byte[] rv = ttl.Page_db(); return Bry_.Eq(rv, ttl_bry) ? null : rv; } diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java new file mode 100644 index 000000000..92043b389 --- /dev/null +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_cmd.java @@ -0,0 +1,72 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012 gnosygnu@gmail.com + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +package gplx.xowa.bldrs.cmds.texts.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.bldrs.cmds.texts.*; +import gplx.dbs.*; +import gplx.xowa.wikis.data.*; import gplx.xowa.wikis.data.tbls.*; +public class Xob_pagelinks_parser_cmd extends Xob_sql_dump_base implements Sql_file_parser_cmd { + private Db_conn core_conn; + private Xowd_pagelinks_temp_tbl temp_tbl; + public Xob_pagelinks_parser_cmd(Xob_bldr bldr, Xowe_wiki wiki) {this.Cmd_ctor(bldr, wiki); this.make_fil_len = Io_mgr.Len_mb;} + @Override public String Sql_file_name() {return "pagelinks";} + @Override public String Cmd_key() {return Xob_cmd_keys.Key_wiki_pagelink;} + private static final byte Fld__pl_from = 0, Fld__pl_namespace = 1, Fld__pl_title = 2; + private int tmp_src_id, tmp_trg_ns; + private int rows = 0; + @Override public void Cmd_bgn_hook(Xob_bldr bldr, Sql_file_parser parser) { + parser.Fld_cmd_(this).Flds_req_idx_(4, 0, 1, 2); + wiki.Init_assert(); + Xowd_db_file core_db = wiki.Data__core_mgr().Db__core(); + this.core_conn = core_db.Conn(); + this.temp_tbl = new Xowd_pagelinks_temp_tbl(core_conn); + core_conn.Ddl_delete_tbl(temp_tbl.Tbl_name()); + temp_tbl.Create_tbl(); + temp_tbl.Insert_bgn(); + } + @Override public void Cmd_end() { + temp_tbl.Insert_end(); + temp_tbl.Create_idx(); + Xowd_pagelinks_tbl actl_tbl = new Xowd_pagelinks_tbl(core_conn); + core_conn.Ddl_delete_tbl(actl_tbl.Tbl_name()); + actl_tbl.Create_tbl(); + core_conn.Exec_sql(Sql__pagelinks__make); + core_conn.Ddl_delete_tbl(temp_tbl.Tbl_name()); + actl_tbl.Create_idx__src_trg(); + actl_tbl.Create_idx__trg_src(); + core_conn.Env_vacuum(); + } + public void Exec(byte[] src, byte[] fld_key, int fld_idx, int fld_bgn, int fld_end, Bry_bfr file_bfr, Sql_file_parser_data data) { + switch (fld_idx) { + case Fld__pl_from: this.tmp_src_id = Bry_.To_int_or(src, fld_bgn, fld_end, -1); break; + case Fld__pl_namespace: this.tmp_trg_ns = Bry_.To_int_or(src, fld_bgn, fld_end, -1); break; + case Fld__pl_title: + byte[] tmp_trg_ttl = Bry_.Mid(src, fld_bgn, fld_end); + temp_tbl.Insert(tmp_src_id, tmp_trg_ns, tmp_trg_ttl); + if (++rows % 100000 == 0) usr_dlg.Prog_many("", "", "reading row ~{0}", Int_.Xto_str_fmt(rows, "#,##0")); + break; + } + } + private static final String Sql__pagelinks__make = String_.Concat_lines_nl_skip_last + ( "INSERT INTO pagelinks (src_id, trg_id, trg_count)" + , "SELECT pl.src_id" + , ", p.page_id" + , ", Count(p.page_id)" + , "FROM pagelinks_temp pl" + , " JOIN page p ON pl.trg_ns = p.page_namespace AND pl.trg_ttl = p.page_title" + , "GROUP BY pl.src_id, p.page_id" + ); +} diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_tst.java b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_tst.java new file mode 100644 index 000000000..fbf0be4fa --- /dev/null +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/texts/sqls/Xob_pagelinks_parser_tst.java @@ -0,0 +1,61 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012 gnosygnu@gmail.com + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +package gplx.xowa.bldrs.cmds.texts.sqls; import gplx.*; import gplx.xowa.*; import gplx.xowa.bldrs.*; import gplx.xowa.bldrs.cmds.*; import gplx.xowa.bldrs.cmds.texts.*; +import org.junit.*; +// public class Xob_pagelinks_parser_tst { +// @Before public void init() {if (Xoa_test_.Db_skip()) return; fxt.Ctor_fsys();} Db_mgr_fxt fxt = new Db_mgr_fxt(); +// @After public void term() {if (Xoa_test_.Db_skip()) return; fxt.Rls();} +// @Test public void Basic() { +// if (Xoa_test_.Db_skip()) return; +// fxt.Init_db_sqlite(); +// fxt.Wiki().Db_mgr_as_sql().Core_data_mgr().Db__cat_core().Tbl__cat_core().Create_tbl(); +// Init_ctgs(1, 2, 3); +// Io_url page_props_url = Xoa_test_.Url_root().GenSubFil_nest("root", "wiki", "en.wikipedia.org", "page_props.sql"); +// fxt .Init_fil(page_props_url, String_.Concat +// ( "INSERT INTO `page_props` VALUES" +// , " (1,'hiddencat','')" +// , ",(2,'pageimage','A.png')" +// , ",(3,'hiddencat','')" +// , ";" +// )) +// .Exec_run(new Xoctg_hiddencat_parser_sql(fxt.Bldr(), fxt.Wiki())) +// ; +// Tst_ctg_hidden(Bool_.Y, 1, 3); +// Tst_ctg_hidden(Bool_.N, 2); +// } +// private void Init_ctgs(params int[] ctgs) { +// int len = ctgs.length; +// Xowd_cat_core_tbl tbl = fxt.Wiki().Db_mgr_as_sql().Core_data_mgr().Db__cat_core().Tbl__cat_core().Create_tbl(); +// tbl.Insert_bgn(); +// try { +// for (int i = 0; i < len; i++) { +// int ctg_id = ctgs[i]; +// tbl.Insert_cmd_by_batch(ctg_id, 0, 0, 0, Bool_.N_byte, 0); +// } +// } finally {tbl.Insert_end();} +// } +// private void Tst_ctg_hidden(boolean expd_hidden, params int[] ctgs) { +// int len = ctgs.length; +// Xowd_cat_core_tbl tbl = fxt.Wiki().Db_mgr_as_sql().Core_data_mgr().Db__cat_core().Tbl__cat_core(); +// for (int i = 0; i < len; i++) { +// int ctg_id = ctgs[i]; +// Xowd_category_itm ctg_itm = tbl.Select(ctg_id); +// Tfds.Eq(expd_hidden, ctg_itm.Hidden(), Int_.Xto_str(ctg_id)); +// } +// } +// } diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_cleanup_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_cleanup_cmd.java index 3d512507a..1e257f6d2 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_cleanup_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_cleanup_cmd.java @@ -79,7 +79,7 @@ public class Xob_cleanup_cmd extends Xob_itm_basic_base implements Xob_cmd { Criteria_ioMatch[] rv = new Criteria_ioMatch[match_ary_len]; for (int i = 0; i < rv.length; i++) { String match = match_ary[i]; - rv[i] = Criteria_ioMatch.parse_(true, match, false); + rv[i] = Criteria_ioMatch.parse(true, match, false); } return rv; } diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java index 5d01a4d9a..e37e2e31f 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_deploy_zip_cmd.java @@ -34,7 +34,7 @@ public class Xob_deploy_zip_cmd extends Xob_itm_basic_base implements Xob_cmd { for (Io_url ns_dir : ns_dirs) { Log("zipping dir: ~{0}", ns_dir.Raw()); String ns_num = ns_dir.NameOnly(); - Xow_ns ns_itm = wiki.Ns_mgr().Ids_get_or_null(Int_.parse_(ns_num)); + Xow_ns ns_itm = wiki.Ns_mgr().Ids_get_or_null(Int_.parse(ns_num)); Zip_ns(bldr, ns_dir, type_name, ns_itm.Name_str()); } } diff --git a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java index 46fbd6928..9eb59bf45 100644 --- a/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java +++ b/400_xowa/src/gplx/xowa/bldrs/cmds/utils/Xob_site_meta_cmd.java @@ -28,7 +28,7 @@ public class Xob_site_meta_cmd implements Xob_cmd { if (wikis == null) wikis = Xow_wmf_api_mgr.Wikis; if (db_url == null) db_url = bldr.App().Fsys_mgr().Cfg_site_meta_fil(); if (cutoff_time == null) cutoff_time = DateAdp_.Now().Add_day(-1); - Site_meta_itm.Build_site_meta(bldr.App().Wmf_mgr(), db_url, wikis, cutoff_time); + Site_meta_itm.Build_site_meta(bldr.App().Utl__json_parser(), bldr.App().Wmf_mgr(), db_url, wikis, cutoff_time); } public void Cmd_init(Xob_bldr bldr) {} public void Cmd_bgn(Xob_bldr bldr) {} diff --git a/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java b/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java index 4f8807b80..1c64e3a4e 100644 --- a/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java +++ b/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_match_mgr.java @@ -116,7 +116,7 @@ public class Dg_match_mgr { int rule_score = rule_tally.Rule().Score(); int rule_score_total = rule_score * min_results; if (log_enabled) log_mgr.Insert_page_rule(log_tid, page_id, rule_tally.Rule().Id(), rule_score_total); - if (rule_score == Dg_rule.Score_banned) {score_cur = Int_.MaxValue; break;} + if (rule_score == Dg_rule.Score_banned) {score_cur = Int_.Max_value; break;} score_cur += rule_score_total; ++rule_match_count; } @@ -154,7 +154,7 @@ class Dg_rule_tally { results[idx_val] = results[idx_val] + 1; } public int Results_pass_count() { - int rv = Int_.MaxValue; + int rv = Int_.Max_value; for (int i = 0; i < results_len; ++i) { int result = results[i]; if (rv > result) rv = result; diff --git a/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_parser.java b/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_parser.java index 30444b026..3964e5c8b 100644 --- a/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/filters/dansguardians/Dg_parser.java @@ -71,8 +71,8 @@ class Dg_parser { if (src[brack_bgn] != Byte_ascii.Lt) {Warn("dg.invalid_line.wrong_term_dlm", rel_path, line_idx, src, line_bgn, line_end); break;} brack_end = Bry_finder.Find_fwd(src, Byte_ascii.Gt, brack_bgn); if (brack_end == Bry_finder.Not_found) {Warn("dg.invalid_line.score not found", rel_path, line_idx, src, line_bgn, line_end); break;} - int parse_score = Bry_.To_int_or(src, brack_bgn + 1, brack_end, Int_.MinValue); - if (parse_score == Int_.MinValue) {Warn("dg.invalid_line.score is invalid", rel_path, line_idx, src, line_bgn, line_end); break;} + int parse_score = Bry_.To_int_or(src, brack_bgn + 1, brack_end, Int_.Min_value); + if (parse_score == Int_.Min_value) {Warn("dg.invalid_line.score is invalid", rel_path, line_idx, src, line_bgn, line_end); break;} score = parse_score; break; } diff --git a/400_xowa/src/gplx/xowa/bldrs/langs/Json_itm_wkr__base.java b/400_xowa/src/gplx/xowa/bldrs/langs/Json_itm_wkr__base.java index 4c1fff32c..be9f4d772 100644 --- a/400_xowa/src/gplx/xowa/bldrs/langs/Json_itm_wkr__base.java +++ b/400_xowa/src/gplx/xowa/bldrs/langs/Json_itm_wkr__base.java @@ -27,12 +27,12 @@ abstract class Json_itm_wkr__base implements Json_itm_wkr { List_adp tmp_list = List_adp_.new_(); Byte_obj_ref tmp_result = Byte_obj_ref.zero_(); Bry_bfr tmp_bfr = Bry_bfr.reset_(16); Json_doc jdoc = json_parser.Parse(src); this.Exec_bgn(); - Json_nde root = jdoc.Root(); + Json_nde root = jdoc.Root_nde(); int subs_len = root.Len(); for (int i = 0; i < subs_len; ++i) { Json_itm itm = root.Get_at(i); switch (itm.Tid()) { - case Json_itm_.Tid_kv: + case Json_itm_.Tid__kv: Json_kv kv = (Json_kv)itm; if (kv.Key().Data_eq(Name_metadata)) continue; // ignore @metadata node byte[] kv_key = kv.Key().Data_bry(); diff --git a/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser.java b/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser.java index 179da862d..25179e1f9 100644 --- a/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/langs/Xol_mw_lang_parser.java @@ -254,8 +254,8 @@ public class Xol_mw_lang_parser { int kv_ary_len = kv_ary.Subs_len(); boolean case_match = false; // if 1 arg, default to false int kv_ary_bgn = 0; int words_len = kv_ary_len; // if 1 arg, default to entire kv_ary; words_len - int case_match_int = Php_itm_.Parse_int_or(kv_ary.Subs_get(0), Int_.MinValue); - if (case_match_int != Int_.MinValue) { + int case_match_int = Php_itm_.Parse_int_or(kv_ary.Subs_get(0), Int_.Min_value); + if (case_match_int != Int_.Min_value) { case_match = Parse_int_as_bool(kv_ary.Subs_get(0)); // arg[0] is case_match kv_ary_bgn = 1; // arg[1] is 1st word words_len = kv_ary_len - 1; // words.len = kv_len - 1 (skip case_match @@ -291,8 +291,8 @@ public class Xol_mw_lang_parser { } } private boolean Parse_int_as_bool(Php_itm itm) { - int rv = Php_itm_.Parse_int_or(itm, Int_.MinValue); - if (rv == Int_.MinValue) throw Err_.new_wo_type("value must be 0 or 1", "val", String_.new_u8(itm.Val_obj_bry())); + int rv = Php_itm_.Parse_int_or(itm, Int_.Min_value); + if (rv == Int_.Min_value) throw Err_.new_wo_type("value must be 0 or 1", "val", String_.new_u8(itm.Val_obj_bry())); return rv == 1; } private void Parse_separatorTransformTable(Php_line_assign line, Xol_num_mgr num_mgr) { diff --git a/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java b/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java index 24d8fd33e..e414a0122 100644 --- a/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java +++ b/400_xowa/src/gplx/xowa/bldrs/syncs/Xob_sync_itm.java @@ -19,12 +19,12 @@ package gplx.xowa.bldrs.syncs; import gplx.*; import gplx.xowa.*; import gplx.xo import gplx.ios.*; class Xob_sync_grp { private final Ordered_hash itms = Ordered_hash_.new_(); - public Xob_sync_grp Ctor_itm(DateAdp upload_time, DateAdp related_time) { - this.upload_time = upload_time; this.related_time = related_time; + public Xob_sync_grp Ctor_itm(DateAdp dump_time, DateAdp upload_time) { + this.dump_time = dump_time; this.upload_time = upload_time; return this; } + public DateAdp Dump_time() {return dump_time;} private DateAdp dump_time; public DateAdp Upload_time() {return upload_time;} private DateAdp upload_time; - public DateAdp Related_time() {return related_time;} private DateAdp related_time; public int Itms__len() {return itms.Count();} public void Itms__add(Xob_sync_pkg file) {itms.Add(file.Path(), file);} public Xob_sync_pkg Itms__get_at(int i) {return (Xob_sync_pkg)itms.Get_at(i);} diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_alias.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_alias.java index bb99a5f8a..4ee1e4bfb 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_alias.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_alias.java @@ -21,7 +21,7 @@ public class Xoi_wiki_props_alias { public String Alias() {return alias;} private String alias; public Xoi_wiki_props_alias Init_by_ctor(int id, String alias) {this.id = id; this.alias = alias; return this;} public void Init_by_xml(gplx.xmls.XmlNde ns_nde) { - this.id = Int_.parse_(ns_nde.Atrs().FetchValOr("id", "-1")); + this.id = Int_.parse(ns_nde.Atrs().FetchValOr("id", "-1")); this.alias = String_.Replace(String_.Replace(ns_nde.Text_inner(), " ", "_"), "'", "''"); } } diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java index 7807c48b8..da5f84b6c 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api.java @@ -52,7 +52,7 @@ public class Xoi_wiki_props_api { bfr.Add_byte_nl(); } public void Parse(Xoi_wiki_props_wiki wiki, String xml) { - XmlDoc xdoc = XmlDoc_.parse_(xml); + XmlDoc xdoc = XmlDoc_.parse(xml); XmlNde query_xnde = Xpath_.SelectFirst(xdoc.Root(), "query"); XmlNde aliases_xnde = Xpath_.SelectFirst(query_xnde, "namespace"+"aliases"); wiki.Alias_ary_(Parse_alias_ary(aliases_xnde)); diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java index cd0baf320..677a1a450 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_api_tst.java @@ -135,7 +135,7 @@ class Xob_subpage_tst_fxt { int ns_len = wiki.Ns_list().Count(); for (int i = 0; i < ns_len; i++) { Xob_subpage_ns ns = (Xob_subpage_ns)wiki.Ns_list().Get_at(i); - sb.Add(ns.Id()).Add("=").Add(Bool_.Xto_str_lower(ns.Enabled())).Add_char_nl(); + sb.Add(ns.Id()).Add("=").Add(Bool_.To_str_lower(ns.Enabled())).Add_char_nl(); } sb.Add_char_nl(); } diff --git a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_ns.java b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_ns.java index b1d5c69c0..57f567147 100644 --- a/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_ns.java +++ b/400_xowa/src/gplx/xowa/bldrs/wiki_cfgs/Xoi_wiki_props_ns.java @@ -21,7 +21,7 @@ public class Xoi_wiki_props_ns { public boolean Subpages_enabled() {return subpages_enabled;} private boolean subpages_enabled; public Xoi_wiki_props_ns Init_by_ctor(int id, boolean subpages_enabled) {this.id = id; this.subpages_enabled = subpages_enabled; return this;} public void Init_by_xml(gplx.xmls.XmlNde ns_nde) { - this.id = Int_.parse_(ns_nde.Atrs().FetchValOr("id", "-1")); + this.id = Int_.parse(ns_nde.Atrs().FetchValOr("id", "-1")); this.subpages_enabled = ns_nde.Atrs().Fetch_or_null("subpages") != null;// per api, subpages="" means ns has subpages; no subpages attribute means no subpages } } diff --git a/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_siteinfo_parser.java b/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_siteinfo_parser.java index cf60a31ed..2f39e8d7e 100644 --- a/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_siteinfo_parser.java +++ b/400_xowa/src/gplx/xowa/bldrs/xmls/Xob_siteinfo_parser.java @@ -31,7 +31,7 @@ public class Xob_siteinfo_parser { finally {rdr.Rls();} } public static void Siteinfo_parse(Xowe_wiki wiki, Gfo_usr_dlg usr_dlg, String siteinfo_str) { - XmlDoc xdoc = XmlDoc_.parse_(siteinfo_str); + XmlDoc xdoc = XmlDoc_.parse(siteinfo_str); XmlNde root = xdoc.Root(); int root_subs_len = root.SubNdes().Count(); Bry_bfr siteinfo_misc_bfr = Bry_bfr.reset_(512); @@ -74,8 +74,8 @@ public class Xob_siteinfo_parser { XmlNde sub_nde = ns_nde.SubNdes().Get_at(i); if (sub_nde.Atrs().Count() == 0) continue; // NOTE: JAVA again has unexpected nodes try { - int ns_id = Int_.parse_(sub_nde.Atrs().FetchValOr("key", "")); - byte case_match = Xow_ns_case_.parse_(sub_nde.Atrs().FetchValOr("case", "")); + int ns_id = Int_.parse(sub_nde.Atrs().FetchValOr("key", "")); + byte case_match = Xow_ns_case_.parse(sub_nde.Atrs().FetchValOr("case", "")); String name = sub_nde.Text_inner(); ns_mgr.Add_new(ns_id, Bry_.new_u8(name), case_match, false); } diff --git a/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_grp_tid.java b/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_grp_tid.java index 7d4059261..4faa51ef7 100644 --- a/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_grp_tid.java +++ b/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_grp_tid.java @@ -24,7 +24,7 @@ public class Xoa_cfg_grp_tid { public static final byte Tid_null = 0, Tid_all = 1, Tid_type = 2, Tid_wiki = 3, Tid_app = 4; public static final String Key_app_str = "app"; public static final byte[] Key_all_bry = Bry_.new_a7("*"), Key_app_bry = Bry_.new_a7(Key_app_str); - public static Xoa_cfg_grp_tid parse_(byte[] key) { + public static Xoa_cfg_grp_tid parse(byte[] key) { Xoa_cfg_grp_tid rv = (Xoa_cfg_grp_tid)factory.Get_by_bry(key); if (rv == null) { rv = new Xoa_cfg_grp_tid(); diff --git a/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_mgr.java b/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_mgr.java index fc25c6193..8b7b6c1b7 100644 --- a/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_mgr.java +++ b/400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_mgr.java @@ -28,7 +28,7 @@ public class Xoa_cfg_mgr implements GfoInvkAble { Xoa_cfg_grp grp = null; Object grp_obj = hash.Get_by(grp_key); if (grp_obj == null) { - Xoa_cfg_grp_tid tid = Xoa_cfg_grp_tid.parse_(itm_key); + Xoa_cfg_grp_tid tid = Xoa_cfg_grp_tid.parse(itm_key); grp = new Xoa_cfg_grp(this, tid, grp_key); hash.Add(grp_key, grp); } diff --git a/400_xowa/src/gplx/xowa/cfgs/gui/Xocfg_pref_mgr.java b/400_xowa/src/gplx/xowa/cfgs/gui/Xocfg_pref_mgr.java index 1c8e4dccc..f7901d232 100644 --- a/400_xowa/src/gplx/xowa/cfgs/gui/Xocfg_pref_mgr.java +++ b/400_xowa/src/gplx/xowa/cfgs/gui/Xocfg_pref_mgr.java @@ -86,7 +86,7 @@ class Xocfg_meta_itm_bool extends Xocfg_meta_itm_base { } class Xocfg_meta_itm_int extends Xocfg_meta_itm_base { public Xocfg_meta_itm_int(String prop_key, int prop_dflt) {this.Set(Xodfg_pref_itm_type_.Tid_int, prop_key, prop_dflt);} - public Xocfg_meta_itm_int Rng_bgn_(int bgn) {return Rng_(bgn, Int_.MaxValue);} + public Xocfg_meta_itm_int Rng_bgn_(int bgn) {return Rng_(bgn, Int_.Max_value);} public Xocfg_meta_itm_int Rng_(int bgn, int end) { return this; } diff --git a/400_xowa/src/gplx/xowa/cfgs2/Xocfg_bnd_itm_srl.java b/400_xowa/src/gplx/xowa/cfgs2/Xocfg_bnd_itm_srl.java index 7cc891675..64ffb8b8e 100644 --- a/400_xowa/src/gplx/xowa/cfgs2/Xocfg_bnd_itm_srl.java +++ b/400_xowa/src/gplx/xowa/cfgs2/Xocfg_bnd_itm_srl.java @@ -30,7 +30,7 @@ public class Xocfg_bnd_itm_srl implements GfoInvkAble { public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_src_)) Src_(app, this, m.ReadStr("v")); else if (ctx.Match(k, Invk_box_)) box = Xog_bnd_box_.Xto_sys_int(m.ReadStr("v")); - else if (ctx.Match(k, Invk_ipt_)) ipt = IptArg_.parse_(m.ReadStr("v")); + else if (ctx.Match(k, Invk_ipt_)) ipt = IptArg_.parse(m.ReadStr("v")); else return GfoInvkAble_.Rv_unhandled; return this; } diff --git a/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr.java b/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr.java index a53669908..8e1b20160 100644 --- a/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr.java +++ b/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr.java @@ -61,11 +61,11 @@ public class Xoctg_html_mgr implements GfoInvkAble { boolean id_exists = wiki.Db_mgr().Load_mgr().Load_by_id(dbo_page, itm.Id()); Xoa_ttl itm_ttl = null; if (id_exists) - itm_ttl = Xoa_ttl.parse_(wiki, dbo_page.Ns_id(), dbo_page.Ttl_page_db()); + itm_ttl = Xoa_ttl.parse(wiki, dbo_page.Ns_id(), dbo_page.Ttl_page_db()); else { - itm_ttl = Xoa_ttl.parse_(wiki, itm.Sortkey()); + itm_ttl = Xoa_ttl.parse(wiki, itm.Sortkey()); if (itm_ttl == null) - itm_ttl = Xoa_ttl.parse_(wiki, Bry_missing); + itm_ttl = Xoa_ttl.parse(wiki, Bry_missing); itm.Id_missing_(true); } itm.Ttl_(itm_ttl); @@ -93,7 +93,7 @@ public class Xoctg_html_mgr implements GfoInvkAble { Xow_msg_mgr msg_mgr = wiki.Msg_mgr(); byte[] all_label = msg_mgr.Val_by_id_args(fmtr_all.Msg_id_label(), view_ctg.Name()); byte[] all_stats = msg_mgr.Val_by_id_args(fmtr_all.Msg_id_stats(), view_grp.Len(), view_grp.Total()); - Xoa_ttl ctg_ttl = Xoa_ttl.parse_(wiki, Xow_ns_.Id_category, view_ctg.Name()); + Xoa_ttl ctg_ttl = Xoa_ttl.parse(wiki, Xow_ns_.Id_category, view_ctg.Name()); byte[] all_navs = fmtr_all.Bld_bwd_fwd(wiki, ctg_ttl, view_grp); fmtr_grp.Init_from_all(wiki, lang, view_ctg, fmtr_all, view_grp); fmtr_all.Html_all().Bld_bfr_many(bfr, fmtr_all.Div_id(), all_label, all_stats, all_navs, lang.Key_bry(), lang.Dir_ltr_bry(), fmtr_grp); diff --git a/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr_tst.java b/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr_tst.java index c94a38d5b..e37630b8b 100644 --- a/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/ctgs/Xoctg_html_mgr_tst.java @@ -32,7 +32,7 @@ public class Xoctg_html_mgr_tst { @Test public void Visited_doesnt_work_for_space() {// PURPOSE: xowa-visited not inserted for pages with space byte[] page_bry = Bry_.new_a7("A 1"); Xoa_url url = Xoa_url.new_(Bry_.new_a7("en.wikipedia.org"), page_bry); - Xoa_ttl ttl = Xoa_ttl.parse_(fxt.Wiki(), page_bry); + Xoa_ttl ttl = Xoa_ttl.parse(fxt.Wiki(), page_bry); fxt.Wiki().Appe().Usere().History_mgr().Add(url, ttl, page_bry); fxt .Init_itm_page("A_1").Init_ctg_name_("Ctg_1").Init_ctg_pages_(0, 1) .Test_html_all(Xoa_ctg_mgr.Tid_page, String_.Concat_lines_nl_skip_last @@ -223,7 +223,7 @@ class Xoh_ctg_page_fxt { public Xowe_wiki Wiki() {return wiki;} private Xowe_wiki wiki; public Xoctg_view_ctg Ctg() {return ctg;} private Xoctg_view_ctg ctg; public void Test_bld_rslts_lnk(boolean next, String ctg_str, String expd) { - byte[] actl = ctg_html.Fmtr(Xoa_ctg_mgr.Tid_page).Grp_max_(0).Bld_bwd_fwd(wiki, Xoa_ttl.parse_(wiki, Bry_.new_a7(ctg_str)), ctg.Grp_by_tid(Xoa_ctg_mgr.Tid_page)); + byte[] actl = ctg_html.Fmtr(Xoa_ctg_mgr.Tid_page).Grp_max_(0).Bld_bwd_fwd(wiki, Xoa_ttl.parse(wiki, Bry_.new_a7(ctg_str)), ctg.Grp_by_tid(Xoa_ctg_mgr.Tid_page)); Tfds.Eq_str_lines(expd, String_.new_u8(actl)); } public Xoh_ctg_page_fxt Init_ctg_name_(String v) {ctg.Name_(Bry_.new_u8(v)); return this;} @@ -238,7 +238,7 @@ class Xoh_ctg_page_fxt { for (int i = 0; i < len; i++) { String title = titles[i]; byte[] title_bry = Bry_.new_u8(title); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, title_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, title_bry); rv[i] = new Xoctg_view_itm().Ttl_(ttl).Sortkey_(ttl.Page_txt()); } return rv; diff --git a/400_xowa/src/gplx/xowa/ctgs/Xoctg_idx_mgr.java b/400_xowa/src/gplx/xowa/ctgs/Xoctg_idx_mgr.java index 8acfa1f92..7e39f10d6 100644 --- a/400_xowa/src/gplx/xowa/ctgs/Xoctg_idx_mgr.java +++ b/400_xowa/src/gplx/xowa/ctgs/Xoctg_idx_mgr.java @@ -53,7 +53,7 @@ public class Xoctg_idx_mgr implements GfoInvkAble { int dif = max / 2; int pos = dif; Xoctg_idx_itm rv = null; - int comp_prv = Int_.MinValue, comp_cur = 0; + int comp_prv = Int_.Min_value, comp_cur = 0; while (true) { rv = (Xoctg_idx_itm)itms.Get_at(pos); comp_cur = Bry_.Compare(find, rv.Sortkey()); @@ -80,7 +80,7 @@ public class Xoctg_idx_mgr implements GfoInvkAble { */ boolean dir_fwd = bmk_comp == CompareAble_.More; // bmk is > than find; move forward fld_rdr.Data_(src); - int comp_prv = bmk_comp, comp_cur = Int_.MinValue; int pos_cur = bmk_bgn; + int comp_prv = bmk_comp, comp_cur = Int_.Min_value; int pos_cur = bmk_bgn; tmp_prv_itm.Parse(fld_rdr.Pos_(pos_cur), pos_cur); // fill prv_itm to whatever binary search found while (true) { int itm_bgn = dir_fwd ? Bry_finder.Find_fwd(src, Byte_ascii.Pipe, pos_cur, src_len) : Bry_finder.Find_bwd(src, Byte_ascii.Pipe, pos_cur); diff --git a/400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_itms.java b/400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_itms.java index 15737f0f9..6140b92ff 100644 --- a/400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_itms.java +++ b/400_xowa/src/gplx/xowa/ctgs/Xoctg_pagelist_itms.java @@ -32,7 +32,7 @@ public class Xoctg_pagelist_itms implements Bry_fmtr_arg { int len = itms.Count(); for (int i = 0; i < len; i++) { Xowd_page_itm page = (Xowd_page_itm)itms.Get_at(i); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Xow_ns_.Id_category, page.Ttl_page_db()); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Xow_ns_.Id_category, page.Ttl_page_db()); byte[] lnki_cls = Xoh_lnki_wtr.Lnki_cls_visited(history_mgr, wiki.Domain_bry(), ttl.Page_txt()); // NOTE: must be ttl.Page_txt() in order to match Xou_history_mgr.Add byte[] lnki_href = href_wtr.Build_to_bry(wiki, ttl); byte[] lnki_ttl = ttl.Full_txt(); diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql.java b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql.java index 3afa13eff..b60c50bbf 100644 --- a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql.java +++ b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql.java @@ -97,14 +97,14 @@ public class Xodb_load_mgr_sql implements Xodb_load_mgr { Xoctg_view_grp view_grp = null; for (int i = 0; i < len; i++) { Xowd_page_itm db_page = (Xowd_page_itm)list.Get_at(i); - if (db_page.Ns_id() == Int_.MinValue) continue; // HACK: page not found; ignore + if (db_page.Ns_id() == Int_.Min_value) continue; // HACK: page not found; ignore Xoctg_page_xtn db_ctg = (Xoctg_page_xtn)db_page.Xtn(); byte cur_tid = db_ctg.Tid(); if (prv_tid != cur_tid) { view_grp = rv.Grp_by_tid(cur_tid); prv_tid = cur_tid; } - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, db_page.Ns_id(), db_page.Ttl_page_db()); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, db_page.Ns_id(), db_page.Ttl_page_db()); Xoctg_view_itm view_itm = new Xoctg_view_itm().Sortkey_(db_ctg.Sortkey()).Ttl_(ttl); view_itm.Load_by_ttl_data(cur_tid, db_page.Id(), Xowd_page_itm.Modified_on_null_int, db_page.Text_len()); view_grp.Itms_add(view_itm); @@ -184,12 +184,12 @@ public class Xodb_load_mgr_sql implements Xodb_load_mgr { boolean rv = false; for (int i = 0; i < link_list.Count(); i++) { Xowd_page_itm page = (Xowd_page_itm)link_list.Get_at(i); - if (page.Ns_id() == Int_.MinValue) continue; // HACK: page not found; ignore + if (page.Ns_id() == Int_.Min_value) continue; // HACK: page not found; ignore byte ctg_tid = Xodb_load_mgr_txt.Load_ctg_v1_tid(page.Ns_id()); Xoctg_view_grp ctg_grp = view_ctg.Grp_by_tid(ctg_tid); Xoctg_view_itm ctg_itm = new Xoctg_view_itm(); ctg_itm.Load_by_ttl_data(ctg_tid, page.Id(), 0, page.Text_len()); - ctg_itm.Ttl_(Xoa_ttl.parse_(wiki, page.Ns_id(), page.Ttl_page_db())); + ctg_itm.Ttl_(Xoa_ttl.parse(wiki, page.Ns_id(), page.Ttl_page_db())); ctg_itm.Sortkey_(page.Ttl_page_db()); ctg_grp.Itms_add(ctg_itm); rv = true; diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql_tst.java b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql_tst.java index 344817ea6..6df2a808a 100644 --- a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql_tst.java +++ b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_sql_tst.java @@ -70,7 +70,7 @@ class Xodb_load_mgr_sql_fxt { Xowd_page_itm page = ary[i]; tbl_page.Insert_cmd_by_batch(page.Id(), page.Ns_id(), page.Ttl_page_db(), false, modified, 10, page.Id(), 0, 0); Xowd_category_itm ctg_itm = (Xowd_category_itm)page.Xtn(); - cat_core_tbl.Insert_cmd_by_batch(ctg_itm.Id(), ctg_itm.Count_pages(), ctg_itm.Count_subcs(), ctg_itm.Count_files(), Bool_.Xto_byte(ctg_itm.Hidden()), 0); + cat_core_tbl.Insert_cmd_by_batch(ctg_itm.Id(), ctg_itm.Count_pages(), ctg_itm.Count_subcs(), ctg_itm.Count_files(), Bool_.To_byte(ctg_itm.Hidden()), 0); } cat_core_tbl.Insert_end(); tbl_page.Insert_end(); @@ -92,7 +92,7 @@ class Xodb_load_mgr_sql_fxt { Xowd_category_itm ctg_itm = (Xowd_category_itm)page.Xtn(); bfr.Add_int_variable(page.Id()).Add_byte_pipe(); bfr.Add(page.Ttl_page_db()).Add_byte_pipe(); - bfr.Add_byte(Bool_.Xto_byte(ctg_itm.Hidden())).Add_byte_nl(); + bfr.Add_byte(Bool_.To_byte(ctg_itm.Hidden())).Add_byte_nl(); } return bfr.Xto_str_and_clear(); } diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java index 8d21007a0..784af6bd8 100644 --- a/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java +++ b/400_xowa/src/gplx/xowa/dbs/Xodb_load_mgr_txt.java @@ -304,7 +304,7 @@ public class Xodb_load_mgr_txt implements Xodb_load_mgr { Xowd_page_itm itm = (Xowd_page_itm)ctgs.Get_at(i); byte itm_tid = Load_ctg_v1_tid(itm.Ns_id()); Xoctg_view_itm sub = Load_ctg_v1_sub(itm_tid, itm); - sub.Ttl_(Xoa_ttl.parse_(wiki, itm.Ns_id(), itm.Ttl_page_db())).Sortkey_(itm.Ttl_page_db()); + sub.Ttl_(Xoa_ttl.parse(wiki, itm.Ns_id(), itm.Ttl_page_db())).Sortkey_(itm.Ttl_page_db()); view_ctg.Grp_by_tid(itm_tid).Itms_add(sub); } for (byte i = 0; i < Xoa_ctg_mgr.Tid__max; i++) { diff --git a/400_xowa/src/gplx/xowa/dbs/Xodb_upgrade_mgr.java b/400_xowa/src/gplx/xowa/dbs/Xodb_upgrade_mgr.java index a8a2c8166..fecf02fdf 100644 --- a/400_xowa/src/gplx/xowa/dbs/Xodb_upgrade_mgr.java +++ b/400_xowa/src/gplx/xowa/dbs/Xodb_upgrade_mgr.java @@ -42,7 +42,7 @@ class Xodb_upgrade_mgr { // KeyVal kv = kv_ary[i]; // String kv_key = kv.Key(); // if (String_.Eq(kv_key, gfs_data_storage_format)) { -// byte data_storage_format_byte = Byte_.parse_(kv.Val_to_str_or_empty()); +// byte data_storage_format_byte = Byte_.parse(kv.Val_to_str_or_empty()); // String data_storage_format_name = Xoi_dump_mgr.Wtr_tid_to_str(data_storage_format_byte); // kv.Val_(data_storage_format_name); // update memory // db_mgr.Tbl_xowa_cfg().Update(Xodb_mgr_sql.Grp__wiki_init, gfs_data_storage_format, data_storage_format_name); // update_database diff --git a/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java b/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java index a4cfe75e3..52aee3897 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java +++ b/400_xowa/src/gplx/xowa/files/Xof_img_size_tst.java @@ -67,7 +67,7 @@ public class Xof_img_size_tst { fxt.Lnki_ext_(Xof_ext_.Id_svg).Lnki_(-1, 40).Orig_(1, 1).Test_html(40, 40, Bool_.N); // NOTE: used to be 1,1 } @Test public void Svg_max_width() { // PURPOSE: large width causes int overflow; vi.w:Danh_sách_quốc_kỳ DATE:2014-04-26 - fxt.Lnki_ext_(Xof_ext_.Id_svg).Lnki_(Int_.MaxValue, 90).Orig_(900, 600).Test_html(135, 90, Bool_.N); // NOTE: used to be Int_.MaxValue,90 + fxt.Lnki_ext_(Xof_ext_.Id_svg).Lnki_(Int_.Max_value, 90).Orig_(900, 600).Test_html(135, 90, Bool_.N); // NOTE: used to be Int_.Max_value,90 } @Test public void Pdf_none_defaults_to_thumb() { // PURPOSE: if no width is specified, pdf uses thumb width default, not orig width); DATE: 2013-11-27 fxt.Lnki_type_(Xop_lnki_type.Id_none).Lnki_ext_(Xof_ext_.Id_pdf).Lnki_(-1, -1).Orig_(440, 220).Test_html(220, 110, Bool_.N); // NOTE: used to be 1,1 diff --git a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java index e797904d4..b9c3d65a5 100644 --- a/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java +++ b/400_xowa/src/gplx/xowa/files/Xof_xfer_itm_tst.java @@ -31,9 +31,9 @@ public class Xof_xfer_itm_tst { @Test public void Explicit_ratio_small() {tst_Calc_view("120,80" , "200,100" , "120,60");} // see NOTE_1:view ratio > file ratio private void tst_Calc_view(String lnki_str, String file_str, String expd_str) { Int_2_ref rv = new Int_2_ref(); - Int_2_val lnki = Int_2_val.parse_(lnki_str); - Int_2_val file = Int_2_val.parse_(file_str); - Int_2_val expd = Int_2_val.parse_(expd_str); + Int_2_val lnki = Int_2_val.parse(lnki_str); + Int_2_val file = Int_2_val.parse(file_str); + Int_2_val expd = Int_2_val.parse(expd_str); Xof_xfer_itm_.Calc_view(rv, Xop_lnki_type.Id_thumb, lnki.Val_0(), lnki.Val_1(), file.Val_0(), file.Val_1(), true); Tfds.Eq(expd.Val_0(), rv.Val_0()); Tfds.Eq(expd.Val_1(), rv.Val_1()); diff --git a/400_xowa/src/gplx/xowa/files/bins/Xof_bin_wkr__fsdb_sql.java b/400_xowa/src/gplx/xowa/files/bins/Xof_bin_wkr__fsdb_sql.java index 3409faab8..7f7612f91 100644 --- a/400_xowa/src/gplx/xowa/files/bins/Xof_bin_wkr__fsdb_sql.java +++ b/400_xowa/src/gplx/xowa/files/bins/Xof_bin_wkr__fsdb_sql.java @@ -45,7 +45,7 @@ public class Xof_bin_wkr__fsdb_sql implements Xof_bin_wkr { } public Io_stream_rdr Get_to_fsys_near(Xof_fsdb_itm rv, byte[] orig_repo, byte[] orig_ttl, Xof_ext orig_ext, double lnki_time, int lnki_page) { Fsd_thm_itm thm_itm = Fsd_thm_itm.new_(); - thm_itm.Init_by_req(Int_.MaxValue, lnki_time, lnki_page); + thm_itm.Init_by_req(Int_.Max_value, lnki_time, lnki_page); boolean found = Select_thm_bin(Bool_.N, thm_itm, orig_repo, orig_ttl); if (found) { tmp_ids.Init_by_thm(found, thm_itm); diff --git a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java index adb1de563..8fa90c17b 100644 --- a/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java +++ b/400_xowa/src/gplx/xowa/files/caches/Xou_cache_mgr.java @@ -33,7 +33,7 @@ public class Xou_cache_mgr { public long Fsys_size_min() {return fsys_size_min;} public void Fsys_size_min_(long v) {fsys_size_min = v;} private long fsys_size_min = Io_mgr.Len_mb * 75; public long Fsys_size_max() {return fsys_size_max;} public void Fsys_size_max_(long v) {fsys_size_max = v;} private long fsys_size_max = Io_mgr.Len_mb * 100; public KeyVal[] Info() { - long view_date = Long_.MaxValue; + long view_date = Long_.Max_value; long fsys_size = 0; int len = hash.Count(); for (int i = 0; i < len; ++i) { @@ -45,7 +45,7 @@ public class Xou_cache_mgr { ( KeyVal_.new_("cache folder", cache_dir.Xto_api()) , KeyVal_.new_("space used", gplx.ios.Io_size_.To_str(fsys_size)) , KeyVal_.new_("file count", len) - , KeyVal_.new_("oldest file", view_date == Long_.MaxValue ? "" : DateAdp_.unixtime_utc_seconds_(view_date).XtoStr_fmt_iso_8561()) + , KeyVal_.new_("oldest file", view_date == Long_.Max_value ? "" : DateAdp_.unixtime_utc_seconds_(view_date).XtoStr_fmt_iso_8561()) ); } public Xou_cache_itm Get_or_null(Xof_fsdb_itm fsdb) {return Get_or_null(fsdb.Lnki_wiki_abrv(), fsdb.Lnki_ttl(), fsdb.Lnki_type(), fsdb.Lnki_upright(), fsdb.Lnki_w(), fsdb.Lnki_h(), fsdb.Lnki_time(), fsdb.Lnki_page(), fsdb.User_thumb_w());} diff --git a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java index e534f263c..e2aebfc48 100644 --- a/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java +++ b/400_xowa/src/gplx/xowa/files/fsdb/tsts/Xof_file_fxt.java @@ -66,7 +66,7 @@ class Xof_file_fxt { itm.Init_at_lnki(arg.Exec_tid(), wiki.Domain_itm().Abrv_xo(), ttl_bry, arg.Lnki_type(), arg.Lnki_upright(), arg.Lnki_w(), arg.Lnki_h(), arg.Lnki_time(), Xof_lnki_page.Null, Xof_patch_upright_tid_.Tid_all); List_adp itms_list = List_adp_.new_(); itms_list.Add(itm); orig_mgr.Find_by_list(Ordered_hash_.new_bry_(), itms_list, Xof_exec_tid.Tid_wiki_page); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Xow_ns_.Id_main, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Xow_ns_.Id_main, ttl_bry); Xoae_page page = Xoae_page.new_(wiki, ttl); fsdb_mgr.Fsdb_search_by_list(itms_list, wiki, page, Xog_js_wkr_.Noop); if (arg.Rslt_orig_exists() != Bool_.__byte) Tfds.Eq(arg.Rslt_orig_exists() == Bool_.Y_byte, itm.Orig_exists(), "orig_exists"); diff --git a/400_xowa/src/gplx/xowa/files/imgs/Xof_img_wkr_query_img_size.java b/400_xowa/src/gplx/xowa/files/imgs/Xof_img_wkr_query_img_size.java index bba81fe67..5ff0bca0f 100644 --- a/400_xowa/src/gplx/xowa/files/imgs/Xof_img_wkr_query_img_size.java +++ b/400_xowa/src/gplx/xowa/files/imgs/Xof_img_wkr_query_img_size.java @@ -31,7 +31,7 @@ class Xof_img_wkr_query_img_size_imageMagick implements Xof_img_wkr_query_img_si int pos_bgn = String_.FindFwd(size_str, "<{", 0); if (pos_bgn == String_.Find_none) return SizeAdp_.Zero; // NOTE: RE: "FindFwd(,0)"; multiple frames are possible; 1st frame must be used as last frame is not accurate; EX:w.Chess:[[File:ChessCastlingMovie.gif|thumb|250px]] int pos_end = String_.FindFwd(size_str, "}>", pos_bgn); if (pos_end == String_.Find_none) return SizeAdp_.Zero; size_str = String_.Mid(size_str, pos_bgn + Marker_bgn_len, pos_end); - return SizeAdp_.parse_or_(size_str, SizeAdp_.Zero); + return SizeAdp_.parse_or(size_str, SizeAdp_.Zero); } static final String Marker_bgn = "<{", Marker_end = "}>"; static final int Marker_bgn_len = String_.Len(Marker_bgn); } diff --git a/400_xowa/src/gplx/xowa/files/origs/Xof_wiki_finder.java b/400_xowa/src/gplx/xowa/files/origs/Xof_wiki_finder.java index 0af5ac95c..6ceb23b4d 100644 --- a/400_xowa/src/gplx/xowa/files/origs/Xof_wiki_finder.java +++ b/400_xowa/src/gplx/xowa/files/origs/Xof_wiki_finder.java @@ -30,7 +30,7 @@ class Xof_wiki_finder { // UNUSED return rv; } private Xoae_page Get_page__by_wiki(Xowe_wiki wiki, int ns_id, byte[] ttl_bry) { - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ns_id, ttl_bry) ; + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ns_id, ttl_bry) ; Xoa_url url = Xoa_url.new_(wiki.Domain_bry(), ttl_bry); return wiki.Load_page_by_ttl(url, ttl); } diff --git a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_base_fxt.java b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_base_fxt.java index 75ef7aaba..89ae4bad9 100644 --- a/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_base_fxt.java +++ b/400_xowa/src/gplx/xowa/files/xfers/Xof_xfer_queue_base_fxt.java @@ -69,7 +69,7 @@ public class Xof_xfer_queue_base_fxt { public void ini_page_create_en_wiki(String ttl) {Init_page_create(en_wiki, ttl, "");} public void ini_page_create_en_wiki_redirect(String ttl, String redirect) {Init_page_create(en_wiki, ttl, "#REDIRECT [[" + redirect + "]]");} public void Init_page_create(Xowe_wiki wiki, String ttl, String txt) { - Xoa_ttl page_ttl = Xoa_ttl.parse_(wiki, Bry_.new_u8(ttl)); + Xoa_ttl page_ttl = Xoa_ttl.parse(wiki, Bry_.new_u8(ttl)); byte[] page_raw = Bry_.new_u8(txt); wiki.Db_mgr().Save_mgr().Data_create(page_ttl, page_raw); } diff --git a/400_xowa/src/gplx/xowa/fmtrs/Xoa_fmtr_itm.java b/400_xowa/src/gplx/xowa/fmtrs/Xoa_fmtr_itm.java index cb586f5f3..ad9957942 100644 --- a/400_xowa/src/gplx/xowa/fmtrs/Xoa_fmtr_itm.java +++ b/400_xowa/src/gplx/xowa/fmtrs/Xoa_fmtr_itm.java @@ -26,7 +26,7 @@ public class Xoa_fmtr_itm implements GfoInvkAble { } public String Run() { GfoInvkAble src_invk = (GfoInvkAble)app.Gfs_mgr().Run_str(src); - int len = Int_.cast_(GfoInvkAble_.InvkCmd(src_invk, Invk_len)); + int len = Int_.cast(GfoInvkAble_.InvkCmd(src_invk, Invk_len)); Bry_bfr bfr = Bry_bfr.new_(); Bfmtr_eval_invk eval_mgr = new Bfmtr_eval_invk(app); Bry_fmtr fmtr = Bry_fmtr.new_bry_(fmt).Eval_mgr_(eval_mgr); diff --git a/400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java b/400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java index 9a70ac06b..6d85f65ce 100644 --- a/400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java +++ b/400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java @@ -66,7 +66,7 @@ public class Xoa_gui_mgr implements GfoEvObj, GfoInvkAble { layout.Init(browser_win); cmd_mgr.Init_by_kit(app); app.Api_root().Init_by_kit(app); - menu_mgr.Menu_bldr().Init_by_kit(app, kit, app.Usere().Fsys_mgr().App_img_dir().GenSubDir_nest("window", "menu")); + menu_mgr.Menu_bldr().Init_by_kit(app, kit, app.Fsys_mgr().Bin_xowa_file_dir().GenSubDir_nest("app.menu")); menu_mgr.Init_by_kit(); bnd_mgr.Init_by_kit(app); GfoEvMgr_.SubSame_many(app.Usere(), this, Xoue_user.Evt_lang_changed); diff --git a/400_xowa/src/gplx/xowa/gui/history/Xog_history_mgr.java b/400_xowa/src/gplx/xowa/gui/history/Xog_history_mgr.java index 6df549cda..e30896800 100644 --- a/400_xowa/src/gplx/xowa/gui/history/Xog_history_mgr.java +++ b/400_xowa/src/gplx/xowa/gui/history/Xog_history_mgr.java @@ -59,7 +59,7 @@ public class Xog_history_mgr { byte[] page_key = Build_page_key(itm.Wiki(), itm.Page(), itm.Qarg()); Xoae_page rv = (Xoae_page)hash.Get_by(page_key); if (rv != null) return rv; - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, itm.Page()); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, itm.Page()); return wiki.Data_mgr().Get_page(ttl, false); } private static byte[] Build_page_key(Xoae_page page) {return Build_page_key(page.Wiki().Domain_bry(), page.Ttl().Full_url(), page.Url().Qargs_mgr().To_bry());} diff --git a/400_xowa/src/gplx/xowa/gui/history/Xog_history_stack_tst.java b/400_xowa/src/gplx/xowa/gui/history/Xog_history_stack_tst.java index b749118e2..65763a011 100644 --- a/400_xowa/src/gplx/xowa/gui/history/Xog_history_stack_tst.java +++ b/400_xowa/src/gplx/xowa/gui/history/Xog_history_stack_tst.java @@ -71,7 +71,7 @@ class Xog_history_stack_fxt { } public Xog_history_stack_fxt Exec_add_one(String ttl_str, String arg_str) { byte[] ttl_bry = Bry_.new_u8(ttl_str); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ttl_bry); Xoae_page page = Xoae_page.test_(wiki, ttl); byte[] url_bry = ttl_bry; if (arg_str != null) url_bry = Bry_.Add(url_bry, Bry_.new_u8(arg_str)); diff --git a/400_xowa/src/gplx/xowa/gui/menus/dom/Xog_mnu_bldr.java b/400_xowa/src/gplx/xowa/gui/menus/dom/Xog_mnu_bldr.java index adf46c88f..59ca7a59d 100644 --- a/400_xowa/src/gplx/xowa/gui/menus/dom/Xog_mnu_bldr.java +++ b/400_xowa/src/gplx/xowa/gui/menus/dom/Xog_mnu_bldr.java @@ -66,7 +66,7 @@ public class Xog_mnu_bldr { Gfui_mnu_itm mnu_itm = owner_gui.Itms_add_chk_msg(sub.Gui_text(), img, app, app.Gfs_mgr(), msg_n, msg_y); sub.Evt_mgr().Sub(mnu_itm); Xog_cmd_itm cmd = app.Gui_mgr().Cmd_mgr().Get_or_null(sub.Key()); - boolean v = Bool_.cast_(app.Gfs_mgr().Run_str_for(app, cmd.Cmd())); + boolean v = Bool_.cast(app.Gfs_mgr().Run_str_for(app, cmd.Cmd())); mnu_itm.Selected_(v); return mnu_itm; } diff --git a/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java b/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java index 5b77c3cfd..500713b2f 100644 --- a/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java +++ b/400_xowa/src/gplx/xowa/gui/urls/Xof_orig_file_downloader.java @@ -22,7 +22,7 @@ public class Xof_orig_file_downloader { Xof_fsdb_itm fsdb = new Xof_fsdb_itm(); lnki_ttl = Xoa_ttl.Replace_spaces(Xoa_app_.Utl__encoder_mgr().Http_url().Decode(lnki_ttl)); fsdb.Init_at_lnki(Xof_exec_tid.Tid_viewer_app, wiki.Domain_itm().Abrv_xo(), lnki_ttl, Xop_lnki_type.Id_none, Xop_lnki_tkn.Upright_null, Xof_img_size.Size__neg1, Xof_img_size.Size__neg1, Xof_lnki_time.Null, Xof_lnki_page.Null, Xof_patch_upright_tid_.Tid_all); - fsdb.Init_at_hdoc(Int_.MaxValue, Xof_html_elem.Tid_img);// NOTE: set elem_id to "impossible" number, otherwise it will auto-update an image on the page with a super-large size; [[File:Alfred Sisley 062.jpg]] + fsdb.Init_at_hdoc(Int_.Max_value, Xof_html_elem.Tid_img);// NOTE: set elem_id to "impossible" number, otherwise it will auto-update an image on the page with a super-large size; [[File:Alfred Sisley 062.jpg]] Xof_orig_itm orig = wiki.File__orig_mgr().Find_by_ttl_or_null(lnki_ttl); if (orig == Xof_orig_itm.Null) return null; // orig not found; need orig in order to get repo Xof_repo_itm repo = wiki.File__repo_mgr().Get_trg_by_id_or_null(orig.Repo(), lnki_ttl, Bry_.Empty); if (repo == null) return null; // repo not found fsdb.Init_at_orig(orig.Repo(), repo.Wiki_domain(), orig.Ttl(), orig.Ext(), orig.W(), orig.H(), orig.Redirect()); diff --git a/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java b/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java index 6eb75db0d..a1aabcd38 100644 --- a/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java +++ b/400_xowa/src/gplx/xowa/gui/urls/Xog_url_wkr.java @@ -154,7 +154,7 @@ public class Xog_url_wkr { // wiki = app.Wiki_mgr().Get_by_key_or_make(href.Wiki()).Init_assert(); // get xwiki and set to wiki // if (use_main_page) // page_bry = wiki.Props().Main_page(); // get Main_page for new wiki; DATE:2014-02-23 -// Xoa_ttl tmp_ttl = Xoa_ttl.parse_(wiki, page_bry); // reparse ttl according to xwiki's case_match rules; NOTE: do not use rv.Page_bry() or else will lose sub_pages (A/B/C); DATE:2014-02-21 +// Xoa_ttl tmp_ttl = Xoa_ttl.parse(wiki, page_bry); // reparse ttl according to xwiki's case_match rules; NOTE: do not use rv.Page_bry() or else will lose sub_pages (A/B/C); DATE:2014-02-21 // if (tmp_ttl != null) // page_bry = tmp_ttl.Full_db(); // } diff --git a/400_xowa/src/gplx/xowa/gui/views/Rect_ref.java b/400_xowa/src/gplx/xowa/gui/views/Rect_ref.java index 16ec3b648..d765698f1 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Rect_ref.java +++ b/400_xowa/src/gplx/xowa/gui/views/Rect_ref.java @@ -29,10 +29,10 @@ public class Rect_ref { @Override public String toString() {return String_.Format("{0},{1},{2},{3}", x, y, w, h);} public static final Rect_ref Zero = new Rect_ref(0, 0, 0, 0); public static Rect_ref rectAdp_(gplx.gfui.RectAdp v) {return new Rect_ref(v.X(), v.Y(), v.Width(), v.Height());} - public static Rect_ref parse_(String raw) { + public static Rect_ref parse(String raw) { try { String[] ary = String_.Split(raw, ","); - return new Rect_ref(Int_.parse_(ary[0]), Int_.parse_(ary[1]), Int_.parse_(ary[2]), Int_.parse_(ary[3])); + return new Rect_ref(Int_.parse(ary[0]), Int_.parse(ary[1]), Int_.parse(ary[2]), Int_.parse(ary[3])); } catch(Exception exc) {throw Err_.new_parse_exc(exc, Rect_ref.class, raw);} } } diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_html_itm.java b/400_xowa/src/gplx/xowa/gui/views/Xog_html_itm.java index f092d3d45..5d8dc5255 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_html_itm.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_html_itm.java @@ -103,7 +103,7 @@ public class Xog_html_itm implements Xog_js_wkr, GfoInvkAble, GfoEvObj { GfoInvkAble_.InvkCmd_msg(cmd_sync, Invk_html_elem_delete, m); } @gplx.Virtual public String Html_elem_atr_get_str(String id, String atr_key) {return html_box.Html_js_eval_proc_as_str(Xog_js_procs.Doc__atr_get_as_obj, id, atr_key);} - @gplx.Virtual public boolean Html_elem_atr_get_bool(String id, String atr_key) {return Bool_.parse_(html_box.Html_js_eval_proc_as_str(Xog_js_procs.Doc__atr_get_to_str, id, atr_key));} + @gplx.Virtual public boolean Html_elem_atr_get_bool(String id, String atr_key) {return Bool_.parse(html_box.Html_js_eval_proc_as_str(Xog_js_procs.Doc__atr_get_to_str, id, atr_key));} public void Html_atr_set(String elem_id, String atr_key, String atr_val) { diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_launcher_tabs.java b/400_xowa/src/gplx/xowa/gui/views/Xog_launcher_tabs.java index ffc645095..c27848b0d 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_launcher_tabs.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_launcher_tabs.java @@ -60,9 +60,9 @@ class Xog_launcher_tabs { } private void Launch_tab(Xog_win_itm win, Xowe_wiki home_wiki, String launch_str) { Xoae_app app = win.App(); - Xoa_url launch_url = home_wiki.Utl__url_parser().Parse_by_urlbar(launch_str); + Xoa_url launch_url = home_wiki.Utl__url_parser().Parse_by_urlbar_or_null(launch_str); if (launch_url == null) return; Xowe_wiki launch_wiki = (Xowe_wiki)app.Wiki_mgr().Get_by_key_or_make_init_y(launch_url.Wiki_bry()); - Xoa_ttl launch_ttl = Xoa_ttl.parse_(launch_wiki, launch_url.Page_bry()); + Xoa_ttl launch_ttl = Xoa_ttl.parse(launch_wiki, launch_url.Page_bry()); Xog_tab_itm tab = win.Tab_mgr().Tabs_new_init(launch_wiki, Xoae_page.new_(launch_wiki, launch_ttl)); // WORKAROUND: set the tab to an empty page, else null ref later; DATE:2014-07-23 tab.Show_url_bgn(launch_url); } diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_layout_box.java b/400_xowa/src/gplx/xowa/gui/views/Xog_layout_box.java index 27b7b630a..7055ebf2a 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_layout_box.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_layout_box.java @@ -19,26 +19,26 @@ package gplx.xowa.gui.views; import gplx.*; import gplx.xowa.*; import gplx.xowa import gplx.gfui.*; public class Xog_layout_box implements GfoInvkAble { public GfoInvkAble Owner() {return owner;} public Xog_layout_box Owner_(GfoInvkAble v) {owner = v; return this;} GfoInvkAble owner; - public int X_abs() {return x_abs;} public Xog_layout_box X_abs_(int v) {x_abs = v; return this;} private int x_abs = Int_.MinValue; - public int Y_abs() {return y_abs;} public Xog_layout_box Y_abs_(int v) {y_abs = v; return this;} private int y_abs = Int_.MinValue; - public int W_abs() {return w_abs;} public Xog_layout_box W_abs_(int v) {w_abs = v; return this;} private int w_abs = Int_.MinValue; - public int H_abs() {return h_abs;} public Xog_layout_box H_abs_(int v) {h_abs = v; return this;} private int h_abs = Int_.MinValue; - public int X_rel() {return x_rel;} public Xog_layout_box X_rel_(int v) {x_rel = v; return this;} private int x_rel = Int_.MinValue; - public int Y_rel() {return y_rel;} public Xog_layout_box Y_rel_(int v) {y_rel = v; return this;} private int y_rel = Int_.MinValue; - public int W_rel() {return w_rel;} public Xog_layout_box W_rel_(int v) {w_rel = v; return this;} private int w_rel = Int_.MinValue; - public int H_rel() {return h_rel;} public Xog_layout_box H_rel_(int v) {h_rel = v; return this;} private int h_rel = Int_.MinValue; + public int X_abs() {return x_abs;} public Xog_layout_box X_abs_(int v) {x_abs = v; return this;} private int x_abs = Int_.Min_value; + public int Y_abs() {return y_abs;} public Xog_layout_box Y_abs_(int v) {y_abs = v; return this;} private int y_abs = Int_.Min_value; + public int W_abs() {return w_abs;} public Xog_layout_box W_abs_(int v) {w_abs = v; return this;} private int w_abs = Int_.Min_value; + public int H_abs() {return h_abs;} public Xog_layout_box H_abs_(int v) {h_abs = v; return this;} private int h_abs = Int_.Min_value; + public int X_rel() {return x_rel;} public Xog_layout_box X_rel_(int v) {x_rel = v; return this;} private int x_rel = Int_.Min_value; + public int Y_rel() {return y_rel;} public Xog_layout_box Y_rel_(int v) {y_rel = v; return this;} private int y_rel = Int_.Min_value; + public int W_rel() {return w_rel;} public Xog_layout_box W_rel_(int v) {w_rel = v; return this;} private int w_rel = Int_.Min_value; + public int H_rel() {return h_rel;} public Xog_layout_box H_rel_(int v) {h_rel = v; return this;} private int h_rel = Int_.Min_value; public String Text() {return text;} public Xog_layout_box Text_(String v) {text = v; return this;} private String text; public String Font_name() {return font_name;} public Xog_layout_box Font_name_(String v) {font_name = v; return this;} private String font_name; public float Font_size() {return font_size;} public Xog_layout_box Font_size_(float v) {font_size = v; return this;} float font_size = Float_.NaN; public FontStyleAdp Font_style() {return font_style;} public Xog_layout_box Font_style_(FontStyleAdp v) {font_style = v; return this;} FontStyleAdp font_style; public byte Mode() {return mode;} public Xog_layout_box Mode_(byte v) {mode = v; return this;} private byte mode = Mode_rel; public void Adj_size(Rect_ref rect) { - if (w_abs > -1) rect.W_(w_abs); if (w_rel != Int_.MinValue) rect.W_(w_rel + rect.W()); - if (h_abs > -1) rect.H_(h_abs); if (h_rel != Int_.MinValue) rect.H_(h_rel + rect.H()); + if (w_abs > -1) rect.W_(w_abs); if (w_rel != Int_.Min_value) rect.W_(w_rel + rect.W()); + if (h_abs > -1) rect.H_(h_abs); if (h_rel != Int_.Min_value) rect.H_(h_rel + rect.H()); } public void Adj_pos(Rect_ref rect) { - if (x_abs > -1) rect.X_(x_abs); if (x_rel != Int_.MinValue) rect.X_(x_rel + rect.X()); - if (y_abs > -1) rect.Y_(y_abs); if (y_rel != Int_.MinValue) rect.Y_(y_rel + rect.Y()); + if (x_abs > -1) rect.X_(x_abs); if (x_rel != Int_.Min_value) rect.X_(x_rel + rect.X()); + if (y_abs > -1) rect.Y_(y_abs); if (y_rel != Int_.Min_value) rect.Y_(y_rel + rect.Y()); } public void Adj_text(GfuiElem elem) { if (text != null) elem.Text_(text); @@ -63,7 +63,7 @@ public class Xog_layout_box implements GfoInvkAble { else if (ctx.Match(k, Invk_text_)) text = m.ReadStr("v"); else if (ctx.Match(k, Invk_font_name_)) font_name = m.ReadStr("v"); else if (ctx.Match(k, Invk_font_size_)) font_size = m.ReadFloat("v"); - else if (ctx.Match(k, Invk_font_style_)) font_style = FontStyleAdp_.parse_(m.ReadStr("v")); + else if (ctx.Match(k, Invk_font_style_)) font_style = FontStyleAdp_.parse(m.ReadStr("v")); else if (ctx.Match(k, Invk_mode_)) mode = String_.Eq(m.ReadStr("v"), "abs") ? Mode_abs : Mode_rel; else if (ctx.Match(k, Invk_owner)) return owner; else return GfoInvkAble_.Rv_unhandled; diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm.java b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm.java index 7d1d58ed8..bc7cedfb0 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm.java @@ -116,7 +116,7 @@ public class Xog_tab_itm implements GfoInvkAble { this.wiki = (Xowe_wiki)app.Wiki_mgr().Get_by_key_or_make_init_y(url.Wiki_bry()); // NOTE: must update wiki variable; DATE:????-??-??; NOTE: must load wiki; DATE:2015-07-22 if (url.Page_is_main()) url.Page_bry_(wiki.Props().Main_page()); if (url.Vnt_bry() != null) Cur_vnt_(wiki, url.Vnt_bry()); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, url.Page_bry()); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, url.Page_bry()); if (ttl == null) {usr_dlg.Prog_one("", "", "title is invalid: ~{0}", String_.new_u8(url.Raw())); return;} Tab_name_(String_.new_u8(ttl.Full_txt())); usr_dlg.Prog_one("", "", "loading: ~{0}", String_.new_u8(ttl.Raw())); diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java index 8651cb7a3..382d38163 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_itm_edit_mgr.java @@ -79,14 +79,14 @@ public class Xog_tab_itm_edit_mgr { byte[] new_text = Bry_.new_u8(tab.Html_itm().Get_elem_value(Xog_html_itm.Elem_id__xowa_edit_rename_box)); if (Bry_.Len_eq_0(new_text)) return; // no ttl given; exit new_text = Xoa_ttl.Replace_spaces(new_text); // ttls cannot have spaces; only underscores - Xoa_ttl new_ttl = Xoa_ttl.parse_(wiki, new_text); + Xoa_ttl new_ttl = Xoa_ttl.parse(wiki, new_text); int new_ns_id = new_ttl.Ns().Id(); if (new_ns_id != Xow_ns_.Id_main) { win_itm.Usr_dlg().Warn_many("", "", "The new page name must remain in the same namespace"); return; } wiki.Db_mgr().Save_mgr().Data_rename(page, new_ns_id, new_text); - page.Ttl_(Xoa_ttl.parse_(wiki, Bry_.Add(page.Ttl().Ns().Name_db_w_colon(), new_text))); + page.Ttl_(Xoa_ttl.parse(wiki, Bry_.Add(page.Ttl().Ns().Name_db_w_colon(), new_text))); win_itm.Page__mode_(Xopg_view_mode.Tid_read); win_itm.Usr_dlg().Prog_one("", "", "renamed page to {0}", String_.new_u8(page.Ttl().Full_txt_raw())); } diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_mgr.java b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_mgr.java index 0f36c6e80..6a4459664 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_tab_mgr.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_tab_mgr.java @@ -77,8 +77,8 @@ public class Xog_tab_mgr implements GfoEvObj { public Xog_tab_itm Tabs_new_dflt(boolean focus) { boolean active_tab_is_null = this.Active_tab_is_null(); Xowe_wiki cur_wiki = active_tab_is_null ? win.App().Usere().Wiki() : active_tab.Wiki(); - Xoa_ttl ttl = Xoa_ttl.parse_(cur_wiki, Xows_special_meta_.Itm__default_tab.Ttl_bry()); - Xoa_url url = cur_wiki.Utl__url_parser().Parse_by_urlbar(ttl.Full_db_as_str()); + Xoa_ttl ttl = Xoa_ttl.parse(cur_wiki, Xows_special_meta_.Itm__default_tab.Ttl_bry()); + Xoa_url url = cur_wiki.Utl__url_parser().Parse_by_urlbar_or_null(ttl.Full_db_as_str()); if (url == null) throw Err_.new_("url", "invalid url", "url", url); Xog_tab_itm rv = Tabs_new(focus, active_tab_is_null, cur_wiki, Xoae_page.new_(cur_wiki, ttl)); rv.Page_update_ui(); rv.Show_url_bgn(url); @@ -219,7 +219,7 @@ public class Xog_tab_mgr implements GfoEvObj { public void Tabs_new_link(String link, boolean focus) { Xowe_wiki wiki = active_tab.Wiki(); Xog_tab_itm new_tab = Tabs_new(focus, false, wiki, Xoae_page.new_(wiki, active_tab.Page().Ttl())); // NOTE: do not use ttl from link, else middle-clicking pages with anchors won't work; DATE:2015-05-03 - Xoa_url url = wiki.Utl__url_parser().Parse_by_urlbar(link); // NOTE: link must be of form domain/wiki/page; DATE:2014-05-27 + Xoa_url url = wiki.Utl__url_parser().Parse_by_urlbar_or_null(link); if (url == null) return; // NOTE: link must be of form domain/wiki/page; DATE:2014-05-27 new_tab.Show_url_bgn(url); if (focus) tab_mgr.Tabs_select_by_idx(new_tab.Tab_idx()); diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm.java b/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm.java index 126c9eabf..b51318760 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm.java @@ -170,7 +170,8 @@ public class Xog_win_itm implements GfoInvkAble, GfoEvObj { public void Page__navigate_by_search() {Page__navigate_by_url_bar(app.Gui_mgr().Win_cfg().Search_box_fmtr().Bld_str_many(search_box.Text()));} public void Page__navigate_by_url_bar(String href) { Xog_tab_itm tab = tab_mgr.Active_tab_assert(); - tab.Show_url_bgn(tab.Wiki().Utl__url_parser().Parse_by_urlbar(href)); + Xoa_url url = tab.Wiki().Utl__url_parser().Parse_by_urlbar_or_null(href); if (url == null) return; + tab.Show_url_bgn(url); } private void Page__navigate_by_href(Xog_tab_itm tab, String href) { // NOTE: different from Navigate_by_url_bar in that it handles "file:///" and other @gplx.Internal protected formats; EX: "/site/", "about:blank"; etc.. Xoa_url url = Xog_url_wkr.Exec_url(this, href); @@ -250,9 +251,9 @@ public class Xog_win_itm implements GfoInvkAble, GfoEvObj { synchronized (App__retrieve__lock) { boolean output_html = String_.Eq(output_str, "html"); Xowe_wiki home_wiki = app.Usere().Wiki(); - Xoa_url url = home_wiki.Utl__url_parser().Parse_by_urlbar(url_str); + Xoa_url url = home_wiki.Utl__url_parser().Parse_by_urlbar_or_null(url_str); if (url == null) return Bry_.Empty; Xowe_wiki wiki = (Xowe_wiki)app.Wiki_mgr().Get_by_key_or_make_init_y(url.Wiki_bry()); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, url.Page_bry()); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, url.Page_bry()); Xoae_page new_page = wiki.Load_page_by_ttl(url, ttl); if (new_page.Missing()) {return Bry_.Empty;} gplx.xowa.servers.Gxw_html_server.Assert_tab(app, new_page); // HACK: assert at least 1 tab for Firefox addon; DATE:2015-01-23 @@ -271,7 +272,7 @@ public class Xog_win_itm implements GfoInvkAble, GfoEvObj { this.kit = kit; win_box = kit.New_win_app("win"); sync_cmd = win_box.Kit().New_cmd_sync(this); - Io_url img_dir = app.Usere().Fsys_mgr().App_img_dir().GenSubDir_nest("window", "chrome"); + Io_url img_dir = app.Fsys_mgr().Bin_xowa_file_dir().GenSubDir_nest("app.window"); FontAdp ui_font = app.Gui_mgr().Win_cfg().Font().XtoFontAdp(); go_bwd_btn = Xog_win_itm_.new_btn(app, kit, win_box, img_dir, "go_bwd_btn", "go_bwd.png" ); go_fwd_btn = Xog_win_itm_.new_btn(app, kit, win_box, img_dir, "go_fwd_btn", "go_fwd.png" ); diff --git a/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm_.java b/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm_.java index a57c569e4..db627f9f2 100644 --- a/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm_.java +++ b/400_xowa/src/gplx/xowa/gui/views/Xog_win_itm_.java @@ -28,8 +28,7 @@ public class Xog_win_itm_ { app.Usere().Cfg_mgr().Startup_mgr().Window_mgr().Init_window(win_box); win.Resizer().Exec_win_resize(app, win_box.Width(), win_box.Height()); - IconAdp.regy_loadDir_shallow(app.Usere().Fsys_mgr().Root_dir().GenSubDir_nest("app", "img", "win")); - win_box.Icon_(IconAdp.regy_("xowa.app")); + win_box.Icon_(IconAdp.file_or_blank(app.Fsys_mgr().Bin_xowa_dir().GenSubFil_nest("file", "app.window", "app_icon.png"))); } public static GfuiBtn new_btn(Xoae_app app, Gfui_kit kit, GfuiWin win, Io_url img_dir, String id, String file) { GfuiBtn rv = kit.New_btn(id, win); diff --git a/400_xowa/src/gplx/xowa/html/Xoh_cfg_file.java b/400_xowa/src/gplx/xowa/html/Xoh_cfg_file.java index c727a1324..d6c2c8ad3 100644 --- a/400_xowa/src/gplx/xowa/html/Xoh_cfg_file.java +++ b/400_xowa/src/gplx/xowa/html/Xoh_cfg_file.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.xowa.html; import gplx.*; import gplx.xowa.*; public class Xoh_cfg_file { public Xoh_cfg_file(Url_encoder url_encoder, Io_url xowa_dir) { - Io_url mw_file_dir = xowa_dir.GenSubDir_nest("file", "mw.file"); + Io_url mw_file_dir = xowa_dir.GenSubDir_nest("file", "mediawiki.file"); img_media_play_btn = url_encoder.Encode_http(mw_file_dir.GenSubFil("play.png")); img_media_info_btn = url_encoder.Encode_http(mw_file_dir.GenSubFil("info.png")); img_thumb_magnify = url_encoder.Encode_http(mw_file_dir.GenSubFil("magnify-clip.png")); diff --git a/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_tst.java b/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_tst.java index 600856e6e..897abcb43 100644 --- a/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_tst.java +++ b/400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr_tst.java @@ -48,10 +48,10 @@ class Xoh_page_wtr_wkr_fxt { } private Bry_bfr tmp_bfr = Bry_bfr.reset_(255); private Xowe_wiki wiki; public Xoae_app App() {return app;} private Xoae_app app; public void Test_page_name_by_display(String ttl, String display, String expd) { - Tfds.Eq(expd, String_.new_a7(Xoh_page_wtr_wkr_.Bld_page_name(tmp_bfr, Xoa_ttl.parse_(wiki, Bry_.new_a7(ttl)), Bry_.new_a7(display)))); + Tfds.Eq(expd, String_.new_a7(Xoh_page_wtr_wkr_.Bld_page_name(tmp_bfr, Xoa_ttl.parse(wiki, Bry_.new_a7(ttl)), Bry_.new_a7(display)))); } public void Test_page_name_by_ttl(String raw, String expd) { - Tfds.Eq(expd, String_.new_a7(Xoh_page_wtr_wkr_.Bld_page_name(tmp_bfr, Xoa_ttl.parse_(wiki, Bry_.new_a7(raw)), null))); + Tfds.Eq(expd, String_.new_a7(Xoh_page_wtr_wkr_.Bld_page_name(tmp_bfr, Xoa_ttl.parse(wiki, Bry_.new_a7(raw)), null))); } public void Test_edit(String raw, String expd) { wiki.Html_mgr().Page_wtr_mgr().Html_capable_(true); @@ -65,7 +65,7 @@ class Xoh_page_wtr_wkr_fxt { public void Test_read(String page_name, String page_text, String expd) { wiki.Html_mgr().Page_wtr_mgr().Html_capable_(true); Xoae_page page = wiki.Ctx().Cur_page(); - page.Ttl_(Xoa_ttl.parse_(wiki, Bry_.new_a7(page_name))); + page.Ttl_(Xoa_ttl.parse(wiki, Bry_.new_a7(page_name))); page.Data_raw_(Bry_.new_u8(page_text)); Xohe_page_wtr_mgr mgr = wiki.Html_mgr().Page_wtr_mgr(); Xoh_page_wtr_wkr wkr = mgr.Wkr(Xopg_view_mode.Tid_read).Page_(page).Mgr_(mgr); diff --git a/400_xowa/src/gplx/xowa/html/Xow_html_mgr.java b/400_xowa/src/gplx/xowa/html/Xow_html_mgr.java index df1e07ad8..6cec81b0e 100644 --- a/400_xowa/src/gplx/xowa/html/Xow_html_mgr.java +++ b/400_xowa/src/gplx/xowa/html/Xow_html_mgr.java @@ -24,11 +24,11 @@ public class Xow_html_mgr implements GfoInvkAble { html_wtr = new Xoh_html_wtr(wiki, this); Xoae_app app = wiki.Appe(); page_wtr_mgr = new Xohe_page_wtr_mgr(app.Gui_mgr().Kit().Tid() != gplx.gfui.Gfui_kit_.Swing_tid); // reverse logic to handle swt,drd but not mem - Io_url file_dir = app.Usere().Fsys_mgr().App_img_dir().GenSubDir_nest("file"); + Io_url file_dir = app.Fsys_mgr().Bin_xowa_file_dir().GenSubDir_nest("mediawiki.file"); img_media_play_btn = Xoa_app_.Utl__encoder_mgr().Fsys().Encode_http(file_dir.GenSubFil("play.png")); img_media_info_btn = Xoa_app_.Utl__encoder_mgr().Fsys().Encode_http(file_dir.GenSubFil("info.png")); img_thumb_magnify = Xoa_app_.Utl__encoder_mgr().Fsys().Encode_http(file_dir.GenSubFil("magnify-clip.png")); - img_xowa_protocol = Xoa_app_.Utl__encoder_mgr().Fsys().Encode_http(app.Usere().Fsys_mgr().App_img_dir().GenSubFil_nest("xowa", "protocol.png")); + img_xowa_protocol = Xoa_app_.Utl__encoder_mgr().Fsys().Encode_http(app.Fsys_mgr().Bin_xowa_file_dir().GenSubFil_nest("app.general", "xowa_exec.png")); portal_mgr = new Xow_portal_mgr(wiki); imgs_mgr = new Xoh_imgs_mgr(this); module_mgr = new Xow_module_mgr(wiki); diff --git a/400_xowa/src/gplx/xowa/html/bridges/Bridge_cmd_mgr.java b/400_xowa/src/gplx/xowa/html/bridges/Bridge_cmd_mgr.java index 702426331..ba96824c6 100644 --- a/400_xowa/src/gplx/xowa/html/bridges/Bridge_cmd_mgr.java +++ b/400_xowa/src/gplx/xowa/html/bridges/Bridge_cmd_mgr.java @@ -18,7 +18,9 @@ along with this program. If not, see . package gplx.xowa.html.bridges; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; import gplx.core.json.*; public class Bridge_cmd_mgr { + private final Json_parser parser; private final Hash_adp_bry cmd_hash = Hash_adp_bry.cs(); + public Bridge_cmd_mgr(Json_parser parser) {this.parser = parser;} public void Add(Bridge_cmd_itm cmd) {cmd_hash.Add_bry_obj(cmd.Key(), cmd);} public String Exec(GfoMsg m) { if (m.Args_count() == 0) throw Err_.new_("bridge.cmds", "no json specified for json_exec"); @@ -26,9 +28,9 @@ public class Bridge_cmd_mgr { } public String Exec(byte[] jdoc_bry) { Json_doc jdoc = null; - try {jdoc = Json_doc.new_(jdoc_bry);} + try {jdoc = parser.Parse(jdoc_bry);} catch (Exception e) {throw Err_.new_exc(e, "bridge.cmds", "invalid json", "json", jdoc_bry);} - Json_nde msg = jdoc.Root(); + Json_nde msg = jdoc.Root_nde(); byte[] key_bry = msg.Get_bry(Key_cmd); Bridge_cmd_itm cmd = (Bridge_cmd_itm)cmd_hash.Get_by_bry(key_bry); if (cmd == null) throw Err_.new_("bridge.cmds", "unknown cmd", "cmd", cmd); try {return cmd.Exec(msg.Get(Key_data));} diff --git a/400_xowa/src/gplx/xowa/html/bridges/Bridge_msg_bldr.java b/400_xowa/src/gplx/xowa/html/bridges/Bridge_msg_bldr.java index 629c222d6..25de1cfd4 100644 --- a/400_xowa/src/gplx/xowa/html/bridges/Bridge_msg_bldr.java +++ b/400_xowa/src/gplx/xowa/html/bridges/Bridge_msg_bldr.java @@ -83,8 +83,8 @@ public class Bridge_msg_bldr { Gfo_tree_data sub_kv = (Gfo_tree_data)itm; String key = sub_kv.Key(); Object val = sub_kv.Val(); switch (sub_kv.Val_tid()) { - case Type_adp_.Tid__bool: wtr.Kv_bool(key, Bool_.cast_(val)); break; - case Type_adp_.Tid__int: wtr.Kv_int(key, Int_.cast_(val)); break; + case Type_adp_.Tid__bool: wtr.Kv_bool(key, Bool_.cast(val)); break; + case Type_adp_.Tid__int: wtr.Kv_int(key, Int_.cast(val)); break; case Type_adp_.Tid__bry: wtr.Kv_bry(key, (byte[])val); break; default: wtr.Kv_str(key, Object_.Xto_str_strict_or_null_mark(val)); break; } diff --git a/400_xowa/src/gplx/xowa/html/bridges/Xoh_bridge_mgr.java b/400_xowa/src/gplx/xowa/html/bridges/Xoh_bridge_mgr.java index 31252090c..2ffa4b1f1 100644 --- a/400_xowa/src/gplx/xowa/html/bridges/Xoh_bridge_mgr.java +++ b/400_xowa/src/gplx/xowa/html/bridges/Xoh_bridge_mgr.java @@ -16,8 +16,10 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ package gplx.xowa.html.bridges; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; +import gplx.core.json.*; import gplx.xowa.html.bridges.dbuis.tbls.*; public class Xoh_bridge_mgr { - public Bridge_cmd_mgr Cmd_mgr() {return cmd_mgr;} private final Bridge_cmd_mgr cmd_mgr = new Bridge_cmd_mgr(); + public Xoh_bridge_mgr(Json_parser parser) {this.cmd_mgr = new Bridge_cmd_mgr(parser);} + public Bridge_cmd_mgr Cmd_mgr() {return cmd_mgr;} private final Bridge_cmd_mgr cmd_mgr; public Bridge_msg_bldr Msg_bldr() {return msg_bldr;} private final Bridge_msg_bldr msg_bldr = new Bridge_msg_bldr(); } diff --git a/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java b/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java index 9198aebec..297680b55 100644 --- a/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/html/hdumps/abrvs/Xohd_abrv_mgr_tst.java @@ -37,7 +37,7 @@ public class Xohd_abrv_mgr_tst { ( "" , " " )); @@ -48,7 +48,7 @@ public class Xohd_abrv_mgr_tst { ( "" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" )); @@ -59,7 +59,7 @@ public class Xohd_abrv_mgr_tst { ( "" , " " )); diff --git a/400_xowa/src/gplx/xowa/html/hrefs/Xoh_href_wtr_tst.java b/400_xowa/src/gplx/xowa/html/hrefs/Xoh_href_wtr_tst.java index c7d3f87a2..f4f6cc24c 100644 --- a/400_xowa/src/gplx/xowa/html/hrefs/Xoh_href_wtr_tst.java +++ b/400_xowa/src/gplx/xowa/html/hrefs/Xoh_href_wtr_tst.java @@ -52,7 +52,7 @@ class Xoh_href_wtr_fxt { } public Xoh_href_wtr_fxt Prep_xwiki_by_many(String raw) {wiki.Xwiki_mgr().Add_many(Bry_.new_u8(raw)); return this;} // need to add to wiki's xwiki_mgr for ttl_parse public void Test_build(String raw, String expd) { - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Bry_.new_u8(raw)); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Bry_.new_u8(raw)); href_wtr.Build_to_bfr(tmp_bfr, app, wiki.Domain_bry(), ttl); Tfds.Eq(expd, tmp_bfr.Xto_str_and_clear()); } diff --git a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int_.java b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int_.java index 7afb2f1e2..7b75681a6 100644 --- a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int_.java +++ b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int_.java @@ -28,7 +28,7 @@ public class Xow_hzip_int_ { public static void Save_bin_int_abrv(Bry_bfr bfr, int val_int) { // save int in binary little endian form; range from -2,080,766,977 to 2,147,483,648; 255^4 or 4,228,250,625 if (val_int == 0) {bfr.Add_byte(Byte_ascii.Null); return;} long val = val_int; - if (val < 0) val = Int_.MaxValue + -val; + if (val < 0) val = Int_.Max_value + -val; int count = 0; while (val > 0) { byte mod = (byte)(val % Base_255_int); @@ -54,8 +54,8 @@ public class Xow_hzip_int_ { mult *= Base_255_int; } } - if (rv > Int_.MaxValue) { - rv -= Int_.MaxValue; + if (rv > Int_.Max_value) { + rv -= Int_.Max_value; rv *= -1; } count_ref.Val_(count); diff --git a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int__tst.java b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int__tst.java index cb641c223..35c560dff 100644 --- a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int__tst.java +++ b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_int__tst.java @@ -33,7 +33,7 @@ public class Xow_hzip_int__tst { fxt.Test_srl( 16646655, 255, 255, 255, 0); fxt.Test_srl( 16646656, 1, 1, 1, 1); fxt.Test_srl( 16646657, 2, 1, 1, 1); - fxt.Test_srl(Int_.MaxValue, 127, 129, 130, 129); + fxt.Test_srl(Int_.Max_value, 127, 129, 130, 129); fxt.Test_srl( -1, 128, 129, 130, 129); fxt.Test_srl( -2, 129, 129, 130, 129); } diff --git a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java index da4ffb687..eb6acdc78 100644 --- a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java +++ b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor.java @@ -119,6 +119,7 @@ public class Xow_hzip_itm__anchor { int href_bgn = Bry_finder.Find_fwd(src, Find_href_bry, pos, src_len); if (href_bgn == Bry_finder.Not_found) return hzip_mgr.Warn_by_pos_add_dflt("a.href_missing", bgn, pos); href_bgn += Find_href_len; int href_end = Bry_finder.Find_fwd(src, Byte_ascii.Quote, href_bgn, src_len); if (href_end == Bry_finder.Not_found) return hzip_mgr.Warn_by_pos_add_dflt("a.href_missing", bgn, href_bgn); + int bfr_bgn = bfr.Len(); bfr.Add_byte(Xow_hzip_dict.Escape).Add_byte(xtid); bfr.Add_mid(src, href_bgn, href_end); bfr.Add_byte(Xow_hzip_dict.Escape); @@ -129,7 +130,11 @@ public class Xow_hzip_itm__anchor { return a_rhs_bgn + Find_a_rhs_bgn_len; } case Xow_hzip_dict.Tid_lnke_brk_text_n: { - int a_lhs_end = Bry_finder.Find_fwd(src, Byte_ascii.Gt, href_end, src_len); if (a_lhs_end == Bry_finder.Not_found) return hzip_mgr.Warn_by_pos_add_dflt("a.a_lhs_end_missing", bgn, href_end); + int a_lhs_end = Bry_finder.Find_fwd(src, Byte_ascii.Gt, href_end, src_len); if (a_lhs_end == Bry_finder.Not_found) return hzip_mgr.Warn_by_pos_add_dflt("a.a_lhs_end_missing", bgn, href_end); + if (src[a_lhs_end + 1] != Byte_ascii.Brack_bgn) { // check if next char is [; DATE:2015-08-25 + bfr.Delete_rng_to_end(bfr_bgn); // delete from start and exit; + return Xow_hzip_mgr.Unhandled; + } int num_bgn = a_lhs_end + 2; // skip >[ int num_end = Bry_finder.Find_fwd(src, Byte_ascii.Brack_end, num_bgn, src_len); if (num_end == Bry_finder.Not_found) return hzip_mgr.Warn_by_pos_add_dflt("a.num_end_missing", bgn, href_end); int num = Bry_.To_int_or(src, num_bgn, num_end, -1); if (num == -1) return hzip_mgr.Warn_by_pos_add_dflt("a.num_invalid", num_bgn, num_end); diff --git a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor_tst.java b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor_tst.java index c745b2a99..df11d3334 100644 --- a/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor_tst.java +++ b/400_xowa/src/gplx/xowa/html/hzips/Xow_hzip_itm__anchor_tst.java @@ -95,6 +95,11 @@ public class Xow_hzip_itm__anchor_tst { fxt.Test_save(brys, "[123]"); fxt.Test_load(brys, "[123]"); } + @Test public void Srl_lnke_brk_n__tidy() { // PURPOSE:handle reparenting of html elements by HTML tidy EX:[http://a.org]; DATE:2015-08-25 + String raw_bgn = "[123]"; + byte[][] brys = Bry_.Ary(Bry_.new_u8(raw_bgn), Xow_hzip_dict.Bry_a_rhs); + fxt.Test_save(brys, raw_bgn + ""); + } @Test public void Html_lnki_ttl() { fxt.Test_html("[[A]]", "A"); } diff --git a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java index f3504815d..3836ba2db 100644 --- a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java +++ b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk.java @@ -48,7 +48,7 @@ public class Xoh_js_cbk implements GfoInvkAble { Xop_ctx ctx = wiki.Ctx(); boolean old_para_enabled = ctx.Para().Enabled(); byte[] raw = Bry_.new_u8(m.Args_getAt(0).Val_to_str_or_empty()); - boolean para_enabled = m.Args_count() < 2 ? false : Bool_.parse_(m.Args_getAt(1).Val_to_str_or_empty()); + boolean para_enabled = m.Args_count() < 2 ? false : Bool_.parse(m.Args_getAt(1).Val_to_str_or_empty()); try { wiki.Ctx().Para().Enabled_(para_enabled); wiki.Parser().Parse_text_to_wdom(root, wiki.Ctx(), wiki.Ctx().Tkn_mkr(), raw, 0); @@ -63,7 +63,7 @@ public class Xoh_js_cbk implements GfoInvkAble { private String Get_page(GfoMsg m) { Xowe_wiki wiki = html_itm.Owner_tab().Wiki(); try { - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, m.Args_getAt(0).Val_to_bry()); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, m.Args_getAt(0).Val_to_bry()); Xoae_page page = wiki.Data_mgr().Get_page(ttl, false); return String_.new_u8(page.Data_raw()); } catch (Exception e) {Err_.Noop(e); return null;} @@ -77,7 +77,7 @@ public class Xoh_js_cbk implements GfoInvkAble { } private String Popups_get_html(GfoMsg m) { try { - int popups_id = Int_.Xby_double_(Double_.cast_(m.Args_getAt(0).Val())); + int popups_id = Int_.Xby_double_(Double_.cast(m.Args_getAt(0).Val())); byte[] href_bry = m.Args_getAt(1).Val_to_bry(); byte[] tooltip_bry = m.Args_getAt(2).Val_to_bry(); return html_itm.Owner_tab().Wiki().Html_mgr().Head_mgr().Popup_mgr().Show_init(popups_id, href_bry, tooltip_bry); @@ -86,10 +86,10 @@ public class Xoh_js_cbk implements GfoInvkAble { private String[] Get_title_meta(Xowe_wiki wiki, byte[] ttl_bry) { synchronized (tmp_page) { tmp_page.Clear(); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ttl_bry); wiki.Db_mgr().Load_mgr().Load_by_ttl(tmp_page, ttl.Ns(), ttl.Page_db()); } - return String_.Ary(tmp_page.Exists() ? "1" : "0", Int_.Xto_str(tmp_page.Id()), Int_.Xto_str(tmp_page.Ns_id()), String_.new_u8(tmp_page.Ttl_page_db()), Bool_.Xto_str_lower(tmp_page.Redirected()), tmp_page.Modified_on().XtoStr_fmt("yyyy-MM-dd HH:mm:ss"), Int_.Xto_str(tmp_page.Text_len())); + return String_.Ary(tmp_page.Exists() ? "1" : "0", Int_.Xto_str(tmp_page.Id()), Int_.Xto_str(tmp_page.Ns_id()), String_.new_u8(tmp_page.Ttl_page_db()), Bool_.To_str_lower(tmp_page.Redirected()), tmp_page.Modified_on().XtoStr_fmt("yyyy-MM-dd HH:mm:ss"), Int_.Xto_str(tmp_page.Text_len())); } private static final Xowd_page_itm tmp_page = Xowd_page_itm.new_tmp(); private String[][] Get_titles_meta(GfoMsg m) { Xowe_wiki wiki = html_itm.Owner_tab().Wiki(); diff --git a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_tst.java b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_tst.java index 2f4e905d5..7df239022 100644 --- a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_tst.java +++ b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_tst.java @@ -22,8 +22,8 @@ public class Xoh_js_cbk_tst { @Before public void init() {fxt.Clear();} private Xoh_js_cbk_fxt fxt = new Xoh_js_cbk_fxt(); @Test public void Get_title() { fxt.Fxt().Init_page_create("exists"); - fxt.Test_get_title("exists", "1" , "0" , Int_.Xto_str(Int_.MinValue), "Exists", "false", "0001-01-01 00:00:00", "0"); - fxt.Test_get_title("absent", "0", "-1", Int_.Xto_str(Int_.MinValue), null , "false", "0001-01-01 00:00:00", "0"); + fxt.Test_get_title("exists", "1" , "0" , Int_.Xto_str(Int_.Min_value), "Exists", "false", "0001-01-01 00:00:00", "0"); + fxt.Test_get_title("absent", "0", "-1", Int_.Xto_str(Int_.Min_value), null , "false", "0001-01-01 00:00:00", "0"); } } class Xoh_js_cbk_fxt { @@ -35,7 +35,7 @@ class Xoh_js_cbk_fxt { public void Test_get_title(String ttl, Object... expd) { Xoae_app app = fxt.App(); Xowe_wiki wiki = fxt.Wiki(); - Xoae_page page = Xoae_page.test_(wiki, Xoa_ttl.parse_(wiki, Bry_.new_a7("mock_page"))); + Xoae_page page = Xoae_page.test_(wiki, Xoa_ttl.parse(wiki, Bry_.new_a7("mock_page"))); Xog_tab_itm tab = app.Gui_mgr().Browser_win().Active_tab(); tab.Page_(page); Xoh_js_cbk exec = tab.Html_itm().Js_cbk(); diff --git a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_wdata_labels_tst.java b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_wdata_labels_tst.java index ab04ea76f..8973f9291 100644 --- a/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_wdata_labels_tst.java +++ b/400_xowa/src/gplx/xowa/html/js/Xoh_js_cbk_wdata_labels_tst.java @@ -16,9 +16,9 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ package gplx.xowa.html.js; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; -import org.junit.*; import gplx.xowa.xtns.wdatas.*; +import org.junit.*; import gplx.core.json.*; import gplx.xowa.xtns.wdatas.*; public class Xoh_js_cbk_wdata_labels_tst { - @Before public void init() {fxt.Init();} Wdata_wiki_mgr_fxt fxt = new Wdata_wiki_mgr_fxt(); + @Before public void init() {fxt.Init();} private final Wdata_wiki_mgr_fxt fxt = new Wdata_wiki_mgr_fxt(); @Test public void Basic() { fxt.Init_pages_add(fxt.Wdoc_bldr("q1").Add_label("en", "en_q1").Xto_wdoc()); fxt.Init_pages_add(fxt.Wdoc_bldr("q2").Add_label("en", "en_q2").Xto_wdoc()); @@ -45,9 +45,9 @@ public class Xoh_js_cbk_wdata_labels_tst { Tst_wikidata_label_get(String_.Ary("en", "q1"), String_.Ary("\ta")); } private Wdata_doc doc_(String qid, String src) { - gplx.core.json.Json_doc doc = gplx.core.json.Json_doc.new_apos_(src); + Json_doc jdoc = fxt.Make_json(src); Xoae_app app = Xoa_app_fxt.app_(); - Wdata_doc rv = new Wdata_doc(Bry_.new_a7(qid), app.Wiki_mgr().Wdata_mgr(), doc); + Wdata_doc rv = new Wdata_doc(Bry_.new_a7(qid), app.Wiki_mgr().Wdata_mgr(), jdoc); return rv; } private void Tst_wikidata_label_get(String[] args, String[] expd) { diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_audio_video_tst.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_audio_video_tst.java index b07a41ec7..aa5c08f47 100644 --- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_audio_video_tst.java +++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_audio_video_tst.java @@ -25,7 +25,7 @@ public class Xoh_file_wtr_audio_video_tst { ( "
" , " " , "
" @@ -46,7 +46,7 @@ public class Xoh_file_wtr_audio_video_tst { , " " , " " , " " @@ -61,19 +61,19 @@ public class Xoh_file_wtr_audio_video_tst { , "
" , " " , " " , "
" , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " a" @@ -99,7 +99,7 @@ public class Xoh_file_wtr_audio_video_tst { ( "
" , " " , "
" @@ -123,7 +123,7 @@ public class Xoh_file_wtr_audio_video_tst { , "
" , " " , " " @@ -139,19 +139,19 @@ public class Xoh_file_wtr_audio_video_tst { , "
" , " " , " " , "
" , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " a" @@ -177,14 +177,14 @@ public class Xoh_file_wtr_audio_video_tst { , "
" , " " , " " , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " a" @@ -211,14 +211,14 @@ public class Xoh_file_wtr_audio_video_tst { , "
" , " " , " " , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " a" diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_basic_tst.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_basic_tst.java index eb8d2e583..f5f43ecae 100644 --- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_basic_tst.java +++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_basic_tst.java @@ -68,7 +68,7 @@ public class Xoh_file_wtr_basic_tst { , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " b" @@ -88,7 +88,7 @@ public class Xoh_file_wtr_basic_tst { , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " b" @@ -108,7 +108,7 @@ public class Xoh_file_wtr_basic_tst { , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " b" @@ -147,7 +147,7 @@ public class Xoh_file_wtr_basic_tst { , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " " @@ -172,7 +172,7 @@ public class Xoh_file_wtr_basic_tst { , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " a" // no pre diff --git a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_media_tst.java b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_media_tst.java index 496911906..d04c0597c 100644 --- a/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_media_tst.java +++ b/400_xowa/src/gplx/xowa/html/lnkis/Xoh_file_wtr_media_tst.java @@ -28,7 +28,7 @@ public class Xoh_file_wtr_media_tst { , "
" , "
" , " " - , " \"\"" + , " \"\"" , " " , "
" , " b " diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_itm.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_itm.java index c2c373477..0f3960b54 100644 --- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_itm.java +++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_itm.java @@ -35,7 +35,7 @@ public class Xow_popup_itm implements Cancelable { public boolean Mode_all() {return mode == Mode_tid_all;} public Xow_popup_itm Mode_all_() { mode = Mode_tid_all; - words_needed = Int_.MaxValue; + words_needed = Int_.Max_value; return this; } public String Popup_id() {return popup_id;} private String popup_id; diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_mgr.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_mgr.java index f60d48e16..f05764372 100644 --- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_mgr.java +++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_mgr.java @@ -121,7 +121,7 @@ public class Xow_popup_mgr implements GfoInvkAble, GfoEvObj { if (!Xoa_url_.Tid_is_pagelike(tmp_url.Tid())) return Bry_.Empty; // NOTE: do not get popups for "file:///"; DATE:2015-04-05 Xowe_wiki popup_wiki = app.Wiki_mgr().Get_by_key_or_null(tmp_url.Wiki_bry()); popup_wiki.Init_assert(); - Xoa_ttl popup_ttl = Xoa_ttl.parse_(popup_wiki, tmp_url.To_bry_page_w_anch()); + Xoa_ttl popup_ttl = Xoa_ttl.parse(popup_wiki, tmp_url.To_bry_page_w_anch()); switch (popup_ttl.Ns().Id()) { case Xow_ns_.Id_media: case Xow_ns_.Id_file: @@ -276,7 +276,7 @@ class Load_popup_wkr implements Gfo_thread_wkr { if (!Xoa_url_.Tid_is_pagelike(tmp_url.Tid())) return; // NOTE: do not get popups for "file:///"; DATE:2015-04-05 Xowe_wiki popup_wiki = app.Wiki_mgr().Get_by_key_or_null(tmp_url.Wiki_bry()); popup_wiki.Init_assert(); - Xoa_ttl popup_ttl = Xoa_ttl.parse_(popup_wiki, tmp_url.To_bry_page_w_anch()); + Xoa_ttl popup_ttl = Xoa_ttl.parse(popup_wiki, tmp_url.To_bry_page_w_anch()); switch (popup_ttl.Ns().Id()) { case Xow_ns_.Id_media: case Xow_ns_.Id_file: diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java index 3b77802cd..34107028c 100644 --- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java +++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java @@ -33,7 +33,7 @@ public class Xow_popup_parser { public Xop_keeplist_wiki Tmpl_keeplist() {return tmpl_keeplist;} private Xop_keeplist_wiki tmpl_keeplist; // private byte[] tmpl_keeplist_bry = Bry_.Empty; public Xop_ctx Wtxt_ctx() {return wtxt_ctx;} private Xop_ctx wtxt_ctx; public void Tmpl_tkn_max_(int v) { - if (v < 0) v = Int_.MaxValue; // allow -1 as shortcut to deactivate + if (v < 0) v = Int_.Max_value; // allow -1 as shortcut to deactivate tmpl_ctx.Tmpl_tkn_max_(v); wtxt_ctx.Tmpl_tkn_max_(v); } diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java index b43d2d1e9..0117f05b1 100644 --- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java +++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_data.java @@ -41,7 +41,7 @@ public class Xow_popup_parser_data { words_needed_val = words_needed_max = popup_itm.Words_needed(); switch (popup_itm.Mode()) { case Xow_popup_itm.Mode_tid_all: - tmpl_max = Int_.MaxValue; + tmpl_max = Int_.Max_value; break; case Xow_popup_itm.Mode_tid_init: case Xow_popup_itm.Mode_tid_more: diff --git a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_tst.java b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_tst.java index 71278412a..81f987312 100644 --- a/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_tst.java +++ b/400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser_tst.java @@ -497,7 +497,7 @@ class Xop_popup_parser_fxt { } public void Test_parse(String raw, String expd) {Test_parse(raw, "Test_1", expd);} public void Test_parse(String raw, String ttl, String expd) { - Xoae_page page = Xoae_page.create_(wiki, Xoa_ttl.parse_(wiki, Bry_.new_a7(ttl))); + Xoae_page page = Xoae_page.create_(wiki, Xoa_ttl.parse(wiki, Bry_.new_a7(ttl))); page.Data_raw_(Bry_.new_u8(raw)); Xow_popup_itm itm = new Xow_popup_itm(1, Bry_.new_u8(raw), Bry_.Empty, word_min); itm.Init(wiki.Domain_bry(), page.Ttl()); diff --git a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr_tst.java b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr_tst.java index 0efde9bcb..e225770fa 100644 --- a/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/html/ns_files/Xoh_ns_file_page_mgr_tst.java @@ -58,7 +58,7 @@ public class Xoh_ns_file_page_mgr_tst { , "" @@ -77,7 +77,7 @@ public class Xoh_ns_file_page_mgr_tst { , "
" , " " , "
" @@ -103,14 +103,14 @@ class Xoh_ns_file_page_mgr_fxt { } public void tst(String expd) { byte[] ttl_bry = Bry_.new_u8(ttl_str); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ttl_bry); file.Init_at_gallery_end(html_w, html_h, Io_url_.mem_fil_(html_src), Io_url_.mem_fil_(html_orig_src)); // file.Orig_ttl_and_redirect_(ttl_bry, Bry_.Empty); file.Init_at_orig(Byte_.Zero, wiki.Domain_bry(), ttl_bry, Xof_ext_.new_by_ttl_(ttl_bry), 0, 0, Bry_.Empty); file.Init_at_hdoc(0, Xof_html_elem.Tid_img); wkr.Bld_html(wiki, bfr, file, ttl, opt, Bry_.To_a7_bry(html_file_size, 0), play_btn_icon); // TEST: must pass in elem_val b/c test only uses 2nd Bld_html while app uses 1st Tfds.Eq_str_lines(expd, bfr.Xto_str_and_clear()); - } static final byte[] play_btn_icon = Bry_.new_a7("file:///mem/xowa/user/test_user/app/img/file/play.png"); + } static final byte[] play_btn_icon = Bry_.new_a7("file:///mem/xowa/bin/any/xowa/file/mediawiki.file/play.png"); public static final String Hdr = String_.Concat_lines_nl_skip_last ( "
    " , "
  • " diff --git a/400_xowa/src/gplx/xowa/html/portal/Xoa_available_wikis_mgr.java b/400_xowa/src/gplx/xowa/html/portal/Xoa_available_wikis_mgr.java index 042555469..94b761092 100644 --- a/400_xowa/src/gplx/xowa/html/portal/Xoa_available_wikis_mgr.java +++ b/400_xowa/src/gplx/xowa/html/portal/Xoa_available_wikis_mgr.java @@ -45,7 +45,7 @@ public class Xoa_available_wikis_mgr implements GfoInvkAble { else if (ctx.Match(k, Invk_itms_refresh)) Itms_reset(); else if (ctx.Match(k, Invk_visible)) return Yn.Xto_str(visible); else if (ctx.Match(k, Invk_visible_)) visible = m.ReadYn("v"); - else if (ctx.Match(k, Invk_visible_toggle)) {visible = !visible; app.Gui_mgr().Browser_win().Active_html_box().Html_js_eval_proc_as_str("xowa-portal-wikis-visible-toggle", Bool_.Xto_str_lower(visible));} + else if (ctx.Match(k, Invk_visible_toggle)) {visible = !visible; app.Gui_mgr().Browser_win().Active_html_box().Html_js_eval_proc_as_str("xowa-portal-wikis-visible-toggle", Bool_.To_str_lower(visible));} else if (ctx.Match(k, Invk_itms_as_html_fmtr_)) itms_as_html_fmtr.Fmt_(m.ReadBry("v")); else return GfoInvkAble_.Rv_unhandled; return this; diff --git a/400_xowa/src/gplx/xowa/html/portal/Xoh_page_body_cls_tst.java b/400_xowa/src/gplx/xowa/html/portal/Xoh_page_body_cls_tst.java index 33692659b..34ecc66ca 100644 --- a/400_xowa/src/gplx/xowa/html/portal/Xoh_page_body_cls_tst.java +++ b/400_xowa/src/gplx/xowa/html/portal/Xoh_page_body_cls_tst.java @@ -48,7 +48,7 @@ class Xoh_page_body_cls_fxt { tmp_bfr = Bry_bfr.reset_(255); wiki.Ns_mgr().Add_new(Wdata_wiki_mgr.Ns_property, Wdata_wiki_mgr.Ns_property_name); } - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Bry_.new_u8(ttl_str)); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Bry_.new_u8(ttl_str)); Tfds.Eq(expd, String_.new_u8(Xoh_page_body_cls.Calc(tmp_bfr, ttl, page_tid))); } } diff --git a/400_xowa/src/gplx/xowa/html/portal/Xoh_subpages_bldr_tst.java b/400_xowa/src/gplx/xowa/html/portal/Xoh_subpages_bldr_tst.java index 3bc00cb4b..888568b01 100644 --- a/400_xowa/src/gplx/xowa/html/portal/Xoh_subpages_bldr_tst.java +++ b/400_xowa/src/gplx/xowa/html/portal/Xoh_subpages_bldr_tst.java @@ -43,7 +43,7 @@ class Xoh_subpages_bldr_fxt { wiki.Ns_mgr().Ids_get_or_null(Xow_ns_.Id_help).Subpages_enabled_(true); } public void Test_bld(String ttl_str, String expd) { - byte[] actl = subpages_bldr.Bld(wiki.Ns_mgr(), Xoa_ttl.parse_(wiki, Bry_.new_u8(ttl_str))); + byte[] actl = subpages_bldr.Bld(wiki.Ns_mgr(), Xoa_ttl.parse(wiki, Bry_.new_u8(ttl_str))); Tfds.Eq_str_lines(expd, String_.new_u8(actl)); } } diff --git a/400_xowa/src/gplx/xowa/html/portal/Xow_portal_mgr_tst.java b/400_xowa/src/gplx/xowa/html/portal/Xow_portal_mgr_tst.java index 391d4bb9f..e17111a83 100644 --- a/400_xowa/src/gplx/xowa/html/portal/Xow_portal_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/html/portal/Xow_portal_mgr_tst.java @@ -40,7 +40,7 @@ class Xowh_portal_mgr_fxt { } } private Xoae_app app; Xowe_wiki wiki; public void Test_div_ns_bry(String ttl, String expd) { - Tfds.Eq(expd, String_.new_a7(wiki.Html_mgr().Portal_mgr().Div_ns_bry(wiki.Utl__bfr_mkr(), Xoa_ttl.parse_(wiki, Bry_.new_a7(ttl)), wiki.Ns_mgr()))); + Tfds.Eq(expd, String_.new_a7(wiki.Html_mgr().Portal_mgr().Div_ns_bry(wiki.Utl__bfr_mkr(), Xoa_ttl.parse(wiki, Bry_.new_a7(ttl)), wiki.Ns_mgr()))); } public void Test_div_personal_bry(String expd) { Tfds.Eq(expd, String_.new_a7(wiki.Html_mgr().Portal_mgr().Div_personal_bry())); diff --git a/400_xowa/src/gplx/xowa/html/wtrs/Xoh_img_path.java b/400_xowa/src/gplx/xowa/html/wtrs/Xoh_img_path.java index 2b7ea25e5..25c3effb6 100644 --- a/400_xowa/src/gplx/xowa/html/wtrs/Xoh_img_path.java +++ b/400_xowa/src/gplx/xowa/html/wtrs/Xoh_img_path.java @@ -18,10 +18,10 @@ along with this program. If not, see . package gplx.xowa.html.wtrs; import gplx.*; import gplx.xowa.*; import gplx.xowa.html.*; public class Xoh_img_path { public static final byte[] - Img_cancel = Bry_.new_a7("window/menu/file/cancel.png") // 32,32 - , Img_search = Bry_.new_a7("window/chrome/search_exec.png") - , Img_option = Bry_.new_a7("window/menu/tools/options.png") - , Img_go_bwd = Bry_.new_a7("window/paging/go_bwd.png") - , Img_go_fwd = Bry_.new_a7("window/paging/go_fwd.png") + Img_cancel = Bry_.new_a7("app.general/cancel.png") // 32,32 + , Img_go_bwd = Bry_.new_a7("app.general/go_bwd.png") + , Img_go_fwd = Bry_.new_a7("app.general/go_fwd.png") + , Img_search = Bry_.new_a7("app.window/search_exec.png") + , Img_option = Bry_.new_a7("app.menu/tools/options.png") ; } diff --git a/400_xowa/src/gplx/xowa/html/wtrs/Xoh_lnki_bldr.java b/400_xowa/src/gplx/xowa/html/wtrs/Xoh_lnki_bldr.java index fa524c7df..abe526a1f 100644 --- a/400_xowa/src/gplx/xowa/html/wtrs/Xoh_lnki_bldr.java +++ b/400_xowa/src/gplx/xowa/html/wtrs/Xoh_lnki_bldr.java @@ -24,7 +24,7 @@ public class Xoh_lnki_bldr { private byte[] img_rel_path; private int img_w, img_h; private boolean img_pos_is_left; public Xoh_lnki_bldr(Xoa_app app, Xoh_href_wtr href_wtr) { this.app = app; this.href_wtr = href_wtr; - this.img_root_dir = app.Fsys_mgr().Root_dir().GenSubDir_nest("user", "anonymous", "app", "img").To_http_file_bry(); + this.img_root_dir = app.Fsys_mgr().Bin_xowa_file_dir().To_http_file_bry(); } public Xoh_lnki_bldr Clear() { href = title = id = caption = null; diff --git a/400_xowa/src/gplx/xowa/langs/cnvs/Xol_cnv_mgr_tst.java b/400_xowa/src/gplx/xowa/langs/cnvs/Xol_cnv_mgr_tst.java index 7c2ada7cd..0edf70aaf 100644 --- a/400_xowa/src/gplx/xowa/langs/cnvs/Xol_cnv_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/langs/cnvs/Xol_cnv_mgr_tst.java @@ -25,7 +25,7 @@ public class Xol_cnv_mgr_tst { fxt.Parser_fxt().Init_page_create("Template:Test_x1", "val"); fxt.Parser_fxt().Test_parse_tmpl_str_test("{{Test_x0}}", "{{test}}", "val"); } - @Test public void Upper_1st() { // PURPOSE: convert should call Xoa_ttl.parse_(), which will upper 1st letter; EX:{{jez-eng|sense}} -> Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06 + @Test public void Upper_1st() { // PURPOSE: convert should call Xoa_ttl.parse(), which will upper 1st letter; EX:{{jez-eng|sense}} -> Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06 fxt.Parser_fxt().Init_page_create("Template:X1", "val"); fxt.Parser_fxt().Test_parse_tmpl_str_test("{{x0}}", "{{test}}", "val"); } @@ -79,7 +79,7 @@ class Xol_cnv_mgr_fxt { } public void Test_convert_by_ttl(String lang_key, String raw, boolean expd) { Xol_lang lang = app.Lang_mgr().Get_by_key_or_new(Bry_.new_a7(lang_key)); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Bry_.new_u8(raw)); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Bry_.new_u8(raw)); Xowd_page_itm page = lang.Vnt_mgr().Convert_ttl(wiki, ttl); if (expd) Tfds.Eq_true(page.Exists()); diff --git a/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr_.java b/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr_.java index 36b66947f..ac0cc7c3c 100644 --- a/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr_.java +++ b/400_xowa/src/gplx/xowa/langs/msgs/Xol_msg_mgr_.java @@ -101,14 +101,14 @@ public class Xol_msg_mgr_ { } private static Xoae_page Get_msg_itm_from_db(Xowe_wiki wiki, Xol_lang lang, byte[] msg_key, byte[] msg_key_sub_root) { byte[] ns_bry = wiki.Ns_mgr().Ns_mediawiki().Name_db_w_colon(); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Bry_.Add(ns_bry, msg_key)); // ttl="MediaWiki:msg_key"; note that there may be "/lang"; EX:pl.d:Wikislownik:Bar/Archiwum_6 and newarticletext/pl + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Bry_.Add(ns_bry, msg_key)); // ttl="MediaWiki:msg_key"; note that there may be "/lang"; EX:pl.d:Wikislownik:Bar/Archiwum_6 and newarticletext/pl Xoae_page rv = ttl == null ? Xoae_page.Empty : wiki.Data_mgr().Get_page_from_msg(ttl); if (rv.Missing()) { // [[MediaWiki:key]] not found; search for [[MediaWiki:key/fallback]] byte[][] fallback_ary = lang.Fallback_bry_ary(); int fallback_ary_len = fallback_ary.length; for (int i = 0; i < fallback_ary_len; i++) { byte[] fallback = fallback_ary[i]; - ttl = Xoa_ttl.parse_(wiki, Bry_.Add(ns_bry, msg_key_sub_root, Slash_bry, fallback)); // ttl="MediaWiki:msg_key/fallback" + ttl = Xoa_ttl.parse(wiki, Bry_.Add(ns_bry, msg_key_sub_root, Slash_bry, fallback)); // ttl="MediaWiki:msg_key/fallback" rv = ttl == null ? Xoae_page.Empty : wiki.Data_mgr().Get_page_from_msg(ttl); if (!rv.Missing()) break; } diff --git a/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_mgr.java b/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_mgr.java index fa73d2c96..75598c997 100644 --- a/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_mgr.java +++ b/400_xowa/src/gplx/xowa/langs/vnts/Xol_vnt_mgr.java @@ -108,7 +108,7 @@ public class Xol_vnt_mgr implements GfoInvkAble { Xol_vnt_converter converter = converter_ary[i]; tmp_bfr.Clear(); if (!converter.Convert_text(tmp_bfr, ttl_bry)) continue; // ttl is not converted for variant; ignore - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ns.Id(), tmp_bfr.Xto_bry_and_clear()); // NOTE: must convert to ttl in order to upper 1st letter; EX:{{jez-eng|sense}} -> Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06 + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ns.Id(), tmp_bfr.Xto_bry_and_clear()); // NOTE: must convert to ttl in order to upper 1st letter; EX:{{jez-eng|sense}} -> Jez-eng; PAGE:sr.w:ДНК DATE:2014-07-06 if (ttl == null) continue; Xowd_page_itm page = new Xowd_page_itm(); page.Ttl_(ns, ttl.Page_db()); diff --git a/400_xowa/src/gplx/xowa/parsers/lnkes/Xoh_lnke_wtr_tst.java b/400_xowa/src/gplx/xowa/parsers/lnkes/Xoh_lnke_wtr_tst.java index b38e39a07..fc27a241d 100644 --- a/400_xowa/src/gplx/xowa/parsers/lnkes/Xoh_lnke_wtr_tst.java +++ b/400_xowa/src/gplx/xowa/parsers/lnkes/Xoh_lnke_wtr_tst.java @@ -25,7 +25,7 @@ public class Xoh_lnke_wtr_tst { @Test public void Caption() {fxt.Test_parse_page_wiki_str("[irc://a b]" , "b");} @Test public void Caption_wtxt() {fxt.Test_parse_page_wiki_str("[irc://a ''b'']" , "b");} @Test public void Xowa_protocol() { - String img = ""; + String img = ""; fxt.Wiki().Sys_cfg().Xowa_proto_enabled_(true); fxt.Test_parse_page_wiki_str("[xowa-cmd:\"a\" z]" , "z" + img + ""); fxt.Test_parse_page_wiki_str("[xowa-cmd:\"a.b('c_d');\" z]" , "z" + img + ""); diff --git a/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr.java b/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr.java index f4a8f1f3c..8c905ffaf 100644 --- a/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr.java +++ b/400_xowa/src/gplx/xowa/parsers/lnkes/Xop_lnke_wkr.java @@ -173,7 +173,7 @@ public class Xop_lnke_wkr implements Xop_ctx_wkr { byte[] xwiki_wiki = xo_url_parser_url.Wiki_bry(); byte[] xwiki_page = xo_url_parser_url.Page_bry(); byte[] ttl_bry = xo_url_parser_url.Page_bry(); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ttl_bry); if (ttl != null && ttl.Wik_itm() != null) { xwiki_wiki = ttl.Wik_itm().Domain_bry(); xwiki_page = ttl.Page_url(); diff --git a/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java b/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java index 8cb4836fe..0c51b83cd 100644 --- a/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java +++ b/400_xowa/src/gplx/xowa/parsers/lnkis/redlinks/Xog_redlink_mgr.java @@ -81,7 +81,7 @@ public class Xog_redlink_mgr implements GfoInvkAble { if (variants_enabled) { Xowd_page_itm vnt_page = vnt_mgr.Convert_ttl(wiki, lnki.Ttl()); if (vnt_page != null) { - Xoa_ttl vnt_ttl = Xoa_ttl.parse_(wiki, lnki.Ttl().Ns().Id(), vnt_page.Ttl_page_db()); + Xoa_ttl vnt_ttl = Xoa_ttl.parse(wiki, lnki.Ttl().Ns().Id(), vnt_page.Ttl_page_db()); html_itm.Html_atr_set(lnki_id, "href", "/wiki/" + String_.new_u8(vnt_ttl.Full_url())); if (!String_.Eq(vnt_mgr.Html_style(), "")) html_itm.Html_atr_set(lnki_id, "style", vnt_mgr.Html_style()); diff --git a/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java b/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java index a34f43d47..8fc3c0458 100644 --- a/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java +++ b/400_xowa/src/gplx/xowa/parsers/logs/Xop_log_basic_wkr.java @@ -68,5 +68,6 @@ public class Xop_log_basic_wkr implements GfoInvkAble { , Tid_timeline = 3 , Tid_score = 4 , Tid_hiero = 5 + , Tid_math = 6 ; } diff --git a/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_basic_tst.java b/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_basic_tst.java index 5496ed4d8..07e9e5d06 100644 --- a/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_basic_tst.java +++ b/400_xowa/src/gplx/xowa/parsers/paras/Xop_para_wkr_basic_tst.java @@ -1062,7 +1062,7 @@ public class Xop_para_wkr_basic_tst { , "
    " , "
    " , " " - , " \"\"" + , " \"\"" , " " , "
    " , " " + caption + "" diff --git a/400_xowa/src/gplx/xowa/parsers/utils/Xop_util.java b/400_xowa/src/gplx/xowa/parsers/utils/Xop_util.java index ad3d480c1..54b64ef02 100644 --- a/400_xowa/src/gplx/xowa/parsers/utils/Xop_util.java +++ b/400_xowa/src/gplx/xowa/parsers/utils/Xop_util.java @@ -28,7 +28,7 @@ public class Xop_util { Bry_bfr tmp_bfr = Bry_bfr.new_(); RandomAdp random_gen = RandomAdp_.new_(); for (int i = 0; i < len; i += 7) { - int rand = random_int_ary == null ? random_gen.Next(Int_.MaxValue) : random_int_ary[i / 7]; + int rand = random_int_ary == null ? random_gen.Next(Int_.Max_value) : random_int_ary[i / 7]; String rand_str = Int_.Xto_str_hex(Bool_.N, Bool_.Y, rand & 0xfffffff); // limits value to 268435455 tmp_bfr.Add_str_a7(rand_str); } diff --git a/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java b/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java index ea53971f9..290790980 100644 --- a/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java +++ b/400_xowa/src/gplx/xowa/servers/http/Http_server_mgr.java @@ -92,7 +92,7 @@ public class Http_server_mgr implements GfoInvkAble { Xowe_wiki wiki = (Xowe_wiki)app.Wiki_mgr().Get_by_key_or_make_init_y(wiki_domain); // get the wiki; assert init for Main_Page; EX:click zh.w on wiki sidebar; DATE:2015-07-19 if (Bry_.Len_eq_0(page_ttl)) page_ttl = wiki.Props().Main_page(); Xoa_url page_url = wiki.Utl__url_parser().Parse(page_ttl); // get the url (needed for query args) - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, page_ttl); // get the ttl + Xoa_ttl ttl = Xoa_ttl.parse(wiki, page_ttl); // get the ttl Xoae_page page = wiki.Load_page_by_ttl(page_url, ttl); // get page and parse it Gxw_html_server.Assert_tab(app, page); // HACK: assert at least 1 tab app.Gui_mgr().Browser_win().Active_page_(page); // HACK: init gui_mgr's page for output (which server ordinarily doesn't need) diff --git a/400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server.java b/400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server.java index edc213a1c..b9350d2de 100644 --- a/400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server.java +++ b/400_xowa/src/gplx/xowa/servers/tcp/Xosrv_server.java @@ -25,7 +25,7 @@ public class Xosrv_server implements GfoInvkAble { public int Wtr_port() {return wtr_port;} public Xosrv_server Wtr_port_(int v) {wtr_port = v; return this;} private int wtr_port = 55001; public int Shutdown_interval() {return shutdown_interval;} public Xosrv_server Shutdown_interval_(int v) {shutdown_interval = v; return this;} private int shutdown_interval = -1; public String Wtr_host() {return wtr_host;} private String wtr_host = "localhost"; - public boolean Running() {return running;} public Xosrv_server Running_(boolean v) {running = v; running_str = Bool_.Xto_str_lower(running); return this;} private boolean running = false; + public boolean Running() {return running;} public Xosrv_server Running_(boolean v) {running = v; running_str = Bool_.To_str_lower(running); return this;} private boolean running = false; public String Running_str() {return running_str;} String running_str = "false"; public void App_ctor(Xoae_app app) {this.app = app;} public Xoae_app App() {return app;} private Xoae_app app; @@ -100,7 +100,7 @@ class Xosrv_xowa_exec_parser { private Json_parser json_parser = new Json_parser(); public Object[] Parse_xowa_exec(byte[] msg_text) { // parses JSON with format '{"args":["arg0","arg1","arg2"]}' Json_doc doc = json_parser.Parse(msg_text); - Json_kv args_kv = (Json_kv)doc.Root().Get_at(0); // get "args" kv + Json_kv args_kv = (Json_kv)doc.Root_nde().Get_at(0); // get "args" kv Json_ary args_ary = (Json_ary)args_kv.Val(); // get [] int len = args_ary.Len(); Object[] rv = new Object[len]; @@ -112,9 +112,9 @@ class Xosrv_xowa_exec_parser { } private Object Parse_ary_itm(Json_itm itm) { switch (itm.Tid()) { - case Json_itm_.Tid_string: + case Json_itm_.Tid__str: return String_.new_u8(itm.Data_bry()); - case Json_itm_.Tid_array: + case Json_itm_.Tid__ary: Json_ary ary = (Json_ary)itm; int len = ary.Len(); String[] rv = new String[len]; diff --git a/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java b/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java index b47f9224a..b3eda0ffb 100644 --- a/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java +++ b/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser.java @@ -51,7 +51,7 @@ public class Wmf_latest_parser { int size_bgn = Bry_finder.Find_fwd_while_space_or_tab(src, date_end, src_len); if (size_bgn == Bry_finder.Not_found) {Gfo_usr_dlg_.I.Warn_many("", "", "size_bgn not found"); break;} size_end = Bry_finder.Find_fwd(src, Byte_ascii.Cr, size_bgn, src_len); byte[] size_bry = Bry_.Mid(src, size_bgn, size_end); - long size = Long_.parse_or_(String_.new_u8(size_bry), -1); + long size = Long_.parse_or(String_.new_u8(size_bry), -1); Wmf_latest_itm itm = new Wmf_latest_itm(name, date, size); hash.Add(name, itm); } diff --git a/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser_tst.java b/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser_tst.java index a0bf03431..aa909b145 100644 --- a/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser_tst.java +++ b/400_xowa/src/gplx/xowa/setup/maints/Wmf_latest_parser_tst.java @@ -34,7 +34,7 @@ public class Wmf_latest_parser_tst { class Wmf_latest_parser_fxt { public void Clear() {} private Wmf_latest_parser parser = new Wmf_latest_parser(); - public Wmf_latest_itm itm(String name, String date, String size) {return new Wmf_latest_itm(Bry_.new_a7(name), DateAdp_.parse_iso8561(date), Io_size_.parse_or_(size, 0));} + public Wmf_latest_itm itm(String name, String date, String size) {return new Wmf_latest_itm(Bry_.new_a7(name), DateAdp_.parse_iso8561(date), Io_size_.parse_or(size, 0));} public void Test_parse(String raw, Wmf_latest_itm... expd) { parser.Parse(Bry_.new_a7(raw)); Wmf_latest_itm[] actl = parser.To_ary(); diff --git a/400_xowa/src/gplx/xowa/specials/Xows_mgr.java b/400_xowa/src/gplx/xowa/specials/Xows_mgr.java index e05435d52..ff344f352 100644 --- a/400_xowa/src/gplx/xowa/specials/Xows_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/Xows_mgr.java @@ -19,9 +19,9 @@ package gplx.xowa.specials; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.history.*; import gplx.xowa.specials.*; import gplx.xowa.specials.allPages.*; import gplx.xowa.specials.search.*; import gplx.xowa.specials.nearby.*; import gplx.xowa.specials.randoms.*; import gplx.xowa.specials.statistics.*; import gplx.xowa.xtns.translates.*; import gplx.xowa.specials.movePage.*; -import gplx.xowa.specials.xowa.system_data.*; import gplx.xowa.specials.xowa.default_tab.*; import gplx.xowa.specials.xowa.popup_history.*; import gplx.xowa.specials.xowa.file_browsers.*; import gplx.xowa.specials.xowa.bookmarks.*; import gplx.xowa.specials.xowa.diags.*; +import gplx.xowa.specials.xowa.system_data.*; import gplx.xowa.specials.xowa.default_tab.*; import gplx.xowa.specials.xowa.popup_history.*; import gplx.xowa.specials.xowa.file_browsers.*; import gplx.xowa.specials.xowa.diags.*; import gplx.xowa.xtns.wdatas.specials.*; -import gplx.xowa.users.data.*; +import gplx.xowa.users.data.*; import gplx.xowa.users.bmks.*; public class Xows_mgr { private final Hash_adp_bry hash; public Xows_mgr(Xowe_wiki wiki, Xol_lang lang) { diff --git a/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java b/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java index cf6922a8c..2ecfb1859 100644 --- a/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java +++ b/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages.java @@ -95,7 +95,7 @@ public class Xows_page_allpages implements GfoInvkAble, Bry_fmtr_arg, Xows_page rslt_list_ttls[i] = null; rslt_list_len = 0; rslt_nxt = rslt_prv = null; - Xoa_ttl from_ttl = Xoa_ttl.parse_(wiki, from_val); if (from_ttl == null) return false; + Xoa_ttl from_ttl = Xoa_ttl.parse(wiki, from_val); if (from_ttl == null) return false; if (!from_ttl.Ns().Id_main()) { // ns specified in title init_ns = from_ttl.Ns(); arg_hash.Set_val_by_int(Bry_arg_ns, init_ns.Id()); @@ -139,7 +139,7 @@ public class Xows_page_allpages implements GfoInvkAble, Bry_fmtr_arg, Xows_page public static Xoa_ttl ttl_(Xowe_wiki wiki, Xow_ns ns, Xowd_page_itm itm) { byte[] ttl_bry = itm.Ttl_page_db(); if (!ns.Id_main()) ttl_bry = Bry_.Add(ns.Name_db_w_colon(), ttl_bry); - return Xoa_ttl.parse_(wiki, ttl_bry); + return Xoa_ttl.parse(wiki, ttl_bry); } public void XferAry(Bry_bfr bfr, int idx) { int len = rslt_list_ttls.length; diff --git a/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java b/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java index 7f7128816..632d14c8b 100644 --- a/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java +++ b/400_xowa/src/gplx/xowa/specials/allPages/Xows_page_allpages_tst.java @@ -200,5 +200,5 @@ class Xows_page_allpages_fxt { Xoa_ttl init_ttl = Make_init_ttl(); allpages.Build_data(init_url, init_ttl); } - private Xoa_ttl Make_init_ttl() {return Xoa_ttl.parse_(wiki, Bry_.new_u8(Xows_special_meta_.Itm__all_pages.Ttl_str() + init_ttl_leaf));} + private Xoa_ttl Make_init_ttl() {return Xoa_ttl.parse(wiki, Bry_.new_u8(Xows_special_meta_.Itm__all_pages.Ttl_str() + init_ttl_leaf));} } diff --git a/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java b/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java index 11356a594..70bf148ca 100644 --- a/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java +++ b/400_xowa/src/gplx/xowa/specials/movePage/Move_page.java @@ -26,7 +26,7 @@ public class Move_page implements Xows_page { public void Special_gen(Xowe_wiki wiki, Xoae_page page, Xoa_url url, Xoa_ttl ttl) { args.Parse(url); byte[] src_ttl_bry = args.Src_ttl(); - src_ttl = Xoa_ttl.parse_(wiki, src_ttl_bry); + src_ttl = Xoa_ttl.parse(wiki, src_ttl_bry); if (args.Submitted()) { Exec_rename(wiki, page); return; @@ -40,7 +40,7 @@ public class Move_page implements Xows_page { int trg_ns_id = args.Trg_ns(); Xow_ns trg_ns = wiki.Ns_mgr().Ids_get_or_null(trg_ns_id); if (trg_ns == null) throw Err_.new_wo_type("unknown ns", "ns", trg_ns_id); byte[] trg_ttl_bry = args.Trg_ttl(); - Xoa_ttl trg_ttl = Xoa_ttl.parse_(wiki, trg_ns_id, trg_ttl_bry); + Xoa_ttl trg_ttl = Xoa_ttl.parse(wiki, trg_ns_id, trg_ttl_bry); Xowd_page_itm src_page = new Xowd_page_itm(); wiki.Db_mgr().Load_mgr().Load_by_ttl(src_page, src_ttl.Ns(), src_ttl.Page_db()); page.Revision_data().Id_(src_page.Id()); @@ -167,7 +167,7 @@ class Move_url_args { private void Clear() { submitted = false; src_ttl = trg_ttl = null; - trg_ns = Int_.MinValue; + trg_ns = Int_.Min_value; create_redirect = false; } private static final byte Key_submitted = 1, Key_src_ttl = 2, Key_trg_ns = 3, Key_trg_ttl = 4, Key_create_redirect = 5; diff --git a/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java b/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java index 1983d14d0..3bc651fa2 100644 --- a/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/nearby/Nearby_mgr.java @@ -68,8 +68,8 @@ public class Nearby_mgr implements Xows_page { Ordered_hash src_pool = Ordered_hash_.new_bry_(); public List_adp Find_from_to(Xowe_wiki wiki, byte[] src_bry, byte[] trg_bry, Hash_adp_bry excluded) { this.wiki = wiki; this.excluded = excluded; - Xoa_ttl src_ttl = Xoa_ttl.parse_(wiki, src_bry); if (src_ttl == null) return List_adp_.Noop; - trg_ttl = Xoa_ttl.parse_(wiki, trg_bry); if (trg_ttl == null) return List_adp_.Noop; + Xoa_ttl src_ttl = Xoa_ttl.parse(wiki, src_bry); if (src_ttl == null) return List_adp_.Noop; + trg_ttl = Xoa_ttl.parse(wiki, trg_bry); if (trg_ttl == null) return List_adp_.Noop; trg = trg_ttl.Page_db(); trail.Clear(); results.Clear(); diff --git a/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page.java b/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page.java index 6c11979f1..8f1b3ecdf 100644 --- a/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page.java +++ b/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page.java @@ -21,7 +21,7 @@ public class Xop_randomRootPage_page implements Xows_page { public void Special_gen(Xowe_wiki wiki, Xoae_page page, Xoa_url url, Xoa_ttl ttl) { Xow_ns ns = wiki.Ns_mgr().Names_get_or_main(ttl.Rest_txt()); byte[] random_ttl_bry = wiki.Db_mgr().Load_mgr().Find_random_ttl(ns); - byte[] root_bry = Xoa_ttl.parse_(wiki, random_ttl_bry).Root_txt(); + byte[] root_bry = Xoa_ttl.parse(wiki, random_ttl_bry).Root_txt(); wiki.Data_mgr().Redirect(page, ns.Gen_ttl(root_bry)); } } diff --git a/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page_tst.java b/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page_tst.java index dcd369fc3..60b574d16 100644 --- a/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page_tst.java +++ b/400_xowa/src/gplx/xowa/specials/randoms/Xop_randomRootPage_page_tst.java @@ -47,7 +47,7 @@ class Xop_randomRootPage_page_fxt { Xoae_page page = wiki.Ctx().Cur_page(); Xoa_url url = wiki.Utl__url_parser().Parse(Bry_.new_u8(special_url)); page.Url_(url); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, Bry_.new_a7(special_url)); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, Bry_.new_a7(special_url)); page.Ttl_(ttl); special_page.Special_gen(wiki, page, url, ttl); return page; diff --git a/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_cmd.java b/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_cmd.java index 240afb22c..02c6685e8 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_cmd.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xog_search_suggest_cmd.java @@ -54,7 +54,7 @@ class Xog_search_suggest_cmd implements GfoInvkAble, Cancelable { } private boolean Search_by_all_pages_v2() { rslts_2.Clear(); - Xoa_ttl search_ttl = Xoa_ttl.parse_(wiki, search_bry); if (search_ttl == null) return false; + Xoa_ttl search_ttl = Xoa_ttl.parse(wiki, search_bry); if (search_ttl == null) return false; byte[] search_ttl_bry = search_ttl.Page_db(); wiki.Db_mgr().Load_mgr().Load_ttls_for_search_suggest(this, rslts_2, search_ttl.Ns(), search_ttl_bry, max_results, all_pages_min, all_pages_extend, true, false); return true; @@ -63,7 +63,7 @@ class Xog_search_suggest_cmd implements GfoInvkAble, Cancelable { rslts_2.Clear(); Xowd_page_itm rslt_nxt = new Xowd_page_itm(); Xowd_page_itm rslt_prv = new Xowd_page_itm(); - Xoa_ttl search_ttl = Xoa_ttl.parse_(wiki, search_bry); if (search_ttl == null) return false; + Xoa_ttl search_ttl = Xoa_ttl.parse(wiki, search_bry); if (search_ttl == null) return false; byte[] search_ttl_bry = search_ttl.Page_db(); List_adp page_list = List_adp_.new_(); wiki.Db_mgr().Load_mgr().Load_ttls_for_all_pages(this, page_list, rslt_nxt, rslt_prv, Int_obj_ref.zero_(), wiki.Ns_mgr().Ns_main(), search_ttl_bry, max_results, all_pages_min, all_pages_extend, true, false); diff --git a/400_xowa/src/gplx/xowa/specials/search/Xosrh_core_tst.java b/400_xowa/src/gplx/xowa/specials/search/Xosrh_core_tst.java index 40a4ef12e..a28facbad 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xosrh_core_tst.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xosrh_core_tst.java @@ -188,7 +188,7 @@ public class Xosrh_core_tst { // public void Test_html_by_url(String ttl_str, String args_str, String expd_html) { // wiki.Init_needed_(false); // byte[] ttl_bry = Bry_.new_a7(ttl_str); -// Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ttl_bry); +// Xoa_ttl ttl = Xoa_ttl.parse(wiki, ttl_bry); // Xoae_page page = Xoae_page.test_(wiki, ttl); // byte[] url_bry = Bry_.new_a7("http://en.wikipedia.org/wiki/Special:Search/" + ttl_str + args_str); // Xoa_url url = wiki.Appe().Url_parser().Parse(url_bry); @@ -200,7 +200,7 @@ public class Xosrh_core_tst { // Xoa_url_parser_old url_parser = new Xoa_url_parser_old(); // byte[] url_raw = Bry_.new_a7("Special:Search/" + ttl_str + ((match_tid == Xows_page__search.Match_tid_all) ? "" : "*") + "?fulltext=y" + Xosrh_rslt_itm_sorter.Xto_url_arg(sort_tid) + "&xowa_page_size=1&xowa_page_index=" + page_idx); // Xoa_url url = url_parser.Parse(url_raw); -// Xoa_ttl ttl = Xoa_ttl.parse_(wiki, url_raw); +// Xoa_ttl ttl = Xoa_ttl.parse(wiki, url_raw); // Xoae_page page = wiki.Ctx().Cur_page(); // search_mgr.Special_gen(url, page, wiki, ttl); // Xosrh_rslt_grp cur_grp = search_mgr.Cur_grp(); diff --git a/400_xowa/src/gplx/xowa/specials/search/Xosrh_rslt_itm_sorter.java b/400_xowa/src/gplx/xowa/specials/search/Xosrh_rslt_itm_sorter.java index e93588527..ff971cc47 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xosrh_rslt_itm_sorter.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xosrh_rslt_itm_sorter.java @@ -35,7 +35,7 @@ public class Xosrh_rslt_itm_sorter implements gplx.lists.ComparerAble { } } public static final byte Tid_none = 0, Tid_len_dsc = 1, Tid_ttl_asc = 2, Tid_id = 3; - public static byte parse_(String v) { + public static byte parse(String v) { if (String_.Eq(v, "none")) return Tid_none; else if (String_.Eq(v, "len_desc")) return Tid_len_dsc; else if (String_.Eq(v, "title_asc")) return Tid_ttl_asc; diff --git a/400_xowa/src/gplx/xowa/specials/search/Xow_domain_sorter__manual_tid.java b/400_xowa/src/gplx/xowa/specials/search/Xow_domain_sorter__manual_tid.java index 31de29535..573eea732 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xow_domain_sorter__manual_tid.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xow_domain_sorter__manual_tid.java @@ -36,7 +36,7 @@ class Xow_domain_sorter__manual implements gplx.lists.ComparerAble { } private int Get_sort_idx_or_neg1(Xow_domain_itm domain) { int sort_idx = domain.Sort_idx(); if (sort_idx != -1) return sort_idx; - sort_idx = Int_.MaxValue; + sort_idx = Int_.Max_value; for (int i = 0; i < ary_len; ++i) { Xow_domain_crt_itm crt = ary[i]; if (crt.Matches(cur_domain, domain)) {sort_idx = i; break;} diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_arg_mgr.java b/400_xowa/src/gplx/xowa/specials/search/Xows_arg_mgr.java index 29b973a58..30915afe4 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xows_arg_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xows_arg_mgr.java @@ -45,7 +45,7 @@ class Xows_arg_mgr { switch (((Byte_obj_val)tid).Val()) { case Arg_search: this.search_bry = Bry_.Replace(arg.Val_bry(), Byte_ascii.Plus, Byte_ascii.Space); break; case Arg_page_idx: this.paging_idx = Bry_.To_int_or(arg.Val_bry(), 0); break; - case Arg_sort: this.sort_tid = Xosrh_rslt_itm_sorter.parse_(String_.new_a7(arg.Val_bry())); break; + case Arg_sort: this.sort_tid = Xosrh_rslt_itm_sorter.parse(String_.new_a7(arg.Val_bry())); break; case Arg_cancel: this.cancel = arg.Val_bry(); break; case Arg_paging: this.paging_itms = paging_parser.Parse(arg.Val_bry()); break; default: break; diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_core.java b/400_xowa/src/gplx/xowa/specials/search/Xows_core.java index 4dd37a5ca..cbcc84213 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xows_core.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xows_core.java @@ -44,7 +44,7 @@ class Xows_core { qry.Cmds__add(cmd); } catch (Exception e) {Xoa_app_.Usr_dlg().Warn_many("", "", "search:wiki failed; wiki=~{0} err=~{1}", domain.Domain_str(), Err_.Message_lang(e));} // handle bad wikis, like "en.wikipedia.org-old"; DATE:2015-04-24 } - qry.Page_max_(Int_.MaxValue); + qry.Page_max_(Int_.Max_value); // do search and generate html html_wkr.Init_by_wiki(search_wiki, search_wiki.Lang().Num_mgr(), qry); int cmds_len = qry.Cmds__len(); diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_db_wkr.java b/400_xowa/src/gplx/xowa/specials/search/Xows_db_wkr.java index 23876d2dd..7a9651f98 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xows_db_wkr.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xows_db_wkr.java @@ -52,7 +52,7 @@ class Xows_db_wkr { if (word.Rslts_done()) continue; // last db_search for word returned 0 results; don't search again; int offset = word.Rslts_offset(); Xoa_app_.Usr_dlg().Prog_many("", "", "searching; wiki=~{0} total=~{1} offset=~{2} index=~{3} word=~{4}", wiki.Domain_str(), word_ary_len, offset, i, word.Text()); - String sql = String_.Format(Search_sql, link_tbl.Tbl_name(), link_tbl.Fld_page_id(), link_tbl.Fld_word_id(), word.Id(), "page_len", "DESC", Int_.MaxValue, offset); // need to return enough results to fill qry.Page_len() as many results may be discarded below; DATE:2015-04-24 + String sql = String_.Format(Search_sql, link_tbl.Tbl_name(), link_tbl.Fld_page_id(), link_tbl.Fld_word_id(), word.Id(), "page_len", "DESC", Int_.Max_value, offset); // need to return enough results to fill qry.Page_len() as many results may be discarded below; DATE:2015-04-24 int rslts_found = Search_pages(cmd, qry, rslt, cache, wiki, page_tbl, attach_rdr, sql, word, matcher, rslts_wanted); total_found += rslts_found; if (rslts_found == -1) return; // canceled diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_html_wkr_tst.java b/400_xowa/src/gplx/xowa/specials/search/Xows_html_wkr_tst.java index 063e495e1..18e9b17e1 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xows_html_wkr_tst.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xows_html_wkr_tst.java @@ -22,9 +22,9 @@ import gplx.xowa.wikis.data.tbls.*; public class Xows_html_wkr_tst { @Before public void init() {fxt.Clear();} private Xows_html_wkr_fxt fxt = new Xows_html_wkr_fxt(); @Test public void Paging() { - fxt.Test_paging(Bool_.Y, 1, "Next"); - fxt.Test_paging(Bool_.N, 1, "Previous"); - fxt.Test_paging(Bool_.Y, 2, "Next"); + fxt.Test_paging(Bool_.Y, 1, "Next"); + fxt.Test_paging(Bool_.N, 1, "Previous"); + fxt.Test_paging(Bool_.Y, 2, "Next"); fxt.Test_paging(Bool_.N, 0, " "); } @Test public void Rows() { diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java b/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java index a32394850..332aa7862 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xows_ns_mgr.java @@ -50,8 +50,8 @@ public class Xows_ns_mgr { if (key_len == 3 && key[2] == Byte_ascii.Star) // translate ns* as ns_all ns_all = true; else { - int ns_id = Bry_.To_int_or(key, 2, key_len, Int_.MinValue); - if (ns_id != Int_.MinValue) { // ignore invalid ints; EX: &nsabc=1; + int ns_id = Bry_.To_int_or(key, 2, key_len, Int_.Min_value); + if (ns_id != Int_.Min_value) { // ignore invalid ints; EX: &nsabc=1; Add_by_id(ns_id); ns_main = ns_all = false; } diff --git a/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java b/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java index 9a3751325..d4f41b8ab 100644 --- a/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java +++ b/400_xowa/src/gplx/xowa/specials/search/Xows_page__search.java @@ -67,7 +67,7 @@ public class Xows_page__search implements Xows_page, GfoInvkAble, GfoEvObj { search_bry = Bry_.Add(search_bry, Byte_ascii.Star); // url.Page_bry_(Bry_.Add(Xows_special_meta_.Itm__search.Ttl_bry(), Byte_ascii.Slash_bry, search_bry));// HACK: need to re-set Page b/c href_parser does not eliminate qargs; DATE:2013-02-08 // search wiki - Xoa_ttl search_ttl = Xoa_ttl.parse_(wiki, search_bry); + Xoa_ttl search_ttl = Xoa_ttl.parse(wiki, search_bry); Xoae_page search_page = page; if (!Bry_.Eq(search_bry, Xows_special_meta_.Itm__search.Ttl_bry())) // do not lookup page else stack overflow; happens when going directly to Special:Search (from history) search_page = wiki.Data_mgr().Get_page(search_ttl, false); // try to find page; EX:Special:Search?search=Earth -> en.w:Earth; needed for search suggest diff --git a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java index 83bb86ca0..d318d9cdf 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java +++ b/400_xowa/src/gplx/xowa/specials/xowa/diags/Xows_cmd__file_check.java @@ -61,7 +61,7 @@ class Xows_cmd__file_check { int rows_len = rows.length; for (int i = 0; i < rows_len; ++i) { Object[] row = rows[i]; - int file_id = Int_.cast_(row[0]); + int file_id = Int_.cast(row[0]); String sql = sql_mkr.Thm_by_id(file_id); Write_sect(bfr, "fsdb.thm.select", sql); Object[][] thm_rows = Db_rdr_utl.Load(atr_main.Conn(), sql); @@ -77,9 +77,9 @@ class Xows_cmd__file_check { int rows_len = rows.length; for (int i = 0; i < rows_len; ++i) { Object[] row = rows[i]; - int bin_db_id = Int_.cast_(row[bin_db_id_ordinal]); if (bin_db_id == -1) continue; + int bin_db_id = Int_.cast(row[bin_db_id_ordinal]); if (bin_db_id == -1) continue; Fsm_bin_fil bin_db = mnt_itm.Bin_mgr().Dbs__get_at(bin_db_id); - int owner_id = Int_.cast_(row[owner_id_ordinal]); + int owner_id = Int_.cast(row[owner_id_ordinal]); String sql = sql_mkr.Bin_by_id(owner_id); Write_sect(bfr, "fsdb.bin.select", sql); Object[][] bin_rows = Db_rdr_utl.Load(bin_db.Conn(), sql); @@ -92,7 +92,7 @@ class Xows_cmd__file_check { Bry_bfr tmp_bfr = Bry_bfr.new_(); for (int i = 0; i < rows_len; ++i) { Object[] row = rows[i]; - int owner_id = Int_.cast_(row[owner_id_ordinal]); + int owner_id = Int_.cast(row[owner_id_ordinal]); byte[] bin_data = (byte[])row[bin_data_ordinal]; file_bry = gplx.xowa.files.repos.Xof_repo_itm_.Ttl_invalid_fsys_chars(tmp_bfr, file_bry); Io_url bin_url = tmp_dir.GenSubFil(String_.new_u8(file_bry)); diff --git a/400_xowa/src/gplx/xowa/tdbs/Xotdb_fsys_mgr.java b/400_xowa/src/gplx/xowa/tdbs/Xotdb_fsys_mgr.java index ac9a0570b..138690cbf 100644 --- a/400_xowa/src/gplx/xowa/tdbs/Xotdb_fsys_mgr.java +++ b/400_xowa/src/gplx/xowa/tdbs/Xotdb_fsys_mgr.java @@ -69,7 +69,7 @@ public class Xotdb_fsys_mgr { int len = ns_dirs.length; Hash_adp rv = Hash_adp_.new_(); for (int i = 0; i < len; i++) { - int ns_int = Int_.parse_or_(ns_dirs[i].NameOnly(), Int_.MinValue); if (ns_int == Int_.MinValue) continue; + int ns_int = Int_.parse_or(ns_dirs[i].NameOnly(), Int_.Min_value); if (ns_int == Int_.Min_value) continue; Xow_ns ns = ns_mgr.Ids_get_or_null(ns_int); if (ns == null) continue; ns.Exists_(true); } diff --git a/400_xowa/src/gplx/xowa/urls/Xoa_url_parser.java b/400_xowa/src/gplx/xowa/urls/Xoa_url_parser.java index b10bf202a..9abce96fa 100644 --- a/400_xowa/src/gplx/xowa/urls/Xoa_url_parser.java +++ b/400_xowa/src/gplx/xowa/urls/Xoa_url_parser.java @@ -38,20 +38,19 @@ public class Xoa_url_parser { this.encoder = app.Utl__encoder_mgr().Xourl(); this.vnt_mgr = wiki.Type_is_edit() ? wiki.Lang().Vnt_mgr() : null; } - public Xoa_url Parse_by_urlbar(String str) { + public Xoa_url Parse_by_urlbar_or_null(String str) { Xoae_app app = (Xoae_app)wiki.App(); byte[] bry = Strip_mobile_segment(Bry_.new_u8(str)); byte[] fmt = app.Gui_mgr().Url_macro_mgr().Fmt_or_null(bry); if (fmt != null) bry = fmt; - // if (app.Wiki_mgr().Wiki_regy().Url_is_invalid_domain(rv)) { // handle lang_code entered; EX: "war" should redirect to "war" article in current wiki, not war.wikipedia.org; DATE:2014-02-07 - // rv.Page_bry_(rv.Wiki_bry()); - // rv.Wiki_bry_(wiki.Domain_bry()); - // } Xoa_url rv = Xoa_url.blank(); - this.Parse(rv, bry, 0, bry.length); - if (rv.Page_is_main()) { // Main_Page requested; EX: "zh.wikipedia.org"; "zh.wikipedia.org/wiki/"; DATE:2014-02-16 - Xow_wiki actl_wiki = app.Wiki_mgri().Get_by_key_or_make_init_y(rv.Wiki_bry()); // NOTE: must call Init_assert to load Main_Page; only call if from url_bar, else all sister wikis will be loaded when parsing Sister_wikis panel - rv.Page_bry_(actl_wiki.Props().Main_page()); + this.Parse(rv, bry, 0, bry.length); if (rv.Page_bry() == null) {Xoa_url_.Invalid_warn(str); return null;} + byte[] wiki_bry = rv.Wiki_bry(); + Xow_xwiki_itm xwiki_itm = app.User().Wikii().Xwiki_mgr().Get_by_key(wiki_bry); + if (xwiki_itm == null) {Xoa_url_.Invalid_warn(str); return null;} // if wiki doesn't exist, warn and return nothing; DATE:2015-08-25 + if (rv.Page_is_main()) { // Main_Page requested; EX: "zh.wikipedia.org"; "zh.wikipedia.org/wiki/"; DATE:2014-02-16 + Xow_wiki wiki_itm = app.Wiki_mgri().Get_by_key_or_make_init_y(wiki_bry); // NOTE: must call Init to load Main_Page; only call if from url_bar, else all sister wikis will be loaded when parsing Sister_wikis panel + rv.Page_bry_(wiki_itm.Props().Main_page()); } return rv; } @@ -111,7 +110,7 @@ public class Xoa_url_parser { tmp_tid = Xoa_url_.Tid_unknown; tmp_raw = gfo_url.Raw(); tmp_wiki = gfo_url.Segs__get_at_1st(); - tmp_page = gfo_url.Segs__get_at_nth(); + tmp_page = gfo_url.Segs__get_at_nth(); tmp_anch = gfo_url.Anch(); tmp_qargs = gfo_url.Qargs(); tmp_wiki_is_missing = false; tmp_page_is_main = false; diff --git a/400_xowa/src/gplx/xowa/urls/Xoa_url_parser__url_bar_tst.java b/400_xowa/src/gplx/xowa/urls/Xoa_url_parser__url_bar_tst.java index 6c08185fc..99a77e4cc 100644 --- a/400_xowa/src/gplx/xowa/urls/Xoa_url_parser__url_bar_tst.java +++ b/400_xowa/src/gplx/xowa/urls/Xoa_url_parser__url_bar_tst.java @@ -54,4 +54,12 @@ public class Xoa_url_parser__url_bar_tst { tstr.Run_parse_from_url_bar("A.b.m." ).Chk_to_str("en.wikipedia.org/wiki/A.b.m."); // false-match tstr.Run_parse_from_url_bar("en.x.wikipedia.org/wiki/A" ).Chk_to_str("en.wikipedia.org/wiki/en.x.wikipedia.org/wiki/A"); // fail } + @Test public void Missing_page() { + tstr.Run_parse_from_url_bar("http://a.org").Chk_is_null(); // unknown wiki; return null; + tstr.Run_parse_from_url_bar("http://en.wikipedia.org").Chk_to_str("en.wikipedia.org/wiki/Main_Page"); // known wiki; return Main_Page + } + @Test public void Invalid_names() { + tstr.Run_parse_from_url_bar("http://a/b/c").Chk_is_null(); // unknown url + tstr.Run_parse_from_url_bar("war").Chk_to_str("en.wikipedia.org/wiki/war"); // word looks like lang, but is actually page; default to current + } } diff --git a/400_xowa/src/gplx/xowa/urls/Xoa_url_parser_fxt.java b/400_xowa/src/gplx/xowa/urls/Xoa_url_parser_fxt.java index a798dadf4..ae8f250ef 100644 --- a/400_xowa/src/gplx/xowa/urls/Xoa_url_parser_fxt.java +++ b/400_xowa/src/gplx/xowa/urls/Xoa_url_parser_fxt.java @@ -55,10 +55,11 @@ public class Xoa_url_parser_fxt { return this; } public Xoa_url_parser_fxt Run_parse_from_url_bar(String raw) { - this.actl_url = parser.Parse_by_urlbar(raw); + this.actl_url = parser.Parse_by_urlbar_or_null(raw); return this; } public Xoa_url_parser_fxt Chk_tid(int v) {Tfds.Eq_int(v, actl_url.Tid() , "tid"); return this;} + public Xoa_url_parser_fxt Chk_is_null() {Tfds.Eq_bool(true, actl_url == null); return this;} public Xoa_url_parser_fxt Chk_vnt(String v) {Tfds.Eq_str(v, actl_url.Vnt_bry() , "vnt"); return this;} public Xoa_url_parser_fxt Chk_wiki(String v) {Tfds.Eq_str(v, actl_url.Wiki_bry() , "wiki"); return this;} public Xoa_url_parser_fxt Chk_wiki_is_missing(boolean v) {Tfds.Eq_bool(v, actl_url.Wiki_is_missing(), "wiki_is_missing"); return this;} diff --git a/400_xowa/src/gplx/xowa/users/Xoc_layout_mgr.java b/400_xowa/src/gplx/xowa/users/Xoc_layout_mgr.java index 5f65af42d..4d5a4fef0 100644 --- a/400_xowa/src/gplx/xowa/users/Xoc_layout_mgr.java +++ b/400_xowa/src/gplx/xowa/users/Xoc_layout_mgr.java @@ -26,7 +26,7 @@ public class Xoc_layout_mgr implements GfoInvkAble { public RectAdp Html_box_adj_rect() {return html_box_adj_rect;} private RectAdp html_box_adj_rect = RectAdp_.Zero; public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_html_box_adj_type)) return html_box_adj_type_enm.Get_str(html_box_adj_type); - else if (ctx.Match(k, Invk_html_box_adj_type_)) {html_box_adj_type = Byte_.parse_(m.ReadStr("v")); this.Refresh_window();} + else if (ctx.Match(k, Invk_html_box_adj_type_)) {html_box_adj_type = Byte_.parse(m.ReadStr("v")); this.Refresh_window();} else if (ctx.Match(k, Invk_html_box_adj_type_list)) return html_box_adj_type_enm.Get_kv_ary(); else if (ctx.Match(k, Invk_html_box_adj_rect)) return html_box_adj_rect.Xto_str(); else if (ctx.Match(k, Invk_html_box_adj_rect_)) {html_box_adj_rect = gplx.gfui.RectAdp_.parse_ws_(m.ReadStr("v")); this.Refresh_window();} diff --git a/400_xowa/src/gplx/xowa/users/Xou_fsys_mgr.java b/400_xowa/src/gplx/xowa/users/Xou_fsys_mgr.java index cd741531a..37f4f1223 100644 --- a/400_xowa/src/gplx/xowa/users/Xou_fsys_mgr.java +++ b/400_xowa/src/gplx/xowa/users/Xou_fsys_mgr.java @@ -33,7 +33,6 @@ public class Xou_fsys_mgr implements GfoInvkAble { public Io_url App_data_history_fil() {return app_data_history_fil;} private Io_url app_data_history_fil; public Io_url App_temp_dir() {return app_temp_dir;} private Io_url app_temp_dir; public Io_url App_temp_html_dir() {return app_temp_html_dir;} private Io_url app_temp_html_dir; - public Io_url App_img_dir() {return app_root_dir.GenSubDir_nest("img");} public Io_url App_data_dir() {return app_root_dir.GenSubDir_nest("data");} public Io_url App_data_cfg_dir() {return app_root_dir.GenSubDir_nest("data", "cfg");} public Io_url App_data_cfg_user_fil() {return app_root_dir.GenSubFil_nest("data", "cfg", Xoa_gfs_mgr.Cfg_user_file);} diff --git a/400_xowa/src/gplx/xowa/users/Xou_user_.java b/400_xowa/src/gplx/xowa/users/Xou_user_.java index 646d55c73..d58cde583 100644 --- a/400_xowa/src/gplx/xowa/users/Xou_user_.java +++ b/400_xowa/src/gplx/xowa/users/Xou_user_.java @@ -35,7 +35,7 @@ class Xou_user_ { } public static void Bookmarks_make(Xoae_app app, Xowe_wiki home_wiki) { app.Usr_dlg().Log_many(GRP_KEY, "bookmarks.create", "creating bookmarks page"); - home_wiki.Db_mgr().Save_mgr().Data_create(Xoa_ttl.parse_(home_wiki, Bry_.new_a7("Data:Bookmarks")), Bry_.new_a7(Bookmarks_text)); + home_wiki.Db_mgr().Save_mgr().Data_create(Xoa_ttl.parse(home_wiki, Bry_.new_a7("Data:Bookmarks")), Bry_.new_a7(Bookmarks_text)); } public static final String User_system_cfg_text = String_.Concat_lines_nl ( "app.scripts.txns.get('user.prefs.general').version_('" + Xoa_app_.Version + "').bgn();" diff --git a/400_xowa/src/gplx/xowa/users/Xouc_window_mgr.java b/400_xowa/src/gplx/xowa/users/Xouc_window_mgr.java index af27428e6..6149d150e 100644 --- a/400_xowa/src/gplx/xowa/users/Xouc_window_mgr.java +++ b/400_xowa/src/gplx/xowa/users/Xouc_window_mgr.java @@ -29,11 +29,11 @@ public class Xouc_window_mgr implements GfoInvkAble { else if (ctx.Match(k, Invk_mode_)) {mode_str = m.ReadStr("v"); mode_tid = Xto_mode_tid(mode_str);} else if (ctx.Match(k, Invk_mode_list)) return Options_mode_list; else if (ctx.Match(k, Invk_rect)) return rect; - else if (ctx.Match(k, Invk_rect_)) rect = Rect_ref.parse_(m.ReadStr("v")); + else if (ctx.Match(k, Invk_rect_)) rect = Rect_ref.parse(m.ReadStr("v")); else if (ctx.Match(k, Invk_safe_mode)) return Yn.Xto_str(safe_mode); else if (ctx.Match(k, Invk_safe_mode_)) safe_mode = m.ReadYn("v"); else if (ctx.Match(k, Invk_previous_adj)) return previous_adj; - else if (ctx.Match(k, Invk_previous_adj_)) previous_adj = Rect_ref.parse_(m.ReadStr("v")); + else if (ctx.Match(k, Invk_previous_adj_)) previous_adj = Rect_ref.parse(m.ReadStr("v")); return this; } public static final String Invk_mode = "mode", Invk_mode_ = "mode_", Invk_mode_list = "mode_list" diff --git a/400_xowa/src/gplx/xowa/users/Xoue_user.java b/400_xowa/src/gplx/xowa/users/Xoue_user.java index 8e5dd7be0..a15eb85d1 100644 --- a/400_xowa/src/gplx/xowa/users/Xoue_user.java +++ b/400_xowa/src/gplx/xowa/users/Xoue_user.java @@ -75,7 +75,7 @@ public class Xoue_user implements Xou_user, GfoEvMgrOwner, GfoInvkAble { Bry_bfr tmp_bfr = wiki.Utl__bfr_mkr().Get_k004(); bookmarks_add_fmtr.Bld_bfr_many(tmp_bfr, wiki_domain, ttl_full_txt); byte[] new_entry = tmp_bfr.To_bry_and_rls(); - Xoa_ttl bookmarks_ttl = Xoa_ttl.parse_(wiki, Bry_data_bookmarks); + Xoa_ttl bookmarks_ttl = Xoa_ttl.parse(wiki, Bry_data_bookmarks); Xoae_page bookmarks_page = wiki.Data_mgr().Get_page(bookmarks_ttl, false); byte[] new_data = Bry_.Add(bookmarks_page.Data_raw(), new_entry); wiki.Db_mgr().Save_mgr().Data_update(bookmarks_page, new_data); diff --git a/400_xowa/src/gplx/xowa/users/Xous_window_mgr.java b/400_xowa/src/gplx/xowa/users/Xous_window_mgr.java index 2e9bbadb8..191e2c4bf 100644 --- a/400_xowa/src/gplx/xowa/users/Xous_window_mgr.java +++ b/400_xowa/src/gplx/xowa/users/Xous_window_mgr.java @@ -52,7 +52,7 @@ public class Xous_window_mgr implements GfoInvkAble { } public Object Invk(GfsCtx ctx, int ikey, String k, GfoMsg m) { if (ctx.Match(k, Invk_rect)) return rect; - else if (ctx.Match(k, Invk_rect_)) rect = Rect_ref.parse_(m.ReadStr("v")); + else if (ctx.Match(k, Invk_rect_)) rect = Rect_ref.parse(m.ReadStr("v")); else if (ctx.Match(k, Invk_maximized)) return Yn.Xto_str(maximized); else if (ctx.Match(k, Invk_maximized_)) maximized = m.ReadYn("v"); return this; diff --git a/400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Dbui_tbl_itm__bmk.java b/400_xowa/src/gplx/xowa/users/bmks/Dbui_tbl_itm__bmk.java similarity index 96% rename from 400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Dbui_tbl_itm__bmk.java rename to 400_xowa/src/gplx/xowa/users/bmks/Dbui_tbl_itm__bmk.java index 8d99208d2..757da4417 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Dbui_tbl_itm__bmk.java +++ b/400_xowa/src/gplx/xowa/users/bmks/Dbui_tbl_itm__bmk.java @@ -15,7 +15,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.specials.xowa.bookmarks; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*; +package gplx.xowa.users.bmks; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.core.json.*; import gplx.html.*; import gplx.xowa.users.data.*; import gplx.xowa.users.bmks.*; import gplx.xowa.html.bridges.*; import gplx.xowa.html.bridges.dbuis.*; import gplx.xowa.html.bridges.dbuis.tbls.*; import gplx.xowa.html.bridges.dbuis.fmtrs.*; diff --git a/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java b/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java index 95bc2a14d..556f9a4c4 100644 --- a/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java +++ b/400_xowa/src/gplx/xowa/users/bmks/Xoud_bmk_itm_tbl.java @@ -76,7 +76,7 @@ public class Xoud_bmk_itm_tbl implements RlsAble { int rv = 0; if (rdr.Move_next()) { Object rv_obj = rdr.Read_obj(fld_sort); - rv = rv_obj == null ? 0 : Int_.cast_(rv_obj) + 1; + rv = rv_obj == null ? 0 : Int_.cast(rv_obj) + 1; } return rv; } diff --git a/400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Xows_bmk_page.java b/400_xowa/src/gplx/xowa/users/bmks/Xows_bmk_page.java similarity index 86% rename from 400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Xows_bmk_page.java rename to 400_xowa/src/gplx/xowa/users/bmks/Xows_bmk_page.java index 13f93d590..904967d66 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Xows_bmk_page.java +++ b/400_xowa/src/gplx/xowa/users/bmks/Xows_bmk_page.java @@ -15,10 +15,10 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.specials.xowa.bookmarks; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*; +package gplx.xowa.users.bmks; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.core.primitives.*; import gplx.xowa.html.bridges.dbuis.tbls.*; -import gplx.xowa.users.data.*; import gplx.xowa.users.bmks.*; +import gplx.xowa.users.data.*; import gplx.xowa.specials.*; public class Xows_bmk_page implements Xows_page { public Xows_special_meta Special_meta() {return Xows_special_meta_.Itm__bookmarks;} public void Special_gen(Xowe_wiki wiki, Xoae_page page, Xoa_url url, Xoa_ttl ttl) { diff --git a/400_xowa/src/gplx/xowa/users/data/Xou_db_file.java b/400_xowa/src/gplx/xowa/users/data/Xou_db_file.java index 33e2f09ed..da46395f7 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xou_db_file.java +++ b/400_xowa/src/gplx/xowa/users/data/Xou_db_file.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.dbs.*; import gplx.dbs.cfgs.*; import gplx.dbs.metas.*; import gplx.xowa.files.caches.*; -import gplx.xowa.users.bmks.*; +import gplx.xowa.users.bmks.*; import gplx.xowa.users.history.*; public class Xou_db_file { private final Db_conn conn; public Xou_db_file(Db_conn conn) { diff --git a/400_xowa/src/gplx/xowa/users/data/Xou_db_mgr.java b/400_xowa/src/gplx/xowa/users/data/Xou_db_mgr.java index a253dc80d..84fec5388 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xou_db_mgr.java +++ b/400_xowa/src/gplx/xowa/users/data/Xou_db_mgr.java @@ -18,7 +18,7 @@ along with this program. If not, see . package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.core.threads.*; import gplx.dbs.*; import gplx.dbs.metas.updates.*; import gplx.dbs.metas.*; import gplx.xowa.files.caches.*; -import gplx.xowa.users.bmks.*; +import gplx.xowa.users.bmks.*; import gplx.xowa.users.history.*; public class Xou_db_mgr { private final Xoa_app app; private final Xoud_id_mgr id_mgr; @@ -41,6 +41,7 @@ public class Xou_db_mgr { this.cache_mgr = new Xou_cache_mgr(app.Wiki_mgri(), app.Fsys_mgr().File_dir(), db_file); this.xfer_itm_finder = new Xou_file_itm_finder(cache_mgr); this.bmk_mgr.Conn_(conn, created); + // this.history_mgr.Conn_(conn, created); if (drd) { cfg_mgr.Conn_(conn, created); site_mgr.Conn_(conn, created); diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_cfg_mgr.java b/400_xowa/src/gplx/xowa/users/data/Xoud_cfg_mgr.java index 15b093258..f371d19e8 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_cfg_mgr.java +++ b/400_xowa/src/gplx/xowa/users/data/Xoud_cfg_mgr.java @@ -25,7 +25,7 @@ public class Xoud_cfg_mgr { } public int Select_int_or(String grp, String key, int or) { String rv = Select_str_or(grp, key, null); - return rv == null ? or : Int_.parse_or_(rv, or); + return rv == null ? or : Int_.parse_or(rv, or); } public byte[] Select_bry_or(String key, byte[] or) {return Select_bry_or("" , key, or);} public byte[] Select_bry_or(String grp, String key, byte[] or) { diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java b/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java index 396a613fc..4bfd8bd4b 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java +++ b/400_xowa/src/gplx/xowa/users/data/Xoud_opt_scope.java @@ -48,7 +48,7 @@ class Xoud_opt_scope_parser { } public Xoud_opt_scope Parse_itm(byte[] src, int bgn, int end) { int lang_dot = Bry_finder.Find_fwd(src, Byte_ascii.Dot, bgn, end); if (lang_dot == Bry_finder.Not_found) return Warn("scope.parse.missing_lang_dot: src=~{0}", src, bgn, end); - int lang_id = Int_.MinValue; + int lang_id = Int_.Min_value; if (lang_dot == 1 && src[bgn] == Byte_ascii.Star) lang_id = Xoud_opt_scope.Lang_id_wildcard; else { diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java b/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java index 98dbad26b..3e03ff9b8 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java +++ b/400_xowa/src/gplx/xowa/users/data/Xoud_user_tbl.java @@ -22,7 +22,7 @@ class Xoud_user_mgr { public void Conn_(Db_conn conn, boolean created) {tbl.Conn_(conn, created);} public int Get_id_or_new(String name) { int rv = tbl.Select_id_by_name(name); - if (rv == Int_.MinValue) { + if (rv == Int_.Min_value) { rv = tbl.Select_id_next(); tbl.Insert(rv, name); } @@ -52,7 +52,7 @@ class Xoud_user_tbl { public int Select_id_by_name(String name) { Db_rdr rdr = conn.Stmt_select(tbl_name, flds, fld_name).Crt_str(fld_name, name).Exec_select__rls_auto(); try { - return rdr.Move_next() ? rdr.Read_int(fld_id) : Int_.MinValue; + return rdr.Move_next() ? rdr.Read_int(fld_id) : Int_.Min_value; } finally {rdr.Rls();} } diff --git a/400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Dbui_tbl_itm__history.java b/400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java similarity index 95% rename from 400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Dbui_tbl_itm__history.java rename to 400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java index 80a5433e4..47a817aba 100644 --- a/400_xowa/src/gplx/xowa/specials/xowa/bookmarks/Dbui_tbl_itm__history.java +++ b/400_xowa/src/gplx/xowa/users/history/Dbui_tbl_itm__history.java @@ -15,7 +15,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.specials.xowa.bookmarks; import gplx.*; import gplx.xowa.*; import gplx.xowa.specials.*; import gplx.xowa.specials.xowa.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.core.json.*; import gplx.html.*; import gplx.xowa.users.data.*; import gplx.xowa.users.bmks.*; import gplx.xowa.html.bridges.*; import gplx.xowa.html.bridges.dbuis.*; import gplx.xowa.html.bridges.dbuis.tbls.*; import gplx.xowa.html.bridges.dbuis.fmtrs.*; diff --git a/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java b/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java index 8a652dae2..7eab5dc24 100644 --- a/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java +++ b/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr.java @@ -58,7 +58,7 @@ public class Xou_history_mgr implements GfoInvkAble { Add(url, ttl, page_ttl); } public void Add(Xoa_url url, Xoa_ttl ttl, byte[] page_ttl) { - if (gplx.xowa.users.data.Xoud_history_mgr.Skip_history(ttl)) return; + if (gplx.xowa.users.history.Xoud_history_mgr.Skip_history(ttl)) return; if (!load_chk) Load(); byte[] key = Xou_history_itm.key_(url.Wiki_bry(), page_ttl); Xou_history_itm itm = (Xou_history_itm)itms.Get_by(key); diff --git a/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr_tst.java b/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr_tst.java index d81747890..fd8693e82 100644 --- a/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/users/history/Xou_history_mgr_tst.java @@ -65,7 +65,7 @@ class Xou_history_mgr_fxt { } public Xou_history_mgr_fxt Add_one(String ttl_str, String arg_str) { byte[] ttl_bry = Bry_.new_u8(ttl_str); - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ttl_bry); Xoae_page page = Xoae_page.test_(wiki, ttl); page.Revision_data().Modified_on_(DateAdp_.Now()); byte[] url_bry = ttl_bry; diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_history_mgr.java b/400_xowa/src/gplx/xowa/users/history/Xoud_history_mgr.java similarity index 88% rename from 400_xowa/src/gplx/xowa/users/data/Xoud_history_mgr.java rename to 400_xowa/src/gplx/xowa/users/history/Xoud_history_mgr.java index b982a0110..0d4ff0163 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_history_mgr.java +++ b/400_xowa/src/gplx/xowa/users/history/Xoud_history_mgr.java @@ -15,14 +15,14 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.core.threads.*; import gplx.dbs.*; import gplx.xowa.specials.*; public class Xoud_history_mgr implements GfoInvkAble { private Xoud_history_tbl history_tbl; - public void Conn_(Db_conn new_conn, boolean created) { - history_tbl = new Xoud_history_tbl(new_conn); - if (created) history_tbl.Create_tbl(); + public void Conn_(Db_conn conn, boolean created) { + this.history_tbl = new Xoud_history_tbl(conn); + if (!conn.Meta_tbl_exists(history_tbl.Tbl_name())) history_tbl.Create_tbl(); } public void Update_async(Gfo_async_mgr async_mgr, Xoa_ttl ttl, Xoa_url url) { // if (Skip_history(ttl)) return; diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_history_row.java b/400_xowa/src/gplx/xowa/users/history/Xoud_history_row.java similarity index 92% rename from 400_xowa/src/gplx/xowa/users/data/Xoud_history_row.java rename to 400_xowa/src/gplx/xowa/users/history/Xoud_history_row.java index a736e0c28..e6d090e23 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_history_row.java +++ b/400_xowa/src/gplx/xowa/users/history/Xoud_history_row.java @@ -15,7 +15,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; public class Xoud_history_row { public Xoud_history_row(int id, byte[] wiki, byte[] url, DateAdp time, int count) { this.id = id; diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_history_special.java b/400_xowa/src/gplx/xowa/users/history/Xoud_history_special.java similarity index 89% rename from 400_xowa/src/gplx/xowa/users/data/Xoud_history_special.java rename to 400_xowa/src/gplx/xowa/users/history/Xoud_history_special.java index f80beb7dc..7c42b5d92 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_history_special.java +++ b/400_xowa/src/gplx/xowa/users/history/Xoud_history_special.java @@ -15,9 +15,8 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.xowa.specials.*; -import gplx.xowa.specials.xowa.bookmarks.*; public class Xoud_history_special implements Xows_page { public Xows_special_meta Special_meta() {return Xows_special_meta_.Itm__page_history;} public void Special_gen(Xowe_wiki wiki, Xoae_page page, Xoa_url url, Xoa_ttl ttl) { diff --git a/400_xowa/src/gplx/xowa/users/data/Xoud_history_tbl.java b/400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java similarity index 94% rename from 400_xowa/src/gplx/xowa/users/data/Xoud_history_tbl.java rename to 400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java index be2f50a5b..3604bec74 100644 --- a/400_xowa/src/gplx/xowa/users/data/Xoud_history_tbl.java +++ b/400_xowa/src/gplx/xowa/users/history/Xoud_history_tbl.java @@ -15,7 +15,7 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . */ -package gplx.xowa.users.data; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; +package gplx.xowa.users.history; import gplx.*; import gplx.xowa.*; import gplx.xowa.users.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.dbs.metas.*; import gplx.dbs.metas.updates.*; public class Xoud_history_tbl implements RlsAble { private final String tbl_name = "user_history"; private final Db_meta_fld_list flds = Db_meta_fld_list.new_(); @@ -31,6 +31,7 @@ public class Xoud_history_tbl implements RlsAble { stmt_insert = stmt_update = stmt_delete = stmt_select_by_page = stmt_select_by_top = null; conn.Rls_reg(this); } + public String Tbl_name() {return tbl_name;} public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds, Db_meta_idx.new_unique_by_tbl(tbl_name, "pkey", fld_wiki, fld_url)));} public void Rls() { stmt_insert = Db_stmt_.Rls(stmt_insert); diff --git a/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java b/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java index d3088f98b..15e1edaa9 100644 --- a/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/users/prefs/Prefs_mgr_tst.java @@ -179,6 +179,6 @@ class Gfui_html_mok extends Xog_html_itm { private Hash_adp elem_atrs = Hash_adp return (String)elem_atrs.Get_by(id + "." + atr_key); } @Override public boolean Html_elem_atr_get_bool(String id, String atr_key) { - return Bool_.parse_((String)elem_atrs.Get_by(id + "." + atr_key)); + return Bool_.parse((String)elem_atrs.Get_by(id + "." + atr_key)); } } diff --git a/400_xowa/src/gplx/xowa/wikis/data/Xow_page_fetcher_wiki.java b/400_xowa/src/gplx/xowa/wikis/data/Xow_page_fetcher_wiki.java index e4d4ae9ef..43cde6039 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/Xow_page_fetcher_wiki.java +++ b/400_xowa/src/gplx/xowa/wikis/data/Xow_page_fetcher_wiki.java @@ -20,7 +20,7 @@ public class Xow_page_fetcher_wiki implements Xow_page_fetcher { public Xow_page_fetcher Wiki_(Xowe_wiki v) {this.wiki = v; return this;} private Xowe_wiki wiki; public void Clear() {} public byte[] Get_by(int ns_id, byte[] ttl_bry) { - Xoa_ttl ttl = Xoa_ttl.parse_(wiki, ns_id, ttl_bry); + Xoa_ttl ttl = Xoa_ttl.parse(wiki, ns_id, ttl_bry); Xoae_page page = wiki.Data_mgr().Get_page(ttl, false); // go through data_mgr in case of redirects return page.Missing() ? null : page.Data_raw(); } diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_itm.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_itm.java index cc0a3306d..f044eacb4 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_itm.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_itm.java @@ -92,7 +92,7 @@ public class Xowd_page_itm implements Xobl_data_itm { public void Clear() { id = Id_null; text_len = 0; // text_len should be 0 b/c text defaults to 0; text_db_id = tdb_row_idx = 0; // default to 0, b/c some tests do not set and will fail at -1 - ns_id = Int_.MinValue; + ns_id = Int_.Min_value; ttl_full_db = ttl_page_db = null; text = Bry_.Empty; // default to Ary_empty for entries that have ns = null; redirected = exists = false; diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java index d37116f6a..44b946347 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_page_tbl.java @@ -219,7 +219,7 @@ public class Xowd_page_tbl implements RlsAble { public void Select_for_special_all_pages(Cancelable cancelable, List_adp rslt_list, Xowd_page_itm rslt_nxt, Xowd_page_itm rslt_prv, Int_obj_ref rslt_count, Xow_ns ns, byte[] key, int max_results, int min_page_len, int browse_len, boolean include_redirects, boolean fetch_prv_item) { Xowd_page_itm nxt_itm = null; int rslt_idx = 0; - boolean max_val_check = max_results == Int_.MaxValue; + boolean max_val_check = max_results == Int_.Max_value; Db_rdr rdr = Load_ttls_starting_with_rdr(ns.Id(), key, include_redirects, max_results, min_page_len, browse_len, true, true); try { while (rdr.Move_next()) { diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_tbl.java new file mode 100644 index 000000000..7c2252aaa --- /dev/null +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_tbl.java @@ -0,0 +1,37 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012 gnosygnu@gmail.com + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +import gplx.ios.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.dbs.*; import gplx.dbs.cfgs.*; +public class Xowd_pagelinks_tbl implements RlsAble { + private final String tbl_name = "pagelinks"; private final Db_meta_fld_list flds = Db_meta_fld_list.new_(); + private final String fld_src_id, fld_trg_id; + private final Db_conn conn; + public Xowd_pagelinks_tbl(Db_conn conn) { + this.conn = conn; + fld_src_id = flds.Add_int("src_id"); + fld_trg_id = flds.Add_int("trg_id"); + flds.Add_int("trg_count"); + conn.Rls_reg(this); + } + public Db_conn Conn() {return conn;} + public String Tbl_name() {return tbl_name;} + public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds));} + public void Create_idx__src_trg() {conn.Ddl_create_idx(Gfo_usr_dlg_.I, Db_meta_idx.new_unique_by_tbl(tbl_name, "src_trg", fld_src_id, fld_trg_id));} + public void Create_idx__trg_src() {conn.Ddl_create_idx(Gfo_usr_dlg_.I, Db_meta_idx.new_unique_by_tbl(tbl_name, "trg_src", fld_trg_id, fld_src_id));} + public void Rls() {} +} diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_temp_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_temp_tbl.java new file mode 100644 index 000000000..576359dc9 --- /dev/null +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_pagelinks_temp_tbl.java @@ -0,0 +1,45 @@ +/* +XOWA: the XOWA Offline Wiki Application +Copyright (C) 2012 gnosygnu@gmail.com + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . +*/ +package gplx.xowa.wikis.data.tbls; import gplx.*; import gplx.xowa.*; import gplx.xowa.wikis.*; import gplx.xowa.wikis.data.*; +import gplx.ios.*; import gplx.dbs.*; import gplx.dbs.qrys.*; import gplx.xowa.dbs.*; import gplx.dbs.cfgs.*; +public class Xowd_pagelinks_temp_tbl implements RlsAble { + private final String tbl_name = "pagelinks_temp"; private final Db_meta_fld_list flds = Db_meta_fld_list.new_(); + private final String fld_src_id, fld_trg_ns, fld_trg_ttl; + private final Db_conn conn; private Db_stmt stmt_insert; + public Xowd_pagelinks_temp_tbl(Db_conn conn) { + this.conn = conn; + flds.Add_int_pkey_autonum("uid"); + fld_src_id = flds.Add_int("src_id"); + fld_trg_ns = flds.Add_int("trg_ns"); + fld_trg_ttl = flds.Add_str("trg_ttl", 255); + conn.Rls_reg(this); + } + public Db_conn Conn() {return conn;} + public String Tbl_name() {return tbl_name;} + public void Create_tbl() {conn.Ddl_create_tbl(Db_meta_tbl.new_(tbl_name, flds));} + public void Create_idx() {conn.Ddl_create_idx(Gfo_usr_dlg_.I, Db_meta_idx.new_normal_by_tbl(tbl_name, "main", fld_src_id, fld_trg_ns, fld_trg_ttl));} + public void Insert_bgn() {conn.Txn_bgn("schema__pagelinks__insert"); stmt_insert = conn.Stmt_insert(tbl_name, flds);} + public void Insert_end() {conn.Txn_end(); stmt_insert = Db_stmt_.Rls(stmt_insert);} + public void Insert(int src_id, int trg_ns, byte[] trg_ttl) { + if (stmt_insert == null) stmt_insert = conn.Stmt_insert(tbl_name, flds); + stmt_insert.Clear().Val_int(fld_src_id, src_id).Val_int(fld_trg_ns, trg_ns).Val_bry_as_str(fld_trg_ttl, trg_ttl).Exec_insert(); + } + public void Rls() { + stmt_insert = Db_stmt_.Rls(stmt_insert); + } +} diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java index 1a3876bd7..5f5b41945 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_site_ns_tbl.java @@ -70,7 +70,7 @@ public class Xowd_site_ns_tbl { .Crt_int(fld_id, ns_id) .Exec_select__rls_auto(); try { - return rdr.Move_next() ? Int_.cast_(rdr.Read_int(fld_count)) : 0; + return rdr.Move_next() ? Int_.cast(rdr.Read_int(fld_count)) : 0; } finally {rdr.Rls();} } public void Update_ns_count(int ns_id, int ns_count) { diff --git a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java index 0149dab28..d1f74001a 100644 --- a/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java +++ b/400_xowa/src/gplx/xowa/wikis/data/tbls/Xowd_xowa_db_tbl.java @@ -48,7 +48,7 @@ public class Xowd_xowa_db_tbl { if (!schema_is_1) { ns_ids = rdr.Read_str(fld_ns_ids); part_id = rdr.Read_int(fld_part_id); - guid = Guid_adp_.parse_(rdr.Read_str(fld_guid)); + guid = Guid_adp_.parse(rdr.Read_str(fld_guid)); } list.Add(Xowd_db_file.load_(props, rdr.Read_int(fld_id), rdr.Read_byte(fld_type), wiki_root_dir.GenSubFil(rdr.Read_str(fld_url)), ns_ids, part_id, guid)); } diff --git a/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_xo_.java b/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_xo_.java index 626339f11..9af1eaa4e 100644 --- a/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_xo_.java +++ b/400_xowa/src/gplx/xowa/wikis/domains/Xow_abrv_xo_.java @@ -50,6 +50,6 @@ public class Xow_abrv_xo_ { domain_bry = type.Domain_bry(); } } - return Xow_domain_itm_.parse(domain_bry); // for consolidation's sake, parse abrv to domain_bry and pass to Xow_domain_itm_.parse_() + return Xow_domain_itm_.parse(domain_bry); // for consolidation's sake, parse abrv to domain_bry and pass to Xow_domain_itm_.parse() } } diff --git a/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl__i18n_tst.java b/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl__i18n_tst.java index c6f73de0f..08bcbd182 100644 --- a/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl__i18n_tst.java +++ b/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl__i18n_tst.java @@ -20,8 +20,14 @@ import org.junit.*; import gplx.xowa.langs.cases.*; public class Xow_ttl__i18n_tst { @Before public void init() {fxt.Reset();} private Xow_ttl_fxt fxt = new Xow_ttl_fxt(); - @Test public void Bidi() { // PURPOSE: handle bidirectional characters; DATE:2015-07-28 - fxt.Init_ttl("A\u00E2\u0080\u008E\u00E2\u0080\u008F\u00E2\u0080\u00AA\u00E2\u0080\u00AB\u00E2\u0080\u00AC\u00E2\u0080\u00AD\u00E2\u0080\u00AEB").Expd_page_txt("AB").Test(); + @Test public void Bidi() { // PURPOSE: handle bidirectional characters; DATE:2015-07-28; DATE:2015-08-24 + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0x8E)) + "B").Expd_page_txt("AB").Test(); + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0x8F)) + "B").Expd_page_txt("AB").Test(); + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0xAA)) + "B").Expd_page_txt("AB").Test(); + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0xAB)) + "B").Expd_page_txt("AB").Test(); + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0xAC)) + "B").Expd_page_txt("AB").Test(); + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0xAD)) + "B").Expd_page_txt("AB").Test(); + fxt.Init_ttl("A" + String_.new_u8(Bry_.ints_(0xE2, 0x80, 0xAE)) + "B").Expd_page_txt("AB").Test(); } @Test public void Multi_byte_char2() { // PURPOSE: multi-byte HTML entity causes array out of index error; EX: w:List_of_Unicode_characters; DATE:2013-12-25 fxt.Init_ttl("ⱥ").Expd_full_txt("ⱥ").Test(); diff --git a/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl_fxt.java b/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl_fxt.java index 49c2cf77f..41af8d7d4 100644 --- a/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl_fxt.java +++ b/400_xowa/src/gplx/xowa/wikis/ttls/Xow_ttl_fxt.java @@ -19,9 +19,10 @@ package gplx.xowa.wikis.ttls; import gplx.*; import gplx.xowa.*; import gplx.xow class Xow_ttl_fxt { private Xop_fxt fxt = new Xop_fxt(); public Xow_ttl_fxt Init_ttl(String raw) {test_raw = raw; return this;} private String test_raw = ""; - public Xow_ttl_fxt Expd_ns_id(int v) {expd_ns_id = v; return this;} private int expd_ns_id = Int_.MinValue; + public Xow_ttl_fxt Expd_ns_id(int v) {expd_ns_id = v; return this;} private int expd_ns_id = Int_.Min_value; public Xow_ttl_fxt Expd_page_txt(String v) {expd_page_txt = v; return this;} private String expd_page_txt; public Xow_ttl_fxt Expd_page_url(String v) {expd_page_url = v; return this;} private String expd_page_url; + public Xow_ttl_fxt Expd_page_db (String v) {expd_page_db = v; return this;} private String expd_page_db; public Xow_ttl_fxt Expd_full_txt(String v) {expd_full_txt = v; return this;} private String expd_full_txt; public Xow_ttl_fxt Expd_full_url(String v) {expd_full_url = v; return this;} private String expd_full_url; public Xow_ttl_fxt Expd_leaf_txt(String v) {expd_leaf_txt = v; return this;} private String expd_leaf_txt; @@ -46,7 +47,7 @@ class Xow_ttl_fxt { fxt.Reset(); fxt.Wiki().Xwiki_mgr().Add_full(Bry_.new_a7("fr"), Bry_.new_a7("fr.wikipedia.org")); test_raw = "Test page"; - expd_ns_id = Int_.MinValue; + expd_ns_id = Int_.Min_value; expd_xwik_txt = expd_full_txt = expd_full_url = expd_page_txt = expd_page_url = expd_leaf_txt = expd_leaf_url = expd_base_txt = expd_base_url = expd_root_txt = expd_rest_txt = expd_talk_txt = expd_talk_url = expd_subj_txt = expd_subj_url = expd_anch_txt = expd_base_txt_wo_qarg = expd_leaf_txt_wo_qarg = expd_qarg_txt = null; @@ -55,12 +56,13 @@ class Xow_ttl_fxt { fxt.Log_clear(); } public void Test() { - Xoa_ttl actl = Xoa_ttl.parse_(fxt.Wiki(), Bry_.new_u8(test_raw)); + Xoa_ttl actl = Xoa_ttl.parse(fxt.Wiki(), Bry_.new_u8(test_raw)); if (expd_err == null) { - if (expd_ns_id != Int_.MinValue) Tfds.Eq(expd_ns_id, actl.Ns().Id(), "ns"); + if (expd_ns_id != Int_.Min_value) Tfds.Eq(expd_ns_id, actl.Ns().Id(), "ns"); if (expd_xwik_txt != null) Tfds.Eq(expd_xwik_txt, String_.new_u8(actl.Wik_txt()), "Wiki"); if (expd_page_txt != null) Tfds.Eq(expd_page_txt, String_.new_u8(actl.Page_txt()), "Page_txt"); if (expd_page_url != null) Tfds.Eq(expd_page_url, String_.new_u8(actl.Page_url()), "Page_url"); + if (expd_page_db != null) Tfds.Eq(expd_page_db , String_.new_u8(actl.Page_db()) , "Page_db"); if (expd_full_txt != null) Tfds.Eq(expd_full_txt, String_.new_u8(actl.Full_txt()), "Full_txt"); if (expd_full_url != null) Tfds.Eq(expd_full_url, String_.new_u8(actl.Full_url()), "Full_url"); if (expd_leaf_txt != null) Tfds.Eq(expd_leaf_txt, String_.new_u8(actl.Leaf_txt()), "Leaf_txt"); diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_fxt.java b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_fxt.java index a3f5d4bae..dfe0e3b8e 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_fxt.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_fxt.java @@ -51,7 +51,7 @@ public class Xow_lang_mgr_fxt { Xoae_app app; public void tst(String raw, String expd) { Xop_ctx ctx = wiki.Ctx(); - ctx.Cur_page().Ttl_(Xoa_ttl.parse_(wiki, Bry_.new_a7("test_page"))); + ctx.Cur_page().Ttl_(Xoa_ttl.parse(wiki, Bry_.new_a7("test_page"))); byte[] raw_bry = Bry_.new_u8(raw); Bry_bfr bfr = Bry_bfr.new_(); Xop_root_tkn root = ctx.Tkn_mkr().Root(raw_bry); diff --git a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_tst.java b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_tst.java index 42dbd57da..819d15855 100644 --- a/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_tst.java +++ b/400_xowa/src/gplx/xowa/wikis/xwikis/Xow_lang_mgr_tst.java @@ -23,7 +23,7 @@ public class Xow_lang_mgr_tst { @Test public void Basic() { fxt.tst("[[simple:Earth]] [[fr:Terre]] [[es:Tierra]] [[de:Erde]] [[it:Terre]]", String_.Concat_lines_nl_skip_last ( "
    " - , "
    In other languages (links: 5)
    " + , "
    In other languages (links: 5)
    " , "