Skip to content

Commit f41e980

Browse files
committed
Update to latest AG
1 parent 5041831 commit f41e980

File tree

4 files changed

+40
-36
lines changed

4 files changed

+40
-36
lines changed

src/zcl_abaplint_abapgit_ext_agent.clas.abap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ENDCLASS.
7272

7373

7474

75-
CLASS ZCL_ABAPLINT_ABAPGIT_EXT_AGENT IMPLEMENTATION.
75+
CLASS zcl_abaplint_abapgit_ext_agent IMPLEMENTATION.
7676

7777

7878
METHOD constructor.
@@ -91,7 +91,7 @@ CLASS ZCL_ABAPLINT_ABAPGIT_EXT_AGENT IMPLEMENTATION.
9191
regex = '\.git$'
9292
with = '' ).
9393

94-
mo_agent = zcl_abapgit_factory=>get_http_agent( ).
94+
mo_agent = zcl_abapgit_http_agent=>create( ).
9595

9696
mo_agent->global_headers( )->set(
9797
iv_key = 'Accept'

src/zcl_abaplint_abapgit_ext_exit.clas.abap

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ CLASS zcl_abaplint_abapgit_ext_exit DEFINITION
2222
zif_abapgit_user_exit~on_event REDEFINITION,
2323
zif_abapgit_user_exit~wall_message_repo REDEFINITION.
2424

25-
CLASS-METHODS class_constructor.
26-
2725
CLASS-METHODS get_last_url
2826
RETURNING
29-
VALUE(rv_url) TYPE string.
27+
VALUE(result) TYPE string.
3028

3129
PROTECTED SECTION.
3230
PRIVATE SECTION.
@@ -62,18 +60,20 @@ CLASS zcl_abaplint_abapgit_ext_exit DEFINITION
6260
timed_out TYPE string VALUE 'timed_out',
6361
END OF c_git_conclusion.
6462

65-
CLASS-DATA:
66-
gv_div_attr TYPE string,
67-
gv_last_url TYPE string.
63+
CLASS-DATA gv_last_url TYPE string.
6864

6965
DATA mt_wall TYPE HASHED TABLE OF ty_wall WITH UNIQUE KEY commit.
7066

67+
METHODS _message_start
68+
RETURNING
69+
VALUE(result) TYPE string.
70+
7171
METHODS _wall_message_abaplint
7272
IMPORTING
73-
!iv_key TYPE zif_abapgit_persistence=>ty_repo-key
74-
!is_check_run TYPE zcl_abaplint_abapgit_ext_chkrn=>ty_check_run
73+
!iv_key TYPE zif_abapgit_persistence=>ty_repo-key
74+
!is_check_run TYPE zcl_abaplint_abapgit_ext_chkrn=>ty_check_run
7575
RETURNING
76-
VALUE(ri_html) TYPE REF TO zif_abapgit_html.
76+
VALUE(result) TYPE REF TO zif_abapgit_html.
7777

7878
ENDCLASS.
7979

@@ -82,13 +82,8 @@ ENDCLASS.
8282
CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
8383

8484

85-
METHOD class_constructor.
86-
gv_div_attr = 'id="abaplint-message" style="padding-right: 10px; margin-top: 10px; float: left;"'.
87-
ENDMETHOD.
88-
89-
9085
METHOD get_last_url.
91-
rv_url = gv_last_url.
86+
result = gv_last_url.
9287
ENDMETHOD.
9388

9489

@@ -158,12 +153,16 @@ CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
158153
ls_check_run = lo_check_run->get( ).
159154

160155
IF ls_check_run IS INITIAL.
161-
ii_html->add( |<div { gv_div_attr }>No abaplint check run found. </div>| ).
156+
ii_html->add( _message_start( ) ).
157+
ii_html->add( 'No abaplint check run found.' ).
158+
ii_html->add( '</div>' ).
162159
RETURN.
163160
ENDIF.
164161

165162
CATCH zcx_abapgit_exception INTO lx_error.
166-
ii_html->add( |<div { gv_div_attr }>{ lx_error->get_text( ) }</div>| ).
163+
ii_html->add( _message_start( ) ).
164+
ii_html->add( lx_error->get_text( ) ).
165+
ii_html->add( '</div>' ).
167166
RETURN.
168167
ENDTRY.
169168

@@ -190,6 +189,11 @@ CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
190189
ENDMETHOD.
191190

192191

192+
METHOD _message_start.
193+
result = '<div id="abaplint-message" style="padding-right:15px;margin-top:10px;float:left">'.
194+
ENDMETHOD.
195+
196+
193197
METHOD _wall_message_abaplint.
194198

195199
DATA:
@@ -198,21 +202,21 @@ CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
198202
lv_msg TYPE string,
199203
lv_summary TYPE string.
200204

201-
ri_html = zcl_abapgit_html=>create( ).
205+
result = zcl_abapgit_html=>create( ).
202206

203-
ri_html->add( |<div { gv_div_attr }>| ).
207+
result->add( _message_start( ) ).
204208

205209
lv_act = |{ zif_abapgit_definitions=>c_action-url }?url={ is_check_run-url }|.
206210

207211
CASE is_check_run-status.
208212
WHEN c_git_status-queued.
209-
ri_html->add_a(
213+
result->add_a(
210214
iv_txt = zcl_abapgit_html=>icon(
211215
iv_name = 'circle-solid'
212216
iv_hint = is_check_run-status )
213217
iv_act = lv_act ).
214218
WHEN c_git_status-in_progress.
215-
ri_html->add_a(
219+
result->add_a(
216220
iv_txt = zcl_abapgit_html=>icon(
217221
iv_name = 'circle-solid'
218222
iv_class = 'warning'
@@ -221,13 +225,13 @@ CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
221225
WHEN c_git_status-completed.
222226
CASE is_check_run-conclusion.
223227
WHEN c_git_conclusion-neutral.
224-
ri_html->add_a(
228+
result->add_a(
225229
iv_txt = zcl_abapgit_html=>icon(
226230
iv_name = 'circle-solid'
227231
iv_hint = is_check_run-conclusion )
228232
iv_act = lv_act ).
229233
WHEN c_git_conclusion-success.
230-
ri_html->add_a(
234+
result->add_a(
231235
iv_txt = zcl_abapgit_html=>icon(
232236
iv_name = 'check'
233237
iv_class = 'success'
@@ -239,17 +243,17 @@ CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
239243
OR c_git_conclusion-skipped
240244
OR c_git_conclusion-stale
241245
OR c_git_conclusion-timed_out.
242-
ri_html->add_a(
246+
result->add_a(
243247
iv_txt = zcl_abapgit_html=>icon(
244248
iv_name = 'times-solid'
245249
iv_class = 'error'
246250
iv_hint = is_check_run-conclusion )
247251
iv_act = lv_act ).
248252
WHEN OTHERS.
249-
ri_html->add( |Unexpected value "{ is_check_run-conclusion }" for "conclusion"| ).
253+
result->add( |Unexpected value "{ is_check_run-conclusion }" for "conclusion"| ).
250254
ENDCASE.
251255
WHEN OTHERS.
252-
ri_html->add( |Unexpected value "{ is_check_run-status }" for "status"| ).
256+
result->add( |Unexpected value "{ is_check_run-status }" for "status"| ).
253257
ENDCASE.
254258

255259
lv_msg = is_check_run-name.
@@ -265,15 +269,15 @@ CLASS zcl_abaplint_abapgit_ext_exit IMPLEMENTATION.
265269
|key={ iv_key }&checkrun={ is_check_run-id }&total={ is_check_run-count_total }|.
266270

267271
" todo, maybe better to show link only for failures
268-
lv_summary = ri_html->a(
272+
lv_summary = result->a(
269273
iv_txt = lv_summary
270274
iv_act = lv_act ).
271275

272276
lv_msg = |{ lv_msg }: { lv_summary }|.
273277
ENDIF.
274278

275-
ri_html->add( lv_msg ).
276-
ri_html->add( '</div>' ).
279+
result->add( lv_msg ).
280+
result->add( '</div>' ).
277281

278282
ENDMETHOD.
279283
ENDCLASS.

src/zcl_abaplint_abapgit_ext_rules.clas.abap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ CLASS zcl_abaplint_abapgit_ext_rules IMPLEMENTATION.
191191

192192
IF mi_default_rules IS INITIAL.
193193

194-
li_agent = zcl_abapgit_factory=>get_http_agent( ).
194+
li_agent = zcl_abapgit_http_agent=>create( ).
195195

196196
TRY.
197197
mi_default_rules = li_agent->request( c_abaplint_host && c_abaplint_defaults )->json( ).
@@ -577,7 +577,7 @@ CLASS zcl_abaplint_abapgit_ext_rules IMPLEMENTATION.
577577

578578
METHOD zif_abapgit_gui_menu_provider~get_menu.
579579

580-
CREATE OBJECT ro_toolbar.
580+
ro_toolbar = zcl_abapgit_html_toolbar=>create( 'abaplint-ext-rules' ).
581581

582582
ro_toolbar->add(
583583
iv_txt = 'Repo Rules'
@@ -605,7 +605,7 @@ CLASS zcl_abaplint_abapgit_ext_rules IMPLEMENTATION.
605605

606606
ri_html->add( '<div class="repo">' ).
607607
ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top(
608-
io_repo = mo_repo
608+
ii_repo = mo_repo
609609
iv_show_commit = abap_false
610610
iv_interactive_branch = abap_false ) ).
611611
ri_html->add( '</div>' ).

src/zcl_abaplint_abapgit_ext_ui.clas.abap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ CLASS zcl_abaplint_abapgit_ext_ui IMPLEMENTATION.
251251
iv_chk = mv_view_source
252252
iv_act = c_action-toggle_view_source ).
253253

254-
CREATE OBJECT ro_toolbar.
254+
ro_toolbar = zcl_abapgit_html_toolbar=>create( 'abaplint-ext-ui' ).
255255

256256
ro_toolbar->add(
257257
iv_txt = 'Sort'
@@ -277,7 +277,7 @@ CLASS zcl_abaplint_abapgit_ext_ui IMPLEMENTATION.
277277

278278
ri_html->add( '<div class="repo">' ).
279279
ri_html->add( zcl_abapgit_gui_chunk_lib=>render_repo_top(
280-
io_repo = mo_repo
280+
ii_repo = mo_repo
281281
iv_show_commit = abap_false
282282
iv_interactive_branch = abap_false ) ).
283283
ri_html->add( '</div>' ).

0 commit comments

Comments
 (0)