hw3: unpackage things for submission

hw3/src/AlbumIterator.java

@@ -1,7 +1,3 @@
-package iterator;
-
-import model.Photo;
-
 import java.util.Iterator;
 
 /**

hw3/src/Photo.java

@@ -1,5 +1,3 @@
-package model;
-
 import java.util.Date;
 
 /**

hw3/src/PhotoAlbumApp.java

@@ -1,8 +1,3 @@
-import controller.PhotoAlbumController;
-import model.PhotoAlbumModel;
-import view.PhotoAlbumView;
-
-
 /**
  * Photo Album Manager application entry point.
  * <p>

hw3/src/PhotoAlbumController.java

@@ -1,12 +1,3 @@
-package controller;
-
-import model.Photo;
-import model.PhotoAlbumModel;
-import strategy.SortByDate;
-import strategy.SortByName;
-import strategy.SortBySize;
-import view.PhotoAlbumView;
-
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.File;

hw3/src/PhotoAlbumModel.java

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

hw3/src/PhotoAlbumView.java

@@ -1,9 +1,3 @@
-package view;
-
-import controller.PhotoAlbumController;
-import model.Photo;
-import model.PhotoAlbumModel;
-
 import javax.swing.*;
 import java.awt.*;
 import java.util.HashMap;

hw3/src/PhotoIterator.java

@@ -1,7 +1,3 @@
-package iterator;
-
-import model.Photo;
-
 import java.util.List;
 import java.util.NoSuchElementException;
 

hw3/src/SortByDate.java

@@ -1,7 +1,3 @@
-package strategy;
-
-import model.Photo;
-
 import java.util.Comparator;
 import java.util.List;
 

hw3/src/SortByName.java

@@ -1,7 +1,3 @@
-package strategy;
-
-import model.Photo;
-
 import java.util.Comparator;
 import java.util.List;
 

hw3/src/SortBySize.java

@@ -1,7 +1,3 @@
-package strategy;
-
-import model.Photo;
-
 import java.util.Comparator;
 import java.util.List;
 

hw3/src/SortingStrategy.java

@@ -1,5 +1,3 @@
-package strategy;
-
 import java.util.List;
 
 /**