diff --git a/src/ui/core/zcl_abapgit_gui.clas.abap b/src/ui/core/zcl_abapgit_gui.clas.abap index a7cba474f..b3b3ba422 100644 --- a/src/ui/core/zcl_abapgit_gui.clas.abap +++ b/src/ui/core/zcl_abapgit_gui.clas.abap @@ -81,7 +81,7 @@ CLASS zcl_abapgit_gui DEFINITION IMPORTING !iv_text TYPE string RETURNING - VALUE(rv_url) TYPE w3url + VALUE(rv_url) TYPE string RAISING zcx_abapgit_exception . METHODS startup @@ -336,7 +336,7 @@ CLASS zcl_abapgit_gui IMPLEMENTATION. METHOD render. - DATA: lv_url TYPE w3url, + DATA: lv_url TYPE string, lv_html TYPE string, li_html TYPE REF TO zif_abapgit_html. diff --git a/src/ui/core/zif_abapgit_gui_asset_manager.intf.abap b/src/ui/core/zif_abapgit_gui_asset_manager.intf.abap index 6162f6523..c24bf0274 100644 --- a/src/ui/core/zif_abapgit_gui_asset_manager.intf.abap +++ b/src/ui/core/zif_abapgit_gui_asset_manager.intf.abap @@ -3,7 +3,7 @@ INTERFACE zif_abapgit_gui_asset_manager TYPES: BEGIN OF ty_web_asset, - url TYPE w3url, + url TYPE string, type TYPE c LENGTH 50, subtype TYPE c LENGTH 50, content TYPE xstring, diff --git a/src/ui/core/zif_abapgit_gui_services.intf.abap b/src/ui/core/zif_abapgit_gui_services.intf.abap index a51ce5f73..0a7050073 100644 --- a/src/ui/core/zif_abapgit_gui_services.intf.abap +++ b/src/ui/core/zif_abapgit_gui_services.intf.abap @@ -6,11 +6,11 @@ INTERFACE zif_abapgit_gui_services IMPORTING !iv_text TYPE string OPTIONAL !iv_xdata TYPE xstring OPTIONAL - !iv_url TYPE w3url OPTIONAL + !iv_url TYPE string OPTIONAL !iv_type TYPE c !iv_subtype TYPE c RETURNING - VALUE(rv_url) TYPE w3url + VALUE(rv_url) TYPE string RAISING zcx_abapgit_exception . METHODS register_event_handler diff --git a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap b/src/ui/zcl_abapgit_html_viewer_gui.clas.abap index 5f96184aa..e7d2d522c 100644 --- a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap +++ b/src/ui/zcl_abapgit_html_viewer_gui.clas.abap @@ -29,7 +29,7 @@ ENDCLASS. -CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. +CLASS ZCL_ABAPGIT_HTML_VIEWER_GUI IMPLEMENTATION. METHOD constructor. @@ -88,8 +88,10 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. METHOD zif_abapgit_html_viewer~get_url. - mo_html_viewer->get_current_url( IMPORTING url = rv_url ). + DATA lv_url TYPE c LENGTH 250. + mo_html_viewer->get_current_url( IMPORTING url = lv_url ). cl_gui_cfw=>flush( ). + rv_url = lv_url. ENDMETHOD. @@ -101,14 +103,19 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. METHOD zif_abapgit_html_viewer~load_data. + DATA lv_url TYPE c LENGTH 250. + DATA lv_assigned TYPE c LENGTH 250. + + ASSERT strlen( iv_url ) <= 250. + lv_url = iv_url. mo_html_viewer->load_data( EXPORTING - url = iv_url + url = lv_url type = iv_type subtype = iv_subtype size = iv_size IMPORTING - assigned_url = ev_assigned_url + assigned_url = lv_assigned CHANGING data_table = ct_data_table EXCEPTIONS @@ -119,6 +126,7 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. IF sy-subrc <> 0. zcx_abapgit_exception=>raise( 'Error loading data for HTML viewer' ). ENDIF. + ev_assigned_url = lv_assigned. ENDMETHOD. @@ -154,9 +162,11 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION. METHOD zif_abapgit_html_viewer~show_url. + DATA lv_url TYPE c LENGTH 250. + lv_url = iv_url. mo_html_viewer->show_url( EXPORTING - url = iv_url + url = lv_url EXCEPTIONS cntl_error = 1 cnht_error_not_allowed = 2 diff --git a/src/ui/zif_abapgit_html_viewer.intf.abap b/src/ui/zif_abapgit_html_viewer.intf.abap index 37f828714..19ae5886e 100644 --- a/src/ui/zif_abapgit_html_viewer.intf.abap +++ b/src/ui/zif_abapgit_html_viewer.intf.abap @@ -2,15 +2,19 @@ INTERFACE zif_abapgit_html_viewer PUBLIC . - CONSTANTS m_id_sapevent TYPE i VALUE 1 ##NO_TEXT. + TYPES: + ty_char256 TYPE c LENGTH 256 . + TYPES: + ty_post_data TYPE STANDARD TABLE OF ty_char256 WITH DEFAULT KEY . + TYPES: + BEGIN OF ty_name_value, + name TYPE c LENGTH 30, + value TYPE c LENGTH 250, + END OF ty_name_value . + TYPES: + ty_query_table TYPE STANDARD TABLE OF ty_name_value WITH DEFAULT KEY . - TYPES ty_char256 TYPE c LENGTH 256. - TYPES ty_post_data TYPE STANDARD TABLE OF ty_char256 WITH DEFAULT KEY. - TYPES: BEGIN OF ty_name_value, - name TYPE c LENGTH 30, - value TYPE c LENGTH 250, - END OF ty_name_value. - TYPES ty_query_table TYPE STANDARD TABLE OF ty_name_value WITH DEFAULT KEY. + CONSTANTS m_id_sapevent TYPE i VALUE 1 ##NO_TEXT. EVENTS sapevent EXPORTING @@ -22,33 +26,35 @@ INTERFACE zif_abapgit_html_viewer METHODS load_data IMPORTING - !iv_url TYPE c OPTIONAL + !iv_url TYPE string OPTIONAL !iv_type TYPE c DEFAULT 'text' !iv_subtype TYPE c DEFAULT 'html' !iv_size TYPE i DEFAULT 0 EXPORTING - !ev_assigned_url TYPE c + !ev_assigned_url TYPE string CHANGING !ct_data_table TYPE STANDARD TABLE RAISING - zcx_abapgit_exception. + zcx_abapgit_exception . METHODS set_registered_events IMPORTING !it_events TYPE cntl_simple_events RAISING - zcx_abapgit_exception. + zcx_abapgit_exception . METHODS show_url IMPORTING - !iv_url TYPE c + !iv_url TYPE string RAISING - zcx_abapgit_exception. + zcx_abapgit_exception . METHODS free . METHODS close_document . METHODS get_url RETURNING - VALUE(rv_url) TYPE w3url. + VALUE(rv_url) TYPE string . METHODS back . - METHODS set_visiblity IMPORTING iv_visible TYPE abap_bool. + METHODS set_visiblity + IMPORTING + !iv_visible TYPE abap_bool . METHODS get_viewer RETURNING VALUE(ro_result) TYPE REF TO cl_gui_html_viewer .