From 03a89d822b0adc9d322817564d2adea2db3a08fa Mon Sep 17 00:00:00 2001
From: oblomov-dev <102328295+oblomov-dev@users.noreply.github.com>
Date: Fri, 28 Nov 2025 13:12:31 -0300
Subject: [PATCH] refactor code

Removed unused methods and streamlined event handling.
---
 src/z2ui5_cl_demo_app_150.clas.abap | 82 ++++++++---------------------
 1 file changed, 22 insertions(+), 60 deletions(-)

diff --git a/src/z2ui5_cl_demo_app_150.clas.abap b/src/z2ui5_cl_demo_app_150.clas.abap
index baeb3756..8165ef1b 100644
--- a/src/z2ui5_cl_demo_app_150.clas.abap
+++ b/src/z2ui5_cl_demo_app_150.clas.abap
@@ -1,78 +1,40 @@
 CLASS z2ui5_cl_demo_app_150 DEFINITION PUBLIC.
-
   PUBLIC SECTION.
-
     INTERFACES z2ui5_if_app.
 
-    DATA client TYPE REF TO z2ui5_if_client.
-
-    METHODS ui5_display.
-    METHODS ui5_event.
-    METHODS ui5_callback.
-
-  PROTECTED SECTION.
-  PRIVATE SECTION.
 ENDCLASS.
 
 
+CLASS z2ui5_cl_demo_app_150 IMPLEMENTATION.
 
-CLASS Z2UI5_CL_DEMO_APP_150 IMPLEMENTATION.
-
-
-  METHOD ui5_event.
-
-    CASE client->get( )-event.
-
-      WHEN 'POPUP'.
-        DATA(lo_app) = z2ui5_cl_pop_to_confirm=>factory( `this is a question` ).
-        client->nav_app_call( lo_app ).
-
-      WHEN 'BACK'.
-        client->nav_app_leave( ).
-
-    ENDCASE.
-
-  ENDMETHOD.
-
-  METHOD ui5_callback.
-
-    TRY.
-        DATA(lo_prev) = client->get_app( client->get( )-s_draft-id_prev_app ).
-        DATA(lv_confirm_result) = CAST z2ui5_cl_pop_to_confirm( lo_prev )->result( ).
-        client->message_box_display( `the result is ` && lv_confirm_result ).
-      CATCH cx_root.
-    ENDTRY.
-
-  ENDMETHOD.
-
-  METHOD ui5_display.
-
-    DATA(view) = z2ui5_cl_xml_view=>factory( ).
-    view->shell(
-        )->page(
-                title          = 'abap2UI5 - Popup To Confirm'
-                navbuttonpress = client->_event( 'BACK' )
-                shownavbutton  = client->check_app_prev_stack( )
-           )->button(
-            text  = 'Open Popup...'
-            press = client->_event( 'POPUP' ) ).
+  METHOD z2ui5_if_app~main.
 
-    client->view_display( view->stringify( ) ).
+    CASE abap_true.
 
-  ENDMETHOD.
+      WHEN client->check_on_init( ).
 
+        DATA(view) = z2ui5_cl_xml_view=>factory( ).
+        view->shell(
+            )->page( title          = 'abap2UI5 - Popup To Confirm'
+                     navbuttonpress = client->_event_nav_app_leave( )
+                     shownavbutton  = client->check_app_prev_stack( )
+            )->button( text  = 'Open Popup...'
+                       press = client->_event( `POPUP` ) ).
+        client->view_display( view->stringify( ) ).
 
-  METHOD z2ui5_if_app~main.
+      WHEN client->check_on_event( `POPUP` ).
 
-    me->client = client.
+        DATA(lo_app) = z2ui5_cl_pop_to_confirm=>factory( i_question_text = `this is a question`
+                                                         i_event_confirm = `POPUP_TRUE`
+                                                         i_event_cancel  = 'POPUP_FALSE' ).
+        client->nav_app_call( lo_app ).
 
-    IF client->get( )-check_on_navigated = abap_true.
-      ui5_display( ).
-      ui5_callback( ).
-      RETURN.
-    ENDIF.
+      WHEN client->check_on_event( `POPUP_TRUE` ).
+        client->message_box_display( `the result is SUCCESS` ).
 
-    ui5_event( ).
+      WHEN client->check_on_event( `POPUP_FALSE` ).
+        client->message_box_display( `the result is CANCEL` ).
 
+    ENDCASE.
   ENDMETHOD.
 ENDCLASS.