diff --git a/src/zabapgit_gui_asset_manager.prog.abap b/src/zabapgit_gui_asset_manager.prog.abap index 5c698f185..05a028110 100644 --- a/src/zabapgit_gui_asset_manager.prog.abap +++ b/src/zabapgit_gui_asset_manager.prog.abap @@ -136,13 +136,13 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION. ENDMETHOD. " get_images. -* used by abapmerge - DEFINE _inline. - APPEND &1 TO lt_data. - END-OF-DEFINITION. - METHOD get_inline_asset. +* used by abapmerge + DEFINE _inline. + APPEND &1 TO lt_data. + END-OF-DEFINITION. + DATA: lt_data TYPE ty_string_tt, lv_str TYPE string. @@ -263,7 +263,7 @@ CLASS lcl_gui_asset_manager IMPLEMENTATION. rv_link = ''. "#EC NOTEXT + && '">'. "#EC NOTEXT ENDMETHOD. " get_webfont_link 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_news.prog.abap b/src/zabapgit_news.prog.abap index f5d5965d0..094296ae8 100644 --- a/src/zabapgit_news.prog.abap +++ b/src/zabapgit_news.prog.abap @@ -26,23 +26,23 @@ CLASS lcl_news DEFINITION CREATE PRIVATE FRIENDS ltcl_news. CLASS-METHODS: create " TODO REFACTOR - IMPORTING io_repo TYPE REF TO lcl_repo - RETURNING VALUE(ro_instance) TYPE REF TO lcl_news - RAISING lcx_exception. + IMPORTING io_repo TYPE REF TO lcl_repo + RETURNING VALUE(ro_instance) TYPE REF TO lcl_news + RAISING lcx_exception. METHODS: get_log - RETURNING VALUE(rt_log) TYPE tt_log, + RETURNING VALUE(rt_log) TYPE tt_log, latest_version - RETURNING VALUE(rv_version) TYPE string, + RETURNING VALUE(rv_version) TYPE string, has_news - RETURNING VALUE(rv_boolean) TYPE abap_bool, + RETURNING VALUE(rv_boolean) TYPE abap_bool, has_important - RETURNING VALUE(rv_boolean) TYPE abap_bool, + RETURNING VALUE(rv_boolean) TYPE abap_bool, has_updates - RETURNING VALUE(rv_boolean) TYPE abap_bool, + RETURNING VALUE(rv_boolean) TYPE abap_bool, has_unseen - RETURNING VALUE(rv_boolean) TYPE abap_bool. + RETURNING VALUE(rv_boolean) TYPE abap_bool. PRIVATE SECTION. DATA: mt_log TYPE tt_log, @@ -59,22 +59,22 @@ CLASS lcl_news DEFINITION CREATE PRIVATE FRIENDS ltcl_news. CLASS-METHODS: version_to_numeric IMPORTING iv_version TYPE string - RETURNING value(rv_version) TYPE i, + RETURNING VALUE(rv_version) TYPE i, normalize_version IMPORTING iv_version TYPE string - RETURNING value(rv_version) TYPE string, + RETURNING VALUE(rv_version) TYPE string, compare_versions - IMPORTING iv_a TYPE string - iv_b TYPE string - RETURNING value(rv_result) TYPE i, + IMPORTING iv_a TYPE string + iv_b TYPE string + RETURNING VALUE(rv_result) TYPE i, parse_line IMPORTING iv_line TYPE string iv_current_version TYPE string - RETURNING value(rs_log) TYPE ty_log, + RETURNING VALUE(rs_log) TYPE ty_log, parse IMPORTING it_lines TYPE string_table iv_current_version TYPE string - RETURNING value(rt_log) TYPE tt_log. + RETURNING VALUE(rt_log) TYPE tt_log. ENDCLASS. "lcl_news @@ -118,10 +118,11 @@ CLASS lcl_news IMPLEMENTATION. WITH KEY path = lc_log_path filename = lc_log_filename. IF sy-subrc = 0. - CREATE OBJECT ro_instance EXPORTING - iv_rawdata = -data - iv_current_version = gc_abap_version " TODO refactor - iv_lastseen_version = normalize_version( lv_last_seen ). + CREATE OBJECT ro_instance + EXPORTING + iv_rawdata = -data + iv_current_version = gc_abap_version " TODO refactor + iv_lastseen_version = normalize_version( lv_last_seen ). ENDIF. IF ro_instance IS BOUND. @@ -156,10 +157,10 @@ CLASS lcl_news IMPLEMENTATION. METHOD parse. - DATA: lv_tail TYPE i, - lv_first_version_found TYPE abap_bool, - lv_version TYPE string, - ls_log LIKE LINE OF rt_log. + DATA: lv_tail TYPE i, + lv_first_version_found TYPE abap_bool, + lv_version TYPE string, + ls_log LIKE LINE OF rt_log. FIELD-SYMBOLS: LIKE LINE OF it_lines. @@ -254,8 +255,8 @@ CLASS lcl_news IMPLEMENTATION. METHOD compare_versions. - DATA: lv_version_a TYPE i, - lv_version_b TYPE i. + DATA: lv_version_a TYPE i, + lv_version_b TYPE i. " Convert versions to numeric lv_version_a = version_to_numeric( iv_a ). @@ -302,8 +303,7 @@ ENDCLASS. "lcl_news *----------------------------------------------------------------------* * Definition of test class for news announcement *----------------------------------------------------------------------* -CLASS ltcl_news DEFINITION FINAL - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT. +CLASS ltcl_news DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS DURATION SHORT. PRIVATE SECTION. @@ -325,8 +325,8 @@ CLASS ltcl_news IMPLEMENTATION. METHOD version_to_numeric. - DATA: lv_version_exp TYPE i VALUE 1023010, - lv_version_act TYPE i. + DATA: lv_version_exp TYPE i VALUE 1023010, + lv_version_act TYPE i. lv_version_act = lcl_news=>version_to_numeric( '1.23.10' ). @@ -444,28 +444,26 @@ CLASS ltcl_news IMPLEMENTATION. ENDMETHOD. "parse_line - - DEFINE _add_news_log_entry. - CLEAR: ls_log. - ls_log-version = &1. - ls_log-is_header = &2. - ls_log-is_important = &3. - ls_log-pos_to_cur = &4. - ls_log-text = &5. - APPEND ls_log TO lt_log_exp. - END-OF-DEFINITION. - - DEFINE _add_news_txt_entry. - APPEND &1 TO lt_lines. - END-OF-DEFINITION. - METHOD parse. - DATA: - lt_log_exp TYPE lcl_news=>tt_log, - lt_log_act TYPE lcl_news=>tt_log, - ls_log LIKE LINE OF lt_log_exp, - lt_lines TYPE string_table. + DEFINE _add_news_log_entry. + CLEAR: ls_log. + ls_log-version = &1. + ls_log-is_header = &2. + ls_log-is_important = &3. + ls_log-pos_to_cur = &4. + ls_log-text = &5. + APPEND ls_log TO lt_log_exp. + END-OF-DEFINITION. + + DEFINE _add_news_txt_entry. + APPEND &1 TO lt_lines. + END-OF-DEFINITION. + + DATA: lt_log_exp TYPE lcl_news=>tt_log, + lt_log_act TYPE lcl_news=>tt_log, + ls_log LIKE LINE OF lt_log_exp, + lt_lines TYPE string_table. " Generate test data _add_news_txt_entry '======'. 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 ''. + ro_html->add( '' ). ro_html->add( '' ) ##NO_TEXT. - _add ''. + ro_html->add( '' ). 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 ''. - _add ''. - _add ''. - _add ''. - _add ''. - _add ''. - _add ''. - _add ''. - _add ''. - _add ''. - _add '
Source:'. - _add ms_merge-source-name. - _add '
Target:'. - _add ms_merge-target-name. - _add '
Ancestor:'. - _add ms_merge-common-commit. - _add '
'. + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '' ). + ro_html->add( '
Source:' ). + ro_html->add( ms_merge-source-name ). + ro_html->add( '
Target:' ). + ro_html->add( ms_merge-target-name ). + ro_html->add( '
Ancestor:' ). + ro_html->add( ms_merge-common-commit ). + ro_html->add( '
' ). - _add '
'. + ro_html->add( '
' ). APPEND LINES OF ms_merge-stree TO lt_files. APPEND LINES OF ms_merge-ttree TO lt_files. diff --git a/src/zabapgit_syntax_highlighter.prog.abap b/src/zabapgit_syntax_highlighter.prog.abap index 3c10caf4a..8f3273a2b 100644 --- a/src/zabapgit_syntax_highlighter.prog.abap +++ b/src/zabapgit_syntax_highlighter.prog.abap @@ -635,8 +635,8 @@ ENDCLASS. " lcl_syntax_xml IMPLEMENTATION *----------------------------------------------------------------------* * CLASS ltcl_syntax_cases definition *----------------------------------------------------------------------* -CLASS ltcl_syntax_cases DEFINITION FINAL - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT. +CLASS ltcl_syntax_cases DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS + DURATION SHORT. PRIVATE SECTION. @@ -1150,8 +1150,8 @@ ENDCLASS. " ltcl_syntax_cases IMPLEMENTATION *----------------------------------------------------------------------* * *----------------------------------------------------------------------* -CLASS ltcl_syntax_basic_logic DEFINITION FINAL - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT. +CLASS ltcl_syntax_basic_logic DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS + DURATION SHORT. PRIVATE SECTION. diff --git a/src/zabapgit_unit_test.prog.abap b/src/zabapgit_unit_test.prog.abap index 5e657bf94..c82efc042 100644 --- a/src/zabapgit_unit_test.prog.abap +++ b/src/zabapgit_unit_test.prog.abap @@ -1702,8 +1702,8 @@ CLASS ltcl_login_manager IMPLEMENTATION. ENDCLASS. -CLASS ltcl_html_action_utils DEFINITION - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL +CLASS ltcl_html_action_utils DEFINITION FOR TESTING RISK LEVEL HARMLESS + DURATION SHORT FINAL INHERITING FROM cl_aunit_assert. PUBLIC SECTION. @@ -1761,8 +1761,7 @@ CLASS ltcl_html_action_utils IMPLEMENTATION. ENDCLASS. "ltcl_html_action_utils -CLASS ltcl_path DEFINITION - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL +CLASS ltcl_path DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL INHERITING FROM cl_aunit_assert. PUBLIC SECTION. @@ -1919,8 +1918,8 @@ CLASS ltcl_path IMPLEMENTATION. ENDCLASS. "ltcl_path -CLASS ltcl_file_status DEFINITION - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL +CLASS ltcl_file_status DEFINITION FOR TESTING RISK LEVEL HARMLESS + DURATION SHORT FINAL INHERITING FROM cl_aunit_assert. PUBLIC SECTION. @@ -2020,8 +2019,8 @@ CLASS ltcl_file_status IMPLEMENTATION. ENDCLASS. "ltcl_file_status -CLASS ltcl_file_status2 DEFINITION - FOR TESTING RISK LEVEL HARMLESS DURATION SHORT FINAL +CLASS ltcl_file_status2 DEFINITION FOR TESTING RISK LEVEL HARMLESS + DURATION SHORT FINAL INHERITING FROM cl_aunit_assert. PUBLIC SECTION. 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 '

