SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-05-01 12:20:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactoring, delete unused variables and methods (#3203)

Browse Source 
* zlib

* xml

* processor

* shi5

* remove unused filter parameter

* pinf cleanup

* ssfo delete empty method

* highlighter

* gui page res, remove unused

* remove unused in diff class

* adt link

* gui, remove 2 unused parameters

* branch overview
This commit is contained in:
Lars Hvam 2020-02-09 09:38:17 +01:00 committed by GitHub
parent 136dfaf8d3
commit eb7e819b25
15 changed files with 130 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/git/zcl_abapgit_git_transport.clas.abap
View File

@ -31,7 +31,6 @@ CLASS zcl_abapgit_git_transport DEFINITION
CLASS-METHODS branches
IMPORTING
!iv_url TYPE string
!iv_filter TYPE abap_bool DEFAULT abap_true
RETURNING
VALUE(ro_branch_list) TYPE REF TO zcl_abapgit_git_branch_list
RAISING

10
src/objects/zcl_abapgit_object_pinf.clas.locals_def.abap
View File

@ -2,8 +2,6 @@ INTERFACE lif_package_interface_facade.
METHODS:
get_elements
IMPORTING
iv_with_deleted_elements TYPE flag DEFAULT 'X'
EXPORTING
et_elements TYPE tpak_package_interf_elem_list
RAISING
@ -16,9 +14,6 @@ INTERFACE lif_package_interface_facade.
zcx_abapgit_exception,
save_elements
IMPORTING
iv_transport_request TYPE trkorr OPTIONAL
iv_suppress_dialog TYPE flag DEFAULT ' '
RAISING
zcx_abapgit_exception,
@ -35,15 +30,10 @@ INTERFACE lif_package_interface_facade.
zcx_abapgit_exception,
delete
IMPORTING
iv_suppress_dialog TYPE flag DEFAULT abap_false
RAISING
zcx_abapgit_exception,
save
IMPORTING
iv_transport_request TYPE trkorr OPTIONAL
iv_suppress_dialog TYPE flag DEFAULT ' '
RAISING
zcx_abapgit_exception,

11
src/objects/zcl_abapgit_object_shi5.clas.abap
View File

@ -26,7 +26,7 @@ ENDCLASS.
CLASS zcl_abapgit_object_shi5 IMPLEMENTATION.
CLASS ZCL_ABAPGIT_OBJECT_SHI5 IMPLEMENTATION.
METHOD constructor.
@ -138,12 +138,7 @@ CLASS zcl_abapgit_object_shi5 IMPLEMENTATION.
METHOD zif_abapgit_object~serialize.
DATA: ls_extension TYPE ty_extension,
lt_struc_id TYPE STANDARD TABLE OF hier_guid,
lv_struc_id TYPE hier_guid,
lt_nodes TYPE TABLE OF hier_iface,
lt_texts TYPE TABLE OF hier_texts,
lt_refs TYPE TABLE OF hier_ref.
DATA: ls_extension TYPE ty_extension.
CALL FUNCTION 'STREE_EXTENSION_EXISTS'
EXPORTING
@ -163,6 +158,4 @@ CLASS zcl_abapgit_object_shi5 IMPLEMENTATION.
ig_data = ls_extension ).
ENDMETHOD.
ENDCLASS.

54
src/objects/zcl_abapgit_object_ssfo.clas.abap
View File

