diff --git a/src/objects/zcl_abapgit_object_fugr.clas.abap b/src/objects/zcl_abapgit_object_fugr.clas.abap index 3376ba4aa..583a78d0f 100644 --- a/src/objects/zcl_abapgit_object_fugr.clas.abap +++ b/src/objects/zcl_abapgit_object_fugr.clas.abap @@ -559,8 +559,6 @@ CLASS ZCL_ABAPGIT_OBJECT_FUGR IMPLEMENTATION. CALL FUNCTION 'RS_GET_ALL_INCLUDES' EXPORTING program = lv_program -* WITH_RESERVED_INCLUDES = -* WITH_CLASS_INCLUDES = ' ' hmm, todo TABLES includetab = rt_includes EXCEPTIONS diff --git a/src/objects/zcl_abapgit_object_wdyn.clas.abap b/src/objects/zcl_abapgit_object_wdyn.clas.abap index d8a0d38ad..72d567faa 100644 --- a/src/objects/zcl_abapgit_object_wdyn.clas.abap +++ b/src/objects/zcl_abapgit_object_wdyn.clas.abap @@ -1,9 +1,15 @@ -CLASS zcl_abapgit_object_wdyn DEFINITION PUBLIC INHERITING FROM zcl_abapgit_objects_super FINAL. +CLASS zcl_abapgit_object_wdyn DEFINITION + PUBLIC + INHERITING FROM zcl_abapgit_objects_super + FINAL + CREATE PUBLIC . PUBLIC SECTION. - INTERFACES zif_abapgit_object. - ALIASES mo_files FOR zif_abapgit_object~mo_files. + INTERFACES zif_abapgit_object . + + ALIASES mo_files + FOR zif_abapgit_object~mo_files . PROTECTED SECTION. PRIVATE SECTION. @@ -63,7 +69,10 @@ CLASS zcl_abapgit_object_wdyn DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje add_fm_exception IMPORTING iv_name TYPE string iv_value TYPE i - CHANGING ct_exception TYPE abap_func_excpbind_tab. + CHANGING ct_exception TYPE abap_func_excpbind_tab, + add_with_inactive_parts + RAISING + zcx_abapgit_exception . ENDCLASS. @@ -110,6 +119,39 @@ CLASS ZCL_ABAPGIT_OBJECT_WDYN IMPLEMENTATION. ENDMETHOD. + METHOD add_with_inactive_parts. + + DATA: + lv_obj_name TYPE trobj_name, + lv_object TYPE trobjtype, + lt_objects TYPE dwinactiv_tab. + + FIELD-SYMBOLS: LIKE LINE OF lt_objects. + + lv_obj_name = ms_item-obj_name. + lv_object = ms_item-obj_type. + + CALL FUNCTION 'RS_INACTIVE_OBJECTS_IN_OBJECT' + EXPORTING + obj_name = lv_obj_name + object = lv_object + TABLES + inactive_objects = lt_objects + EXCEPTIONS + object_not_found = 1 + OTHERS = 2. + IF sy-subrc <> 0. + zcx_abapgit_exception=>raise( 'Error from RS_INACTIVE_OBJECTS_IN_OBJECT' ). + ENDIF. + + LOOP AT lt_objects ASSIGNING . + zcl_abapgit_objects_activation=>add( iv_type = -object + iv_name = -obj_name ). + ENDLOOP. + + ENDMETHOD. + + METHOD delta_controller. DATA: li_controller TYPE REF TO if_wdy_md_controller, @@ -784,7 +826,7 @@ CLASS ZCL_ABAPGIT_OBJECT_WDYN IMPLEMENTATION. io_xml = io_xml ). ENDIF. - zcl_abapgit_objects_activation=>add_item( ms_item ). + add_with_inactive_parts( ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_objects_activation.clas.abap b/src/objects/zcl_abapgit_objects_activation.clas.abap index 16c094e18..e1a4fb365 100644 --- a/src/objects/zcl_abapgit_objects_activation.clas.abap +++ b/src/objects/zcl_abapgit_objects_activation.clas.abap @@ -1,22 +1,27 @@ -CLASS zcl_abapgit_objects_activation DEFINITION PUBLIC CREATE PUBLIC. +CLASS zcl_abapgit_objects_activation DEFINITION + PUBLIC + CREATE PUBLIC . PUBLIC SECTION. + CLASS-METHODS add - IMPORTING iv_type TYPE trobjtype - iv_name TYPE clike - iv_delete TYPE abap_bool DEFAULT abap_false - RAISING zcx_abapgit_exception. - + IMPORTING + !iv_type TYPE trobjtype + !iv_name TYPE clike + !iv_delete TYPE abap_bool DEFAULT abap_false + RAISING + zcx_abapgit_exception . CLASS-METHODS add_item - IMPORTING is_item TYPE zif_abapgit_definitions=>ty_item - RAISING zcx_abapgit_exception. - + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + RAISING + zcx_abapgit_exception . CLASS-METHODS activate - IMPORTING iv_ddic TYPE abap_bool DEFAULT abap_false - RAISING zcx_abapgit_exception. - - CLASS-METHODS clear. - + IMPORTING + !iv_ddic TYPE abap_bool DEFAULT abap_false + RAISING + zcx_abapgit_exception . + CLASS-METHODS clear . PROTECTED SECTION. PRIVATE SECTION. @@ -228,43 +233,16 @@ CLASS ZCL_ABAPGIT_OBJECTS_ACTIVATION IMPLEMENTATION. * function module RS_INSERT_INTO_WORKING_AREA * class CL_WB_ACTIVATION_WORK_AREA - DATA: lt_objects TYPE dwinactiv_tab, - lv_obj_name TYPE dwinactiv-obj_name. + FIELD-SYMBOLS: TYPE dwinactiv. - FIELD-SYMBOLS: LIKE LINE OF lt_objects. - - - lv_obj_name = iv_name. - - CASE iv_type. - WHEN 'CLAS'. - APPEND iv_name TO gt_classes. - WHEN 'WDYN'. -* todo, move this to the object type include instead - CALL FUNCTION 'RS_INACTIVE_OBJECTS_IN_OBJECT' - EXPORTING - obj_name = lv_obj_name - object = iv_type - TABLES - inactive_objects = lt_objects - EXCEPTIONS - object_not_found = 1 - OTHERS = 2. - IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'Error from RS_INACTIVE_OBJECTS_IN_OBJECT' ). - ENDIF. - - LOOP AT lt_objects ASSIGNING . - -delet_flag = iv_delete. - ENDLOOP. - - APPEND LINES OF lt_objects TO gt_objects. - WHEN OTHERS. - APPEND INITIAL LINE TO gt_objects ASSIGNING . - -object = iv_type. - -obj_name = lv_obj_name. - -delet_flag = iv_delete. - ENDCASE. + IF iv_type = 'CLAS'. + APPEND iv_name TO gt_classes. + ELSE. + APPEND INITIAL LINE TO gt_objects ASSIGNING . + -object = iv_type. + -obj_name = iv_name. + -delet_flag = iv_delete. + ENDIF. ENDMETHOD. diff --git a/src/zcl_abapgit_file_status.clas.abap b/src/zcl_abapgit_file_status.clas.abap index ad23c83ff..c53341eaa 100644 --- a/src/zcl_abapgit_file_status.clas.abap +++ b/src/zcl_abapgit_file_status.clas.abap @@ -370,9 +370,8 @@ CLASS ZCL_ABAPGIT_FILE_STATUS IMPLEMENTATION. FIELD-SYMBOLS: LIKE LINE OF it_results, LIKE LINE OF it_results. - + " This method just adds messages to the log. No log, nothing to do here IF ii_log IS INITIAL. -* huh? RETURN. ENDIF.