Changeset de112fd


Ignore:
Timestamp:
Dec 19, 2010 3:43:33 PM (10 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5e7bad2
Parents:
da86615 (diff), 360d96d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

explicit merge of 'daa35ac8b482063c4db4b6205ca5dacc045080a4'

and 'cde8ce662bee407206b7fea94beaa230f052f501'

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    rda86615 rde112fd  
    804804            else if (isRunning && knownPeers > 0)
    805805                statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "nopeers.png\" ></td><td class=\"snarkTorrentStatus " + rowClass + "\">" + _("No Peers") +
    806                                ": 0&thinsp;/&thinsp;" + knownPeers ;
     806                               ": 0" + thinsp(isDegraded) + knownPeers ;
    807807            else if (isRunning)
    808808                statusString = "<img alt=\"\" border=\"0\" src=\"" + _imgPath + "nopeers.png\" ></td><td class=\"snarkTorrentStatus " + rowClass + "\">" + _("No Peers");
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java

    rda86615 rde112fd  
    268268        int active = _helper.getActivePeers();
    269269        buf.append(active)
    270            .append("&thinsp;/&thinsp;")
     270           .append(SummaryHelper.THINSP)
    271271           .append(Math.max(active, _helper.getActiveProfiles()))
    272272           .append("</td></tr>\n" +
     
    377377           .append(":</b></td><td align=\"right\">")
    378378           .append(_helper.getInboundTransferred())
    379            .append("&thinsp;/&thinsp;")
     379           .append(SummaryHelper.THINSP)
    380380           .append(_helper.getOutboundTransferred())
    381381           .append("</td></tr></table>\n" +
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

    rda86615 rde112fd  
    3030 */
    3131public class SummaryHelper extends HelperBase {
     32
     33    // Opera 10.63 doesn't have the char, TODO check UA
     34    //static final String THINSP = "&thinsp;/&thinsp;";
     35    static final String THINSP = " / ";
     36
    3237    /**
    3338     * Retrieve the shortened 4 character ident for the router located within
     
    322327        else
    323328            fmt = new DecimalFormat("#0.00");
    324         return fmt.format(in) + "&thinsp;/&thinsp;" + fmt.format(out) + "&nbsp;" +
     329        return fmt.format(in) + THINSP + fmt.format(out) + "&nbsp;" +
    325330               (mega ? 'M' : 'K');
    326331    }
  • router/java/src/net/i2p/router/RouterVersion.java

    rda86615 rde112fd  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 38;
     21    public final static long BUILD = 39;
    2222
    2323    /** for example "-test" */
  • router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java

    rda86615 rde112fd  
    6363    private long _lastBadSkew;
    6464    private static final long[] RATES = { 10*60*1000 };
     65
     66    // Opera doesn't have the char, TODO check UA
     67    //private static final String THINSP = "&thinsp;/&thinsp;";
     68    private static final String THINSP = " / ";
    6569
    6670    public NTCPTransport(RouterContext ctx) {
     
    741745            buf.append("</td><td class=\"cells\" align=\"right\">");
    742746            buf.append(DataHelper.formatDuration2(con.getTimeSinceReceive()));
    743             buf.append("&thinsp;/&thinsp;").append(DataHelper.formatDuration2(con.getTimeSinceSend()));
     747            buf.append(THINSP).append(DataHelper.formatDuration2(con.getTimeSinceSend()));
    744748            buf.append("</td><td class=\"cells\" align=\"right\">");
    745749            if (con.getTimeSinceReceive() < 10*1000) {
     
    749753                buf.append(formatRate(0));
    750754            }
    751             buf.append("&thinsp;/&thinsp;");
     755            buf.append(THINSP);
    752756            if (con.getTimeSinceSend() < 10*1000) {
    753757                buf.append(formatRate(con.getSendRate()/1024));
     
    786790//            buf.append("<tr> <td colspan=\"11\"><hr></td></tr>\n");
    787791            buf.append("<tr class=\"tablefooter\"><td align=\"center\"><b>").append(peers.size()).append(' ').append(_("peers")).append("</b></td><td>&nbsp;</td><td>&nbsp;");
    788             buf.append("</td><td align=\"center\"><b>").append(formatRate(bpsRecv/1024)).append("&thinsp;/&thinsp;").append(formatRate(bpsSend/1024)).append("</b>");
     792            buf.append("</td><td align=\"center\"><b>").append(formatRate(bpsRecv/1024)).append(THINSP).append(formatRate(bpsSend/1024)).append("</b>");
    789793            buf.append("</td><td align=\"center\"><b>").append(DataHelper.formatDuration2(totalUptime/peers.size()));
    790794            buf.append("</b></td><td align=\"center\"><b>").append(DataHelper.formatDuration2(offsetTotal*1000/peers.size()));
  • router/java/src/net/i2p/router/transport/udp/UDPTransport.java

    rda86615 rde112fd  
    170170    private static final int TRANSIENT_FAIL_BID = 8;
    171171    private final TransportBid[] _cachedBid;
     172
     173    // Opera doesn't have the char, TODO check UA
     174    //private static final String THINSP = "&thinsp;/&thinsp;";
     175    private static final String THINSP = " / ";
    172176
    173177    public UDPTransport(RouterContext ctx) {
     
    19831987            buf.append("<td class=\"cells\" align=\"right\">");
    19841988            buf.append(DataHelper.formatDuration2(idleIn));
    1985             buf.append("&thinsp/&thinsp;");
     1989            buf.append(THINSP);
    19861990            buf.append(DataHelper.formatDuration2(idleOut));
    19871991            buf.append("</td>");
     
    19921996            buf.append("<td class=\"cells\" align=\"right\" nowrap>");
    19931997            buf.append(formatKBps(recvBps));
    1994             buf.append("&thinsp;/&thinsp;");
     1998            buf.append(THINSP);
    19951999            buf.append(formatKBps(sendBps));
    19962000            //buf.append(" K/s");
     
    20182022            buf.append(sendWindow/1024);
    20192023            buf.append("K");
    2020             buf.append("&thinsp;/&thinsp;").append(peer.getConcurrentSends());
    2021             buf.append("&thinsp;/&thinsp;").append(peer.getConcurrentSendWindow());
    2022             buf.append("&thinsp;/&thinsp;").append(peer.getConsecutiveSendRejections());
     2024            buf.append(THINSP).append(peer.getConcurrentSends());
     2025            buf.append(THINSP).append(peer.getConcurrentSendWindow());
     2026            buf.append(THINSP).append(peer.getConsecutiveSendRejections());
    20232027            buf.append("</td>");
    20242028
     
    20432047           
    20442048            buf.append("<td class=\"cells\" align=\"right\">");
    2045             buf.append(peer.getMTU()).append("&thinsp;/&thinsp;").append(peer.getReceiveMTU());
     2049            buf.append(peer.getMTU()).append(THINSP).append(peer.getReceiveMTU());
    20462050           
    20472051            //.append('/');
     
    21032107        buf.append("<tr class=\"tablefooter\"> <td colspan=\"3\" align=\"left\"><b>").append(_("SUMMARY")).append("</b></td>" +
    21042108                   "<td align=\"center\" nowrap><b>");
    2105         buf.append(formatKBps(bpsIn)).append("&thinsp;/&thinsp;").append(formatKBps(bpsOut));
     2109        buf.append(formatKBps(bpsIn)).append(THINSP).append(formatKBps(bpsOut));
    21062110        long x = numPeers > 0 ? uptimeMsTotal/numPeers : 0;
    21072111        buf.append("</b></td>" +
Note: See TracChangeset for help on using the changeset viewer.