From 5171a831323bfa6d07a4a2987c861c9fb1aad800 Mon Sep 17 00:00:00 2001 From: larshp Date: Thu, 11 Jan 2018 16:16:05 +0000 Subject: [PATCH] lif_gui_page to global --- src/ui/zif_abapgit_gui_page.intf.abap | 16 +++++++++++++ src/ui/zif_abapgit_gui_page.intf.xml | 16 +++++++++++++ src/zabapgit_gui.prog.abap | 8 +++---- src/zabapgit_gui_router.prog.abap | 16 ++++++------- src/zabapgit_page.prog.abap | 26 +++------------------ src/zabapgit_page_background.prog.abap | 8 +++---- src/zabapgit_page_branch_overview.prog.abap | 4 ++-- src/zabapgit_page_commit.prog.abap | 4 ++-- src/zabapgit_page_diff.prog.abap | 4 ++-- src/zabapgit_page_main.prog.abap | 6 ++--- src/zabapgit_page_merge.prog.abap | 4 ++-- src/zabapgit_page_repo_settings.prog.abap | 4 ++-- src/zabapgit_page_settings.prog.abap | 4 ++-- src/zabapgit_page_stage.prog.abap | 4 ++-- src/zabapgit_view_repo.prog.abap | 10 ++++---- src/zabapgit_view_tutorial.prog.abap | 8 +++---- 16 files changed, 78 insertions(+), 64 deletions(-) create mode 100644 src/ui/zif_abapgit_gui_page.intf.abap create mode 100644 src/ui/zif_abapgit_gui_page.intf.xml diff --git a/src/ui/zif_abapgit_gui_page.intf.abap b/src/ui/zif_abapgit_gui_page.intf.abap new file mode 100644 index 000000000..6198b6607 --- /dev/null +++ b/src/ui/zif_abapgit_gui_page.intf.abap @@ -0,0 +1,16 @@ +INTERFACE zif_abapgit_gui_page PUBLIC. + + METHODS on_event + IMPORTING iv_action TYPE clike + iv_prev_page TYPE clike + iv_getdata TYPE clike OPTIONAL + it_postdata TYPE cnht_post_data_tab OPTIONAL + EXPORTING ei_page TYPE REF TO zif_abapgit_gui_page + ev_state TYPE i + RAISING zcx_abapgit_exception zcx_abapgit_cancel. + + METHODS render + RETURNING VALUE(ro_html) TYPE REF TO zcl_abapgit_html + RAISING zcx_abapgit_exception. + +ENDINTERFACE. diff --git a/src/ui/zif_abapgit_gui_page.intf.xml b/src/ui/zif_abapgit_gui_page.intf.xml new file mode 100644 index 000000000..977fa80b8 --- /dev/null +++ b/src/ui/zif_abapgit_gui_page.intf.xml @@ -0,0 +1,16 @@ + + + + + + ZIF_ABAPGIT_GUI_PAGE + 1 + E + GUI page + 2 + 1 + X + + + + diff --git a/src/zabapgit_gui.prog.abap b/src/zabapgit_gui.prog.abap index b7e27668f..c8f0fbd35 100644 --- a/src/zabapgit_gui.prog.abap +++ b/src/zabapgit_gui.prog.abap @@ -23,11 +23,11 @@ CLASS lcl_gui DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app. PRIVATE SECTION. TYPES: BEGIN OF ty_page_stack, - page TYPE REF TO lif_gui_page, + page TYPE REF TO zif_abapgit_gui_page, bookmark TYPE abap_bool, END OF ty_page_stack. - DATA: mi_cur_page TYPE REF TO lif_gui_page, + DATA: mi_cur_page TYPE REF TO zif_abapgit_gui_page, mt_stack TYPE STANDARD TABLE OF ty_page_stack, mo_router TYPE REF TO lcl_gui_router, mo_asset_man TYPE REF TO lcl_gui_asset_manager, @@ -58,7 +58,7 @@ CLASS lcl_gui DEFINITION FINAL CREATE PRIVATE FRIENDS lcl_app. RETURNING VALUE(rv_page_name) TYPE string. METHODS call_page - IMPORTING ii_page TYPE REF TO lif_gui_page + IMPORTING ii_page TYPE REF TO zif_abapgit_gui_page iv_with_bookmark TYPE abap_bool DEFAULT abap_false iv_replacing TYPE abap_bool DEFAULT abap_false RAISING zcx_abapgit_exception. @@ -86,7 +86,7 @@ CLASS lcl_gui IMPLEMENTATION. METHOD handle_action. DATA: lx_exception TYPE REF TO zcx_abapgit_exception, - li_page TYPE REF TO lif_gui_page, + li_page TYPE REF TO zif_abapgit_gui_page, lv_state TYPE i. TRY. diff --git a/src/zabapgit_gui_router.prog.abap b/src/zabapgit_gui_router.prog.abap index c53ce5c31..12dc16689 100644 --- a/src/zabapgit_gui_router.prog.abap +++ b/src/zabapgit_gui_router.prog.abap @@ -13,7 +13,7 @@ CLASS lcl_gui_router DEFINITION FINAL. iv_prev_page TYPE clike iv_getdata TYPE clike OPTIONAL it_postdata TYPE cnht_post_data_tab OPTIONAL - EXPORTING ei_page TYPE REF TO lif_gui_page + EXPORTING ei_page TYPE REF TO zif_abapgit_gui_page ev_state TYPE i RAISING zcx_abapgit_exception zcx_abapgit_cancel. @@ -21,38 +21,38 @@ CLASS lcl_gui_router DEFINITION FINAL. METHODS get_page_by_name IMPORTING iv_name TYPE clike - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception. METHODS get_page_diff IMPORTING iv_getdata TYPE clike iv_prev_page TYPE clike - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception. METHODS get_page_branch_overview IMPORTING iv_getdata TYPE clike - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception. METHODS get_page_stage IMPORTING iv_getdata TYPE clike - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception. METHODS get_page_db_by_name IMPORTING iv_name TYPE clike iv_getdata TYPE clike - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception. METHODS get_page_background IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception. METHODS get_page_playground - RETURNING VALUE(ri_page) TYPE REF TO lif_gui_page + RETURNING VALUE(ri_page) TYPE REF TO zif_abapgit_gui_page RAISING zcx_abapgit_exception zcx_abapgit_cancel. ENDCLASS. diff --git a/src/zabapgit_page.prog.abap b/src/zabapgit_page.prog.abap index 3f7654975..8dc392d81 100644 --- a/src/zabapgit_page.prog.abap +++ b/src/zabapgit_page.prog.abap @@ -2,29 +2,9 @@ *& Include ZABAPGIT_PAGE *&---------------------------------------------------------------------* -*----------------------------------------------------------------------* -* INTERFACE lif_gui_page DEFINITION -*----------------------------------------------------------------------* -INTERFACE lif_gui_page. - - METHODS on_event - IMPORTING iv_action TYPE clike - iv_prev_page TYPE clike - iv_getdata TYPE clike OPTIONAL - it_postdata TYPE cnht_post_data_tab OPTIONAL - EXPORTING ei_page TYPE REF TO lif_gui_page - ev_state TYPE i - RAISING zcx_abapgit_exception zcx_abapgit_cancel. - - METHODS render - RETURNING VALUE(ro_html) TYPE REF TO zcl_abapgit_html - RAISING zcx_abapgit_exception. - -ENDINTERFACE. - CLASS lcl_gui_page DEFINITION ABSTRACT. PUBLIC SECTION. - INTERFACES lif_gui_page. + INTERFACES zif_abapgit_gui_page. PROTECTED SECTION. @@ -145,11 +125,11 @@ CLASS lcl_gui_page IMPLEMENTATION. ASSERT 1 = 1. " Dummy ENDMETHOD. "scripts - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. ev_state = zif_abapgit_definitions=>gc_event_state-not_handled. ENDMETHOD. "lif_gui_page~on_event - METHOD lif_gui_page~render. + METHOD zif_abapgit_gui_page~render. DATA lo_script TYPE REF TO zcl_abapgit_html. diff --git a/src/zabapgit_page_background.prog.abap b/src/zabapgit_page_background.prog.abap index 3f1f91dcf..b3c9690cf 100644 --- a/src/zabapgit_page_background.prog.abap +++ b/src/zabapgit_page_background.prog.abap @@ -7,7 +7,7 @@ CLASS lcl_gui_page_bkg_run DEFINITION FINAL PUBLIC SECTION. METHODS constructor. - METHODS lif_gui_page~on_event REDEFINITION. + METHODS zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS render_content REDEFINITION. @@ -26,7 +26,7 @@ CLASS lcl_gui_page_bkg_run IMPLEMENTATION. ms_control-page_title = 'BACKGROUND_RUN'. ENDMETHOD. " constructor. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. RETURN. ENDMETHOD. @@ -78,7 +78,7 @@ CLASS lcl_gui_page_bkg DEFINITION FINAL PUBLIC SECTION. METHODS: constructor IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS render_content REDEFINITION. @@ -114,7 +114,7 @@ CLASS lcl_gui_page_bkg IMPLEMENTATION. iv_act = zif_abapgit_definitions=>gc_action-go_background_run ) ##NO_TEXT. ENDMETHOD. "build_menu - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA ls_bg_task TYPE lcl_persist_background=>ty_background. diff --git a/src/zabapgit_page_branch_overview.prog.abap b/src/zabapgit_page_branch_overview.prog.abap index a597b5dca..1101dd20d 100644 --- a/src/zabapgit_page_branch_overview.prog.abap +++ b/src/zabapgit_page_branch_overview.prog.abap @@ -341,7 +341,7 @@ CLASS lcl_gui_page_boverview DEFINITION FINAL INHERITING FROM lcl_gui_page. constructor IMPORTING io_repo TYPE REF TO lcl_repo_online RAISING zcx_abapgit_exception, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS render_content REDEFINITION. @@ -593,7 +593,7 @@ CLASS lcl_gui_page_boverview IMPLEMENTATION. ENDMETHOD. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA: ls_merge TYPE ty_merge, lo_merge TYPE REF TO lcl_gui_page_merge. diff --git a/src/zabapgit_page_commit.prog.abap b/src/zabapgit_page_commit.prog.abap index b95775bb5..68c4ad80c 100644 --- a/src/zabapgit_page_commit.prog.abap +++ b/src/zabapgit_page_commit.prog.abap @@ -16,7 +16,7 @@ CLASS lcl_gui_page_commit DEFINITION FINAL INHERITING FROM lcl_gui_page. IMPORTING io_repo TYPE REF TO lcl_repo_online io_stage TYPE REF TO lcl_stage RAISING zcx_abapgit_exception, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS: @@ -56,7 +56,7 @@ CLASS lcl_gui_page_commit IMPLEMENTATION. ms_control-page_title = 'COMMIT'. ENDMETHOD. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA: ls_commit TYPE lcl_services_git=>ty_commit_fields. diff --git a/src/zabapgit_page_diff.prog.abap b/src/zabapgit_page_diff.prog.abap index 0e77895da..f7c8880ca 100644 --- a/src/zabapgit_page_diff.prog.abap +++ b/src/zabapgit_page_diff.prog.abap @@ -32,7 +32,7 @@ CLASS lcl_gui_page_diff DEFINITION FINAL INHERITING FROM lcl_gui_page. is_object TYPE zif_abapgit_definitions=>ty_item OPTIONAL iv_supress_stage TYPE abap_bool DEFAULT abap_false RAISING zcx_abapgit_exception, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS: @@ -334,7 +334,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ENDMETHOD. " build_menu. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. CASE iv_action. WHEN c_actions-toggle_unified. " Toggle file diplay diff --git a/src/zabapgit_page_main.prog.abap b/src/zabapgit_page_main.prog.abap index 154bec898..9195a99ab 100644 --- a/src/zabapgit_page_main.prog.abap +++ b/src/zabapgit_page_main.prog.abap @@ -8,7 +8,7 @@ CLASS lcl_gui_page_main DEFINITION FINAL INHERITING FROM lcl_gui_page. METHODS: constructor RAISING zcx_abapgit_exception, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS render_content REDEFINITION. @@ -49,13 +49,13 @@ CLASS lcl_gui_page_main IMPLEMENTATION. ms_control-page_menu = build_main_menu( ). ENDMETHOD. " constructor - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA: lv_key TYPE lcl_persistence_repo=>ty_repo-key. IF NOT mo_repo_content IS INITIAL. - mo_repo_content->lif_gui_page~on_event( + mo_repo_content->zif_abapgit_gui_page~on_event( EXPORTING iv_action = iv_action iv_prev_page = iv_prev_page diff --git a/src/zabapgit_page_merge.prog.abap b/src/zabapgit_page_merge.prog.abap index f6347ad77..fd5680db6 100644 --- a/src/zabapgit_page_merge.prog.abap +++ b/src/zabapgit_page_merge.prog.abap @@ -324,7 +324,7 @@ CLASS lcl_gui_page_merge DEFINITION FINAL INHERITING FROM lcl_gui_page. iv_source TYPE string iv_target TYPE string RAISING zcx_abapgit_exception, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS render_content REDEFINITION. @@ -360,7 +360,7 @@ CLASS lcl_gui_page_merge IMPLEMENTATION. ENDMETHOD. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. CASE iv_action. WHEN c_actions-merge. diff --git a/src/zabapgit_page_repo_settings.prog.abap b/src/zabapgit_page_repo_settings.prog.abap index 43f2c8a12..5e4baccc4 100644 --- a/src/zabapgit_page_repo_settings.prog.abap +++ b/src/zabapgit_page_repo_settings.prog.abap @@ -7,7 +7,7 @@ CLASS lcl_gui_page_repo_sett DEFINITION FINAL INHERITING FROM lcl_gui_page. METHODS: constructor IMPORTING io_repo TYPE REF TO lcl_repo, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. CONSTANTS: @@ -68,7 +68,7 @@ CLASS lcl_gui_page_repo_sett IMPLEMENTATION. ENDMETHOD. "render_content - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA: lt_post_fields TYPE tihttpnvp, lo_dot TYPE REF TO zcl_abapgit_dot_abapgit, diff --git a/src/zabapgit_page_settings.prog.abap b/src/zabapgit_page_settings.prog.abap index 049d3e205..dc0c8349e 100644 --- a/src/zabapgit_page_settings.prog.abap +++ b/src/zabapgit_page_settings.prog.abap @@ -11,7 +11,7 @@ CLASS lcl_gui_page_settings DEFINITION FINAL INHERITING FROM lcl_gui_page. END OF c_action. METHODS constructor. - METHODS lif_gui_page~on_event REDEFINITION. + METHODS zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS render_content REDEFINITION. @@ -106,7 +106,7 @@ CLASS lcl_gui_page_settings IMPLEMENTATION. ENDMETHOD. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. * todo, check input values eg INT DATA: diff --git a/src/zabapgit_page_stage.prog.abap b/src/zabapgit_page_stage.prog.abap index 18ebf8e28..79a0de5c5 100644 --- a/src/zabapgit_page_stage.prog.abap +++ b/src/zabapgit_page_stage.prog.abap @@ -16,7 +16,7 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page. io_repo TYPE REF TO lcl_repo_online iv_seed TYPE string OPTIONAL RAISING zcx_abapgit_exception, - lif_gui_page~on_event REDEFINITION. + zif_abapgit_gui_page~on_event REDEFINITION. PROTECTED SECTION. METHODS: @@ -88,7 +88,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION. ENDMETHOD. "build_menu - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA lo_stage TYPE REF TO lcl_stage. diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap index a6b13fa1c..bc45e54cf 100644 --- a/src/zabapgit_view_repo.prog.abap +++ b/src/zabapgit_view_repo.prog.abap @@ -3,9 +3,11 @@ *&---------------------------------------------------------------------* CLASS lcl_gui_view_repo DEFINITION FINAL. + PUBLIC SECTION. - INTERFACES lif_gui_page. - ALIASES render FOR lif_gui_page~render. + INTERFACES zif_abapgit_gui_page. + + ALIASES render FOR zif_abapgit_gui_page~render. CONSTANTS: BEGIN OF c_actions, change_dir TYPE string VALUE 'change_dir' ##NO_TEXT, @@ -95,7 +97,7 @@ CLASS lcl_gui_view_repo IMPLEMENTATION. ENDMETHOD. "constructor - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. DATA: lv_path TYPE string. @@ -121,7 +123,7 @@ CLASS lcl_gui_view_repo IMPLEMENTATION. ENDMETHOD. "lif_gui_page~on_event - METHOD lif_gui_page~render. + METHOD zif_abapgit_gui_page~render. DATA: lt_repo_items TYPE lcl_repo_content_list=>tt_repo_items, lo_browser TYPE REF TO lcl_repo_content_list, diff --git a/src/zabapgit_view_tutorial.prog.abap b/src/zabapgit_view_tutorial.prog.abap index afdf69757..2b3916562 100644 --- a/src/zabapgit_view_tutorial.prog.abap +++ b/src/zabapgit_view_tutorial.prog.abap @@ -4,8 +4,8 @@ CLASS lcl_gui_view_tutorial DEFINITION FINAL. PUBLIC SECTION. - INTERFACES lif_gui_page. - ALIASES render FOR lif_gui_page~render. + INTERFACES zif_abapgit_gui_page. + ALIASES render FOR zif_abapgit_gui_page~render. PRIVATE SECTION. METHODS render_content @@ -15,11 +15,11 @@ ENDCLASS. "lcl_gui_view_tutorial CLASS lcl_gui_view_tutorial IMPLEMENTATION. - METHOD lif_gui_page~on_event. + METHOD zif_abapgit_gui_page~on_event. ev_state = zif_abapgit_definitions=>gc_event_state-not_handled. ENDMETHOD. " lif_gui_page~on_event. - METHOD lif_gui_page~render. + METHOD zif_abapgit_gui_page~render. CREATE OBJECT ro_html.