6767.diff
rules/convert/builtin_functions.rules 2022-10-10 14:57:13 +0000 | ||
---|---|---|
187 | 187 |
** RFB 20210713 Added support for LIST-EVENTS (HandleOps.listEvents). Ref #5536. |
188 | 188 |
** CA 20220930 Dynamic invocation of functions or RUN statements are now tracked via an |
189 | 189 |
** InvokeConfig call-site, to allow the runtime to cache the target of the call-site. |
190 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
190 | 191 |
*/ |
191 | 192 |
--> |
192 | 193 |
|
... | ... | |
578 | 579 |
|
579 | 580 |
<!-- DATA-SOURCE-MODIFIED function --> |
580 | 581 |
<rule>ftype == prog.kw_data_sm |
581 |
<action>methodText = "DataSourceModifiable.isDataSourceModified"</action>
|
|
582 |
<action>methodText = "DataSourceModifiable.dataSourceModified"</action>
|
|
582 | 583 |
<action>dbimport = true</action> |
583 | 584 |
</rule> |
584 | 585 |
|
rules/convert/datasets.rules 2022-10-10 14:57:50 +0000 | ||
---|---|---|
4 | 4 |
** Module : datasets.rules |
5 | 5 |
** Abstract : converts static (and dynamic) DataSets definitions |
6 | 6 |
** |
7 |
** Copyright (c) 2019-2020, Golden Code Development Corporation.
|
|
7 |
** Copyright (c) 2019-2022, Golden Code Development Corporation.
|
|
8 | 8 |
** |
9 | 9 |
** _#_ _I_ __Date__ _________________________________Description_________________________________ |
10 | 10 |
** 001 OM 20190327 First commit. |
... | ... | |
20 | 20 |
** APIs, as these modes are optional for function or OO method definitions. |
21 | 21 |
** 006 CA 20200503 ParameterOption enums are qualified and not imported, as it collides |
22 | 22 |
** character.valueOf with. |
23 |
** 007 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
23 | 24 |
*/ |
24 | 25 |
--> |
25 | 26 | |
... | ... | |
382 | 383 |
</rule> |
383 | 384 |
<rule>type == prog.kw_serialzn |
384 | 385 |
<action> |
385 |
execLib("addChainNode", copy.parent, "setSerializeName", java.method_call)
|
|
386 |
execLib("addChainNode", copy.parent, "serializeName", java.method_call) |
|
386 | 387 |
</action> |
387 | 388 |
</rule> |
388 | 389 |
<rule>type == prog.kw_xml_ntyp |
rules/convert/methods_attributes.rules 2022-10-10 14:58:05 +0000 | ||
---|---|---|
537 | 537 |
** moveBeforeTabItem. See #6383. |
538 | 538 |
** VVT 20221003 CommonHandle.getResourceType() method renamed to resourceType() to prevent convlicts |
539 | 539 |
** with namesakes in DMO. See #6694. |
540 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
540 | 541 |
*/ |
541 | 542 |
--> |
542 | 543 |
|
... | ... | |
707 | 708 |
<rule>list.put(prog.kw_cur_qry , execLib("cr_descr", "DataRelation" , "getCurrentQuery" , null , true ))</rule> |
708 | 709 |
<rule>list.put(prog.kw_cvt_3d_c, execLib("cr_descr", "ImageSupport" , "getConvert3D" , "setConvert3D" , true ))</rule> |
709 | 710 |
<rule>list.put(prog.kw_data_scm, execLib("cr_descr", "Buffer" , "dataSourceCompleteMap" , null , true ))</rule> |
710 |
<rule>list.put(prog.kw_data_sm , execLib("cr_descr", "DataSourceModifiable" , "isDataSourceModified" , "setDataSourceModified" , true ))</rule>
|
|
711 |
<rule>list.put(prog.kw_data_sm , execLib("cr_descr", "DataSourceModifiable" , "dataSourceModified" , "dataSourceModified" , true ))</rule>
|
|
711 | 712 |
<rule>list.put(prog.kw_data_src, execLib("cr_descr", "Buffer" , "dataSource" , null , true ))</rule> |
712 | 713 |
<rule>list.put(prog.kw_data_sri, execLib("cr_descr", "Buffer" , "dataSourceRowid" , "dataSourceRowid" , true ))</rule> |
713 | 714 |
<rule>list.put(prog.kw_dataset , execLib("cr_descr", "Buffer" , "dataSet" , null , true ))</rule> |
... | ... | |
813 | 814 |
<rule>list.put(prog.kw_invoke , execLib("cr_descr", "Call" , "invoke" , null , true ))</rule> |
814 | 815 |
<rule>list.put(prog.kw_is_open , execLib("cr_descr", "Openable" , "isOpen" , null , true ))</rule> |
815 | 816 |
<rule>list.put(prog.kw_is_p_set, execLib("cr_descr", "Call" , "isParameterSet" , null , true ))</rule> |
816 |
<rule>list.put(prog.kw_is_m_ten, execLib("cr_descr", "Buffer" , "isMultiTenant" , "setMultiTenant" , true ))</rule>
|
|
817 |
<rule>list.put(prog.kw_is_m_ten, execLib("cr_descr", "Buffer" , "multiTenant" , "multiTenant" , true ))</rule>
|
|
817 | 818 |
<rule>list.put(prog.kw_key , execLib("cr_descr", "BufferField" , "isKey" , null , true ))</rule> |
818 | 819 |
<rule>list.put(prog.kw_keys , execLib("cr_descr", "Keyable" , "keys" , null , true ))</rule> |
819 | 820 |
<rule>list.put(prog.kw_lab_bgc , execLib("cr_descr", "BrowseElement" , "getLabelBgColor" , "setLabelBgColor" , true ))</rule> |
... | ... | |
914 | 915 |
<rule>list.put(prog.kw_prim_p_p, execLib("cr_descr", "ClientPrincipal" , "getPrimaryPassphrase" , "setPrimaryPassphrase" , true ))</rule> |
915 | 916 |
<rule>list.put(prog.kw_print , execLib("cr_descr", "HtmlBrowser" , "print" , null , true ))</rule> |
916 | 917 |
<rule>list.put(prog.kw_proctype, execLib("cr_descr", "Call" , "getProcedureType" , "setProcedureType" , true ))</rule> |
917 |
<rule>list.put(prog.kw_qual_uid, execLib("cr_descr", "ClientPrincipal" , "getQualifiedUid" , "setQualifiedUid" , true ))</rule> |
|
918 |
<rule>list.put(prog.kw_query , execLib("cr_descr", "QueryAssociable" , "getQueryAsHandle" , "setQueryAsHandle" , true ))</rule>
|
|
918 |
<rule>list.put(prog.kw_qual_uid, execLib("cr_descr", "ClientPrincipal" , "getQualifiedUid" , "setQualifiedUid" , true ))</rule>
|
|
919 |
<rule>list.put(prog.kw_query , execLib("cr_descr", "QueryAssociable" , "queryAsHandle" , "queryAsHandle" , true ))</rule>
|
|
919 | 920 |
<rule>list.put(prog.kw_radio_b , execLib("cr_descr", "RadioSet" , "getRadioButtons" , "setRadioButtons" , true ))</rule> |
920 | 921 |
<rule>list.put(prog.kw_raw_tran, execLib("cr_descr", "Buffer" , "rawTransfer" , null , true ))</rule> |
921 | 922 |
<rule>list.put(prog.kw_read_fil, execLib("cr_descr", "Editor" , "readFile" , null , true ))</rule> |
... | ... | |
969 | 970 |
<rule>list.put(prog.kw_selected, execLib("cr_descr", "Widget" , "isSelected" , "setSelected" , true ))</rule> |
970 | 971 |
<rule>list.put(prog.kw_sep_fgc , execLib("cr_descr", "Browse" , "getSeparatorFgColor" , "setSeparatorFgColor" , true ))</rule> |
971 | 972 |
<rule>list.put(prog.kw_serialzh, execLib("cr_descr", "SerializeHiddenable" , "getSerializeHidden" , "setSerializeHidden" , true ))</rule> |
972 |
<rule>list.put(prog.kw_serialzn, execLib("cr_descr", "NamedSerializable" , "getSerializeName" , "setSerializeName" , true ))</rule>
|
|
973 |
<rule>list.put(prog.kw_serialzn, execLib("cr_descr", "NamedSerializable" , "serializeName" , "serializeName" , true ))</rule>
|
|
973 | 974 |
<rule>list.put(prog.kw_serialzr, execLib("cr_descr", "Buffer" , "serializeRow" , null , true ))</rule> |
974 | 975 |
<rule>list.put(prog.kw_server , execLib("cr_descr", "Remotable" , "getServerHandle" , "setServerHandle" , true ))</rule> |
975 | 976 |
<rule>list.put(prog.kw_sessn_id, execLib("cr_descr", "ClientPrincipal" , "getSessionId" , "setSessionId" , true ))</rule> |
... | ... | |
1071 | 1072 |
<rule>list.put(prog.kw_calvalue, execLib("cr_descr", "Calendar" , "getCalendarValue" , "setCalendarValue" , true ))</rule> |
1072 | 1073 |
<rule>list.put(prog.kw_cease , execLib("cr_descr", "FWDTimer" , "cease" , null , true ))</rule> |
1073 | 1074 |
<rule>list.put(prog.kw_check_bo, execLib("cr_descr", "TreeFace" , "isCheckBoxes" , "setCheckBoxes" , true ))</rule> |
1074 |
<rule>list.put(prog.kw_clea_tab, execLib("cr_descr", "Signature" , "clearTablet" , "" , true ))</rule>
|
|
1075 |
<rule>list.put(prog.kw_clea_win, execLib("cr_descr", "Signature" , "clearSignatureWindow" , "" , true ))</rule>
|
|
1075 |
<rule>list.put(prog.kw_clea_tab, execLib("cr_descr", "Signature" , "clearTablet" , "" , true ))</rule> |
|
1076 |
<rule>list.put(prog.kw_clea_win, execLib("cr_descr", "Signature" , "clearSignatureWindow" , "" , true ))</rule> |
|
1076 | 1077 |
<rule>list.put(prog.kw_clr_all , execLib("cr_descr", "TreeFace" , "clearAll" , null , true ))</rule> |
1077 | 1078 |
<rule>list.put(prog.kw_clr_attl, execLib("cr_descr", "EmailSender" , "clearAttachmentsList" , "" , true ))</rule> |
1078 | 1079 |
<rule>list.put(prog.kw_clr_bccl, execLib("cr_descr", "EmailSender" , "clearBccAddressList" , "" , true ))</rule> |
... | ... | |
1157 | 1158 |
<rule>list.put(prog.kw_is_c_vis, execLib("cr_descr", "TreeList" , "isColumnVisible" , null , true ))</rule> |
1158 | 1159 |
<rule>list.put(prog.kw_is_msel , execLib("cr_descr", "TreeFace" , "isMultiSelect" , null , true ))</rule> |
1159 | 1160 |
<rule>list.put(prog.kw_is_n_exp, execLib("cr_descr", "TreeFace" , "isNodeExpanded" , null , true ))</rule> |
1160 |
<rule>list.put(prog.kw_kpad_hot, execLib("cr_descr", "Signature" , "keypadAddHotSpot" , "" , true ))</rule>
|
|
1161 |
<rule>list.put(prog.kw_kpad_cle, execLib("cr_descr", "Signature" , "keypadClearHotSpotList" , "" , true ))</rule>
|
|
1162 |
<rule>list.put(prog.kw_kpad_qry, execLib("cr_descr", "Signature" , "keypadQueryHotSpot" , "" , true ))</rule>
|
|
1163 |
<rule>list.put(prog.kw_lcd_refr, execLib("cr_descr", "Signature" , "lcdRefresh" , "" , true ))</rule>
|
|
1164 |
<rule>list.put(prog.kw_lcd_swin, execLib("cr_descr", "Signature" , "lcdSetWindow" , "" , true ))</rule>
|
|
1165 |
<rule>list.put(prog.kw_lcd_wstr, execLib("cr_descr", "Signature" , "lcdWriteString" , "" , true ))</rule>
|
|
1161 |
<rule>list.put(prog.kw_kpad_hot, execLib("cr_descr", "Signature" , "keypadAddHotSpot" , "" , true ))</rule> |
|
1162 |
<rule>list.put(prog.kw_kpad_cle, execLib("cr_descr", "Signature" , "keypadClearHotSpotList" , "" , true ))</rule> |
|
1163 |
<rule>list.put(prog.kw_kpad_qry, execLib("cr_descr", "Signature" , "keypadQueryHotSpot" , "" , true ))</rule> |
|
1164 |
<rule>list.put(prog.kw_lcd_refr, execLib("cr_descr", "Signature" , "lcdRefresh" , "" , true ))</rule> |
|
1165 |
<rule>list.put(prog.kw_lcd_swin, execLib("cr_descr", "Signature" , "lcdSetWindow" , "" , true ))</rule> |
|
1166 |
<rule>list.put(prog.kw_lcd_wstr, execLib("cr_descr", "Signature" , "lcdWriteString" , "" , true ))</rule> |
|
1166 | 1167 |
<rule>list.put(prog.kw_msicon, execLib("cr_descr", "WidgetExtension" , "getMouseIcon" , "setMouseIcon" , true ))</rule> |
1167 | 1168 |
<rule>list.put(prog.kw_mspntnum, execLib("cr_descr", "WidgetExtension" , "getMousePointerNum" , "setMousePointerNum" , true ))</rule> |
1168 | 1169 |
<rule>list.put(prog.kw_m_d_i_p, execLib("cr_descr", "TreeList" , "moveDownInParent" , null , true ))</rule> |
... | ... | |
1179 | 1180 |
<rule>list.put(prog.kw_node_key, execLib("cr_descr", "TreeNodeFace" , "getNodeKey" , null , true ))</rule> |
1180 | 1181 |
<rule>list.put(prog.kw_node_par, execLib("cr_descr", "TreeNodeFace" , "getNodeParent" , null , true ))</rule> |
1181 | 1182 |
<rule>list.put(prog.kw_node_txt, execLib("cr_descr", "TreeNodeFace" , "getNodeText" , "setNodeText" , true ))</rule> |
1182 |
<rule>list.put(prog.kw_num_pnts, execLib("cr_descr", "Signature" , "numberOfTabletPoints" , "" , true ))</rule>
|
|
1183 |
<rule>list.put(prog.kw_num_pnts, execLib("cr_descr", "Signature" , "numberOfTabletPoints" , "" , true ))</rule> |
|
1183 | 1184 |
<rule>list.put(prog.kw_ocx_mbtn, execLib("cr_descr", "OcxMouse" , "getMouseButton" , null , true ))</rule> |
1184 | 1185 |
<rule>list.put(prog.kw_ocx_msht, execLib("cr_descr", "OcxMouse" , "getMouseShift" , null , true ))</rule> |
1185 | 1186 |
<rule>list.put(prog.kw_ocx_msx, execLib("cr_descr", "OcxMouse" , "getMouseX" , null , true ))</rule> |
... | ... | |
1241 | 1242 |
<rule>list.put(prog.kw_set_cptm, execLib("cr_descr", "Signature" , "setLCDCaptureMode" , "" , true ))</rule> |
1242 | 1243 |
<rule>list.put(prog.kw_set_f_d , execLib("cr_descr", "TabSet" , "setFontDetails" , null , true ))</rule> |
1243 | 1244 |
<rule>list.put(prog.kw_foc_asel, execLib("cr_descr", "SelectableText" , "focusAndSelect" , null , true ))</rule> |
1244 |
<rule>list.put(prog.kw_set_imgf, execLib("cr_descr", "Signature" , "setImageFileFormat" , "" , true ))</rule>
|
|
1245 |
<rule>list.put(prog.kw_set_imgh, execLib("cr_descr", "Signature" , "setImageXSize" , "" , true ))</rule>
|
|
1246 |
<rule>list.put(prog.kw_set_imgw, execLib("cr_descr", "Signature" , "setImageYSize" , "" , true ))</rule>
|
|
1247 |
<rule>list.put(prog.kw_set_jmod, execLib("cr_descr", "Signature" , "setJustifyMode" , "" , true ))</rule>
|
|
1248 |
<rule>list.put(prog.kw_set_jstx, execLib("cr_descr", "Signature" , "setJustifyX" , "" , true ))</rule>
|
|
1249 |
<rule>list.put(prog.kw_set_jsty, execLib("cr_descr", "Signature" , "setJustifyY" , "" , true ))</rule>
|
|
1245 |
<rule>list.put(prog.kw_set_imgf, execLib("cr_descr", "Signature" , "setImageFileFormat" , "" , true ))</rule> |
|
1246 |
<rule>list.put(prog.kw_set_imgh, execLib("cr_descr", "Signature" , "setImageXSize" , "" , true ))</rule> |
|
1247 |
<rule>list.put(prog.kw_set_imgw, execLib("cr_descr", "Signature" , "setImageYSize" , "" , true ))</rule> |
|
1248 |
<rule>list.put(prog.kw_set_jmod, execLib("cr_descr", "Signature" , "setJustifyMode" , "" , true ))</rule> |
|
1249 |
<rule>list.put(prog.kw_set_jstx, execLib("cr_descr", "Signature" , "setJustifyX" , "" , true ))</rule> |
|
1250 |
<rule>list.put(prog.kw_set_jsty, execLib("cr_descr", "Signature" , "setJustifyY" , "" , true ))</rule> |
|
1250 | 1251 |
<rule>list.put(prog.kw_set_msel, execLib("cr_descr", "TreeFace" , "setMultiSelect" , null , true ))</rule> |
1251 | 1252 |
<rule>list.put(prog.kw_set_n_bg, execLib("cr_descr", "TreeFace" , "setNodeBgColor" , null , true ))</rule> |
1252 | 1253 |
<rule>list.put(prog.kw_set_n_fg, execLib("cr_descr", "TreeFace" , "setNodeFgColor" , null , true ))</rule> |
... | ... | |
1258 | 1259 |
<rule>list.put(prog.kw_set_swin, execLib("cr_descr", "Signature" , "setSignatureWindow" , "" , true ))</rule> |
1259 | 1260 |
<rule>list.put(prog.kw_set_tbme, execLib("cr_descr", "Signature" , "setTranslateBitmapEnable" , "" , true ))</rule> |
1260 | 1261 |
<rule>list.put(prog.kw_set_tn_i, execLib("cr_descr", "TreeFace" , "setTreeNodeIcons" , null , true ))</rule> |
1261 |
<rule>list.put(prog.kw_set_tsta, execLib("cr_descr", "Signature" , "setTabletState" , "" , true ))</rule>
|
|
1262 |
<rule>list.put(prog.kw_set_tsta, execLib("cr_descr", "Signature" , "setTabletState" , "" , true ))</rule> |
|
1262 | 1263 |
<rule>list.put(prog.kw_show_but, execLib("cr_descr", "TreeFace" , "isShowButtons" , "setShowButtons" , true ))</rule> |
1263 | 1264 |
<rule>list.put(prog.kw_show_hdr, execLib("cr_descr", "TreeList" , "isShowHeader" , "setShowHeader" , true ))</rule> |
1264 | 1265 |
<rule>list.put(prog.kw_shr_d_f, execLib("cr_descr", "TreeList" , "getShortDateFormat" , "setShortDateFormat" , true ))</rule> |
... | ... | |
1280 | 1281 |
<rule>list.put(prog.kw_tab_show, execLib("cr_descr", "TabSet" , "show" , null , true ))</rule> |
1281 | 1282 |
<rule>list.put(prog.kw_tabs, execLib("cr_descr", "TabSet" , "getTabs" , "setTabs" , true ))</rule> |
1282 | 1283 |
<rule>list.put(prog.kw_tab_idx , execLib("cr_descr", "TabSet" , "getTabIndex" , "setTabIndex" , true ))</rule> |
1283 |
<rule>list.put(prog.kw_tab_mod, execLib("cr_descr", "Signature" , "tabletModelNumber" , "" , true ))</rule>
|
|
1284 |
<rule>list.put(prog.kw_tab_mod, execLib("cr_descr", "Signature" , "tabletModelNumber" , "" , true ))</rule> |
|
1284 | 1285 |
<rule>list.put(prog.kw_tab_ml , execLib("cr_descr", "TabSet" , "isMultiLine" , "setMultiLine" , true ))</rule> |
1285 | 1286 |
<rule>list.put(prog.kw_textedit, execLib("cr_descr", "TreeFace" , "isTextEdit" , "setTextEdit" , true ))</rule> |
1286 | 1287 |
<rule>list.put(prog.kw_tho_sep, execLib("cr_descr", "TreeList" , "getThousandSeparator" , "setThousandSeparator" , true ))</rule> |
... | ... | |
2847 | 2848 | |
2848 | 2849 |
<rule>ftype == prog.kw_adm_data |
2849 | 2850 |
<action>hwrap = "ADMData"</action> |
2850 |
<action>methodText = "getADMData"</action>
|
|
2851 |
<action>methodText = "admData"</action>
|
|
2851 | 2852 |
<rule>isAssign |
2852 |
<action>methodText = "setADMData"</action>
|
|
2853 |
<action>methodText = "admData"</action>
|
|
2853 | 2854 |
</rule> |
2854 | 2855 |
</rule> |
2855 | 2856 | |
... | ... | |
3134 | 3135 |
in the case of FRAMES, the attribute is documented as R/W --> |
3135 | 3136 |
<action>hwrap = "IterableResource"</action> |
3136 | 3137 |
<rule>isAssign |
3137 |
<action on="true">methodText = "setCurrentIteration"</action>
|
|
3138 |
<action on="true">methodText = "currentIteration"</action>
|
|
3138 | 3139 |
<action on="false">methodText = "currentIteration"</action> |
3139 | 3140 |
</rule> |
3140 | 3141 |
</rule> |
... | ... | |
3178 | 3179 | |
3179 | 3180 |
<rule>ftype == prog.kw_dbname |
3180 | 3181 |
<action>hwrap = "DatabaseInfo"</action> |
3181 |
<action>methodText = "getDbName"</action>
|
|
3182 |
<action>methodText = "dbName"</action>
|
|
3182 | 3183 |
</rule> |
3183 | 3184 | |
3184 | 3185 |
<rule>ftype == prog.kw_dcolor |
... | ... | |
4827 | 4828 |
</rule> |
4828 | 4829 | |
4829 | 4830 |
<rule>ftype == prog.kw_table |
4830 |
<action>methodText = "getTable"</action>
|
|
4831 |
<action>methodText = "table"</action>
|
|
4831 | 4832 |
</rule> |
4832 | 4833 | |
4833 | 4834 |
<rule>ftype == prog.kw_3d |
... | ... | |
4844 | 4845 | |
4845 | 4846 |
<rule>ftype == prog.kw_table |
4846 | 4847 |
<action>hwrap = "DatabaseInfo"</action> |
4847 |
<action>methodText = "getTable"</action>
|
|
4848 |
<action>methodText = "table"</action>
|
|
4848 | 4849 |
</rule> |
4849 | 4850 | |
4850 | 4851 |
<rule>ftype == prog.kw_title |
... | ... | |
4887 | 4888 |
<!-- Attribute for DOM XML --> |
4888 | 4889 |
<rule>ftype == prog.kw_uniq_id |
4889 | 4890 |
<action>hwrap = "UniqueID"</action> |
4890 |
<action>methodText = "getUniqueID"</action>
|
|
4891 |
<action>methodText = "uniqueID"</action>
|
|
4891 | 4892 |
<action>xmlimport = true</action> |
4892 | 4893 |
</rule> |
4893 | 4894 |
src/com/goldencode/p2j/convert/BufferList.java 2022-10-10 14:58:32 +0000 | ||
---|---|---|
2 | 2 |
** Module : BufferList.java |
3 | 3 |
** Abstract : stores the list of all buffers by the same name in a source file |
4 | 4 |
** |
5 |
** Copyright (c) 2005-2019, Golden Code Development Corporation.
|
|
5 |
** Copyright (c) 2005-2022, Golden Code Development Corporation.
|
|
6 | 6 |
** |
7 | 7 |
** -#- -I- --Date-- --JPRM-- ----------------Description----------------- |
8 | 8 |
** 001 GES 20050922 @22788 First version which provides a helper class to store the list of all |
... | ... | |
16 | 16 |
** 007 OM 20161007 Code maintenance (generified, typo fix, javadoc). |
17 | 17 |
** 008 CA 20190128 Track buffer's static state (if OO). |
18 | 18 |
** 009 CA 20190513 Fixed buffer usage from super-classes, in OO. |
19 |
** 010 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
19 | 20 |
*/ |
20 | 21 |
/* |
21 | 22 |
** This program is free software: you can redistribute it and/or modify |
... | ... | |
275 | 276 |
* |
276 | 277 |
* @return The logical database for this buffer. |
277 | 278 |
*/ |
278 |
public String getDbName()
|
|
279 |
public String dbName()
|
|
279 | 280 |
{ |
280 | 281 |
return dbName; |
281 | 282 |
} |
src/com/goldencode/p2j/persist/AbstractTempTable.java 2022-10-10 15:15:02 +0000 | ||
---|---|---|
46 | 46 |
** CA 20220214 The slave buffers are cleaned up only when the associated temp-table gets deleted. |
47 | 47 |
** OM 20220422 Allow Xml/JsonImport to load records into buffer without exposing package private methods. |
48 | 48 |
** CA 20221006 UNIQUE-ID is kept as a Java type instead of BDT. Refs #6827 |
49 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
49 | 50 |
*/ |
50 | 51 | |
51 | 52 |
/* |
... | ... | |
246 | 247 |
* @return The integer number of the children. |
247 | 248 |
*/ |
248 | 249 |
@Override |
249 |
public integer getUniqueID()
|
|
250 |
public integer uniqueID()
|
|
250 | 251 |
{ |
251 | 252 |
if (uniqueId == null) |
252 | 253 |
{ |
... | ... | |
591 | 592 |
* @return See above. |
592 | 593 |
*/ |
593 | 594 |
@Override |
594 |
public character getADMData()
|
|
595 |
public character admData()
|
|
595 | 596 |
{ |
596 | 597 |
return new character(this.admData); |
597 | 598 |
} |
... | ... | |
603 | 604 |
* The new value. |
604 | 605 |
*/ |
605 | 606 |
@Override |
606 |
public void setADMData(String value)
|
|
607 |
public void admData(String value)
|
|
607 | 608 |
{ |
608 | 609 |
this.admData.assign(value); |
609 | 610 |
} |
... | ... | |
615 | 616 |
* The new value. |
616 | 617 |
*/ |
617 | 618 |
@Override |
618 |
public void setADMData(character value)
|
|
619 |
public void admData(character value)
|
|
619 | 620 |
{ |
620 | 621 |
this.admData.assign(value); |
621 | 622 |
} |
... | ... | |
2043 | 2044 |
@Override |
2044 | 2045 |
public character getXmlNodeName() |
2045 | 2046 |
{ |
2046 |
return xmlNodeName == null || xmlNodeName.trim().isEmpty() ? getSerializeName()
|
|
2047 |
return xmlNodeName == null || xmlNodeName.trim().isEmpty() ? serializeName()
|
|
2047 | 2048 |
: new character(xmlNodeName); |
2048 | 2049 |
} |
2049 | 2050 |
|
... | ... | |
2240 | 2241 |
* @return {@code true} when the data has been modified. |
2241 | 2242 |
*/ |
2242 | 2243 |
@Override |
2243 |
public logical isDataSourceModified()
|
|
2244 |
public logical dataSourceModified()
|
|
2244 | 2245 |
{ |
2245 | 2246 |
return new logical(dataSourceModified); |
2246 | 2247 |
} |
... | ... | |
2252 | 2253 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
2253 | 2254 |
*/ |
2254 | 2255 |
@Override |
2255 |
public void setDataSourceModified(logical mod)
|
|
2256 |
public void dataSourceModified(logical mod)
|
|
2256 | 2257 |
{ |
2257 | 2258 |
if (mod == null || mod.isUnknown()) |
2258 | 2259 |
{ |
... | ... | |
2260 | 2261 |
return; |
2261 | 2262 |
} |
2262 | 2263 |
|
2263 |
setDataSourceModified(mod.getValue());
|
|
2264 |
dataSourceModified(mod.getValue());
|
|
2264 | 2265 |
} |
2265 | 2266 |
|
2266 | 2267 |
/** |
... | ... | |
2270 | 2271 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
2271 | 2272 |
*/ |
2272 | 2273 |
@Override |
2273 |
public void setDataSourceModified(boolean mod)
|
|
2274 |
public void dataSourceModified(boolean mod)
|
|
2274 | 2275 |
{ |
2275 | 2276 |
this.dataSourceModified = mod; |
2276 | 2277 |
} |
... | ... | |
2281 | 2282 |
* @return the current value of the {@code SERIALIZE-NAME} attribute. |
2282 | 2283 |
*/ |
2283 | 2284 |
@Override |
2284 |
public character getSerializeName()
|
|
2285 |
public character serializeName()
|
|
2285 | 2286 |
{ |
2286 | 2287 |
return new character(serializeName == null || serializeName.trim().isEmpty() ? name.getValue() |
2287 | 2288 |
: serializeName); |
... | ... | |
2294 | 2295 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
2295 | 2296 |
*/ |
2296 | 2297 |
@Override |
2297 |
public void setSerializeName(Text sName)
|
|
2298 |
public void serializeName(Text sName) |
|
2298 | 2299 |
{ |
2299 |
setSerializeName(sName == null || sName.isUnknown() ? null : sName.getValue());
|
|
2300 |
serializeName(sName == null || sName.isUnknown() ? null : sName.getValue()); |
|
2300 | 2301 |
} |
2301 | 2302 |
|
2302 | 2303 |
/** |
... | ... | |
2306 | 2307 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
2307 | 2308 |
*/ |
2308 | 2309 |
@Override |
2309 |
public void setSerializeName(String sName)
|
|
2310 |
public void serializeName(String sName) |
|
2310 | 2311 |
{ |
2311 | 2312 |
serializeName = sName; |
2312 | 2313 |
} |
src/com/goldencode/p2j/persist/Buffer.java 2022-10-10 15:15:20 +0000 | ||
---|---|---|
2 | 2 |
** Module : Buffer.java |
3 | 3 |
** Abstract : interface which must be extended by any business DMO interface |
4 | 4 |
** |
5 |
** Copyright (c) 2013-2021, Golden Code Development Corporation.
|
|
5 |
** Copyright (c) 2013-2022, Golden Code Development Corporation.
|
|
6 | 6 |
** |
7 | 7 |
** -#- -I- --Date-- ---------------------------------------Description--------------------------------------- |
8 | 8 |
** 001 ECF 20130118 Created initial version. |
... | ... | |
92 | 92 |
** OM 20201205 Added AUTO-DELETE attribute definition. |
93 | 93 |
** OM 20201218 Fixed implementation for error and rejected attributes/hidden fields. |
94 | 94 |
** OM 20211020 Added _DATASOURCE_ROWID property. |
95 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
95 | 96 |
*/ |
96 | 97 | |
97 | 98 |
/* |
... | ... | |
2778 | 2779 |
* @return See above. |
2779 | 2780 |
*/ |
2780 | 2781 |
@LegacyAttribute(name = "IS-MULTI-TENANT") |
2781 |
public logical isMultiTenant();
|
|
2782 |
|
|
2783 |
/** |
|
2784 |
* Setter for the IS-MULTI-TENANT attribute. |
|
2785 |
* |
|
2786 |
* @param l |
|
2787 |
* The flag value. |
|
2788 |
*/ |
|
2789 |
@LegacyAttribute(name = "IS-MULTI-TENANT", setter = true) |
|
2790 |
public void setMultiTenant(logical l);
|
|
2791 |
|
|
2792 |
/** |
|
2793 |
* Setter for the IS-MULTI-TENANT attribute. |
|
2794 |
* |
|
2795 |
* @param l |
|
2796 |
* The flag value. |
|
2797 |
*/ |
|
2798 |
@LegacyAttribute(name = "IS-MULTI-TENANT", setter = true) |
|
2799 |
public void setMultiTenant(boolean l);
|
|
2782 |
public logical multiTenant();
|
|
2783 |
|
|
2784 |
/** |
|
2785 |
* Setter for the IS-MULTI-TENANT attribute. |
|
2786 |
* |
|
2787 |
* @param l |
|
2788 |
* The flag value. |
|
2789 |
*/ |
|
2790 |
@LegacyAttribute(name = "IS-MULTI-TENANT", setter = true) |
|
2791 |
public void multiTenant(logical l);
|
|
2792 |
|
|
2793 |
/** |
|
2794 |
* Setter for the IS-MULTI-TENANT attribute. |
|
2795 |
* |
|
2796 |
* @param l |
|
2797 |
* The flag value. |
|
2798 |
*/ |
|
2799 |
@LegacyAttribute(name = "IS-MULTI-TENANT", setter = true) |
|
2800 |
public void multiTenant(boolean l);
|
|
2800 | 2801 |
|
2801 | 2802 |
/** |
2802 | 2803 |
* Definition of the SERIALIZE-ROW method. Writes current row from this buffer into the specified data |
src/com/goldencode/p2j/persist/BufferFieldImpl.java 2022-10-10 15:15:33 +0000 | ||
---|---|---|
65 | 65 |
** created. |
66 | 66 |
** CA 20221006 Fixed a NPE related to instantiating-procedure in 'changeValue' (surrogate instances being |
67 | 67 |
** created). |
68 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
68 | 69 |
*/ |
69 | 70 | |
70 | 71 |
/* |
... | ... | |
907 | 908 |
* @return Current value of the DBNAME attribute. |
908 | 909 |
*/ |
909 | 910 |
@Override |
910 |
public character getDbName()
|
|
911 |
public character dbName()
|
|
911 | 912 |
{ |
912 | 913 |
return new character(fieldRef.getParentBuffer().getDatabase().getName()); |
913 | 914 |
} |
... | ... | |
918 | 919 |
* @return Current value of the TABLE attribute. |
919 | 920 |
*/ |
920 | 921 |
@Override |
921 |
public character getTable()
|
|
922 |
public character table()
|
|
922 | 923 |
{ |
923 | 924 |
return new character(fieldRef.getParentBuffer().getTable()); |
924 | 925 |
} |
... | ... | |
1366 | 1367 |
* @return See above. |
1367 | 1368 |
*/ |
1368 | 1369 |
@Override |
1369 |
public character getADMData()
|
|
1370 |
public character admData()
|
|
1370 | 1371 |
{ |
1371 | 1372 |
return new character(this.admData); |
1372 | 1373 |
} |
... | ... | |
1378 | 1379 |
* The new value. |
1379 | 1380 |
*/ |
1380 | 1381 |
@Override |
1381 |
public void setADMData(String value)
|
|
1382 |
public void admData(String value)
|
|
1382 | 1383 |
{ |
1383 | 1384 |
this.admData = value; |
1384 | 1385 |
} |
... | ... | |
1390 | 1391 |
* The new value. |
1391 | 1392 |
*/ |
1392 | 1393 |
@Override |
1393 |
public void setADMData(character value)
|
|
1394 |
public void admData(character value)
|
|
1394 | 1395 |
{ |
1395 | 1396 |
this.admData = value.toJavaType(); |
1396 | 1397 |
} |
... | ... | |
1402 | 1403 |
* @return The integer number of the children. |
1403 | 1404 |
*/ |
1404 | 1405 |
@Override |
1405 |
public integer getUniqueID()
|
|
1406 |
public integer uniqueID()
|
|
1406 | 1407 |
{ |
1407 | 1408 |
return new integer(this.uniqueID); |
1408 | 1409 |
} |
... | ... | |
1424 | 1425 |
* @return the current value of the {@code SERIALIZE-NAME} attribute. |
1425 | 1426 |
*/ |
1426 | 1427 |
@Override |
1427 |
public character getSerializeName()
|
|
1428 |
public character serializeName()
|
|
1428 | 1429 |
{ |
1429 |
String sName = lfi.getSerializeOptions(getTempTable()).getSerializeName();
|
|
1430 |
String sName = lfi.getSerializeOptions(getTempTable()).serializeName();
|
|
1430 | 1431 |
return new character(sName == null || sName.trim().isEmpty() ? lfi.getLegacyName() : sName); |
1431 | 1432 |
} |
1432 | 1433 |
|
... | ... | |
1437 | 1438 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
1438 | 1439 |
*/ |
1439 | 1440 |
@Override |
1440 |
public void setSerializeName(Text sName)
|
|
1441 |
public void serializeName(Text sName) |
|
1441 | 1442 |
{ |
1442 |
setSerializeName(sName == null || sName.isUnknown() ? null : sName.getValue());
|
|
1443 |
serializeName(sName == null || sName.isUnknown() ? null : sName.getValue()); |
|
1443 | 1444 |
} |
1444 | 1445 |
|
1445 | 1446 |
/** |
... | ... | |
1449 | 1450 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
1450 | 1451 |
*/ |
1451 | 1452 |
@Override |
1452 |
public void setSerializeName(String sName)
|
|
1453 |
public void serializeName(String sName) |
|
1453 | 1454 |
{ |
1454 | 1455 |
// this actually works for permanent tables, too, although they cannot be serialized |
1455 |
lfi.getSerializeOptions(getTempTable()).setSerializeName(sName);
|
|
1456 |
lfi.getSerializeOptions(getTempTable()).serializeName(sName); |
|
1456 | 1457 |
} |
1457 | 1458 |
|
1458 | 1459 |
/** |
src/com/goldencode/p2j/persist/BufferImpl.java 2022-10-10 15:15:43 +0000 | ||
---|---|---|
74 | 74 |
** 025 ECF 20131028 Import change. |
75 | 75 |
** 026 SVL 20131028 Handled bufferField() for static tables, added doSetName. |
76 | 76 |
** 027 CA 20131013 Static buffers are deleted only when the instantiating procedure gets deleted. |
77 |
** 028 OM 20131128 Stub implementation for getUniqueID.
|
|
77 |
** 028 OM 20131128 Stub implementation for uniqueID.
|
|
78 | 78 |
** 029 HC 20131222 Implemented ADM-DATA and UNIQUE-ID attribute. |
79 | 79 |
** 030 VMN 20140110 Implemented bufferField(character). |
80 | 80 |
** 031 OM 20140107 Implemented disableDumpTriggers() and disableLoadTriggers() methods and |
... | ... | |
224 | 224 |
** BUFFER-FIELD's instantiating procedure must be the BUFFER's, and not when it gets lazily |
225 | 225 |
** created. |
226 | 226 |
** CA 20221010 Reduced 'toLowerCase' usage in 'attachDataSource'. Refs #6820 |
227 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
227 | 228 |
*/ |
228 | 229 | |
229 | 230 |
/* |
... | ... | |
687 | 688 |
* @return {@code true} when the data has been modified. |
688 | 689 |
*/ |
689 | 690 |
@Override |
690 |
public logical isDataSourceModified()
|
|
691 |
public logical dataSourceModified()
|
|
691 | 692 |
{ |
692 | 693 |
return new logical(dataSourceModified); |
693 | 694 |
} |
... | ... | |
699 | 700 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
700 | 701 |
*/ |
701 | 702 |
@Override |
702 |
public void setDataSourceModified(logical mod)
|
|
703 |
public void dataSourceModified(logical mod)
|
|
703 | 704 |
{ |
704 | 705 |
if (mod == null || mod.isUnknown()) |
705 | 706 |
{ |
... | ... | |
707 | 708 |
return; |
708 | 709 |
} |
709 | 710 |
|
710 |
setDataSourceModified(mod.getValue());
|
|
711 |
dataSourceModified(mod.getValue());
|
|
711 | 712 |
} |
712 | 713 |
|
713 | 714 |
/** |
... | ... | |
717 | 718 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
718 | 719 |
*/ |
719 | 720 |
@Override |
720 |
public void setDataSourceModified(boolean mod)
|
|
721 |
public void dataSourceModified(boolean mod)
|
|
721 | 722 |
{ |
722 | 723 |
this.dataSourceModified = mod; |
723 | 724 |
} |
... | ... | |
932 | 933 |
* @return See above. |
933 | 934 |
*/ |
934 | 935 |
@Override |
935 |
public logical isMultiTenant()
|
|
936 |
public logical multiTenant()
|
|
936 | 937 |
{ |
937 | 938 |
// TODO: multi-tenant is not supported at this time |
938 | 939 |
return new logical(false); |
... | ... | |
945 | 946 |
* The flag value. |
946 | 947 |
*/ |
947 | 948 |
@Override |
948 |
public void setMultiTenant(logical l)
|
|
949 |
public void multiTenant(logical l)
|
|
949 | 950 |
{ |
950 | 951 |
// TODO: multi-tenant is not supported at this time |
951 | 952 |
} |
... | ... | |
957 | 958 |
* The flag value. |
958 | 959 |
*/ |
959 | 960 |
@Override |
960 |
public void setMultiTenant(boolean l)
|
|
961 |
public void multiTenant(boolean l)
|
|
961 | 962 |
{ |
962 | 963 |
// TODO: multi-tenant is not supported at this time |
963 | 964 |
} |
... | ... | |
4322 | 4323 |
* |
4323 | 4324 |
* @return Current value of the DBNAME attribute. |
4324 | 4325 |
*/ |
4325 |
public character getDbName()
|
|
4326 |
public character dbName()
|
|
4326 | 4327 |
{ |
4327 | 4328 |
final RecordBuffer buf = buffer(); |
4328 | 4329 |
if (buf.getParentTable() != null) |
... | ... | |
4341 | 4342 |
* @return Current value of the TABLE attribute. |
4342 | 4343 |
*/ |
4343 | 4344 |
@Override |
4344 |
public character getTable()
|
|
4345 |
public character table()
|
|
4345 | 4346 |
{ |
4346 | 4347 |
return new character(TableMapper.getLegacyName(this.buffer())); |
4347 | 4348 |
} |
... | ... | |
4455 | 4456 |
* @return See above. |
4456 | 4457 |
*/ |
4457 | 4458 |
@Override |
4458 |
public character getADMData()
|
|
4459 |
public character admData()
|
|
4459 | 4460 |
{ |
4460 | 4461 |
return new character(this.admData); |
4461 | 4462 |
} |
... | ... | |
4467 | 4468 |
* The new value. |
4468 | 4469 |
*/ |
4469 | 4470 |
@Override |
4470 |
public void setADMData(String value)
|
|
4471 |
public void admData(String value)
|
|
4471 | 4472 |
{ |
4472 | 4473 |
this.admData = value; |
4473 | 4474 |
} |
... | ... | |
4479 | 4480 |
* The new value. |
4480 | 4481 |
*/ |
4481 | 4482 |
@Override |
4482 |
public void setADMData(character value)
|
|
4483 |
public void admData(character value)
|
|
4483 | 4484 |
{ |
4484 | 4485 |
this.admData = value.toJavaType(); |
4485 | 4486 |
} |
... | ... | |
4492 | 4493 |
* current process. |
4493 | 4494 |
*/ |
4494 | 4495 |
@Override |
4495 |
public integer getUniqueID()
|
|
4496 |
public integer uniqueID()
|
|
4496 | 4497 |
{ |
4497 | 4498 |
return new integer(this.uniqueID); |
4498 | 4499 |
} |
... | ... | |
4571 | 4572 |
* @return The current value of the {@code SERIALIZE-NAME} attribute. |
4572 | 4573 |
*/ |
4573 | 4574 |
@Override |
4574 |
public character getSerializeName()
|
|
4575 |
public character serializeName()
|
|
4575 | 4576 |
{ |
4576 |
return buffer().getParentTable().getSerializeName();
|
|
4577 |
return buffer().getParentTable().serializeName();
|
|
4577 | 4578 |
} |
4578 | 4579 |
|
4579 | 4580 |
/** |
... | ... | |
4583 | 4584 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
4584 | 4585 |
*/ |
4585 | 4586 |
@Override |
4586 |
public void setSerializeName(Text sName)
|
|
4587 |
public void serializeName(Text sName) |
|
4587 | 4588 |
{ |
4588 |
buffer().getParentTable().setSerializeName(sName);
|
|
4589 |
buffer().getParentTable().serializeName(sName); |
|
4589 | 4590 |
} |
4590 | 4591 |
|
4591 | 4592 |
/** |
... | ... | |
4595 | 4596 |
* The new value for the {@code SERIALIZE-NAME} attribute. |
4596 | 4597 |
*/ |
4597 | 4598 |
@Override |
4598 |
public void setSerializeName(String sName)
|
|
4599 |
public void serializeName(String sName) |
|
4599 | 4600 |
{ |
4600 |
buffer().getParentTable().setSerializeName(sName);
|
|
4601 |
buffer().getParentTable().serializeName(sName); |
|
4601 | 4602 |
} |
4602 | 4603 |
|
4603 | 4604 |
/** |
... | ... | |
6040 | 6041 |
* @return The associated query or {@code unknown} if none exists. |
6041 | 6042 |
*/ |
6042 | 6043 |
@Override |
6043 |
public handle getQueryAsHandle()
|
|
6044 |
public handle queryAsHandle()
|
|
6044 | 6045 |
{ |
6045 | 6046 |
// bit of maintenance |
6046 | 6047 |
if (lastQuery != null && !lastQuery._isValid()) |
... | ... | |
6059 | 6060 |
* The query to associate. |
6060 | 6061 |
*/ |
6061 | 6062 |
@Override |
6062 |
public void setQueryAsHandle(handle qry)
|
|
6063 |
public void queryAsHandle(handle qry)
|
|
6063 | 6064 |
{ |
6064 | 6065 |
handle.invalidAttribute("QUERY", true, LegacyResource.BUFFER); |
6065 | 6066 |
} |
... | ... | |
6072 | 6073 |
* The query to associate. |
6073 | 6074 |
*/ |
6074 | 6075 |
@Override |
6075 |
public void setQueryAsHandle(QueryWrapper qry)
|
|
6076 |
public void queryAsHandle(QueryWrapper qry)
|
|
6076 | 6077 |
{ |
6077 | 6078 |
handle.invalidAttribute("QUERY", true, LegacyResource.BUFFER); |
6078 | 6079 |
} |
... | ... | |
7694 | 7695 |
boolean suppliedQuery = false; |
7695 | 7696 |
if (srcBufCount > 1) |
7696 | 7697 |
{ |
7697 |
if (!dataSource.getQueryAsHandle()._isValid())
|
|
7698 |
if (!dataSource.queryAsHandle()._isValid())
|
|
7698 | 7699 |
{ |
7699 | 7700 |
ErrorManager.recordOrShowError(11980); |
7700 | 7701 |
// Must assign a user query to a data-source that is a join before filling. |
... | ... | |
7706 | 7707 |
|
7707 | 7708 |
suppliedQuery = true; |
7708 | 7709 |
} |
7709 |
if (dataSource.getQueryAsHandle()._isValid())
|
|
7710 |
if (dataSource.queryAsHandle()._isValid())
|
|
7710 | 7711 |
{ |
7711 | 7712 |
suppliedQuery = true; |
7712 | 7713 |
} |
... | ... | |
7764 | 7765 |
P2JQuery fillQuery = null; |
7765 | 7766 |
if (suppliedQuery) |
7766 | 7767 |
{ |
7767 |
hQuery = dataSource.getQueryAsHandle();
|
|
7768 |
hQuery = dataSource.queryAsHandle();
|
|
7768 | 7769 |
fillQuery = (P2JQuery) hQuery.getResource(); |
7769 | 7770 |
if (fillQuery.prepareString().isUnknown()) |
7770 | 7771 |
{ |
... | ... | |
10195 | 10196 |
// deleted before-image loaded in before-buffer(this) will set the attribute, instead. |
10196 | 10197 |
if (rowState == ROW_MODIFIED || rowState == ROW_DELETED) |
10197 | 10198 |
{ |
10198 |
BufferImpl.this.setDataSourceModified(true);
|
|
10199 |
tableHandle().unwrapDataSourceModifiable().setDataSourceModified(true);
|
|
10200 |
after.tableHandle().unwrapDataSourceModifiable().setDataSourceModified(true);
|
|
10201 |
peerBuffer.dataSet.setDataSourceModified(true);
|
|
10199 |
BufferImpl.this.dataSourceModified(true);
|
|
10200 |
tableHandle().unwrapDataSourceModifiable().dataSourceModified(true);
|
|
10201 |
after.tableHandle().unwrapDataSourceModifiable().dataSourceModified(true);
|
|
10202 |
peerBuffer.dataSet.dataSourceModified(true);
|
|
10202 | 10203 |
} |
10203 | 10204 |
|
10204 | 10205 |
logical ok = new logical(); |
src/com/goldencode/p2j/persist/DataRelation.java 2022-10-10 15:15:57 +0000 | ||
---|---|---|
17 | 17 |
** OM 20210930 Only the name of dynamic relations have name constraints. |
18 | 18 |
** OM 20220120 Added getRelationFields(boolean) method. |
19 | 19 |
** CA 20220923 Internal var definitions must be done via TypeFactory and not UndoableFactory. |
20 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
20 | 21 |
*/ |
21 | 22 | |
22 | 23 |
/* |
... | ... | |
744 | 745 |
* @return The associated query or {@code unknown} if none exists. |
745 | 746 |
*/ |
746 | 747 |
@Override |
747 |
public handle getQueryAsHandle()
|
|
748 |
public handle queryAsHandle()
|
|
748 | 749 |
{ |
749 | 750 |
if (query == null) |
750 | 751 |
{ |
... | ... | |
762 | 763 |
* The query to associate. |
763 | 764 |
*/ |
764 | 765 |
@Override |
765 |
public void setQueryAsHandle(handle qry)
|
|
766 |
public void queryAsHandle(handle qry)
|
|
766 | 767 |
{ |
767 | 768 |
handle.invalidAttribute("QUERY", true, LegacyResource.DATA_RELATION); |
768 | 769 |
} |
... | ... | |
774 | 775 |
* The query to associate. |
775 | 776 |
*/ |
776 | 777 |
@Override |
777 |
public void setQueryAsHandle(QueryWrapper qry)
|
|
778 |
public void queryAsHandle(QueryWrapper qry)
|
|
778 | 779 |
{ |
779 | 780 |
handle.invalidAttribute("QUERY", true, LegacyResource.DATA_RELATION); |
780 | 781 |
} |
... | ... | |
785 | 786 |
* @return See above. |
786 | 787 |
*/ |
787 | 788 |
@Override |
788 |
public character getADMData()
|
|
789 |
public character admData()
|
|
789 | 790 |
{ |
790 | 791 |
return new character(admData); |
791 | 792 |
} |
... | ... | |
796 | 797 |
* @param value The new value. |
797 | 798 |
*/ |
798 | 799 |
@Override |
799 |
public void setADMData(String value)
|
|
800 |
public void admData(String value)
|
|
800 | 801 |
{ |
801 | 802 |
admData = value; |
802 | 803 |
} |
... | ... | |
807 | 808 |
* @param value The new value. |
808 | 809 |
*/ |
809 | 810 |
@Override |
810 |
public void setADMData(character value)
|
|
811 |
public void admData(character value)
|
|
811 | 812 |
{ |
812 | 813 |
admData = (value == null || value.isUnknown()) ? null : value.getValue(); |
813 | 814 |
} |
src/com/goldencode/p2j/persist/DataSet.java 2022-10-10 15:16:08 +0000 | ||
---|---|---|
73 | 73 |
** and every block. |
74 | 74 |
** CA 20220923 Internal var definitions must be done via TypeFactory and not UndoableFactory. |
75 | 75 |
** CA 20221006 UNIQUE-ID is kept as Java type instead of BDT. Refs #6827 |
76 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
76 | 77 |
*/ |
77 | 78 | |
78 | 79 |
/* |
... | ... | |
1873 | 1874 |
* @return {@code true} when the data has been modified. |
1874 | 1875 |
*/ |
1875 | 1876 |
@Override |
1876 |
public logical isDataSourceModified()
|
|
1877 |
public logical dataSourceModified()
|
|
1877 | 1878 |
{ |
1878 | 1879 |
return new logical(dataSourceModified); |
1879 | 1880 |
} |
... | ... | |
1885 | 1886 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
1886 | 1887 |
*/ |
1887 | 1888 |
@Override |
1888 |
public void setDataSourceModified(logical mod)
|
|
1889 |
public void dataSourceModified(logical mod)
|
|
1889 | 1890 |
{ |
1890 | 1891 |
if (mod == null || mod.isUnknown()) |
1891 | 1892 |
{ |
... | ... | |
1893 | 1894 |
return; |
1894 | 1895 |
} |
1895 | 1896 |
|
1896 |
setDataSourceModified(mod.getValue());
|
|
1897 |
dataSourceModified(mod.getValue());
|
|
1897 | 1898 |
} |
1898 | 1899 |
|
1899 | 1900 |
/** |
... | ... | |
1903 | 1904 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
1904 | 1905 |
*/ |
1905 | 1906 |
@Override |
1906 |
public void setDataSourceModified(boolean mod)
|
|
1907 |
public void dataSourceModified(boolean mod)
|
|
1907 | 1908 |
{ |
1908 | 1909 |
this.dataSourceModified = mod; |
1909 | 1910 |
} |
... | ... | |
2249 | 2250 |
* @return the current value of the {@code SERIALIZE-NAME} attribute. |
2250 | 2251 |
*/ |
2251 | 2252 |
@Override |
2252 |
public character getSerializeName()
|
|
2253 |
public character serializeName()
|
|
2253 | 2254 |
{ |
2254 | 2255 |
String jsName = serializeName != null ? serializeName : name; |
2255 | 2256 |
if (jsName == null || jsName.isEmpty()) |
... | ... | |
2266 | 2267 |
* @param sName the new value for the {@code SERIALIZE-NAME} attribute. |
2267 | 2268 |
*/ |
2268 | 2269 |
@Override |
2269 |
public void setSerializeName(Text sName)
|
|
2270 |
public void serializeName(Text sName) |
|
2270 | 2271 |
{ |
2271 |
setSerializeName(sName.toJavaType());
|
|
2272 |
serializeName(sName.toJavaType()); |
|
2272 | 2273 |
} |
2273 | 2274 |
|
2274 | 2275 |
/** |
... | ... | |
2277 | 2278 |
* @param sName the new value for the {@code SERIALIZE-NAME} attribute. |
2278 | 2279 |
*/ |
2279 | 2280 |
@Override |
2280 |
public void setSerializeName(String sName)
|
|
2281 |
public void serializeName(String sName) |
|
2281 | 2282 |
{ |
2282 | 2283 |
if (sName != null) |
2283 | 2284 |
{ |
... | ... | |
2379 | 2380 |
* @return See above. |
2380 | 2381 |
*/ |
2381 | 2382 |
@Override |
2382 |
public character getADMData()
|
|
2383 |
public character admData()
|
|
2383 | 2384 |
{ |
2384 | 2385 |
return new character(admData); |
2385 | 2386 |
} |
... | ... | |
2390 | 2391 |
* @param value The new value. |
2391 | 2392 |
*/ |
2392 | 2393 |
@Override |
2393 |
public void setADMData(String value)
|
|
2394 |
public void admData(String value)
|
|
2394 | 2395 |
{ |
2395 | 2396 |
this.admData = value; |
2396 | 2397 |
} |
... | ... | |
2401 | 2402 |
* @param value The new value. |
2402 | 2403 |
*/ |
2403 | 2404 |
@Override |
2404 |
public void setADMData(character value)
|
|
2405 |
public void admData(character value)
|
|
2405 | 2406 |
{ |
2406 | 2407 |
this.admData = value.toJavaType(); |
2407 | 2408 |
} |
... | ... | |
2822 | 2823 |
for (DataRelation rel : relations) |
2823 | 2824 |
{ |
2824 | 2825 |
Buffer cb = rel.getChildBuffer().unwrapBuffer(); |
2825 |
int uuid = cb.getUniqueID().intValue();
|
|
2826 |
int uuid = cb.uniqueID().intValue();
|
|
2826 | 2827 |
if (childBuffers.contains(uuid)) |
2827 | 2828 |
{ |
2828 | 2829 |
ErrorManager.recordOrShowError(11979, cb.name().toStringMessage()); |
... | ... | |
5155 | 5156 |
* @return an integer values that uniques identifies this resource. |
5156 | 5157 |
*/ |
5157 | 5158 |
@Override |
5158 |
public integer getUniqueID()
|
|
5159 |
public integer uniqueID()
|
|
5159 | 5160 |
{ |
5160 | 5161 |
return new integer(this.uuid); |
5161 | 5162 |
} |
... | ... | |
5456 | 5457 |
*/ |
5457 | 5458 |
protected DataRelation allowsActiveChild(Buffer childBuffer) |
5458 | 5459 |
{ |
5459 |
int childUid = childBuffer.getUniqueID().intValue();
|
|
5460 |
int childUid = childBuffer.uniqueID().intValue();
|
|
5460 | 5461 |
|
5461 | 5462 |
for (DataRelation relation : relations) |
5462 | 5463 |
{ |
5463 | 5464 |
if (relation._isActive() && |
5464 | 5465 |
!relation._isReposition() && |
5465 |
relation.getChildBuffer().unwrapBuffer().getUniqueID().intValue() == childUid)
|
|
5466 |
relation.getChildBuffer().unwrapBuffer().uniqueID().intValue() == childUid)
|
|
5466 | 5467 |
{ |
5467 | 5468 |
return relation; |
5468 | 5469 |
} |
... | ... | |
6321 | 6322 |
* |
6322 | 6323 |
* @return A reference of this object in order to help chaining. |
6323 | 6324 |
*/ |
6324 |
public Builder setSerializeName(String serName)
|
|
6325 |
public Builder serializeName(String serName) |
|
6325 | 6326 |
{ |
6326 |
buildChain.add(() -> target.setSerializeName(serName));
|
|
6327 |
buildChain.add(() -> target.serializeName(serName)); |
|
6327 | 6328 |
return this; |
6328 | 6329 |
} |
6329 | 6330 |
|
src/com/goldencode/p2j/persist/DataSource.java 2022-10-10 15:16:19 +0000 | ||
---|---|---|
25 | 25 |
** OM 20220217 Fixed SAVE-WHERE-STRING for ROWID keys. |
26 | 26 |
** OM 20220412 Setting the query attribute to unknown is a no-op. |
27 | 27 |
** OM 20220801 Recompute the buffer list dynamically. |
28 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
28 | 29 |
*/ |
29 | 30 | |
30 | 31 |
/* |
... | ... | |
332 | 333 |
* @return See above. |
333 | 334 |
*/ |
334 | 335 |
@Override |
335 |
public character getADMData()
|
|
336 |
public character admData()
|
|
336 | 337 |
{ |
337 | 338 |
return new character(admData); |
338 | 339 |
} |
... | ... | |
343 | 344 |
* @param value The new value. |
344 | 345 |
*/ |
345 | 346 |
@Override |
346 |
public void setADMData(String value)
|
|
347 |
public void admData(String value)
|
|
347 | 348 |
{ |
348 | 349 |
this.admData = value; |
349 | 350 |
} |
... | ... | |
354 | 355 |
* @param value The new value. |
355 | 356 |
*/ |
356 | 357 |
@Override |
357 |
public void setADMData(character value)
|
|
358 |
public void admData(character value)
|
|
358 | 359 |
{ |
359 | 360 |
this.admData = value.toJavaType(); |
360 | 361 |
} |
... | ... | |
365 | 366 |
* @return The associated query or {@code unknown} if none exists. |
366 | 367 |
*/ |
367 | 368 |
@Override |
368 |
public handle getQueryAsHandle()
|
|
369 |
public handle queryAsHandle()
|
|
369 | 370 |
{ |
370 | 371 |
return query._isValid() ? new handle(query.getResource()) : new handle(); |
371 | 372 |
} |
... | ... | |
377 | 378 |
* The query to associate. |
378 | 379 |
*/ |
379 | 380 |
@Override |
380 |
public void setQueryAsHandle(handle qry)
|
|
381 |
public void queryAsHandle(handle qry)
|
|
381 | 382 |
{ |
382 | 383 |
if (qry.isUnknown()) |
383 | 384 |
{ |
... | ... | |
403 | 404 |
* The query to associate. |
404 | 405 |
*/ |
405 | 406 |
@Override |
406 |
public void setQueryAsHandle(QueryWrapper qry)
|
|
407 |
public void queryAsHandle(QueryWrapper qry)
|
|
407 | 408 |
{ |
408 | 409 |
setQueryImpl(qry); |
409 | 410 |
} |
... | ... | |
2180 | 2181 |
*/ |
2181 | 2182 |
public Builder setQuery(QueryWrapper query) |
2182 | 2183 |
{ |
2183 |
DataSource.this.setQueryAsHandle(query);
|
|
2184 |
DataSource.this.queryAsHandle(query);
|
|
2184 | 2185 |
return this; |
2185 | 2186 |
} |
2186 | 2187 |
|
src/com/goldencode/p2j/persist/DataSourceModifiable.java 2022-10-10 15:16:37 +0000 | ||
---|---|---|
3 | 3 |
** Abstract : Declares the public methods for DATA-SOURCE-MODIFIED attributes of DataSet, Buffer, and |
4 | 4 |
* TempTable. |
5 | 5 |
** |
6 |
** Copyright (c) 2020, Golden Code Development Corporation. |
|
6 |
** Copyright (c) 2020-2022, Golden Code Development Corporation.
|
|
7 | 7 |
** |
8 | 8 |
** -#- -I- --Date-- ---------------------------------------Description--------------------------------------- |
9 | 9 |
** 001 OM 20201020 Created initial version. |
10 |
** 002 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
10 | 11 |
*/ |
11 | 12 | |
12 | 13 |
/* |
... | ... | |
77 | 78 |
* @return {@code true} when the data has been modified. |
78 | 79 |
*/ |
79 | 80 |
@LegacyAttribute(name = "DATA-SOURCE-MODIFIED") |
80 |
public logical isDataSourceModified();
|
|
81 |
|
|
82 |
/** |
|
83 |
* Manually mark the data in the target structure as modified. |
|
84 |
* |
|
85 |
* @param mod |
|
86 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
|
87 |
*/ |
|
88 |
@LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true) |
|
89 |
public void setDataSourceModified(logical mod);
|
|
90 |
|
|
91 |
/** |
|
92 |
* Manually mark the data in the target structure as modified. |
|
93 |
* |
|
94 |
* @param mod |
|
95 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
|
96 |
*/ |
|
97 |
@LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true) |
|
98 |
public void setDataSourceModified(boolean mod);
|
|
99 |
|
|
100 |
public static logical isDataSourceModified(Buffer rb)
|
|
81 |
public logical dataSourceModified();
|
|
82 |
|
|
83 |
/** |
|
84 |
* Manually mark the data in the target structure as modified. |
|
85 |
* |
|
86 |
* @param mod |
|
87 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
|
88 |
*/ |
|
89 |
@LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true) |
|
90 |
public void dataSourceModified(logical mod);
|
|
91 |
|
|
92 |
/** |
|
93 |
* Manually mark the data in the target structure as modified. |
|
94 |
* |
|
95 |
* @param mod |
|
96 |
* {@code true} when the data is marked as modified and {@code false} otherwise. |
|
97 |
*/ |
|
98 |
@LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true) |
|
99 |
public void dataSourceModified(boolean mod);
|
|
100 |
|
|
101 |
public static logical dataSourceModified(Buffer rb)
|
|
101 | 102 |
{ |
102 |
return rb.isDataSourceModified();
|
|
103 |
return rb.dataSourceModified();
|
|
103 | 104 |
} |
104 | 105 |
} |
105 | 106 |
src/com/goldencode/p2j/persist/NamedSerializable.java 2022-10-10 15:16:53 +0000 | ||
---|---|---|
3 | 3 |
** Abstract : Interface which defines access methods for SERIALIZE-NAME attribute of a DataSet, |
4 | 4 |
** a temp-table, a temp-table buffer or a temp-table buffer-field object. |
5 | 5 |
** |
6 |
** Copyright (c) 2018-2019, Golden Code Development Corporation.
|
|
6 |
** Copyright (c) 2018-2022, Golden Code Development Corporation.
|
|
7 | 7 |
** |
8 | 8 |
** -#- -I- --Date-- ---------------------------------Description--------------------------------- |
9 | 9 |
** 001 OM 20181114 Created initial version. |
10 | 10 |
** 002 OM 20190327 Renamed to DataSource to avoid conflicts with DataSet source. |
11 | 11 |
** 003 CA 20190812 Added legacy attribute annotations. |
12 |
** 004 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
12 | 13 |
*/ |
13 | 14 | |
14 | 15 |
/* |
... | ... | |
81 | 82 |
* @return the current value of the {@code SERIALIZE-NAME} attribute. |
82 | 83 |
*/ |
83 | 84 |
@LegacyAttribute(name = "SERIALIZE-NAME") |
84 |
public character getSerializeName();
|
|
85 |
|
|
86 |
/** |
|
87 |
* Implementation of the write access of the {@code SERIALIZE-NAME} attribute. |
|
88 |
* |
|
89 |
* @param sName |
|
90 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
|
91 |
*/ |
|
92 |
@LegacyAttribute(name = "SERIALIZE-NAME", setter = true) |
|
93 |
public void setSerializeName(Text sName);
|
|
94 |
|
|
95 |
/** |
|
96 |
* Implementation of the write access of the {@code SERIALIZE-NAME} attribute. |
|
97 |
* |
|
98 |
* @param sName |
|
99 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
|
100 |
*/ |
|
101 |
@LegacyAttribute(name = "SERIALIZE-NAME", setter = true) |
|
102 |
public void setSerializeName(String sName);
|
|
85 |
public character serializeName();
|
|
86 |
|
|
87 |
/** |
|
88 |
* Implementation of the write access of the {@code SERIALIZE-NAME} attribute. |
|
89 |
* |
|
90 |
* @param sName |
|
91 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
|
92 |
*/ |
|
93 |
@LegacyAttribute(name = "SERIALIZE-NAME", setter = true) |
|
94 |
public void serializeName(Text sName); |
|
95 |
|
|
96 |
/** |
|
97 |
* Implementation of the write access of the {@code SERIALIZE-NAME} attribute. |
|
98 |
* |
|
99 |
* @param sName |
|
100 |
* the new value for the {@code SERIALIZE-NAME} attribute. |
|
101 |
*/ |
|
102 |
@LegacyAttribute(name = "SERIALIZE-NAME", setter = true) |
|
103 |
public void serializeName(String sName); |
|
103 | 104 |
} |
src/com/goldencode/p2j/persist/P2JField.java 2022-10-10 15:17:20 +0000 | ||
---|---|---|
2 | 2 |
** Module : P2JField.java |
3 | 3 |
** Abstract : Container for DMO field definitions. |
4 | 4 |
** |
5 |
** Copyright (c) 2013-2020, Golden Code Development Corporation.
|
|
5 |
** Copyright (c) 2013-2022, Golden Code Development Corporation.
|
|
6 | 6 |
** |
7 | 7 |
** -#- -I- --Date-- ---------------------------------------Description--------------------------------------- |
8 | 8 |
** 001 SVL 20130624 Created initial version. |
... | ... | |
13 | 13 |
** 006 CA 20191203 The field's help and serialize options must be used to uniquely identify it. |
14 | 14 |
** 007 CA 20200724 The 'initial' BDT is mutable, keep a copy, not the exact reference. |
15 | 15 |
** OM 20200701 Made class immutable. Added debugging support. |
16 |
** 008 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
16 | 17 |
*/ |
17 | 18 | |
18 | 19 |
/* |
... | ... | |
350 | 351 |
* |
351 | 352 |
* @return See above. |
352 | 353 |
*/ |
353 |
public String getSerializeName()
|
|
354 |
public String serializeName()
|
|
354 | 355 |
{ |
355 | 356 |
return serializeName; |
356 | 357 |
} |
src/com/goldencode/p2j/persist/QueryAssociable.java 2022-10-10 15:17:37 +0000 | ||
---|---|---|
2 | 2 |
** Module : QueryAssociable.java |
3 | 3 |
** Abstract : interface which that defines features about associated queries |
4 | 4 |
** |
5 |
** Copyright (c) 2014-2017, Golden Code Development Corporation.
|
|
5 |
** Copyright (c) 2014-2022, Golden Code Development Corporation.
|
|
6 | 6 |
** |
7 | 7 |
** -#- -I- --Date-- ---------------------------------Description--------------------------------- |
8 | 8 |
** 001 GES 20141126 Created initial version. |
9 | 9 |
** 002 SVL 20150804 Added setQueryAsHandle(QueryWrapper). |
10 |
** 003 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
10 | 11 |
*/ |
11 | 12 |
/* |
12 | 13 |
** This program is free software: you can redistribute it and/or modify |
... | ... | |
76 | 77 |
* @return The associated query or <code>unknown</code> if none exists. |
77 | 78 |
*/ |
78 | 79 |
@LegacyAttribute(name = "QUERY") |
79 |
public handle getQueryAsHandle();
|
|
80 |
public handle queryAsHandle();
|
|
80 | 81 |
|
81 | 82 |
/** |
82 | 83 |
* Set the query associated with the given resource. |
... | ... | |
85 | 86 |
* The query to associate. |
86 | 87 |
*/ |
87 | 88 |
@LegacyAttribute(name = "QUERY", setter = true) |
88 |
public void setQueryAsHandle(handle qry);
|
|
89 |
public void queryAsHandle(handle qry);
|
|
89 | 90 | |
90 | 91 |
/** |
91 | 92 |
* Set the query associated with the given resource. |
... | ... | |
94 | 95 |
* The query to associate. |
95 | 96 |
*/ |
96 | 97 |
@LegacyAttribute(name = "QUERY", setter = true) |
97 |
public void setQueryAsHandle(QueryWrapper qry);
|
|
98 |
public void queryAsHandle(QueryWrapper qry);
|
|
98 | 99 |
} |
src/com/goldencode/p2j/persist/QueryWrapper.java 2022-10-10 15:17:49 +0000 | ||
---|---|---|
260 | 260 |
** CA 20220930 Refactored the callback invocation to be performed via a call-site and |
261 | 261 |
** InvokeConfig, to allow caching of the resolved target. |
262 | 262 |
** CA 20221006 UNIQUE-ID and ADM-DATA are kept as Java types instead of BDT. Refs #6827 |
263 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
263 | 264 |
*/ |
264 | 265 | |
265 | 266 |
/* |
... | ... | |
4531 | 4532 |
* @return See above. |
4532 | 4533 |
*/ |
4533 | 4534 |
@Override |
4534 |
public character getADMData()
|
|
4535 |
public character admData()
|
|
4535 | 4536 |
{ |
4536 | 4537 |
return new character(admData); |
4537 | 4538 |
} |
... | ... | |
4543 | 4544 |
* The new value. |
4544 | 4545 |
*/ |
4545 | 4546 |
@Override |
4546 |
public void setADMData(String value)
|
|
4547 |
public void admData(String value)
|
|
4547 | 4548 |
{ |
4548 | 4549 |
this.admData = value; |
4549 | 4550 |
} |
... | ... | |
4555 | 4556 |
* The new value. |
4556 | 4557 |
*/ |
4557 | 4558 |
@Override |
4558 |
public void setADMData(character value)
|
|
4559 |
public void admData(character value)
|
|
4559 | 4560 |
{ |
4560 | 4561 |
this.admData = value.toJavaType(); |
4561 | 4562 |
} |
... | ... | |
4567 | 4568 |
* @return The integer number of the children. |
4568 | 4569 |
*/ |
4569 | 4570 |
@Override |
4570 |
public integer getUniqueID()
|
|
4571 |
public integer uniqueID()
|
|
4571 | 4572 |
{ |
4572 | 4573 |
return new integer(uniqueID); |
4573 | 4574 |
} |
src/com/goldencode/p2j/persist/RecordBuffer.java 2022-10-10 15:18:01 +0000 | ||
---|---|---|
1236 | 1236 |
** directly. Refs #6826 |
1237 | 1237 |
** CA 20221010 Performance improvements - avoid the ProcedureData lookup, by keeping a parallel |
1238 | 1238 |
** stack of this data for THIS-PROCEDURE. Refs #6826 |
1239 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
1239 | 1240 |
*/ |
1240 | 1241 | |
1241 | 1242 |
/* |
... | ... | |
11286 | 11287 |
if (dmoProxy != null) |
11287 | 11288 |
{ |
11288 | 11289 |
// reset the DATA-SOURCE-MODIFIED |
11289 |
((Buffer) dmoProxy).setDataSourceModified(false);
|
|
11290 |
((Buffer) dmoProxy).dataSourceModified(false);
|
|
11290 | 11291 |
} |
11291 | 11292 |
|
11292 | 11293 |
if (newCrtRecord != null) |
src/com/goldencode/p2j/persist/StaticTempTable.java 2022-10-10 15:18:09 +0000 | ||
---|---|---|
39 | 39 |
** child shared temp-tables) is deleted. |
40 | 40 |
** OM 20210921 Initialized serializeName, xmlNodeName, namespaceUri, and namespacePrefix from DmoInfo. |
41 | 41 |
** CA 20221006 The equals and hashCode methods must not be implemented by resources. |
42 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
42 | 43 |
*/ |
43 | 44 | |
44 | 45 |
/* |
... | ... | |
139 | 140 |
DmoMeta dmoInfo = buffer.getDmoInfo(); |
140 | 141 |
if (!dmoInfo.serializeName.isEmpty()) |
141 | 142 |
{ |
142 |
super.setSerializeName(dmoInfo.serializeName);
|
|
143 |
super.serializeName(dmoInfo.serializeName); |
|
143 | 144 |
} |
144 | 145 |
if (!dmoInfo.xmlNodeName.isEmpty()) |
145 | 146 |
{ |
... | ... | |
1433 | 1434 |
public String toString() |
1434 | 1435 |
{ |
1435 | 1436 |
String myName = (name == null) ? "unnamed" : name().getValue(); |
1436 |
return "STATIC " + myName + ", ID " + getUniqueID().getValue();
|
|
1437 |
return "STATIC " + myName + ", ID " + uniqueID().getValue();
|
|
1437 | 1438 |
} |
1438 | 1439 | |
1439 | 1440 |
/** |
src/com/goldencode/p2j/persist/TempTableBuilder.java 2022-10-10 15:18:18 +0000 | ||
---|---|---|
114 | 114 |
** CA 20221006 Added JMX instrumentation for dynamic temp-table prepare. Refs #6814 |
115 | 115 |
** Do not access tableHandle() in the FWD runtime, get the TempTable instance directly. |
116 | 116 |
** Refs #6826 |
117 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
117 | 118 |
*/ |
118 | 119 | |
119 | 120 |
/* |
... | ... | |
3542 | 3543 |
srcField.getCodePage(), |
3543 | 3544 |
srcField.getHelp(), |
3544 | 3545 |
srcField.isSerializeHidden(), |
3545 |
srcField.getSerializeName(),
|
|
3546 |
srcField.serializeName(),
|
|
3546 | 3547 |
srcField.getXmlDataType(), |
3547 | 3548 |
srcField.getXmlNodeName(), |
3548 | 3549 |
srcField.getXmlNodeType(), |
... | ... | |
3694 | 3695 |
eh.clearPending(); |
3695 | 3696 |
} |
3696 | 3697 |
} |
3697 |
return "DYNAMIC " + myName + ", ID " + getUniqueID().getValue() + "\n" + lc.toStringMessage();
|
|
3698 |
return "DYNAMIC " + myName + ", ID " + uniqueID().getValue() + "\n" + lc.toStringMessage();
|
|
3698 | 3699 |
} |
3699 | 3700 |
} |
src/com/goldencode/p2j/persist/serial/ExtentTracker.java 2022-10-10 15:18:37 +0000 | ||
---|---|---|
2 | 2 |
** Module : ExtentTracker.java |
3 | 3 |
** Abstract : Helper object to track extents during temp-table data import. |
4 | 4 |
** |
5 |
** Copyright (c) 2017-2021, Golden Code Development Corporation.
|
|
5 |
** Copyright (c) 2017-2022, Golden Code Development Corporation.
|
|
6 | 6 |
** |
7 | 7 |
** -#- -I- --Date-- ---------------------------------------Description--------------------------------------- |
8 | 8 |
** 001 ECF 20190123 Extracted from XmlImport. |
9 | 9 |
** 002 OM 20201120 Small fix in constructor. |
10 | 10 |
** 003 CA 20210510 Fixed JSON and XML serialization when XML-NODE-NAME/SERIALIZE-NAME field options are set. |
11 |
** 004 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
11 | 12 |
*/ |
12 | 13 | |
13 | 14 |
/* |
... | ... | |
93 | 94 |
Integer extent = column.getExtent(); |
94 | 95 |
if (extent != null && extent > 0) |
95 | 96 |
{ |
96 |
String name = json ? column.getSerializeName() : column.getXmlNodeName();
|
|
97 |
String name = json ? column.serializeName() : column.getXmlNodeName();
|
|
97 | 98 |
ExtentTracker.Tracker tracker = new Tracker(extent); |
98 | 99 |
trackers.put(name, tracker); |
99 | 100 |
} |
src/com/goldencode/p2j/persist/serial/JsonExport.java 2022-10-10 15:18:49 +0000 | ||
---|---|---|
29 | 29 |
** the BlockManager API |
30 | 30 |
** CA 20221006 Do not access tableHandle() in the FWD runtime, get the TempTable instance directly. |
31 | 31 |
** Refs #6826 |
32 |
** VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767. |
|
32 | 33 |
*/ |
33 | 34 | |
34 | 35 |
/* |
... | ... | |
454 | 455 |
|
455 | 456 |
JsonObject json = (JsonObject) (((ObjectVar<?>) ufo).ref()); |
456 | 457 |
clearObject(json); |
457 |
json.add_1(buffer.getSerializeName(), root);
|
|
458 |
json.add_1(buffer.serializeName(), root);
|
|
458 | 459 |
|
459 | 460 |
return true; // all good! |
460 | 461 |
} |
... | ... | |
544 | 545 |
|
545 | 546 |
JsonObject json = (JsonObject) (((ObjectVar<?>) ufo).ref()); |
546 | 547 |
clearObject(json); |
547 |
json.add(((BufferImpl) buffer.getDMOProxy()).getSerializeName(), root);
|
|
548 |
json.add(((BufferImpl) buffer.getDMOProxy()).serializeName(), root);
|
|
548 | 549 |
} |
549 | 550 |
else //if (isJATarget) |
550 | 551 |
{ |
... | ... | |
598 | 599 |
|
599 | 600 |
for (TempTableSchema.Column column : schema.columns()) |
600 | 601 |
{ |
601 |
String name = column.getSerializeName();
|
|
602 |
String name = column.serializeName();
|
|
602 | 603 |
if (ReservedProperty.isReservedProperty(name)) |
603 | 604 |
{ |
604 | 605 |
// some fields which start with "__" are hidden fields (specific to BEFORE tables) |
... | ... | |
626 | 627 |
addPropertyToJsonArray(jsonExtent.ref(), column, datum); |
627 | 628 |
} |
628 | 629 |
|
629 |
root.ref().add(new character(column.getSerializeName()), jsonExtent);
|
|
630 |
root.ref().add(new character(column.serializeName()), jsonExtent);
|
|
630 | 631 |
} |
631 | 632 |
else // plain property |
632 | 633 |
{ |
... | ... | |
660 | 661 |
{ |