From 2de38986151251a430d27b95f091747c038f8996 Mon Sep 17 00:00:00 2001 From: atsy Date: Sat, 14 May 2016 17:57:41 +0300 Subject: [PATCH] Merge with master fix --- zabapgit.prog.abap | 144 +++------------------------------------------ 1 file changed, 9 insertions(+), 135 deletions(-) diff --git a/zabapgit.prog.abap b/zabapgit.prog.abap index e41a3fa45..0cc4b7288 100644 --- a/zabapgit.prog.abap +++ b/zabapgit.prog.abap @@ -17288,15 +17288,9 @@ CLASS lcl_gui_page_diff DEFINITION FINAL. DATA: ms_result TYPE lcl_file_status=>ty_result, mo_diff TYPE REF TO lcl_diff. -<<<<<<< HEAD METHODS styles RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper. METHODS render_head RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper. METHODS render_diff RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper. -======= - METHODS: - render_stats - RETURNING VALUE(rv_html) TYPE string. ->>>>>>> master ENDCLASS. @@ -17370,6 +17364,7 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. 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 {' ). "#EC NOTEXT @@ -17380,7 +17375,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ro_html = lo_html. ENDMETHOD. -<<<<<<< HEAD METHOD render_head. DATA lo_html TYPE REF TO lcl_html_helper. DATA ls_count TYPE lcl_diff=>ty_count. @@ -17401,15 +17395,9 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ro_html = lo_html. ENDMETHOD. -======= - METHOD render_stats. - - DATA: ls_count TYPE lcl_diff=>ty_count. ->>>>>>> master METHOD render_diff. -<<<<<<< HEAD DATA lo_html TYPE REF TO lcl_html_helper. DATA lt_diffs TYPE lcl_diff=>ty_diffs_tt. DATA lv_index TYPE i. @@ -17421,74 +17409,10 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. DATA lv_anchor_name TYPE string. FIELD-SYMBOLS: LIKE LINE OF lt_diffs. -======= - ls_count = mo_diff->stats( ). - rv_html = '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '
Insert' && - ls_count-insert && - '
Delete' && - ls_count-delete && - '
Update' && - ls_count-update && - '

' && gc_newline. - - ENDMETHOD. - - METHOD lif_gui_page~render. - - DATA: lv_html TYPE string, - lv_local TYPE string, - lv_remote TYPE string, - lv_clocal TYPE string, - lv_cremote TYPE string, - lv_index TYPE i, - lt_diffs TYPE lcl_diff=>ty_diffs_tt, - lv_anchor_count LIKE sy-tabix, - lv_break TYPE string, - lv_href TYPE string. - - FIELD-SYMBOLS: LIKE LINE OF lt_diffs, - LIKE LINE OF lt_diffs. - - - lv_html = lcl_gui=>header( ) && - '' && - '
' && - '

' && - ms_result-obj_type && ' ' && - ms_result-obj_name && ' ' && - ms_result-filename && '



' && - render_stats( ). - - lv_html = lv_html && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - || && gc_newline && - '' && gc_newline && - ''. ->>>>>>> master CREATE OBJECT lo_html. lt_diffs = mo_diff->get( ). -<<<<<<< HEAD lo_html->add( '
' ). "#EC NOTEXT lo_html->add( '
' && gc_newline && - '

Local

<>' && gc_newline && - '

Remote

' ). "#EC NOTEXT lo_html->add( '' ). "#EC NOTEXT @@ -17502,27 +17426,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. 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 ). -======= - LOOP AT lt_diffs ASSIGNING WHERE short = abap_true. - lv_index = sy-tabix + 1. - READ TABLE lt_diffs INDEX lv_index ASSIGNING . - IF sy-subrc = 0 AND -short = abap_false. - lv_break = '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '' && gc_newline && - ''. - ELSE. - CLEAR lv_break. - ENDIF. - - lv_local = escape( val = -local - format = cl_abap_format=>e_html_attr ). - lv_remote = escape( val = -remote - format = cl_abap_format=>e_html_attr ). ->>>>>>> master CLEAR: lv_attr_local, lv_attr_remote. CASE -result. @@ -17535,13 +17438,12 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. lv_attr_remote = ' class="diff_del"'. "#EC NOTEXT ENDCASE. -<<<<<<< HEAD - 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( || ). "#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 ENDLOOP. @@ -17551,7 +17453,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. ro_html = lo_html. ENDMETHOD. - METHOD lif_gui_page~on_event. CASE iv_action. @@ -17568,6 +17469,8 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. DATA: lv_html TYPE string. DATA lo_html TYPE REF TO lcl_html_helper. + CREATE OBJECT lo_html. + * REDO lv_html = lcl_gui=>header( ). @@ -17587,35 +17490,6 @@ CLASS lcl_gui_page_diff IMPLEMENTATION. lo_html->add( lcl_gui=>footer( ) ). rv_html = lo_html->mv_html. -======= - IF -result = lcl_diff=>c_diff-delete - OR -result = lcl_diff=>c_diff-insert - OR -result = lcl_diff=>c_diff-update. - lv_anchor_count = lv_anchor_count + 1. - lv_href = |{ -result }|. - ELSE. - CLEAR lv_href. - ENDIF. - - lv_html = lv_html && - '' && gc_newline && - '' && gc_newline && - '
' && lv_local && '
' && gc_newline && - '' && gc_newline && - '' && gc_newline && - '
' && lv_remote && '
' && gc_newline && - '' && lv_break && gc_newline. - ENDLOOP. - - rv_html = lv_html && gc_newline && - '
 
 
{ lv_index }
{ -local_line }{ -remote_line }
' && -local_line && ' ' && lv_href && ' ' && -remote_line && '
' && gc_newline && - '
' && gc_newline && - lcl_gui=>footer( ). ->>>>>>> master ENDMETHOD.