cleanup and style changes

pretty printer
remove unused variables
cleanup

src/zabapgit_definitions.prog.abap

@@ -14,8 +14,11 @@ TYPES: BEGIN OF ty_file_signature,
          sha1     TYPE ty_sha1,
        END OF ty_file_signature.
 
-TYPES: ty_file_signatures_tt TYPE STANDARD TABLE OF ty_file_signature WITH DEFAULT KEY.
+TYPES: ty_file_signatures_tt TYPE STANDARD TABLE OF
-TYPES: ty_file_signatures_ts TYPE SORTED TABLE OF ty_file_signature WITH UNIQUE KEY path filename.
+         ty_file_signature WITH DEFAULT KEY.
+
+TYPES: ty_file_signatures_ts TYPE SORTED TABLE OF
+         ty_file_signature WITH UNIQUE KEY path filename.
 
 TYPES: BEGIN OF ty_file.
     INCLUDE TYPE ty_file_signature.
@@ -24,7 +27,6 @@ TYPES: data TYPE xstring,
 TYPES: ty_files_tt TYPE STANDARD TABLE OF ty_file WITH DEFAULT KEY.
 
 TYPES: ty_string_tt TYPE STANDARD TABLE OF string WITH DEFAULT KEY.
-TYPES: tt_w3urls    TYPE STANDARD TABLE OF w3url  WITH DEFAULT KEY.
 
 TYPES: BEGIN OF ty_comment,
          username TYPE string,

src/zabapgit_file_status.prog.abap

@@ -193,7 +193,8 @@ CLASS lcl_file_status IMPLEMENTATION.
 
     " Match against current state
     READ TABLE it_state INTO ls_file_sig
-      WITH KEY path = is_local-file-path filename = is_local-file-filename
+      WITH KEY path = is_local-file-path
+      filename = is_local-file-filename
       BINARY SEARCH.
 
     IF sy-subrc = 0.
@@ -203,7 +204,8 @@ CLASS lcl_file_status IMPLEMENTATION.
       IF ls_file_sig-sha1 <> is_remote-sha1.
         rs_result-rstate = gc_state-modified.
       ENDIF.
-      rs_result-match = boolc( rs_result-lstate IS INITIAL AND rs_result-rstate IS INITIAL ).
+      rs_result-match = boolc( rs_result-lstate IS INITIAL
+        AND rs_result-rstate IS INITIAL ).
     ELSE.
       " This is a strange situation. As both local and remote exist
       " the state should also be present. Maybe this is a first run of the code.

src/zabapgit_git.prog.abap

@@ -337,7 +337,8 @@ CLASS lcl_git_transport IMPLEMENTATION.
 
     LOOP AT lt_branches FROM 1 ASSIGNING <ls_branch>.
       IF sy-tabix = 1.
-        lv_capa = 'side-band-64k no-progress multi_ack agent=' && lcl_http=>get_agent( ) ##NO_TEXT.
+        lv_capa = 'side-band-64k no-progress multi_ack agent='
+          && lcl_http=>get_agent( ) ##NO_TEXT.
         lv_line = 'want' && ` ` && <ls_branch>-sha1
           && ` ` && lv_capa && gc_newline.                  "#EC NOTEXT
       ELSE.
@@ -348,14 +349,16 @@ CLASS lcl_git_transport IMPLEMENTATION.
     ENDLOOP.
 
     IF iv_deepen = abap_true.
-      lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( 'deepen 1' && gc_newline ). "#EC NOTEXT
+      lv_buffer = lv_buffer && lcl_git_utils=>pkt_string( 'deepen 1'
+        && gc_newline ).                                    "#EC NOTEXT
     ENDIF.
 
     lv_buffer = lv_buffer
              && '0000'
              && '0009done' && gc_newline.
 
-    lv_xstring = lo_client->send_receive_close( lcl_convert=>string_to_xstring_utf8( lv_buffer ) ).
+    lv_xstring = lo_client->send_receive_close(
+      lcl_convert=>string_to_xstring_utf8( lv_buffer ) ).
 
     parse( IMPORTING ev_pack = lv_pack
            CHANGING cv_data = lv_xstring ).

