Further reduce dependencies on a Sone for downloading.

[Sone.git] / src / main / java / net / pterodactylus / sone / data / ImageImpl.java

diff --git a/src/main/java/net/pterodactylus/sone/data/ImageImpl.java b/src/main/java/net/pterodactylus/sone/data/ImageImpl.java
index c8f7a9b..447bb82 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/ImageImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/ImageImpl.java
@@ -202,17 +202,32 @@ public class ImageImpl implements Image {
                        @Override
                        public Image update() throws IllegalStateException {
                                checkState(!sone.isPresent() || (ImageImpl.this.sone == null) || sone.get().equals(ImageImpl.this.sone), "can not change Sone once set");
-                               checkState(!creationTime.isPresent() || (ImageImpl.this.creationTime == 0), "can not change creation time once set");
+                               checkState(!creationTime.isPresent() || ((ImageImpl.this.creationTime == 0) || (ImageImpl.this.creationTime == creationTime.get())), "can not change creation time once set");
                                checkState(!key.isPresent() || (ImageImpl.this.key == null) || key.get().equals(ImageImpl.this.key), "can not change key once set");
                                checkState(!width.isPresent() || (ImageImpl.this.width == 0) || width.get().equals(ImageImpl.this.width), "can not change width once set");
                                checkState(!height.isPresent() || (ImageImpl.this.height == 0) || height.get().equals(ImageImpl.this.height), "can not change height once set");
-                               ImageImpl.this.sone = sone.or(ImageImpl.this.sone);
-                               ImageImpl.this.creationTime = creationTime.or(ImageImpl.this.creationTime);
-                               ImageImpl.this.key = key.or(ImageImpl.this.key);
-                               ImageImpl.this.title = title.or(ImageImpl.this.title);
-                               ImageImpl.this.description = description.or(ImageImpl.this.description);
-                               ImageImpl.this.width = width.or(ImageImpl.this.width);
-                               ImageImpl.this.height = height.or(ImageImpl.this.height);
+
+                               if (sone.isPresent()) {
+                                       ImageImpl.this.sone = sone.get();
+                               }
+                               if (creationTime.isPresent()) {
+                                       ImageImpl.this.creationTime = creationTime.get();
+                               }
+                               if (key.isPresent()) {
+                                       ImageImpl.this.key = key.get();
+                               }
+                               if (title.isPresent()) {
+                                       ImageImpl.this.title = title.get();
+                               }
+                               if (description.isPresent()) {
+                                       ImageImpl.this.description = description.get();
+                               }
+                               if (width.isPresent()) {
+                                       ImageImpl.this.width = width.get();
+                               }
+                               if (height.isPresent()) {
+                                       ImageImpl.this.height = height.get();
+                               }
 
                                return ImageImpl.this;
                        }