From 0fa4ed299eba7f4ffa4101dbfd68f119c84e9962 Mon Sep 17 00:00:00 2001
From: Christian Guenter <christianguenter@googlemail.com>
Date: Tue, 7 Aug 2018 08:14:07 +0000
Subject: [PATCH] downport 702

---
 .../zcl_abapgit_ecatt_config_downl.clas.abap  |  6 ++++--
 .../ecatt/zcl_abapgit_ecatt_helper.clas.abap  |  4 ++--
 .../zcl_abapgit_ecatt_sp_upload.clas.abap     | 20 +++++++++++++++----
 .../zcl_abapgit_ecatt_val_obj_upl.clas.abap   | 14 +++++++++----
 .../zcl_abapgit_gui_page_code_insp.clas.abap  |  9 ++++++++-
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/objects/ecatt/zcl_abapgit_ecatt_config_downl.clas.abap b/src/objects/ecatt/zcl_abapgit_ecatt_config_downl.clas.abap
index e049aeee5..54f23c5cf 100644
--- a/src/objects/ecatt/zcl_abapgit_ecatt_config_downl.clas.abap
+++ b/src/objects/ecatt/zcl_abapgit_ecatt_config_downl.clas.abap
@@ -28,7 +28,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_ECATT_CONFIG_DOWNL IMPLEMENTATION.
+CLASS zcl_abapgit_ecatt_config_downl IMPLEMENTATION.
 
 
   METHOD download.
@@ -56,7 +56,9 @@ CLASS ZCL_ABAPGIT_ECATT_CONFIG_DOWNL IMPLEMENTATION.
 
     set_attributes_to_template( ).
     ecatt_config ?= ecatt_object.
-    set_ecatt_objects_to_template( ).
+
+    CALL METHOD ('SET_ECATT_OBJECTS_TO_TEMPLATE'). " doesn't exist in 702
+
 * MS180406
     set_var_mode_to_dom( ).
 * ENDMS180406
diff --git a/src/objects/ecatt/zcl_abapgit_ecatt_helper.clas.abap b/src/objects/ecatt/zcl_abapgit_ecatt_helper.clas.abap
index 9ce36d6d5..b43a82d3a 100644
--- a/src/objects/ecatt/zcl_abapgit_ecatt_helper.clas.abap
+++ b/src/objects/ecatt/zcl_abapgit_ecatt_helper.clas.abap
@@ -133,8 +133,8 @@ CLASS zcl_abapgit_ecatt_helper IMPLEMENTATION.
         ex_dom = ri_template_over_all ).
 
 * MD: Workaround, because nodes starting with "XML" are not allowed
-    lv_nc_xmlref_typ = ri_template_over_all->get_elements_by_tag_name_ns(
-                      'XMLREF_TYP' ).                       "#EC NOTEXT
+    lv_nc_xmlref_typ ?= ri_template_over_all->get_elements_by_tag_name_ns(
+                          'XMLREF_TYP' ).                   "#EC NOTEXT
     lv_count = lv_nc_xmlref_typ->get_length( ).
     WHILE lv_index LT lv_count.
       lv_n_xmlref_typ = lv_nc_xmlref_typ->get_item( lv_index ).
diff --git a/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap b/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap
index 1ec57613c..798859fe0 100644
--- a/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap
+++ b/src/objects/ecatt/zcl_abapgit_ecatt_sp_upload.clas.abap
@@ -28,7 +28,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION.
+CLASS zcl_abapgit_ecatt_sp_upload IMPLEMENTATION.
 
 
   METHOD get_ecatt_sp.
@@ -96,11 +96,21 @@ CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION.
           lv_exception_occurred TYPE etonoff,
           lo_ecatt_sp           TYPE REF TO object.
 
-    FIELD-SYMBOLS: <ecatt_sp> TYPE any.
+    FIELD-SYMBOLS: <ecatt_sp> TYPE any,
+                   <lv_d_akh> TYPE data,
+                   <lv_i_akh> TYPE data.
 
     TRY.
         ch_object-i_devclass = ch_object-d_devclass.