src/zabapgit_gui_asset_manager.prog.abap

@@ -108,11 +108,7 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION.
       TABLES
         binary_tab   = lt_w3mime
       EXCEPTIONS
-        failed       = 1.
+        failed       = 1 ##FM_SUBRC_OK.
-
-    IF sy-subrc IS NOT INITIAL.
-      RETURN.
-    ENDIF.
 
   ENDMETHOD.  " get_mime_asset.
 
@@ -136,10 +132,6 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION.
 
   ENDMETHOD.  " get_images.
 
-  DEFINE _inline.
-    APPEND &1 TO lt_data.
-  END-OF-DEFINITION.
-
   METHOD get_inline_asset.
 
     DATA: lt_data TYPE ty_string_tt,

src/zabapgit_object_clas.prog.abap

@@ -1114,11 +1114,7 @@ CLASS lcl_object_clas IMPLEMENTATION.
   METHOD deserialize_sotr.
     "OTR stands for Online Text Repository
     DATA: lt_sotr    TYPE ty_sotr_tt,
-          lt_objects TYPE sotr_objects,
+          lt_objects TYPE sotr_objects.
-          ls_paket   TYPE sotr_pack,
-          lv_object  LIKE LINE OF lt_objects.
-
-    FIELD-SYMBOLS: <ls_sotr> LIKE LINE OF lt_sotr.
 
 
     io_xml->read( EXPORTING iv_name = 'SOTR'
@@ -1155,8 +1151,7 @@ CLASS lcl_object_clas IMPLEMENTATION.
 
   METHOD deserialize_tpool.
 
-    DATA: lv_cp        TYPE program,
+    DATA: lv_clsname   TYPE seoclsname,
-          lv_clsname   TYPE seoclsname,
           lt_tpool_ext TYPE ty_tpool_tt,
           lt_tpool     TYPE textpool_table.
 

src/zabapgit_object_shi3.prog.abap

@@ -158,6 +158,7 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
           lt_texts  TYPE TABLE OF hier_texts,
           lt_refs   TYPE TABLE OF hier_ref.
 
+
     CALL FUNCTION 'STREE_STRUCTURE_READ'
       EXPORTING
         structure_id     = mv_tree_id
@@ -167,10 +168,6 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
       TABLES
         description      = lt_titles.
 
-    IF sy-subrc <> 0.
-      lcx_exception=>raise( 'Error from STREE_STRUCTURE_READ, SHI3' ).
-    ENDIF.
-
     CALL FUNCTION 'STREE_HIERARCHY_READ'
       EXPORTING
         structure_id       = mv_tree_id
@@ -182,9 +179,6 @@ CLASS lcl_object_shi3 IMPLEMENTATION.
         list_of_nodes      = lt_nodes
         list_of_references = lt_refs
         list_of_texts      = lt_texts.
-    IF sy-subrc <> 0.
-      lcx_exception=>raise( 'Error from STREE_HIERARCHY_READ, SHI3' ).
-    ENDIF.
 
     strip_stamps( CHANGING cs_head  = ls_head
                            ct_nodes = lt_nodes ).

src/zabapgit_object_tabl_valid.prog.abap

@@ -187,9 +187,6 @@ CLASS lct_table_validation IMPLEMENTATION.
   ENDMETHOD.
 
   METHOD no_fields_no_message.
-    DATA:
-      ls_current_table_field  LIKE LINE OF mt_current_table_fields.
-
     create_xmls( ).
 
     mv_validation_message = mo_table_validator->validate(
@@ -199,7 +196,6 @@ CLASS lct_table_validation IMPLEMENTATION.
     cl_abap_unit_assert=>assert_initial( mv_validation_message ).
   ENDMETHOD.
 
-
   METHOD create_xmls.
     CREATE OBJECT mo_previous_version_out_xml.
     mo_previous_version_out_xml->add(
@@ -220,6 +216,4 @@ CLASS lct_table_validation IMPLEMENTATION.
         iv_xml = mo_current_version_out_xml->render( ).
   ENDMETHOD.
 
-
-
 ENDCLASS.

src/zabapgit_object_tran.prog.abap

@@ -243,8 +243,7 @@ CLASS lcl_object_tran IMPLEMENTATION.
         communication_failure = 2
         resource_failure      = 3
         OTHERS                = 4
-        ##fm_subrc_ok
+        ##fm_subrc_ok.    "#EC CI_SUBRC
-      .                                                   "#EC CI_SUBRC
 
   ENDMETHOD.                    "jump
 

src/zabapgit_objects.prog.abap

@@ -1705,9 +1705,9 @@ CLASS lcl_objects DEFINITION FINAL.
     CLASS-METHODS supported_list
       RETURNING VALUE(rt_types) TYPE ty_types_tt.
 
-    CLASS-METHODS is_language_installed
+*    CLASS-METHODS is_language_installed
-      IMPORTING iv_language   TYPE langu
+*      IMPORTING iv_language   TYPE langu
-      RETURNING VALUE(rv_yes) TYPE abap_bool.
+*      RETURNING VALUE(rv_yes) TYPE abap_bool.
 
   PRIVATE SECTION.
 
@@ -1747,7 +1747,6 @@ CLASS lcl_objects DEFINITION FINAL.
       RAISING  lcx_exception.
 
     CLASS-METHODS warning_overwrite
-      IMPORTING io_repo    TYPE REF TO lcl_repo
       CHANGING  ct_results TYPE ty_results_tt
       RAISING   lcx_exception.
 

src/zabapgit_objects_impl.prog.abap

@@ -207,17 +207,17 @@ CLASS lcl_objects IMPLEMENTATION.
 
   ENDMETHOD.                    "supported_list
 
-  METHOD is_language_installed.
+*  METHOD is_language_installed.
-
+*
-    IF mv_langs_installed IS INITIAL.
+*    IF mv_langs_installed IS INITIAL.
-      CALL FUNCTION 'RSAQ_READ_INSTALLED_LANGUAGES'
+*      CALL FUNCTION 'RSAQ_READ_INSTALLED_LANGUAGES'
-        IMPORTING
+*        IMPORTING
-          inst_languages = mv_langs_installed.
+*          inst_languages = mv_langs_installed.
-    ENDIF.
+*    ENDIF.
-
+*
-    rv_yes = boolc( mv_langs_installed CA iv_language ).
+*    rv_yes = boolc( mv_langs_installed CA iv_language ).
-
+*
-  ENDMETHOD.  "is_language_installed
+*  ENDMETHOD.  "is_language_installed
 
   METHOD exists.
 
@@ -616,8 +616,7 @@ CLASS lcl_objects IMPLEMENTATION.
 
     lt_results = prioritize_deser( lt_results ).
 
-    warning_overwrite( EXPORTING io_repo = io_repo
+    warning_overwrite( CHANGING ct_results = lt_results ).
-                       CHANGING ct_results = lt_results ).
 
     LOOP AT lt_results ASSIGNING <ls_result> WHERE obj_type IS NOT INITIAL
         AND NOT ( lstate = gc_state-added AND rstate IS INITIAL ).

src/zabapgit_page.prog.abap

@@ -53,7 +53,6 @@ CLASS lcl_gui_page_super DEFINITION ABSTRACT.
       RAISING   lcx_exception.
 
     METHODS header
-      IMPORTING io_include_style TYPE REF TO lcl_html_helper OPTIONAL
       RETURNING VALUE(ro_html)   TYPE REF TO lcl_html_helper.
 
     METHODS footer

src/zabapgit_page_debug.prog.abap

@@ -69,7 +69,7 @@ CLASS lcl_gui_page_debuginfo IMPLEMENTATION.
       TABLES
         wt_object_text = lt_objects
       EXCEPTIONS
-        OTHERS         = 1.
+        OTHERS         = 1 ##FM_SUBRC_OK.
 
     LOOP AT lt_objects ASSIGNING <object> WHERE pgmid = 'R3TR'.
       ls_item-obj_type = <object>-object.

src/zabapgit_page_diff.prog.abap

@@ -96,7 +96,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION.
           WHERE obj_type = is_object-obj_type
           AND   obj_name = is_object-obj_name
           AND   match IS INITIAL.
-
         append_diff( it_remote = lt_remote
                      it_local  = lt_local
                      is_status = <ls_status> ).

src/zabapgit_page_main.prog.abap

@@ -137,15 +137,13 @@ CLASS lcl_gui_page_main IMPLEMENTATION.
 
     IF lines( lt_repos ) = 0 AND lx_error IS INITIAL.
       ro_html->add( render_explore( ) ).
-    ELSE.
+    ELSEIF mv_show IS INITIAL.
-      IF mv_show IS INITIAL.
       CREATE OBJECT lo_tutorial.
       ro_html->add( lo_tutorial->lif_gui_page~render( ) ).
     ELSE.
       lo_repo = lcl_app=>repo_srv( )->get( mv_show ).
       ro_html->add( render_repo( lo_repo ) ).
     ENDIF.
-    ENDIF.
 
     ro_html->add( footer( ) ).
 

src/zabapgit_persistence.prog.abap

@@ -1432,14 +1432,12 @@ CLASS lcl_settings DEFINITION FINAL.
     METHODS
       get_run_critical_tests
         RETURNING VALUE(rv_run) TYPE abap_bool.
-  PROTECTED SECTION.
 
   PRIVATE SECTION.
     DATA mv_proxy_url TYPE string.
     DATA mv_proxy_port TYPE string.
     DATA mv_run_critical_tests TYPE abap_bool.
 
-
 ENDCLASS.
 
 CLASS lcl_settings IMPLEMENTATION.
@@ -1484,10 +1482,6 @@ CLASS lcl_persistence_settings DEFINITION FINAL.
       RETURNING
         VALUE(ro_settings) TYPE REF TO lcl_settings.
 
-  PROTECTED SECTION.
-
-  PRIVATE SECTION.
-
 ENDCLASS.
 
 CLASS lcl_persistence_settings IMPLEMENTATION.
@@ -1520,8 +1514,7 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
         ro_settings->set_proxy_url(
           lcl_app=>db( )->read(
             iv_type  = 'SETTINGS'
-            iv_value = 'PROXY_URL'
+            iv_value = 'PROXY_URL' ) ).
-          ) ).
       CATCH lcx_not_found.
         ro_settings->set_proxy_url( '' ).
     ENDTRY.
@@ -1529,8 +1522,7 @@ CLASS lcl_persistence_settings IMPLEMENTATION.
         ro_settings->set_proxy_port(
           lcl_app=>db( )->read(
             iv_type  = 'SETTINGS'
-            iv_value = 'PROXY_PORT'
+            iv_value = 'PROXY_PORT' ) ).
-          ) ).
       CATCH lcx_not_found.
         ro_settings->set_proxy_port( '' ).
     ENDTRY.

