From 443405203544745e9fd35de0d2b7867c71db171e Mon Sep 17 00:00:00 2001
From: larshp <larshp@hotmail.com>
Date: Mon, 5 Jun 2017 16:02:55 +0000
Subject: [PATCH] remove macro _add

---
 src/zabapgit_html.prog.abap                 |  4 --
 src/zabapgit_page_branch_overview.prog.abap | 36 ++++++-------
 src/zabapgit_page_commit.prog.abap          |  2 +-
 src/zabapgit_page_merge.prog.abap           | 36 ++++++-------
 src/zabapgit_view_tutorial.prog.abap        | 60 ++++++++++-----------
 5 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/src/zabapgit_html.prog.abap b/src/zabapgit_html.prog.abap
index d37308a0a..7a77608d8 100644
--- a/src/zabapgit_html.prog.abap
+++ b/src/zabapgit_html.prog.abap
@@ -2,10 +2,6 @@
 *&  Include           ZABAPGIT_HTML
 *&---------------------------------------------------------------------*
 
-DEFINE _add.
-  ro_html->add( &1 ) ##NO_TEXT.
-END-OF-DEFINITION.
-
 *----------------------------------------------------------------------*
 *       CLASS lcl_html DEFINITION
 *----------------------------------------------------------------------*
diff --git a/src/zabapgit_page_branch_overview.prog.abap b/src/zabapgit_page_branch_overview.prog.abap
index e67b5d96e..e1d3d2347 100644
--- a/src/zabapgit_page_branch_overview.prog.abap
+++ b/src/zabapgit_page_branch_overview.prog.abap
@@ -432,30 +432,30 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
     ro_html->add( build_menu( )->render( ) ).
 
 * see http://stackoverflow.com/questions/6081483/maximum-size-of-a-canvas-element
-    _add '<canvas id="gitGraph"></canvas>'.
+    ro_html->add( '<canvas id="gitGraph"></canvas>' ).
 
     ro_html->add( '<script type="text/javascript" src="https://cdnjs.' &&
       'cloudflare.com/ajax/libs/gitgraph.js/1.2.3/gitgraph.min.js">' &&
       '</script>' ) ##NO_TEXT.
 
-    _add '<script type="text/javascript">'.
-    _add 'var myTemplateConfig = {'.
+    ro_html->add( '<script type="text/javascript">' ).
+    ro_html->add( 'var myTemplateConfig = {' ).
     ro_html->add( 'colors: [ "#979797", "#008fb5", "#f1c109", "'
       && '#095256", "#087F8C", "#5AAA95", "#86A873", "#BB9F06" ],' ) ##NO_TEXT.
-    _add 'branch: {'.
-    _add '  lineWidth: 8,'.
-    _add '  spacingX: 50'.
-    _add '},'.
-    _add 'commit: {'.
-    _add '  spacingY: -40,'.
-    _add '  dot: { size: 12 },'.
-    _add '  message: { font: "normal 14pt Arial" }'.
-    _add '}'.
-    _add '};'.
-    _add 'var gitgraph = new GitGraph({'.
-    _add '  template: myTemplateConfig,'.
-    _add '  orientation: "vertical-reverse"'.
-    _add '});'.
+    ro_html->add( 'branch: {' ).
+    ro_html->add( '  lineWidth: 8,' ).
+    ro_html->add( '  spacingX: 50' ).
+    ro_html->add( '},' ).
+    ro_html->add( 'commit: {' ).
+    ro_html->add( '  spacingY: -40,' ).
+    ro_html->add( '  dot: { size: 12 },' ).
+    ro_html->add( '  message: { font: "normal 14pt Arial" }' ).
+    ro_html->add( '}' ).
+    ro_html->add( '};' ).
+    ro_html->add( 'var gitgraph = new GitGraph({' ).
+    ro_html->add( '  template: myTemplateConfig,' ).
+    ro_html->add( '  orientation: "vertical-reverse"' ).
+    ro_html->add( '});' ).
 
     LOOP AT mt_commits ASSIGNING <ls_commit>.
       IF sy-tabix = 1.
