|
34 | 34 | * |
35 | 35 | * @author Cory McKay and Tristano Tenaglia |
36 | 36 | */ |
| 37 | +@SuppressWarnings("jol") |
37 | 38 | public class MusicFileSelectorPanel |
38 | 39 | extends JPanel |
39 | 40 | implements ActionListener { |
@@ -523,12 +524,14 @@ private void addSymbolicMusicFilesToTable(File[] files_to_add) { |
523 | 524 | // Combine the new symbolic music files with those already on the table |
524 | 525 | SymbolicMusicFile[] music_files_already_on_table = getSymbolicMusicFilesToExtractFeaturesFrom(); |
525 | 526 | int number_music_files_already_on_table = 0; |
526 | | - if (null != music_files_already_on_table) |
| 527 | + if (music_files_already_on_table != null) |
527 | 528 | number_music_files_already_on_table = music_files_already_on_table.length; |
528 | 529 | int number_music_files_to_add = music_files_to_add.length; |
529 | 530 | SymbolicMusicFile[] new_and_old_music_files = new SymbolicMusicFile[number_music_files_already_on_table + number_music_files_to_add]; |
530 | | - System.arraycopy(music_files_already_on_table, 0, new_and_old_music_files, 0, number_music_files_already_on_table); |
531 | | - System.arraycopy(music_files_to_add, 0, new_and_old_music_files, number_music_files_already_on_table, number_music_files_to_add); |
| 531 | + for (int i = 0; i < number_music_files_already_on_table; i++) |
| 532 | + new_and_old_music_files[i] = music_files_already_on_table[i]; |
| 533 | + for (int i = 0; i < number_music_files_to_add; i++) |
| 534 | + new_and_old_music_files[i + number_music_files_already_on_table] = music_files_to_add[i]; |
532 | 535 |
|
533 | 536 | // Remove duplicate symbolic music files with the same file path |
534 | 537 | for (int i = 0; i < new_and_old_music_files.length - 1; i++) { |
|
0 commit comments