From e1551c3941b66d86138d09ff6b51beef5c616690 Mon Sep 17 00:00:00 2001 From: Christian Guenter Date: Sat, 5 May 2018 12:35:04 +0000 Subject: [PATCH] move type defintiion to zif_abapgit_definitions --- src/persist/zcl_abapgit_persist_migrate.clas.abap | 2 +- src/persist/zcl_abapgit_persist_settings.clas.abap | 4 ++-- src/persist/zcl_abapgit_persistence_user.clas.abap | 6 +++--- src/zcl_abapgit_settings.clas.abap | 10 +++------- src/zif_abapgit_definitions.intf.abap | 5 +++++ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/persist/zcl_abapgit_persist_migrate.clas.abap b/src/persist/zcl_abapgit_persist_migrate.clas.abap index fdc888e64..9483f42f7 100644 --- a/src/persist/zcl_abapgit_persist_migrate.clas.abap +++ b/src/persist/zcl_abapgit_persist_migrate.clas.abap @@ -66,7 +66,7 @@ CLASS zcl_abapgit_persist_migrate IMPLEMENTATION. DATA: lt_abapgit_users TYPE STANDARD TABLE OF char12 WITH NON-UNIQUE DEFAULT KEY, - ls_user_settings TYPE zcl_abapgit_settings=>ty_s_user_settings, + ls_user_settings TYPE zif_abapgit_definitions=>ty_s_user_settings, lo_user_persistence TYPE REF TO zcl_abapgit_persistence_user. FIELD-SYMBOLS: LIKE LINE OF lt_abapgit_users, diff --git a/src/persist/zcl_abapgit_persist_settings.clas.abap b/src/persist/zcl_abapgit_persist_settings.clas.abap index a813a4ae3..d522d103c 100644 --- a/src/persist/zcl_abapgit_persist_settings.clas.abap +++ b/src/persist/zcl_abapgit_persist_settings.clas.abap @@ -23,7 +23,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_PERSIST_SETTINGS IMPLEMENTATION. +CLASS zcl_abapgit_persist_settings IMPLEMENTATION. METHOD get_instance. @@ -39,7 +39,7 @@ CLASS ZCL_ABAPGIT_PERSIST_SETTINGS IMPLEMENTATION. METHOD modify. DATA: lv_settings TYPE string, - ls_user_settings TYPE zcl_abapgit_settings=>ty_s_user_settings. + ls_user_settings TYPE zif_abapgit_definitions=>ty_s_user_settings. lv_settings = io_settings->get_settings_xml( ). diff --git a/src/persist/zcl_abapgit_persistence_user.clas.abap b/src/persist/zcl_abapgit_persistence_user.clas.abap index d7a2d5fd8..c2d161b70 100644 --- a/src/persist/zcl_abapgit_persistence_user.clas.abap +++ b/src/persist/zcl_abapgit_persistence_user.clas.abap @@ -142,12 +142,12 @@ CLASS zcl_abapgit_persistence_user DEFINITION zcx_abapgit_exception . METHODS get_settings RETURNING - VALUE(rs_user_settings) TYPE zcl_abapgit_settings=>ty_s_user_settings + VALUE(rs_user_settings) TYPE zif_abapgit_definitions=>ty_s_user_settings RAISING zcx_abapgit_exception. METHODS set_settings IMPORTING - is_user_settings TYPE zcl_abapgit_settings=>ty_s_user_settings + is_user_settings TYPE zif_abapgit_definitions=>ty_s_user_settings RAISING zcx_abapgit_exception. PRIVATE SECTION. @@ -170,7 +170,7 @@ CLASS zcl_abapgit_persistence_user DEFINITION diff_unified TYPE abap_bool, favorites TYPE tt_favorites, repo_config TYPE ty_repo_config_tt, - settings TYPE zcl_abapgit_settings=>ty_s_user_settings, + settings TYPE zif_abapgit_definitions=>ty_s_user_settings, END OF ty_user . DATA mv_user TYPE xubname . diff --git a/src/zcl_abapgit_settings.clas.abap b/src/zcl_abapgit_settings.clas.abap index 6f5c4c5e6..1439e2dad 100644 --- a/src/zcl_abapgit_settings.clas.abap +++ b/src/zcl_abapgit_settings.clas.abap @@ -1,10 +1,6 @@ CLASS zcl_abapgit_settings DEFINITION PUBLIC CREATE PUBLIC. PUBLIC SECTION. - TYPES: BEGIN OF ty_s_user_settings, - max_lines TYPE i, - adt_jump_enabled TYPE abap_bool, - END OF ty_s_user_settings. CONSTANTS: c_commitmsg_comment_length_dft TYPE i VALUE 50. CONSTANTS: c_commitmsg_body_size_dft TYPE i VALUE 72. @@ -69,7 +65,7 @@ CLASS zcl_abapgit_settings DEFINITION PUBLIC CREATE PUBLIC. zcx_abapgit_exception, get_user_settings RETURNING - VALUE(rs_settings) TYPE zcl_abapgit_settings=>ty_s_user_settings + VALUE(rs_settings) TYPE zif_abapgit_definitions=>ty_s_user_settings RAISING zcx_abapgit_exception, set_xml_settings @@ -80,7 +76,7 @@ CLASS zcl_abapgit_settings DEFINITION PUBLIC CREATE PUBLIC. set_defaults, set_user_settings IMPORTING - is_user_settings TYPE ty_s_user_settings. + is_user_settings TYPE zif_abapgit_definitions=>ty_s_user_settings. PRIVATE SECTION. TYPES: BEGIN OF ty_s_settings, @@ -93,7 +89,7 @@ CLASS zcl_abapgit_settings DEFINITION PUBLIC CREATE PUBLIC. commitmsg_body_size TYPE i, END OF ty_s_settings. DATA: ms_settings TYPE ty_s_settings, - ms_user_settings TYPE ty_s_user_settings. + ms_user_settings TYPE zif_abapgit_definitions=>ty_s_user_settings. ENDCLASS. diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index 529c943d8..c435e5a49 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -278,6 +278,11 @@ INTERFACE zif_abapgit_definitions PUBLIC. END OF ty_repo_item. TYPES tt_repo_items TYPE STANDARD TABLE OF ty_repo_item WITH DEFAULT KEY. + TYPES: BEGIN OF ty_s_user_settings, + max_lines TYPE i, + adt_jump_enabled TYPE abap_bool, + END OF ty_s_user_settings. + CONSTANTS gc_xml_version TYPE string VALUE 'v1.0.0' ##NO_TEXT. CONSTANTS gc_abap_version TYPE string VALUE 'v1.64.0' ##NO_TEXT. CONSTANTS: