summaryrefslogtreecommitdiffstats
path: root/dozentenmodul
diff options
context:
space:
mode:
authorSimon Rettberg2015-08-27 15:49:10 +0200
committerSimon Rettberg2015-08-27 15:49:10 +0200
commitb8123fc05a65722b376059475ce4dd7e5139e040 (patch)
tree2a93061a42a6d67dc037aea16d264040c9479c62 /dozentenmodul
parent[client] ListTable: re-enable accidentally disabled sorting by Comparator (diff)
downloadtutor-module-b8123fc05a65722b376059475ce4dd7e5139e040.tar.gz
tutor-module-b8123fc05a65722b376059475ce4dd7e5139e040.tar.xz
tutor-module-b8123fc05a65722b376059475ce4dd7e5139e040.zip
[client] OS Sorting: Sort "Unknown" last
Diffstat (limited to 'dozentenmodul')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Sorters.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Sorters.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Sorters.java
index af5e9e9f..0065f5f1 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Sorters.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Sorters.java
@@ -32,6 +32,13 @@ public class Sorters {
public static final Comparator<OperatingSystem> osName = new Comparator<OperatingSystem>() {
@Override
public int compare(OperatingSystem o1, OperatingSystem o2) {
+ if (o1 == null) {
+ if (o2 == null)
+ return 0;
+ return 1;
+ } else if (o2 == null) {
+ return -1;
+ }
return FormatHelper.osName(o1).compareTo(FormatHelper.osName(o2));
}
};