import java.util.logging.Level;
import java.util.logging.Logger;
+import net.pterodactylus.sone.template.SoneAccessor;
import net.pterodactylus.util.logging.Logging;
import freenet.keys.FreenetURI;
*
* @return The friend Sones of this Sone
*/
- public Set<Sone> getFriends() {
- return Collections.unmodifiableSet(friendSones);
+ public List<Sone> getFriends() {
+ List<Sone> friends = new ArrayList<Sone>(friendSones);
+ Collections.sort(friends, new Comparator<Sone>() {
+
+ @Override
+ public int compare(Sone leftSone, Sone rightSone) {
+ int diff = SoneAccessor.getNiceName(leftSone).compareTo(SoneAccessor.getNiceName(rightSone));
+ if (diff != 0) {
+ return diff;
+ }
+ return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, rightSone.getTime() - leftSone.getTime()));
+ }
+ });
+ return friends;
}
/**
* The new (and only) friends of this Sone
* @return This Sone (for method chaining)
*/
- public synchronized Sone setFriends(Collection<Sone> friends) {
+ public Sone setFriends(Collection<Sone> friends) {
friendSones.clear();
friendSones.addAll(friends);
- modificationCounter++;
return this;
}
* The friend Sone to add
* @return This Sone (for method chaining)
*/
- public synchronized Sone addFriend(Sone friendSone) {
- if (!friendSone.equals(this) && friendSones.add(friendSone)) {
- modificationCounter++;
+ public Sone addFriend(Sone friendSone) {
+ if (!friendSone.equals(this)) {
+ friendSones.add(friendSone);
}
return this;
}
* The friend Sone to remove
* @return This Sone (for method chaining)
*/
- public synchronized Sone removeFriend(Sone friendSone) {
- if (friendSones.remove(friendSone)) {
- modificationCounter++;
- }
+ public Sone removeFriend(Sone friendSone) {
+ friendSones.remove(friendSone);
return this;
}
* @param soneId
* The Sone ID to block
*/
- public void addBlockedSoneId(String soneId) {
- blockedSoneIds.add(soneId);
+ public synchronized void addBlockedSoneId(String soneId) {
+ if (blockedSoneIds.add(soneId)) {
+ modificationCounter++;
+ }
}
/**
* @param soneId
* The Sone ID to unblock
*/
- public void removeBlockedSoneId(String soneId) {
- blockedSoneIds.remove(soneId);
+ public synchronized void removeBlockedSoneId(String soneId) {
+ if (blockedSoneIds.remove(soneId)) {
+ modificationCounter++;
+ }
}
/**