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

propagate from branch 'i2p.i2p.tuna.tmp' (head 1bba286bdb7f8ba879c4db3f356676151674a201)

Browse Source 
to branch 'i2p.i2p' (head 5698b31632398b8156a3b4cc215fed677cf205bf)
This commit is contained in:
dev
2015-04-15 16:08:29 +00:00
parent 54dba980b4 de6608f6b8
commit b31ae4bae5
161 changed files with 33674 additions and 25999 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
View File

@ -973,8 +973,9 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
* @param t may be null
*/
public void notifyTaskFailed(UpdateTask task, String reason, Throwable t) {
if (_log.shouldLog(Log.ERROR))
_log.error("Failed " + task + " for " + task.getType() + ": " + reason, t);
int level = task.getType() == TYPE_DUMMY ? Log.WARN : Log.ERROR;
if (_log.shouldLog(level))
_log.log(level, "Failed " + task + " for " + task.getType() + ": " + reason, t);
List<RegisteredUpdater> toTry = _downloaders.get(task);
if (toTry != null) {
UpdateItem ui = new UpdateItem(task.getType(), task.getID());

2
apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java
View File

@ -27,6 +27,7 @@ public class ConfigNavHelper extends HelperBase {
_x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
_x("Reseeding"), _x("Advanced") };
/** @since 0.9.19 */
private static class Tab {
public final String page, title;
public Tab(String p, String t) {
@ -34,6 +35,7 @@ public class ConfigNavHelper extends HelperBase {
}
}
/** @since 0.9.19 */
private class TabComparator implements Comparator<Tab> {
private static final long serialVersionUID = 1L;
private final Collator coll;

1
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
View File

@ -86,6 +86,7 @@ public class ConfigUIHelper extends HelperBase {
{ "hu", "hu", _x("Hungarian"), null },
{ "it", "it", _x("Italian"), null },
{ "ja", "jp", _x("Japanese"), null },
{ "mg", "mg", _x("Malagasy"), null },
{ "nl", "nl", _x("Dutch"), null },
{ "nb", "no", _x("Norwegian Bokmaal"), null },
{ "pl", "pl", _x("Polish"), null },

6
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@ -69,7 +69,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.su2\r\n" +
"http://inr.i2p/i2p/i2pupdate.su2\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.su2\r\n" +
"http://stats.i2p/i2p/i2pupdate.su2\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.su2\r\n" +
"http://update.dg.i2p/files/i2pupdate.su2\r\n" +
@ -79,7 +79,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String NO_PACK200_URLS =
"http://echelon.i2p/i2p/i2pupdate.sud\r\n" +
"http://inr.i2p/i2p/i2pupdate.sud\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.sud\r\n" +
"http://stats.i2p/i2p/i2pupdate.sud\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.sud\r\n" +
"http://update.dg.i2p/files/i2pupdate.sud\r\n" +
@ -113,7 +113,7 @@ public class ConfigUpdateHandler extends FormHandler {
private static final String DEFAULT_SU3_UPDATE_URLS =
"http://echelon.i2p/i2p/i2pupdate.su3\r\n" +
"http://inr.i2p/i2p/i2pupdate.su3\r\n" +
"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
//"http://meeh.i2p/i2pupdate/i2pupdate.su3\r\n" +
"http://stats.i2p/i2p/i2pupdate.su3\r\n" +
// "http://www.i2p2.i2p/_static/i2pupdate.su3\r\n" +
"http://update.dg.i2p/files/i2pupdate.su3\r\n" +