src/zabapgit_repo_impl.prog.abap

@@ -549,7 +549,8 @@ CLASS lcl_repo IMPLEMENTATION.
           WITH KEY item = ls_item. " type+name+package key
         " There is something in cache and the object is unchanged
         IF sy-subrc = 0
-          AND abap_false = lcl_objects=>has_changed_since( is_item      = ls_item
+            AND abap_false = lcl_objects=>has_changed_since(
+            is_item      = ls_item
             iv_timestamp = mv_last_serialization ).
           LOOP AT lt_cache ASSIGNING <ls_cache> WHERE item = ls_item.
             APPEND <ls_cache> TO rt_files.

src/zabapgit_sap_package.prog.abap

@@ -117,7 +117,8 @@ CLASS lcl_sap_package IMPLEMENTATION.
     SORT lt_res_sort BY obj_type ASCENDING obj_name ASCENDING.
 
     LOOP AT it_results ASSIGNING <ls_res1> WHERE NOT obj_type IS INITIAL.
-      IF NOT ( <ls_res1>-obj_type = ls_item-obj_type AND <ls_res1>-obj_name = ls_item-obj_name ).
+      IF NOT ( <ls_res1>-obj_type = ls_item-obj_type
+          AND <ls_res1>-obj_name = ls_item-obj_name ).
         APPEND INITIAL LINE TO lt_item_idx ASSIGNING <ls_res2>.
         <ls_res2>-obj_type = <ls_res1>-obj_type.
         <ls_res2>-obj_name = <ls_res1>-obj_name.

src/zabapgit_services_abapgit.prog.abap

@@ -5,12 +5,18 @@
 CLASS lcl_services_abapgit DEFINITION FINAL.
   PUBLIC SECTION.
 
-    CONSTANTS c_abapgit_homepage TYPE string VALUE 'http://www.abapgit.org' ##NO_TEXT.
+    CONSTANTS c_abapgit_homepage TYPE string
-    CONSTANTS c_abapgit_wikipage TYPE string VALUE 'https://github.com/larshp/abapGit/wiki'.
+      VALUE 'http://www.abapgit.org' ##NO_TEXT.
-    CONSTANTS c_package_abapgit  TYPE devclass VALUE '$ABAPGIT'.
+    CONSTANTS c_abapgit_wikipage TYPE string
-    CONSTANTS c_package_plugins  TYPE devclass VALUE '$ABAPGIT_PLUGINS'.
+      VALUE 'https://github.com/larshp/abapGit/wiki'.
-    CONSTANTS c_abapgit_url      TYPE string VALUE 'https://github.com/larshp/abapGit.git'.
+    CONSTANTS c_package_abapgit  TYPE devclass
-    CONSTANTS c_plugins_url      TYPE string VALUE 'https://github.com/larshp/abapGit-plugins.git'.
+      VALUE '$ABAPGIT'.
+    CONSTANTS c_package_plugins  TYPE devclass
+      VALUE '$ABAPGIT_PLUGINS'.
+    CONSTANTS c_abapgit_url      TYPE string
+      VALUE 'https://github.com/larshp/abapGit.git'.
+    CONSTANTS c_plugins_url      TYPE string
+      VALUE 'https://github.com/larshp/abapGit-plugins.git'.
 
     CLASS-METHODS open_abapgit_homepage
       RAISING lcx_exception.

src/zabapgit_services_db.prog.abap

@@ -32,8 +32,7 @@ CLASS lcl_services_db IMPLEMENTATION.
       text_button_2         = 'Cancel'
       icon_button_2         = 'ICON_CANCEL'
       default_button        = '2'
-      display_cancel_button = abap_false
+      display_cancel_button = abap_false ).                 "#EC NOTEXT
-    ).  "#EC NOTEXT
 
     IF lv_answer = '2'.
       RAISE EXCEPTION TYPE lcx_cancel.

