Update years in copyright line

[Sone.git] / src / main / java / net / pterodactylus / sone / web / EditAlbumPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index d028f8d..5244bc5 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditAlbumPage.java - Copyright © 2011–2012 David Roden
+ * Sone - EditAlbumPage.java - Copyright © 2011–2015 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
@@ -51,30 +51,19 @@ public class EditAlbumPage extends SoneTemplatePage {
        protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);
                if (request.getMethod() == Method.POST) {
-                       Sone currentSone = getCurrentSone(request.getToadletContext());
                        String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
-                       Album album = webInterface.getCore().getAlbum(albumId, false);
+                       Album album = webInterface.getCore().getAlbum(albumId);
                        if (album == null) {
                                throw new RedirectException("invalid.html");
                        }
-                       if (!webInterface.getCore().isLocalSone(album.getSone())) {
+                       if (!album.getSone().isLocal()) {
                                throw new RedirectException("noPermission.html");
                        }
                        if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
-                               if (album.getParent() == null) {
-                                       currentSone.moveAlbumUp(album);
-                                       webInterface.getCore().touchConfiguration();
-                                       throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
-                               }
                                album.getParent().moveAlbumUp(album);
                                webInterface.getCore().touchConfiguration();
                                throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
                        } else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
-                               if (album.getParent() == null) {
-                                       currentSone.moveAlbumDown(album);
-                                       webInterface.getCore().touchConfiguration();
-                                       throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
-                               }
                                album.getParent().moveAlbumDown(album);
                                webInterface.getCore().touchConfiguration();
                                throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
@@ -83,14 +72,14 @@ public class EditAlbumPage extends SoneTemplatePage {
                        if (webInterface.getCore().getImage(albumImageId, false) == null) {
                                albumImageId = null;
                        }
-                       album.setAlbumImage(albumImageId);
+                       album.modify().setAlbumImage(albumImageId).update();
                        String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
-                       if (title.length() == 0) {
-                               templateContext.set("titleMissing", true);
-                               return;
-                       }
                        String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
-                       album.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+                       try {
+                               album.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+                       } catch (AlbumTitleMustNotBeEmpty atmnbe) {
+                               throw new RedirectException("emptyAlbumTitle.html");
+                       }
                        webInterface.getCore().touchConfiguration();
                        throw new RedirectException("imageBrowser.html?album=" + album.getId());
                }