X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSoneImpl.java;h=1fe971fbb401ecf4f0ccd0711c221b0afa22ec3a;hp=880eb954046a4a78cac78f602ae461d5f92c3692;hb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;hpb=3d888e800617335535c1a4b2cbac3e02acfdde34

diff --git a/src/main/java/net/pterodactylus/sone/data/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
index 880eb95..1fe971f 100644
--- a/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
@@ -28,7 +28,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.core.Options;
+import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions;
 import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.util.logging.Logging;
 
@@ -99,10 +99,10 @@ public class SoneImpl implements Sone {
 	private final Set<String> likedReplyIds = new CopyOnWriteArraySet<String>();
 
 	/** The root album containing all albums. */
-	private final Album rootAlbum = new AlbumImpl().setSone(this);
+	private final Album rootAlbum = new AlbumImpl(this);
 
 	/** Sone-specific options. */
-	private Options options = new Options();
+	private SoneOptions options = new DefaultSoneOptions();
 
 	/**
 	 * Creates a new Sone.
@@ -371,8 +371,7 @@ public class SoneImpl implements Sone {
 	 * @return The friend Sones of this Sone
 	 */
 	public List<String> getFriends() {
-		List<String> friends = new ArrayList<String>(friendSones);
-		return friends;
+		return new ArrayList<String>(friendSones);
 	}
 
 	/**
@@ -644,7 +643,7 @@ public class SoneImpl implements Sone {
 	 *
 	 * @return The options of this Sone
 	 */
-	public Options getOptions() {
+	public SoneOptions getOptions() {
 		return options;
 	}
 
@@ -655,7 +654,7 @@ public class SoneImpl implements Sone {
 	 * 		The options of this Sone
 	 */
 	/* TODO - remove this method again, maybe add an option provider */
-	public void setOptions(Options options) {
+	public void setOptions(SoneOptions options) {
 		this.options = options;
 	}