@@ -490,7 +490,7 @@ CLASS lcl_gui_page_branch_overview IMPLEMENTATION.
 
     ENDLOOP.
 
-    _add '</script>'.
+    ro_html->add( '</script>' ).
 
   ENDMETHOD.
 
diff --git a/src/zabapgit_page_commit.prog.abap b/src/zabapgit_page_commit.prog.abap
index 3cb752154..e21a6e675 100644
--- a/src/zabapgit_page_commit.prog.abap
+++ b/src/zabapgit_page_commit.prog.abap
@@ -257,7 +257,7 @@ CLASS lcl_gui_page_commit IMPLEMENTATION.
   METHOD scripts.
 
     CREATE OBJECT ro_html.
-    _add 'setInitialFocus("comment");'.
+    ro_html->add( 'setInitialFocus("comment");' ).
 
   ENDMETHOD.    "scripts
 
diff --git a/src/zabapgit_page_merge.prog.abap b/src/zabapgit_page_merge.prog.abap
index f55542f18..e45836557 100644
--- a/src/zabapgit_page_merge.prog.abap
+++ b/src/zabapgit_page_merge.prog.abap
@@ -420,25 +420,25 @@ CLASS lcl_gui_page_merge IMPLEMENTATION.
       iv_show_package = abap_false
       iv_show_branch  = abap_false ) ).
 
-    _add '<table>'.
-    _add '<tr>'.
-    _add '<td>Source:</td>'.
-    _add '<td>'.
-    _add ms_merge-source-name.
-    _add '</td></tr>'.
-    _add '<tr>'.
-    _add '<td>Target:</td>'.
-    _add '<td>'.
-    _add ms_merge-target-name.
-    _add '</td></tr>'.
-    _add '<tr>'.
-    _add '<td>Ancestor:</td>'.
-    _add '<td>'.
-    _add ms_merge-common-commit.
-    _add '</td></tr>'.
-    _add '</table>'.
+    ro_html->add( '<table>' ).
+    ro_html->add( '<tr>' ).
+    ro_html->add( '<td>Source:</td>' ).
+    ro_html->add( '<td>' ).
+    ro_html->add( ms_merge-source-name ).
+    ro_html->add( '</td></tr>' ).
+    ro_html->add( '<tr>' ).
+    ro_html->add( '<td>Target:</td>' ).
+    ro_html->add( '<td>' ).
+    ro_html->add( ms_merge-target-name ).
+    ro_html->add( '</td></tr>' ).
+    ro_html->add( '<tr>' ).
+    ro_html->add( '<td>Ancestor:</td>' ).
+    ro_html->add( '<td>' ).
+    ro_html->add( ms_merge-common-commit ).
+    ro_html->add( '</td></tr>' ).
+    ro_html->add( '</table>' ).
 
-    _add '<br>'.
+    ro_html->add( '<br>' ).
 
     APPEND LINES OF ms_merge-stree TO lt_files.
     APPEND LINES OF ms_merge-ttree TO lt_files.
diff --git a/src/zabapgit_view_tutorial.prog.abap b/src/zabapgit_view_tutorial.prog.abap
index a73ca6806..631508e1c 100644
--- a/src/zabapgit_view_tutorial.prog.abap
+++ b/src/zabapgit_view_tutorial.prog.abap
@@ -33,58 +33,58 @@ CLASS lcl_gui_view_tutorial IMPLEMENTATION.
 
     CREATE OBJECT ro_html.
 
-    _add '<h1>Tutorial</h1>'.
-    _add '<hr>'.
+    ro_html->add( '<h1>Tutorial</h1>' ).
+    ro_html->add( '<hr>' ).
 
-    _add '<h2>Adding and cloning repos</h2>'.
-    _add '<p><ul>'.
+    ro_html->add( '<h2>Adding and cloning repos</h2>' ).
+    ro_html->add( '<p><ul>' ).
 
-    _add `<li>To clone a remote repo (e.g. from github) click `.
+    ro_html->add( `<li>To clone a remote repo (e.g. from github) click ` ).
     ro_html->add_a( iv_txt = '+ Clone' iv_act = gc_action-repo_clone ).
