Ticket #1682: 20160206_i2psnark_i2ptunnel_ministreaming_routerconsole_streaming.diff

File 20160206_i2psnark_i2ptunnel_ministreaming_routerconsole_streaming.diff, 20.8 KB (added by z3r0fox, 6 years ago)

Diff of @Deprecated annotations to i2psnark, i2ptunnel, ministreaming, routerconsole, streaming

  • apps/i2psnark/java/src/org/klomp/snark/Peer.java

    #
    # old_revision [631717747c08c723b4c30282f24ebf93c081a7dc]
    #
    # patch "apps/i2psnark/java/src/org/klomp/snark/Peer.java"
    #  from [c779f69e54ac662587847d0fb0c6bb28bcb4f03c]
    #    to [1857dcfa65200077482cc107d2dc5f7d29796d2d]
    # 
    # patch "apps/i2psnark/java/src/org/klomp/snark/PeerID.java"
    #  from [509ea31c7a739f2ead3337f1cd14d67cebcf835f]
    #    to [c524a9d5c6ba18448f5b15c830dea2fadfd3cff2]
    # 
    # patch "apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java"
    #  from [fb6e07b46522f100c6569eb9eb8be457a99e5862]
    #    to [93f1ee79df69c70b353dc44b6972dd4dda03f867]
    # 
    # patch "apps/i2psnark/java/src/org/klomp/snark/PeerState.java"
    #  from [9f6c5984ea652447beb46da999b1970b9ff47223]
    #    to [8ba6430ce7dfe40a20d1ff6be8773585075c9392]
    # 
    # patch "apps/i2psnark/java/src/org/klomp/snark/SnarkShutdown.java"
    #  from [284292e4a6662eec7b336468e5d5e122b4d3a080]
    #    to [6d06ca2caad77414bcf53dd8dbed238cc6fe5bc9]
    # 
    # patch "apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java"
    #  from [6c30f98a155d40f103a6dcfc02c257719c0d50bf]
    #    to [ee606e50ee632f09bf08e9d8c6ca59d519240231]
    # 
    # patch "apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java"
    #  from [038f6f699c22221f85026d93f1e8543a2f519f7c]
    #    to [de19d5769472793d461b3a4092119f46ff4ba56b]
    # 
    # patch "apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java"
    #  from [73c6110484beb8e6c458928fce9c1425bdeaa229]
    #    to [f5a6e04d0e42c16570cfc3c3038daf642e6d050a]
    # 
    # patch "apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelOutproxyRunner.java"
    #  from [89f6ee067963e3807d9571b9704a9d13ce0b558c]
    #    to [40ccc25023d8df39285386b843eac2e1ef10d10d]
    # 
    # patch "apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java"
    #  from [78297d98dcecab9f97d95a7372d6d38ebe21b082]
    #    to [b0cec2dd01589db6175db68fc460606378451b53]
    # 
    # patch "apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java"
    #  from [7e9790b3d4cfcc21657e07421fdddd831d6b6223]
    #    to [e9a2395889d2782ccbce00716ec40dbede4e58a2]
    # 
    # patch "apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java"
    #  from [30f84bd040d27031886b9d999bf90b021c077337]
    #    to [ea8e75775e23b0e4a1c56e54df35d0b73e4282d2]
    # 
    # patch "apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java"
    #  from [20442973d81b469e8bd966cfcb8dcceb4e0bea0c]
    #    to [540cc1a951eb3c7cf6d8542e0466164393865716]
    # 
    # patch "apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java"
    #  from [4612b5d7daf465b5d07c0e6551bb397aa148c96e]
    #    to [65ce2ab75a5bd1ae3837b253e087b5ee604c027c]
    # 
    # patch "apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java"
    #  from [b43a03111bb86423cdc026462d47663fb89d8f0f]
    #    to [1a933f3971ea2a2e0ccac3f63c2a6fa5028a5b70]
    # 
    # patch "apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java"
    #  from [7ec310164b8fe0406d88e1af59be6944538a5031]
    #    to [ba57f0045016756d1e78dc8d3de80e374597608a]
    # 
    # patch "apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java"
    #  from [e728566ab9dfd121f5432106b9e73932233f9a8b]
    #    to [2a51f2834cf4d48a0fd840dc16c3ac3f5436debd]
    # 
    # patch "apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java"
    #  from [93fb83c78cd6798907f445482008a1f3f68edacb]
    #    to [0496007b6bf6dd3f2d64f79d27333ee9acfa0368]
    # 
    # patch "apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java"
    #  from [d86df427a509d33519292b8022aa9f9086e5129b]
    #    to [27004f81c6cc453c07d8a189c860c29730f5efea]
    # 
    # patch "apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java"
    #  from [d6efe8c9f5dd3fa3de8dc634a6e7606efa542eb8]
    #    to [954db3ebdf46de3001159cc180cadc96cec6b7cd]
    # 
    # patch "apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java"
    #  from [a585c5730a4503f624505ac5a82c8d459ae2e375]
    #    to [70d680b4edce223e160f31b65d66bb0ce376a24d]
    # 
    # patch "apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java"
    #  from [1f1f0f8d2e3960e6bffb020551bd9ca6a2560a4b]
    #    to [f11f9c9f8dfb5521ae94739a361233a36dc4cc20]
    # 
    # patch "apps/streaming/java/src/net/i2p/client/streaming/impl/RetransmissionTimer.java"
    #  from [ce5be9b5121e68f1f72b8c5b8cb4db10cf798dab]
    #    to [85e283156c4e875c6bd301d5914875d66c772e75]
    #
    ============================================================
    public class Peer implements Comparable< 
    194194   * Compares the PeerIDs.
    195195   * @deprecated unused?
    196196   */
     197  @Deprecated
    197198  public int compareTo(Peer p)
    198199  {
    199200    int rv = peerID.compareTo(p.peerID);
    public class Peer implements Comparable< 
    531532   * @deprecated deadlocks
    532533   * @since 0.8.1
    533534   */
     535  @Deprecated
    534536  boolean isRequesting(int p) {
    535537    PeerState s = state;
    536538    return s != null && s.isRequesting(p);
    public class Peer implements Comparable< 
    563565   * us then we start downloading from it. Has no effect when not connected.
    564566   * @deprecated unused
    565567   */
     568  @Deprecated
    566569  public void setInteresting(boolean interest)
    567570  {
    568571    PeerState s = state;
  • apps/i2psnark/java/src/org/klomp/snark/PeerID.java

    ============================================================
    public class PeerID implements Comparabl 
    196196   * Compares port, address and id.
    197197   * @deprecated unused? and will NPE now that address can be null?
    198198   */
     199  @Deprecated
    199200  public int compareTo(PeerID pid)
    200201  {
    201202    int result = port - pid.port;
  • apps/i2psnark/java/src/org/klomp/snark/PeerMonitorTask.java

    ============================================================
    import net.i2p.data.DataHelper; 
    3030 *
    3131 * @deprecated unused, for command line client only, commented out in Snark.java
    3232 */
     33@Deprecated
    3334class PeerMonitorTask implements Runnable
    3435{
    3536  final static long MONITOR_PERIOD = 10 * 1000; // Ten seconds.
  • apps/i2psnark/java/src/org/klomp/snark/PeerState.java

    ============================================================
    class PeerState implements DataLoader 
    744744   * @deprecated deadlocks
    745745   * @since 0.8.1
    746746   */
     747  @Deprecated
    747748  synchronized boolean isRequesting(int piece) {
    748749      if (pendingRequest != null && pendingRequest.getPiece() == piece)
    749750          return true;
  • apps/i2psnark/java/src/org/klomp/snark/SnarkShutdown.java

    ============================================================
    import net.i2p.util.I2PAppThread; 
    2828 * Makes sure everything ends correctly when shutting down.
    2929 * @deprecated unused
    3030 */
     31@Deprecated
    3132public class SnarkShutdown extends I2PAppThread
    3233{
    3334  private final Storage storage;
  • apps/i2psnark/java/src/org/klomp/snark/web/RunStandalone.java

    ============================================================
    import net.i2p.util.FileUtil; 
    1010/**
    1111 *  @deprecated does not work
    1212 */
     13@Deprecated
    1314public class RunStandalone {
    1415/****
    1516    static {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

    ============================================================
    public class I2PTunnel extends EventDisp 
    18311831     * just call context.namingService.lookup() directly.
    18321832     * @deprecated Don't use i2ptunnel for lookup! Use I2PAppContext.getGlobalContext().namingService().lookup(name) from i2p.jar
    18331833     */
     1834    @Deprecated
    18341835    public static Destination destFromName(String name) throws DataFormatException {
    18351836        return destFromName(name, null, null, false, null, null);
    18361837    }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

    ============================================================
    public class I2PTunnelClient extends I2P 
    2424     * list of Destination objects that we point at
    2525     * @deprecated why protected? Is anybody using out-of-tree? Protected from the beginning (2004)
    2626     */
     27    @Deprecated
    2728    protected List<Destination> dests;
    2829
    2930    /**
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelOutproxyRunner.java

    ============================================================
    public class I2PTunnelOutproxyRunner ext 
    9393     *
    9494     * @deprecated unused
    9595     */
     96    @Deprecated
    9697    public boolean isFinished() {
    9798        return finished;
    9899    }
    public class I2PTunnelOutproxyRunner ext 
    104105     * @return date (ms since the epoch), or -1 if no data has been transferred yet
    105106     * @deprecated unused
    106107     */
     108    @Deprecated
    107109    public long getLastActivityOn() {
    108110        return lastActivityOn;
    109111    }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java

    ============================================================
    public class I2PTunnelRunner extends I2P 
    8282     *                               Will synchronize on slock when removing.
    8383     *  @deprecated use FailCallback constructor
    8484     */
     85    @Deprecated
    8586    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData,
    8687                           List<I2PSocket> sockList) {
    8788        this(s, i2ps, slock, initialI2PData, null, sockList, null, null, true);
    public class I2PTunnelRunner extends I2P 
    9798     *                               Will synchronize on slock when removing.
    9899     *  @deprecated use FailCallback constructor
    99100     */
     101    @Deprecated
    100102    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData,
    101103                           byte[] initialSocketData, List<I2PSocket> sockList) {
    102104        this(s, i2ps, slock, initialI2PData, initialSocketData, sockList, null, null, true);
    public class I2PTunnelRunner extends I2P 
    113115     *                   it will be run before closing s.
    114116     *  @deprecated use FailCallback constructor
    115117     */
     118    @Deprecated
    116119    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData,
    117120                           List<I2PSocket> sockList, Runnable onTimeout) {
    118121        this(s, i2ps, slock, initialI2PData, null, sockList, onTimeout, null, true);
    public class I2PTunnelRunner extends I2P 
    130133     *                   it will be run before closing s.
    131134     *  @deprecated use FailCallback constructor
    132135     */
     136    @Deprecated
    133137    public I2PTunnelRunner(Socket s, I2PSocket i2ps, Object slock, byte[] initialI2PData,
    134138                           byte[] initialSocketData, List<I2PSocket> sockList, Runnable onTimeout) {
    135139        this(s, i2ps, slock, initialI2PData, initialSocketData, sockList, onTimeout, null, true);
    public class I2PTunnelRunner extends I2P 
    192196     *
    193197     * @deprecated unused
    194198     */
     199    @Deprecated
    195200    public boolean isFinished() {
    196201        return finished;
    197202    }
    public class I2PTunnelRunner extends I2P 
    203208     * @return date (ms since the epoch), or -1 if no data has been transferred yet
    204209     * @deprecated unused
    205210     */
     211    @Deprecated
    206212    public long getLastActivityOn() {
    207213        return lastActivityOn;
    208214    }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

    ============================================================
    public class TunnelController implements 
    752752     *  @return one big string of "key=val key=val ..."
    753753     *  @deprecated why would you want this? Use getClientOptionProps() instead
    754754     */
     755    @Deprecated
    755756    public String getClientOptions() {
    756757        StringBuilder opts = new StringBuilder(64);
    757758        for (Map.Entry<Object, Object> e : _config.entrySet()) {
    public class TunnelController implements 
    869870     *  A text description of the tunnel.
    870871     *  @deprecated unused
    871872     */
     873    @Deprecated
    872874    public void getSummary(StringBuilder buf) {
    873875        String type = getType();
    874876        buf.append(type);
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PServerSocket.java

    ============================================================
    public interface I2PServerSocket { 
    4242     *  @return null always
    4343     *  @since 0.8.11
    4444     */
     45    @Deprecated
    4546    public AcceptingChannel getChannel();
    4647
    4748    /**
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocket.java

    ============================================================
    public interface I2PSocket extends Close 
    6262     *  @return null always
    6363     *  @since 0.8.9
    6464     */
     65    @Deprecated
    6566    public SelectableChannel getChannel() throws IOException;
    6667
    6768    /**
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

    ============================================================
    public class I2PSocketManagerFactory { 
    3737     *  Ignored since 0.9.12, cannot be changed via properties.
    3838     *  @deprecated
    3939     */
     40    @Deprecated
    4041    public static final String PROP_MANAGER = "i2p.streaming.manager";
    4142
    4243    /**
  • apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java

    ============================================================
    package net.i2p.client.streaming; 
    1010 *  @since 0.9.12
    1111 *  @deprecated
    1212 */
     13@Deprecated
    1314public class I2PSocketManagerFull {}
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

    ============================================================
    public class ConfigNetHelper extends Hel 
    149149     *  This isn't updated for the new statuses, but it's commented out in the jsp.
    150150     *  @deprecated unused, to be fixed if needed
    151151     */
     152    @Deprecated
    152153    public String getRequireIntroductionsChecked() {
    153154        Status status = _context.commSystem().getStatus();
    154155        switch (status) {
  • apps/routerconsole/java/src/net/i2p/router/web/SummaryRenderer.java

    ============================================================
    class SummaryRenderer { 
    4848     * DOM level 3 load and store support.  Perhaps we can bundle that, or
    4949     * specify who can get it from where, etc.
    5050     *
    51      * @deprecated unsed
     51     * @deprecated unused
    5252     * @throws UnsupportedOperationException always
    5353     */
     54    @Deprecated
    5455    public static synchronized void render(I2PAppContext ctx, OutputStream out, String filename) throws IOException {
    5556        throw new UnsupportedOperationException();
    5657/*****
  • apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java

    ============================================================
    class ConnectionOptions extends I2PSocke 
    538538     * @deprecated This doesn't appear to be used.
    539539     * @return receive window size.
    540540     */
     541    @Deprecated
    541542    public int getReceiveWindow() { return _receiveWindow; }
    542543    public void setReceiveWindow(int numMsgs) { _receiveWindow = numMsgs; }
    543544   
  • apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java

    ============================================================
    class I2PServerSocketFull implements I2P 
    4545     *  @return null always
    4646     *  @since 0.8.11
    4747     */
     48    @Deprecated
    4849    public synchronized AcceptingChannel getChannel() {
    4950        return null;
    5051    }
  • apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java

    ============================================================
    class I2PSocketFull implements I2PSocket 
    9696     *  @return null always
    9797     *  @since 0.8.9
    9898     */
     99    @Deprecated
    99100    public synchronized SelectableChannel getChannel() {
    100101        return null;
    101102    }
  • apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java

    ============================================================
    public class I2PSocketManagerFull implem 
    168168     * @deprecated use 4-arg constructor
    169169     * @throws UnsupportedOperationException always
    170170     */
     171    @Deprecated
    171172    public I2PSocketManagerFull() {
    172173        throw new UnsupportedOperationException();
    173174    }
    public class I2PSocketManagerFull implem 
    176177     * @deprecated use 4-arg constructor
    177178     * @throws UnsupportedOperationException always
    178179     */
     180    @Deprecated
    179181    public void init(I2PAppContext context, I2PSession session, Properties opts, String name) {
    180182        throw new UnsupportedOperationException();
    181183    }
  • apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java

    ============================================================
    class PacketLocal extends Packet impleme 
    6666    /**
    6767     * @deprecated should always return null
    6868     */
     69    @Deprecated
    6970    public SessionKey getKeyUsed() { return _keyUsed; }
    7071
    7172    /**
    7273     * @deprecated I2PSession throws out the tags
    7374     */
     75    @Deprecated
    7476    public void setKeyUsed(SessionKey key) {
    7577        if (key != null)
    7678            _log.error("Who is sending tags thru the streaming lib?");
    class PacketLocal extends Packet impleme 
    8082    /**
    8183     * @deprecated should always return null or an empty set
    8284     */
     85    @Deprecated
    8386    public Set<SessionTag> getTagsSent() { return Collections.emptySet(); }
    8487
    8588    /**
    8689     * @deprecated I2PSession throws out the tags
    8790     */
     91    @Deprecated
    8892    public void setTagsSent(Set<SessionTag> tags) {
    8993        if (tags != null && !tags.isEmpty())
    9094            _log.error("Who is sending tags thru the streaming lib? " + tags.size());
  • apps/streaming/java/src/net/i2p/client/streaming/impl/RetransmissionTimer.java

    ============================================================
    public class RetransmissionTimer extends 
    1212     *  @deprecated Don't use this to prestart threads, this is no longer a static instance
    1313     *  @return a new instance as of 0.9
    1414     */
     15    @Deprecated
    1516    public static final RetransmissionTimer getInstance() {
    1617        return new RetransmissionTimer(I2PAppContext.getGlobalContext(), "RetransmissionTimer");
    1718    }