diff --git a/src/objects/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap index 904178b39..cd88d1702 100644 --- a/src/objects/zcl_abapgit_objects.clas.abap +++ b/src/objects/zcl_abapgit_objects.clas.abap @@ -172,7 +172,7 @@ CLASS zcl_abapgit_objects DEFINITION zcx_abapgit_exception . CLASS-METHODS deserialize_objects IMPORTING - !is_step TYPE zif_abapgit_definitions=>ty_step_data + !is_step TYPE zif_abapgit_objects=>ty_step_data !ii_log TYPE REF TO zif_abapgit_log CHANGING !ct_files TYPE zif_abapgit_definitions=>ty_file_signatures_tt @@ -217,12 +217,12 @@ CLASS zcl_abapgit_objects DEFINITION VALUE(rt_results) TYPE zif_abapgit_definitions=>ty_results_tt . CLASS-METHODS get_deserialize_steps RETURNING - VALUE(rt_steps) TYPE zif_abapgit_definitions=>ty_step_data_tt . + VALUE(rt_steps) TYPE zif_abapgit_objects=>ty_step_data_tt . ENDCLASS. -CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. +CLASS zcl_abapgit_objects IMPLEMENTATION. METHOD adjust_namespaces. @@ -582,14 +582,14 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. lv_path TYPE string, lt_items TYPE zif_abapgit_definitions=>ty_items_tt, lt_steps_id TYPE zif_abapgit_definitions=>ty_deserialization_step_tt, - lt_steps TYPE zif_abapgit_definitions=>ty_step_data_tt, + lt_steps TYPE zif_abapgit_objects=>ty_step_data_tt, lx_exc TYPE REF TO zcx_abapgit_exception. DATA: lo_folder_logic TYPE REF TO zcl_abapgit_folder_logic. FIELD-SYMBOLS: TYPE zif_abapgit_definitions=>ty_result, TYPE LINE OF zif_abapgit_definitions=>ty_deserialization_step_tt, - TYPE LINE OF zif_abapgit_definitions=>ty_step_data_tt, - TYPE LINE OF zif_abapgit_definitions=>ty_deserialization_tt. + TYPE LINE OF zif_abapgit_objects=>ty_step_data_tt, + TYPE LINE OF zif_abapgit_objects=>ty_deserialization_tt. lt_steps = get_deserialize_steps( ). @@ -910,7 +910,7 @@ CLASS ZCL_ABAPGIT_OBJECTS IMPLEMENTATION. METHOD get_deserialize_steps. - FIELD-SYMBOLS: TYPE LINE OF zif_abapgit_definitions=>ty_step_data_tt. + FIELD-SYMBOLS: TYPE LINE OF zif_abapgit_objects=>ty_step_data_tt. APPEND INITIAL LINE TO rt_steps ASSIGNING . -step_id = zif_abapgit_object=>gc_step_id-ddic. diff --git a/src/objects/zif_abapgit_objects.intf.abap b/src/objects/zif_abapgit_objects.intf.abap new file mode 100644 index 000000000..b74e40ad1 --- /dev/null +++ b/src/objects/zif_abapgit_objects.intf.abap @@ -0,0 +1,26 @@ +INTERFACE zif_abapgit_objects + PUBLIC. + + TYPES: + BEGIN OF ty_deserialization, + obj TYPE REF TO zif_abapgit_object, + xml TYPE REF TO zif_abapgit_xml_input, + package TYPE devclass, + item TYPE zif_abapgit_definitions=>ty_item, + END OF ty_deserialization . + TYPES: + ty_deserialization_tt TYPE STANDARD TABLE OF ty_deserialization WITH DEFAULT KEY . + TYPES: + BEGIN OF ty_step_data, + step_id TYPE zif_abapgit_definitions=>ty_deserialization_step, + order TYPE i, + descr TYPE string, + is_ddic TYPE abap_bool, + syntax_check TYPE abap_bool, + objects TYPE ty_deserialization_tt, + END OF ty_step_data . + TYPES: + ty_step_data_tt TYPE STANDARD TABLE OF ty_step_data + WITH DEFAULT KEY . + +ENDINTERFACE. diff --git a/src/objects/zif_abapgit_objects.intf.xml b/src/objects/zif_abapgit_objects.intf.xml new file mode 100644 index 000000000..7ddc8f0ce --- /dev/null +++ b/src/objects/zif_abapgit_objects.intf.xml @@ -0,0 +1,15 @@ + + + + + + ZIF_ABAPGIT_OBJECTS + E + abapGit: Objects + 2 + 1 + X + + + + diff --git a/src/ui/zcl_abapgit_gui_router.clas.abap b/src/ui/zcl_abapgit_gui_router.clas.abap index da1e41554..6d4a5ebc0 100644 --- a/src/ui/zcl_abapgit_gui_router.clas.abap +++ b/src/ui/zcl_abapgit_gui_router.clas.abap @@ -127,7 +127,7 @@ ENDCLASS. -CLASS zcl_abapgit_gui_router IMPLEMENTATION. +CLASS ZCL_ABAPGIT_GUI_ROUTER IMPLEMENTATION. METHOD abapgit_services_actions. @@ -226,7 +226,7 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. DATA: lv_key TYPE zif_abapgit_persistence=>ty_repo-key, lv_last_repo_key TYPE zif_abapgit_persistence=>ty_repo-key, - lt_repo_list TYPE zif_abapgit_definitions=>ty_repo_ref_tt. + lt_repo_list TYPE zif_abapgit_persistence=>ty_repos. lv_key = ii_event->query( )->get( 'KEY' ). @@ -234,7 +234,7 @@ CLASS zcl_abapgit_gui_router IMPLEMENTATION. CASE ii_event->mv_action. WHEN zcl_abapgit_gui=>c_action-go_home. lv_last_repo_key = zcl_abapgit_persistence_user=>get_instance( )->get_repo_show( ). - lt_repo_list = zcl_abapgit_repo_srv=>get_instance( )->list( ). + lt_repo_list = zcl_abapgit_persist_factory=>get_repo( )->list( ). IF lv_last_repo_key IS NOT INITIAL. CREATE OBJECT rs_handled-page TYPE zcl_abapgit_gui_page_repo_view diff --git a/src/ui/zcl_abapgit_services_abapgit.clas.abap b/src/ui/zcl_abapgit_services_abapgit.clas.abap index bdb975ce4..f4076dee4 100644 --- a/src/ui/zcl_abapgit_services_abapgit.clas.abap +++ b/src/ui/zcl_abapgit_services_abapgit.clas.abap @@ -60,7 +60,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_SERVICES_ABAPGIT IMPLEMENTATION. +CLASS zcl_abapgit_services_abapgit IMPLEMENTATION. METHOD check_sapgui. @@ -329,9 +329,9 @@ CLASS ZCL_ABAPGIT_SERVICES_ABAPGIT IMPLEMENTATION. ls_r_package LIKE LINE OF lt_r_package, lt_superpackages TYPE zif_abapgit_sap_package=>ty_devclass_tt, li_package TYPE REF TO zif_abapgit_sap_package, - lt_repo_list TYPE zif_abapgit_definitions=>ty_repo_ref_tt. + lt_repo_list TYPE zif_abapgit_repo_srv=>ty_repo_list. - FIELD-SYMBOLS: TYPE LINE OF zif_abapgit_definitions=>ty_repo_ref_tt, + FIELD-SYMBOLS: TYPE LINE OF zif_abapgit_repo_srv=>ty_repo_list, LIKE LINE OF lt_superpackages. li_package = zcl_abapgit_factory=>get_sap_package( iv_package ). diff --git a/src/zcl_abapgit_migrations.clas.abap b/src/zcl_abapgit_migrations.clas.abap index b28c62943..22c05fadb 100644 --- a/src/zcl_abapgit_migrations.clas.abap +++ b/src/zcl_abapgit_migrations.clas.abap @@ -17,12 +17,12 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_MIGRATIONS IMPLEMENTATION. +CLASS zcl_abapgit_migrations IMPLEMENTATION. METHOD local_dot_abapgit. - DATA: lt_repos TYPE zif_abapgit_definitions=>ty_repo_ref_tt, + DATA: lt_repos TYPE zif_abapgit_repo_srv=>ty_repo_list, lo_dot_abapgit TYPE REF TO zcl_abapgit_dot_abapgit. FIELD-SYMBOLS: LIKE LINE OF lt_repos. diff --git a/src/zcl_abapgit_repo_srv.clas.abap b/src/zcl_abapgit_repo_srv.clas.abap index 655cf5af2..68bf5d473 100644 --- a/src/zcl_abapgit_repo_srv.clas.abap +++ b/src/zcl_abapgit_repo_srv.clas.abap @@ -28,7 +28,7 @@ CLASS zcl_abapgit_repo_srv DEFINITION CLASS-DATA gi_ref TYPE REF TO zif_abapgit_repo_srv . DATA mv_init TYPE abap_bool VALUE abap_false ##NO_TEXT. - DATA mt_list TYPE zif_abapgit_definitions=>ty_repo_ref_tt . + DATA mt_list TYPE zif_abapgit_repo_srv=>ty_repo_list . METHODS determine_branch_name IMPORTING @@ -76,7 +76,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_REPO_SRV IMPLEMENTATION. +CLASS zcl_abapgit_repo_srv IMPLEMENTATION. METHOD add. @@ -336,7 +336,7 @@ CLASS ZCL_ABAPGIT_REPO_SRV IMPLEMENTATION. METHOD zif_abapgit_repo_srv~is_repo_installed. - DATA: lt_repo TYPE zif_abapgit_definitions=>ty_repo_ref_tt, + DATA: lt_repo TYPE zif_abapgit_repo_srv=>ty_repo_list, lo_repo TYPE REF TO zcl_abapgit_repo, lv_url TYPE string, lv_package TYPE devclass, diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index d49f6e8dd..0264f0168 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -32,8 +32,6 @@ INTERFACE zif_abapgit_definitions 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: - ty_repo_ref_tt TYPE STANDARD TABLE OF REF TO zcl_abapgit_repo WITH DEFAULT KEY . TYPES ty_git_branch_type TYPE c LENGTH 2 . TYPES: BEGIN OF ty_git_branch, @@ -359,32 +357,11 @@ INTERFACE zif_abapgit_definitions length TYPE lvc_outlen, END OF ty_alv_column, ty_alv_column_tt TYPE TABLE OF ty_alv_column WITH DEFAULT KEY. - TYPES: - BEGIN OF ty_deserialization, - obj TYPE REF TO zif_abapgit_object, - xml TYPE REF TO zif_abapgit_xml_input, - package TYPE devclass, - item TYPE ty_item, - END OF ty_deserialization . - TYPES: - ty_deserialization_tt TYPE STANDARD TABLE OF ty_deserialization WITH DEFAULT KEY . TYPES: ty_deserialization_step TYPE string. TYPES: ty_deserialization_step_tt TYPE STANDARD TABLE OF ty_deserialization_step WITH DEFAULT KEY . - TYPES: - BEGIN OF ty_step_data, - step_id TYPE ty_deserialization_step, - order TYPE i, - descr TYPE string, - is_ddic TYPE abap_bool, - syntax_check TYPE abap_bool, - objects TYPE ty_deserialization_tt, - END OF ty_step_data . - TYPES: - ty_step_data_tt TYPE STANDARD TABLE OF ty_step_data - WITH DEFAULT KEY . TYPES: ty_object_type_range TYPE RANGE OF trobjtype, ty_object_name_range TYPE RANGE OF sobj_name. diff --git a/src/zif_abapgit_exit.intf.abap b/src/zif_abapgit_exit.intf.abap index af1fabe55..b48d589e0 100644 --- a/src/zif_abapgit_exit.intf.abap +++ b/src/zif_abapgit_exit.intf.abap @@ -62,7 +62,7 @@ INTERFACE zif_abapgit_exit zcx_abapgit_exception . METHODS deserialize_postprocess IMPORTING - !is_step TYPE zif_abapgit_definitions=>ty_step_data + !is_step TYPE zif_abapgit_objects=>ty_step_data !ii_log TYPE REF TO zif_abapgit_log . METHODS get_ci_tests IMPORTING diff --git a/src/zif_abapgit_repo_srv.intf.abap b/src/zif_abapgit_repo_srv.intf.abap index d2ed1b090..de31ae3c9 100644 --- a/src/zif_abapgit_repo_srv.intf.abap +++ b/src/zif_abapgit_repo_srv.intf.abap @@ -1,5 +1,8 @@ INTERFACE zif_abapgit_repo_srv - PUBLIC . + PUBLIC. + + TYPES: + ty_repo_list TYPE STANDARD TABLE OF REF TO zcl_abapgit_repo WITH DEFAULT KEY. METHODS delete IMPORTING @@ -23,7 +26,7 @@ INTERFACE zif_abapgit_repo_srv zcx_abapgit_exception . METHODS list RETURNING - VALUE(rt_list) TYPE zif_abapgit_definitions=>ty_repo_ref_tt + VALUE(rt_list) TYPE ty_repo_list RAISING zcx_abapgit_exception . METHODS new_offline