@ -6,24 +6,35 @@ CLASS zcl_abapgit_object_ssfo DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje
PROTECTED SECTION.
PRIVATE SECTION.
TYPES: ty_string_range TYPE RANGE OF string.
CLASS-DATA: gt_range_node_codes TYPE ty_string_range.
CONSTANTS: attrib_abapgit_leadig_spaces TYPE string VALUE 'abapgit-leadig-spaces' ##NO_TEXT.
TYPES:
ty_string_range TYPE RANGE OF string .
METHODS fix_ids IMPORTING ii_xml_doc TYPE REF TO if_ixml_document.
METHODS set_attribute_leading_spaces IMPORTING iv_name TYPE string
ii_node TYPE REF TO if_ixml_node
CHANGING cv_within_code_section TYPE abap_bool.
METHODS handle_attrib_leading_spaces IMPORTING iv_name TYPE string
ii_node TYPE REF TO if_ixml_node
CHANGING cv_within_code_section TYPE abap_bool.
METHODS get_range_node_codes RETURNING VALUE(rt_range_node_codes) TYPE ty_string_range.
METHODS code_item_section_handling IMPORTING iv_name TYPE string
ii_node TYPE REF TO if_ixml_node
EXPORTING ei_code_item_element TYPE REF TO if_ixml_element
CHANGING cv_within_code_section TYPE abap_bool
RAISING zcx_abapgit_exception.
CLASS-DATA gt_range_node_codes TYPE ty_string_range .
CONSTANTS attrib_abapgit_leadig_spaces TYPE string VALUE 'abapgit-leadig-spaces' ##NO_TEXT.
METHODS fix_ids
IMPORTING
!ii_xml_doc TYPE REF TO if_ixml_document .
METHODS handle_attrib_leading_spaces
IMPORTING
!iv_name TYPE string
!ii_node TYPE REF TO if_ixml_node
CHANGING
!cv_within_code_section TYPE abap_bool .
METHODS get_range_node_codes
RETURNING
VALUE(rt_range_node_codes) TYPE ty_string_range .
METHODS code_item_section_handling
IMPORTING
!iv_name TYPE string
!ii_node TYPE REF TO if_ixml_node
EXPORTING
!ei_code_item_element TYPE REF TO if_ixml_element
CHANGING
!cv_within_code_section TYPE abap_bool
RAISING
zcx_abapgit_exception .
ENDCLASS.
@ -179,13 +190,6 @@ CLASS ZCL_ABAPGIT_OBJECT_SSFO IMPLEMENTATION.
ENDMETHOD.
METHOD set_attribute_leading_spaces.
RETURN.
ENDMETHOD.
METHOD zif_abapgit_object~changed_by.
SELECT SINGLE lastuser FROM stxfadm INTO rv_user
@ -439,10 +443,6 @@ CLASS ZCL_ABAPGIT_OBJECT_SSFO IMPLEMENTATION.
OR lv_name = 'LASTUSER'.
li_node->set_value( 'DUMMY' ).
ENDIF.
set_attribute_leading_spaces( EXPORTING iv_name = lv_name
ii_node = li_node
CHANGING cv_within_code_section = lv_within_code_section ).
li_node = li_iterator->get_next( ).
ENDWHILE.

5
src/objects/zcl_abapgit_objects_super.clas.abap
View File

