idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use Collator for comparing strings

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-12-13 12:21:11 +00:00
parent 20b7104c41
commit fc9114eaa5
6 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webui/src/main/java/com/muwire/webui/BrowseServlet.java
View File

@@ -3,6 +3,7 @@ package com.muwire.webui;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -212,7 +213,7 @@ public class BrowseServlet extends HttpServlet {
}
private static final Comparator<Result> BY_NAME = (k, v) -> {
return k.event.getName().compareTo(v.event.getName());
return Collator.getInstance().compare(k.event.getName(), v.event.getName());
};
private static final Comparator<Result> BY_SIZE = (k, v) -> {
@@ -231,11 +232,11 @@ public class BrowseServlet extends HttpServlet {
}
private static final Comparator<Browse> BY_HOST = (k, v) -> {
return k.getHost().getHumanReadableName().compareTo(v.getHost().getHumanReadableName());
return Collator.getInstance().compare(k.getHost().getHumanReadableName(), v.getHost().getHumanReadableName());
};
private static final Comparator<Browse> BY_STATUS = (k, v) -> {
return k.getStatus().toString().compareTo(v.getStatus().toString());
return Collator.getInstance().compare(k.getStatus().toString(), v.getStatus().toString());
};
private static final Comparator<Browse> BY_RESULTS = (k, v) -> {

5
webui/src/main/java/com/muwire/webui/CertificateServlet.java
View File

@@ -3,6 +3,7 @@ package com.muwire.webui;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -175,11 +176,11 @@ public class CertificateServlet extends HttpServlet {
}
private static final Comparator<CertificateEntry> BY_ISSUER = (l, r) -> {
return l.persona.getHumanReadableName().compareTo(r.persona.getHumanReadableName());
return Collator.getInstance().compare(l.persona.getHumanReadableName(), r.persona.getHumanReadableName());
};
private static final Comparator<CertificateEntry> BY_NAME = (l, r) -> {
return l.name.compareTo(r.name);
return Collator.getInstance().compare(l.name, r.name);
};
private static final Comparator<CertificateEntry> BY_TIMESTAMP = (l, r) -> {

5
webui/src/main/java/com/muwire/webui/DownloadServlet.java
View File

@@ -2,6 +2,7 @@ package com.muwire.webui;
import java.io.File;
import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -175,11 +176,11 @@ public class DownloadServlet extends HttpServlet {
}
private static final Comparator<Download> BY_NAME = (l, r) -> {
return l.name.compareTo(r.name);
return Collator.getInstance().compare(l.name, r.name);
};
private static final Comparator<Download> BY_STATE = (l, r) -> {
return l.state.toString().compareTo(r.state.toString());
return Collator.getInstance().compare(l.state.toString(), r.state.toString());
};
private static final Comparator<Download> BY_SPEED = (l, r) -> {

3
webui/src/main/java/com/muwire/webui/FilesServlet.java
View File

@@ -5,6 +5,7 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -212,7 +213,7 @@ public class FilesServlet extends HttpServlet {
}
private static final Comparator<FilesTableEntry> BY_PATH = (l, r) -> {
return l.path.compareTo(r.path);
return Collator.getInstance().compare(l.path, r.path);
};
private static final Comparator<FilesTableEntry> BY_SIZE = (l, r) -> {

15
webui/src/main/java/com/muwire/webui/SearchServlet.java
View File

@@ -2,6 +2,7 @@ package com.muwire.webui;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -372,7 +373,7 @@ public class SearchServlet extends HttpServlet {
}
private static final Comparator<SearchResults> SEARCH_BY_NAME = (k, v) -> {
return k.getSearch().compareTo(v.getSearch());
return Collator.getInstance().compare(k.getSearch(), v.getSearch());
};
private static final Comparator<SearchResults> SEARCH_BY_SENDERS = (k, v) -> {
@@ -391,11 +392,11 @@ public class SearchServlet extends HttpServlet {
}
private static final Comparator<Sender> SENDER_BY_NAME = (k, v) -> {
return k.persona.getHumanReadableName().compareTo(v.persona.getHumanReadableName());
return Collator.getInstance().compare(k.persona.getHumanReadableName(), v.persona.getHumanReadableName());
};
private static final Comparator<Sender> SENDER_BY_TRUST = (k, v) -> {
return k.trustLevel.toString().compareTo(v.trustLevel.toString());
return Collator.getInstance().compare(k.trustLevel.toString(), v.trustLevel.toString());
};
private static final Comparator<Sender> SENDER_BY_RESULTS = (k, v) -> {
@@ -410,7 +411,7 @@ public class SearchServlet extends HttpServlet {
}
private static final Comparator<ResultFromSender> RESULT_FROM_SENDER_BY_NAME = (k, v) -> {
return k.name.compareTo(v.name);
return Collator.getInstance().compare(k.name, v.name);
};
private static final Comparator<ResultFromSender> RESULT_FROM_SENDER_BY_SIZE = (k, v) -> {
@@ -429,7 +430,7 @@ public class SearchServlet extends HttpServlet {
}
private static final Comparator<Result> RESULT_BY_NAME = (k, v) -> {
return k.name.compareTo(v.name);
return Collator.getInstance().compare(k.name, v.name);
};
private static final Comparator<Result> RESULT_BY_SIZE = (k, v) -> {
@@ -448,7 +449,7 @@ public class SearchServlet extends HttpServlet {
}
private static final Comparator<SenderForResult> SENDER_FOR_RESULT_BY_SENDER = (k, v) -> {
return k.sender.getHumanReadableName().compareTo(v.sender.getHumanReadableName());
return Collator.getInstance().compare(k.sender.getHumanReadableName(), v.sender.getHumanReadableName());
};
private static final Comparator<SenderForResult> SENDER_FOR_RESULT_BY_BROWSING = (k, v) -> {
@@ -456,7 +457,7 @@ public class SearchServlet extends HttpServlet {
};
private static final Comparator<SenderForResult> SENDER_FOR_RESULT_BY_TRUST = (k, v) -> {
return k.trustLevel.toString().compareTo(v.trustLevel.toString());
return Collator.getInstance().compare(k.trustLevel.toString(), v.trustLevel.toString());
};
private static final ColumnComparators<SenderForResult> SENDER_FOR_RESULT_COMPARATORS = new ColumnComparators<>();

15
webui/src/main/java/com/muwire/webui/TrustServlet.java
View File

@@ -2,6 +2,7 @@ package com.muwire.webui;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -240,11 +241,11 @@ public class TrustServlet extends HttpServlet {
}
private static final Comparator<TrustUser> USER_BY_USER = (l, r) -> {
return l.persona.getHumanReadableName().compareTo(r.persona.getHumanReadableName());
return Collator.getInstance().compare(l.persona.getHumanReadableName(), r.persona.getHumanReadableName());
};
private static final Comparator<TrustUser> USER_BY_REASON = (l, r) -> {
return l.reason.compareTo(r.reason);
return Collator.getInstance().compare(l.reason, r.reason);
};
private static final Comparator<TrustUser> USER_BY_SUBSCRIBED = (l, r) -> {
@@ -289,11 +290,11 @@ public class TrustServlet extends HttpServlet {
}
private static final Comparator<Subscription> SUBSCRIPTION_BY_USER = (l, r) -> {
return l.persona.getHumanReadableName().compareTo(r.persona.getHumanReadableName());
return Collator.getInstance().compare(l.persona.getHumanReadableName(), r.persona.getHumanReadableName());
};
private static final Comparator<Subscription> SUBSCRIPTION_BY_STATUS = (l, r) -> {
return l.status.toString().compareTo(r.status.toString());
return Collator.getInstance().compare(l.status.toString(), r.status.toString());
};
private static final Comparator<Subscription> SUBSCRIPTION_BY_TIMESTAMP = (l, r) -> {
@@ -339,15 +340,15 @@ public class TrustServlet extends HttpServlet {
}
private static final Comparator<TrustListEntry> TRUST_LIST_ENTRY_BY_USER = (l, r) -> {
return l.persona.getHumanReadableName().compareTo(r.persona.getHumanReadableName());
return Collator.getInstance().compare(l.persona.getHumanReadableName(), r.persona.getHumanReadableName());
};
private static final Comparator<TrustListEntry> TRUST_LIST_ENTRY_BY_REASON = (l, r) -> {
return l.reason.compareTo(r.reason);
return Collator.getInstance().compare(l.reason, r.reason);
};
private static final Comparator<TrustListEntry> TRUST_LIST_ENTRY_BY_STATUS = (l, r) -> {
return l.status.toString().compareTo(r.status.toString());
return Collator.getInstance().compare(l.status.toString(), r.status.toString());
};
private static final ColumnComparators<TrustListEntry> TRUST_LIST_ENTRY_COMPARATORS = new ColumnComparators<>();