SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-02 13:03:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix pull clasenh "file emxxx not found" #4515 (#4552)

Browse Source 
* Fix #4515

Fix #4515 by serializing new TAB_INCLUDES to contain include numbers of new methods of classes.

* Last fix before pull request

* files named "em_<methodname>" instead "emxxx"

* editorder without gaps

* Cleanup commented out line

* fixes abaplint

Co-authored-by: sandra rossi <sandra.rossi@gmail.com>
Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
sandraros 2021-02-28 19:40:54 +01:00 committed by GitHub
parent 8cdeff8f16
commit 8edc8736f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/objects/enh/zcl_abapgit_object_enho_class.clas.abap
View File

@ -45,18 +45,35 @@ CLASS zcl_abapgit_object_enho_class IMPLEMENTATION.
lv_editorder TYPE n LENGTH 3, lv_editorder TYPE n LENGTH 3,
lv_methname TYPE seocpdname, lv_methname TYPE seocpdname,
lt_abap TYPE rswsourcet, lt_abap TYPE rswsourcet,
lx_enh TYPE REF TO cx_enh_root. lx_enh TYPE REF TO cx_enh_root,
lv_new_em TYPE abap_bool,
lt_files TYPE zif_abapgit_definitions=>ty_files_tt.
FIELD-SYMBOLS: <ls_method> LIKE LINE OF lt_tab_methods. FIELD-SYMBOLS: <ls_method> LIKE LINE OF lt_tab_methods,
<ls_file> TYPE zif_abapgit_definitions=>ty_file.
ii_xml->read( EXPORTING iv_name = 'TAB_METHODS' ii_xml->read( EXPORTING iv_name = 'TAB_METHODS'
CHANGING cg_data = lt_tab_methods ). CHANGING cg_data = lt_tab_methods ).
lv_new_em = abap_false.
lt_files = mo_files->get_files( ).
LOOP AT lt_files ASSIGNING <ls_file>
WHERE filename CS 'enho.em_'.
lv_new_em = abap_true.
EXIT.
ENDLOOP.
SORT lt_tab_methods BY meth_header-editorder.
LOOP AT lt_tab_methods ASSIGNING <ls_method>. LOOP AT lt_tab_methods ASSIGNING <ls_method>.
lv_editorder = <ls_method>-meth_header-editorder.
lv_methname = <ls_method>-methkey-cmpname. lv_methname = <ls_method>-methkey-cmpname.
lt_abap = mo_files->read_abap( iv_extra = 'em' && lv_editorder ). IF lv_new_em = abap_true.
lt_abap = mo_files->read_abap( iv_extra = 'em_' && lv_methname ).
ELSE.
" old way
lv_editorder = <ls_method>-meth_header-editorder.
lt_abap = mo_files->read_abap( iv_extra = 'em' && lv_editorder ).
ENDIF.
TRY. TRY.
io_class->add_change_new_method_source( io_class->add_change_new_method_source(
@ -102,7 +119,7 @@ CLASS zcl_abapgit_object_enho_class IMPLEMENTATION.
permission_error = 3 permission_error = 3
OTHERS = 4. OTHERS = 4.
IF sy-subrc = 0. IF sy-subrc = 0.
mo_files->add_abap( iv_extra = |EM{ <ls_include>-includenr }| mo_files->add_abap( iv_extra = |EM_{ <ls_include>-cpdname }|
it_abap = lt_source ). it_abap = lt_source ).
ENDIF. ENDIF.
ENDLOOP. ENDLOOP.

7
src/objects/enh/zcl_abapgit_object_enho_clif.clas.abap
View File

@ -125,7 +125,8 @@ CLASS ZCL_ABAPGIT_OBJECT_ENHO_CLIF IMPLEMENTATION.
DATA: lt_tab_attributes TYPE enhclasstabattrib, DATA: lt_tab_attributes TYPE enhclasstabattrib,
lt_tab_types TYPE enhtype_tab, lt_tab_types TYPE enhtype_tab,
lt_tab_methods TYPE enhnewmeth_tab, lt_tab_methods TYPE enhnewmeth_tab,
lt_tab_eventdata TYPE enhevent_tab. lt_tab_eventdata TYPE enhevent_tab,
lv_editorder TYPE i.
FIELD-SYMBOLS: <ls_attr> LIKE LINE OF lt_tab_attributes, FIELD-SYMBOLS: <ls_attr> LIKE LINE OF lt_tab_attributes,
<ls_type> LIKE LINE OF lt_tab_types, <ls_type> LIKE LINE OF lt_tab_types,
@ -159,12 +160,16 @@ CLASS ZCL_ABAPGIT_OBJECT_ENHO_CLIF IMPLEMENTATION.
<ls_type>-descript_id. <ls_type>-descript_id.
ENDLOOP. ENDLOOP.
lv_editorder = 0.
SORT lt_tab_methods BY meth_header-editorder.
LOOP AT lt_tab_methods ASSIGNING <ls_meth>. LOOP AT lt_tab_methods ASSIGNING <ls_meth>.
CLEAR: <ls_meth>-meth_header-author, CLEAR: <ls_meth>-meth_header-author,
<ls_meth>-meth_header-createdon, <ls_meth>-meth_header-createdon,
<ls_meth>-meth_header-changedby, <ls_meth>-meth_header-changedby,
<ls_meth>-meth_header-changedon, <ls_meth>-meth_header-changedon,
<ls_meth>-meth_header-descript_id. <ls_meth>-meth_header-descript_id.
lv_editorder = lv_editorder + 1.
<ls_meth>-meth_header-editorder = lv_editorder.
LOOP AT <ls_meth>-meth_param ASSIGNING <ls_param>. LOOP AT <ls_meth>-meth_param ASSIGNING <ls_param>.
CLEAR: <ls_param>-author, CLEAR: <ls_param>-author,
<ls_param>-createdon, <ls_param>-createdon,