src/zabapgit_services_git.prog.abap

@@ -63,8 +63,7 @@ CLASS lcl_services_git IMPLEMENTATION.
       text_button_2         = 'Cancel'
       icon_button_2         = 'ICON_CANCEL'
       default_button        = '2'
-      display_cancel_button = abap_false
+      display_cancel_button = abap_false ).                 "#EC NOTEXT
-    ).  "#EC NOTEXT
 
     IF lv_answer = '2'.
       RAISE EXCEPTION TYPE lcx_cancel.

src/zabapgit_services_repo.prog.abap

@@ -105,8 +105,7 @@ CLASS lcl_services_repo IMPLEMENTATION.
       text_button_2         = 'Cancel'
       icon_button_2         = 'ICON_CANCEL'
       default_button        = '2'
-      display_cancel_button = abap_false
+      display_cancel_button = abap_false ).                 "#EC NOTEXT
-    ).  "#EC NOTEXT
 
     IF lv_answer = '2'.
       RAISE EXCEPTION TYPE lcx_cancel.
@@ -149,8 +148,7 @@ CLASS lcl_services_repo IMPLEMENTATION.
         text_button_2         = 'Cancel'
         icon_button_2         = 'ICON_CANCEL'
         default_button        = '2'
-        display_cancel_button = abap_false
+        display_cancel_button = abap_false ).               "#EC NOTEXT
-      ).  "#EC NOTEXT
 
       IF lv_answer = '2'.
         RAISE EXCEPTION TYPE lcx_cancel.
