diff --git a/src/ui/core/zcl_abapgit_gui.clas.abap b/src/ui/core/zcl_abapgit_gui.clas.abap index 6f7e4a49a..ae679a28c 100644 --- a/src/ui/core/zcl_abapgit_gui.clas.abap +++ b/src/ui/core/zcl_abapgit_gui.clas.abap @@ -40,13 +40,13 @@ CLASS zcl_abapgit_gui DEFINITION RAISING zcx_abapgit_exception . METHODS on_event - FOR EVENT sapevent OF zif_abapgit_html_viewer + FOR EVENT sapevent OF zif_abapgit_html_viewer IMPORTING - !action - !frame - !getdata - !postdata - !query_table . + !action + !frame + !getdata + !postdata + !query_table . METHODS constructor IMPORTING !io_component TYPE REF TO object OPTIONAL @@ -83,7 +83,9 @@ CLASS zcl_abapgit_gui DEFINITION IMPORTING !iv_text TYPE string RETURNING - VALUE(rv_url) TYPE w3url . + VALUE(rv_url) TYPE w3url + RAISING + zcx_abapgit_exception . METHODS startup RAISING zcx_abapgit_exception . @@ -109,7 +111,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI IMPLEMENTATION. +CLASS zcl_abapgit_gui IMPLEMENTATION. METHOD back. @@ -427,20 +429,16 @@ CLASS ZCL_ABAPGIT_GUI IMPLEMENTATION. ev_size = lv_size et_tab = lt_html ). - TRY. - mi_html_viewer->load_data( - EXPORTING - iv_type = iv_type - iv_subtype = iv_subtype - iv_size = lv_size - iv_url = iv_url - IMPORTING - ev_assigned_url = rv_url - CHANGING - ct_data_table = lt_html ). - CATCH zcx_abapgit_exception. - ASSERT 1 = 2. - ENDTRY. + mi_html_viewer->load_data( + EXPORTING + iv_type = iv_type + iv_subtype = iv_subtype + iv_size = lv_size + iv_url = iv_url + IMPORTING + ev_assigned_url = rv_url + CHANGING + ct_data_table = lt_html ). ELSE. " Raw input zcl_abapgit_convert=>xstring_to_bintab( EXPORTING @@ -449,20 +447,16 @@ CLASS ZCL_ABAPGIT_GUI IMPLEMENTATION. ev_size = lv_size et_bintab = lt_xdata ). - TRY. - mi_html_viewer->load_data( - EXPORTING - iv_type = iv_type - iv_subtype = iv_subtype - iv_size = lv_size - iv_url = iv_url - IMPORTING - ev_assigned_url = rv_url - CHANGING - ct_data_table = lt_xdata ). - CATCH zcx_abapgit_exception. - ASSERT 1 = 2. - ENDTRY. + mi_html_viewer->load_data( + EXPORTING + iv_type = iv_type + iv_subtype = iv_subtype + iv_size = lv_size + iv_url = iv_url + IMPORTING + ev_assigned_url = rv_url + CHANGING + ct_data_table = lt_xdata ). ENDIF. ASSERT sy-subrc = 0. " Image data error diff --git a/src/ui/core/zif_abapgit_gui_services.intf.abap b/src/ui/core/zif_abapgit_gui_services.intf.abap index ce348cfaf..c5f4e0361 100644 --- a/src/ui/core/zif_abapgit_gui_services.intf.abap +++ b/src/ui/core/zif_abapgit_gui_services.intf.abap @@ -1,30 +1,28 @@ INTERFACE zif_abapgit_gui_services PUBLIC . + METHODS cache_asset IMPORTING - iv_text TYPE string OPTIONAL - iv_xdata TYPE xstring OPTIONAL - iv_url TYPE w3url OPTIONAL - iv_type TYPE c - iv_subtype TYPE c + !iv_text TYPE string OPTIONAL + !iv_xdata TYPE xstring OPTIONAL + !iv_url TYPE w3url OPTIONAL + !iv_type TYPE c + !iv_subtype TYPE c RETURNING - VALUE(rv_url) TYPE w3url. - + VALUE(rv_url) TYPE w3url + RAISING + zcx_abapgit_exception . METHODS register_event_handler IMPORTING - ii_event_handler TYPE REF TO zif_abapgit_gui_event_handler. - + !ii_event_handler TYPE REF TO zif_abapgit_gui_event_handler . METHODS get_current_page_name RETURNING - VALUE(rv_page_name) TYPE string. - + VALUE(rv_page_name) TYPE string . METHODS get_hotkeys_ctl RETURNING - VALUE(ri_hotkey_ctl) TYPE REF TO zif_abapgit_gui_hotkey_ctl. - + VALUE(ri_hotkey_ctl) TYPE REF TO zif_abapgit_gui_hotkey_ctl . METHODS get_html_parts RETURNING - VALUE(ro_parts) TYPE REF TO zcl_abapgit_html_parts. - + VALUE(ro_parts) TYPE REF TO zcl_abapgit_html_parts . ENDINTERFACE. diff --git a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap b/src/ui/zcl_abapgit_html_viewer_gui.clas.abap index 4f549df7c..1649cec6d 100644 --- a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap +++ b/src/ui/zcl_abapgit_html_viewer_gui.clas.abap @@ -95,31 +95,42 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. mo_html_viewer->load_data( EXPORTING - url = iv_url - type = iv_type - subtype = iv_subtype - size = iv_size + url = iv_url + type = iv_type + subtype = iv_subtype + size = iv_size IMPORTING - assigned_url = ev_assigned_url + assigned_url = ev_assigned_url CHANGING - data_table = ct_data_table ). + data_table = ct_data_table + EXCEPTIONS + dp_invalid_parameter = 1 + dp_error_general = 2 + cntl_error = 3 + html_syntax_notcorrect = 4 ). + IF sy-subrc <> 0. + zcx_abapgit_exception=>raise( 'Error loading data for HTML viewer' ). + ENDIF. ENDMETHOD. METHOD zif_abapgit_html_viewer~set_registered_events. - mo_html_viewer->set_registered_events( it_events ). + mo_html_viewer->set_registered_events( + EXPORTING + events = it_events + EXCEPTIONS + cntl_error = 1 + cntl_system_error = 2 + illegal_event_combination = 3 ). + IF sy-subrc <> 0. + zcx_abapgit_exception=>raise( 'Error registering events for HTML viewer' ). + ENDIF. ENDMETHOD. - METHOD zif_abapgit_html_viewer~show_url. - - mo_html_viewer->show_url( iv_url ). - - ENDMETHOD. - METHOD zif_abapgit_html_viewer~set_visiblity. DATA: lv_visible TYPE c LENGTH 1. @@ -131,4 +142,21 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. mo_html_viewer->set_visible( lv_visible ). ENDMETHOD. + + + METHOD zif_abapgit_html_viewer~show_url. + + mo_html_viewer->show_url( + EXPORTING + url = iv_url + EXCEPTIONS + cntl_error = 1 + cnht_error_not_allowed = 2 + cnht_error_parameter = 3 + dp_error_general = 4 ). + IF sy-subrc <> 0. + zcx_abapgit_exception=>raise( 'Error showing URL in HTML viewer' ). + ENDIF. + + ENDMETHOD. ENDCLASS.