diff --git a/src/zabapgit_git_helpers.prog.abap b/src/zabapgit_git_helpers.prog.abap index 123d2ff8f..bbcb29962 100644 --- a/src/zabapgit_git_helpers.prog.abap +++ b/src/zabapgit_git_helpers.prog.abap @@ -268,11 +268,11 @@ CLASS lcl_git_branch_list IMPLEMENTATION. METHOD is_ignored. - IF iv_branch_name EQ 'refs/heads/gh-pages'. " Github pages + IF iv_branch_name = 'refs/heads/gh-pages'. " Github pages rv_ignore = abap_true. ENDIF. - IF iv_branch_name CP 'refs/pull/*' + IF iv_branch_name CP 'refs/pull/*' OR iv_branch_name CP 'refs/merge-requests/*' OR iv_branch_name CP 'refs/keep-around/*' OR iv_branch_name CP 'refs/tmp/*'. @@ -302,7 +302,6 @@ CLASS lcl_git_branch_list IMPLEMENTATION. IF iv_branch_name CP 'refs/tags/*'. rv_type = c_type-tag. - RETURN. ENDIF. ENDMETHOD. "get_type diff --git a/src/zabapgit_gui_router.prog.abap b/src/zabapgit_gui_router.prog.abap index b540f923e..0d8689f81 100644 --- a/src/zabapgit_gui_router.prog.abap +++ b/src/zabapgit_gui_router.prog.abap @@ -73,7 +73,7 @@ CLASS lcl_gui_router IMPLEMENTATION. CASE iv_action. " General routing - WHEN gc_action-go_main " Go Main page + WHEN gc_action-go_main " Go Main page OR gc_action-go_explore " Go Explore page OR gc_action-go_db " Go DB util page OR gc_action-go_background_run " Go background run page @@ -200,8 +200,7 @@ CLASS lcl_gui_router IMPLEMENTATION. METHOD get_page_by_name. DATA: lv_page_class TYPE string, - lv_page_name TYPE string, - lv_message TYPE string. + lv_page_name TYPE string. lv_page_name = iv_name. SHIFT lv_page_name LEFT DELETING LEADING 'go_'. diff --git a/src/zabapgit_html.prog.abap b/src/zabapgit_html.prog.abap index b64acb9c3..56506d677 100644 --- a/src/zabapgit_html.prog.abap +++ b/src/zabapgit_html.prog.abap @@ -153,13 +153,13 @@ CLASS lcl_html_helper IMPLEMENTATION. lv_class = iv_class. - IF iv_opt ca gc_html_opt-emphas. + IF iv_opt CA gc_html_opt-emphas. lv_class = lv_class && ' emphasis' ##NO_TEXT. ENDIF. - IF iv_opt ca gc_html_opt-cancel. + IF iv_opt CA gc_html_opt-cancel. lv_class = lv_class && ' attention' ##NO_TEXT. ENDIF. - IF iv_opt ca gc_html_opt-crossout. + IF iv_opt CA gc_html_opt-crossout. lv_class = lv_class && ' crossout grey' ##NO_TEXT. ENDIF. IF lv_class IS NOT INITIAL. diff --git a/src/zabapgit_html_action_utils.prog.abap b/src/zabapgit_html_action_utils.prog.abap index c64cdeed9..4fc1a543d 100644 --- a/src/zabapgit_html_action_utils.prog.abap +++ b/src/zabapgit_html_action_utils.prog.abap @@ -74,9 +74,9 @@ CLASS lcl_html_action_utils DEFINITION FINAL. IMPORTING it_postdata TYPE cnht_post_data_tab EXPORTING es_fields TYPE any. - CLASS-METHODS repo_key_encode - IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key - RETURNING VALUE(rv_string) TYPE string. +* CLASS-METHODS repo_key_encode +* IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key +* RETURNING VALUE(rv_string) TYPE string. CLASS-METHODS decode_bg_update IMPORTING iv_getdata TYPE clike @@ -265,7 +265,6 @@ CLASS lcl_html_action_utils IMPLEMENTATION. DATA: lt_fields TYPE tihttpnvp, lv_string TYPE string. - FIELD-SYMBOLS: LIKE LINE OF lt_fields. CONCATENATE LINES OF it_postdata INTO lv_string. rs_content = dbkey_decode( lv_string ). @@ -312,16 +311,15 @@ CLASS lcl_html_action_utils IMPLEMENTATION. ENDMETHOD. "parse_commit_request - METHOD repo_key_encode. - - DATA: lt_fields TYPE tihttpnvp, - ls_field LIKE LINE OF lt_fields. - - add_field( EXPORTING name = 'KEY' iv = iv_key CHANGING ct = lt_fields ). - - rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ). - - ENDMETHOD. "repo_key_encode +* METHOD repo_key_encode. +* +* DATA: lt_fields TYPE tihttpnvp. +* +* add_field( EXPORTING name = 'KEY' iv = iv_key CHANGING ct = lt_fields ). +* +* rv_string = cl_http_utility=>if_http_utility~fields_to_string( lt_fields ). +* +* ENDMETHOD. "repo_key_encode METHOD decode_bg_update. diff --git a/src/zabapgit_objects_impl.prog.abap b/src/zabapgit_objects_impl.prog.abap index bf7787c75..4cb47a21f 100644 --- a/src/zabapgit_objects_impl.prog.abap +++ b/src/zabapgit_objects_impl.prog.abap @@ -50,8 +50,7 @@ CLASS lcl_objects IMPLEMENTATION. lv_answer = lcl_popups=>popup_to_confirm( titlebar = 'Warning' text_question = lv_question - display_cancel_button = abap_false - ). "#EC NOTEXT + display_cancel_button = abap_false ). "#EC NOTEXT IF lv_answer = '2'. DELETE ct_results INDEX lv_index. @@ -85,8 +84,7 @@ CLASS lcl_objects IMPLEMENTATION. text_button_2 = 'Cancel' icon_button_2 = 'ICON_CANCEL' default_button = '2' - display_cancel_button = abap_false - ). "#EC NOTEXT + display_cancel_button = abap_false ). "#EC NOTEXT IF lv_answer = '2'. rv_cancel = abap_true. diff --git a/src/zabapgit_page_background.prog.abap b/src/zabapgit_page_background.prog.abap index 64d0ee4ff..56e9fd0c0 100644 --- a/src/zabapgit_page_background.prog.abap +++ b/src/zabapgit_page_background.prog.abap @@ -122,8 +122,7 @@ CLASS lcl_gui_page_background IMPLEMENTATION. lv_push TYPE string, lv_pull TYPE string, lv_afixed TYPE string, - lv_aauto TYPE string, - lt_list TYPE lcl_repo_srv=>ty_repo_tt. + lv_aauto TYPE string. CREATE OBJECT ro_html. diff --git a/src/zabapgit_page_diff.prog.abap b/src/zabapgit_page_diff.prog.abap index 19772c55b..0ec2b1dbc 100644 --- a/src/zabapgit_page_diff.prog.abap +++ b/src/zabapgit_page_diff.prog.abap @@ -6,18 +6,17 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page_super. PUBLIC SECTION. - TYPES: begin of ty_file_diff, + TYPES: BEGIN OF ty_file_diff, filename TYPE string, o_diff TYPE REF TO lcl_diff, - end of ty_file_diff, + END OF ty_file_diff, tt_file_diff TYPE STANDARD TABLE OF ty_file_diff. METHODS: constructor - IMPORTING - iv_key TYPE lcl_persistence_repo=>ty_repo-key - is_file TYPE ty_file OPTIONAL - is_object TYPE ty_item OPTIONAL - RAISING lcx_exception. + IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key + is_file TYPE ty_file OPTIONAL + is_object TYPE ty_item OPTIONAL + RAISING lcx_exception. METHODS lif_gui_page~render REDEFINITION. @@ -39,7 +38,7 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page_super. it_local TYPE ty_files_item_tt iv_path TYPE string iv_filename TYPE string - RAISING lcx_exception. + RAISING lcx_exception. ENDCLASS. "lcl_gui_page_diff @@ -47,10 +46,10 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. METHOD constructor. - DATA: lt_remote TYPE ty_files_tt, - lt_local TYPE ty_files_item_tt, - lt_results TYPE ty_results_tt, - lo_repo TYPE REF TO lcl_repo_online. + DATA: lt_remote TYPE ty_files_tt, + lt_local TYPE ty_files_item_tt, + lt_results TYPE ty_results_tt, + lo_repo TYPE REF TO lcl_repo_online. FIELD-SYMBOLS: LIKE LINE OF lt_results. @@ -111,9 +110,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. METHOD append_diff. DATA: - ls_r_dummy LIKE LINE OF it_remote ##NEEDED, - ls_l_dummy LIKE LINE OF it_local ##NEEDED, - ls_diff_file LIKE LINE OF mt_diff_files. + ls_r_dummy LIKE LINE OF it_remote ##NEEDED, + ls_l_dummy LIKE LINE OF it_local ##NEEDED, + ls_diff_file LIKE LINE OF mt_diff_files. FIELD-SYMBOLS: LIKE LINE OF it_remote, LIKE LINE OF it_local. @@ -186,7 +185,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. lo_html->add( '}' ). "#EC NOTEXT lo_html->add( 'div.diff_content {' ). "#EC NOTEXT lo_html->add( ' background: #fff;' ). "#EC NOTEXT - lo_html->add( ' border-top: 1px solid #DDD;' ). "#EC NOTEXT + lo_html->add( ' border-top: 1px solid #DDD;' ). "#EC NOTEXT lo_html->add( ' border-bottom: 1px solid #DDD;' ). "#EC NOTEXT lo_html->add( '}' ). "#EC NOTEXT @@ -199,9 +198,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. lo_html->add( ' color: #EEE;' ). "#EC NOTEXT lo_html->add( ' background-color: #BBB;' ). "#EC NOTEXT lo_html->add( ' text-align: left;' ). "#EC NOTEXT - lo_html->add( ' font-weight: bold;' ). "#EC NOTEXT + lo_html->add( ' font-weight: bold;' ). "#EC NOTEXT lo_html->add( ' padding-left: 0.5em;' ). "#EC NOTEXT - lo_html->add( ' font-size: 9pt;' ). "#EC NOTEXT + lo_html->add( ' font-size: 9pt;' ). "#EC NOTEXT lo_html->add( '}' ). "#EC NOTEXT lo_html->add( 'table.diff_tab td {' ). "#EC NOTEXT lo_html->add( ' color: #444;' ). "#EC NOTEXT @@ -265,9 +264,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ro_html->add( '' ). "#EC NOTEXT ro_html->add( '' ). "#EC NOTEXT ro_html->add( '' ). "#EC NOTEXT - ro_html->add( '' ). "#EC NOTEXT + ro_html->add( '' ). "#EC NOTEXT ro_html->add( '' ). "#EC NOTEXT - ro_html->add( '' ). "#EC NOTEXT + ro_html->add( '' ). "#EC NOTEXT ro_html->add( '' ). "#EC NOTEXT ro_html->add( render_lines( is_diff ) ). ro_html->add( '
LOCALLOCALREMOTEREMOTE
' ). "#EC NOTEXT diff --git a/src/zabapgit_password_dialog.prog.abap b/src/zabapgit_password_dialog.prog.abap index d7f36694d..63ba43ea1 100644 --- a/src/zabapgit_password_dialog.prog.abap +++ b/src/zabapgit_password_dialog.prog.abap @@ -21,7 +21,7 @@ SELECTION-SCREEN END OF SCREEN 1002. *----------------------------------------------------------------------- * LCL_PASSWORD_DIALOG *----------------------------------------------------------------------- -CLASS lcl_password_dialog DEFINITION. +CLASS lcl_password_dialog DEFINITION FINAL. PUBLIC SECTION. CONSTANTS dynnr TYPE char4 VALUE '1002'. diff --git a/src/zabapgit_persistence.prog.abap b/src/zabapgit_persistence.prog.abap index a16349ade..9a4bf77c5 100644 --- a/src/zabapgit_persistence.prog.abap +++ b/src/zabapgit_persistence.prog.abap @@ -424,11 +424,6 @@ CLASS lcl_persistence_user DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app. DATA: mv_user TYPE xubname. - TYPES: - ty_repo_hidden_tt - TYPE STANDARD TABLE OF lcl_persistence_repo=>ty_repo-key - WITH DEFAULT KEY. - TYPES: BEGIN OF ty_repo_config, url TYPE lcl_persistence_repo=>ty_repo-url, username TYPE string, diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap index bdb88aa44..cda5de30f 100644 --- a/src/zabapgit_popups.prog.abap +++ b/src/zabapgit_popups.prog.abap @@ -3,7 +3,7 @@ *&---------------------------------------------------------------------* "! various popups, static methods, no class/object state -CLASS lcl_popups DEFINITION. +CLASS lcl_popups DEFINITION FINAL. PUBLIC SECTION. TYPES: BEGIN OF ty_popup, diff --git a/src/zabapgit_services_abapgit.prog.abap b/src/zabapgit_services_abapgit.prog.abap index a44eda2e7..98ba52ce8 100644 --- a/src/zabapgit_services_abapgit.prog.abap +++ b/src/zabapgit_services_abapgit.prog.abap @@ -52,8 +52,7 @@ CLASS lcl_services_abapgit IMPLEMENTATION. text_button_1 = 'Continue' text_button_2 = 'Cancel' default_button = '2' - display_cancel_button = abap_false - ). "#EC NOTEXT + display_cancel_button = abap_false ). "#EC NOTEXT IF lv_answer <> '1'. RETURN. ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/src/zabapgit_stage.prog.abap b/src/zabapgit_stage.prog.abap index f26ad930b..958a136cc 100644 --- a/src/zabapgit_stage.prog.abap +++ b/src/zabapgit_stage.prog.abap @@ -56,10 +56,10 @@ CLASS lcl_stage DEFINITION FINAL. IMPORTING iv_path TYPE ty_file-path iv_filename TYPE ty_file-filename RAISING lcx_exception, - lookup - IMPORTING iv_path TYPE ty_file-path - iv_filename TYPE ty_file-filename - RETURNING VALUE(rv_method) TYPE ty_method, +* lookup +* IMPORTING iv_path TYPE ty_file-path +* iv_filename TYPE ty_file-filename +* RETURNING VALUE(rv_method) TYPE ty_method, get_merge_source RETURNING VALUE(rv_source) TYPE ty_sha1, count @@ -103,19 +103,19 @@ CLASS lcl_stage IMPLEMENTATION. rv_branch = mv_branch_sha1. ENDMETHOD. - METHOD lookup. - - DATA ls_stage LIKE LINE OF mt_stage. - - - READ TABLE mt_stage INTO ls_stage - WITH KEY file-path = iv_path - file-filename = iv_filename. - IF sy-subrc = 0. - rv_method = ls_stage-method. - ENDIF. - - ENDMETHOD. "lookup +* METHOD lookup. +* +* DATA ls_stage LIKE LINE OF mt_stage. +* +* +* READ TABLE mt_stage INTO ls_stage +* WITH KEY file-path = iv_path +* file-filename = iv_filename. +* IF sy-subrc = 0. +* rv_method = ls_stage-method. +* ENDIF. +* +* ENDMETHOD. "lookup METHOD get_all. rt_stage = mt_stage. diff --git a/src/zabapgit_util.prog.abap b/src/zabapgit_util.prog.abap index 9672d95e1..7641b5262 100644 --- a/src/zabapgit_util.prog.abap +++ b/src/zabapgit_util.prog.abap @@ -347,17 +347,17 @@ CLASS lcl_path DEFINITION FINAL. ev_filename TYPE string. CLASS-METHODS is_root - IMPORTING iv_path TYPE string + IMPORTING iv_path TYPE string RETURNING VALUE(rv_yes) TYPE abap_bool. CLASS-METHODS is_subdir - IMPORTING iv_path TYPE string - iv_parent TYPE string + IMPORTING iv_path TYPE string + iv_parent TYPE string RETURNING VALUE(rv_yes) TYPE abap_bool. CLASS-METHODS change_dir - IMPORTING iv_cur_dir TYPE string - iv_cd TYPE string + IMPORTING iv_cur_dir TYPE string + iv_cd TYPE string RETURNING VALUE(rv_path) TYPE string. ENDCLASS. "lcl_path @@ -398,7 +398,7 @@ CLASS lcl_path IMPLEMENTATION. lv_last = lv_len - 1. rv_yes = boolc( strlen( iv_path ) > lv_len AND iv_path+0(lv_len) = iv_parent - AND ( iv_parent+lv_last(1) = '/' OR iv_path+lv_Len(1) = '/' ) ). + AND ( iv_parent+lv_last(1) = '/' OR iv_path+lv_len(1) = '/' ) ). ENDMETHOD. "is_subdir @@ -406,7 +406,6 @@ CLASS lcl_path IMPLEMENTATION. DATA lv_last TYPE i. DATA lv_temp TYPE string. - DATA lv_len TYPE i. lv_last = strlen( iv_cur_dir ) - 1. @@ -425,12 +424,10 @@ CLASS lcl_path IMPLEMENTATION. SHIFT lv_temp UP TO '/' LEFT. rv_path = reverse( lv_temp ). ENDIF. + ELSEIF iv_cur_dir+lv_last(1) = '/'. " Append cd to cur_dir separated by / + rv_path = iv_cur_dir && iv_cd. ELSE. - IF iv_cur_dir+lv_last(1) = '/'. " Append cd to cur_dir separated by / - rv_path = iv_cur_dir && iv_cd. - ELSE. - rv_path = iv_cur_dir && '/' && iv_cd. - ENDIF. + rv_path = iv_cur_dir && '/' && iv_cd. ENDIF. " TODO: improve logic and cases diff --git a/src/zabapgit_xml.prog.abap b/src/zabapgit_xml.prog.abap index 0de3049a8..aa679df6c 100644 --- a/src/zabapgit_xml.prog.abap +++ b/src/zabapgit_xml.prog.abap @@ -323,8 +323,7 @@ CLASS lcl_xml_input IMPLEMENTATION. METHOD read. - DATA: lv_text TYPE string, - lx_error TYPE REF TO cx_transformation_error, + DATA: lx_error TYPE REF TO cx_transformation_error, lt_rtab TYPE abap_trans_resbind_tab. FIELD-SYMBOLS: LIKE LINE OF lt_rtab.