From 041d85b85df3386b1105c5adccd6b3b2d9c57b6a Mon Sep 17 00:00:00 2001 From: Yuri Tatishchev Date: Wed, 26 Mar 2025 21:41:40 -0700 Subject: [PATCH] hw3: unpackage things for submission --- hw3/src/{iterator => }/AlbumIterator.java | 4 ---- hw3/src/{model => }/Photo.java | 2 -- hw3/src/PhotoAlbumApp.java | 5 ----- hw3/src/{controller => }/PhotoAlbumController.java | 9 --------- hw3/src/{model => }/PhotoAlbumModel.java | 6 ------ hw3/src/{view => }/PhotoAlbumView.java | 6 ------ hw3/src/{iterator => }/PhotoIterator.java | 4 ---- hw3/src/{strategy => }/SortByDate.java | 4 ---- hw3/src/{strategy => }/SortByName.java | 4 ---- hw3/src/{strategy => }/SortBySize.java | 4 ---- hw3/src/{strategy => }/SortingStrategy.java | 2 -- 11 files changed, 50 deletions(-) rename hw3/src/{iterator => }/AlbumIterator.java (95%) rename hw3/src/{model => }/Photo.java (95%) rename hw3/src/{controller => }/PhotoAlbumController.java (95%) rename hw3/src/{model => }/PhotoAlbumModel.java (97%) rename hw3/src/{view => }/PhotoAlbumView.java (99%) rename hw3/src/{iterator => }/PhotoIterator.java (98%) rename hw3/src/{strategy => }/SortByDate.java (89%) rename hw3/src/{strategy => }/SortByName.java (88%) rename hw3/src/{strategy => }/SortBySize.java (89%) rename hw3/src/{strategy => }/SortingStrategy.java (91%) diff --git a/hw3/src/iterator/AlbumIterator.java b/hw3/src/AlbumIterator.java similarity index 95% rename from hw3/src/iterator/AlbumIterator.java rename to hw3/src/AlbumIterator.java index 95a63a3..7874693 100644 --- a/hw3/src/iterator/AlbumIterator.java +++ b/hw3/src/AlbumIterator.java @@ -1,7 +1,3 @@ -package iterator; - -import model.Photo; - import java.util.Iterator; /** diff --git a/hw3/src/model/Photo.java b/hw3/src/Photo.java similarity index 95% rename from hw3/src/model/Photo.java rename to hw3/src/Photo.java index bbd203e..a7ec774 100644 --- a/hw3/src/model/Photo.java +++ b/hw3/src/Photo.java @@ -1,5 +1,3 @@ -package model; - import java.util.Date; /** diff --git a/hw3/src/PhotoAlbumApp.java b/hw3/src/PhotoAlbumApp.java index 0eb660f..731b65a 100644 --- a/hw3/src/PhotoAlbumApp.java +++ b/hw3/src/PhotoAlbumApp.java @@ -1,8 +1,3 @@ -import controller.PhotoAlbumController; -import model.PhotoAlbumModel; -import view.PhotoAlbumView; - - /** * Photo Album Manager application entry point. *

diff --git a/hw3/src/controller/PhotoAlbumController.java b/hw3/src/PhotoAlbumController.java similarity index 95% rename from hw3/src/controller/PhotoAlbumController.java rename to hw3/src/PhotoAlbumController.java index 0a02a89..24e5a90 100644 --- a/hw3/src/controller/PhotoAlbumController.java +++ b/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; diff --git a/hw3/src/model/PhotoAlbumModel.java b/hw3/src/PhotoAlbumModel.java similarity index 97% rename from hw3/src/model/PhotoAlbumModel.java rename to hw3/src/PhotoAlbumModel.java index 015b6d4..66d8e1e 100644 --- a/hw3/src/model/PhotoAlbumModel.java +++ b/hw3/src/PhotoAlbumModel.java @@ -1,9 +1,3 @@ -package model; - -import strategy.SortingStrategy; -import iterator.AlbumIterator; -import iterator.PhotoIterator; - import java.util.*; /** diff --git a/hw3/src/view/PhotoAlbumView.java b/hw3/src/PhotoAlbumView.java similarity index 99% rename from hw3/src/view/PhotoAlbumView.java rename to hw3/src/PhotoAlbumView.java index 0b2bba0..2257f6c 100644 --- a/hw3/src/view/PhotoAlbumView.java +++ b/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; diff --git a/hw3/src/iterator/PhotoIterator.java b/hw3/src/PhotoIterator.java similarity index 98% rename from hw3/src/iterator/PhotoIterator.java rename to hw3/src/PhotoIterator.java index fc6a12d..71e887e 100644 --- a/hw3/src/iterator/PhotoIterator.java +++ b/hw3/src/PhotoIterator.java @@ -1,7 +1,3 @@ -package iterator; - -import model.Photo; - import java.util.List; import java.util.NoSuchElementException; diff --git a/hw3/src/strategy/SortByDate.java b/hw3/src/SortByDate.java similarity index 89% rename from hw3/src/strategy/SortByDate.java rename to hw3/src/SortByDate.java index 35d237a..487923b 100644 --- a/hw3/src/strategy/SortByDate.java +++ b/hw3/src/SortByDate.java @@ -1,7 +1,3 @@ -package strategy; - -import model.Photo; - import java.util.Comparator; import java.util.List; diff --git a/hw3/src/strategy/SortByName.java b/hw3/src/SortByName.java similarity index 88% rename from hw3/src/strategy/SortByName.java rename to hw3/src/SortByName.java index 59a5b49..14deb7b 100644 --- a/hw3/src/strategy/SortByName.java +++ b/hw3/src/SortByName.java @@ -1,7 +1,3 @@ -package strategy; - -import model.Photo; - import java.util.Comparator; import java.util.List; diff --git a/hw3/src/strategy/SortBySize.java b/hw3/src/SortBySize.java similarity index 89% rename from hw3/src/strategy/SortBySize.java rename to hw3/src/SortBySize.java index 6088413..065e542 100644 --- a/hw3/src/strategy/SortBySize.java +++ b/hw3/src/SortBySize.java @@ -1,7 +1,3 @@ -package strategy; - -import model.Photo; - import java.util.Comparator; import java.util.List; diff --git a/hw3/src/strategy/SortingStrategy.java b/hw3/src/SortingStrategy.java similarity index 91% rename from hw3/src/strategy/SortingStrategy.java rename to hw3/src/SortingStrategy.java index 9460791..6f08ed4 100644 --- a/hw3/src/strategy/SortingStrategy.java +++ b/hw3/src/SortingStrategy.java @@ -1,5 +1,3 @@ -package strategy; - import java.util.List; /**