X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=06a1467b1364c8a353932927388c1f3cfa22e2c2;hb=7dfc9c778882083632f916b178a241f06c2a08fe;hp=6a90c7afe2148864d9a5a4d0b38ebcce323501e2;hpb=4448c88ba0401366f4566eb42a850ded674f8ceb;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6a90c7a..06a1467 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1320,7 +1320,6 @@ public class Core implements IdentityListener, UpdateListener {
 		}
 
 		/* load albums. */
-		Map<String, Album> albums = new HashMap<String, Album>();
 		List<Album> topLevelAlbums = new ArrayList<Album>();
 		while (true) {
 			String albumPrefix = sonePrefix + "/Albums/" + albums.size();
@@ -1328,17 +1327,16 @@ public class Core implements IdentityListener, UpdateListener {
 			if (albumId == null) {
 				break;
 			}
-			String albumName = configuration.getStringValue(albumPrefix + "/Name").getValue(null);
+			String albumTitle = configuration.getStringValue(albumPrefix + "/Title").getValue(null);
 			String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
 			String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").getValue(null);
-			if ((albumName == null) || (albumDescription == null)) {
+			if ((albumTitle == null) || (albumDescription == null)) {
 				logger.log(Level.WARNING, "Invalid album found, aborting load!");
 				return;
 			}
-			Album album = new Album(albumId).setSone(sone).setName(albumName).setDescription(albumDescription);
-			albums.put(albumId, album);
+			Album album = getAlbum(albumId).setSone(sone).setTitle(albumTitle).setDescription(albumDescription);
 			if (albumParentId != null) {
-				Album parentAlbum = albums.get(albumParentId);
+				Album parentAlbum = getAlbum(albumParentId, false);
 				if (parentAlbum == null) {
 					logger.log(Level.WARNING, "Invalid parent album ID: " + albumParentId);
 					return;
@@ -1485,7 +1483,7 @@ public class Core implements IdentityListener, UpdateListener {
 			for (Album album : albums) {
 				String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
 				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
-				configuration.getStringValue(albumPrefix + "/Name").setValue(album.getName());
+				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
 				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
 			}