Changeset 5ddb4ed


Ignore:
Timestamp:
Jul 13, 2017 3:46:37 PM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
0b85bff
Parents:
d2da262
Message:

fixups after review

Files:
11 edited

Legend:

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

    rd2da262 r5ddb4ed  
    15251525   */
    15261526  public void gotCommentReq(Peer peer, int num) {
    1527       /* if disabled, return */
     1527      /* TODO cache per-torrent setting, use it instead */
     1528      if (!_util.utCommentsEnabled())
     1529          return;
    15281530      CommentSet comments = snark.getComments();
    15291531      if (comments != null) {
     
    15481550   */
    15491551  public void gotComments(Peer peer, List<Comment> comments) {
    1550       /* if disabled, return */
     1552      /* TODO cache per-torrent setting, use it instead */
     1553      if (!_util.utCommentsEnabled())
     1554          return;
    15511555      if (!comments.isEmpty())
    15521556          snark.addComments(comments);
  • apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

    rd2da262 r5ddb4ed  
    798798    }
    799799
     800    /**
     801     * @since 0.9.31
     802     */
    800803    public boolean getUniversalTheming() {
    801804        return _context.getBooleanProperty(RC_PROP_UNIVERSAL_THEMING);
  • apps/i2psnark/java/src/org/klomp/snark/comments/Comment.java

    rd2da262 r5ddb4ed  
    7171        }
    7272        this.name = name;
    73         if (rating < 0 || rating > 5)
     73        if (rating < 0)
    7474            rating = 0;
    7575        else if (rating > 5)
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

    rd2da262 r5ddb4ed  
    13761376            out.write(" " + _t("If you want to keep track of sites you have added manually, add to your Master or Private address book instead."));
    13771377        }
     1378        // FIXME wasn't escaped
     1379        String label = _t("Save & continue").replace("&", "&amp;");
    13781380        out.write("</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"router\" value=\"router\">" +
    1379                   _t("Save & continue") + "</button></div>\n");
     1381                  label + "</button></div>\n");
    13801382
    13811383        if(_context.namingService().getName().equals("BlockfileNamingService")) {
     
    13851387            _t("This address will be saved to your Master address book. Select this option for addresses you wish to keep separate from the main router address book, but don't mind publishing.") +
    13861388            "</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"master\" value=\"master\">" +
    1387             _t("Save & continue") + "</button></div>\n");
     1389            label + "</button></div>\n");
    13881390
    13891391            out.write("<h4>" + _t("Save {0} to private address book and continue to website", destination) + "</h4>\n<p>" +
    13901392            _t("This address will be saved to your Private address book, ensuring it is never published.") +
    13911393            "</p>\n<div class=\"formaction\"><button type=\"submit\" class=\"accept\" name=\"private\" value=\"private\">" +
    1392             _t("Save & continue") + "</button></div>\n");
     1394            label + "</button></div>\n");
    13931395
    13941396        }
  • apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java

    rd2da262 r5ddb4ed  
    3030        _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S +
    3131        _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "info/bandwidth.png" + S +
    32         _x("Configure UI") + S + _x("Select console theme & language & set optional console password") + S + "/configui" + S + I + "info/ui.png" + S +
     32        // FIXME wasn't escaped
     33        _x("Configure UI") + S + _x("Select console theme & language & set optional console password").replace("&", "&amp;") + S + "/configui" + S + I + "info/ui.png" + S +
    3334        _x("Customize Home Page") + S + _x("I2P Home Page Configuration") + S + "/confighome" + S + I + "home_page.png" + S +
    3435        _x("Email") + S + _x("Anonymous webmail client") + S + "/susimail/susimail" + S + I + "email.png" + S +
     
    230231               .append("\">")
    231232               .append(DataHelper.escapeHTML(app.name))
    232                .append("</td><td align=\"left\"><a href=\"");
     233               .append("</label></td><td align=\"left\"><a href=\"");
    233234            String url = DataHelper.escapeHTML(app.url);
    234235            buf.append(url)
  • apps/routerconsole/java/src/net/i2p/router/web/NewsFeedHelper.java

    rd2da262 r5ddb4ed  
    8989                    buf.append("</a>");
    9090                if (entry.authorName != null) {
     91                                                              // FIXME translate
    9192                    buf.append(" <span class=\"newsAuthor\" title=\"Post author\"><i>")
    92                        .append(Messages.getString("{0}", DataHelper.escapeHTML(entry.authorName), ctx))
     93                       .append(DataHelper.escapeHTML(entry.authorName))
    9394                       .append("</i></span>\n");
    9495                }
  • apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java

    rd2da262 r5ddb4ed  
    8585                render(ut, out, urlBase, sortFlags);
    8686            } else {
    87                 // pluggable (none yet_
     87                // pluggable (none yet)
    8888                t.renderStatusHTML(out, urlBase, sortFlags);
    8989            }
     
    153153    }
    154154
    155     /// begin SSU
     155    /// begin NTCP
    156156
    157157    /**
  • apps/routerconsole/java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

    rd2da262 r5ddb4ed  
    176176            Rate failed = prof.getTunnelHistory().getFailedRate().getRate(30*60*1000);
    177177            long fails = failed.computeAverages(ra, false).getTotalEventCount();
    178             if (fails == 0) buf.append(_t("OK"));
    179             if (fails > 0) {
     178            if (fails == 0) {
     179                buf.append(_t("OK"));
     180            } else if (fails > 0) {
    180181                Rate accepted = prof.getTunnelCreateResponseTime().getRate(30*60*1000);
    181182                long total = fails + accepted.computeAverages(ra, false).getTotalEventCount();
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java

    rd2da262 r5ddb4ed  
    162162     * @since 0.9.31
    163163     */
    164     public class NetworkStateMessage {
     164    public static class NetworkStateMessage {
    165165        private NetworkState state;
    166166        private String msg;
     
    185185        @Override
    186186        public String toString() {
    187             return super.toString() + " (" + state + "; " + msg + ')';
     187            return "(" + state + "; " + msg + ')';
    188188        }
    189189    }
  • core/java/src/net/i2p/crypto/KeyGenerator.java

    rd2da262 r5ddb4ed  
    229229
    230230    /**
    231      *  Generic signature type, supports DSA, ECDSA, EdDSA
     231     *  Generic signature type, supports DSA, RSA, ECDSA, EdDSA
    232232     *  @since 0.9.9
    233233     */
  • debian-alt/doc/dependencies.txt

    rd2da262 r5ddb4ed  
    110110  No package or not widely available.
    111111  There is an old 1.5.9 Maven jrobin package at http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.jrobin%22
     112  Jrobin is in Gentoo.
    112113
    113114* libhttpclient-java
Note: See TracChangeset for help on using the changeset viewer.