I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit d479c4ae authored by zzz's avatar zzz
Browse files

* configstats: Fix group sorting, translate groups

parent 9c220e08
No related branches found
No related tags found
No related merge requests found
package net.i2p.router.web; package net.i2p.router.web;
import java.util.ArrayList; import java.util.ArrayList;
import java.text.Collator;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.SortedSet;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.TreeMap;
import net.i2p.stat.FrequencyStat; import net.i2p.stat.FrequencyStat;
import net.i2p.stat.Rate; import net.i2p.stat.Rate;
...@@ -17,9 +21,9 @@ import net.i2p.util.Log; ...@@ -17,9 +21,9 @@ import net.i2p.util.Log;
public class ConfigStatsHelper extends HelperBase { public class ConfigStatsHelper extends HelperBase {
private Log _log; private Log _log;
private String _filter; private String _filter;
private Set _filters; private Set<String> _filters;
/** list of names of stats which are remaining, ordered by nested groups */ /** list of names of stats which are remaining, ordered by nested groups */
private List _stats; private List<String> _stats;
private String _currentStatName; private String _currentStatName;
private String _currentGraphName; private String _currentGraphName;
private String _currentStatDescription; private String _currentStatDescription;
...@@ -43,11 +47,11 @@ public class ConfigStatsHelper extends HelperBase { ...@@ -43,11 +47,11 @@ public class ConfigStatsHelper extends HelperBase {
_log = _context.logManager().getLog(ConfigStatsHelper.class); _log = _context.logManager().getLog(ConfigStatsHelper.class);
_stats = new ArrayList(); _stats = new ArrayList();
Map groups = _context.statManager().getStatsByGroup(); Map<String, SortedSet<String>> unsorted = _context.statManager().getStatsByGroup();
for (Iterator iter = groups.values().iterator(); iter.hasNext(); ) { Map<String, Set<String>> groups = new TreeMap(new AlphaComparator());
Set stats = (Set)iter.next(); groups.putAll(unsorted);
for (Iterator statIter = stats.iterator(); statIter.hasNext(); ) for (Set<String> stats : groups.values()) {
_stats.add(statIter.next()); _stats.addAll(stats);
} }
_filter = _context.statManager().getStatFilter(); _filter = _context.statManager().getStatFilter();
if (_filter == null) if (_filter == null)
...@@ -149,4 +153,16 @@ public class ConfigStatsHelper extends HelperBase { ...@@ -149,4 +153,16 @@ public class ConfigStatsHelper extends HelperBase {
public boolean getIsFull() { public boolean getIsFull() {
return _context.getBooleanProperty(StatManager.PROP_STAT_FULL); return _context.getBooleanProperty(StatManager.PROP_STAT_FULL);
} }
/**
* Translated sort
* @since 0.9.4
*/
private class AlphaComparator implements Comparator<String> {
public int compare(String lhs, String rhs) {
String lname = _(lhs);
String rname = _(rhs);
return Collator.getInstance().compare(lname, rname);
}
}
} }
...@@ -97,7 +97,7 @@ Warning - Log with care, stat file grows without limit.<br> ...@@ -97,7 +97,7 @@ Warning - Log with care, stat file grows without limit.<br>
while (statshelper.groupRequired()) { %> while (statshelper.groupRequired()) { %>
<tr class="tablefooter"> <tr class="tablefooter">
<td align="left" colspan="3" id=<%=statshelper.getCurrentGroupName()%>> <td align="left" colspan="3" id=<%=statshelper.getCurrentGroupName()%>>
<b><%=statshelper.getCurrentGroupName()%></b> <b><%=intl._(statshelper.getCurrentGroupName())%></b>
(<a href="javascript:void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=intl._("toggle all")%></a>) (<a href="javascript:void(null);" onclick="toggleAll('<%=statshelper.getCurrentGroupName()%>')"><%=intl._("toggle all")%></a>)
</td></tr> </td></tr>
<tr class="tablefooter"> <tr class="tablefooter">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment