CaZzzer/cs151
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw3: PhotoAlbumModel: fix out-of-bounds errors on deletePhoto

Browse Source
This commit is contained in:
Yuri Tatishchev 2025-03-26 20:52:50 -07:00
parent 19141831c8
commit f2ee03502d
Signed by: CaZzzer
GPG Key ID: E0EBF441EA424369
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw3/src/model/PhotoAlbumModel.java
View File

@ -59,18 +59,14 @@ public class PhotoAlbumModel {
} }
/** /**
* Deletes a photo from the album by name. * Deletes a photo from the album by name (if it exists).
* If the deleted photo is the current photo or the album is empty, * Resets the iterator and notifies the listeners.
* the iterator is reset.
* *
* @param name the name of the photo to delete * @param name the name of the photo to delete
*/ */
public void deletePhoto(String name) { public void deletePhoto(String name) {
Photo currentPhoto = iterator.current();
photos.removeIf(photo -> photo.name().equals(name)); photos.removeIf(photo -> photo.name().equals(name));
if (photos.isEmpty() || (currentPhoto != null && currentPhoto.name().equals(name))) { iterator = new PhotoIterator(photos);
iterator = new PhotoIterator(photos);
}
notifyListeners(); notifyListeners();
} }