-        ch_object-i_akh      = ch_object-d_akh.
+
+        ASSIGN COMPONENT 'D_AKH' OF STRUCTURE ch_object
+               TO <lv_d_akh>. " doesn't exist in 702
+        ASSIGN COMPONENT 'I_AKH' OF STRUCTURE ch_object
+               TO <lv_i_akh>. " doesn't exist in 702
+        IF  <lv_d_akh> IS ASSIGNED
+        AND <lv_i_akh> IS ASSIGNED.
+          <lv_i_akh> = <lv_d_akh>.
+        ENDIF.
 
         super->upload(
           CHANGING
@@ -117,7 +127,9 @@ CLASS ZCL_ABAPGIT_ECATT_SP_UPLOAD IMPLEMENTATION.
     ENDTRY.
 
     TRY.
-        get_attributes_from_dom_new( CHANGING ch_object = ch_object ).
+        CALL METHOD ('GET_ATTRIBUTES_FROM_DOM_NEW') " doesn't exist in 720
+          CHANGING
+            ch_object = ch_object.
       CATCH cx_ecatt_apl INTO lx_ecatt.
         lv_exc_occ = 'X'.
     ENDTRY.
diff --git a/src/objects/ecatt/zcl_abapgit_ecatt_val_obj_upl.clas.abap b/src/objects/ecatt/zcl_abapgit_ecatt_val_obj_upl.clas.abap
index 54ac07db4..9b38193c5 100644
--- a/src/objects/ecatt/zcl_abapgit_ecatt_val_obj_upl.clas.abap
+++ b/src/objects/ecatt/zcl_abapgit_ecatt_val_obj_upl.clas.abap
@@ -222,15 +222,19 @@ CLASS zcl_abapgit_ecatt_val_obj_upl IMPLEMENTATION.
 
     FIELD-SYMBOLS: <lg_ecatt_vo> TYPE any,
                    <lg_params>   TYPE data,
-                   <lv_d_akh>    TYPE data.
+                   <lv_d_akh>    TYPE data,
+                   <lv_i_akh>    TYPE data.
 
     TRY.
         ch_object-i_devclass = ch_object-d_devclass.
 
         ASSIGN COMPONENT 'D_AKH' OF STRUCTURE ch_object
                TO <lv_d_akh>. " doesn't exist in 702
-        IF sy-subrc = 0.
-          ch_object-i_akh = <lv_d_akh>.
+        ASSIGN COMPONENT 'I_AKH' OF STRUCTURE ch_object
+               TO <lv_i_akh>. " doesn't exist in 702
+        IF  <lv_d_akh> IS ASSIGNED
+        AND <lv_i_akh> IS ASSIGNED.
+          <lv_i_akh> = <lv_d_akh>.
         ENDIF.
 
         super->upload(
@@ -247,7 +251,9 @@ CLASS zcl_abapgit_ecatt_val_obj_upl IMPLEMENTATION.
     ENDTRY.
 
     TRY.
-        get_attributes_from_dom_new( CHANGING ch_object = ch_object ).
+        CALL METHOD ('GET_ATTRIBUTES_FROM_DOM_NEW') " doesn't exit in 702
+          CHANGING
+            ch_object = ch_object.
       CATCH cx_ecatt_apl INTO lx_ex.
         lv_exc_occ = 'X'.
     ENDTRY.
diff --git a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap b/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap
index 5c2e891f9..98e7e02f2 100644
--- a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap
+++ b/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap
@@ -159,12 +159,19 @@ CLASS zcl_abapgit_gui_page_code_insp IMPLEMENTATION.
 
     MOVE-CORRESPONDING <ls_result> TO ls_info.
 
-    lo_test = cl_ci_tests=>get_test_ref( <ls_result>-test ).
+    TRY.
+        lo_test ?= cl_ci_tests=>get_test_ref( <ls_result>-test ).
+
+      CATCH cx_root.
+        zcx_abapgit_exception=>raise( |Jump to object not supported in your NW release|  ).
+    ENDTRY.
+
     lo_result = lo_test->get_result_node( <ls_result>-kind ).
 
     lo_result->set_info( ls_info ).
     lo_result->if_ci_test~navigate( ).
 
+
   ENDMETHOD.