Tutorial

'. - _add '
'. + ro_html->add( '

Tutorial

' ). + ro_html->add( '
' ). - _add '

Adding and cloning repos

'. - _add '

    '. + ro_html->add( '

    Adding and cloning repos

    ' ). + ro_html->add( '

      ' ). - _add `
    • To clone a remote repo (e.g. from github) click `. + ro_html->add( `
    • 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.
      • '. + ro_html->add( ' from the top menu. This will copy a remote repo to your system.' ). - _add `
    • To add a local package as a repo click `. + ro_html->add( `
    • 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
      • '. + 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' ). - _add `
    • Go `. + ro_html->add( `
    • Go ` ). ro_html->add_a( iv_txt = 'Explore' iv_act = gc_action-go_explore ). - _add ' to find projects using abapGit
      • '. + ro_html->add( ' to find projects using abapGit' ). - _add '

    '. + ro_html->add( '

' ). - _add '

Repository list and favorites

'. - _add '

    '. + ro_html->add( '

    Repository list and favorites

    ' ). + ro_html->add( '

      ' ). ro_html->add( |
    • To choose a repo press { lcl_html=>icon( 'three-bars/blue' ) } at the favorite bar.
      • | ). ro_html->add( |
    • To favorite a repo click { lcl_html=>icon( 'star/darkgrey' ) } icon at repo toolbar.
      • | ). - _add '

    '. + ro_html->add( '

' ). - _add '

abapGit related repositories

'. - _add '

    '. - _add '
  • '. + ro_html->add( '

    abapGit related repositories

    ' ). + ro_html->add( '

      ' ). + ro_html->add( '
    • ' ). IF lcl_services_abapgit=>is_installed( ) = abap_true. - _add 'abapGit installed in package '. - _add lcl_services_abapgit=>c_package_abapgit. + ro_html->add( 'abapGit installed in package ' ). + 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 '
      • '. - _add '
    • '. + ro_html->add( '
      • ' ). + ro_html->add( '
    • ' ). IF lcl_services_abapgit=>is_installed_pi( ) = abap_true. - _add 'abapGit plugins installed in package '. - _add lcl_services_abapgit=>c_package_plugins. + ro_html->add( 'abapGit plugins installed in package ' ). + 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 '
      • '. - _add '

    '. + ro_html->add( '
    • ' ). + ro_html->add( '

' ). ENDMETHOD. " render_content.