echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sort clients on /configclients

Browse Source
This commit is contained in:
zzz
2015-04-16 15:07:08 +00:00
parent 568c90806d
commit 6f09224bdc
1 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java
View File

@ -1,9 +1,13 @@
package net.i2p.router.web; package net.i2p.router.web;
import java.text.Collator;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
@ -116,8 +120,18 @@ public class ConfigClientsHelper extends HelperBase {
boolean allowEdit = isClientChangeEnabled(); boolean allowEdit = isClientChangeEnabled();
List<ClientAppConfig> clients = ClientAppConfig.getClientApps(_context); List<ClientAppConfig> clients = ClientAppConfig.getClientApps(_context);
List<CAC> cacs = new ArrayList<CAC>(clients.size());
for (int cur = 0; cur < clients.size(); cur++) { for (int cur = 0; cur < clients.size(); cur++) {
ClientAppConfig ca = clients.get(cur); ClientAppConfig ca = clients.get(cur);
String xname = ca.clientName;
if (xname.length() > 0)
xname = _(xname);
cacs.add(new CAC(cur, ca, xname));
}
Collections.sort(cacs, new CACComparator());
for (CAC cac : cacs) {
ClientAppConfig ca = cac.config;
int cur = cac.index;
boolean isConsole = ca.className.equals("net.i2p.router.web.RouterConsoleRunner"); boolean isConsole = ca.className.equals("net.i2p.router.web.RouterConsoleRunner");
boolean showStart; boolean showStart;
boolean showStop; boolean showStop;
@ -155,6 +169,32 @@ public class ConfigClientsHelper extends HelperBase {
return buf.toString(); return buf.toString();
} }
/** @since 0.9.20 */
private static class CAC {
public final int index;
public final ClientAppConfig config;
public final String xname;
public CAC(int idx, ClientAppConfig cfg, String xn) {
index = idx; config = cfg; xname = xn;
}
}
/** @since 0.9.20 */
private class CACComparator implements Comparator<CAC> {
private static final long serialVersionUID = 1L;
private final Collator coll;
public CACComparator() {
super();
coll = Collator.getInstance(new Locale(Messages.getLanguage(_context)));
}
public int compare(CAC l, CAC r) {
return coll.compare(l.xname, r.xname);
}
}
/** webapps */ /** webapps */
public String getForm2() { public String getForm2() {
StringBuilder buf = new StringBuilder(1024); StringBuilder buf = new StringBuilder(1024);