[freenet-cvs] r22490 - trunk/freenet/src/freenet/node/simulator

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-09-06 06:36:21 +0000 (Sat, 06 Sep 2008)
New Revision: 22490

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
   trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
   trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
Log:
warning hunt: freenet.node.simulator

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java   
2008-09-06 06:35:58 UTC (rev 22489)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeNetworkColoringTest.java   
2008-09-06 06:36:21 UTC (rev 22490)
@@ -142,10 +142,10 @@
         RunningAverage aRate = new BootstrappingDecayingRunningAverage(0.0, 
0.0, 1.0, 500, null);
                RunningAverage bRate = new 
BootstrappingDecayingRunningAverage(0.0, 0.0, 1.0, 500, null);
                RunningAverage bridgeRate = new 
BootstrappingDecayingRunningAverage(0.0, 0.0, 1.0, 500, null);
-               HashSet generalIds=new HashSet();
-               HashSet aIds=new HashSet();
-               HashSet bIds=new HashSet();
-               HashSet bridgeIds=new HashSet();
+               HashSet<Integer> generalIds = new HashSet<Integer>();
+               HashSet<Integer> aIds = new HashSet<Integer>();
+               HashSet<Integer> bIds = new HashSet<Integer>();
+               HashSet<Integer> bridgeIds = new HashSet<Integer>();
         while(true) {
             cycleNumber++;

@@ -239,13 +239,13 @@
                }
     }

-       private static void idReport(String group, HashSet ids, int targetNum) {
+       private static void idReport(String group, HashSet<Integer> ids, int 
targetNum) {
                //Print out the number which are non-zero & display the 
distinct ones if a few...
                int size=ids.size();
                int MAX=6;
                StringBuilder sb=new 
StringBuilder(Integer.toString(size)).append("/").append(Integer.toString(targetNum));
                sb.append(" ids (").append(group).append(") = ");
-               Iterator iter=ids.iterator();
+               Iterator<Integer> iter = ids.iterator();
                for (int i=0; i<=MAX && i<size; i++) {
                        String thisId=iter.next().toString();
                        if (i==0)

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-09-06 06:35:58 UTC (rev 22489)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-09-06 06:36:21 UTC (rev 22490)
@@ -160,7 +160,7 @@
                     node2 = random.nextInt(NUMBER_OF_NODES);
                 } while(node2 == node1);
                 Node fetchNode = nodes[node2];
-                block = (ClientKeyBlock) 
fetchNode.clientCore.realGetKey(fetchKey, false, true, false);
+                block = fetchNode.clientCore.realGetKey(fetchKey, false, true, 
false);
                 if(block == null) {
                                        int 
percentSuccess=100*fetchSuccesses/insertAttempts;
                     Logger.error(RealNodeRequestInsertTest.class, "Fetch 
#"+requestNumber+" FAILED ("+percentSuccess+"%); from "+node2);
@@ -187,7 +187,7 @@
                 StringBuilder load = new StringBuilder("Running UIDs for 
nodes: ");
                 int totalRunningUIDs = 0;
                 int totalRunningUIDsAlt = 0;
-                Vector runningUIDsList = new Vector(); // <Long>
+                Vector<Long> runningUIDsList = new Vector<Long>();
                 for(int i=0;i<nodes.length;i++) {
                        load.append(i);
                        load.append(':');

Modified: trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java      
2008-09-06 06:35:58 UTC (rev 22489)
+++ trunk/freenet/src/freenet/node/simulator/SeednodePingTest.java      
2008-09-06 06:36:21 UTC (rev 22490)
@@ -100,7 +100,7 @@
                                System.out.println(seednode.getIdentityString() 
+ " is not connected "+seednode.getHandshakeCount());
                        }
                }
-               Map<FATE, Integer> totals = new 
EnumMap(SeedServerTestPeerNode.FATE.class);
+               Map<FATE, Integer> totals = new EnumMap<FATE, 
Integer>(SeedServerTestPeerNode.FATE.class);
                for(SeedServerTestPeerNode seednode : seedNodes) {
                        FATE fate = seednode.getFate();
                        Integer x = totals.get(fate);
@@ -117,7 +117,7 @@
                System.out.println("################## 
("+node.peers.countConnectedPeers()+") 
"+countConnectedSeednodes+'/'+node.peers.countSeednodes());
                Thread.sleep(5000);
        }
-       Map<FATE, Integer> totals = new 
EnumMap(SeedServerTestPeerNode.FATE.class);
+       Map<FATE, Integer> totals = new EnumMap<FATE, 
Integer>(SeedServerTestPeerNode.FATE.class);
        for(SeedServerTestPeerNode seednode : seedNodes) {
                FATE fate = seednode.getFate();
                Integer x = totals.get(fate);