From 06616580eb500d94d1d6ca165638c7c4ac01cf61 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Wed, 7 Nov 2018 12:50:20 +0100 Subject: [PATCH] Naming conventions (#2059) * fix naming conventions * naming conventions --- .../zcl_abapgit_ecatt_sp_download.clas.abap | 10 +- .../zcl_abapgit_ecatt_sp_upload.clas.abap | 16 +- src/objects/zcl_abapgit_object_scp1.clas.abap | 37 +- src/objects/zcl_abapgit_object_udmo.clas.abap | 31 +- src/objects/zcl_abapgit_object_xinx.clas.abap | 27 +- .../zcl_abapgit_objects_super.clas.abap | 136 ++++--- src/ui/zcl_abapgit_popups.clas.abap | 378 +++++++++--------- src/utils/zcl_abapgit_convert.clas.abap | 22 +- src/zcl_abapgit_branch_overview.clas.abap | 68 ++-- src/zcl_abapgit_folder_logic.clas.abap | 12 +- src/zcl_abapgit_objects.clas.abap | 8 +- src/zcl_abapgit_repo_content_list.clas.abap | 11 +- src/zcl_abapgit_tadir.clas.abap | 30 +- 13 files changed, 401 insertions(+), 385 deletions(-) diff --git a/src/objects/ecatt/zcl_abapgit_ecatt_sp_download.clas.abap b/src/objects/ecatt/zcl_abapgit_ecatt_sp_download.clas.abap index 9fd81969c..47a433c52 100644 --- a/src/objects/ecatt/zcl_abapgit_ecatt_sp_download.clas.abap +++ b/src/objects/ecatt/zcl_abapgit_ecatt_sp_download.clas.abap @@ -31,7 +31,7 @@ ENDCLASS. -CLASS zcl_abapgit_ecatt_sp_download IMPLEMENTATION. +CLASS ZCL_ABAPGIT_ECATT_SP_DOWNLOAD IMPLEMENTATION. METHOD download. @@ -96,6 +96,7 @@ CLASS zcl_abapgit_ecatt_sp_download IMPLEMENTATION. ENDMETHOD. + METHOD set_sp_data_to_template. " downport @@ -106,16 +107,16 @@ CLASS zcl_abapgit_ecatt_sp_download IMPLEMENTATION. lv_sp_xml TYPE etxml_line_str, lo_ecatt_sp TYPE REF TO object. - FIELD-SYMBOLS: TYPE data. + FIELD-SYMBOLS: TYPE data. li_start_profile_data_node = template_over_all->create_simple_element( name = 'START_PROFILE' parent = root_node ). - ASSIGN ('ECATT_OBJECT') TO . + ASSIGN ('ECATT_OBJECT') TO . ASSERT sy-subrc = 0. - lo_ecatt_sp = . + lo_ecatt_sp = . TRY. CALL METHOD lo_ecatt_sp->('GET_SP_ATTRIBUTES') @@ -134,5 +135,4 @@ CLASS zcl_abapgit_ecatt_sp_download IMPLEMENTATION. li_start_profile_data_node->append_child( new_child = li_element ). ENDMETHOD. - ENDCLASS. diff --git a/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap b/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap index 9e56bd511..894aa8ed4 100644 --- a/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap +++ b/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap @@ -43,7 +43,7 @@ CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION. lv_exception_occurred TYPE etonoff, lo_ecatt_sp TYPE REF TO object. - FIELD-SYMBOLS: TYPE any. + FIELD-SYMBOLS: TYPE any. TRY. li_section = template_over_all->find_from_name_ns( 'START_PROFILE' ). @@ -59,10 +59,10 @@ CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION. IMPORTING xml_as_string = lv_start_profile. - ASSIGN ('ECATT_OBJECT') TO . + ASSIGN ('ECATT_OBJECT') TO . ASSERT sy-subrc = 0. - lo_ecatt_sp = . + lo_ecatt_sp = . CALL METHOD lo_ecatt_sp->('SET_SP_ATTRIBUTES') EXPORTING @@ -95,9 +95,9 @@ CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION. lv_exception_occurred TYPE etonoff, lo_ecatt_sp TYPE REF TO object. - FIELD-SYMBOLS: TYPE any, - TYPE data, - TYPE data. + FIELD-SYMBOLS: TYPE any, + TYPE data, + TYPE data. TRY. ch_object-i_devclass = ch_object-d_devclass. @@ -132,10 +132,10 @@ CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION. lv_exc_occ = 'X'. ENDTRY. - ASSIGN me->ecatt_object TO . + ASSIGN me->ecatt_object TO . ASSERT sy-subrc = 0. - lo_ecatt_sp = . + lo_ecatt_sp = . TRY. get_ecatt_sp( ). diff --git a/src/objects/zcl_abapgit_object_scp1.clas.abap b/src/objects/zcl_abapgit_object_scp1.clas.abap index c27ffc734..e408612c6 100644 --- a/src/objects/zcl_abapgit_object_scp1.clas.abap +++ b/src/objects/zcl_abapgit_object_scp1.clas.abap @@ -81,33 +81,33 @@ CLASS ZCL_ABAPGIT_OBJECT_SCP1 IMPLEMENTATION. METHOD call_delete_fms. - CONSTANTS version_new TYPE c VALUE 'N' ##NO_TEXT. "Include SCPRINTCONST version_new - CONSTANTS operation_delete TYPE c VALUE 'D' ##NO_TEXT. - DATA profile_type TYPE scprattr-type. - DATA fatherprofiles TYPE standard table of scproprof WITH DEFAULT KEY. - DATA fatherprofile TYPE scproprof. + CONSTANTS lc_version_new TYPE c VALUE 'N' ##NO_TEXT. "Include SCPRINTCONST version_new + CONSTANTS lc_operation_delete TYPE c VALUE 'D' ##NO_TEXT. + DATA lv_profile_type TYPE scprattr-type. + DATA lt_fatherprofiles TYPE STANDARD TABLE OF scproprof WITH DEFAULT KEY. + DATA ls_fatherprofile TYPE scproprof. CALL FUNCTION 'SCPR_DB_ATTR_GET_DETAIL' EXPORTING profid = iv_profile_id - version = version_new + version = lc_version_new IMPORTING - proftype = profile_type + proftype = lv_profile_type EXCEPTIONS OTHERS = 0. CALL FUNCTION 'SCPR_PRSET_DB_USED_IN' EXPORTING profid = iv_profile_id - version = version_new + version = lc_version_new TABLES - profiles = fatherprofiles. + profiles = lt_fatherprofiles. - fatherprofile-id = iv_profile_id. - APPEND fatherprofile TO fatherprofiles. + ls_fatherprofile-id = iv_profile_id. + APPEND ls_fatherprofile TO lt_fatherprofiles. CALL FUNCTION 'SCPR_CT_TRANSPORT_ENTRIES' TABLES - profids = fatherprofiles + profids = lt_fatherprofiles EXCEPTIONS error_in_transport_layer = 1 user_abort = 2. @@ -118,9 +118,9 @@ CLASS ZCL_ABAPGIT_OBJECT_SCP1 IMPLEMENTATION. CALL FUNCTION 'SCPR_PRSET_DB_DELETE_ALL' EXPORTING profid = iv_profile_id - proftype = profile_type + proftype = lv_profile_type TABLES - fatherprofs = fatherprofiles + fatherprofs = lt_fatherprofiles EXCEPTIONS user_abort = 1. IF sy-subrc <> 0. @@ -130,7 +130,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SCP1 IMPLEMENTATION. CALL FUNCTION 'SCPR_MEM_SCPR_ACTIONS_ADD' EXPORTING bcset_id = iv_profile_id - operation = operation_delete. + operation = lc_operation_delete. ENDMETHOD. @@ -270,11 +270,12 @@ CLASS ZCL_ABAPGIT_OBJECT_SCP1 IMPLEMENTATION. METHOD zif_abapgit_object~delete. - DATA: profile_id TYPE scpr_id. - profile_id = ms_item-obj_name. + DATA: lv_profile_id TYPE scpr_id. + + lv_profile_id = ms_item-obj_name. enqueue( ). - call_delete_fms( profile_id ). + call_delete_fms( lv_profile_id ). dequeue( ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_udmo.clas.abap b/src/objects/zcl_abapgit_object_udmo.clas.abap index 61b49b6d8..c3edf9ebc 100644 --- a/src/objects/zcl_abapgit_object_udmo.clas.abap +++ b/src/objects/zcl_abapgit_object_udmo.clas.abap @@ -95,7 +95,7 @@ ENDCLASS. -CLASS zcl_abapgit_object_udmo IMPLEMENTATION. +CLASS ZCL_ABAPGIT_OBJECT_UDMO IMPLEMENTATION. METHOD access_free. @@ -412,7 +412,7 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. METHOD serialize_entities. DATA lt_udmo_entities TYPE STANDARD TABLE OF dm41s WITH DEFAULT KEY. - FIELD-SYMBOLS TYPE dm41s. + FIELD-SYMBOLS TYPE dm41s. SELECT * FROM dm41s INTO TABLE lt_udmo_entities @@ -420,21 +420,20 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. AND as4local EQ me->mv_activation_state. - LOOP AT lt_udmo_entities ASSIGNING . + LOOP AT lt_udmo_entities ASSIGNING . " You are reminded that administrative information, such as last changed by user, date, time is not serialised. - CLEAR -lstuser. - CLEAR -lstdate. - CLEAR -lsttime. - CLEAR -fstuser. - CLEAR -fstdate. - CLEAR -fsttime. - + CLEAR -lstuser. + CLEAR -lstdate. + CLEAR -lsttime. + CLEAR -fstuser. + CLEAR -fstdate. + CLEAR -fsttime. ENDLOOP. " You are reminded that descriptions in other languages do not have to be in existence, although they may. - IF lines( lt_udmo_entities ) GT 0. + IF lines( lt_udmo_entities ) > 0. io_xml->add( iv_name = 'UDMO_ENTITIES' ig_data = lt_udmo_entities ). ENDIF. @@ -713,6 +712,11 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_object~is_active. + rv_active = is_active( ). + ENDMETHOD. + + METHOD zif_abapgit_object~is_locked. rv_is_locked = exists_a_lock_entry_for( @@ -778,9 +782,4 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. me->serialize_long_texts( io_xml ). ENDMETHOD. - - - METHOD zif_abapgit_object~is_active. - rv_active = is_active( ). - ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_object_xinx.clas.abap b/src/objects/zcl_abapgit_object_xinx.clas.abap index 216f11cdc..2811f147d 100644 --- a/src/objects/zcl_abapgit_object_xinx.clas.abap +++ b/src/objects/zcl_abapgit_object_xinx.clas.abap @@ -23,7 +23,7 @@ ENDCLASS. -CLASS zcl_abapgit_object_xinx IMPLEMENTATION. +CLASS ZCL_ABAPGIT_OBJECT_XINX IMPLEMENTATION. METHOD constructor. @@ -84,7 +84,7 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION. METHOD zif_abapgit_object~deserialize. DATA: ls_extension_index TYPE ty_extension_index, - rc TYPE sy-subrc. + lv_rc TYPE sy-subrc. io_xml->read( EXPORTING @@ -118,7 +118,7 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION. name = mv_name id = mv_id IMPORTING - rc = rc + rc = lv_rc EXCEPTIONS not_found = 1 put_failure = 2 @@ -128,7 +128,7 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION. zcx_abapgit_exception=>raise( |Error from DDIF_INDX_ACTIVATE { sy-subrc }| ). ENDIF. - IF rc <> 0. + IF lv_rc <> 0. zcx_abapgit_exception=>raise( |Cannot activate extension index { mv_id } of table { mv_name }| ). ENDIF. @@ -164,6 +164,16 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_object~is_active. + rv_active = is_active( ). + ENDMETHOD. + + + METHOD zif_abapgit_object~is_locked. + rv_is_locked = abap_false. + ENDMETHOD. + + METHOD zif_abapgit_object~jump. CALL FUNCTION 'RS_TOOL_ACCESS' @@ -213,13 +223,4 @@ CLASS zcl_abapgit_object_xinx IMPLEMENTATION. ig_data = ls_extension_index ). ENDMETHOD. - - METHOD zif_abapgit_object~is_locked. - rv_is_locked = abap_false. - ENDMETHOD. - - - METHOD zif_abapgit_object~is_active. - rv_active = is_active( ). - ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_objects_super.clas.abap b/src/objects/zcl_abapgit_objects_super.clas.abap index c2e1bf2a4..32d09f5e1 100644 --- a/src/objects/zcl_abapgit_objects_super.clas.abap +++ b/src/objects/zcl_abapgit_objects_super.clas.abap @@ -21,58 +21,75 @@ CLASS zcl_abapgit_objects_super DEFINITION PUBLIC ABSTRACT. PROTECTED SECTION. - DATA: ms_item TYPE zif_abapgit_definitions=>ty_item, - mv_language TYPE spras. - - METHODS: - check_timestamp - IMPORTING - iv_timestamp TYPE timestamp - iv_date TYPE datum - iv_time TYPE uzeit - RETURNING - VALUE(rv_changed) TYPE abap_bool, - get_metadata - RETURNING VALUE(rs_metadata) TYPE zif_abapgit_definitions=>ty_metadata, - corr_insert - IMPORTING iv_package TYPE devclass - RAISING zcx_abapgit_exception, - tadir_insert - IMPORTING iv_package TYPE devclass - RAISING zcx_abapgit_exception, - jump_se11 - IMPORTING iv_radio TYPE string - iv_field TYPE string - RAISING zcx_abapgit_exception, - exists_a_lock_entry_for - IMPORTING iv_lock_object TYPE string - iv_argument TYPE seqg3-garg OPTIONAL - RETURNING VALUE(rv_exists_a_lock_entry) TYPE abap_bool - RAISING zcx_abapgit_exception, - set_default_package - IMPORTING iv_package TYPE devclass, - serialize_longtexts - IMPORTING io_xml TYPE REF TO zcl_abapgit_xml_output - iv_longtext_id TYPE dokil-id OPTIONAL - it_dokil TYPE zif_abapgit_definitions=>tty_dokil OPTIONAL - RAISING zcx_abapgit_exception, - deserialize_longtexts - IMPORTING io_xml TYPE REF TO zcl_abapgit_xml_input - RAISING zcx_abapgit_exception, - delete_longtexts - IMPORTING iv_longtext_id TYPE dokil-id - RAISING zcx_abapgit_exception, - is_active - RETURNING VALUE(e_active) TYPE abap_bool - RAISING zcx_abapgit_exception. + DATA ms_item TYPE zif_abapgit_definitions=>ty_item . + DATA mv_language TYPE spras . + METHODS check_timestamp + IMPORTING + !iv_timestamp TYPE timestamp + !iv_date TYPE datum + !iv_time TYPE uzeit + RETURNING + VALUE(rv_changed) TYPE abap_bool . + METHODS get_metadata + RETURNING + VALUE(rs_metadata) TYPE zif_abapgit_definitions=>ty_metadata . + METHODS corr_insert + IMPORTING + !iv_package TYPE devclass + RAISING + zcx_abapgit_exception . + METHODS tadir_insert + IMPORTING + !iv_package TYPE devclass + RAISING + zcx_abapgit_exception . + METHODS jump_se11 + IMPORTING + !iv_radio TYPE string + !iv_field TYPE string + RAISING + zcx_abapgit_exception . + METHODS exists_a_lock_entry_for + IMPORTING + !iv_lock_object TYPE string + !iv_argument TYPE seqg3-garg OPTIONAL + RETURNING + VALUE(rv_exists_a_lock_entry) TYPE abap_bool + RAISING + zcx_abapgit_exception . + METHODS set_default_package + IMPORTING + !iv_package TYPE devclass . + METHODS serialize_longtexts + IMPORTING + !io_xml TYPE REF TO zcl_abapgit_xml_output + !iv_longtext_id TYPE dokil-id OPTIONAL + !it_dokil TYPE zif_abapgit_definitions=>tty_dokil OPTIONAL + RAISING + zcx_abapgit_exception . + METHODS deserialize_longtexts + IMPORTING + !io_xml TYPE REF TO zcl_abapgit_xml_input + RAISING + zcx_abapgit_exception . + METHODS delete_longtexts + IMPORTING + !iv_longtext_id TYPE dokil-id + RAISING + zcx_abapgit_exception . + METHODS is_active + RETURNING + VALUE(rv_active) TYPE abap_bool + RAISING + zcx_abapgit_exception . PRIVATE SECTION. CLASS-METHODS: is_adt_jump_possible - IMPORTING io_object TYPE REF TO cl_wb_object - io_adt TYPE REF TO object - RETURNING VALUE(r_is_adt_jump_possible) TYPE abap_bool + IMPORTING io_object TYPE REF TO cl_wb_object + io_adt TYPE REF TO object + RETURNING VALUE(rv_is_adt_jump_possible) TYPE abap_bool RAISING zcx_abapgit_exception. CLASS-METHODS: get_adt_objects_and_names @@ -86,7 +103,6 @@ CLASS zcl_abapgit_objects_super DEFINITION PUBLIC ABSTRACT. ev_include TYPE progname RAISING zcx_abapgit_exception. - ENDCLASS. @@ -272,15 +288,15 @@ CLASS ZCL_ABAPGIT_OBJECTS_SUPER IMPLEMENTATION. METHOD is_active. - DATA: messages TYPE STANDARD TABLE OF sprot_u WITH DEFAULT KEY, - e071_tadirs TYPE STANDARD TABLE OF e071 WITH DEFAULT KEY, - e071_tadir TYPE e071. + DATA: lt_messages TYPE STANDARD TABLE OF sprot_u WITH DEFAULT KEY, + lt_e071_tadirs TYPE STANDARD TABLE OF e071 WITH DEFAULT KEY, + ls_e071_tadir LIKE LINE OF lt_e071_tadirs. ms_item-inactive = abap_false. - e071_tadir-object = ms_item-obj_type. - e071_tadir-obj_name = ms_item-obj_name. - INSERT e071_tadir INTO TABLE e071_tadirs. + ls_e071_tadir-object = ms_item-obj_type. + ls_e071_tadir-obj_name = ms_item-obj_name. + INSERT ls_e071_tadir INTO TABLE lt_e071_tadirs. CALL FUNCTION 'RS_INACTIVE_OBJECTS_WARNING' EXPORTING @@ -289,14 +305,14 @@ CLASS ZCL_ABAPGIT_OBJECTS_SUPER IMPLEMENTATION. suppress_dictionary_check = abap_false phased_activation = abap_false TABLES - p_e071 = e071_tadirs - p_xmsg = messages. + p_e071 = lt_e071_tadirs + p_xmsg = lt_messages. - IF messages IS NOT INITIAL. + IF lt_messages IS NOT INITIAL. ms_item-inactive = abap_true. ENDIF. - e_active = boolc( ms_item-inactive = abap_false ). + rv_active = boolc( ms_item-inactive = abap_false ). ENDMETHOD. @@ -332,9 +348,9 @@ CLASS ZCL_ABAPGIT_OBJECTS_SUPER IMPLEMENTATION. result = lv_vit_wb_request. IF lv_vit_wb_request = abap_true. - r_is_adt_jump_possible = abap_false. + rv_is_adt_jump_possible = abap_false. ELSE. - r_is_adt_jump_possible = abap_true. + rv_is_adt_jump_possible = abap_true. ENDIF. CATCH cx_root. diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap index 93342cead..0513742d8 100644 --- a/src/ui/zcl_abapgit_popups.clas.abap +++ b/src/ui/zcl_abapgit_popups.clas.abap @@ -86,7 +86,8 @@ ENDCLASS. -CLASS zcl_abapgit_popups IMPLEMENTATION. +CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION. + METHOD add_field. @@ -103,6 +104,193 @@ CLASS zcl_abapgit_popups IMPLEMENTATION. ENDMETHOD. + METHOD create_new_table. + + " create and populate a table on the fly derived from + " it_data with a select column + + DATA: lr_struct TYPE REF TO data, + lt_components TYPE cl_abap_structdescr=>component_table, + lo_struct_descr TYPE REF TO cl_abap_structdescr, + lo_struct_descr2 TYPE REF TO cl_abap_structdescr. + + FIELD-SYMBOLS: TYPE STANDARD TABLE, + TYPE abap_componentdescr, + TYPE data, + TYPE any. + + go_table_descr ?= cl_abap_tabledescr=>describe_by_data( it_list ). + lo_struct_descr ?= go_table_descr->get_table_line_type( ). + lt_components = lo_struct_descr->get_components( ). + + INSERT INITIAL LINE INTO lt_components ASSIGNING INDEX 1. + ASSERT sy-subrc = 0. + + -name = c_fieldname_selected. + -type ?= cl_abap_datadescr=>describe_by_name( 'FLAG' ). + + lo_struct_descr2 = cl_abap_structdescr=>create( lt_components ). + go_table_descr = cl_abap_tabledescr=>create( lo_struct_descr2 ). + + CREATE DATA gr_table TYPE HANDLE go_table_descr. + ASSIGN gr_table->* TO . + ASSERT sy-subrc = 0. + + CREATE DATA lr_struct TYPE HANDLE lo_struct_descr2. + ASSIGN lr_struct->* TO . + ASSERT sy-subrc = 0. + + LOOP AT it_list ASSIGNING . + CLEAR . + MOVE-CORRESPONDING TO . + INSERT INTO TABLE . + ENDLOOP. + + ENDMETHOD. + + + METHOD extract_field_values. + + FIELD-SYMBOLS: LIKE LINE OF it_fields. + + CLEAR: ev_url, + ev_package, + ev_branch. + + READ TABLE it_fields INDEX 1 ASSIGNING . + ASSERT sy-subrc = 0. + ev_url = -value. + + READ TABLE it_fields INDEX 2 ASSIGNING . + ASSERT sy-subrc = 0. + ev_package = -value. + TRANSLATE ev_package TO UPPER CASE. + + READ TABLE it_fields INDEX 3 ASSIGNING . + ASSERT sy-subrc = 0. + ev_branch = -value. + + ENDMETHOD. + + + METHOD get_selected_rows. + + DATA: lv_condition TYPE string, + lr_exporting TYPE REF TO data. + + FIELD-SYMBOLS: TYPE any, + TYPE STANDARD TABLE, + TYPE any. + + lv_condition = |{ c_fieldname_selected } = ABAP_TRUE|. + + ASSIGN gr_table->* TO . + ASSERT sy-subrc = 0. + + CREATE DATA lr_exporting LIKE LINE OF et_list. + ASSIGN lr_exporting->* TO . + + LOOP AT ASSIGNING WHERE (lv_condition). + CLEAR . + MOVE-CORRESPONDING TO . + APPEND TO et_list. + ENDLOOP. + + ENDMETHOD. + + + METHOD on_select_list_function_click. + + FIELD-SYMBOLS: TYPE STANDARD TABLE, + TYPE any, + TYPE flag. + + ASSIGN gr_table->* TO . + ASSERT sy-subrc = 0. + + CASE e_salv_function. + WHEN 'O.K.'. + gv_cancel = abap_false. + go_select_list_popup->close_screen( ). + + WHEN 'ABR'. + "Canceled: clear list to overwrite nothing + CLEAR . + gv_cancel = abap_true. + go_select_list_popup->close_screen( ). + + WHEN 'SALL'. + + LOOP AT ASSIGNING . + + ASSIGN COMPONENT c_fieldname_selected + OF STRUCTURE + TO . + ASSERT sy-subrc = 0. + + = abap_true. + + ENDLOOP. + + go_select_list_popup->refresh( ). + + WHEN 'DSEL'. + + LOOP AT ASSIGNING . + + ASSIGN COMPONENT c_fieldname_selected + OF STRUCTURE + TO . + ASSERT sy-subrc = 0. + + = abap_false. + + ENDLOOP. + + go_select_list_popup->refresh( ). + + WHEN OTHERS. + CLEAR . + go_select_list_popup->close_screen( ). + ENDCASE. + + ENDMETHOD. + + + METHOD on_select_list_link_click. + + DATA: lv_line TYPE sytabix. + + FIELD-SYMBOLS: TYPE STANDARD TABLE, + TYPE any, + TYPE flag. + + ASSIGN gr_table->* TO . + ASSERT sy-subrc = 0. + + lv_line = row. + + READ TABLE ASSIGNING + INDEX lv_line. + IF sy-subrc = 0. + + ASSIGN COMPONENT c_fieldname_selected + OF STRUCTURE + TO . + ASSERT sy-subrc = 0. + + IF = abap_true. + = abap_false. + ELSE. + = abap_true. + ENDIF. + + ENDIF. + + go_select_list_popup->refresh( ). + ENDMETHOD. + + METHOD zif_abapgit_popups~branch_list_popup. DATA: lo_branches TYPE REF TO zcl_abapgit_git_branch_list, @@ -304,193 +492,6 @@ CLASS zcl_abapgit_popups IMPLEMENTATION. ENDMETHOD. - METHOD create_new_table. - - " create and populate a table on the fly derived from - " it_data with a select column - - DATA: lr_struct TYPE REF TO data, - lt_components TYPE cl_abap_structdescr=>component_table, - lo_struct_descr TYPE REF TO cl_abap_structdescr, - struct_descr TYPE REF TO cl_abap_structdescr. - - FIELD-SYMBOLS: TYPE STANDARD TABLE, - TYPE abap_componentdescr, - TYPE data, - TYPE any. - - go_table_descr ?= cl_abap_tabledescr=>describe_by_data( it_list ). - lo_struct_descr ?= go_table_descr->get_table_line_type( ). - lt_components = lo_struct_descr->get_components( ). - - INSERT INITIAL LINE INTO lt_components ASSIGNING INDEX 1. - ASSERT sy-subrc = 0. - - -name = c_fieldname_selected. - -type ?= cl_abap_datadescr=>describe_by_name( 'FLAG' ). - - struct_descr = cl_abap_structdescr=>create( lt_components ). - go_table_descr = cl_abap_tabledescr=>create( struct_descr ). - - CREATE DATA gr_table TYPE HANDLE go_table_descr. - ASSIGN gr_table->* TO . - ASSERT sy-subrc = 0. - - CREATE DATA lr_struct TYPE HANDLE struct_descr. - ASSIGN lr_struct->* TO . - ASSERT sy-subrc = 0. - - LOOP AT it_list ASSIGNING . - CLEAR . - MOVE-CORRESPONDING TO . - INSERT INTO TABLE . - ENDLOOP. - - ENDMETHOD. - - - METHOD extract_field_values. - - FIELD-SYMBOLS: LIKE LINE OF it_fields. - - CLEAR: ev_url, - ev_package, - ev_branch. - - READ TABLE it_fields INDEX 1 ASSIGNING . - ASSERT sy-subrc = 0. - ev_url = -value. - - READ TABLE it_fields INDEX 2 ASSIGNING . - ASSERT sy-subrc = 0. - ev_package = -value. - TRANSLATE ev_package TO UPPER CASE. - - READ TABLE it_fields INDEX 3 ASSIGNING . - ASSERT sy-subrc = 0. - ev_branch = -value. - - ENDMETHOD. - - - METHOD get_selected_rows. - - DATA: lv_condition TYPE string, - lr_exporting TYPE REF TO data. - - FIELD-SYMBOLS: TYPE any, - TYPE STANDARD TABLE, - TYPE any. - - lv_condition = |{ c_fieldname_selected } = ABAP_TRUE|. - - ASSIGN gr_table->* TO . - ASSERT sy-subrc = 0. - - CREATE DATA lr_exporting LIKE LINE OF et_list. - ASSIGN lr_exporting->* TO . - - LOOP AT ASSIGNING WHERE (lv_condition). - CLEAR . - MOVE-CORRESPONDING TO . - APPEND TO et_list. - ENDLOOP. - - ENDMETHOD. - - - METHOD on_select_list_function_click. - - FIELD-SYMBOLS: TYPE STANDARD TABLE, - TYPE any, - TYPE flag. - - ASSIGN gr_table->* TO . - ASSERT sy-subrc = 0. - - CASE e_salv_function. - WHEN 'O.K.'. - gv_cancel = abap_false. - go_select_list_popup->close_screen( ). - - WHEN 'ABR'. - "Canceled: clear list to overwrite nothing - CLEAR . - gv_cancel = abap_true. - go_select_list_popup->close_screen( ). - - WHEN 'SALL'. - - LOOP AT ASSIGNING . - - ASSIGN COMPONENT c_fieldname_selected - OF STRUCTURE - TO . - ASSERT sy-subrc = 0. - - = abap_true. - - ENDLOOP. - - go_select_list_popup->refresh( ). - - WHEN 'DSEL'. - - LOOP AT ASSIGNING . - - ASSIGN COMPONENT c_fieldname_selected - OF STRUCTURE - TO . - ASSERT sy-subrc = 0. - - = abap_false. - - ENDLOOP. - - go_select_list_popup->refresh( ). - - WHEN OTHERS. - CLEAR . - go_select_list_popup->close_screen( ). - ENDCASE. - - ENDMETHOD. - - - METHOD on_select_list_link_click. - - DATA: lv_line TYPE sytabix. - - FIELD-SYMBOLS: TYPE STANDARD TABLE, - TYPE any, - TYPE flag. - - ASSIGN gr_table->* TO . - ASSERT sy-subrc = 0. - - lv_line = row. - - READ TABLE ASSIGNING - INDEX lv_line. - IF sy-subrc = 0. - - ASSIGN COMPONENT c_fieldname_selected - OF STRUCTURE - TO . - ASSERT sy-subrc = 0. - - IF = abap_true. - = abap_false. - ELSE. - = abap_true. - ENDIF. - - ENDIF. - - go_select_list_popup->refresh( ). - ENDMETHOD. - - METHOD zif_abapgit_popups~package_popup_callback. DATA: ls_package_data TYPE scompkdtln, @@ -1131,5 +1132,4 @@ CLASS zcl_abapgit_popups IMPLEMENTATION. ENDIF. ENDMETHOD. - ENDCLASS. diff --git a/src/utils/zcl_abapgit_convert.clas.abap b/src/utils/zcl_abapgit_convert.clas.abap index 8e4811ebc..4cc52f42e 100644 --- a/src/utils/zcl_abapgit_convert.clas.abap +++ b/src/utils/zcl_abapgit_convert.clas.abap @@ -50,34 +50,34 @@ CLASS ZCL_ABAPGIT_CONVERT IMPLEMENTATION. METHOD bitbyte_to_int. - DATA: bitbyte TYPE string, - len TYPE i, - offset TYPE i. + DATA: lv_bitbyte TYPE string, + lv_len TYPE i, + lv_offset TYPE i. - bitbyte = iv_bits. - SHIFT bitbyte LEFT DELETING LEADING '0 '. - len = strlen( bitbyte ). - offset = len - 1. + lv_bitbyte = iv_bits. + SHIFT lv_bitbyte LEFT DELETING LEADING '0 '. + lv_len = strlen( lv_bitbyte ). + lv_offset = lv_len - 1. rv_int = 0. - DO len TIMES. + DO lv_len TIMES. IF sy-index = 1. "Intialize - CASE bitbyte+offset(1). + CASE lv_bitbyte+lv_offset(1). WHEN '1'. rv_int = 1. ENDCASE. ELSE. - CASE bitbyte+offset(1). + CASE lv_bitbyte+lv_offset(1). WHEN '1'. rv_int = rv_int + ( 2 ** ( sy-index - 1 ) ). ENDCASE. ENDIF. - offset = offset - 1. "Move Cursor + lv_offset = lv_offset - 1. "Move Cursor ENDDO. diff --git a/src/zcl_abapgit_branch_overview.clas.abap b/src/zcl_abapgit_branch_overview.clas.abap index d76ed25e4..dd860f2fd 100644 --- a/src/zcl_abapgit_branch_overview.clas.abap +++ b/src/zcl_abapgit_branch_overview.clas.abap @@ -154,11 +154,11 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. METHOD determine_merges. - DATA: BEGIN OF deleted_branch_info, + DATA: BEGIN OF ls_deleted_branch_info, created TYPE flag, index TYPE string, name TYPE string, - END OF deleted_branch_info. + END OF ls_deleted_branch_info. FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_commit, TYPE zif_abapgit_definitions=>ty_commit, @@ -176,20 +176,20 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. -merge = -branch. * orphaned, branch has been deleted after merge - deleted_branch_info-created = abap_false. + ls_deleted_branch_info-created = abap_false. WHILE -branch IS INITIAL. - IF deleted_branch_info-created = abap_false. + IF ls_deleted_branch_info-created = abap_false. - deleted_branch_info-created = abap_true. - deleted_branch_info-index = deleted_branch_info-index + 1. - deleted_branch_info-name = c_deleted_branch_name_prefix && deleted_branch_info-index && '__'. - CONDENSE deleted_branch_info-name NO-GAPS. + ls_deleted_branch_info-created = abap_true. + ls_deleted_branch_info-index = ls_deleted_branch_info-index + 1. + ls_deleted_branch_info-name = c_deleted_branch_name_prefix && ls_deleted_branch_info-index && '__'. + CONDENSE ls_deleted_branch_info-name NO-GAPS. - -merge = deleted_branch_info-name. + -merge = ls_deleted_branch_info-name. ENDIF. - -branch = deleted_branch_info-name. + -branch = ls_deleted_branch_info-name. READ TABLE mt_commits ASSIGNING WITH KEY sha1 = -parent1. @@ -202,7 +202,7 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. IF IS ASSIGNED. APPEND INITIAL LINE TO -create ASSIGNING . - -name = deleted_branch_info-name. + -name = ls_deleted_branch_info-name. -parent = -branch. ENDIF. @@ -474,18 +474,19 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. METHOD _get_1st_child_commit. - DATA: lt_1stchild_commits TYPE ty_commits. - DATA: lsr_parent LIKE LINE OF it_commit_sha1s. - DATA: ltr_commit_sha1s LIKE it_commit_sha1s. - FIELD-SYMBOLS: LIKE LINE OF it_commit_sha1s. - FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_commit. + DATA: lt_1stchild_commits TYPE ty_commits, + ls_parent LIKE LINE OF it_commit_sha1s, + lt_commit_sha1s LIKE it_commit_sha1s. + + FIELD-SYMBOLS: LIKE LINE OF it_commit_sha1s, + TYPE zif_abapgit_definitions=>ty_commit. CLEAR: es_1st_commit. * get all reachable next commits - ltr_commit_sha1s = it_commit_sha1s. - LOOP AT ct_commits ASSIGNING WHERE parent1 IN ltr_commit_sha1s - OR parent2 IN ltr_commit_sha1s. + lt_commit_sha1s = it_commit_sha1s. + LOOP AT ct_commits ASSIGNING WHERE parent1 IN lt_commit_sha1s + OR parent2 IN lt_commit_sha1s. INSERT INTO TABLE lt_1stchild_commits. ENDLOOP. @@ -503,10 +504,10 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. et_commit_sha1s = it_commit_sha1s. ENDIF. - lsr_parent-sign = 'I'. - lsr_parent-option = 'EQ'. - lsr_parent-low = es_1st_commit-sha1. - INSERT lsr_parent INTO TABLE et_commit_sha1s. + ls_parent-sign = 'I'. + ls_parent-option = 'EQ'. + ls_parent-low = es_1st_commit-sha1. + INSERT ls_parent INTO TABLE et_commit_sha1s. ENDMETHOD. @@ -526,20 +527,21 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. METHOD _sort_commits. - DATA: lt_sorted_commits TYPE ty_commits. - DATA: lv_next_commit TYPE zif_abapgit_definitions=>ty_commit. - DATA: ltr_parents TYPE tyt_commit_sha1_range. - DATA: lsr_parent LIKE LINE OF ltr_parents. + DATA: lt_sorted_commits TYPE ty_commits, + lv_next_commit TYPE zif_abapgit_definitions=>ty_commit, + lt_parents TYPE tyt_commit_sha1_range, + ls_parent LIKE LINE OF lt_parents. + FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_commit. * find initial commit READ TABLE ct_commits ASSIGNING WITH KEY parent1 = space. IF sy-subrc = 0. - lsr_parent-sign = 'I'. - lsr_parent-option = 'EQ'. - lsr_parent-low = -sha1. - INSERT lsr_parent INTO TABLE ltr_parents. + ls_parent-sign = 'I'. + ls_parent-option = 'EQ'. + ls_parent-low = -sha1. + INSERT ls_parent INTO TABLE lt_parents. * first commit INSERT INTO TABLE lt_sorted_commits. @@ -548,8 +550,8 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION. DELETE ct_commits WHERE sha1 = -sha1. DO. - _get_1st_child_commit( EXPORTING it_commit_sha1s = ltr_parents - IMPORTING et_commit_sha1s = ltr_parents + _get_1st_child_commit( EXPORTING it_commit_sha1s = lt_parents + IMPORTING et_commit_sha1s = lt_parents es_1st_commit = lv_next_commit CHANGING ct_commits = ct_commits ). IF lv_next_commit IS INITIAL. diff --git a/src/zcl_abapgit_folder_logic.clas.abap b/src/zcl_abapgit_folder_logic.clas.abap index 1d3681c4d..3ef0f6f23 100644 --- a/src/zcl_abapgit_folder_logic.clas.abap +++ b/src/zcl_abapgit_folder_logic.clas.abap @@ -56,18 +56,18 @@ CLASS ZCL_ABAPGIT_FOLDER_LOGIC IMPLEMENTATION. METHOD get_parent. - DATA: st_parent LIKE LINE OF mt_parent. + DATA: ls_parent LIKE LINE OF mt_parent. "Determine Parent Package - READ TABLE mt_parent INTO st_parent + READ TABLE mt_parent INTO ls_parent WITH TABLE KEY devclass = iv_package. IF sy-subrc <> 0. rv_parent = zcl_abapgit_factory=>get_sap_package( iv_package )->read_parent( ). - st_parent-devclass = iv_package. - st_parent-parentcl = rv_parent. - INSERT st_parent INTO TABLE mt_parent. + ls_parent-devclass = iv_package. + ls_parent-parentcl = rv_parent. + INSERT ls_parent INTO TABLE mt_parent. ELSE. - rv_parent = st_parent-parentcl. + rv_parent = ls_parent-parentcl. ENDIF. ENDMETHOD. diff --git a/src/zcl_abapgit_objects.clas.abap b/src/zcl_abapgit_objects.clas.abap index e5dcb0783..5c7191cdf 100644 --- a/src/zcl_abapgit_objects.clas.abap +++ b/src/zcl_abapgit_objects.clas.abap @@ -704,13 +704,13 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. METHOD is_active. - DATA: object TYPE REF TO zif_abapgit_object. + DATA: li_object TYPE REF TO zif_abapgit_object. - object = create_object( is_item = is_item - iv_language = sy-langu ). + li_object = create_object( is_item = is_item + iv_language = sy-langu ). TRY. - rv_active = object->is_active( ). + rv_active = li_object->is_active( ). CATCH cx_sy_dyn_call_illegal_method cx_sy_ref_is_initial. rv_active = abap_true. diff --git a/src/zcl_abapgit_repo_content_list.clas.abap b/src/zcl_abapgit_repo_content_list.clas.abap index 46005eb64..f265c7eda 100644 --- a/src/zcl_abapgit_repo_content_list.clas.abap +++ b/src/zcl_abapgit_repo_content_list.clas.abap @@ -48,7 +48,7 @@ ENDCLASS. -CLASS zcl_abapgit_repo_content_list IMPLEMENTATION. +CLASS ZCL_ABAPGIT_REPO_CONTENT_LIST IMPLEMENTATION. METHOD build_folders. @@ -103,8 +103,8 @@ CLASS zcl_abapgit_repo_content_list IMPLEMENTATION. METHOD build_repo_items_offline. - DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt. - DATA: item TYPE zif_abapgit_definitions=>ty_item. + DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, + ls_item TYPE zif_abapgit_definitions=>ty_item. FIELD-SYMBOLS: LIKE LINE OF rt_repo_items, LIKE LINE OF lt_tadir. @@ -115,13 +115,12 @@ CLASS zcl_abapgit_repo_content_list IMPLEMENTATION. io_dot = mo_repo->get_dot_abapgit( ) ). LOOP AT lt_tadir ASSIGNING . -* CATCH zcx_abapgit_exception. " APPEND INITIAL LINE TO rt_repo_items ASSIGNING . -obj_type = -object. -obj_name = -obj_name. -path = -path. - MOVE-CORRESPONDING TO item. - -inactive = boolc( zcl_abapgit_objects=>is_active( item ) = abap_false ). + MOVE-CORRESPONDING TO ls_item. + -inactive = boolc( zcl_abapgit_objects=>is_active( ls_item ) = abap_false ). IF -inactive = abap_true. -sortkey = c_sortkey-inactive. ELSE. diff --git a/src/zcl_abapgit_tadir.clas.abap b/src/zcl_abapgit_tadir.clas.abap index 00bd44ec9..37fb6cdf5 100644 --- a/src/zcl_abapgit_tadir.clas.abap +++ b/src/zcl_abapgit_tadir.clas.abap @@ -37,22 +37,22 @@ ENDCLASS. -CLASS zcl_abapgit_tadir IMPLEMENTATION. +CLASS ZCL_ABAPGIT_TADIR IMPLEMENTATION. METHOD build. - DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, - lt_tdevc TYPE STANDARD TABLE OF tdevc, - lv_path TYPE string, - lo_skip_objects TYPE REF TO zcl_abapgit_skip_objects, - lt_excludes TYPE RANGE OF trobjtype, - lt_srcsystem TYPE RANGE OF tadir-srcsystem, - ls_srcsystem LIKE LINE OF lt_srcsystem, - ls_exclude LIKE LINE OF lt_excludes, - lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic, - last_package TYPE devclass VALUE cl_abap_char_utilities=>horizontal_tab, - lt_packages TYPE zif_abapgit_sap_package=>ty_devclass_tt. + DATA: lt_tadir TYPE zif_abapgit_definitions=>ty_tadir_tt, + lt_tdevc TYPE STANDARD TABLE OF tdevc, + lv_path TYPE string, + lo_skip_objects TYPE REF TO zcl_abapgit_skip_objects, + lt_excludes TYPE RANGE OF trobjtype, + lt_srcsystem TYPE RANGE OF tadir-srcsystem, + ls_srcsystem LIKE LINE OF lt_srcsystem, + ls_exclude LIKE LINE OF lt_excludes, + lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic, + lv_last_package TYPE devclass VALUE cl_abap_char_utilities=>horizontal_tab, + lt_packages TYPE zif_abapgit_sap_package=>ty_devclass_tt. FIELD-SYMBOLS: LIKE LINE OF lt_tdevc, LIKE LINE OF rt_tadir, @@ -115,9 +115,9 @@ CLASS zcl_abapgit_tadir IMPLEMENTATION. LOOP AT rt_tadir ASSIGNING . - IF last_package <> -devclass. + IF lv_last_package <> -devclass. "Change in Package - last_package = -devclass. + lv_last_package = -devclass. IF NOT io_dot IS INITIAL. "Reuse given Folder Logic Instance @@ -275,6 +275,4 @@ CLASS zcl_abapgit_tadir IMPLEMENTATION. ENDIF. ENDMETHOD. - - ENDCLASS.