@@ -199,8 +197,7 @@ CLASS lcl_services_repo IMPLEMENTATION.
       text_button_2         = 'Cancel'
       icon_button_2         = 'ICON_CANCEL'
       default_button        = '2'
-      display_cancel_button = abap_false
+      display_cancel_button = abap_false ).                 "#EC NOTEXT
-    ).  "#EC NOTEXT
 
     IF lv_answer = '2'.
       RAISE EXCEPTION TYPE lcx_cancel.
@@ -267,7 +264,8 @@ CLASS lcl_services_repo IMPLEMENTATION.
           lv_question TYPE string,
           lo_repo     TYPE REF TO lcl_repo.
 
-    lo_repo ?= lcl_app=>repo_srv( )->get( iv_key ).
+
+    lo_repo = lcl_app=>repo_srv( )->get( iv_key ).
 
     lv_question =  'This will rebuild and overwrite local repo checksums.'.
 
@@ -308,11 +306,11 @@ CLASS lcl_services_repo IMPLEMENTATION.
 
     CALL FUNCTION 'RS_TOOL_ACCESS'
       EXPORTING
-         OPERATION       = 'SHOW'
+        operation       = 'SHOW'
-         IN_NEW_WINDOW   = 'X'
+        in_new_window   = 'X'
-         OBJECT_NAME     = iv_package
+        object_name     = iv_package
-         OBJECT_TYPE     = 'DEVC'
+        object_type     = 'DEVC'
-         WITH_OBJECTLIST = 'X'.
+        with_objectlist = 'X'.
 
   ENDMETHOD.  " open_se80.
 

