move to git.simongehrig.de
This commit is contained in:
@@ -48,7 +48,6 @@ public class SOMEvent {
|
||||
// Singleton to prevent Instantiation
|
||||
if (event == null) {
|
||||
event = new SOMEvent();
|
||||
// event.currentimage = SOMImage.getFallbackImage();
|
||||
}
|
||||
|
||||
return event;
|
||||
@@ -61,22 +60,16 @@ public class SOMEvent {
|
||||
*/
|
||||
public void getEventImages() {
|
||||
// Behandelt
|
||||
// if (!imagesread) {
|
||||
|
||||
File[] files = FilesWorker.getSourcePath().listFiles();
|
||||
|
||||
assert files != null;
|
||||
Arrays.sort(files);
|
||||
|
||||
for (File file : files) {
|
||||
SOMImage img = new SOMImage(file.getName());
|
||||
SOMImage img = new SOMImage();
|
||||
img.updateImageState();
|
||||
this.addImage(img);
|
||||
}
|
||||
|
||||
// imagesread = true;
|
||||
// }
|
||||
// return;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -89,15 +82,6 @@ public class SOMEvent {
|
||||
images.add(now);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the Events' Date
|
||||
*
|
||||
* @return the date
|
||||
*/
|
||||
public Date getDate() {
|
||||
return date;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a List of all of the Events' images
|
||||
*
|
||||
@@ -105,9 +89,9 @@ public class SOMEvent {
|
||||
*/
|
||||
public List<SOMImage> getImages() {
|
||||
// If there are no Event Images Collected
|
||||
if (images.size() == 0)
|
||||
// get all the events' images
|
||||
getEventImages();
|
||||
// if (0 == images.size())
|
||||
// // get all the events' images
|
||||
// this.getEventImages();
|
||||
//...and return them
|
||||
return images;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user