From 803148fa0fafc321c4fcba1cbe13a9d1ae5a3851 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Sat, 17 Feb 2018 13:55:12 +0100 Subject: [PATCH] fix some naming conventions #1132 (#1211) --- .../zcl_abapgit_2fa_auth_registry.clas.abap | 8 +- src/objects/zcl_abapgit_object_auth.clas.abap | 100 ++-- .../zcl_abapgit_object_clas_old.clas.abap | 465 ++++++++-------- src/objects/zcl_abapgit_object_cmpt.clas.abap | 134 ++--- src/objects/zcl_abapgit_object_dcls.clas.abap | 212 ++++---- src/objects/zcl_abapgit_object_ddls.clas.abap | 335 ++++++------ src/objects/zcl_abapgit_object_ddlx.clas.abap | 322 +++++------ src/objects/zcl_abapgit_object_devc.clas.abap | 299 +++++----- src/objects/zcl_abapgit_object_dial.clas.abap | 155 +++--- src/objects/zcl_abapgit_object_doma.clas.abap | 465 ++++++++-------- .../zcl_abapgit_object_enho_fugr.clas.abap | 41 +- .../zcl_abapgit_object_enho_wdyn.clas.abap | 57 +- src/objects/zcl_abapgit_object_fugr.clas.abap | 511 +++++++++--------- src/objects/zcl_abapgit_object_jobd.clas.abap | 274 +++++----- src/objects/zcl_abapgit_object_prag.clas.abap | 165 +++--- src/objects/zcl_abapgit_object_prog.clas.abap | 175 +++--- src/objects/zcl_abapgit_object_sfpf.clas.abap | 237 ++++---- src/objects/zcl_abapgit_object_srfc.clas.abap | 163 +++--- src/objects/zcl_abapgit_object_ssst.clas.abap | 309 ++++++----- src/objects/zcl_abapgit_object_tabl.clas.abap | 6 +- src/objects/zcl_abapgit_object_tran.clas.abap | 230 ++++---- src/objects/zcl_abapgit_object_ucsa.clas.abap | 317 +++++------ src/objects/zcl_abapgit_object_webi.clas.abap | 246 +++++---- .../zcl_abapgit_objects_saxx_super.clas.abap | 386 ++++++------- .../zcl_abapgit_objects_super.clas.abap | 72 +-- .../zcl_abapgit_oo_class_new.clas.abap | 254 +++++---- .../zcl_abapgit_persist_migrate.clas.abap | 46 +- .../zcl_abapgit_persist_settings.clas.abap | 10 +- ...t_syntax_highlighter.clas.testclasses.abap | 15 +- .../zcl_abapgit_gui_asset_manager.clas.abap | 8 +- src/ui/zcl_abapgit_gui_chunk_lib.clas.abap | 26 +- .../zcl_abapgit_gui_page_boverview.clas.abap | 8 +- src/ui/zcl_abapgit_gui_page_db.clas.abap | 18 +- .../zcl_abapgit_gui_page_debuginfo.clas.abap | 6 +- src/ui/zcl_abapgit_gui_page_diff.clas.abap | 43 +- .../zcl_abapgit_html_action_utils.clas.abap | 55 +- ...it_html_action_utils.clas.testclasses.abap | 47 +- src/ui/zcl_abapgit_popups.clas.abap | 29 +- src/zcl_abapgit_background.clas.abap | 6 +- ..._abapgit_file_status.clas.testclasses.abap | 58 +- src/zcl_abapgit_migrations.clas.abap | 17 +- src/zcl_abapgit_news.clas.abap | 13 +- src/zcl_abapgit_objects.clas.abap | 8 +- src/zcl_abapgit_sap_package.clas.abap | 2 +- src/zcl_abapgit_settings.clas.abap | 21 +- src/zcl_abapgit_skip_objects.clas.abap | 9 +- ...it_transport_objects.clas.testclasses.abap | 7 +- src/zlib/zcl_abapgit_zlib.clas.abap | 20 +- 48 files changed, 3362 insertions(+), 3048 deletions(-) diff --git a/src/http/zcl_abapgit_2fa_auth_registry.clas.abap b/src/http/zcl_abapgit_2fa_auth_registry.clas.abap index f7add5c21..b6bd695ef 100644 --- a/src/http/zcl_abapgit_2fa_auth_registry.clas.abap +++ b/src/http/zcl_abapgit_2fa_auth_registry.clas.abap @@ -67,11 +67,11 @@ CLASS ZCL_ABAPGIT_2FA_AUTH_REGISTRY IMPLEMENTATION. METHOD get_authenticator_for_url. - FIELD-SYMBOLS: LIKE LINE OF gt_registered_authenticators. + FIELD-SYMBOLS: LIKE LINE OF gt_registered_authenticators. - LOOP AT gt_registered_authenticators ASSIGNING . - IF ->supports_url( iv_url ) = abap_true. - ro_authenticator = . + LOOP AT gt_registered_authenticators ASSIGNING . + IF ->supports_url( iv_url ) = abap_true. + ro_authenticator = . RETURN. ENDIF. ENDLOOP. diff --git a/src/objects/zcl_abapgit_object_auth.clas.abap b/src/objects/zcl_abapgit_object_auth.clas.abap index 07be90d25..4b99d7931 100644 --- a/src/objects/zcl_abapgit_object_auth.clas.abap +++ b/src/objects/zcl_abapgit_object_auth.clas.abap @@ -6,36 +6,46 @@ CLASS zcl_abapgit_object_auth DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje ENDCLASS. -CLASS zcl_abapgit_object_auth IMPLEMENTATION. - METHOD zif_abapgit_object~has_changed_since. - rv_changed = abap_true. - ENDMETHOD. "zif_abapgit_object~has_changed_since - METHOD zif_abapgit_object~get_metadata. - rs_metadata = get_metadata( ). - ENDMETHOD. "zif_abapgit_object~get_metadata +CLASS ZCL_ABAPGIT_OBJECT_AUTH IMPLEMENTATION. + METHOD zif_abapgit_object~changed_by. * looks like "changed by user" is not stored in the database rv_user = c_user_unknown. ENDMETHOD. - METHOD zif_abapgit_object~serialize. - DATA: ls_authx TYPE authx. + METHOD zif_abapgit_object~compare_to_remote_version. + CREATE OBJECT ro_comparison_result TYPE zcl_abapgit_comparison_null. + ENDMETHOD. - SELECT SINGLE * FROM authx INTO ls_authx - WHERE fieldname = ms_item-obj_name. "#EC CI_GENBUFF + METHOD zif_abapgit_object~delete. + + DATA: lv_fieldname TYPE authx-fieldname. + + + lv_fieldname = ms_item-obj_name. + +* there is a bug in SAP standard, the TADIR entries are not deleted +* when the AUTH object is deleted in transaction SU20 + CALL FUNCTION 'SUSR_AUTF_DELETE_FIELD' + EXPORTING + fieldname = lv_fieldname + EXCEPTIONS + delete_not_possible = 1 + field_in_use = 2 + not_existing = 3 + no_authority = 4 + OTHERS = 5. IF sy-subrc <> 0. - RETURN. + zcx_abapgit_exception=>raise( 'error from SUSR_AUTF_DELETE_FIELD' ). ENDIF. - io_xml->add( iv_name = 'AUTHX' - ig_data = ls_authx ). + ENDMETHOD. "zif_abapgit_object~delete - ENDMETHOD. "zif_abapgit_object~serialize METHOD zif_abapgit_object~deserialize. * see include LSAUT_FIELDF02 @@ -63,29 +73,6 @@ CLASS zcl_abapgit_object_auth IMPLEMENTATION. ENDMETHOD. "zif_abapgit_object~deserialize - METHOD zif_abapgit_object~delete. - - DATA: lv_fieldname TYPE authx-fieldname. - - - lv_fieldname = ms_item-obj_name. - -* there is a bug in SAP standard, the TADIR entries are not deleted -* when the AUTH object is deleted in transaction SU20 - CALL FUNCTION 'SUSR_AUTF_DELETE_FIELD' - EXPORTING - fieldname = lv_fieldname - EXCEPTIONS - delete_not_possible = 1 - field_in_use = 2 - not_existing = 3 - no_authority = 4 - OTHERS = 5. - IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from SUSR_AUTF_DELETE_FIELD' ). - ENDIF. - - ENDMETHOD. "zif_abapgit_object~delete METHOD zif_abapgit_object~exists. @@ -99,22 +86,45 @@ CLASS zcl_abapgit_object_auth IMPLEMENTATION. ENDMETHOD. "zif_abapgit_object~exists + + METHOD zif_abapgit_object~get_metadata. + rs_metadata = get_metadata( ). + ENDMETHOD. "zif_abapgit_object~get_metadata + + + METHOD zif_abapgit_object~has_changed_since. + rv_changed = abap_true. + ENDMETHOD. "zif_abapgit_object~has_changed_since + + METHOD zif_abapgit_object~jump. - DATA: field TYPE fieldname. + DATA: lv_field TYPE fieldname. - field = ms_item-obj_name. + lv_field = ms_item-obj_name. * TODO, this function module does not exist in 702 CALL FUNCTION 'SU20_MAINTAIN_SNGL' EXPORTING - id_field = field + id_field = lv_field id_wbo_mode = abap_false. ENDMETHOD. "zif_abapgit_object~jump - METHOD zif_abapgit_object~compare_to_remote_version. - CREATE OBJECT ro_comparison_result TYPE zcl_abapgit_comparison_null. - ENDMETHOD. -ENDCLASS. "zcl_abapgit_object_auth IMPLEMENTATION + METHOD zif_abapgit_object~serialize. + + DATA: ls_authx TYPE authx. + + + SELECT SINGLE * FROM authx INTO ls_authx + WHERE fieldname = ms_item-obj_name. "#EC CI_GENBUFF + IF sy-subrc <> 0. + RETURN. + ENDIF. + + io_xml->add( iv_name = 'AUTHX' + ig_data = ls_authx ). + + ENDMETHOD. "zif_abapgit_object~serialize +ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_clas_old.clas.abap b/src/objects/zcl_abapgit_object_clas_old.clas.abap index e33ad986e..88b35d428 100644 --- a/src/objects/zcl_abapgit_object_clas_old.clas.abap +++ b/src/objects/zcl_abapgit_object_clas_old.clas.abap @@ -33,150 +33,140 @@ CLASS zcl_abapgit_object_clas_old DEFINITION PUBLIC INHERITING FROM zcl_abapgit_ ENDCLASS. -CLASS zcl_abapgit_object_clas_old IMPLEMENTATION. - METHOD zif_abapgit_object~has_changed_since. - DATA: - lt_includes TYPE seoincl_t. - FIELD-SYMBOLS LIKE LINE OF lt_includes. +CLASS ZCL_ABAPGIT_OBJECT_CLAS_OLD IMPLEMENTATION. - lt_includes = mo_object_oriented_object_fct->get_includes( ms_item-obj_name ). - LOOP AT lt_includes ASSIGNING . - rv_changed = check_prog_changed_since( - iv_program = - iv_timestamp = iv_timestamp - iv_skip_gui = abap_true ). - IF rv_changed = abap_true. - RETURN. - ENDIF. - ENDLOOP. - ENDMETHOD. "zif_abapgit_object~has_changed_since - - METHOD zif_abapgit_object~get_metadata. - rs_metadata = get_metadata( ). - ENDMETHOD. "zif_abapgit_object~get_metadata - - METHOD zif_abapgit_object~changed_by. - - TYPES: BEGIN OF ty_includes, - programm TYPE programm, - END OF ty_includes. - - TYPES: BEGIN OF ty_reposrc, - unam TYPE reposrc-unam, - udat TYPE reposrc-udat, - utime TYPE reposrc-utime, - END OF ty_reposrc. - - DATA: lt_reposrc TYPE STANDARD TABLE OF ty_reposrc, - ls_reposrc LIKE LINE OF lt_reposrc, - lt_includes TYPE STANDARD TABLE OF ty_includes. - - lt_includes = mo_object_oriented_object_fct->get_includes( ms_item-obj_name ). - ASSERT lines( lt_includes ) > 0. - - SELECT unam udat utime FROM reposrc - INTO TABLE lt_reposrc - FOR ALL ENTRIES IN lt_includes - WHERE progname = lt_includes-programm - AND r3state = 'A'. - IF sy-subrc <> 0. - rv_user = c_user_unknown. - ELSE. - SORT lt_reposrc BY udat DESCENDING utime DESCENDING. - READ TABLE lt_reposrc INDEX 1 INTO ls_reposrc. - ASSERT sy-subrc = 0. - rv_user = ls_reposrc-unam. - ENDIF. + METHOD constructor. + super->constructor( + is_item = is_item + iv_language = iv_language ). + mo_object_oriented_object_fct = zcl_abapgit_oo_factory=>make( ms_item-obj_type ). ENDMETHOD. - METHOD zif_abapgit_object~exists. - DATA: ls_class_key TYPE seoclskey. + + METHOD deserialize_abap. + + DATA: ls_vseoclass TYPE vseoclass, + lt_source TYPE seop_source_string, + lt_local_definitions TYPE seop_source_string, + lt_local_implementations TYPE seop_source_string, + lt_local_macros TYPE seop_source_string, + lt_test_classes TYPE seop_source_string, + lt_descriptions TYPE zif_abapgit_definitions=>ty_seocompotx_tt, + ls_class_key TYPE seoclskey. + + + lt_source = mo_files->read_abap( ). + + lt_local_definitions = mo_files->read_abap( iv_extra = 'locals_def' + iv_error = abap_false ). "#EC NOTEXT + + lt_local_implementations = mo_files->read_abap( iv_extra = 'locals_imp' + iv_error = abap_false ). "#EC NOTEXT + + lt_local_macros = mo_files->read_abap( iv_extra = 'macros' + iv_error = abap_false ). "#EC NOTEXT + + lt_test_classes = mo_files->read_abap( iv_extra = 'testclasses' + iv_error = abap_false ). "#EC NOTEXT + ls_class_key-clsname = ms_item-obj_name. - rv_bool = mo_object_oriented_object_fct->exists( iv_object_name = ls_class_key ). - ENDMETHOD. "zif_abapgit_object~exists + io_xml->read( EXPORTING iv_name = 'VSEOCLASS' + CHANGING cg_data = ls_vseoclass ). - METHOD zif_abapgit_object~jump. - CALL FUNCTION 'RS_TOOL_ACCESS' + mo_object_oriented_object_fct->create( EXPORTING - operation = 'SHOW' - object_name = ms_item-obj_name - object_type = 'CLAS' - in_new_window = abap_true. - ENDMETHOD. "jump + iv_package = iv_package + CHANGING + is_properties = ls_vseoclass ). - METHOD zif_abapgit_object~delete. - DATA: ls_clskey TYPE seoclskey. - ls_clskey-clsname = ms_item-obj_name. + mo_object_oriented_object_fct->generate_locals( + is_key = ls_class_key + iv_force = seox_true + it_local_definitions = lt_local_definitions + it_local_implementations = lt_local_implementations + it_local_macros = lt_local_macros + it_local_test_classes = lt_test_classes ). - mo_object_oriented_object_fct->delete( ls_clskey ). - ENDMETHOD. "delete + mo_object_oriented_object_fct->deserialize_source( + is_key = ls_class_key + it_source = lt_source ). - METHOD zif_abapgit_object~serialize. + io_xml->read( EXPORTING iv_name = 'DESCRIPTIONS' + CHANGING cg_data = lt_descriptions ). - DATA: lt_source TYPE seop_source_string, - ls_class_key TYPE seoclskey. + mo_object_oriented_object_fct->update_descriptions( + is_key = ls_class_key + it_descriptions = lt_descriptions ). - ls_class_key-clsname = ms_item-obj_name. + mo_object_oriented_object_fct->add_to_activation_list( ms_item ). + ENDMETHOD. "deserialize - IF zif_abapgit_object~exists( ) = abap_false. + + METHOD deserialize_docu. + + DATA: lt_lines TYPE tlinetab, + lv_object TYPE dokhl-object. + + io_xml->read( EXPORTING iv_name = 'LINES' + CHANGING cg_data = lt_lines ). + + IF lt_lines[] IS INITIAL. RETURN. ENDIF. - CALL FUNCTION 'SEO_BUFFER_REFRESH' - EXPORTING - version = seoc_version_active - force = seox_true. - CALL FUNCTION 'SEO_BUFFER_REFRESH' - EXPORTING - version = seoc_version_inactive - force = seox_true. + lv_object = ms_item-obj_name. - lt_source = mo_object_oriented_object_fct->serialize_abap( ls_class_key ). + mo_object_oriented_object_fct->create_documentation( + it_lines = lt_lines + iv_object_name = lv_object + iv_language = mv_language ). + ENDMETHOD. - mo_files->add_abap( lt_source ). - lt_source = mo_object_oriented_object_fct->serialize_abap( - is_class_key = ls_class_key - iv_type = seop_ext_class_locals_def ). - IF NOT lt_source[] IS INITIAL. - mo_files->add_abap( iv_extra = 'locals_def' - it_abap = lt_source ). "#EC NOTEXT + METHOD deserialize_sotr. + "OTR stands for Online Text Repository + DATA: lt_sotr TYPE zif_abapgit_definitions=>ty_sotr_tt. + + io_xml->read( EXPORTING iv_name = 'SOTR' + CHANGING cg_data = lt_sotr ). + + IF lines( lt_sotr ) = 0. + RETURN. ENDIF. - lt_source = mo_object_oriented_object_fct->serialize_abap( - is_class_key = ls_class_key - iv_type = seop_ext_class_locals_imp ). - IF NOT lt_source[] IS INITIAL. - mo_files->add_abap( iv_extra = 'locals_imp' - it_abap = lt_source ). "#EC NOTEXT + mo_object_oriented_object_fct->create_sotr( + iv_package = iv_package + it_sotr = lt_sotr ). + ENDMETHOD. + + + METHOD deserialize_tpool. + + DATA: lv_clsname TYPE seoclsname, + lt_tpool_ext TYPE zif_abapgit_definitions=>ty_tpool_tt, + lt_tpool TYPE textpool_table. + + + io_xml->read( EXPORTING iv_name = 'TPOOL' + CHANGING cg_data = lt_tpool_ext ). + lt_tpool = read_tpool( lt_tpool_ext ). + + IF lt_tpool[] IS INITIAL. + RETURN. ENDIF. - lt_source = mo_object_oriented_object_fct->serialize_abap( - is_class_key = ls_class_key - iv_type = seop_ext_class_testclasses ). + lv_clsname = ms_item-obj_name. - mv_skip_testclass = mo_object_oriented_object_fct->get_skip_test_classes( ). - IF NOT lt_source[] IS INITIAL AND mv_skip_testclass = abap_false. - mo_files->add_abap( iv_extra = 'testclasses' - it_abap = lt_source ). "#EC NOTEXT - ENDIF. - - lt_source = mo_object_oriented_object_fct->serialize_abap( - is_class_key = ls_class_key - iv_type = seop_ext_class_macros ). - IF NOT lt_source[] IS INITIAL. - mo_files->add_abap( iv_extra = 'macros' - it_abap = lt_source ). "#EC NOTEXT - ENDIF. - - serialize_xml( io_xml ). - - ENDMETHOD. "serialize + mo_object_oriented_object_fct->insert_text_pool( + iv_class_name = lv_clsname + it_text_pool = lt_tpool + iv_language = mv_language ). + ENDMETHOD. "deserialize_textpool METHOD serialize_xml. @@ -251,6 +241,56 @@ CLASS zcl_abapgit_object_clas_old IMPLEMENTATION. ENDMETHOD. "serialize_xml + + METHOD zif_abapgit_object~changed_by. + + TYPES: BEGIN OF ty_includes, + programm TYPE programm, + END OF ty_includes. + + TYPES: BEGIN OF ty_reposrc, + unam TYPE reposrc-unam, + udat TYPE reposrc-udat, + utime TYPE reposrc-utime, + END OF ty_reposrc. + + DATA: lt_reposrc TYPE STANDARD TABLE OF ty_reposrc, + ls_reposrc LIKE LINE OF lt_reposrc, + lt_includes TYPE STANDARD TABLE OF ty_includes. + + lt_includes = mo_object_oriented_object_fct->get_includes( ms_item-obj_name ). + ASSERT lines( lt_includes ) > 0. + + SELECT unam udat utime FROM reposrc + INTO TABLE lt_reposrc + FOR ALL ENTRIES IN lt_includes + WHERE progname = lt_includes-programm + AND r3state = 'A'. + IF sy-subrc <> 0. + rv_user = c_user_unknown. + ELSE. + SORT lt_reposrc BY udat DESCENDING utime DESCENDING. + READ TABLE lt_reposrc INDEX 1 INTO ls_reposrc. + ASSERT sy-subrc = 0. + rv_user = ls_reposrc-unam. + ENDIF. + + ENDMETHOD. + + + METHOD zif_abapgit_object~compare_to_remote_version. + CREATE OBJECT ro_comparison_result TYPE zcl_abapgit_comparison_null. + ENDMETHOD. + + + METHOD zif_abapgit_object~delete. + DATA: ls_clskey TYPE seoclskey. + ls_clskey-clsname = ms_item-obj_name. + + mo_object_oriented_object_fct->delete( ls_clskey ). + ENDMETHOD. "delete + + METHOD zif_abapgit_object~deserialize. deserialize_abap( io_xml = io_xml iv_package = iv_package ). @@ -263,134 +303,109 @@ CLASS zcl_abapgit_object_clas_old IMPLEMENTATION. deserialize_docu( io_xml ). ENDMETHOD. "deserialize - METHOD deserialize_sotr. - "OTR stands for Online Text Repository - DATA: lt_sotr TYPE zif_abapgit_definitions=>ty_sotr_tt. - io_xml->read( EXPORTING iv_name = 'SOTR' - CHANGING cg_data = lt_sotr ). + METHOD zif_abapgit_object~exists. + DATA: ls_class_key TYPE seoclskey. + ls_class_key-clsname = ms_item-obj_name. - IF lines( lt_sotr ) = 0. - RETURN. - ENDIF. + rv_bool = mo_object_oriented_object_fct->exists( iv_object_name = ls_class_key ). + ENDMETHOD. "zif_abapgit_object~exists + + + METHOD zif_abapgit_object~get_metadata. + rs_metadata = get_metadata( ). + ENDMETHOD. "zif_abapgit_object~get_metadata + + + METHOD zif_abapgit_object~has_changed_since. + DATA: lt_includes TYPE seoincl_t. + + FIELD-SYMBOLS LIKE LINE OF lt_includes. + + + lt_includes = mo_object_oriented_object_fct->get_includes( ms_item-obj_name ). + LOOP AT lt_includes ASSIGNING . + rv_changed = check_prog_changed_since( + iv_program = + iv_timestamp = iv_timestamp + iv_skip_gui = abap_true ). + IF rv_changed = abap_true. + RETURN. + ENDIF. + ENDLOOP. - mo_object_oriented_object_fct->create_sotr( - iv_package = iv_package - it_sotr = lt_sotr ). ENDMETHOD. - METHOD deserialize_docu. - DATA: lt_lines TYPE tlinetab, - lv_object TYPE dokhl-object. - - io_xml->read( EXPORTING iv_name = 'LINES' - CHANGING cg_data = lt_lines ). - - IF lt_lines[] IS INITIAL. - RETURN. - ENDIF. - - lv_object = ms_item-obj_name. - - mo_object_oriented_object_fct->create_documentation( - it_lines = lt_lines - iv_object_name = lv_object - iv_language = mv_language ). - ENDMETHOD. - - METHOD deserialize_tpool. - - DATA: lv_clsname TYPE seoclsname, - lt_tpool_ext TYPE zif_abapgit_definitions=>ty_tpool_tt, - lt_tpool TYPE textpool_table. + METHOD zif_abapgit_object~jump. + CALL FUNCTION 'RS_TOOL_ACCESS' + EXPORTING + operation = 'SHOW' + object_name = ms_item-obj_name + object_type = 'CLAS' + in_new_window = abap_true. + ENDMETHOD. "jump - io_xml->read( EXPORTING iv_name = 'TPOOL' - CHANGING cg_data = lt_tpool_ext ). - lt_tpool = read_tpool( lt_tpool_ext ). + METHOD zif_abapgit_object~serialize. - IF lt_tpool[] IS INITIAL. - RETURN. - ENDIF. - - lv_clsname = ms_item-obj_name. - - mo_object_oriented_object_fct->insert_text_pool( - iv_class_name = lv_clsname - it_text_pool = lt_tpool - iv_language = mv_language ). - - ENDMETHOD. "deserialize_textpool - - METHOD deserialize_abap. - - DATA: ls_vseoclass TYPE vseoclass, - lt_source TYPE seop_source_string, - lt_local_definitions TYPE seop_source_string, - lt_local_implementations TYPE seop_source_string, - lt_local_macros TYPE seop_source_string, - lt_test_classes TYPE seop_source_string, - lt_descriptions TYPE zif_abapgit_definitions=>ty_seocompotx_tt, - ls_class_key TYPE seoclskey. - - - lt_source = mo_files->read_abap( ). - - lt_local_definitions = mo_files->read_abap( iv_extra = 'locals_def' - iv_error = abap_false ). "#EC NOTEXT - - lt_local_implementations = mo_files->read_abap( iv_extra = 'locals_imp' - iv_error = abap_false ). "#EC NOTEXT - - lt_local_macros = mo_files->read_abap( iv_extra = 'macros' - iv_error = abap_false ). "#EC NOTEXT - - lt_test_classes = mo_files->read_abap( iv_extra = 'testclasses' - iv_error = abap_false ). "#EC NOTEXT + DATA: lt_source TYPE seop_source_string, + ls_class_key TYPE seoclskey. ls_class_key-clsname = ms_item-obj_name. - io_xml->read( EXPORTING iv_name = 'VSEOCLASS' - CHANGING cg_data = ls_vseoclass ). + IF zif_abapgit_object~exists( ) = abap_false. + RETURN. + ENDIF. - mo_object_oriented_object_fct->create( + CALL FUNCTION 'SEO_BUFFER_REFRESH' EXPORTING - iv_package = iv_package - CHANGING - is_properties = ls_vseoclass ). + version = seoc_version_active + force = seox_true. + CALL FUNCTION 'SEO_BUFFER_REFRESH' + EXPORTING + version = seoc_version_inactive + force = seox_true. - mo_object_oriented_object_fct->generate_locals( - is_key = ls_class_key - iv_force = seox_true - it_local_definitions = lt_local_definitions - it_local_implementations = lt_local_implementations - it_local_macros = lt_local_macros - it_local_test_classes = lt_test_classes ). + lt_source = mo_object_oriented_object_fct->serialize_abap( ls_class_key ). - mo_object_oriented_object_fct->deserialize_source( - is_key = ls_class_key - it_source = lt_source ). + mo_files->add_abap( lt_source ). - io_xml->read( EXPORTING iv_name = 'DESCRIPTIONS' - CHANGING cg_data = lt_descriptions ). + lt_source = mo_object_oriented_object_fct->serialize_abap( + is_class_key = ls_class_key + iv_type = seop_ext_class_locals_def ). + IF NOT lt_source[] IS INITIAL. + mo_files->add_abap( iv_extra = 'locals_def' + it_abap = lt_source ). "#EC NOTEXT + ENDIF. - mo_object_oriented_object_fct->update_descriptions( - is_key = ls_class_key - it_descriptions = lt_descriptions ). + lt_source = mo_object_oriented_object_fct->serialize_abap( + is_class_key = ls_class_key + iv_type = seop_ext_class_locals_imp ). + IF NOT lt_source[] IS INITIAL. + mo_files->add_abap( iv_extra = 'locals_imp' + it_abap = lt_source ). "#EC NOTEXT + ENDIF. - mo_object_oriented_object_fct->add_to_activation_list( ms_item ). - ENDMETHOD. "deserialize + lt_source = mo_object_oriented_object_fct->serialize_abap( + is_class_key = ls_class_key + iv_type = seop_ext_class_testclasses ). - METHOD zif_abapgit_object~compare_to_remote_version. - CREATE OBJECT ro_comparison_result TYPE zcl_abapgit_comparison_null. - ENDMETHOD. + mv_skip_testclass = mo_object_oriented_object_fct->get_skip_test_classes( ). + IF NOT lt_source[] IS INITIAL AND mv_skip_testclass = abap_false. + mo_files->add_abap( iv_extra = 'testclasses' + it_abap = lt_source ). "#EC NOTEXT + ENDIF. - METHOD constructor. - super->constructor( - is_item = is_item - iv_language = iv_language ). - mo_object_oriented_object_fct = zcl_abapgit_oo_factory=>make( ms_item-obj_type ). - ENDMETHOD. + lt_source = mo_object_oriented_object_fct->serialize_abap( + is_class_key = ls_class_key + iv_type = seop_ext_class_macros ). + IF NOT lt_source[] IS INITIAL. + mo_files->add_abap( iv_extra = 'macros' + it_abap = lt_source ). "#EC NOTEXT + ENDIF. -ENDCLASS. "zcl_abapgit_object_CLAS IMPLEMENTATION + serialize_xml( io_xml ). + + ENDMETHOD. "serialize +ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_cmpt.clas.abap b/src/objects/zcl_abapgit_object_cmpt.clas.abap index f74833aba..78c35ee02 100644 --- a/src/objects/zcl_abapgit_object_cmpt.clas.abap +++ b/src/objects/zcl_abapgit_object_cmpt.clas.abap @@ -14,7 +14,10 @@ CLASS zcl_abapgit_object_cmpt DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje ENDCLASS. -CLASS zcl_abapgit_object_cmpt IMPLEMENTATION. + + +CLASS ZCL_ABAPGIT_OBJECT_CMPT IMPLEMENTATION. + METHOD constructor. @@ -31,15 +34,10 @@ CLASS zcl_abapgit_object_cmpt IMPLEMENTATION. ENDMETHOD. - METHOD zif_abapgit_object~has_changed_since. - - rv_changed = abap_true. - - ENDMETHOD. METHOD zif_abapgit_object~changed_by. - DATA: mi_cmp_template TYPE REF TO object. + DATA: lo_cmp_template TYPE REF TO object. TRY. CALL METHOD ('CL_CMP_TEMPLATE')=>('S_CREATE_FROM_DB') @@ -47,9 +45,9 @@ CLASS zcl_abapgit_object_cmpt IMPLEMENTATION. i_name = |{ ms_item-obj_name }| i_version = 'A' RECEIVING - r_ref_template = mi_cmp_template. + r_ref_template = lo_cmp_template. - CALL METHOD mi_cmp_template->('IF_CMP_TEMPLATE_EDIT~GET_CHANGE_USER') + CALL METHOD lo_cmp_template->('IF_CMP_TEMPLATE_EDIT~GET_CHANGE_USER') RECEIVING r_user = rv_user. @@ -59,77 +57,57 @@ CLASS zcl_abapgit_object_cmpt IMPLEMENTATION. ENDMETHOD. - METHOD zif_abapgit_object~get_metadata. - rs_metadata = get_metadata( ). - rs_metadata-delete_tadir = abap_true. + METHOD zif_abapgit_object~compare_to_remote_version. + + CREATE OBJECT ro_comparison_result TYPE zcl_abapgit_comparison_null. ENDMETHOD. - METHOD zif_abapgit_object~exists. - DATA: name TYPE c LENGTH 30. + METHOD zif_abapgit_object~delete. - name = ms_item-obj_name. + DATA: lv_deleted TYPE abap_bool. TRY. - CALL METHOD ('CL_CMP_TEMPLATE')=>('S_TEMPLATE_EXISTS') + CALL METHOD mo_cmp_db->('IF_CMP_TEMPLATE_DB~DELETE_TEMPLATE') EXPORTING - i_name = name - i_version = 'A' + i_name = |{ ms_item-obj_name }| + i_version = 'A' + i_flg_header = abap_true + i_flg_lines = abap_true RECEIVING - r_flg_exists = rv_bool. - - CATCH cx_root. - zcx_abapgit_exception=>raise( 'CMPT not supported' ). - ENDTRY. - - ENDMETHOD. - - METHOD zif_abapgit_object~serialize. - - DATA: lr_template TYPE REF TO data. - FIELD-SYMBOLS: