diff --git a/src/01/00/03/z2ui5_cl_util.clas.abap b/src/01/00/03/z2ui5_cl_util.clas.abap index 04dc642f..90c3488f 100644 --- a/src/01/00/03/z2ui5_cl_util.clas.abap +++ b/src/01/00/03/z2ui5_cl_util.clas.abap @@ -329,7 +329,7 @@ CLASS z2ui5_cl_util DEFINITION CLASS-METHODS filter_get_token_t_by_range_t IMPORTING - val TYPE ty_t_range + val TYPE ANY TABLE RETURNING VALUE(result) TYPE ty_t_token. @@ -337,6 +337,12 @@ CLASS z2ui5_cl_util DEFINITION RETURNING VALUE(result) TYPE z2ui5_if_types=>ty_t_name_value. + CLASS-METHODS itab_corresponding + IMPORTING + val TYPE STANDARD TABLE + CHANGING + tab TYPE STANDARD TABLE. + CLASS-METHODS itab_filter_by_val IMPORTING val TYPE clike @@ -725,7 +731,16 @@ CLASS z2ui5_cl_util IMPLEMENTATION. DATA(lt_mapping) = filter_get_token_range_mapping( ). - LOOP AT val REFERENCE INTO DATA(lr_row). + DATA(lt_tab) = VALUE ty_t_range( ). + + itab_corresponding( + EXPORTING + val = lt_tab + CHANGING + tab = lt_tab + ). + + LOOP AT lt_tab REFERENCE INTO DATA(lr_row). DATA(lv_value) = lt_mapping[ n = lr_row->option ]-v. REPLACE `{LOW}` IN lv_value WITH lr_row->low. @@ -944,11 +959,14 @@ CLASS z2ui5_cl_util IMPLEMENTATION. METHOD rtti_get_type_name. + TRY. - DATA(lo_descr) = cl_abap_elemdescr=>describe_by_data( val ). - DATA(lo_ele) = CAST cl_abap_elemdescr( lo_descr ). - result = lo_ele->get_relative_name( ). + DATA(lo_descr) = cl_abap_elemdescr=>describe_by_data( val ). + DATA(lo_ele) = CAST cl_abap_elemdescr( lo_descr ). + result = lo_ele->get_relative_name( ). + CATCH cx_root. + ENDTRY. ENDMETHOD. @@ -1055,7 +1073,7 @@ CLASS z2ui5_cl_util IMPLEMENTATION. TYPES fixvalues TYPE STANDARD TABLE OF fixvalue WITH EMPTY KEY. DATA lt_values TYPE fixvalues. - CALL METHOD ELEMDESCR->('GET_DDIC_FIXED_VALUES') + CALL METHOD elemdescr->('GET_DDIC_FIXED_VALUES') EXPORTING p_langu = langu RECEIVING @@ -1479,4 +1497,18 @@ CLASS z2ui5_cl_util IMPLEMENTATION. ENDMETHOD. + METHOD itab_corresponding. + + FIELD-SYMBOLS TYPE any. + FIELD-SYMBOLS TYPE any. + + LOOP AT val ASSIGNING . + + INSERT INITIAL LINE INTO tab ASSIGNING . + = CORRESPONDING #( ). + + ENDLOOP. + + ENDMETHOD. + ENDCLASS. diff --git a/src/01/02/01/package.devc.xml b/src/01/01/package.devc.xml similarity index 85% rename from src/01/02/01/package.devc.xml rename to src/01/01/package.devc.xml index 3fe84d09..ae4cff1d 100644 --- a/src/01/02/01/package.devc.xml +++ b/src/01/01/package.devc.xml @@ -3,7 +3,7 @@ - abap2UI5 - core services + abap2UI5 - services diff --git a/src/01/02/01/z2ui5_cl_core_attri_srv.clas.abap b/src/01/01/z2ui5_cl_core_attri_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_attri_srv.clas.abap rename to src/01/01/z2ui5_cl_core_attri_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_attri_srv.clas.testclasses.abap b/src/01/01/z2ui5_cl_core_attri_srv.clas.testclasses.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_attri_srv.clas.testclasses.abap rename to src/01/01/z2ui5_cl_core_attri_srv.clas.testclasses.abap diff --git a/src/01/02/01/z2ui5_cl_core_attri_srv.clas.xml b/src/01/01/z2ui5_cl_core_attri_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_attri_srv.clas.xml rename to src/01/01/z2ui5_cl_core_attri_srv.clas.xml diff --git a/src/01/02/01/z2ui5_cl_core_bind_srv.clas.abap b/src/01/01/z2ui5_cl_core_bind_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_bind_srv.clas.abap rename to src/01/01/z2ui5_cl_core_bind_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_bind_srv.clas.testclasses.abap b/src/01/01/z2ui5_cl_core_bind_srv.clas.testclasses.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_bind_srv.clas.testclasses.abap rename to src/01/01/z2ui5_cl_core_bind_srv.clas.testclasses.abap diff --git a/src/01/02/01/z2ui5_cl_core_bind_srv.clas.xml b/src/01/01/z2ui5_cl_core_bind_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_bind_srv.clas.xml rename to src/01/01/z2ui5_cl_core_bind_srv.clas.xml diff --git a/src/01/02/01/z2ui5_cl_core_diss_srv.clas.abap b/src/01/01/z2ui5_cl_core_diss_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_diss_srv.clas.abap rename to src/01/01/z2ui5_cl_core_diss_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_diss_srv.clas.testclasses.abap b/src/01/01/z2ui5_cl_core_diss_srv.clas.testclasses.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_diss_srv.clas.testclasses.abap rename to src/01/01/z2ui5_cl_core_diss_srv.clas.testclasses.abap diff --git a/src/01/02/01/z2ui5_cl_core_diss_srv.clas.xml b/src/01/01/z2ui5_cl_core_diss_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_diss_srv.clas.xml rename to src/01/01/z2ui5_cl_core_diss_srv.clas.xml diff --git a/src/01/02/01/z2ui5_cl_core_draft_srv.clas.abap b/src/01/01/z2ui5_cl_core_draft_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_draft_srv.clas.abap rename to src/01/01/z2ui5_cl_core_draft_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_draft_srv.clas.testclasses.abap b/src/01/01/z2ui5_cl_core_draft_srv.clas.testclasses.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_draft_srv.clas.testclasses.abap rename to src/01/01/z2ui5_cl_core_draft_srv.clas.testclasses.abap diff --git a/src/01/02/01/z2ui5_cl_core_draft_srv.clas.xml b/src/01/01/z2ui5_cl_core_draft_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_draft_srv.clas.xml rename to src/01/01/z2ui5_cl_core_draft_srv.clas.xml diff --git a/src/01/02/01/z2ui5_cl_core_event_srv.clas.abap b/src/01/01/z2ui5_cl_core_event_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_event_srv.clas.abap rename to src/01/01/z2ui5_cl_core_event_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_event_srv.clas.testclasses.abap b/src/01/01/z2ui5_cl_core_event_srv.clas.testclasses.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_event_srv.clas.testclasses.abap rename to src/01/01/z2ui5_cl_core_event_srv.clas.testclasses.abap diff --git a/src/01/02/01/z2ui5_cl_core_event_srv.clas.xml b/src/01/01/z2ui5_cl_core_event_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_event_srv.clas.xml rename to src/01/01/z2ui5_cl_core_event_srv.clas.xml diff --git a/src/01/02/01/z2ui5_cl_core_json_srv.clas.abap b/src/01/01/z2ui5_cl_core_json_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_json_srv.clas.abap rename to src/01/01/z2ui5_cl_core_json_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_json_srv.clas.testclasses.abap b/src/01/01/z2ui5_cl_core_json_srv.clas.testclasses.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_json_srv.clas.testclasses.abap rename to src/01/01/z2ui5_cl_core_json_srv.clas.testclasses.abap diff --git a/src/01/02/01/z2ui5_cl_core_json_srv.clas.xml b/src/01/01/z2ui5_cl_core_json_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_json_srv.clas.xml rename to src/01/01/z2ui5_cl_core_json_srv.clas.xml diff --git a/src/01/02/01/z2ui5_cl_core_util_srv.clas.abap b/src/01/01/z2ui5_cl_core_util_srv.clas.abap similarity index 100% rename from src/01/02/01/z2ui5_cl_core_util_srv.clas.abap rename to src/01/01/z2ui5_cl_core_util_srv.clas.abap diff --git a/src/01/02/01/z2ui5_cl_core_util_srv.clas.xml b/src/01/01/z2ui5_cl_core_util_srv.clas.xml similarity index 100% rename from src/01/02/01/z2ui5_cl_core_util_srv.clas.xml rename to src/01/01/z2ui5_cl_core_util_srv.clas.xml diff --git a/src/01/02/01/z2ui5_t_01.tabl.xml b/src/01/01/z2ui5_t_01.tabl.xml similarity index 100% rename from src/01/02/01/z2ui5_t_01.tabl.xml rename to src/01/01/z2ui5_t_01.tabl.xml diff --git a/src/01/02/package.devc.xml b/src/01/02/package.devc.xml index c37d2f51..d106d9bb 100644 --- a/src/01/02/package.devc.xml +++ b/src/01/02/package.devc.xml @@ -3,7 +3,7 @@ - abap2UI5 - core + abap2UI5 - logic diff --git a/src/02/02/z2ui5_cl_app_hello_world.clas.abap b/src/01/03/z2ui5_cl_core_app_hello_w.clas.abap similarity index 91% rename from src/02/02/z2ui5_cl_app_hello_world.clas.abap rename to src/01/03/z2ui5_cl_core_app_hello_w.clas.abap index 3e40e09b..09372a1f 100644 --- a/src/02/02/z2ui5_cl_app_hello_world.clas.abap +++ b/src/01/03/z2ui5_cl_core_app_hello_w.clas.abap @@ -1,4 +1,4 @@ -CLASS z2ui5_cl_app_hello_world DEFINITION +CLASS z2ui5_cl_core_app_hello_w DEFINITION PUBLIC CREATE PUBLIC . @@ -14,7 +14,7 @@ ENDCLASS. -CLASS z2ui5_cl_app_hello_world IMPLEMENTATION. +CLASS z2ui5_cl_core_app_hello_w IMPLEMENTATION. METHOD z2ui5_if_app~main. diff --git a/src/02/02/z2ui5_cl_app_hello_world.clas.xml b/src/01/03/z2ui5_cl_core_app_hello_w.clas.xml similarity index 79% rename from src/02/02/z2ui5_cl_app_hello_world.clas.xml rename to src/01/03/z2ui5_cl_core_app_hello_w.clas.xml index 0a73c531..bd8520ef 100644 --- a/src/02/02/z2ui5_cl_app_hello_world.clas.xml +++ b/src/01/03/z2ui5_cl_core_app_hello_w.clas.xml @@ -3,9 +3,9 @@ - Z2UI5_CL_APP_HELLO_WORLD + Z2UI5_CL_CORE_APP_HELLO_W E - ui - app hello world + abap2UI5 - app hello world 1 X X diff --git a/src/01/03/z2ui5_cl_core_app_startup.clas.abap b/src/01/03/z2ui5_cl_core_app_startup.clas.abap index 00c0fbcc..6a148fec 100644 --- a/src/01/03/z2ui5_cl_core_app_startup.clas.abap +++ b/src/01/03/z2ui5_cl_core_app_startup.clas.abap @@ -300,7 +300,7 @@ CLASS Z2UI5_CL_CORE_APP_STARTUP IMPLEMENTATION. ms_home-btn_event_id = `BUTTON_CHECK`. ms_home-class_editable = abap_true. ms_home-btn_icon = `sap-icon://validate`. - ms_home-classname = z2ui5_cl_util=>rtti_get_classname_by_ref( NEW z2ui5_cl_app_hello_world( ) ). + ms_home-classname = z2ui5_cl_util=>rtti_get_classname_by_ref( NEW z2ui5_cl_core_app_hello_w( ) ). ENDMETHOD. ENDCLASS. diff --git a/src/01/04/package.devc.xml b/src/01/04/package.devc.xml index d38ae0b6..acd6e686 100644 --- a/src/01/04/package.devc.xml +++ b/src/01/04/package.devc.xml @@ -3,7 +3,7 @@ - abap2UI5 - cc startup + abap2UI5 - custom controls diff --git a/src/02/01/z2ui5_cl_xml_view.clas.xml b/src/02/01/z2ui5_cl_xml_view.clas.xml index 3de951ee..36499319 100644 --- a/src/02/01/z2ui5_cl_xml_view.clas.xml +++ b/src/02/01/z2ui5_cl_xml_view.clas.xml @@ -5,7 +5,7 @@ Z2UI5_CL_XML_VIEW E - abap2UI5 - view renderer + abap2UI5 - view parser 1 X X diff --git a/src/02/01/z2ui5_cl_xml_view_cc.clas.xml b/src/02/01/z2ui5_cl_xml_view_cc.clas.xml index af16ecf1..bfa0e2d5 100644 --- a/src/02/01/z2ui5_cl_xml_view_cc.clas.xml +++ b/src/02/01/z2ui5_cl_xml_view_cc.clas.xml @@ -5,7 +5,7 @@ Z2UI5_CL_XML_VIEW_CC E - abap2UI5 - view renderer cc + abap2UI5 - view parser cc 1 X X diff --git a/src/02/02/z2ui5_cl_pop_get_range.clas.abap b/src/02/02/z2ui5_cl_pop_get_range.clas.abap index de85423d..38af2714 100644 --- a/src/02/02/z2ui5_cl_pop_get_range.clas.abap +++ b/src/02/02/z2ui5_cl_pop_get_range.clas.abap @@ -19,7 +19,7 @@ CLASS z2ui5_cl_pop_get_range DEFINITION CLASS-METHODS factory IMPORTING - t_range TYPE z2ui5_cl_util=>ty_t_range OPTIONAL + t_range TYPE any table OPTIONAL RETURNING VALUE(r_result) TYPE REF TO z2ui5_cl_pop_get_range. @@ -51,7 +51,14 @@ CLASS Z2UI5_CL_POP_GET_RANGE IMPLEMENTATION. METHOD factory. r_result = NEW #( ). - r_result->ms_result-t_range = t_range. + + z2ui5_cl_util=>itab_corresponding( + EXPORTING + val = t_range + CHANGING + tab = r_result->ms_result-t_range + ). + INSERT VALUE #( ) INTO TABLE r_result->ms_result-t_range. ENDMETHOD. diff --git a/src/02/02/z2ui5_cl_pop_get_range.clas.xml b/src/02/02/z2ui5_cl_pop_get_range.clas.xml index 4bb4c37e..ce02e8b8 100644 --- a/src/02/02/z2ui5_cl_pop_get_range.clas.xml +++ b/src/02/02/z2ui5_cl_pop_get_range.clas.xml @@ -5,7 +5,7 @@ Z2UI5_CL_POP_GET_RANGE E - ui - popup get range +  ui - popup get range 1 X X diff --git a/src/02/03/package.devc.xml b/src/02/03/package.devc.xml new file mode 100644 index 00000000..64836ab4 --- /dev/null +++ b/src/02/03/package.devc.xml @@ -0,0 +1,10 @@ + + + + + + abap2UI5 - api + + + + diff --git a/src/02/z2ui5_cl_http_handler.clas.abap b/src/02/03/z2ui5_cl_http_handler.clas.abap similarity index 100% rename from src/02/z2ui5_cl_http_handler.clas.abap rename to src/02/03/z2ui5_cl_http_handler.clas.abap diff --git a/src/02/z2ui5_cl_http_handler.clas.testclasses.abap b/src/02/03/z2ui5_cl_http_handler.clas.testclasses.abap similarity index 100% rename from src/02/z2ui5_cl_http_handler.clas.testclasses.abap rename to src/02/03/z2ui5_cl_http_handler.clas.testclasses.abap diff --git a/src/02/z2ui5_cl_http_handler.clas.xml b/src/02/03/z2ui5_cl_http_handler.clas.xml similarity index 100% rename from src/02/z2ui5_cl_http_handler.clas.xml rename to src/02/03/z2ui5_cl_http_handler.clas.xml diff --git a/src/02/z2ui5_if_app.intf.abap b/src/02/03/z2ui5_if_app.intf.abap similarity index 100% rename from src/02/z2ui5_if_app.intf.abap rename to src/02/03/z2ui5_if_app.intf.abap diff --git a/src/02/z2ui5_if_app.intf.xml b/src/02/03/z2ui5_if_app.intf.xml similarity index 100% rename from src/02/z2ui5_if_app.intf.xml rename to src/02/03/z2ui5_if_app.intf.xml diff --git a/src/02/z2ui5_if_client.intf.abap b/src/02/03/z2ui5_if_client.intf.abap similarity index 100% rename from src/02/z2ui5_if_client.intf.abap rename to src/02/03/z2ui5_if_client.intf.abap diff --git a/src/02/z2ui5_if_client.intf.xml b/src/02/03/z2ui5_if_client.intf.xml similarity index 100% rename from src/02/z2ui5_if_client.intf.xml rename to src/02/03/z2ui5_if_client.intf.xml diff --git a/src/02/z2ui5_if_types.intf.abap b/src/02/03/z2ui5_if_types.intf.abap similarity index 100% rename from src/02/z2ui5_if_types.intf.abap rename to src/02/03/z2ui5_if_types.intf.abap diff --git a/src/02/z2ui5_if_types.intf.xml b/src/02/03/z2ui5_if_types.intf.xml similarity index 100% rename from src/02/z2ui5_if_types.intf.xml rename to src/02/03/z2ui5_if_types.intf.xml