projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove check for now.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
Album.java
diff --git
a/src/main/java/net/pterodactylus/sone/data/Album.java
b/src/main/java/net/pterodactylus/sone/data/Album.java
index
a0a85de
..
86f2c59
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Album.java
@@
-103,7
+103,7
@@
public class Album implements Fingerprintable {
* @return This album
*/
public Album setSone(Sone sone) {
* @return This album
*/
public Album setSone(Sone sone) {
- Validation.begin().isN
ull("Current Album Owner", this.sone).isN
otNull("New Album Owner", sone).check();
+ Validation.begin().isNotNull("New Album Owner", sone).check();
this.sone = sone;
return this;
}
this.sone = sone;
return this;
}
@@
-158,6
+158,7
@@
public class Album implements Fingerprintable {
*/
public void addImage(Image image) {
Validation.begin().isNotNull("Image", image).check().isNotNull("Image Owner", image.getSone()).check().isEqual("Image Owner", image.getSone(), sone).check();
*/
public void addImage(Image image) {
Validation.begin().isNotNull("Image", image).check().isNotNull("Image Owner", image.getSone()).check().isEqual("Image Owner", image.getSone(), sone).check();
+ image.setAlbum(this);
images.add(image);
}
images.add(image);
}
@@
-186,6
+187,15
@@
public class Album implements Fingerprintable {
}
/**
}
/**
+ * Returns whether this album contains any other albums or images.
+ *
+ * @return {@code true} if this album is empty, {@code false} otherwise
+ */
+ public boolean isEmpty() {
+ return albums.isEmpty() && images.isEmpty();
+ }
+
+ /**
* Returns the parent album of this album.
*
* @return The parent album of this album, or {@code null} if this album
* Returns the parent album of this album.
*
* @return The parent album of this album, or {@code null} if this album
@@
-288,7
+298,9
@@
public class Album implements Fingerprintable {
/* add images. */
fingerprint.append("Images(");
for (Image image : images) {
/* add images. */
fingerprint.append("Images(");
for (Image image : images) {
- fingerprint.append(image.getFingerprint());
+ if (image.isInserted()) {
+ fingerprint.append(image.getFingerprint());
+ }
}
fingerprint.append(')');
}
fingerprint.append(')');