Changeset e38db5e


Ignore:
Timestamp:
Nov 20, 2013 11:36:39 PM (6 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
688dd23
Parents:
817f531
Message:

i2ptunnel: type arguments, unused imports

Location:
apps/i2ptunnel/java/src/net/i2p/i2ptunnel
Files:
27 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ConnThrottler.java

    r817f531 re38db5e  
    5353                         long throttlePeriod, long totalThrottlePeriod, String action, Log log) {
    5454        updateLimits(max, totalMax, period, throttlePeriod, totalThrottlePeriod);
    55         _peers = new HashMap(4);
     55        _peers = new HashMap<Hash, Record>(4);
    5656        _action = action;
    5757        _log = log;
     
    144144
    145145        public Record() {
    146             times = new ArrayList(8);
     146            times = new ArrayList<Long>(8);
    147147            increment();
    148148        }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

    r817f531 re38db5e  
    4747import java.util.List;
    4848import java.util.Locale;
    49 import java.util.Map;
    5049import java.util.Properties;
    5150import java.util.Set;
     
    10099    private static final String nocli_args[] = { "-nocli", "-die"};
    101100
    102     private final List<I2PTunnelTask> tasks = new ArrayList();
     101    private final List<I2PTunnelTask> tasks = new ArrayList<I2PTunnelTask>();
    103102    private int next_task_id = 1;
    104103
    105     private final Set listeners = new CopyOnWriteArraySet();
     104    private final Set<ConnectionEventListener> listeners = new CopyOnWriteArraySet<ConnectionEventListener>();
    106105
    107106    public static void main(String[] args) throws IOException {
     
    125124        Properties p = _context.getProperties();
    126125        _clientOptions = p;
    127         _sessions = new CopyOnWriteArraySet();
     126        _sessions = new CopyOnWriteArraySet<I2PSession>();
    128127       
    129128        addConnectionEventListener(lsnr);
     
    197196    /** @return A copy, non-null */
    198197    List<I2PSession> getSessions() {
    199             return new ArrayList(_sessions);
     198            return new ArrayList<I2PSession>(_sessions);
    200199    }
    201200
     
    15071506     */
    15081507    private void purgetasks(Logging l) {
    1509             List<I2PTunnelTask> removed = new ArrayList();
     1508            List<I2PTunnelTask> removed = new ArrayList<I2PTunnelTask>();
    15101509            for (I2PTunnelTask t : tasks) {
    15111510                if (!t.isOpen()) {
     
    16691668    void routerDisconnected() {
    16701669        _log.error(getPrefix() + "Router disconnected - firing notification events");
    1671             for (Iterator iter = listeners.iterator(); iter.hasNext();) {
    1672                 ConnectionEventListener lsnr = (ConnectionEventListener) iter.next();
     1670            for (Iterator<ConnectionEventListener> iter = listeners.iterator(); iter.hasNext();) {
     1671                ConnectionEventListener lsnr = iter.next();
    16731672                if (lsnr != null) lsnr.routerDisconnected();
    16741673            }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

    r817f531 re38db5e  
    4444              tunnel, pkf);
    4545
    46         _addrs = new ArrayList(1);
     46        _addrs = new ArrayList<I2PSocketAddress>(1);
    4747        if (waitEventValue("openBaseClientResult").equals("error")) {
    4848            notifyEvent("openClientResult", "error");
     
    5050        }
    5151
    52         dests = new ArrayList(1);
     52        dests = new ArrayList<Destination>(1);
    5353        buildAddresses(destinations);
    5454
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

    r817f531 re38db5e  
    4949    protected final Object sockLock = new Object(); // Guards sockMgr and mySockets
    5050    protected I2PSocketManager sockMgr; // should be final and use a factory. LINT
    51     protected final List<I2PSocket> mySockets = new ArrayList();
     51    protected final List<I2PSocket> mySockets = new ArrayList<I2PSocket>();
    5252    protected boolean _ownDest;
    5353
     
    679679        public CustomThreadPoolExecutor() {
    680680             super(0, Integer.MAX_VALUE, HANDLER_KEEPALIVE_MS, TimeUnit.MILLISECONDS,
    681                    new SynchronousQueue(), new CustomThreadFactory());
     681                   new SynchronousQueue<Runnable>(), new CustomThreadFactory());
    682682        }
    683683    }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java

    r817f531 re38db5e  
    44package net.i2p.i2ptunnel;
    55
    6 import java.io.File;
    76import java.io.IOException;
    87import java.io.InputStream;
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

    r817f531 re38db5e  
    44package net.i2p.i2ptunnel;
    55
    6 import java.io.File;
    76import java.io.IOException;
    87import java.io.InputStream;
     
    7170     *  via address helper links
    7271     */
    73     private final ConcurrentHashMap<String, String> addressHelpers = new ConcurrentHashMap(8);
     72    private final ConcurrentHashMap<String, String> addressHelpers = new ConcurrentHashMap<String, String>(8);
    7473
    7574    /**
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java

    r817f531 re38db5e  
    9595                               I2PTunnel tunnel) throws IllegalArgumentException {
    9696        super(localPort, ownDest, l, notifyThis, handlerName, tunnel);
    97         _proxyList = new ArrayList(4);
     97        _proxyList = new ArrayList<String>(4);
    9898        _proxyNonce = new byte[PROXYNONCE_BYTES];
    9999        _context.random().nextBytes(_proxyNonce);
    100         _nonces = new ConcurrentHashMap();
     100        _nonces = new ConcurrentHashMap<String, NonceInfo>();
    101101    }
    102102
     
    111111            throws IllegalArgumentException {
    112112        super(localPort, l, sktMgr, tunnel, notifyThis, clientId);
    113         _proxyList = new ArrayList(4);
     113        _proxyList = new ArrayList<String>(4);
    114114        _proxyNonce = new byte[PROXYNONCE_BYTES];
    115115        _context.random().nextBytes(_proxyNonce);
    116         _nonces = new ConcurrentHashMap();
     116        _nonces = new ConcurrentHashMap<String, NonceInfo>();
    117117    }
    118118
     
    410410     */
    411411    private static Map<String, String> parseArgs(String args) {
    412         Map<String, String> rv = new HashMap(8);
     412        Map<String, String> rv = new HashMap<String, String>(8);
    413413        char data[] = args.toCharArray();
    414414        StringBuilder buf = new StringBuilder(32);
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

    r817f531 re38db5e  
    99import java.util.StringTokenizer;
    1010
    11 import net.i2p.I2PException;
    1211import net.i2p.client.streaming.I2PSocket;
    1312import net.i2p.client.streaming.I2PSocketAddress;
     
    6160              "IRC Client on " + tunnel.listenHost + ':' + localPort, tunnel, pkf);
    6261       
    63         _addrs = new ArrayList(4);
     62        _addrs = new ArrayList<I2PSocketAddress>(4);
    6463        buildAddresses(destinations);
    6564
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java

    r817f531 re38db5e  
    2828import java.util.concurrent.ThreadFactory;
    2929
    30 import net.i2p.I2PAppContext;
    3130import net.i2p.I2PException;
    3231import net.i2p.client.I2PSessionException;
     
    7877    protected boolean bidir;
    7978    private ThreadPoolExecutor _executor;
    80     private final Map<Integer, InetSocketAddress> _socketMap = new ConcurrentHashMap(4);
     79    private final Map<Integer, InetSocketAddress> _socketMap = new ConcurrentHashMap<Integer, InetSocketAddress>(4);
    8180
    8281    /** unused? port should always be specified */
     
    322321            if (!forced && sockMgr.listSockets().size() != 0) {
    323322                l.log("There are still active connections!");
    324                 for (Iterator it = sockMgr.listSockets().iterator(); it.hasNext();) {
     323                for (Iterator<I2PSocket> it = sockMgr.listSockets().iterator(); it.hasNext();) {
    325324                    l.log("->" + it.next());
    326325                }
     
    474473        public CustomThreadPoolExecutor(int max, String name) {
    475474             super(MIN_HANDLERS, max, HANDLER_KEEPALIVE_MS, TimeUnit.MILLISECONDS,
    476                    new SynchronousQueue(), new CustomThreadFactory(name));
     475                   new SynchronousQueue<Runnable>(), new CustomThreadFactory(name));
    477476        }
    478477    }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java

    r817f531 re38db5e  
    124124            BufferedReader br = new BufferedReader(new FileReader(cmd.substring(3)));
    125125            String line;
    126             List pingHandlers = new ArrayList();
     126            List<PingHandler> pingHandlers = new ArrayList<PingHandler>();
    127127            int i = 0;
    128128            while ((line = br.readLine()) != null) {
     
    138138            }
    139139            br.close();
    140             for (Iterator it = pingHandlers.iterator(); it.hasNext();) {
     140            for (Iterator<PingHandler> it = pingHandlers.iterator(); it.hasNext();) {
    141141                Thread t = (Thread) it.next();
    142142                t.join();
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

    r817f531 re38db5e  
    55import java.io.IOException;
    66import java.util.ArrayList;
    7 import java.util.HashMap;
    8 import java.util.Iterator;
    97import java.util.List;
    108import java.util.Map;
    119import java.util.Properties;
    12 import java.util.Random;
    13 
    1410import net.i2p.I2PAppContext;
    1511import net.i2p.I2PException;
     
    7167        _log = I2PAppContext.getGlobalContext().logManager().getLog(TunnelController.class);
    7268        setConfig(config, prefix);
    73         _messages = new ArrayList(4);
     69        _messages = new ArrayList<String>(4);
    7470        _running = false;
    7571        boolean keyOK = true;
     
    742738     */
    743739    public List<String> clearMessages() {
    744         List rv = null;
     740        List<String> rv = null;
    745741        synchronized (this) {
    746             rv = new ArrayList(_messages);
     742            rv = new ArrayList<String>(_messages);
    747743            _messages.clear();
    748744        }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelControllerGroup.java

    r817f531 re38db5e  
    44import java.io.IOException;
    55import java.util.ArrayList;
    6 import java.util.Collections;
    76import java.util.HashMap;
    87import java.util.HashSet;
     
    8483        _mgr = mgr;
    8584        _log = _context.logManager().getLog(TunnelControllerGroup.class);
    86         _controllers = new ArrayList();
     85        _controllers = new ArrayList<TunnelController>();
    8786        if (args == null || args.length <= 0)
    8887            _configFile = DEFAULT_CONFIG_FILE;
     
    9190        else
    9291            throw new IllegalArgumentException("Usage: TunnelControllerGroup [filename]");
    93         _sessions = new HashMap(4);
     92        _sessions = new HashMap<I2PSession, Set<TunnelController>>(4);
    9493        synchronized (TunnelControllerGroup.class) {
    9594            if (_instance == null)
     
    289288     */
    290289    public synchronized List<String> removeController(TunnelController controller) {
    291         if (controller == null) return new ArrayList();
     290        if (controller == null) return new ArrayList<String>();
    292291        controller.stopTunnel();
    293292        List<String> msgs = controller.clearMessages();
     
    303302     */
    304303    public synchronized List<String> stopAllControllers() {
    305         List<String> msgs = new ArrayList();
     304        List<String> msgs = new ArrayList<String>();
    306305        for (int i = 0; i < _controllers.size(); i++) {
    307306            TunnelController controller = _controllers.get(i);
     
    320319     */
    321320    public synchronized List<String> startAllControllers() {
    322         List<String> msgs = new ArrayList();
     321        List<String> msgs = new ArrayList<String>();
    323322        for (int i = 0; i < _controllers.size(); i++) {
    324323            TunnelController controller = _controllers.get(i);
     
    338337     */
    339338    public synchronized List<String> restartAllControllers() {
    340         List<String> msgs = new ArrayList();
     339        List<String> msgs = new ArrayList<String>();
    341340        for (int i = 0; i < _controllers.size(); i++) {
    342341            TunnelController controller = _controllers.get(i);
     
    355354     */
    356355    public synchronized List<String> clearAllMessages() {
    357         List<String> msgs = new ArrayList();
     356        List<String> msgs = new ArrayList<String>();
    358357        for (int i = 0; i < _controllers.size(); i++) {
    359358            TunnelController controller = _controllers.get(i);
     
    427426     */
    428427    public synchronized List<TunnelController> getControllers() {
    429         return new ArrayList(_controllers);
     428        return new ArrayList<TunnelController>(_controllers);
    430429    }
    431430   
     
    440439            Set<TunnelController> owners = _sessions.get(session);
    441440            if (owners == null) {
    442                 owners = new HashSet(2);
     441                owners = new HashSet<TunnelController>(2);
    443442                _sessions.put(session, owners);
    444443            }
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/DCCClientManager.java

    r817f531 re38db5e  
    5656        _tunnel = tunnel;
    5757        _log = tunnel.getContext().logManager().getLog(DCCClientManager.class);
    58         _incoming = new ConcurrentHashMap(8);
    59         _active = new ConcurrentHashMap(8);
    60         _complete = new ConcurrentHashMap(8);
     58        _incoming = new ConcurrentHashMap<Integer, I2PTunnelDCCClient>(8);
     59        _active = new ConcurrentHashMap<Integer, I2PTunnelDCCClient>(8);
     60        _complete = new ConcurrentHashMap<Integer, I2PTunnelDCCClient>(8);
    6161    }
    6262
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/I2PTunnelDCCServer.java

    r817f531 re38db5e  
    7676                              EventDispatcher notifyThis, I2PTunnel tunnel) {
    7777        super(DUMMY, 0, sktMgr, l, notifyThis, tunnel);
    78         _outgoing = new ConcurrentHashMap(8);
    79         _active = new ConcurrentHashMap(8);
    80         _resume = new ConcurrentHashMap(8);
    81         _sockList = new CopyOnWriteArrayList();
     78        _outgoing = new ConcurrentHashMap<Integer, LocalAddress>(8);
     79        _active = new ConcurrentHashMap<Integer, LocalAddress>(8);
     80        _resume = new ConcurrentHashMap<Integer, LocalAddress>(8);
     81        _sockList = new CopyOnWriteArrayList<I2PSocket>();
    8282    }
    8383
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java

    r817f531 re38db5e  
    233233                "ZLINE"
    234234        };
    235         _allowedOutbound = new HashSet(Arrays.asList(allowedCommands));
     235        _allowedOutbound = new HashSet<String>(Arrays.asList(allowedCommands));
    236236    }
    237237
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java

    r817f531 re38db5e  
    1818import net.i2p.i2ptunnel.I2PTunnelHTTPClient;
    1919import net.i2p.util.FileUtil;
    20 import net.i2p.util.Log;
    2120import net.i2p.util.Translate;
    2221
     
    120119        // Do the add and redirect.
    121120        if (targetRequest.equals("/add")) {
    122             Map<String, String> opts = new HashMap(8);
     121            Map<String, String> opts = new HashMap<String, String>(8);
    123122            // this only works if all keys are followed by =value
    124123            StringTokenizer tok = new StringTokenizer(query, "=&;");
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java

    r817f531 re38db5e  
    7070    private void parseOptions() {
    7171        Properties opts = getTunnel().getClientOptions();
    72         proxies = new HashMap(1);
     72        proxies = new HashMap<String, List<String>>(1);
    7373        for (Map.Entry e : opts.entrySet()) {
    7474           String prop = (String)e.getKey();
     
    7676              continue;
    7777           String port = prop.substring(PROP_PROXY_PREFIX.length());
    78            List proxyList = new ArrayList(1);
     78           List<String> proxyList = new ArrayList<String>(1);
    7979           StringTokenizer tok = new StringTokenizer((String)e.getValue(), ", \t");
    8080           while (tok.hasMoreTokens()) {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/MultiSink.java

    r817f531 re38db5e  
    1111 * @author zzz modded from streamr/MultiSource
    1212 */
    13 public class MultiSink implements Source, Sink {
     13public class MultiSink<S extends Sink> implements Source, Sink {
    1414    private static final Log _log = new Log(MultiSink.class);
    1515
    16     public MultiSink(Map cache) {
     16    public MultiSink(Map<Destination, S> cache) {
    1717        this.cache = cache;
    1818    }
     
    3232    }
    3333   
    34     private Map<Destination, Sink> cache;
     34    private Map<Destination, S> cache;
    3535}
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/ReplyTracker.java

    r817f531 re38db5e  
    1111 * @author zzz
    1212 */
    13 public class ReplyTracker implements Source, Sink {
     13public class ReplyTracker<S extends Sink> implements Source, Sink {
    1414    private static final Log _log = new Log(MultiSink.class);
    1515
    16     public ReplyTracker(Sink reply, Map cache) {
     16    public ReplyTracker(S reply, Map<Destination, S> cache) {
    1717        this.reply = reply;
    1818        this.cache = cache;
     
    3030    }
    3131   
    32     private Sink reply;
    33     private Map<Destination, Sink> cache;
     32    private S reply;
     33    private Map<Destination, S> cache;
    3434    private Sink sink;
    3535}
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

    r817f531 re38db5e  
    598598     */
    599599    private void handleUDP(DataInputStream in, DataOutputStream out) throws SOCKSException {
    600         List<Integer> ports = new ArrayList(1);
     600        List<Integer> ports = new ArrayList<Integer>(1);
    601601        synchronized (_startLock) {
    602602            if (_tunnel == null) {
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java

    r817f531 re38db5e  
    2727public class SOCKSUDPPort implements Source, Sink {
    2828
    29     public SOCKSUDPPort(InetAddress host, int port, Map replyMap) {
     29    public SOCKSUDPPort(InetAddress host, int port, Map<Destination, SOCKSUDPPort> replyMap) {
    3030
    3131        // this passes the host and port from UDPUnwrapper to UDPWrapper
    32         Map cache = new ConcurrentHashMap(4);
     32        Map<Destination, SOCKSHeader> cache = new ConcurrentHashMap<Destination, SOCKSHeader>(4);
    3333
    3434        // rcv from I2P and send to a port
     
    4242        this.unwrapper = new SOCKSUDPUnwrapper(cache);
    4343        this.udpsource.setSink(this.unwrapper);
    44         this.udptracker = new ReplyTracker(this, replyMap);
     44        this.udptracker = new ReplyTracker<SOCKSUDPPort>(this, replyMap);
    4545        this.unwrapper.setSink(this.udptracker);
    4646    }
     
    7474    private SOCKSUDPWrapper wrapper;
    7575    private SOCKSUDPUnwrapper unwrapper;
    76     private ReplyTracker udptracker;
     76    private ReplyTracker<SOCKSUDPPort> udptracker;
    7777}
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java

    r817f531 re38db5e  
    55import java.util.Iterator;
    66import java.util.Map;
    7 
    87import net.i2p.data.Destination;
    98import net.i2p.i2ptunnel.I2PTunnel;
     
    3433        super(null, tunnel, tunnel, tunnel);
    3534
    36         this.ports = new ConcurrentHashMap(1);
    37         this.cache = new ConcurrentHashMap(1);
    38         this.demuxer = new MultiSink(this.cache);
     35        this.ports = new ConcurrentHashMap<Integer, SOCKSUDPPort>(1);
     36        this.cache = new ConcurrentHashMap<Destination, SOCKSUDPPort>(1);
     37        this.demuxer = new MultiSink<SOCKSUDPPort>(this.cache);
    3938        setSink(this.demuxer);
    4039    }
     
    5453        if (sup != null)
    5554            sup.stop();
    56         for (Iterator iter = cache.entrySet().iterator(); iter.hasNext();) {
    57             Map.Entry<Destination, SOCKSUDPPort> e = (Map.Entry) iter.next();
     55        for (Iterator<Map.Entry<Destination, SOCKSUDPPort>> iter = cache.entrySet().iterator(); iter.hasNext();) {
     56            Map.Entry<Destination, SOCKSUDPPort> e = iter.next();
    5857            if (e.getValue() == sup)
    5958                iter.remove();
     
    9089    private Map<Integer, SOCKSUDPPort> ports;
    9190    private Map<Destination, SOCKSUDPPort> cache;
    92     private MultiSink demuxer;
     91    private MultiSink<SOCKSUDPPort> demuxer;
    9392}
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Subscriber.java

    r817f531 re38db5e  
    99import java.util.Set;
    1010
    11 // i2p
    12 import net.i2p.client.I2PSession;
    1311import net.i2p.data.Destination;
    1412import net.i2p.i2ptunnel.udp.*;
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/I2PSource.java

    r817f531 re38db5e  
    3333       
    3434        // create queue
    35         this.queue = new ArrayBlockingQueue(256);
     35        this.queue = new ArrayBlockingQueue<Integer>(256);
    3636       
    3737        // create listener
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java

    r817f531 re38db5e  
    66import java.io.ByteArrayOutputStream;
    77import java.io.ByteArrayInputStream;
    8 import java.net.ServerSocket;
    98import java.util.concurrent.atomic.AtomicLong;
    109
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

    r817f531 re38db5e  
    99 */
    1010
    11 import java.util.Iterator;
    1211import java.util.List;
    1312import java.util.Map;
    1413import java.util.Properties;
    15 import java.util.StringTokenizer;
    1614import java.util.Set;
    1715import java.util.TreeMap;
     
    4442        if (group == null)
    4543            return false;
    46         List controllers = group.getControllers();
     44        List<TunnelController> controllers = group.getControllers();
    4745        if (controllers.size() > tunnel) {
    48             TunnelController cur = (TunnelController)controllers.get(tunnel);
     46            TunnelController cur = controllers.get(tunnel);
    4947            if (cur == null) return false;
    5048            return isClient(cur.getType());
     
    375373            boolean isMD5Proxy = "httpclient".equals(tun.getType()) ||
    376374                                 "connectclient".equals(tun.getType());
    377             Map<String, String> sorted = new TreeMap();
     375            Map<String, String> sorted = new TreeMap<String, String>();
    378376            for (Map.Entry e : opts.entrySet()) {
    379377                String key = (String)e.getKey();
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

    r817f531 re38db5e  
    103103    private static final int MAX_NONCES = 8;
    104104    /** store nonces in a static FIFO instead of in System Properties @since 0.8.1 */
    105     private static final List<String> _nonces = new ArrayList(MAX_NONCES + 1);
     105    private static final List<String> _nonces = new ArrayList<String>(MAX_NONCES + 1);
    106106
    107107    static final String CLIENT_NICKNAME = "shared clients";
     
    130130        _curNonce = "-1";
    131131        addNonce();
    132         _booleanOptions = new ConcurrentHashSet(4);
    133         _otherOptions = new ConcurrentHashMap(4);
     132        _booleanOptions = new ConcurrentHashSet<String>(4);
     133        _otherOptions = new ConcurrentHashMap<String, String>(4);
    134134    }
    135135   
     
    12251225        };
    12261226
    1227     protected static final Set _noShowSet = new HashSet(128);
    1228     protected static final Set _nonProxyNoShowSet = new HashSet(4);
     1227    protected static final Set<String> _noShowSet = new HashSet<String>(128);
     1228    protected static final Set<String> _nonProxyNoShowSet = new HashSet<String>(4);
    12291229    static {
    12301230        _noShowSet.addAll(Arrays.asList(_noShowOpts));
Note: See TracChangeset for help on using the changeset viewer.