src/zabapgit_syntax_highlighter.prog.abap

@@ -197,8 +197,7 @@ CLASS lcl_syntax_highlighter IMPLEMENTATION.
 
     FIELD-SYMBOLS:
       <regex>  LIKE LINE OF mt_rules,
-      <result> TYPE match_result,
+      <result> TYPE match_result.
-      <match>  TYPE ty_match.
 
     CLEAR et_matches.
 
@@ -651,8 +650,7 @@ CLASS ltcl_syntax_cases DEFINITION FINAL
 
     METHODS:
       do_test IMPORTING iv_line     TYPE string
-                        iv_filename TYPE string
+                        iv_filename TYPE string,
-              RETURNING VALUE(ro_instance) TYPE REF TO lcl_syntax_highlighter,
       test_abap_01 FOR TESTING,
       test_abap_02 FOR TESTING,
       test_abap_03 FOR TESTING,

src/zabapgit_unit_test.prog.abap

@@ -1839,7 +1839,6 @@ CLASS ltcl_file_status IMPLEMENTATION.
     DATA: lt_local       TYPE ty_files_item_tt,
           lt_remote      TYPE ty_files_tt,
           lt_state       TYPE ty_file_signatures_tt,
-          lt_tadir       TYPE ty_tadir_tt,
           lt_results     TYPE ty_results_tt,
           lt_results_exp TYPE ty_results_tt.
 
@@ -2185,21 +2184,21 @@ CLASS ltcl_persistence_settings IMPLEMENTATION.
         lcl_app=>db( )->delete(
           iv_type       = 'SETTINGS'
           iv_value      = 'PROXY_URL' ).
-      CATCH cx_static_check.
+      CATCH cx_static_check ##NO_HANDLER.
         "If entry didn't exist, that's okay
     ENDTRY.
     TRY.
         lcl_app=>db( )->delete(
           iv_type       = 'SETTINGS'
           iv_value      = 'PROXY_PORT' ).
-      CATCH cx_static_check.
+      CATCH cx_static_check ##NO_HANDLER.
         "If entry didn't exist, that's okay
     ENDTRY.
     TRY.
         lcl_app=>db( )->delete(
           iv_type       = 'SETTINGS'
           iv_value      = 'CRIT_TESTS' ).
-      CATCH cx_static_check.
+      CATCH cx_static_check ##NO_HANDLER.
         "If entry didn't exist, that's okay
     ENDTRY.