projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused plugin.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
data
/
Sone.java
diff --git
a/src/main/java/net/pterodactylus/sone/data/Sone.java
b/src/main/java/net/pterodactylus/sone/data/Sone.java
index
63b6e05
..
a8e8009
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/
src/main/java/net/pterodactylus/sone/data/Sone.java
@@
-22,6
+22,7
@@
import static java.util.Arrays.asList;
import static net.pterodactylus.sone.core.SoneUri.create;
import static net.pterodactylus.sone.data.Album.FLATTENER;
import static net.pterodactylus.sone.data.Album.IMAGES;
import static net.pterodactylus.sone.core.SoneUri.create;
import static net.pterodactylus.sone.data.Album.FLATTENER;
import static net.pterodactylus.sone.data.Album.IMAGES;
+import static net.pterodactylus.sone.template.SoneAccessor.getNiceName;
import java.util.Collection;
import java.util.Collections;
import java.util.Collection;
import java.util.Collections;
@@
-34,12
+35,12
@@
import net.pterodactylus.sone.database.AlbumBuilder;
import net.pterodactylus.sone.database.PostBuilder;
import net.pterodactylus.sone.database.PostReplyBuilder;
import net.pterodactylus.sone.freenet.wot.Identity;
import net.pterodactylus.sone.database.PostBuilder;
import net.pterodactylus.sone.database.PostReplyBuilder;
import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.sone.template.SoneAccessor;
import freenet.keys.FreenetURI;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import freenet.keys.FreenetURI;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
+import com.google.common.collect.ComparisonChain;
import com.google.common.primitives.Ints;
/**
import com.google.common.primitives.Ints;
/**
@@
-99,15
+100,21
@@
public interface Sone extends Identified, Fingerprintable, Comparable<Sone> {
@Override
public int compare(Sone leftSone, Sone rightSone) {
@Override
public int compare(Sone leftSone, Sone rightSone) {
- int diff = SoneAccessor.getNiceName(leftSone).compareToIgnoreCase(SoneAccessor.getNiceName(rightSone));
- if (diff != 0) {
- return diff;
- }
- return leftSone.getId().compareToIgnoreCase(rightSone.getId());
+ return ComparisonChain.start()
+ .compare(getNiceName(leftSone).toLowerCase(), getNiceName(rightSone).toLowerCase())
+ .compare(leftSone.getId(), rightSone.getId())
+ .result();
}
};
}
};
+ public static final Function<Sone, String> TO_NICE_NAME = new Function<Sone, String>() {
+ @Override
+ public String apply(Sone sone) {
+ return (sone == null) ? null : getNiceName(sone);
+ }
+ };
+
/** Comparator that sorts Sones by last activity (least recent active first). */
public static final Comparator<Sone> LAST_ACTIVITY_COMPARATOR = new Comparator<Sone>() {
/** Comparator that sorts Sones by last activity (least recent active first). */
public static final Comparator<Sone> LAST_ACTIVITY_COMPARATOR = new Comparator<Sone>() {