@ -85,11 +85,12 @@ CLASS zcl_abapgit_objects_super DEFINITION PUBLIC ABSTRACT.
RAISING
zcx_abapgit_exception .
PRIVATE SECTION.
ENDCLASS.
CLASS zcl_abapgit_objects_super IMPLEMENTATION.
CLASS ZCL_ABAPGIT_OBJECTS_SUPER IMPLEMENTATION.
METHOD check_timestamp.
@ -205,7 +206,6 @@ CLASS zcl_abapgit_objects_super IMPLEMENTATION.
ENDMETHOD.
METHOD get_metadata.
DATA: lv_class TYPE string.
@ -260,7 +260,6 @@ CLASS zcl_abapgit_objects_super IMPLEMENTATION.
iv_obj_name = iv_obj_name
iv_obj_type = iv_obj_type
iv_sub_obj_name = iv_sub_obj_name
iv_sub_obj_type = iv_sub_obj_type
iv_line_number = iv_line_number ).
cl_gui_frontend_services=>execute(

3
src/syntax/zcl_abapgit_syntax_highlighter.clas.testclasses.abap
View File

@ -12,8 +12,7 @@ CLASS ltcl_syntax_cases DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS
DATA:
mt_after_parse TYPE zcl_abapgit_syntax_highlighter=>ty_match_tt,
mt_after_order TYPE zcl_abapgit_syntax_highlighter=>ty_match_tt,
mt_after_extend TYPE zcl_abapgit_syntax_highlighter=>ty_match_tt,
ms_match TYPE zcl_abapgit_syntax_highlighter=>ty_match.
mt_after_extend TYPE zcl_abapgit_syntax_highlighter=>ty_match_tt.
METHODS:
do_test IMPORTING iv_line TYPE string

135
src/ui/core/zcl_abapgit_gui.clas.abap
View File

@ -106,20 +106,17 @@ CLASS zcl_abapgit_gui DEFINITION
METHODS handle_action
IMPORTING
iv_action TYPE c
iv_frame TYPE c OPTIONAL
iv_getdata TYPE c OPTIONAL
it_postdata TYPE cnht_post_data_tab OPTIONAL
it_query_table TYPE cnht_query_table OPTIONAL.
it_postdata TYPE cnht_post_data_tab OPTIONAL.
METHODS handle_error
IMPORTING
ix_exception TYPE REF TO zcx_abapgit_exception.
ENDCLASS.
CLASS zcl_abapgit_gui IMPLEMENTATION.
CLASS ZCL_ABAPGIT_GUI IMPLEMENTATION.
METHOD back.
@ -154,6 +151,45 @@ CLASS zcl_abapgit_gui IMPLEMENTATION.
ENDMETHOD.
METHOD cache_asset.
DATA: lv_xstr TYPE xstring,
lt_xdata TYPE lvc_t_mime,
lv_size TYPE int4.
ASSERT iv_text IS SUPPLIED OR iv_xdata IS SUPPLIED.
IF iv_text IS SUPPLIED. " String input
lv_xstr = zcl_abapgit_convert=>string_to_xstring( iv_text ).
ELSE. " Raw input
lv_xstr = iv_xdata.
ENDIF.
zcl_abapgit_convert=>xstring_to_bintab(
EXPORTING
iv_xstr = lv_xstr
IMPORTING
ev_size = lv_size
et_bintab = lt_xdata ).
mo_html_viewer->load_data(
EXPORTING
type = iv_type
subtype = iv_subtype
size = lv_size
url = iv_url
IMPORTING
assigned_url = rv_url
CHANGING
data_table = lt_xdata
EXCEPTIONS
OTHERS = 1 ) ##NO_TEXT.
ASSERT sy-subrc = 0. " Image data error
ENDMETHOD.
METHOD cache_html.
rv_url = cache_asset(
@ -314,14 +350,35 @@ CLASS zcl_abapgit_gui IMPLEMENTATION.
ENDMETHOD.
METHOD handle_error.
DATA: li_gui_error_handler TYPE REF TO zif_abapgit_gui_error_handler,
lx_exception TYPE REF TO cx_root.
TRY.
li_gui_error_handler ?= mi_cur_page.
IF li_gui_error_handler->handle_error( ix_exception ) = abap_true.
" We rerender the current page to display the error box
render( ).
ELSE.
MESSAGE ix_exception TYPE 'S' DISPLAY LIKE 'E'.
ENDIF.
CATCH zcx_abapgit_exception cx_sy_move_cast_error INTO lx_exception.
" In case of fire we just fallback to plain old message
MESSAGE lx_exception TYPE 'S' DISPLAY LIKE 'E'.
ENDTRY.
ENDMETHOD.
METHOD on_event.
handle_action(
iv_action = action
iv_frame = frame
iv_getdata = getdata
it_postdata = postdata
it_query_table = query_table ).
it_postdata = postdata ).
ENDMETHOD.
@ -382,66 +439,4 @@ CLASS zcl_abapgit_gui IMPLEMENTATION.
SET HANDLER me->on_event FOR mo_html_viewer.
ENDMETHOD.
METHOD cache_asset.
DATA: lv_xstr TYPE xstring,
lt_xdata TYPE lvc_t_mime,
lv_size TYPE int4.
ASSERT iv_text IS SUPPLIED OR iv_xdata IS SUPPLIED.
IF iv_text IS SUPPLIED. " String input
lv_xstr = zcl_abapgit_convert=>string_to_xstring( iv_text ).
ELSE. " Raw input
lv_xstr = iv_xdata.
ENDIF.
zcl_abapgit_convert=>xstring_to_bintab(
EXPORTING
iv_xstr = lv_xstr
IMPORTING
ev_size = lv_size
et_bintab = lt_xdata ).
mo_html_viewer->load_data(
EXPORTING
type = iv_type
subtype = iv_subtype
size = lv_size
url = iv_url
IMPORTING
assigned_url = rv_url
CHANGING
data_table = lt_xdata
EXCEPTIONS
OTHERS = 1 ) ##NO_TEXT.
ASSERT sy-subrc = 0. " Image data error
ENDMETHOD.
METHOD handle_error.
DATA: li_gui_error_handler TYPE REF TO zif_abapgit_gui_error_handler,
lx_exception TYPE REF TO cx_root.
TRY.
li_gui_error_handler ?= mi_cur_page.
IF li_gui_error_handler->handle_error( ix_exception ) = abap_true.
" We rerender the current page to display the error box
render( ).
ELSE.
MESSAGE ix_exception TYPE 'S' DISPLAY LIKE 'E'.
ENDIF.
CATCH zcx_abapgit_exception cx_sy_move_cast_error INTO lx_exception.
" In case of fire we just fallback to plain old message
MESSAGE lx_exception TYPE 'S' DISPLAY LIKE 'E'.
ENDTRY.
ENDMETHOD.
ENDCLASS.

4
src/ui/core/zcl_abapgit_gui_css_processor.clas.testclasses.abap
View File

@ -26,8 +26,6 @@ CLASS ltcl_test_base IMPLEMENTATION.
ENDMETHOD.
METHOD add_file.
DATA: ls_asset TYPE zif_abapgit_gui_asset_manager=>ty_web_asset.
mo_asset_manager->register_asset(
iv_url = iv_url
iv_type = 'text/css'
@ -75,7 +73,7 @@ CLASS ltcl_single_file IMPLEMENTATION.
TRY.
mo_cut->process( ).
cl_abap_unit_assert=>fail( ). " Assetman fails on empty content
CATCH zcx_abapgit_exception.
CATCH zcx_abapgit_exception ##NO_HANDLER.
ENDTRY.
ENDMETHOD.

6
src/ui/zcl_abapgit_gui_page_merge_res.clas.abap
View File

@ -61,8 +61,6 @@ CLASS zcl_abapgit_gui_page_merge_res DEFINITION
RAISING
zcx_abapgit_exception .
METHODS build_menu
IMPORTING
VALUE(iv_with_conflict) TYPE abap_bool OPTIONAL
RETURNING
VALUE(ro_menu) TYPE REF TO zcl_abapgit_html_toolbar .
METHODS is_binary
@ -97,7 +95,6 @@ CLASS zcl_abapgit_gui_page_merge_res DEFINITION
METHODS render_line_split
IMPORTING
!is_diff_line TYPE zif_abapgit_definitions=>ty_diff
!iv_fstate TYPE char1
RETURNING
VALUE(ro_html) TYPE REF TO zcl_abapgit_html .
METHODS render_table_head
@ -394,8 +391,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_MERGE_RES IMPLEMENTATION.
CONDENSE <ls_diff>-new_num. "get rid of leading spaces
CONDENSE <ls_diff>-old_num.
ro_html->add( render_line_split( is_diff_line = <ls_diff>
iv_fstate = is_diff-fstate ) ).
ro_html->add( render_line_split( is_diff_line = <ls_diff> ) ).
ENDLOOP.

28
src/utils/zcl_abapgit_adt_link.clas.abap
View File

@ -1,17 +1,20 @@
CLASS zcl_abapgit_adt_link DEFINITION
PUBLIC FINAL.
PUBLIC
FINAL
CREATE PUBLIC .
PUBLIC SECTION.
CLASS-METHODS:
generate
IMPORTING iv_obj_name TYPE zif_abapgit_definitions=>ty_item-obj_name
iv_obj_type TYPE zif_abapgit_definitions=>ty_item-obj_type
iv_sub_obj_name TYPE zif_abapgit_definitions=>ty_item-obj_name OPTIONAL
iv_sub_obj_type TYPE zif_abapgit_definitions=>ty_item-obj_type OPTIONAL
iv_line_number TYPE i OPTIONAL
RETURNING VALUE(rv_result) TYPE string
RAISING zcx_abapgit_exception.
CLASS-METHODS generate
IMPORTING
!iv_obj_name TYPE zif_abapgit_definitions=>ty_item-obj_name
!iv_obj_type TYPE zif_abapgit_definitions=>ty_item-obj_type
!iv_sub_obj_name TYPE zif_abapgit_definitions=>ty_item-obj_name OPTIONAL
!iv_line_number TYPE i OPTIONAL
RETURNING
VALUE(rv_result) TYPE string
RAISING
zcx_abapgit_exception .
PROTECTED SECTION.
PRIVATE SECTION.
CLASS-METHODS:
@ -37,7 +40,8 @@ ENDCLASS.
CLASS zcl_abapgit_adt_link IMPLEMENTATION.
CLASS ZCL_ABAPGIT_ADT_LINK IMPLEMENTATION.
METHOD generate.
@ -154,6 +158,7 @@ CLASS zcl_abapgit_adt_link IMPLEMENTATION.
ENDMETHOD.
METHOD is_adt_jump_possible.
DATA: lo_wb_request TYPE REF TO cl_wb_request,
@ -196,5 +201,4 @@ CLASS zcl_abapgit_adt_link IMPLEMENTATION.
ENDTRY.
ENDMETHOD.
ENDCLASS.

3
src/utils/zcl_abapgit_diff.clas.testclasses.abap
View File

@ -6,8 +6,7 @@ CLASS ltcl_diff DEFINITION FOR TESTING
PRIVATE SECTION.
DATA: mt_new TYPE TABLE OF string,
mt_old TYPE TABLE OF string,
mt_expected TYPE zif_abapgit_definitions=>ty_diffs_tt,
ms_expected LIKE LINE OF mt_expected.
mt_expected TYPE zif_abapgit_definitions=>ty_diffs_tt.
METHODS:
add_new IMPORTING iv_new TYPE string,

1
src/xml/zcl_abapgit_xml.clas.testclasses.abap
View File

@ -74,7 +74,6 @@ CLASS ltcl_xml IMPLEMENTATION.
DATA: li_element TYPE REF TO if_ixml_element,
li_ostream TYPE REF TO if_ixml_ostream,
li_renderer TYPE REF TO if_ixml_renderer,
li_streamfactory TYPE REF TO if_ixml_stream_factory.
li_element = mo_xml->mi_xml_doc->find_from_path( |/{ mo_xml->c_abapgit_tag }/{ iv_name }| ).

3
src/zcl_abapgit_branch_overview.clas.abap
View File

@ -460,9 +460,6 @@ CLASS ZCL_ABAPGIT_BRANCH_OVERVIEW IMPLEMENTATION.
lt_temp LIKE it_commits.
FIELD-SYMBOLS: <ls_branch> LIKE LINE OF mt_branches,
<ls_new> LIKE LINE OF rt_commits,
<ls_temp> LIKE LINE OF lt_temp,
<ls_temp_end> LIKE LINE OF lt_temp,
<ls_commit> LIKE LINE OF it_commits.
LOOP AT mt_branches ASSIGNING <ls_branch>.

6
src/zlib/zcl_abapgit_zlib.clas.abap
View File

@ -133,9 +133,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
METHOD decompress.
DATA: lv_x TYPE x LENGTH 1,
lv_symbol TYPE i,
lv_bfinal TYPE c LENGTH 1,
DATA: lv_bfinal TYPE c LENGTH 1,
lv_btype TYPE c LENGTH 2.
@ -447,7 +445,7 @@ CLASS ZCL_ABAPGIT_ZLIB IMPLEMENTATION.
METHOD not_compressed.
DATA: lv_len TYPE i,
lv_nlen TYPE i.
lv_nlen TYPE i ##NEEDED.
go_stream->take_bits( 5 ).

3
src/zlib/zcl_abapgit_zlib.clas.testclasses.abap
View File

@ -52,8 +52,7 @@ CLASS ltcl_zlib IMPLEMENTATION.
DATA: ls_data TYPE zcl_abapgit_zlib=>ty_decompress,
lv_compressed TYPE xstring,
lv_decoded TYPE xstring,
lv_hex TYPE xstring.
lv_decoded TYPE xstring.
lv_compressed = |75555D6FE246147DF7AFB8521F1610A0AA8F911A| &&