diff --git a/zabapgit.prog.abap b/zabapgit.prog.abap index 6fb8b69a0..06803fa24 100644 --- a/zabapgit.prog.abap +++ b/zabapgit.prog.abap @@ -3,7 +3,7 @@ REPORT zabapgit. * See http://www.abapgit.org CONSTANTS: gc_xml_version TYPE string VALUE 'v1.0.0', "#EC NOTEXT - gc_abap_version TYPE string VALUE 'v1.7.1'. "#EC NOTEXT + gc_abap_version TYPE string VALUE 'v1.7.2'. "#EC NOTEXT ******************************************************************************** * The MIT License (MIT) @@ -14831,7 +14831,7 @@ CLASS lcl_html_helper DEFINITION FINAL. METHODS _add_str IMPORTING iv_str TYPE csequence. METHODS _add_htm IMPORTING io_html TYPE REF TO lcl_html_helper. -endclass. "lcl_html_helper DEFINITION +ENDCLASS. "lcl_html_helper DEFINITION *----------------------------------------------------------------------* * CLASS lcl_html_helper IMPLEMENTATION @@ -14844,18 +14844,18 @@ CLASS lcl_html_helper IMPLEMENTATION. lo_type = cl_abap_typedescr=>describe_by_data( iv_chunk ). CASE lo_type->type_kind. - WHEN cl_abap_typedescr=>typekind_char OR cl_abap_typedescr=>typekind_string. - _add_str( iv_chunk ). - WHEN cl_abap_typedescr=>typekind_oref. - ASSERT iv_chunk IS BOUND. " Dev mistake - TRY. - lo_html ?= iv_chunk. - CATCH cx_sy_move_cast_error. + WHEN cl_abap_typedescr=>typekind_char OR cl_abap_typedescr=>typekind_string. + _add_str( iv_chunk ). + WHEN cl_abap_typedescr=>typekind_oref. + ASSERT iv_chunk IS BOUND. " Dev mistake + TRY. + lo_html ?= iv_chunk. + CATCH cx_sy_move_cast_error. + ASSERT 1 = 0. " Dev mistake + ENDTRY. + _add_htm( lo_html ). + WHEN OTHERS. ASSERT 1 = 0. " Dev mistake - ENDTRY. - _add_htm( lo_html ). - WHEN OTHERS. - ASSERT 1 = 0. " Dev mistake ENDCASE. ENDMETHOD. " add @@ -17348,73 +17348,73 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. DATA lo_html TYPE REF TO lcl_html_helper. CREATE OBJECT lo_html. - lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '}' ). "#EC NOTEXT + lo_html->add( 'table.diff_tab th {' ). "#EC NOTEXT + lo_html->add( ' color: grey;' ). "#EC NOTEXT + lo_html->add( ' text-align: left;' ). "#EC NOTEXT + lo_html->add( ' font-weight: normal;' ). "#EC NOTEXT + lo_html->add( ' padding: 0.5em;' ). "#EC NOTEXT + lo_html->add( '}' ). "#EC NOTEXT + lo_html->add( 'table.diff_tab td {' ). "#EC NOTEXT + lo_html->add( ' color: #333;' ). "#EC NOTEXT + lo_html->add( ' padding-left: 0.5em;' ). "#EC NOTEXT + lo_html->add( ' padding-right: 0.5em;' ). "#EC NOTEXT + lo_html->add( '}' ). "#EC NOTEXT + lo_html->add( 'table.diff_tab td.num, th.num {' ). "#EC NOTEXT + lo_html->add( ' text-align: right;' ). "#EC NOTEXT + lo_html->add( ' color: #ccc;' ). "#EC NOTEXT + lo_html->add( ' border-left: 1px solid #eee;' ). "#EC NOTEXT + lo_html->add( ' border-right: 1px solid #eee;' ). "#EC NOTEXT + lo_html->add( '}' ). "#EC NOTEXT + lo_html->add( 'table.diff_tab td.cmd, th.cmd {' ). "#EC NOTEXT + lo_html->add( ' font-size: smaller;' ). "#EC NOTEXT + lo_html->add( ' text-align: center !important;' ). "#EC NOTEXT + lo_html->add( ' white-space: nowrap;' ). "#EC NOTEXT + lo_html->add( '}' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT ro_html = lo_html. ENDMETHOD. @@ -17426,16 +17426,16 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ls_count = mo_diff->stats( ). - lo_html->add( '
' ). "#EC NOTEXT + lo_html->add( '
' ). "#EC NOTEXT lo_html->add( |+ { ls_count-insert }| ). "#EC NOTEXT lo_html->add( |- { ls_count-delete }| ). "#EC NOTEXT lo_html->add( |~ { ls_count-update }| ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( ms_result-obj_type ). "#EC NOTEXT - lo_html->add( |{ ms_result-obj_name }| ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( ms_result-obj_type ). "#EC NOTEXT + lo_html->add( |{ ms_result-obj_name }| ). "#EC NOTEXT lo_html->add( |({ ms_result-filename })| ). - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '
' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '
' ). "#EC NOTEXT ro_html = lo_html. ENDMETHOD. @@ -17458,17 +17458,17 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. CREATE OBJECT lo_html. lt_diffs = mo_diff->get( ). - lo_html->add( '
' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '
' ). "#EC NOTEXT + lo_html->add( '
@LOCAL@REMOTE▼ 1
' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT - LOOP AT lt_diffs ASSIGNING . + LOOP AT lt_diffs ASSIGNING WHERE short = abap_true. lv_index = sy-tabix. lv_local = escape( val = -local format = cl_abap_format=>e_html_attr ). lv_remote = escape( val = -remote format = cl_abap_format=>e_html_attr ). @@ -17476,31 +17476,31 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. CLEAR: lv_attr_local, lv_attr_remote. " Class for changed lines CASE -result. WHEN lcl_diff=>c_diff-insert. - lv_attr_local = ' class="diff_ins"'. "#EC NOTEXT + lv_attr_local = ' class="diff_ins"'. "#EC NOTEXT WHEN lcl_diff=>c_diff-delete. - lv_attr_remote = ' class="diff_del"'. "#EC NOTEXT + lv_attr_remote = ' class="diff_del"'. "#EC NOTEXT WHEN lcl_diff=>c_diff-update. - lv_attr_local = ' class="diff_ins"'. "#EC NOTEXT - lv_attr_remote = ' class="diff_del"'. "#EC NOTEXT + lv_attr_local = ' class="diff_upd"'. "#EC NOTEXT + lv_attr_remote = ' class="diff_upd"'. "#EC NOTEXT ENDCASE. CLEAR lv_href. " Create link to next change IF -result = lcl_diff=>c_diff-delete - OR -result = lcl_diff=>c_diff-insert - OR -result = lcl_diff=>c_diff-update. + OR -result = lcl_diff=>c_diff-insert + OR -result = lcl_diff=>c_diff-update. lv_anchor_count = lv_anchor_count + 1. lv_href = |▼ { lv_anchor_count + 1 }|. ENDIF. - lo_html->add( '' ). "#EC NOTEXT - lo_html->add( || ). "#EC NOTEXT - lo_html->add( |{ lv_local }| ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( || ). "#EC NOTEXT + lo_html->add( |
{ lv_local }
| ). "#EC NOTEXT lo_html->add( |
| ). "#EC NOTEXT - lo_html->add( |{ lv_remote }| ). "#EC NOTEXT - lo_html->add( || ). "#EC NOTEXT - lo_html->add( '' ). "#EC NOTEXT + lo_html->add( |
{ lv_remote }
| ). "#EC NOTEXT + lo_html->add( |
| ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT " TODO Refactor ? READ TABLE lt_diffs INDEX lv_index ASSIGNING . @@ -17510,8 +17510,8 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ENDLOOP. - lo_html->add( '
@LOCAL@REMOTE▼ 1
{ -local_line }
{ -local_line }{ -remote_line }{ lv_href }
{ lv_href }
' ). "#EC NOTEXT - lo_html->add( '
' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT + lo_html->add( '' ). "#EC NOTEXT ro_html = lo_html. ENDMETHOD. @@ -17522,15 +17522,15 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. WHEN 'back'. lcl_gui=>back( ). WHEN OTHERS. - _raise 'Unknown action'. "#EC NOTEXT + _raise 'Unknown action'. "#EC NOTEXT ENDCASE. ENDMETHOD. METHOD lif_gui_page~render. - DATA: lv_html TYPE string. - DATA lo_html TYPE REF TO lcl_html_helper. + DATA: lv_html TYPE string, + lo_html TYPE REF TO lcl_html_helper. CREATE OBJECT lo_html. @@ -17538,18 +17538,18 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. lv_html = lcl_gui=>header( ). "TODO: crutch, redo later after unification - replace first occurrence of '' in lv_html - with '' && styles( )->mv_html. + REPLACE FIRST OCCURRENCE OF '' IN lv_html + WITH '' && styles( )->mv_html. "TODO: crutch, move to SAP back button (code almost ready) lv_html = lv_html && '
' && 'Back' && '
'. lo_html->add( lv_html ). * ^^^ REDO - lo_html->add( '
' ). "#EC NOTEXT + lo_html->add( '
' ). "#EC NOTEXT lo_html->add( render_head( ) ). lo_html->add( render_diff( ) ). - lo_html->add( '
' ). "#EC NOTEXT + lo_html->add( '
' ). "#EC NOTEXT lo_html->add( lcl_gui=>footer( ) ). rv_html = lo_html->mv_html.