From 75812fb17b012985a310c09eb9592fa7251d6ece Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Sat, 11 Jan 2020 09:24:36 +0100 Subject: [PATCH] less prefixes (#3144) --- abaplint.json | 5 +++- src/git/zcl_abapgit_git_pack.clas.abap | 2 +- src/objects/zcl_abapgit_object_form.clas.abap | 26 +++++++++---------- src/objects/zcl_abapgit_object_msag.clas.abap | 2 +- src/objects/zcl_abapgit_object_view.clas.abap | 8 +++--- src/objects/zcl_abapgit_object_wapa.clas.abap | 2 +- .../zcl_abapgit_objects_program.clas.abap | 2 +- src/ui/zcl_abapgit_gui_page_diff.clas.abap | 2 +- .../zcl_abapgit_gui_page_repo_over.clas.abap | 10 +++---- src/ui/zcl_abapgit_log_viewer.clas.abap | 4 +-- src/ui/zcl_abapgit_tag_popups.clas.abap | 2 +- src/zcl_abapgit_objects.clas.abap | 2 +- 12 files changed, 35 insertions(+), 32 deletions(-) diff --git a/abaplint.json b/abaplint.json index a4ea73797..296b2bee2 100644 --- a/abaplint.json +++ b/abaplint.json @@ -56,7 +56,10 @@ "globalMacros": [] }, "rules": { - "prefix_is_current_class": false, + "prefix_is_current_class": { + "enabled": true, + "omitMeInstanceCalls": false + }, "allowed_object_naming": true, "check_comments": false, "fully_type_constants": true, diff --git a/src/git/zcl_abapgit_git_pack.clas.abap b/src/git/zcl_abapgit_git_pack.clas.abap index 687120e4e..b59ce8777 100644 --- a/src/git/zcl_abapgit_git_pack.clas.abap +++ b/src/git/zcl_abapgit_git_pack.clas.abap @@ -79,7 +79,7 @@ CLASS zcl_abapgit_git_pack DEFINITION VALUE(rv_data) TYPE xstring . CLASS-METHODS encode_tag IMPORTING - !is_tag TYPE zcl_abapgit_git_pack=>ty_tag + !is_tag TYPE ty_tag RETURNING VALUE(rv_data) TYPE xstring RAISING diff --git a/src/objects/zcl_abapgit_object_form.clas.abap b/src/objects/zcl_abapgit_object_form.clas.abap index fccdadc24..aeffa2478 100644 --- a/src/objects/zcl_abapgit_object_form.clas.abap +++ b/src/objects/zcl_abapgit_object_form.clas.abap @@ -53,26 +53,26 @@ CLASS zcl_abapgit_object_form DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje METHODS _save_form IMPORTING - it_lines TYPE zcl_abapgit_object_form=>tyt_lines + it_lines TYPE tyt_lines CHANGING - cs_form_data TYPE zcl_abapgit_object_form=>tys_form_data. + cs_form_data TYPE tys_form_data. METHODS extract_tdlines IMPORTING - is_form_data TYPE zcl_abapgit_object_form=>tys_form_data + is_form_data TYPE tys_form_data RETURNING - VALUE(rt_lines) TYPE zcl_abapgit_object_form=>tyt_lines + VALUE(rt_lines) TYPE tyt_lines RAISING zcx_abapgit_exception. METHODS _clear_changed_fields CHANGING - cs_form_data TYPE zcl_abapgit_object_form=>tys_form_data. + cs_form_data TYPE tys_form_data. METHODS compress_lines IMPORTING - is_form_data TYPE zcl_abapgit_object_form=>tys_form_data - it_lines TYPE zcl_abapgit_object_form=>tyt_lines + is_form_data TYPE tys_form_data + it_lines TYPE tyt_lines RAISING zcx_abapgit_exception. @@ -80,20 +80,20 @@ CLASS zcl_abapgit_object_form DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje IMPORTING iv_object_name TYPE zif_abapgit_definitions=>ty_item-obj_name RETURNING - VALUE(rt_text_header) TYPE zcl_abapgit_object_form=>tyt_text_header. + VALUE(rt_text_header) TYPE tyt_text_header. METHODS _read_form IMPORTING - is_text_header TYPE zcl_abapgit_object_form=>tys_text_header + is_text_header TYPE tys_text_header EXPORTING ev_form_found TYPE abap_bool - es_form_data TYPE zcl_abapgit_object_form=>tys_form_data - et_lines TYPE zcl_abapgit_object_form=>tyt_lines. + es_form_data TYPE tys_form_data + et_lines TYPE tyt_lines. METHODS _sort_tdlines_by_windows CHANGING - ct_form_windows TYPE zcl_abapgit_object_form=>tys_form_data-windows - ct_lines TYPE zcl_abapgit_object_form=>tyt_lines. + ct_form_windows TYPE tys_form_data-windows + ct_lines TYPE tyt_lines. METHODS order_check_and_insert RAISING diff --git a/src/objects/zcl_abapgit_object_msag.clas.abap b/src/objects/zcl_abapgit_object_msag.clas.abap index aa4183a5d..e3e55e2c2 100644 --- a/src/objects/zcl_abapgit_object_msag.clas.abap +++ b/src/objects/zcl_abapgit_object_msag.clas.abap @@ -31,7 +31,7 @@ CLASS zcl_abapgit_object_msag DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje zcx_abapgit_exception . METHODS serialize_longtexts_msag IMPORTING - !it_t100 TYPE zcl_abapgit_object_msag=>tty_t100 + !it_t100 TYPE tty_t100 !io_xml TYPE REF TO zcl_abapgit_xml_output RAISING zcx_abapgit_exception . diff --git a/src/objects/zcl_abapgit_object_view.clas.abap b/src/objects/zcl_abapgit_object_view.clas.abap index be512c8ab..8d52ad8d0 100644 --- a/src/objects/zcl_abapgit_object_view.clas.abap +++ b/src/objects/zcl_abapgit_object_view.clas.abap @@ -32,10 +32,10 @@ CLASS zcl_abapgit_object_view DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje EXPORTING es_dd25v TYPE dd25v es_dd09l TYPE dd09l - et_dd26v TYPE zcl_abapgit_object_view=>tty_dd26v - et_dd27p TYPE zcl_abapgit_object_view=>tty_dd27p - et_dd28j TYPE zcl_abapgit_object_view=>tty_dd28j - et_dd28v TYPE zcl_abapgit_object_view=>tty_dd28v + et_dd26v TYPE tty_dd26v + et_dd27p TYPE tty_dd27p + et_dd28j TYPE tty_dd28j + et_dd28v TYPE tty_dd28v RAISING zcx_abapgit_exception. diff --git a/src/objects/zcl_abapgit_object_wapa.clas.abap b/src/objects/zcl_abapgit_object_wapa.clas.abap index 042ed92c6..c2eb29b15 100644 --- a/src/objects/zcl_abapgit_object_wapa.clas.abap +++ b/src/objects/zcl_abapgit_object_wapa.clas.abap @@ -45,7 +45,7 @@ CLASS zcl_abapgit_object_wapa DEFINITION PUBLIC INHERITING FROM zcl_abapgit_obje delete_superfluous_pages IMPORTING it_local_pages TYPE o2pagelist - it_remote_pages TYPE zcl_abapgit_object_wapa=>ty_pages_tt + it_remote_pages TYPE ty_pages_tt RAISING zcx_abapgit_exception. diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap index b59221a25..ba5e1dcda 100644 --- a/src/objects/zcl_abapgit_objects_program.clas.abap +++ b/src/objects/zcl_abapgit_objects_program.clas.abap @@ -159,7 +159,7 @@ CLASS zcl_abapgit_objects_program DEFINITION PUBLIC INHERITING FROM zcl_abapgit_ CLASS-METHODS auto_correct_cua_adm IMPORTING - is_cua TYPE zcl_abapgit_objects_program=>ty_cua + is_cua TYPE ty_cua CHANGING cs_adm TYPE rsmpe_adm. diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/zcl_abapgit_gui_page_diff.clas.abap index 45821074f..ec0a05283 100644 --- a/src/ui/zcl_abapgit_gui_page_diff.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_diff.clas.abap @@ -128,7 +128,7 @@ CLASS zcl_abapgit_gui_page_diff DEFINITION METHODS render_patch_head IMPORTING io_html TYPE REF TO zcl_abapgit_html - is_diff TYPE zcl_abapgit_gui_page_diff=>ty_file_diff. + is_diff TYPE ty_file_diff. METHODS apply_patch_for IMPORTING iv_filename TYPE string diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap index 9332cbb11..13736cb56 100644 --- a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap @@ -57,13 +57,13 @@ CLASS zcl_abapgit_gui_page_repo_over DEFINITION apply_filter CHANGING - ct_overview TYPE zcl_abapgit_gui_page_repo_over=>tty_overview, + ct_overview TYPE tty_overview, map_repo_list_to_overview IMPORTING it_repo_list TYPE zif_abapgit_persistence=>tt_repo RETURNING - VALUE(rt_overview) TYPE zcl_abapgit_gui_page_repo_over=>tty_overview + VALUE(rt_overview) TYPE tty_overview RAISING zcx_abapgit_exception, @@ -74,19 +74,19 @@ CLASS zcl_abapgit_gui_page_repo_over DEFINITION render_table IMPORTING io_html TYPE REF TO zcl_abapgit_html - it_overview TYPE zcl_abapgit_gui_page_repo_over=>tty_overview, + it_overview TYPE tty_overview, render_table_body IMPORTING io_html TYPE REF TO zcl_abapgit_html - it_overview TYPE zcl_abapgit_gui_page_repo_over=>tty_overview, + it_overview TYPE tty_overview, render_header_bar IMPORTING io_html TYPE REF TO zcl_abapgit_html, apply_order_by - CHANGING ct_overview TYPE zcl_abapgit_gui_page_repo_over=>tty_overview. + CHANGING ct_overview TYPE tty_overview. ENDCLASS. diff --git a/src/ui/zcl_abapgit_log_viewer.clas.abap b/src/ui/zcl_abapgit_log_viewer.clas.abap index 8bd67a6df..61ca77eb1 100644 --- a/src/ui/zcl_abapgit_log_viewer.clas.abap +++ b/src/ui/zcl_abapgit_log_viewer.clas.abap @@ -65,7 +65,7 @@ CLASS zcl_abapgit_log_viewer DEFINITION goto_t100_message IMPORTING - is_log TYPE zcl_abapgit_log_viewer=>ty_log_out + is_log TYPE ty_log_out RAISING zcx_abapgit_exception, @@ -74,7 +74,7 @@ CLASS zcl_abapgit_log_viewer DEFINITION dispatch IMPORTING - is_log TYPE zcl_abapgit_log_viewer=>ty_log_out + is_log TYPE ty_log_out iv_column TYPE salv_de_column RAISING zcx_abapgit_exception, diff --git a/src/ui/zcl_abapgit_tag_popups.clas.abap b/src/ui/zcl_abapgit_tag_popups.clas.abap index c8c74e45d..ac333afc0 100644 --- a/src/ui/zcl_abapgit_tag_popups.clas.abap +++ b/src/ui/zcl_abapgit_tag_popups.clas.abap @@ -29,7 +29,7 @@ CLASS zcl_abapgit_tag_popups DEFINITION IMPORTING it_tags TYPE zif_abapgit_definitions=>ty_git_tag_list_tt RETURNING - VALUE(rt_tags_out) TYPE zcl_abapgit_tag_popups=>tty_tag_out, + VALUE(rt_tags_out) TYPE tty_tag_out, clean_up, diff --git a/src/zcl_abapgit_objects.clas.abap b/src/zcl_abapgit_objects.clas.abap index b7f74215b..754ee0896 100644 --- a/src/zcl_abapgit_objects.clas.abap +++ b/src/zcl_abapgit_objects.clas.abap @@ -39,7 +39,7 @@ CLASS zcl_abapgit_objects DEFINITION !iv_language TYPE spras !iv_serialize_master_lang_only TYPE abap_bool DEFAULT abap_false RETURNING - VALUE(rs_files_and_item) TYPE zcl_abapgit_objects=>ty_serialization + VALUE(rs_files_and_item) TYPE ty_serialization RAISING zcx_abapgit_exception . CLASS-METHODS deserialize