Declare potentially-static methods as static.

[Sone.git] / src / main / java / net / pterodactylus / sone / template / AlbumAccessor.java

diff --git a/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java b/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java
index e2c6f16..e22e00b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java
+++ b/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Sone - AlbumAccessor.java - Copyright © 2011 David Roden
+ * Sone - AlbumAccessor.java - Copyright © 2011–2012 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
@@ -24,8 +24,8 @@ import java.util.Map;
 
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.util.template.Accessor;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * {@link Accessor} implementation for {@link Album}s. A property named
@@ -40,19 +40,19 @@ public class AlbumAccessor extends ReflectionAccessor {
         * {@inheritDoc}
         */
        @Override
-       public Object get(DataProvider dataProvider, Object object, String member) {
+       public Object get(TemplateContext templateContext, Object object, String member) {
                Album album = (Album) object;
                if ("backlinks".equals(member)) {
                        List<Map<String, String>> backlinks = new ArrayList<Map<String, String>>();
                        Album currentAlbum = album;
                        while (currentAlbum != null) {
-                               backlinks.add(0, createLink("imageBrowser.html?album=" + album.getId(), album.getName()));
+                               backlinks.add(0, createLink("imageBrowser.html?album=" + currentAlbum.getId(), currentAlbum.getTitle()));
                                currentAlbum = currentAlbum.getParent();
                        }
-                       backlinks.add(0, createLink("viewSone.html?sone=" + album.getSone().getId(), SoneAccessor.getNiceName(album.getSone())));
+                       backlinks.add(0, createLink("imageBrowser.html?sone=" + album.getSone().getId(), SoneAccessor.getNiceName(album.getSone())));
                        return backlinks;
                }
-               return super.get(dataProvider, object, member);
+               return super.get(templateContext, object, member);
        }
 
        //
@@ -68,7 +68,7 @@ public class AlbumAccessor extends ReflectionAccessor {
         *            The name of the link
         * @return The created map containing the mappings
         */
-       private Map<String, String> createLink(String target, String name) {
+       private static Map<String, String> createLink(String target, String name) {
                Map<String, String> link = new HashMap<String, String>();
                link.put("target", target);
                link.put("name", name);