X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateAlbumPage.java;h=561878c7a63fedd297f63e5d6646f7f5e1d34354;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=4f268ece23b8cf9786e965ef3c5cf7ddce505b0b;hpb=23c1760105986cd53d78535010fe2a5c979f0c85;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java index 4f268ec..561878c 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java @@ -21,7 +21,7 @@ import static net.pterodactylus.sone.text.TextFilter.filter; import net.pterodactylus.sone.data.Album; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.database.AlbumBuilderFactory; +import net.pterodactylus.sone.database.AlbumBuilder; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; @@ -50,9 +50,6 @@ public class CreateAlbumPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -71,8 +68,8 @@ public class CreateAlbumPage extends SoneTemplatePage { private Album createAlbum(FreenetRequest request, String name) { Sone currentSone = getCurrentSone(request.getToadletContext()); String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36); - AlbumBuilderFactory parent = parentId.equals("") ? currentSone : webInterface.getCore().getAlbum(parentId).get(); - Album album = parent.newAlbumBuilder().randomId().build(); + AlbumBuilder albumBuilder = parentId.equals("") ? currentSone.newAlbumBuilder() : webInterface.getCore().getAlbum(parentId).get().newAlbumBuilder(); + Album album = albumBuilder.build(); return setTitleAndDescription(request, name, album); }