hw3: PhotoAlbumModel: remove sortingStrategy from constructor
This commit is contained in:
parent
b12cf9f6d2
commit
0fb5fd0654
@ -6,7 +6,7 @@ import view.PhotoAlbumView;
|
|||||||
public class PhotoAlbumApp {
|
public class PhotoAlbumApp {
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
// Create MVC components
|
// Create MVC components
|
||||||
PhotoAlbumModel model = new PhotoAlbumModel(new SortByDate());
|
PhotoAlbumModel model = new PhotoAlbumModel();
|
||||||
PhotoAlbumView view = new PhotoAlbumView();
|
PhotoAlbumView view = new PhotoAlbumView();
|
||||||
PhotoAlbumController controller = new PhotoAlbumController(model, view);
|
PhotoAlbumController controller = new PhotoAlbumController(model, view);
|
||||||
|
|
||||||
|
@ -11,7 +11,6 @@ import javax.swing.*;
|
|||||||
import javax.swing.filechooser.FileNameExtensionFilter;
|
import javax.swing.filechooser.FileNameExtensionFilter;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class PhotoAlbumController {
|
public class PhotoAlbumController {
|
||||||
private final PhotoAlbumModel model;
|
private final PhotoAlbumModel model;
|
||||||
@ -78,12 +77,4 @@ public class PhotoAlbumController {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void handlePhotoSelection(int index) {
|
|
||||||
// Reset iterator and loop to the selected index
|
|
||||||
List<Photo> photos = model.getPhotos();
|
|
||||||
for (int i = 0; i < index; i++) {
|
|
||||||
model.next();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -15,11 +15,10 @@ public class PhotoAlbumModel {
|
|||||||
void onModelChanged();
|
void onModelChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
public PhotoAlbumModel(SortingStrategy<Photo> sortingStrategy) {
|
public PhotoAlbumModel() {
|
||||||
photos = new ArrayList<>();
|
photos = new ArrayList<>();
|
||||||
listeners = new ArrayList<>();
|
listeners = new ArrayList<>();
|
||||||
iterator = new PhotoIterator(photos);
|
iterator = new PhotoIterator(photos);
|
||||||
this.sortingStrategy = sortingStrategy;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addPhoto(Photo photo) {
|
public void addPhoto(Photo photo) {
|
||||||
@ -48,7 +47,10 @@ public class PhotoAlbumModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void sortPhotos() {
|
private void sortPhotos() {
|
||||||
photos = sortingStrategy.sort(photos);
|
if (sortingStrategy != null) {
|
||||||
|
photos = sortingStrategy.sort(photos);
|
||||||
|
iterator = new PhotoIterator(photos);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addListener(ModelChangeListener listener) {
|
public void addListener(ModelChangeListener listener) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user