-    _add ' from the top menu. This will copy a remote repo to your system.</li>'.
+    ro_html->add( ' from the top menu. This will copy a remote repo to your system.</li>' ).
 
-    _add `<li>To add a local package as a repo click `.
+    ro_html->add( `<li>To add a local package as a repo click ` ).
     ro_html->add_a( iv_txt = '+ Offline' iv_act = gc_action-repo_newoffline ).
-    _add ' from the top menu. This will track a repo which already exist in'.
-    _add ' the system with abapGit. You''ll be able to attach it to remote origin'.
-    _add ' or just serialize as a zip file</li>'.
+    ro_html->add( ' from the top menu. This will track a repo which already exist in' ).
+    ro_html->add( ' the system with abapGit. You''ll be able to attach it to remote origin' ).
+    ro_html->add( ' or just serialize as a zip file</li>' ).
 
-    _add `<li>Go `.
+    ro_html->add( `<li>Go ` ).
     ro_html->add_a( iv_txt = 'Explore' iv_act = gc_action-go_explore ).
-    _add ' to find projects using abapGit</li>'.
+    ro_html->add( ' to find projects using abapGit</li>' ).
 
-    _add '</ul></p>'.
+    ro_html->add( '</ul></p>' ).
 
-    _add '<h2>Repository list and favorites</h2>'.
-    _add '<p><ul>'.
+    ro_html->add( '<h2>Repository list and favorites</h2>' ).
+    ro_html->add( '<p><ul>' ).
     ro_html->add( |<li>To choose a repo press {
                   lcl_html=>icon( 'three-bars/blue' ) } at the favorite bar.</li>| ).
     ro_html->add( |<li>To favorite a repo click {
                   lcl_html=>icon( 'star/darkgrey' ) } icon at repo toolbar.</li>| ).
-    _add '</ul></p>'.
+    ro_html->add( '</ul></p>' ).
 
-    _add '<h2>abapGit related repositories</h2>'.
-    _add '<p><ul>'.
-    _add '<li>'.
+    ro_html->add( '<h2>abapGit related repositories</h2>' ).
+    ro_html->add( '<p><ul>' ).
+    ro_html->add( '<li>' ).
     IF lcl_services_abapgit=>is_installed( ) = abap_true.
-      _add 'abapGit installed in package&nbsp;'.
-      _add lcl_services_abapgit=>c_package_abapgit.
+      ro_html->add( 'abapGit installed in package&nbsp;' ).
+      ro_html->add( lcl_services_abapgit=>c_package_abapgit ).
     ELSE.
       ro_html->add_a( iv_txt = 'install abapGit repo' iv_act = gc_action-abapgit_install ).
-      _add ' - To keep abapGit up-to-date (or also to contribute) you need to'.
-      _add 'install it as a repository.'.
+      ro_html->add( ' - To keep abapGit up-to-date (or also to contribute) you need to' ).
+      ro_html->add( 'install it as a repository.' ).
     ENDIF.
-    _add '</li>'.
-    _add '<li>'.
+    ro_html->add( '</li>' ).
+    ro_html->add( '<li>' ).
     IF lcl_services_abapgit=>is_installed_pi( ) = abap_true.
-      _add 'abapGit plugins installed in package&nbsp;'.
-      _add lcl_services_abapgit=>c_package_plugins.
+      ro_html->add( 'abapGit plugins installed in package&nbsp;' ).
+      ro_html->add( lcl_services_abapgit=>c_package_plugins ).
     ELSE.
       ro_html->add_a( iv_txt = 'install abapGit plugins' iv_act = gc_action-abapgit_install_pi ).
-      _add ' - you can also install plugins to extend supported object types'.
+      ro_html->add( ' - you can also install plugins to extend supported object types' ).
     ENDIF.
-    _add '</li>'.
-    _add '</ul></p>'.
+    ro_html->add( '</li>' ).
+    ro_html->add( '</ul></p>' ).
 
   ENDMETHOD. " render_content.