projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't access the Sone in the constructor.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
SoneImpl.java
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
(file)
--- 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 java.util.logging.Level;
import java.util.logging.Logger;
-import net.pterodactylus.sone.
core.
Options;
+import net.pterodactylus.sone.
data.SoneOptions.DefaultSone
Options;
import net.pterodactylus.sone.freenet.wot.Identity;
import net.pterodactylus.util.logging.Logging;
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 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. */
/** Sone-specific options. */
- private
Options options = new
Options();
+ private
SoneOptions options = new DefaultSone
Options();
/**
* Creates a new Sone.
/**
* Creates a new Sone.
@@
-371,8
+371,7
@@
public class SoneImpl implements Sone {
* @return The friend Sones of this Sone
*/
public List<String> getFriends() {
* @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
*/
*
* @return The options of this Sone
*/
- public Options getOptions() {
+ public
Sone
Options getOptions() {
return options;
}
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 */
* The options of this Sone
*/
/* TODO - remove this method again, maybe add an option provider */
- public void setOptions(Options options) {
+ public void setOptions(
Sone
Options options) {
this.options = options;
}
this.options = options;
}