From 20c1a3c6103433c0cf35822354275036515bab57 Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:16:00 -0500 Subject: [PATCH] Refactor serializer constructor (#6701) --- .../zcl_abapgit_object_common_aff.clas.abap | 20 ++- .../core/zcl_abapgit_objects_files.clas.abap | 16 +- ...bapgit_objects_files.clas.testclasses.abap | 14 +- .../texts/zcl_abapgit_i18n_params.clas.abap | 2 +- src/objects/zcl_abapgit_object_aifc.clas.abap | 170 +++++++++--------- src/objects/zcl_abapgit_object_amsd.clas.abap | 22 ++- src/objects/zcl_abapgit_object_apis.clas.abap | 22 ++- src/objects/zcl_abapgit_object_auth.clas.abap | 16 +- src/objects/zcl_abapgit_object_bdef.clas.abap | 26 +-- src/objects/zcl_abapgit_object_chdo.clas.abap | 16 +- src/objects/zcl_abapgit_object_clas.clas.abap | 37 ++-- src/objects/zcl_abapgit_object_cmpt.clas.abap | 22 ++- src/objects/zcl_abapgit_object_cus0.clas.abap | 15 +- src/objects/zcl_abapgit_object_cus1.clas.abap | 16 +- src/objects/zcl_abapgit_object_cus2.clas.abap | 16 +- src/objects/zcl_abapgit_object_dcls.clas.abap | 4 +- src/objects/zcl_abapgit_object_ddls.clas.abap | 23 ++- src/objects/zcl_abapgit_object_ddlx.clas.abap | 4 +- src/objects/zcl_abapgit_object_devc.clas.abap | 22 ++- src/objects/zcl_abapgit_object_doct.clas.abap | 20 ++- src/objects/zcl_abapgit_object_docv.clas.abap | 14 +- src/objects/zcl_abapgit_object_drul.clas.abap | 26 +-- src/objects/zcl_abapgit_object_dsys.clas.abap | 15 +- src/objects/zcl_abapgit_object_dtdc.clas.abap | 26 +-- .../zcl_abapgit_object_ecatt_super.clas.abap | 21 ++- src/objects/zcl_abapgit_object_enhc.clas.abap | 21 ++- src/objects/zcl_abapgit_object_enho.clas.abap | 10 +- src/objects/zcl_abapgit_object_form.clas.abap | 22 ++- src/objects/zcl_abapgit_object_ftgl.clas.abap | 22 ++- src/objects/zcl_abapgit_object_fugr.clas.abap | 14 +- src/objects/zcl_abapgit_object_iamu.clas.abap | 4 +- src/objects/zcl_abapgit_object_iarp.clas.abap | 19 +- src/objects/zcl_abapgit_object_iasp.clas.abap | 20 ++- src/objects/zcl_abapgit_object_iatu.clas.abap | 4 +- src/objects/zcl_abapgit_object_idoc.clas.abap | 21 ++- src/objects/zcl_abapgit_object_iext.clas.abap | 21 ++- src/objects/zcl_abapgit_object_intf.clas.abap | 26 ++- ..._abapgit_object_intf.clas.testclasses.abap | 14 +- src/objects/zcl_abapgit_object_oa2p.clas.abap | 16 +- src/objects/zcl_abapgit_object_pdts.clas.abap | 18 +- .../zcl_abapgit_object_pdxx_super.clas.abap | 67 ++++--- src/objects/zcl_abapgit_object_pers.clas.abap | 22 ++- src/objects/zcl_abapgit_object_prog.clas.abap | 4 +- src/objects/zcl_abapgit_object_sfbf.clas.abap | 14 +- src/objects/zcl_abapgit_object_sfbs.clas.abap | 14 +- src/objects/zcl_abapgit_object_sfpf.clas.abap | 6 +- src/objects/zcl_abapgit_object_sfsw.clas.abap | 14 +- src/objects/zcl_abapgit_object_shi3.clas.abap | 19 +- src/objects/zcl_abapgit_object_shi5.clas.abap | 16 +- src/objects/zcl_abapgit_object_shi8.clas.abap | 16 +- src/objects/zcl_abapgit_object_sktd.clas.abap | 17 +- src/objects/zcl_abapgit_object_smim.clas.abap | 4 +- src/objects/zcl_abapgit_object_smtg.clas.abap | 22 ++- src/objects/zcl_abapgit_object_sod1.clas.abap | 13 +- src/objects/zcl_abapgit_object_sod2.clas.abap | 13 +- src/objects/zcl_abapgit_object_sots.clas.abap | 4 +- src/objects/zcl_abapgit_object_sprx.clas.abap | 22 ++- src/objects/zcl_abapgit_object_sqsc.clas.abap | 28 +-- src/objects/zcl_abapgit_object_srfc.clas.abap | 15 +- src/objects/zcl_abapgit_object_srvb.clas.abap | 22 ++- src/objects/zcl_abapgit_object_srvd.clas.abap | 30 ++-- src/objects/zcl_abapgit_object_sush.clas.abap | 13 +- src/objects/zcl_abapgit_object_suso.clas.abap | 21 ++- src/objects/zcl_abapgit_object_type.clas.abap | 4 +- src/objects/zcl_abapgit_object_udmo.clas.abap | 17 +- src/objects/zcl_abapgit_object_ueno.clas.abap | 16 +- .../zcl_abapgit_object_w3xx_super.clas.abap | 29 ++- src/objects/zcl_abapgit_object_wapa.clas.abap | 8 +- src/objects/zcl_abapgit_object_wdca.clas.abap | 4 +- src/objects/zcl_abapgit_object_wdcc.clas.abap | 4 +- src/objects/zcl_abapgit_object_xinx.clas.abap | 21 ++- src/objects/zcl_abapgit_object_xslt.clas.abap | 4 +- src/objects/zcl_abapgit_objects.clas.abap | 73 ++++---- .../zcl_abapgit_objects_bridge.clas.abap | 66 ++++--- .../zcl_abapgit_objects_super.clas.abap | 39 +++- src/objects/zif_abapgit_object.intf.abap | 2 - .../zcl_abapgit_gui_page_debuginfo.clas.abap | 4 +- 77 files changed, 980 insertions(+), 584 deletions(-) diff --git a/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap b/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap index 9349e3c42..f2a2a2b26 100644 --- a/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap +++ b/src/objects/aff/zcl_abapgit_object_common_aff.clas.abap @@ -25,8 +25,10 @@ CLASS zcl_abapgit_object_common_aff DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING zcx_abapgit_exception. @@ -80,8 +82,10 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. lo_handler TYPE REF TO object. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). " Check if AFF handler exists and if object type is registered and supported TRY. @@ -263,7 +267,7 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. TYPE symsg, LIKE LINE OF ls_additional_extensions. - lv_json_as_xstring = zif_abapgit_object~mo_files->read_raw( 'json' ). + lv_json_as_xstring = mo_files->read_raw( 'json' ). lv_name = ms_item-obj_name. " beyond here there will be dragons.... @@ -319,7 +323,7 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. LOOP AT ls_additional_extensions ASSIGNING . - lv_file_as_xstring = zif_abapgit_object~mo_files->read_raw( -extension ). + lv_file_as_xstring = mo_files->read_raw( -extension ). CALL METHOD -file_name_mapper->('IF_AFF_FILE_NAME_MAPPER~GET_FILE_NAME_FROM_OBJECT') EXPORTING @@ -622,7 +626,7 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. lv_json_as_xstring_wo_alv = remove_abap_language_version( lv_json_as_xstring ). ENDIF. - zif_abapgit_object~mo_files->add_raw( + mo_files->add_raw( iv_ext = 'json' iv_data = lv_json_as_xstring_wo_alv ). @@ -646,7 +650,7 @@ CLASS zcl_abapgit_object_common_aff IMPLEMENTATION. RECEIVING result = lv_file_as_xstring. - zif_abapgit_object~mo_files->add_raw( + mo_files->add_raw( iv_ext = -extension iv_data = lv_file_as_xstring ). diff --git a/src/objects/core/zcl_abapgit_objects_files.clas.abap b/src/objects/core/zcl_abapgit_objects_files.clas.abap index 5ce90304a..c0dafadff 100644 --- a/src/objects/core/zcl_abapgit_objects_files.clas.abap +++ b/src/objects/core/zcl_abapgit_objects_files.clas.abap @@ -1,9 +1,15 @@ CLASS zcl_abapgit_objects_files DEFINITION PUBLIC - CREATE PUBLIC . + CREATE PRIVATE. PUBLIC SECTION. + CLASS-METHODS new + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_path TYPE string OPTIONAL + RETURNING + VALUE(ro_files) TYPE REF TO zcl_abapgit_objects_files. METHODS constructor IMPORTING !is_item TYPE zif_abapgit_definitions=>ty_item @@ -319,6 +325,14 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. ENDMETHOD. + METHOD new. + CREATE OBJECT ro_files + EXPORTING + is_item = is_item + iv_path = iv_path. + ENDMETHOD. + + METHOD read_abap. DATA: lv_filename TYPE string, diff --git a/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap b/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap index 4db26867b..a8d3fa08f 100644 --- a/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap +++ b/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap @@ -59,9 +59,9 @@ CLASS ltcl_objects_files IMPLEMENTATION. " object type and name are upper case ls_item-obj_type = 'PROG'. ls_item-obj_name = 'ZLF'. - CREATE OBJECT mo_cut - EXPORTING - is_item = ls_item. + + mo_cut = zcl_abapgit_objects_files=>new( ls_item ). + mo_cut->set_files( lt_files ). ENDMETHOD. @@ -148,9 +148,7 @@ CLASS ltcl_objects_files IMPLEMENTATION. ls_item-obj_type = 'PROG'. ls_item-obj_name = '/TEST/ZLF'. - CREATE OBJECT mo_cut - EXPORTING - is_item = ls_item. + mo_cut = zcl_abapgit_objects_files=>new( ls_item ). " filenames are lower case cl_abap_unit_assert=>assert_equals( @@ -168,9 +166,7 @@ CLASS ltcl_objects_files IMPLEMENTATION. ls_item-obj_type = 'CHKO'. ls_item-obj_name = 'Z_AFF_EXAMPLE_CHKO'. - CREATE OBJECT mo_cut - EXPORTING - is_item = ls_item. + mo_cut = zcl_abapgit_objects_files=>new( ls_item ). mo_cut->add_raw( iv_data = lv_data iv_ext = 'json' ). diff --git a/src/objects/texts/zcl_abapgit_i18n_params.clas.abap b/src/objects/texts/zcl_abapgit_i18n_params.clas.abap index ef99f91f2..6c6360fc5 100644 --- a/src/objects/texts/zcl_abapgit_i18n_params.clas.abap +++ b/src/objects/texts/zcl_abapgit_i18n_params.clas.abap @@ -1,7 +1,7 @@ CLASS zcl_abapgit_i18n_params DEFINITION PUBLIC FINAL - CREATE PUBLIC . + CREATE PRIVATE. PUBLIC SECTION. diff --git a/src/objects/zcl_abapgit_object_aifc.clas.abap b/src/objects/zcl_abapgit_object_aifc.clas.abap index 4a558ec62..ac9048cff 100644 --- a/src/objects/zcl_abapgit_object_aifc.clas.abap +++ b/src/objects/zcl_abapgit_object_aifc.clas.abap @@ -10,10 +10,13 @@ CLASS zcl_abapgit_object_aifc DEFINITION METHODS constructor IMPORTING - !iv_language TYPE spras - !is_item TYPE zif_abapgit_definitions=>ty_item + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING zcx_abapgit_exception. + PROTECTED SECTION. TYPES: BEGIN OF ty_aif_key_s, @@ -127,6 +130,22 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. ENDMETHOD. + METHOD clear_client. + DATA: + BEGIN OF ls_data_to_clear, + mandt TYPE sy-mandt, + client TYPE sy-mandt, + END OF ls_data_to_clear. + + FIELD-SYMBOLS: + TYPE any. + + LOOP AT ct_data ASSIGNING . + MOVE-CORRESPONDING ls_data_to_clear TO . + ENDLOOP. + ENDMETHOD. + + METHOD compress_interface. DATA: lx_dyn_call_error TYPE REF TO cx_sy_dyn_call_error. DATA: lx_root TYPE REF TO cx_root. @@ -150,8 +169,11 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. METHOD constructor. DATA: lx_exc_ref TYPE REF TO cx_sy_dyn_call_error. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). ms_icd_data_key = is_item-obj_name. @@ -166,6 +188,68 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. ENDMETHOD. + METHOD execute_checks. + DATA ls_ifkeys TYPE ty_aif_key_s. + + DATA lr_tabledescr TYPE REF TO cl_abap_tabledescr. + DATA lr_structdescr TYPE REF TO cl_abap_structdescr. + DATA lr_table TYPE REF TO data. + FIELD-SYMBOLS TYPE STANDARD TABLE. + FIELD-SYMBOLS TYPE any. + FIELD-SYMBOLS: TYPE any. + + DATA: lx_dyn_call_error TYPE REF TO cx_sy_dyn_call_error. + DATA: lx_root TYPE REF TO cx_root. + + lr_structdescr ?= cl_abap_typedescr=>describe_by_name( p_name = '/AIF/T_FINF' ). + lr_tabledescr = cl_abap_tabledescr=>create( p_line_type = lr_structdescr ). + + CREATE DATA lr_table TYPE HANDLE lr_tabledescr. + ASSIGN lr_table->* TO . + IF sy-subrc <> 0. + zcx_abapgit_exception=>raise( 'Fieldsymbol not assigned' ). + ENDIF. + + TRY. + io_xml->read( EXPORTING + iv_name = '/AIF/T_FINF' + CHANGING + cg_data = ). + + READ TABLE ASSIGNING INDEX 1. + IF sy-subrc = 0. + ASSIGN COMPONENT 'NS' OF STRUCTURE TO . + IF sy-subrc = 0. + ls_ifkeys-ns = . + ENDIF. + + ASSIGN COMPONENT 'IFNAME' OF STRUCTURE TO . + IF sy-subrc = 0. + ls_ifkeys-ifname = . + ENDIF. + + ASSIGN COMPONENT 'IFVERSION' OF STRUCTURE TO . + IF sy-subrc = 0. + ls_ifkeys-ifver = . + ENDIF. + + CALL METHOD mo_abapgit_util->('/AIF/IF_ABAPGIT_AIFC_UTIL~EXECUTE_CHECKS') + EXPORTING + is_ifkeys = ls_ifkeys + is_finf = + RECEIVING + rv_success = rv_success. + ENDIF. + + CATCH cx_sy_dyn_call_error INTO lx_dyn_call_error. + zcx_abapgit_exception=>raise( iv_text = 'AIFC not supported' + ix_previous = lx_dyn_call_error ). + CATCH cx_root INTO lx_root. + zcx_abapgit_exception=>raise_with_text( lx_root ). + ENDTRY. + ENDMETHOD. + + METHOD get_content_compress. DATA: lx_dyn_call_error TYPE REF TO cx_sy_dyn_call_error. DATA: lx_root TYPE REF TO cx_root. @@ -529,82 +613,4 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. ix_previous = lx_dyn_call_error ). ENDTRY. ENDMETHOD. - - - METHOD clear_client. - DATA: - BEGIN OF ls_data_to_clear, - mandt TYPE sy-mandt, - client TYPE sy-mandt, - END OF ls_data_to_clear. - - FIELD-SYMBOLS: - TYPE any. - - LOOP AT ct_data ASSIGNING . - MOVE-CORRESPONDING ls_data_to_clear TO . - ENDLOOP. - ENDMETHOD. - - - METHOD execute_checks. - DATA ls_ifkeys TYPE ty_aif_key_s. - - DATA lr_tabledescr TYPE REF TO cl_abap_tabledescr. - DATA lr_structdescr TYPE REF TO cl_abap_structdescr. - DATA lr_table TYPE REF TO data. - FIELD-SYMBOLS TYPE STANDARD TABLE. - FIELD-SYMBOLS TYPE any. - FIELD-SYMBOLS: TYPE any. - - DATA: lx_dyn_call_error TYPE REF TO cx_sy_dyn_call_error. - DATA: lx_root TYPE REF TO cx_root. - - lr_structdescr ?= cl_abap_typedescr=>describe_by_name( p_name = '/AIF/T_FINF' ). - lr_tabledescr = cl_abap_tabledescr=>create( p_line_type = lr_structdescr ). - - CREATE DATA lr_table TYPE HANDLE lr_tabledescr. - ASSIGN lr_table->* TO . - IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'Fieldsymbol not assigned' ). - ENDIF. - - TRY. - io_xml->read( EXPORTING - iv_name = '/AIF/T_FINF' - CHANGING - cg_data = ). - - READ TABLE ASSIGNING INDEX 1. - IF sy-subrc = 0. - ASSIGN COMPONENT 'NS' OF STRUCTURE TO . - IF sy-subrc = 0. - ls_ifkeys-ns = . - ENDIF. - - ASSIGN COMPONENT 'IFNAME' OF STRUCTURE TO . - IF sy-subrc = 0. - ls_ifkeys-ifname = . - ENDIF. - - ASSIGN COMPONENT 'IFVERSION' OF STRUCTURE TO . - IF sy-subrc = 0. - ls_ifkeys-ifver = . - ENDIF. - - CALL METHOD mo_abapgit_util->('/AIF/IF_ABAPGIT_AIFC_UTIL~EXECUTE_CHECKS') - EXPORTING - is_ifkeys = ls_ifkeys - is_finf = - RECEIVING - rv_success = rv_success. - ENDIF. - - CATCH cx_sy_dyn_call_error INTO lx_dyn_call_error. - zcx_abapgit_exception=>raise( iv_text = 'AIFC not supported' - ix_previous = lx_dyn_call_error ). - CATCH cx_root INTO lx_root. - zcx_abapgit_exception=>raise_with_text( lx_root ). - ENDTRY. - ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_amsd.clas.abap b/src/objects/zcl_abapgit_object_amsd.clas.abap index bea841cc4..08b001492 100644 --- a/src/objects/zcl_abapgit_object_amsd.clas.abap +++ b/src/objects/zcl_abapgit_object_amsd.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_amsd DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. METHODS: @@ -92,8 +94,10 @@ CLASS zcl_abapgit_object_amsd IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_logical_db_schema_key = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_apis.clas.abap b/src/objects/zcl_abapgit_object_apis.clas.abap index 8ec6191ae..33ae157bf 100644 --- a/src/objects/zcl_abapgit_object_apis.clas.abap +++ b/src/objects/zcl_abapgit_object_apis.clas.abap @@ -8,13 +8,14 @@ CLASS zcl_abapgit_object_apis DEFINITION INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -32,8 +33,11 @@ CLASS zcl_abapgit_object_apis IMPLEMENTATION. DATA lr_data TYPE REF TO data. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CREATE DATA lr_data TYPE (c_model). diff --git a/src/objects/zcl_abapgit_object_auth.clas.abap b/src/objects/zcl_abapgit_object_auth.clas.abap index c93ae1622..4241eec8b 100644 --- a/src/objects/zcl_abapgit_object_auth.clas.abap +++ b/src/objects/zcl_abapgit_object_auth.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_auth DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: mv_fieldname TYPE authx-fieldname. @@ -20,8 +25,11 @@ CLASS zcl_abapgit_object_auth IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_fieldname = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_bdef.clas.abap b/src/objects/zcl_abapgit_object_bdef.clas.abap index 75ce4373a..6b5c98f13 100644 --- a/src/objects/zcl_abapgit_object_bdef.clas.abap +++ b/src/objects/zcl_abapgit_object_bdef.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_bdef DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -194,8 +196,10 @@ CLASS zcl_abapgit_object_bdef IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_behaviour_definition_key = ms_item-obj_name. @@ -244,7 +248,7 @@ CLASS zcl_abapgit_object_bdef IMPLEMENTATION. ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . ASSERT sy-subrc = 0. - = zif_abapgit_object~mo_files->read_string( 'asbdef' ). + = mo_files->read_string( 'asbdef' ). CREATE OBJECT ro_object_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). @@ -600,7 +604,7 @@ CLASS zcl_abapgit_object_bdef IMPLEMENTATION. iv_name = 'BDEF' ig_data = ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'asbdef' iv_string = lv_source ). diff --git a/src/objects/zcl_abapgit_object_chdo.clas.abap b/src/objects/zcl_abapgit_object_chdo.clas.abap index 6e3b21e6f..4b0f31323 100644 --- a/src/objects/zcl_abapgit_object_chdo.clas.abap +++ b/src/objects/zcl_abapgit_object_chdo.clas.abap @@ -9,8 +9,13 @@ CLASS zcl_abapgit_object_chdo DEFINITION METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. METHODS after_import @@ -74,8 +79,11 @@ CLASS zcl_abapgit_object_chdo IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_object = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_clas.clas.abap b/src/objects/zcl_abapgit_object_clas.clas.abap index 221ca7455..ecdf8671f 100644 --- a/src/objects/zcl_abapgit_object_clas.clas.abap +++ b/src/objects/zcl_abapgit_object_clas.clas.abap @@ -9,8 +9,13 @@ CLASS zcl_abapgit_object_clas DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras . + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. DATA: mi_object_oriented_object_fct TYPE REF TO zif_abapgit_oo_object_fnc, mv_skip_testclass TYPE abap_bool, @@ -142,8 +147,12 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). CREATE OBJECT mi_object_oriented_object_fct TYPE zcl_abapgit_oo_class. @@ -166,21 +175,21 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. lt_attributes TYPE zif_abapgit_oo_object_fnc=>ty_obj_attribute_tt. - lt_source = zif_abapgit_object~mo_files->read_abap( ). + lt_source = mo_files->read_abap( ). - lt_local_definitions = zif_abapgit_object~mo_files->read_abap( + lt_local_definitions = mo_files->read_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-locals_def iv_error = abap_false ). - lt_local_implementations = zif_abapgit_object~mo_files->read_abap( + lt_local_implementations = mo_files->read_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-locals_imp iv_error = abap_false ). - lt_local_macros = zif_abapgit_object~mo_files->read_abap( + lt_local_macros = mo_files->read_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-macros iv_error = abap_false ). - lt_test_classes = zif_abapgit_object~mo_files->read_abap( + lt_test_classes = mo_files->read_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-testclasses iv_error = abap_false ). @@ -1003,13 +1012,13 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. source_apack_replacement( CHANGING ct_source = lt_source ). - zif_abapgit_object~mo_files->add_abap( lt_source ). + mo_files->add_abap( lt_source ). lt_source = mi_object_oriented_object_fct->serialize_abap( is_class_key = ls_class_key iv_type = seop_ext_class_locals_def ). IF lines( lt_source ) > 0. - zif_abapgit_object~mo_files->add_abap( + mo_files->add_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-locals_def it_abap = lt_source ). ENDIF. @@ -1018,7 +1027,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. is_class_key = ls_class_key iv_type = seop_ext_class_locals_imp ). IF lines( lt_source ) > 0. - zif_abapgit_object~mo_files->add_abap( + mo_files->add_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-locals_imp it_abap = lt_source ). ENDIF. @@ -1029,7 +1038,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. mv_skip_testclass = mi_object_oriented_object_fct->get_skip_test_classes( ). IF lines( lt_source ) > 0 AND mv_skip_testclass = abap_false. - zif_abapgit_object~mo_files->add_abap( + mo_files->add_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-testclasses it_abap = lt_source ). ENDIF. @@ -1038,7 +1047,7 @@ CLASS zcl_abapgit_object_clas IMPLEMENTATION. is_class_key = ls_class_key iv_type = seop_ext_class_macros ). IF lines( lt_source ) > 0. - zif_abapgit_object~mo_files->add_abap( + mo_files->add_abap( iv_extra = zif_abapgit_oo_object_fnc=>c_parts-macros it_abap = lt_source ). ENDIF. diff --git a/src/objects/zcl_abapgit_object_cmpt.clas.abap b/src/objects/zcl_abapgit_object_cmpt.clas.abap index ac1641520..3d0a0a710 100644 --- a/src/objects/zcl_abapgit_object_cmpt.clas.abap +++ b/src/objects/zcl_abapgit_object_cmpt.clas.abap @@ -1,14 +1,17 @@ CLASS zcl_abapgit_object_cmpt DEFINITION PUBLIC INHERITING FROM zcl_abapgit_objects_super FINAL. PUBLIC SECTION. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. INTERFACES zif_abapgit_object. - PROTECTED SECTION. PRIVATE SECTION. DATA: mo_cmp_db TYPE REF TO object, @@ -23,8 +26,11 @@ CLASS zcl_abapgit_object_cmpt IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CALL METHOD ('CL_CMP_TEMPLATE')=>('S_GET_DB_ACCESS') diff --git a/src/objects/zcl_abapgit_object_cus0.clas.abap b/src/objects/zcl_abapgit_object_cus0.clas.abap index 55551124a..399f62fab 100644 --- a/src/objects/zcl_abapgit_object_cus0.clas.abap +++ b/src/objects/zcl_abapgit_object_cus0.clas.abap @@ -5,8 +5,12 @@ CLASS zcl_abapgit_object_cus0 DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. TYPES: ty_img_activity_texts TYPE STANDARD TABLE OF cus_imgact @@ -26,8 +30,11 @@ CLASS zcl_abapgit_object_cus0 IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_img_activity = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_cus1.clas.abap b/src/objects/zcl_abapgit_object_cus1.clas.abap index 47b618570..e1dea2449 100644 --- a/src/objects/zcl_abapgit_object_cus1.clas.abap +++ b/src/objects/zcl_abapgit_object_cus1.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_cus1 DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. TYPES: ty_activity_titles TYPE STANDARD TABLE OF cus_actt @@ -37,8 +42,11 @@ CLASS zcl_abapgit_object_cus1 IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_customizing_activity = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_cus2.clas.abap b/src/objects/zcl_abapgit_object_cus2.clas.abap index 724008107..8d453e086 100644 --- a/src/objects/zcl_abapgit_object_cus2.clas.abap +++ b/src/objects/zcl_abapgit_object_cus2.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_cus2 DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. TYPES: ty_attribute_titles TYPE STANDARD TABLE OF cus_atrt @@ -37,8 +42,11 @@ CLASS zcl_abapgit_object_cus2 IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_img_attribute = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_dcls.clas.abap b/src/objects/zcl_abapgit_object_dcls.clas.abap index 80f68abca..74addfb1c 100644 --- a/src/objects/zcl_abapgit_object_dcls.clas.abap +++ b/src/objects/zcl_abapgit_object_dcls.clas.abap @@ -89,7 +89,7 @@ CLASS zcl_abapgit_object_dcls IMPLEMENTATION. ASSIGN COMPONENT 'SOURCE' OF STRUCTURE TO . ASSERT sy-subrc = 0. - = zif_abapgit_object~mo_files->read_string( 'asdcls' ). + = mo_files->read_string( 'asdcls' ). TRY. tadir_insert( iv_package ). @@ -242,7 +242,7 @@ CLASS zcl_abapgit_object_dcls IMPLEMENTATION. ASSIGN COMPONENT 'SOURCE' OF STRUCTURE TO . ASSERT sy-subrc = 0. - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'asdcls' iv_string = ). diff --git a/src/objects/zcl_abapgit_object_ddls.clas.abap b/src/objects/zcl_abapgit_object_ddls.clas.abap index 95c36ee65..ed0016335 100644 --- a/src/objects/zcl_abapgit_object_ddls.clas.abap +++ b/src/objects/zcl_abapgit_object_ddls.clas.abap @@ -5,10 +5,13 @@ CLASS zcl_abapgit_object_ddls DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING - zcx_abapgit_exception . + zcx_abapgit_exception. + PROTECTED SECTION. METHODS open_adt_stob IMPORTING @@ -38,8 +41,10 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION. DATA lo_ddl TYPE REF TO object. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CALL METHOD ('CL_DD_DDL_HANDLER_FACTORY')=>('CREATE') @@ -162,7 +167,7 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION. METHOD read_baseinfo. TRY. - rv_baseinfo_string = zif_abapgit_object~mo_files->read_string( 'baseinfo' ). + rv_baseinfo_string = mo_files->read_string( 'baseinfo' ). CATCH zcx_abapgit_exception. " File not found. That's ok, as the object could have been created in a @@ -278,7 +283,7 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION. ASSIGN COMPONENT 'SOURCE' OF STRUCTURE TO . ASSERT sy-subrc = 0. - = zif_abapgit_object~mo_files->read_string( 'asddls' ). + = mo_files->read_string( 'asddls' ). CALL METHOD ('CL_DD_DDL_HANDLER_FACTORY')=>('CREATE') RECEIVING @@ -474,7 +479,7 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION. IF = ms_item-obj_name AND = 'A'. ASSIGN COMPONENT 'BASEINFO_STRING' OF STRUCTURE TO . ASSERT sy-subrc = 0. - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'baseinfo' iv_string = ). EXIT. @@ -513,7 +518,7 @@ CLASS zcl_abapgit_object_ddls IMPLEMENTATION. format_source_before_serialize( CHANGING cv_string = ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'asddls' iv_string = ). diff --git a/src/objects/zcl_abapgit_object_ddlx.clas.abap b/src/objects/zcl_abapgit_object_ddlx.clas.abap index e60bbb62c..d48fb6668 100644 --- a/src/objects/zcl_abapgit_object_ddlx.clas.abap +++ b/src/objects/zcl_abapgit_object_ddlx.clas.abap @@ -203,7 +203,7 @@ CLASS zcl_abapgit_object_ddlx IMPLEMENTATION. TRY. " If the file doesn't exist that's ok, because previously " the source code was stored in the xml. We are downward compatible. - = zif_abapgit_object~mo_files->read_string( 'asddlxs' ). + = mo_files->read_string( 'asddlxs' ). CATCH zcx_abapgit_exception ##NO_HANDLER. ENDTRY. @@ -372,7 +372,7 @@ CLASS zcl_abapgit_object_ddlx IMPLEMENTATION. ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . ASSERT sy-subrc = 0. - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'asddlxs' iv_string = ). diff --git a/src/objects/zcl_abapgit_object_devc.clas.abap b/src/objects/zcl_abapgit_object_devc.clas.abap index 114abfd55..53dc35705 100644 --- a/src/objects/zcl_abapgit_object_devc.clas.abap +++ b/src/objects/zcl_abapgit_object_devc.clas.abap @@ -6,9 +6,15 @@ CLASS zcl_abapgit_object_devc DEFINITION PUBLIC INTERFACES: zif_abapgit_object. - METHODS: - constructor IMPORTING is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -66,13 +72,19 @@ CLASS zcl_abapgit_object_devc IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). + IF is_item-devclass IS NOT INITIAL. mv_local_devclass = is_item-devclass. ELSE. mv_local_devclass = is_item-obj_name. ENDIF. + ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_doct.clas.abap b/src/objects/zcl_abapgit_object_doct.clas.abap index 153e4a5bc..ae4a3ee05 100644 --- a/src/objects/zcl_abapgit_object_doct.clas.abap +++ b/src/objects/zcl_abapgit_object_doct.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_doct DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -24,8 +28,10 @@ CLASS zcl_abapgit_object_doct IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mi_longtexts = zcl_abapgit_factory=>get_longtexts( ). diff --git a/src/objects/zcl_abapgit_object_docv.clas.abap b/src/objects/zcl_abapgit_object_docv.clas.abap index 5ec6c4004..109ba1288 100644 --- a/src/objects/zcl_abapgit_object_docv.clas.abap +++ b/src/objects/zcl_abapgit_object_docv.clas.abap @@ -10,10 +10,13 @@ CLASS zcl_abapgit_object_docv DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -46,8 +49,11 @@ CLASS zcl_abapgit_object_docv IMPLEMENTATION. DATA: lv_prefix TYPE namespace, lv_bare_name TYPE progname. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). IF ms_item-obj_name(2) <> 'DT'. " IN, MO, UO, UP mv_id = ms_item-obj_name(2). diff --git a/src/objects/zcl_abapgit_object_drul.clas.abap b/src/objects/zcl_abapgit_object_drul.clas.abap index d69f94be5..a893245fc 100644 --- a/src/objects/zcl_abapgit_object_drul.clas.abap +++ b/src/objects/zcl_abapgit_object_drul.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_drul DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. METHODS: @@ -116,8 +118,10 @@ CLASS zcl_abapgit_object_drul IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_dependency_rule_key = ms_item-obj_name. @@ -308,7 +312,7 @@ CLASS zcl_abapgit_object_drul IMPLEMENTATION. TO . ASSERT sy-subrc = 0. - = zif_abapgit_object~mo_files->read_string( 'asdrul' ). + = mo_files->read_string( 'asdrul' ). tadir_insert( iv_package ). @@ -458,7 +462,7 @@ CLASS zcl_abapgit_object_drul IMPLEMENTATION. iv_name = 'DRUL' ig_data = ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'asdrul' iv_string = lv_source ). diff --git a/src/objects/zcl_abapgit_object_dsys.clas.abap b/src/objects/zcl_abapgit_object_dsys.clas.abap index 491ce9adb..fd862d6f2 100644 --- a/src/objects/zcl_abapgit_object_dsys.clas.abap +++ b/src/objects/zcl_abapgit_object_dsys.clas.abap @@ -6,8 +6,12 @@ CLASS zcl_abapgit_object_dsys DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. @@ -46,8 +50,11 @@ CLASS zcl_abapgit_object_dsys IMPLEMENTATION. DATA: lv_prefix TYPE namespace, lv_bare_name TYPE progname. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). IF ms_item-obj_name(1) = '/'. diff --git a/src/objects/zcl_abapgit_object_dtdc.clas.abap b/src/objects/zcl_abapgit_object_dtdc.clas.abap index 2fa535e6b..ebb01db14 100644 --- a/src/objects/zcl_abapgit_object_dtdc.clas.abap +++ b/src/objects/zcl_abapgit_object_dtdc.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_dtdc DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. METHODS: @@ -132,8 +134,10 @@ CLASS zcl_abapgit_object_dtdc IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_dynamic_cache_key = ms_item-obj_name. mv_has_own_wb_data_class = has_own_wb_data_class( ). @@ -324,7 +328,7 @@ CLASS zcl_abapgit_object_dtdc IMPLEMENTATION. TO . ASSERT sy-subrc = 0. - = zif_abapgit_object~mo_files->read_string( 'asdtdc' ). + = mo_files->read_string( 'asdtdc' ). tadir_insert( iv_package ). @@ -474,7 +478,7 @@ CLASS zcl_abapgit_object_dtdc IMPLEMENTATION. iv_name = 'DTDC' ig_data = ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'asdtdc' iv_string = lv_source ). diff --git a/src/objects/zcl_abapgit_object_ecatt_super.clas.abap b/src/objects/zcl_abapgit_object_ecatt_super.clas.abap index b4688e847..791d5aebc 100644 --- a/src/objects/zcl_abapgit_object_ecatt_super.clas.abap +++ b/src/objects/zcl_abapgit_object_ecatt_super.clas.abap @@ -8,11 +8,15 @@ CLASS zcl_abapgit_object_ecatt_super DEFINITION INTERFACES zif_abapgit_object . - METHODS: - constructor - IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras . + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. METHODS: get_object_type ABSTRACT @@ -228,8 +232,11 @@ CLASS zcl_abapgit_object_ecatt_super IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_object_name = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_enhc.clas.abap b/src/objects/zcl_abapgit_object_enhc.clas.abap index 96ca7c568..665de5791 100644 --- a/src/objects/zcl_abapgit_object_enhc.clas.abap +++ b/src/objects/zcl_abapgit_object_enhc.clas.abap @@ -5,11 +5,15 @@ CLASS zcl_abapgit_object_enhc DEFINITION PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: @@ -24,8 +28,11 @@ CLASS zcl_abapgit_object_enhc IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_composite_id = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_enho.clas.abap b/src/objects/zcl_abapgit_object_enho.clas.abap index 8df7140bd..f6b876a5e 100644 --- a/src/objects/zcl_abapgit_object_enho.clas.abap +++ b/src/objects/zcl_abapgit_object_enho.clas.abap @@ -18,7 +18,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_OBJECT_ENHO IMPLEMENTATION. +CLASS zcl_abapgit_object_enho IMPLEMENTATION. METHOD factory. @@ -32,17 +32,17 @@ CLASS ZCL_ABAPGIT_OBJECT_ENHO IMPLEMENTATION. CREATE OBJECT ri_enho TYPE zcl_abapgit_object_enho_hook EXPORTING is_item = ms_item - io_files = zif_abapgit_object~mo_files. + io_files = mo_files. WHEN cl_enh_tool_class=>tooltype. CREATE OBJECT ri_enho TYPE zcl_abapgit_object_enho_class EXPORTING is_item = ms_item - io_files = zif_abapgit_object~mo_files. + io_files = mo_files. WHEN cl_enh_tool_intf=>tooltype. CREATE OBJECT ri_enho TYPE zcl_abapgit_object_enho_intf EXPORTING is_item = ms_item - io_files = zif_abapgit_object~mo_files. + io_files = mo_files. WHEN cl_wdr_cfg_enhancement=>tooltype. CREATE OBJECT ri_enho TYPE zcl_abapgit_object_enho_wdyc EXPORTING @@ -51,7 +51,7 @@ CLASS ZCL_ABAPGIT_OBJECT_ENHO IMPLEMENTATION. CREATE OBJECT ri_enho TYPE zcl_abapgit_object_enho_fugr EXPORTING is_item = ms_item - io_files = zif_abapgit_object~mo_files. + io_files = mo_files. WHEN 'WDYENH'. CREATE OBJECT ri_enho TYPE zcl_abapgit_object_enho_wdyn EXPORTING diff --git a/src/objects/zcl_abapgit_object_form.clas.abap b/src/objects/zcl_abapgit_object_form.clas.abap index f20652199..c2177b4bc 100644 --- a/src/objects/zcl_abapgit_object_form.clas.abap +++ b/src/objects/zcl_abapgit_object_form.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_form DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. CONSTANTS: c_objectname_form TYPE thead-tdobject VALUE 'FORM' ##NO_TEXT. @@ -130,7 +135,7 @@ CLASS zcl_abapgit_object_form IMPLEMENTATION. ig_data = it_lines ). lv_string = li_xml->render( ). IF lv_string IS NOT INITIAL. - zif_abapgit_object~mo_files->add_string( iv_extra = + mo_files->add_string( iv_extra = build_extra_from_header( is_form_data-form_header ) iv_ext = c_extension_xml iv_string = lv_string ). @@ -141,8 +146,11 @@ CLASS zcl_abapgit_object_form IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_form_name = ms_item-obj_name. @@ -155,12 +163,12 @@ CLASS zcl_abapgit_object_form IMPLEMENTATION. DATA li_xml TYPE REF TO zif_abapgit_xml_input. TRY. - lv_string = zif_abapgit_object~mo_files->read_string( iv_extra = + lv_string = mo_files->read_string( iv_extra = build_extra_from_header( is_form_data-form_header ) iv_ext = c_extension_xml ). CATCH zcx_abapgit_exception. - lv_string = zif_abapgit_object~mo_files->read_string( iv_extra = + lv_string = mo_files->read_string( iv_extra = build_extra_from_header_old( is_form_data-form_header ) iv_ext = c_extension_xml ). diff --git a/src/objects/zcl_abapgit_object_ftgl.clas.abap b/src/objects/zcl_abapgit_object_ftgl.clas.abap index acdfee410..59cdf46ed 100644 --- a/src/objects/zcl_abapgit_object_ftgl.clas.abap +++ b/src/objects/zcl_abapgit_object_ftgl.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_ftgl DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: @@ -48,8 +50,10 @@ CLASS zcl_abapgit_object_ftgl IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_toggle_id = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_fugr.clas.abap b/src/objects/zcl_abapgit_object_fugr.clas.abap index 1df22b785..8824f6bbc 100644 --- a/src/objects/zcl_abapgit_object_fugr.clas.abap +++ b/src/objects/zcl_abapgit_object_fugr.clas.abap @@ -227,7 +227,7 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION. LOOP AT it_functions ASSIGNING . - lt_source = zif_abapgit_object~mo_files->read_abap( iv_extra = -funcname ). + lt_source = mo_files->read_abap( iv_extra = -funcname ). lv_area = ms_item-obj_name. @@ -383,9 +383,9 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION. ENDIF. TRY. - lt_source = zif_abapgit_object~mo_files->read_abap( iv_extra = ). + lt_source = mo_files->read_abap( iv_extra = ). - lo_xml = zif_abapgit_object~mo_files->read_xml( ). + lo_xml = mo_files->read_xml( ). lo_xml->read( EXPORTING iv_name = 'PROGDIR' CHANGING cg_data = ls_progdir ). @@ -554,7 +554,7 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION. LOOP AT lt_includes ASSIGNING . - lo_xml = zif_abapgit_object~mo_files->read_xml( ). + lo_xml = mo_files->read_xml( ). lo_xml->read( EXPORTING iv_name = 'PROGDIR' CHANGING cg_data = ls_progdir ). @@ -895,12 +895,12 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION. IF NOT lt_new_source IS INITIAL. strip_generation_comments( CHANGING ct_source = lt_new_source ). - zif_abapgit_object~mo_files->add_abap( + mo_files->add_abap( iv_extra = -funcname it_abap = lt_new_source ). ELSE. strip_generation_comments( CHANGING ct_source = lt_source ). - zif_abapgit_object~mo_files->add_abap( + mo_files->add_abap( iv_extra = -funcname it_abap = lt_source ). ENDIF. @@ -951,7 +951,7 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION. * todo, filename is not correct, a include can be used in several programs serialize_program( is_item = ms_item - io_files = zif_abapgit_object~mo_files + io_files = mo_files iv_program = iv_extra = ). diff --git a/src/objects/zcl_abapgit_object_iamu.clas.abap b/src/objects/zcl_abapgit_object_iamu.clas.abap index 4ce979b5c..e4f4fc656 100644 --- a/src/objects/zcl_abapgit_object_iamu.clas.abap +++ b/src/objects/zcl_abapgit_object_iamu.clas.abap @@ -331,7 +331,7 @@ CLASS zcl_abapgit_object_iamu IMPLEMENTATION. ls_internet_appl_comp_binary-attributes-devclass = iv_package. IF io_xml->get_metadata( )-version = 'v2.0.0'. - lv_xstring = zif_abapgit_object~mo_files->read_raw( ls_internet_appl_comp_binary-extension ). + lv_xstring = mo_files->read_raw( ls_internet_appl_comp_binary-extension ). zcl_abapgit_convert=>xstring_to_bintab( EXPORTING @@ -430,7 +430,7 @@ CLASS zcl_abapgit_object_iamu IMPLEMENTATION. iv_name = ls_internet_appl_comp_binary-attributes-longname iv_data = lv_xstring ). - zif_abapgit_object~mo_files->add_raw( + mo_files->add_raw( iv_data = lv_xstring iv_ext = ls_internet_appl_comp_binary-extension ). diff --git a/src/objects/zcl_abapgit_object_iarp.clas.abap b/src/objects/zcl_abapgit_object_iarp.clas.abap index fb763b0c3..4341dddb7 100644 --- a/src/objects/zcl_abapgit_object_iarp.clas.abap +++ b/src/objects/zcl_abapgit_object_iarp.clas.abap @@ -3,10 +3,15 @@ CLASS zcl_abapgit_object_iarp DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: @@ -75,8 +80,10 @@ CLASS zcl_abapgit_object_iarp IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). ms_name = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_iasp.clas.abap b/src/objects/zcl_abapgit_object_iasp.clas.abap index 964455bdd..bef6d82e7 100644 --- a/src/objects/zcl_abapgit_object_iasp.clas.abap +++ b/src/objects/zcl_abapgit_object_iasp.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_iasp DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: @@ -74,8 +78,10 @@ CLASS zcl_abapgit_object_iasp IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_name = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_iatu.clas.abap b/src/objects/zcl_abapgit_object_iatu.clas.abap index d5a3915c4..abf3651b3 100644 --- a/src/objects/zcl_abapgit_object_iatu.clas.abap +++ b/src/objects/zcl_abapgit_object_iatu.clas.abap @@ -341,7 +341,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION. io_xml->read( EXPORTING iv_name = 'ATTR' CHANGING cg_data = ls_attr ). - lv_source = zif_abapgit_object~mo_files->read_string( 'html' ). + lv_source = mo_files->read_string( 'html' ). ls_attr-devclass = iv_package. save( is_attr = ls_attr @@ -424,7 +424,7 @@ CLASS zcl_abapgit_object_iatu IMPLEMENTATION. io_xml->add( iv_name = 'ATTR' ig_data = ls_attr ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = 'html' iv_string = lv_source ). diff --git a/src/objects/zcl_abapgit_object_idoc.clas.abap b/src/objects/zcl_abapgit_object_idoc.clas.abap index 3679c023e..e01d7db1a 100644 --- a/src/objects/zcl_abapgit_object_idoc.clas.abap +++ b/src/objects/zcl_abapgit_object_idoc.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_idoc DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + CLASS-METHODS clear_idoc_segement_fields CHANGING cg_structure TYPE any. PROTECTED SECTION. PRIVATE SECTION. @@ -68,8 +72,11 @@ CLASS zcl_abapgit_object_idoc IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_idoctyp = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_iext.clas.abap b/src/objects/zcl_abapgit_object_iext.clas.abap index 7fba2cf65..e0f681080 100644 --- a/src/objects/zcl_abapgit_object_iext.clas.abap +++ b/src/objects/zcl_abapgit_object_iext.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_iext DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. TYPES: BEGIN OF ty_extention, @@ -27,8 +31,11 @@ CLASS zcl_abapgit_object_iext IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_extension = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_intf.clas.abap b/src/objects/zcl_abapgit_object_intf.clas.abap index b9b33ed31..52542eb01 100644 --- a/src/objects/zcl_abapgit_object_intf.clas.abap +++ b/src/objects/zcl_abapgit_object_intf.clas.abap @@ -18,8 +18,13 @@ CLASS zcl_abapgit_object_intf DEFINITION PUBLIC FINAL INHERITING FROM zcl_abapgi METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. METHODS deserialize_proxy IMPORTING @@ -111,8 +116,11 @@ CLASS zcl_abapgit_object_intf IMPLEMENTATION. DATA li_aff_registry TYPE REF TO zif_abapgit_aff_registry. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). + mi_object_oriented_object_fct = zcl_abapgit_oo_factory=>make( ms_item-obj_type ). CREATE OBJECT li_aff_registry TYPE zcl_abapgit_aff_registry. @@ -258,7 +266,7 @@ CLASS zcl_abapgit_object_intf IMPLEMENTATION. DATA ls_intf_aff TYPE zif_abapgit_aff_intf_v1=>ty_main. DATA lo_aff_mapper TYPE REF TO zif_abapgit_aff_type_mapping. - lv_json_data = zif_abapgit_object~mo_files->read_raw( 'json' ). + lv_json_data = mo_files->read_raw( 'json' ). ls_intf_aff = lcl_aff_metadata_handler=>deserialize( lv_json_data ). CREATE OBJECT lo_aff_mapper TYPE lcl_aff_type_mapping. @@ -412,8 +420,8 @@ CLASS zcl_abapgit_object_intf IMPLEMENTATION. " HERE: switch with feature flag for XML or JSON file format IF mv_aff_enabled = abap_true. lv_serialized_data = lcl_aff_metadata_handler=>serialize( ls_intf ). - zif_abapgit_object~mo_files->add_raw( iv_ext = 'json' - iv_data = lv_serialized_data ). + mo_files->add_raw( iv_ext = 'json' + iv_data = lv_serialized_data ). ELSE. io_xml->add( iv_name = 'VSEOINTERF' @@ -531,7 +539,7 @@ CLASS zcl_abapgit_object_intf IMPLEMENTATION. cg_properties = ls_intf-vseointerf ). ls_clskey-clsname = ms_item-obj_name. - lt_source = zif_abapgit_object~mo_files->read_abap( ). + lt_source = mo_files->read_abap( ). mi_object_oriented_object_fct->deserialize_source( is_key = ls_clskey @@ -673,7 +681,7 @@ CLASS zcl_abapgit_object_intf IMPLEMENTATION. lt_source = mi_object_oriented_object_fct->serialize_abap( ls_interface_key ). - zif_abapgit_object~mo_files->add_abap( lt_source ). + mo_files->add_abap( lt_source ). serialize_xml( io_xml ). diff --git a/src/objects/zcl_abapgit_object_intf.clas.testclasses.abap b/src/objects/zcl_abapgit_object_intf.clas.testclasses.abap index f39561728..5cb88a79b 100644 --- a/src/objects/zcl_abapgit_object_intf.clas.testclasses.abap +++ b/src/objects/zcl_abapgit_object_intf.clas.testclasses.abap @@ -112,12 +112,13 @@ CLASS ltcl_unit_test DEFINITION FINAL FOR TESTING DURATION SHORT RISK LEVEL HARM PRIVATE SECTION. DATA: mo_cut TYPE REF TO zif_abapgit_object, + mo_files TYPE REF TO zcl_abapgit_objects_files, mo_log TYPE REF TO zcl_abapgit_log, mo_object_fnc TYPE REF TO lth_oo_object_fnc, ms_item TYPE zif_abapgit_definitions=>ty_item. METHODS: - setup, + setup RAISING zcx_abapgit_exception, get_xml RETURNING VALUE(rv_xml) TYPE string, @@ -136,14 +137,13 @@ CLASS ltcl_unit_test IMPLEMENTATION. ms_item-obj_type = 'INTF'. ms_item-abap_language_version = zif_abapgit_aff_types_v1=>co_abap_language_version_src-standard. + mo_files = zcl_abapgit_objects_files=>new( ms_item ). + CREATE OBJECT lo_cut EXPORTING is_item = ms_item - iv_language = 'E'. - - CREATE OBJECT lo_cut->zif_abapgit_object~mo_files - EXPORTING - is_item = ms_item. + iv_language = 'E' + io_files = mo_files. CREATE OBJECT mo_log. @@ -167,7 +167,7 @@ CLASS ltcl_unit_test IMPLEMENTATION. EXPORTING iv_xml = get_xml( ). - mo_cut->mo_files->add_abap( get_source( ) ). + mo_files->add_abap( get_source( ) ). mo_cut->deserialize( iv_package = 'MY_PACKAGE' diff --git a/src/objects/zcl_abapgit_object_oa2p.clas.abap b/src/objects/zcl_abapgit_object_oa2p.clas.abap index b795cd1b7..bd6495353 100644 --- a/src/objects/zcl_abapgit_object_oa2p.clas.abap +++ b/src/objects/zcl_abapgit_object_oa2p.clas.abap @@ -7,10 +7,15 @@ CLASS zcl_abapgit_object_oa2p DEFINITION PUBLIC SECTION. INTERFACES zif_abapgit_object . + METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -25,8 +30,11 @@ CLASS zcl_abapgit_object_oa2p IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_profile = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_pdts.clas.abap b/src/objects/zcl_abapgit_object_pdts.clas.abap index 07296c784..3c45523fb 100644 --- a/src/objects/zcl_abapgit_object_pdts.clas.abap +++ b/src/objects/zcl_abapgit_object_pdts.clas.abap @@ -6,9 +6,14 @@ CLASS zcl_abapgit_object_pdts DEFINITION PUBLIC SECTION. - METHODS constructor IMPORTING is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. METHODS zif_abapgit_object~serialize REDEFINITION. METHODS zif_abapgit_object~deserialize REDEFINITION. @@ -35,8 +40,11 @@ CLASS zcl_abapgit_object_pdts IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). ms_objkey-otype = 'TS'. ms_objkey-objid = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_pdxx_super.clas.abap b/src/objects/zcl_abapgit_object_pdxx_super.clas.abap index c80112c82..004a4b501 100644 --- a/src/objects/zcl_abapgit_object_pdxx_super.clas.abap +++ b/src/objects/zcl_abapgit_object_pdxx_super.clas.abap @@ -6,9 +6,15 @@ CLASS zcl_abapgit_object_pdxx_super DEFINITION PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS constructor IMPORTING is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. DATA ms_objkey TYPE hrsobject. @@ -31,23 +37,16 @@ CLASS zcl_abapgit_object_pdxx_super IMPLEMENTATION. ENDMETHOD. - METHOD zif_abapgit_object~exists. + METHOD constructor. - CALL FUNCTION 'RH_READ_OBJECT' - EXPORTING - plvar = '01' - otype = ms_objkey-otype - objid = ms_objkey-objid - istat = '1' - begda = sy-datum - endda = '99991231' - ointerval = 'X' - read_db = 'X' - EXCEPTIONS - not_found = 1 - OTHERS = 2. + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). - rv_bool = boolc( sy-subrc = 0 ). + ms_objkey-otype = is_item-obj_type+2(2). + ms_objkey-objid = ms_item-obj_name. ENDMETHOD. @@ -90,6 +89,27 @@ CLASS zcl_abapgit_object_pdxx_super IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_object~exists. + + CALL FUNCTION 'RH_READ_OBJECT' + EXPORTING + plvar = '01' + otype = ms_objkey-otype + objid = ms_objkey-objid + istat = '1' + begda = sy-datum + endda = '99991231' + ointerval = 'X' + read_db = 'X' + EXCEPTIONS + not_found = 1 + OTHERS = 2. + + rv_bool = boolc( sy-subrc = 0 ). + + ENDMETHOD. + + METHOD zif_abapgit_object~get_comparator. RETURN. ENDMETHOD. @@ -139,15 +159,4 @@ CLASS zcl_abapgit_object_pdxx_super IMPLEMENTATION. METHOD zif_abapgit_object~serialize. ASSERT 1 = 2. "Must be redefined ENDMETHOD. - - - METHOD constructor. - - super->constructor( is_item = is_item - iv_language = iv_language ). - - ms_objkey-otype = is_item-obj_type+2(2). - ms_objkey-objid = ms_item-obj_name. - - ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_pers.clas.abap b/src/objects/zcl_abapgit_object_pers.clas.abap index 3f09423f8..5437635db 100644 --- a/src/objects/zcl_abapgit_object_pers.clas.abap +++ b/src/objects/zcl_abapgit_object_pers.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_pers DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. TYPES: @@ -38,9 +42,11 @@ CLASS zcl_abapgit_object_pers IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). - + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_pers_key = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_prog.clas.abap b/src/objects/zcl_abapgit_object_prog.clas.abap index 2ec023bcb..5009c4e46 100644 --- a/src/objects/zcl_abapgit_object_prog.clas.abap +++ b/src/objects/zcl_abapgit_object_prog.clas.abap @@ -220,7 +220,7 @@ CLASS zcl_abapgit_object_prog IMPLEMENTATION. lv_program_name = ms_item-obj_name. - lt_source = zif_abapgit_object~mo_files->read_abap( ). + lt_source = mo_files->read_abap( ). io_xml->read( EXPORTING iv_name = 'TPOOL' CHANGING cg_data = lt_tpool_ext ). @@ -343,7 +343,7 @@ CLASS zcl_abapgit_object_prog IMPLEMENTATION. serialize_program( io_xml = io_xml is_item = ms_item - io_files = zif_abapgit_object~mo_files ). + io_files = mo_files ). " Texts serializing (translations) IF mo_i18n_params->is_lxe_applicable( ) = abap_false. diff --git a/src/objects/zcl_abapgit_object_sfbf.clas.abap b/src/objects/zcl_abapgit_object_sfbf.clas.abap index abac543d1..476f35810 100644 --- a/src/objects/zcl_abapgit_object_sfbf.clas.abap +++ b/src/objects/zcl_abapgit_object_sfbf.clas.abap @@ -5,8 +5,12 @@ CLASS zcl_abapgit_object_sfbf DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -62,8 +66,10 @@ CLASS zcl_abapgit_object_sfbf IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_bf = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_sfbs.clas.abap b/src/objects/zcl_abapgit_object_sfbs.clas.abap index f64a4d41a..6e4d5076c 100644 --- a/src/objects/zcl_abapgit_object_sfbs.clas.abap +++ b/src/objects/zcl_abapgit_object_sfbs.clas.abap @@ -5,8 +5,12 @@ CLASS zcl_abapgit_object_sfbs DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -62,8 +66,10 @@ CLASS zcl_abapgit_object_sfbs IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_bfset = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_sfpf.clas.abap b/src/objects/zcl_abapgit_object_sfpf.clas.abap index 6a46c0146..b6775aa08 100644 --- a/src/objects/zcl_abapgit_object_sfpf.clas.abap +++ b/src/objects/zcl_abapgit_object_sfpf.clas.abap @@ -121,7 +121,7 @@ CLASS zcl_abapgit_object_sfpf IMPLEMENTATION. li_fp_layout = li_fp_form->get_layout( ). lv_layout_data = li_fp_layout->get_layout_data( ). - zif_abapgit_object~mo_files->add_raw( + mo_files->add_raw( iv_ext = c_layout_file_ext iv_data = lv_layout_data ). @@ -230,8 +230,8 @@ CLASS zcl_abapgit_object_sfpf IMPLEMENTATION. TRY. li_form = cl_fp_helper=>convert_xstring_to_form( lv_xstr ). - IF zif_abapgit_object~mo_files->contains_file( c_layout_file_ext ) = abap_true. - lv_layout = zif_abapgit_object~mo_files->read_raw( c_layout_file_ext ). + IF mo_files->contains_file( c_layout_file_ext ) = abap_true. + lv_layout = mo_files->read_raw( c_layout_file_ext ). li_form->get_layout( )->set_layout_data( lv_layout ). ENDIF. diff --git a/src/objects/zcl_abapgit_object_sfsw.clas.abap b/src/objects/zcl_abapgit_object_sfsw.clas.abap index e5e1ddf00..a895d3542 100644 --- a/src/objects/zcl_abapgit_object_sfsw.clas.abap +++ b/src/objects/zcl_abapgit_object_sfsw.clas.abap @@ -5,8 +5,12 @@ CLASS zcl_abapgit_object_sfsw DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -62,8 +66,10 @@ CLASS zcl_abapgit_object_sfsw IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_switch = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_shi3.clas.abap b/src/objects/zcl_abapgit_object_shi3.clas.abap index 400621957..bdef8477a 100644 --- a/src/objects/zcl_abapgit_object_shi3.clas.abap +++ b/src/objects/zcl_abapgit_object_shi3.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_shi3 DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. METHODS has_authorization @@ -69,9 +74,15 @@ CLASS zcl_abapgit_object_shi3 IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). + mv_tree_id = ms_item-obj_name. + ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_shi5.clas.abap b/src/objects/zcl_abapgit_object_shi5.clas.abap index 0993cd5e2..bf786fc52 100644 --- a/src/objects/zcl_abapgit_object_shi5.clas.abap +++ b/src/objects/zcl_abapgit_object_shi5.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_shi5 DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. TYPES: ty_ttree_extt TYPE STANDARD TABLE OF ttree_extt @@ -28,8 +33,11 @@ CLASS zcl_abapgit_object_shi5 IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_extension = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_shi8.clas.abap b/src/objects/zcl_abapgit_object_shi8.clas.abap index 48de50dd9..b0ddb12e7 100644 --- a/src/objects/zcl_abapgit_object_shi8.clas.abap +++ b/src/objects/zcl_abapgit_object_shi8.clas.abap @@ -5,8 +5,13 @@ CLASS zcl_abapgit_object_shi8 DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: mv_assignment_id TYPE hier_sfw_id. @@ -20,8 +25,11 @@ CLASS zcl_abapgit_object_shi8 IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_assignment_id = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_sktd.clas.abap b/src/objects/zcl_abapgit_object_sktd.clas.abap index 736eca553..5d06c9db7 100644 --- a/src/objects/zcl_abapgit_object_sktd.clas.abap +++ b/src/objects/zcl_abapgit_object_sktd.clas.abap @@ -10,10 +10,13 @@ CLASS zcl_abapgit_object_sktd DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING - zcx_abapgit_exception . + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -39,7 +42,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_OBJECT_SKTD IMPLEMENTATION. +CLASS zcl_abapgit_object_sktd IMPLEMENTATION. METHOD clear_field. @@ -146,8 +149,10 @@ CLASS ZCL_ABAPGIT_OBJECT_SKTD IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_object_key = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_smim.clas.abap b/src/objects/zcl_abapgit_object_smim.clas.abap index b93bebc8a..a1ad570a4 100644 --- a/src/objects/zcl_abapgit_object_smim.clas.abap +++ b/src/objects/zcl_abapgit_object_smim.clas.abap @@ -51,7 +51,7 @@ CLASS zcl_abapgit_object_smim IMPLEMENTATION. lv_filename = build_filename( lv_filename ). - lt_files = zif_abapgit_object~mo_files->get_files( ). + lt_files = mo_files->get_files( ). READ TABLE lt_files ASSIGNING WITH KEY file @@ -354,7 +354,7 @@ CLASS zcl_abapgit_object_smim IMPLEMENTATION. ls_file-filename = build_filename( lv_filename ). ls_file-path = '/'. ls_file-data = lv_content. - zif_abapgit_object~mo_files->add( ls_file ). + mo_files->add( ls_file ). SELECT SINGLE lo_class FROM smimloio INTO lv_class WHERE loio_id = lv_loio. "#EC CI_GENBUFF diff --git a/src/objects/zcl_abapgit_object_smtg.clas.abap b/src/objects/zcl_abapgit_object_smtg.clas.abap index 6b1098c52..9c6b704bb 100644 --- a/src/objects/zcl_abapgit_object_smtg.clas.abap +++ b/src/objects/zcl_abapgit_object_smtg.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_smtg DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. DATA: @@ -95,8 +97,10 @@ CLASS zcl_abapgit_object_smtg IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_template_id = ms_item-obj_name. mo_structdescr = get_structure( ). diff --git a/src/objects/zcl_abapgit_object_sod1.clas.abap b/src/objects/zcl_abapgit_object_sod1.clas.abap index e2ba1820b..5a8bcb956 100644 --- a/src/objects/zcl_abapgit_object_sod1.clas.abap +++ b/src/objects/zcl_abapgit_object_sod1.clas.abap @@ -10,11 +10,12 @@ CLASS zcl_abapgit_object_sod1 DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING zcx_abapgit_exception. - PROTECTED SECTION. PRIVATE SECTION. @@ -182,8 +183,10 @@ CLASS zcl_abapgit_object_sod1 IMPLEMENTATION. DATA lo_data_model TYPE REF TO object. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CREATE OBJECT lo_data_model TYPE (c_data_model_class_name). diff --git a/src/objects/zcl_abapgit_object_sod2.clas.abap b/src/objects/zcl_abapgit_object_sod2.clas.abap index fff35f915..6b1087d0a 100644 --- a/src/objects/zcl_abapgit_object_sod2.clas.abap +++ b/src/objects/zcl_abapgit_object_sod2.clas.abap @@ -10,11 +10,12 @@ CLASS zcl_abapgit_object_sod2 DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING zcx_abapgit_exception. - PROTECTED SECTION. PRIVATE SECTION. @@ -182,8 +183,10 @@ CLASS zcl_abapgit_object_sod2 IMPLEMENTATION. DATA lo_data_model TYPE REF TO object. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CREATE OBJECT lo_data_model TYPE (c_data_model_class_name). diff --git a/src/objects/zcl_abapgit_object_sots.clas.abap b/src/objects/zcl_abapgit_object_sots.clas.abap index 06cf10cfb..5b379c77c 100644 --- a/src/objects/zcl_abapgit_object_sots.clas.abap +++ b/src/objects/zcl_abapgit_object_sots.clas.abap @@ -275,7 +275,7 @@ CLASS zcl_abapgit_object_sots IMPLEMENTATION. LOOP AT -entries ASSIGNING . TRY. - -text = zif_abapgit_object~mo_files->read_string( + -text = mo_files->read_string( iv_extra = get_raw_text_filename( ) iv_ext = 'txt' ). @@ -380,7 +380,7 @@ CLASS zcl_abapgit_object_sots IMPLEMENTATION. LOOP AT -entries ASSIGNING . - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_extra = get_raw_text_filename( ) iv_ext = 'txt' iv_string = -text ). diff --git a/src/objects/zcl_abapgit_object_sprx.clas.abap b/src/objects/zcl_abapgit_object_sprx.clas.abap index a9d9d9648..605b48727 100644 --- a/src/objects/zcl_abapgit_object_sprx.clas.abap +++ b/src/objects/zcl_abapgit_object_sprx.clas.abap @@ -4,13 +4,14 @@ CLASS zcl_abapgit_object_sprx DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje INTERFACES: zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -76,8 +77,11 @@ CLASS zcl_abapgit_object_sprx IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). get_object_and_name( IMPORTING diff --git a/src/objects/zcl_abapgit_object_sqsc.clas.abap b/src/objects/zcl_abapgit_object_sqsc.clas.abap index b8d5f2f89..1e1189db1 100644 --- a/src/objects/zcl_abapgit_object_sqsc.clas.abap +++ b/src/objects/zcl_abapgit_object_sqsc.clas.abap @@ -7,13 +7,14 @@ CLASS zcl_abapgit_object_sqsc DEFINITION INTERFACES: zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. PROTECTED SECTION. PRIVATE SECTION. @@ -118,8 +119,11 @@ CLASS zcl_abapgit_object_sqsc IMPLEMENTATION. FIELD-SYMBOLS: TYPE ty_abap_name. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CREATE OBJECT mo_proxy @@ -154,8 +158,10 @@ CLASS zcl_abapgit_object_sqsc IMPLEMENTATION. CREATE OBJECT lo_interface EXPORTING - is_item = ls_item - iv_language = mv_language. + is_item = ls_item + iv_language = mv_language + io_files = mo_files + io_i18n_params = mo_i18n_params. lo_interface->zif_abapgit_object~delete( iv_package = iv_package iv_transport = iv_transport ). diff --git a/src/objects/zcl_abapgit_object_srfc.clas.abap b/src/objects/zcl_abapgit_object_srfc.clas.abap index 59b341655..ab2f9eb3f 100644 --- a/src/objects/zcl_abapgit_object_srfc.clas.abap +++ b/src/objects/zcl_abapgit_object_srfc.clas.abap @@ -10,10 +10,13 @@ CLASS zcl_abapgit_object_srfc DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING - zcx_abapgit_exception . + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. ENDCLASS. @@ -28,8 +31,10 @@ CLASS zcl_abapgit_object_srfc IMPLEMENTATION. DATA li_srfc_persist TYPE REF TO if_wb_object_persist. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CREATE OBJECT li_srfc_persist TYPE ('CL_UCONRFC_OBJECT_PERSIST'). diff --git a/src/objects/zcl_abapgit_object_srvb.clas.abap b/src/objects/zcl_abapgit_object_srvb.clas.abap index 822c4bdae..a76dbfa01 100644 --- a/src/objects/zcl_abapgit_object_srvb.clas.abap +++ b/src/objects/zcl_abapgit_object_srvb.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_srvb DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. METHODS: @@ -133,8 +135,10 @@ CLASS zcl_abapgit_object_srvb IMPLEMENTATION. METHOD constructor. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_service_binding_key = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_srvd.clas.abap b/src/objects/zcl_abapgit_object_srvd.clas.abap index a9d76b76c..ef6da47cb 100644 --- a/src/objects/zcl_abapgit_object_srvd.clas.abap +++ b/src/objects/zcl_abapgit_object_srvd.clas.abap @@ -3,13 +3,15 @@ CLASS zcl_abapgit_object_srvd DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras - RAISING - zcx_abapgit_exception. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -143,8 +145,12 @@ CLASS zcl_abapgit_object_srvd IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_service_definition_key = ms_item-obj_name. @@ -192,9 +198,9 @@ CLASS zcl_abapgit_object_srvd IMPLEMENTATION. ASSIGN COMPONENT 'CONTENT-SOURCE' OF STRUCTURE TO . ASSERT sy-subrc = 0. - = zif_abapgit_object~mo_files->read_string( c_source_file ). + = mo_files->read_string( c_source_file ). IF IS INITIAL. - = zif_abapgit_object~mo_files->read_string( 'assrvd' ). + = mo_files->read_string( 'assrvd' ). ENDIF. CREATE OBJECT ro_object_data TYPE ('CL_SRVD_WB_OBJECT_DATA'). @@ -560,7 +566,7 @@ CLASS zcl_abapgit_object_srvd IMPLEMENTATION. iv_name = c_xml_parent_name ig_data = ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_ext = c_source_file iv_string = lv_source ). diff --git a/src/objects/zcl_abapgit_object_sush.clas.abap b/src/objects/zcl_abapgit_object_sush.clas.abap index e89ea1e57..c493583b1 100644 --- a/src/objects/zcl_abapgit_object_sush.clas.abap +++ b/src/objects/zcl_abapgit_object_sush.clas.abap @@ -10,10 +10,13 @@ CLASS zcl_abapgit_object_sush DEFINITION METHODS constructor IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL RAISING zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. @@ -76,8 +79,10 @@ CLASS zcl_abapgit_object_sush IMPLEMENTATION. DATA: lr_data_head TYPE REF TO data. super->constructor( - is_item = is_item - iv_language = iv_language ). + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). TRY. CREATE DATA lr_data_head TYPE ('IF_SU22_ADT_OBJECT=>TS_SU2X_HEAD'). diff --git a/src/objects/zcl_abapgit_object_suso.clas.abap b/src/objects/zcl_abapgit_object_suso.clas.abap index c9065bf25..48b6eb6f1 100644 --- a/src/objects/zcl_abapgit_object_suso.clas.abap +++ b/src/objects/zcl_abapgit_object_suso.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_suso DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. CONSTANTS c_longtext_id_suso TYPE dokil-id VALUE 'UO'. @@ -35,8 +39,11 @@ CLASS zcl_abapgit_object_suso IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_objectname = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_type.clas.abap b/src/objects/zcl_abapgit_object_type.clas.abap index 02e44039f..f9e47abd9 100644 --- a/src/objects/zcl_abapgit_object_type.clas.abap +++ b/src/objects/zcl_abapgit_object_type.clas.abap @@ -131,7 +131,7 @@ CLASS zcl_abapgit_object_type IMPLEMENTATION. io_xml->read( EXPORTING iv_name = 'DDTEXT' CHANGING cg_data = lv_ddtext ). - lt_source = zif_abapgit_object~mo_files->read_abap( ). + lt_source = mo_files->read_abap( ). IF zif_abapgit_object~exists( ) = abap_false. create( iv_ddtext = lv_ddtext @@ -230,7 +230,7 @@ CLASS zcl_abapgit_object_type IMPLEMENTATION. io_xml->add( iv_name = 'DDTEXT' ig_data = lv_ddtext ). - zif_abapgit_object~mo_files->add_abap( lt_source ). + mo_files->add_abap( lt_source ). ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_udmo.clas.abap b/src/objects/zcl_abapgit_object_udmo.clas.abap index c230b3217..131bbd522 100644 --- a/src/objects/zcl_abapgit_object_udmo.clas.abap +++ b/src/objects/zcl_abapgit_object_udmo.clas.abap @@ -10,8 +10,13 @@ CLASS zcl_abapgit_object_udmo DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras . + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. METHODS corr_insert @@ -169,9 +174,11 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). - + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). " Conversion to Data model mv_data_model = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_ueno.clas.abap b/src/objects/zcl_abapgit_object_ueno.clas.abap index de78fd0fa..1816aba86 100644 --- a/src/objects/zcl_abapgit_object_ueno.clas.abap +++ b/src/objects/zcl_abapgit_object_ueno.clas.abap @@ -10,8 +10,13 @@ CLASS zcl_abapgit_object_ueno DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras. + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. @@ -137,8 +142,11 @@ CLASS zcl_abapgit_object_ueno IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). mv_entity_id = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_w3xx_super.clas.abap b/src/objects/zcl_abapgit_object_w3xx_super.clas.abap index ede73ce8a..46f4a25b9 100644 --- a/src/objects/zcl_abapgit_object_w3xx_super.clas.abap +++ b/src/objects/zcl_abapgit_object_w3xx_super.clas.abap @@ -22,8 +22,13 @@ CLASS zcl_abapgit_object_w3xx_super DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras . + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. TYPES ty_bdcdata TYPE STANDARD TABLE OF bdcdata WITH NON-UNIQUE DEFAULT KEY. @@ -64,10 +69,16 @@ CLASS zcl_abapgit_object_w3xx_super IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). + ms_key-relid = ms_item-obj_type+2(2). ms_key-objid = ms_item-obj_name. + ENDMETHOD. @@ -208,8 +219,8 @@ CLASS zcl_abapgit_object_w3xx_super IMPLEMENTATION. CHANGING cg_data = lv_base64str ). lv_xstring = cl_http_utility=>decode_x_base64( lv_base64str ). WHEN 'v2.0.0'. - lv_xstring = zif_abapgit_object~mo_files->read_raw( iv_extra = 'data' - iv_ext = get_ext( lt_w3params ) ). + lv_xstring = mo_files->read_raw( iv_extra = 'data' + iv_ext = get_ext( lt_w3params ) ). WHEN OTHERS. zcx_abapgit_exception=>raise( 'W3xx: Unknown serializer version' ). ENDCASE. @@ -488,9 +499,9 @@ CLASS zcl_abapgit_object_w3xx_super IMPLEMENTATION. ig_data = lt_w3params ). " Seriazation v2, separate data file. 'extra' added to prevent conflict with .xml - zif_abapgit_object~mo_files->add_raw( iv_data = lv_xstring - iv_extra = 'data' - iv_ext = get_ext( lt_w3params ) ). + mo_files->add_raw( iv_data = lv_xstring + iv_extra = 'data' + iv_ext = get_ext( lt_w3params ) ). ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_wapa.clas.abap b/src/objects/zcl_abapgit_object_wapa.clas.abap index 375c2c695..cfef095aa 100644 --- a/src/objects/zcl_abapgit_object_wapa.clas.abap +++ b/src/objects/zcl_abapgit_object_wapa.clas.abap @@ -53,7 +53,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_OBJECT_WAPA IMPLEMENTATION. +CLASS zcl_abapgit_object_wapa IMPLEMENTATION. METHOD create_new_application. @@ -234,7 +234,7 @@ CLASS ZCL_ABAPGIT_OBJECT_WAPA IMPLEMENTATION. REPLACE ALL OCCURRENCES OF '/' IN lv_ext WITH '_-'. REPLACE ALL OCCURRENCES OF '/' IN lv_extra WITH '_-'. IF iv_no_files_add = abap_false. - zif_abapgit_object~mo_files->add_raw( + mo_files->add_raw( iv_extra = lv_extra iv_ext = lv_ext iv_data = lv_content ). @@ -489,8 +489,8 @@ CLASS ZCL_ABAPGIT_OBJECT_WAPA IMPLEMENTATION. REPLACE ALL OCCURRENCES OF '/' IN lv_extra WITH '_-'. REPLACE ALL OCCURRENCES OF '/' IN lv_ext WITH '_-'. - lt_remote_content = to_page_content( zif_abapgit_object~mo_files->read_raw( iv_extra = lv_extra - iv_ext = lv_ext ) ). + lt_remote_content = to_page_content( mo_files->read_raw( iv_extra = lv_extra + iv_ext = lv_ext ) ). lt_local_content = to_page_content( get_page_content( lo_page ) ). IF ls_local_page = AND lt_local_content = lt_remote_content. diff --git a/src/objects/zcl_abapgit_object_wdca.clas.abap b/src/objects/zcl_abapgit_object_wdca.clas.abap index 507ca1f2e..f5f8a1276 100644 --- a/src/objects/zcl_abapgit_object_wdca.clas.abap +++ b/src/objects/zcl_abapgit_object_wdca.clas.abap @@ -279,7 +279,7 @@ CLASS zcl_abapgit_object_wdca IMPLEMENTATION. iv_transport = iv_transport ). TRY. - lv_xml_string = zif_abapgit_object~mo_files->read_string( + lv_xml_string = mo_files->read_string( iv_extra = 'appl_config' iv_ext = 'xml' ). @@ -428,7 +428,7 @@ CLASS zcl_abapgit_object_wdca IMPLEMENTATION. ASSERT sy-subrc = 0. ENDIF. - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_extra = 'appl_config' iv_ext = 'xml' iv_string = lv_xml_string ). diff --git a/src/objects/zcl_abapgit_object_wdcc.clas.abap b/src/objects/zcl_abapgit_object_wdcc.clas.abap index 92b44f2c3..7ce5617de 100644 --- a/src/objects/zcl_abapgit_object_wdcc.clas.abap +++ b/src/objects/zcl_abapgit_object_wdcc.clas.abap @@ -118,7 +118,7 @@ CLASS zcl_abapgit_object_wdcc IMPLEMENTATION. io_xml->read( EXPORTING iv_name = 'WDA_COMPONENT' CHANGING cg_data = ls_orig_config-component ). - lv_xml_string = zif_abapgit_object~mo_files->read_string( + lv_xml_string = mo_files->read_string( iv_extra = 'comp_config' iv_ext = 'xml' ). @@ -420,7 +420,7 @@ CLASS zcl_abapgit_object_wdcc IMPLEMENTATION. ASSERT sy-subrc = 0. ENDIF. - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_extra = 'comp_config' iv_ext = 'xml' iv_string = lv_xml_string ). diff --git a/src/objects/zcl_abapgit_object_xinx.clas.abap b/src/objects/zcl_abapgit_object_xinx.clas.abap index dd18d6f72..305e7cef9 100644 --- a/src/objects/zcl_abapgit_object_xinx.clas.abap +++ b/src/objects/zcl_abapgit_object_xinx.clas.abap @@ -3,11 +3,15 @@ CLASS zcl_abapgit_object_xinx DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje PUBLIC SECTION. INTERFACES zif_abapgit_object. - METHODS: - constructor - IMPORTING - is_item TYPE zif_abapgit_definitions=>ty_item - iv_language TYPE spras. + METHODS constructor + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + zcx_abapgit_exception. + PROTECTED SECTION. PRIVATE SECTION. TYPES: @@ -41,8 +45,11 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item - iv_language = iv_language ). + super->constructor( + is_item = is_item + iv_language = iv_language + io_files = io_files + io_i18n_params = io_i18n_params ). cl_wb_object_type=>get_key_components_from_id( EXPORTING diff --git a/src/objects/zcl_abapgit_object_xslt.clas.abap b/src/objects/zcl_abapgit_object_xslt.clas.abap index 47c32cd8d..9db1ab2bf 100644 --- a/src/objects/zcl_abapgit_object_xslt.clas.abap +++ b/src/objects/zcl_abapgit_object_xslt.clas.abap @@ -118,7 +118,7 @@ CLASS zcl_abapgit_object_xslt IMPLEMENTATION. ls_attributes-devclass = iv_package. - lv_source = zif_abapgit_object~mo_files->read_string( + lv_source = mo_files->read_string( iv_extra = 'source' iv_ext = 'xml' ). @@ -245,7 +245,7 @@ CLASS zcl_abapgit_object_xslt IMPLEMENTATION. lv_source = lo_xslt->get_source_string( ). - zif_abapgit_object~mo_files->add_string( + mo_files->add_string( iv_extra = 'source' iv_ext = 'xml' iv_string = lv_source ). diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 0dd6b293d..739c166bf 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -151,12 +151,14 @@ CLASS zcl_abapgit_objects DEFINITION zcx_abapgit_exception . CLASS-METHODS check_objects_locked IMPORTING - !it_items TYPE zif_abapgit_definitions=>ty_items_tt + !it_items TYPE zif_abapgit_definitions=>ty_items_tt RAISING zcx_abapgit_exception . + CLASS-METHODS create_object IMPORTING !is_item TYPE zif_abapgit_definitions=>ty_item + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL !is_metadata TYPE zif_abapgit_definitions=>ty_metadata OPTIONAL !iv_native_only TYPE abap_bool DEFAULT abap_false @@ -164,6 +166,7 @@ CLASS zcl_abapgit_objects DEFINITION VALUE(ri_obj) TYPE REF TO zif_abapgit_object RAISING zcx_abapgit_exception . + CLASS-METHODS map_tadir_to_items IMPORTING !it_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt @@ -423,14 +426,11 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. DATA: lv_message TYPE string, lv_class_name TYPE string, ls_obj_serializer_map LIKE LINE OF gt_obj_serializer_map. - DATA lo_obj_base TYPE REF TO zcl_abapgit_objects_super. - DATA lo_i18n_params TYPE REF TO zcl_abapgit_i18n_params. - IF io_i18n_params IS BOUND. - lo_i18n_params = io_i18n_params. - ELSE. - lo_i18n_params = zcl_abapgit_i18n_params=>new( ). " All defaults - ENDIF. + " serialize & deserialize require files and i18n parameters, + " other calls are good without them + ASSERT io_files IS BOUND AND io_i18n_params IS BOUND OR + io_files IS NOT BOUND AND io_i18n_params IS NOT BOUND. READ TABLE gt_obj_serializer_map INTO ls_obj_serializer_map WITH KEY item = is_item. @@ -457,17 +457,34 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. ENDIF. TRY. - CREATE OBJECT ri_obj TYPE (lv_class_name) - EXPORTING - is_item = is_item - iv_language = lo_i18n_params->ms_params-main_language. + IF io_files IS BOUND AND io_i18n_params IS BOUND. + CREATE OBJECT ri_obj TYPE (lv_class_name) + EXPORTING + is_item = is_item + iv_language = io_i18n_params->ms_params-main_language + io_files = io_files + io_i18n_params = io_i18n_params. + ELSE. + CREATE OBJECT ri_obj TYPE (lv_class_name) + EXPORTING + is_item = is_item + iv_language = zif_abapgit_definitions=>c_english. + ENDIF. CATCH cx_sy_create_object_error. lv_message = |Object type { is_item-obj_type } is not supported by this system|. IF iv_native_only = abap_false. TRY. " 2nd step, try looking for plugins - CREATE OBJECT ri_obj TYPE zcl_abapgit_objects_bridge - EXPORTING - is_item = is_item. + IF io_files IS BOUND AND io_i18n_params IS BOUND. + CREATE OBJECT ri_obj TYPE zcl_abapgit_objects_bridge + EXPORTING + is_item = is_item + io_files = io_files + io_i18n_params = io_i18n_params. + ELSE. + CREATE OBJECT ri_obj TYPE zcl_abapgit_objects_bridge + EXPORTING + is_item = is_item. + ENDIF. CATCH cx_sy_create_object_error. zcx_abapgit_exception=>raise( lv_message ). ENDTRY. @@ -476,11 +493,6 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. ENDIF. ENDTRY. - IF ri_obj IS BOUND. - lo_obj_base ?= ri_obj. - lo_obj_base->mo_i18n_params = lo_i18n_params. - ENDIF. - ENDMETHOD. @@ -725,10 +737,9 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. ENDIF. " Create or update object - CREATE OBJECT lo_files - EXPORTING - is_item = ls_item - iv_path = lv_path. + lo_files = zcl_abapgit_objects_files=>new( + is_item = ls_item + iv_path = lv_path ). lo_files->set_files( lt_remote ). @@ -744,6 +755,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. li_obj = create_object( is_item = ls_item is_metadata = ls_metadata + io_files = lo_files io_i18n_params = lo_i18n_params ). compare_remote_to_local( @@ -752,8 +764,6 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. is_result = ii_log = ii_log ). - li_obj->mo_files = lo_files. - "get required steps for deserialize the object lt_steps_id = li_obj->get_deserialize_steps( ). @@ -827,6 +837,7 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. DATA: li_progress TYPE REF TO zif_abapgit_progress, li_exit TYPE REF TO zif_abapgit_exit, + lo_base TYPE REF TO zcl_abapgit_objects_super, lx_exc TYPE REF TO zcx_abapgit_exception. FIELD-SYMBOLS: LIKE LINE OF is_step-objects. @@ -850,7 +861,9 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. iv_step = is_step-step_id ii_log = ii_log iv_transport = iv_transport ). - APPEND LINES OF -obj->mo_files->get_accessed_files( ) TO ct_files. + + lo_base ?= -obj. + APPEND LINES OF lo_base->get_accessed_files( ) TO ct_files. ii_log->add_success( iv_msg = |Object { -item-obj_name } imported| is_item = -item ). @@ -1163,13 +1176,13 @@ CLASS zcl_abapgit_objects IMPLEMENTATION. is_item-obj_name }| ). ENDIF. + lo_files = zcl_abapgit_objects_files=>new( is_item ). + li_obj = create_object( is_item = is_item + io_files = lo_files io_i18n_params = io_i18n_params ). - CREATE OBJECT lo_files EXPORTING is_item = is_item. - li_obj->mo_files = lo_files. " TODO move into create_object - CREATE OBJECT li_xml TYPE zcl_abapgit_xml_output. rs_files_and_item-item = is_item. diff --git a/src/objects/zcl_abapgit_objects_bridge.clas.abap b/src/objects/zcl_abapgit_objects_bridge.clas.abap index d2a1d2e65..8e822e31e 100644 --- a/src/objects/zcl_abapgit_objects_bridge.clas.abap +++ b/src/objects/zcl_abapgit_objects_bridge.clas.abap @@ -3,8 +3,13 @@ CLASS zcl_abapgit_objects_bridge DEFINITION PUBLIC FINAL CREATE PUBLIC INHERITIN PUBLIC SECTION. METHODS constructor - IMPORTING is_item TYPE zif_abapgit_definitions=>ty_item - RAISING cx_sy_create_object_error. + IMPORTING + !is_item TYPE zif_abapgit_definitions=>ty_item + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL + RAISING + cx_sy_create_object_error + zcx_abapgit_exception. INTERFACES zif_abapgit_object. PROTECTED SECTION. @@ -40,6 +45,36 @@ ENDCLASS. CLASS zcl_abapgit_objects_bridge IMPLEMENTATION. + METHOD constructor. + + DATA ls_objtype_map LIKE LINE OF gt_objtype_map. + + super->constructor( + is_item = is_item + iv_language = zif_abapgit_definitions=>c_english + io_files = io_files + io_i18n_params = io_i18n_params ). + + initialize( ). + +* determine the responsible plugin + READ TABLE gt_objtype_map INTO ls_objtype_map + WITH TABLE KEY obj_typ = is_item-obj_type. + IF sy-subrc = 0. + CREATE OBJECT mo_plugin TYPE (ls_objtype_map-plugin_class). + + CALL METHOD mo_plugin->('SET_ITEM') + EXPORTING + iv_obj_type = is_item-obj_type + iv_obj_name = is_item-obj_name. + ELSE. + RAISE EXCEPTION TYPE cx_sy_create_object_error + EXPORTING + classname = 'LCL_OBJECTS_BRIDGE'. + ENDIF. + ENDMETHOD. + + METHOD initialize. DATA lt_plugin_class TYPE STANDARD TABLE OF seoclsname WITH DEFAULT KEY. @@ -106,33 +141,6 @@ CLASS zcl_abapgit_objects_bridge IMPLEMENTATION. ENDMETHOD. - METHOD constructor. - - DATA ls_objtype_map LIKE LINE OF gt_objtype_map. - - super->constructor( is_item = is_item - iv_language = zif_abapgit_definitions=>c_english ). - - initialize( ). - -* determine the responsible plugin - READ TABLE gt_objtype_map INTO ls_objtype_map - WITH TABLE KEY obj_typ = is_item-obj_type. - IF sy-subrc = 0. - CREATE OBJECT mo_plugin TYPE (ls_objtype_map-plugin_class). - - CALL METHOD mo_plugin->('SET_ITEM') - EXPORTING - iv_obj_type = is_item-obj_type - iv_obj_name = is_item-obj_name. - ELSE. - RAISE EXCEPTION TYPE cx_sy_create_object_error - EXPORTING - classname = 'LCL_OBJECTS_BRIDGE'. - ENDIF. - ENDMETHOD. - - METHOD zif_abapgit_object~changed_by. rv_user = c_user_unknown. " todo ENDMETHOD. diff --git a/src/objects/zcl_abapgit_objects_super.clas.abap b/src/objects/zcl_abapgit_objects_super.clas.abap index e2eaa3259..c6b6d0382 100644 --- a/src/objects/zcl_abapgit_objects_super.clas.abap +++ b/src/objects/zcl_abapgit_objects_super.clas.abap @@ -1,8 +1,7 @@ CLASS zcl_abapgit_objects_super DEFINITION PUBLIC ABSTRACT - CREATE PUBLIC - GLOBAL FRIENDS zcl_abapgit_objects . + CREATE PUBLIC. PUBLIC SECTION. @@ -10,13 +9,21 @@ CLASS zcl_abapgit_objects_super DEFINITION METHODS constructor IMPORTING - !is_item TYPE zif_abapgit_definitions=>ty_item - !iv_language TYPE spras . + !is_item TYPE zif_abapgit_definitions=>ty_item + !iv_language TYPE spras + !io_files TYPE REF TO zcl_abapgit_objects_files OPTIONAL + !io_i18n_params TYPE REF TO zcl_abapgit_i18n_params OPTIONAL. + + METHODS get_accessed_files + RETURNING + VALUE(rt_files) TYPE zif_abapgit_git_definitions=>ty_file_signatures_tt. PROTECTED SECTION. - DATA ms_item TYPE zif_abapgit_definitions=>ty_item . - DATA mo_i18n_params TYPE REF TO zcl_abapgit_i18n_params . - DATA mv_language TYPE spras . + DATA: + ms_item TYPE zif_abapgit_definitions=>ty_item, + mv_language TYPE spras, + mo_files TYPE REF TO zcl_abapgit_objects_files, + mo_i18n_params TYPE REF TO zcl_abapgit_i18n_params. METHODS get_metadata RETURNING @@ -121,6 +128,19 @@ CLASS zcl_abapgit_objects_super IMPLEMENTATION. ASSERT NOT ms_item IS INITIAL. mv_language = iv_language. ASSERT NOT mv_language IS INITIAL. + + IF io_files IS NOT INITIAL. + mo_files = io_files. + ELSE. + mo_files = zcl_abapgit_objects_files=>new( is_item ). " New file collection + ENDIF. + + IF io_i18n_params IS NOT INITIAL. + mo_i18n_params = io_i18n_params. + ELSE. + mo_i18n_params = zcl_abapgit_i18n_params=>new( ). " All defaults + ENDIF. + ENDMETHOD. @@ -273,6 +293,11 @@ CLASS zcl_abapgit_objects_super IMPLEMENTATION. ENDMETHOD. + METHOD get_accessed_files. + rt_files = mo_files->get_accessed_files( ). + ENDMETHOD. + + METHOD get_metadata. DATA: lv_class TYPE string. diff --git a/src/objects/zif_abapgit_object.intf.abap b/src/objects/zif_abapgit_object.intf.abap index d5568f745..67240c13e 100644 --- a/src/objects/zif_abapgit_object.intf.abap +++ b/src/objects/zif_abapgit_object.intf.abap @@ -1,8 +1,6 @@ INTERFACE zif_abapgit_object PUBLIC . - DATA mo_files TYPE REF TO zcl_abapgit_objects_files . - CONSTANTS: BEGIN OF gc_step_id, early TYPE zif_abapgit_definitions=>ty_deserialization_step VALUE `EARLY`, diff --git a/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap index 6b89a1b3e..1a55adbc5 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap @@ -336,12 +336,12 @@ CLASS zcl_abapgit_gui_page_debuginfo IMPLEMENTATION. rv_html = rv_html && |{ get_jump_object( lv_class ) }|. - CATCH cx_sy_create_object_error. + CATCH cx_sy_create_object_error zcx_abapgit_exception. TRY. " 2nd step, try looking for plugins CREATE OBJECT li_object TYPE zcl_abapgit_objects_bridge EXPORTING is_item = ls_item. - CATCH cx_sy_create_object_error. + CATCH cx_sy_create_object_error zcx_abapgit_exception. rv_html = rv_html && |{ lv_class } - error instantiating class|. CONTINUE. ENDTRY.