From b04226e8f12039935ce6894609ee8edfc2bdcae7 Mon Sep 17 00:00:00 2001 From: Gregor Wolf Date: Thu, 28 Feb 2019 16:23:18 +0000 Subject: [PATCH] Add missing sy-subrc to exception --- src/objects/zcl_abapgit_oo_base.clas.abap | 55 ++++++++++--------- src/objects/zcl_abapgit_oo_class.clas.abap | 18 +++--- .../zcl_abapgit_oo_serializer.clas.abap | 2 +- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/objects/zcl_abapgit_oo_base.clas.abap b/src/objects/zcl_abapgit_oo_base.clas.abap index 7d49a66b2..36168c468 100644 --- a/src/objects/zcl_abapgit_oo_base.clas.abap +++ b/src/objects/zcl_abapgit_oo_base.clas.abap @@ -26,7 +26,21 @@ ENDCLASS. -CLASS zcl_abapgit_oo_base IMPLEMENTATION. +CLASS ZCL_ABAPGIT_OO_BASE IMPLEMENTATION. + + + METHOD convert_attrib_to_vseoattrib. + FIELD-SYMBOLS: LIKE LINE OF it_attributes, + LIKE LINE OF rt_vseoattrib. + + LOOP AT it_attributes ASSIGNING . + INSERT INITIAL LINE INTO TABLE rt_vseoattrib ASSIGNING . + MOVE-CORRESPONDING TO . + -clsname = iv_clsname. + UNASSIGN . + ENDLOOP. + UNASSIGN . + ENDMETHOD. METHOD deserialize_abap_source_new. @@ -99,7 +113,7 @@ CLASS zcl_abapgit_oo_base IMPLEMENTATION. class_not_existing = 1 OTHERS = 2. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from CL_OO_SOURCE' ). + zcx_abapgit_exception=>raise( |Error from CL_OO_SOURCE. Subrc = { sy-subrc }| ). ENDIF. TRY. @@ -138,7 +152,7 @@ CLASS zcl_abapgit_oo_base IMPLEMENTATION. ret_code = 1 OTHERS = 2. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from DOCU_UPD' ). + zcx_abapgit_exception=>raise( |Error from DOCU_UPD. Subrc = { sy-subrc }| ). ENDIF. ENDMETHOD. @@ -211,6 +225,17 @@ CLASS zcl_abapgit_oo_base IMPLEMENTATION. ENDMETHOD. + METHOD zif_abapgit_oo_object_fnc~read_attributes. + SELECT cmpname attbusobj attkeyfld + FROM seocompodf + INTO CORRESPONDING FIELDS OF TABLE rt_attributes + WHERE clsname = iv_object_name + AND ( attbusobj <> space OR attkeyfld <> space ) + AND version = '1' + ORDER BY PRIMARY KEY. + ENDMETHOD. + + METHOD zif_abapgit_oo_object_fnc~read_descriptions. SELECT * FROM seocompotx INTO TABLE rt_descriptions WHERE clsname = iv_obejct_name @@ -288,28 +313,4 @@ CLASS zcl_abapgit_oo_base IMPLEMENTATION. DELETE FROM seocompotx WHERE clsname = is_key-clsname. "#EC CI_SUBRC INSERT seocompotx FROM TABLE it_descriptions. "#EC CI_SUBRC ENDMETHOD. - - METHOD zif_abapgit_oo_object_fnc~read_attributes. - SELECT cmpname attbusobj attkeyfld - FROM seocompodf - INTO CORRESPONDING FIELDS OF TABLE rt_attributes - WHERE clsname = iv_object_name - AND ( attbusobj <> space OR attkeyfld <> space ) - AND version = '1' - ORDER BY PRIMARY KEY. - ENDMETHOD. - - - METHOD convert_attrib_to_vseoattrib. - FIELD-SYMBOLS: LIKE LINE OF it_attributes, - LIKE LINE OF rt_vseoattrib. - - LOOP AT it_attributes ASSIGNING . - INSERT INITIAL LINE INTO TABLE rt_vseoattrib ASSIGNING . - MOVE-CORRESPONDING TO . - -clsname = iv_clsname. - UNASSIGN . - ENDLOOP. - UNASSIGN . - ENDMETHOD. ENDCLASS. diff --git a/src/objects/zcl_abapgit_oo_class.clas.abap b/src/objects/zcl_abapgit_oo_class.clas.abap index 08c8c5c98..f596ca757 100644 --- a/src/objects/zcl_abapgit_oo_class.clas.abap +++ b/src/objects/zcl_abapgit_oo_class.clas.abap @@ -134,7 +134,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. internal_error_insert_report = 11 OTHERS = 12. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from SEO_METHOD_GENERATE_INCLUDE' ). + zcx_abapgit_exception=>raise( |Error from SEO_METHOD_GENERATE_INCLUDE. Subrc = { sy-subrc }| ). ENDIF. rv_program = cl_oo_classname_service=>get_method_include( ls_mtdkey ). @@ -174,7 +174,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. _internal_class_overflow = 19 OTHERS = 20. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from SEO_CLASS_GENERATE_CLASSPOOL' ). + zcx_abapgit_exception=>raise( |Error from SEO_CLASS_GENERATE_CLASSPOOL. Subrc = { sy-subrc }| ). ENDIF. ENDMETHOD. @@ -283,7 +283,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. OTHERS = 3. ENDTRY. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error instantiating CL_OO_CLASS_SECTION_SOURCE' ). + zcx_abapgit_exception=>raise( |Error instantiating CL_OO_CLASS_SECTION_SOURCE. Subrc = { sy-subrc }| ). ENDIF. lo_update->set_dark_mode( seox_true ). @@ -301,7 +301,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. scan_abap_source_error = 1 OTHERS = 2 ). IF sy-subrc <> 0 OR lv_scan_error = abap_true. - zcx_abapgit_exception=>raise( 'CLAS, error while scanning source' ). + zcx_abapgit_exception=>raise( |CLAS, error while scanning source. Subrc = { sy-subrc }| ). ENDIF. * this will update the SEO* database tables @@ -397,7 +397,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. other = 6 OTHERS = 7. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( |error from SEO_CLASS_CREATE_COMPLETE: { sy-subrc }| ). + zcx_abapgit_exception=>raise( |Error from SEO_CLASS_CREATE_COMPLETE. Subrc = { sy-subrc }| ). ENDIF. ENDMETHOD. @@ -421,7 +421,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. object_not_found = 1 OTHERS = 2. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from SOTR_OBJECT_GET_OBJECTS' ). + zcx_abapgit_exception=>raise( |error from SOTR_OBJECT_GET_OBJECTS. Subrc = { sy-subrc }| ). ENDIF. READ TABLE lt_objects INDEX 1 INTO lv_object. @@ -458,7 +458,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. no_entry_found = 18 OTHERS = 19. IF sy-subrc <> 0 AND sy-subrc <> 5. - zcx_abapgit_exception=>raise( 'error from SOTR_CREATE_CONCEPT,' && sy-subrc ). + zcx_abapgit_exception=>raise( |Error from SOTR_CREATE_CONCEPT. Subrc = { sy-subrc }| ). ENDIF. ENDLOOP. @@ -481,7 +481,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. * this can happen when the SXCI object is deleted before the implementing CLAS RETURN. ELSEIF sy-subrc <> 0. - zcx_abapgit_exception=>raise( |Error from SEO_CLASS_DELETE_COMPLETE: { sy-subrc }| ). + zcx_abapgit_exception=>raise( |Error from SEO_CLASS_DELETE_COMPLETE. Subrc = { sy-subrc }| ). ENDIF. ENDMETHOD. @@ -629,7 +629,7 @@ CLASS ZCL_ABAPGIT_OO_CLASS IMPLEMENTATION. IF sy-subrc = 1. RETURN. " in case only inactive version exists ELSEIF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from seo_clif_get' ). + zcx_abapgit_exception=>raise( |Error from SEO_CLIF_GET. Subrc = { sy-subrc }| ). ENDIF. ENDMETHOD. diff --git a/src/objects/zcl_abapgit_oo_serializer.clas.abap b/src/objects/zcl_abapgit_oo_serializer.clas.abap index dc8cf9f38..623c2af5d 100644 --- a/src/objects/zcl_abapgit_oo_serializer.clas.abap +++ b/src/objects/zcl_abapgit_oo_serializer.clas.abap @@ -250,7 +250,7 @@ CLASS ZCL_ABAPGIT_OO_SERIALIZER IMPLEMENTATION. class_not_existing = 1 OTHERS = 2. IF sy-subrc <> 0. - zcx_abapgit_exception=>raise( 'error from CL_OO_SOURCE' ). + zcx_abapgit_exception=>raise( |Error from CL_OO_SOURCE. Subrc = { sy-subrc }| ). ENDIF. lo_source->read( 'A' ).