diff --git a/src/zcl_excel_columns.clas.abap b/src/zcl_excel_columns.clas.abap index 3ada97c..06cfd48 100644 --- a/src/zcl_excel_columns.clas.abap +++ b/src/zcl_excel_columns.clas.abap @@ -6,13 +6,6 @@ CLASS zcl_excel_columns DEFINITION *"* public components of class ZCL_EXCEL_COLUMNS *"* do not include other source files here!!! PUBLIC SECTION. - TYPES: - BEGIN OF mty_s_hashed_column, - column_index TYPE int4, - column TYPE REF TO zcl_excel_column, - END OF mty_s_hashed_column , - mty_ts_hasehd_column TYPE HASHED TABLE OF mty_s_hashed_column WITH UNIQUE KEY column_index. - METHODS add IMPORTING !io_column TYPE REF TO zcl_excel_column . @@ -41,9 +34,15 @@ CLASS zcl_excel_columns DEFINITION *"* private components of class ZABAP_EXCEL_RANGES *"* do not include other source files here!!! PRIVATE SECTION. + TYPES: + BEGIN OF mty_s_hashed_column, + column_index TYPE int4, + column TYPE REF TO zcl_excel_column, + END OF mty_s_hashed_column , + mty_ts_hashed_column TYPE HASHED TABLE OF mty_s_hashed_column WITH UNIQUE KEY column_index. DATA columns TYPE REF TO cl_object_collection . - DATA columns_hasehd TYPE mty_ts_hasehd_column . + DATA columns_hashed TYPE mty_ts_hashed_column . ENDCLASS. @@ -57,14 +56,14 @@ CLASS zcl_excel_columns IMPLEMENTATION. ls_hashed_column-column_index = io_column->get_column_index( ). ls_hashed_column-column = io_column. - INSERT ls_hashed_column INTO TABLE columns_hasehd . + INSERT ls_hashed_column INTO TABLE columns_hashed . columns->add( io_column ). ENDMETHOD. METHOD clear. - CLEAR columns_hasehd. + CLEAR columns_hashed. columns->clear( ). ENDMETHOD. @@ -79,7 +78,7 @@ CLASS zcl_excel_columns IMPLEMENTATION. METHOD get. FIELD-SYMBOLS: TYPE mty_s_hashed_column. - READ TABLE columns_hasehd WITH KEY column_index = ip_index ASSIGNING . + READ TABLE columns_hashed WITH KEY column_index = ip_index ASSIGNING . IF sy-subrc = 0. eo_column = -column. ENDIF. @@ -97,7 +96,7 @@ CLASS zcl_excel_columns IMPLEMENTATION. METHOD remove. - DELETE TABLE columns_hasehd WITH TABLE KEY column_index = io_column->get_column_index( ) . + DELETE TABLE columns_hashed WITH TABLE KEY column_index = io_column->get_column_index( ) . columns->remove( io_column ). ENDMETHOD. diff --git a/src/zcl_excel_rows.clas.abap b/src/zcl_excel_rows.clas.abap index 28f6938..92692b1 100644 --- a/src/zcl_excel_rows.clas.abap +++ b/src/zcl_excel_rows.clas.abap @@ -13,13 +13,6 @@ CLASS zcl_excel_rows DEFINITION *"* protected components of class ZABAP_EXCEL_WORKSHEETS *"* do not include other source files here!!! PUBLIC SECTION. - TYPES: - BEGIN OF mty_s_hashed_row, - row_index TYPE int4, - row TYPE REF TO zcl_excel_row, - END OF mty_s_hashed_row , - mty_ts_hasehd_row TYPE HASHED TABLE OF mty_s_hashed_row WITH UNIQUE KEY row_index. - METHODS add IMPORTING !io_row TYPE REF TO zcl_excel_row . @@ -52,9 +45,15 @@ CLASS zcl_excel_rows DEFINITION *"* private components of class ZABAP_EXCEL_RANGES *"* do not include other source files here!!! PRIVATE SECTION. + TYPES: + BEGIN OF mty_s_hashed_row, + row_index TYPE int4, + row TYPE REF TO zcl_excel_row, + END OF mty_s_hashed_row , + mty_ts_hashed_row TYPE HASHED TABLE OF mty_s_hashed_row WITH UNIQUE KEY row_index. DATA rows TYPE REF TO cl_object_collection . - DATA rows_hasehd TYPE mty_ts_hasehd_row . + DATA rows_hashed TYPE mty_ts_hashed_row . ENDCLASS. @@ -69,14 +68,14 @@ CLASS zcl_excel_rows IMPLEMENTATION. ls_hashed_row-row_index = io_row->get_row_index( ). ls_hashed_row-row = io_row. - INSERT ls_hashed_row INTO TABLE rows_hasehd. + INSERT ls_hashed_row INTO TABLE rows_hashed. rows->add( io_row ). ENDMETHOD. "ADD METHOD clear. - CLEAR rows_hasehd. + CLEAR rows_hashed. rows->clear( ). ENDMETHOD. "CLEAR @@ -91,7 +90,7 @@ CLASS zcl_excel_rows IMPLEMENTATION. METHOD get. FIELD-SYMBOLS: TYPE mty_s_hashed_row. - READ TABLE rows_hasehd WITH KEY row_index = ip_index ASSIGNING . + READ TABLE rows_hashed WITH KEY row_index = ip_index ASSIGNING . IF sy-subrc = 0. eo_row = -row. ENDIF. @@ -109,7 +108,7 @@ CLASS zcl_excel_rows IMPLEMENTATION. METHOD remove. - DELETE TABLE rows_hasehd WITH TABLE KEY row_index = io_row->get_row_index( ) . + DELETE TABLE rows_hashed WITH TABLE KEY row_index = io_row->get_row_index( ) . rows->remove( io_row ). ENDMETHOD. "REMOVE @@ -121,7 +120,7 @@ CLASS zcl_excel_rows IMPLEMENTATION. METHOD get_min_index. FIELD-SYMBOLS: TYPE mty_s_hashed_row. - LOOP AT rows_hasehd ASSIGNING . + LOOP AT rows_hashed ASSIGNING . IF ep_index = 0 OR -row_index < ep_index. ep_index = -row_index. ENDIF. @@ -131,7 +130,7 @@ CLASS zcl_excel_rows IMPLEMENTATION. METHOD get_max_index. FIELD-SYMBOLS: TYPE mty_s_hashed_row. - LOOP AT rows_hasehd ASSIGNING . + LOOP AT rows_hashed ASSIGNING . IF -row_index > ep_index. ep_index = -row_index. ENDIF.