Rename tracks memoizer.

[demoscenemusic.git] / src / main / java / net / pterodactylus / demoscenemusic / data / DataManager.java

diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
index 5183226..d1a8769 100644 (file)
--- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
+++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java
@@ -140,7 +140,7 @@ public class DataManager {
                                track = new DefaultTrack(trackId).name(resultSet.getString("TRACKS.NAME")).artists(new ArrayList<Artist>()).styles(new HashSet<Style>());
                                loadedTracks.add(track);
                        }
-                       Artist artist = new DefaultArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
+                       Artist artist = new LazyArtist(resultSet.getString("ARTISTS.ID")).name(resultSet.getString("ARTISTS.NAME"));
                        if (!track.artists().contains(artist)) {
                                track.artists().add(artist);
                        }
@@ -173,7 +173,7 @@ public class DataManager {
                public void processResult(ResultSet resultSet) throws SQLException {
                        String artistId = resultSet.getString("ARTISTS.ID");
                        if ((artist == null) || (!artist.id().equals(artistId))) {
-                               artist = new DefaultArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
+                               artist = new LazyArtist(artistId).name(resultSet.getString("ARTISTS.NAME")).groups(new HashSet<Group>());
                                artists.add(artist);
                        }
 
@@ -185,7 +185,7 @@ public class DataManager {
 
        private class LazyArtist extends DefaultArtist {
 
-               private final Memoizer<Void> tracks = new Memoizer<Void>(new Callable<Void>() {
+               private final Memoizer<Void> tracksMemoizer = new Memoizer<Void>(new Callable<Void>() {
                        public Void call() throws DatabaseException {
                                if (!hasValue("tracks")) {
                                        value("tracks", Collection.class).set(getTracksByArtist(id()));
@@ -199,8 +199,8 @@ public class DataManager {
                }
 
                public Collection<Track> tracks() {
-                       tracks.get();
-                       return value("tracks", Collection.class).get();
+                       tracksMemoizer.get();
+                       return super.tracks();
                }
 
        }