[freenet-cvs] r21901 - trunk/freenet/src/freenet/node

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-08-15 12:31:28 +0000 (Fri, 15 Aug 2008)
New Revision: 21901

Modified:
   trunk/freenet/src/freenet/node/GlobalProbe.java
Log:
Make GlobalProbe public so that we can use it in the simulator

Modified: trunk/freenet/src/freenet/node/GlobalProbe.java
===================================================================
--- trunk/freenet/src/freenet/node/GlobalProbe.java     2008-08-15 12:30:36 UTC 
(rev 21900)
+++ trunk/freenet/src/freenet/node/GlobalProbe.java     2008-08-15 12:31:28 UTC 
(rev 21901)
@@ -11,13 +11,13 @@
        double lastLocation = 0.0;
        long lastTime;
        int lastHops;
-       boolean doneSomething = false;
+       private boolean doneSomething = false;
        final ProbeCallback cb;
        final Node node;
        int ctr;
        final int probeType;

-       GlobalProbe(Node n, int probeType) {
+       public GlobalProbe(Node n, int probeType) {
                this.node = n;
                this.probeType = probeType;
        cb = new ProbeCallback() {
@@ -100,13 +100,11 @@
        private void output(double loc, int hops) {
                double estimatedNodes = ((double) (ctr+1)) / loc;
                Logger.error(this, "LOCATION "+ctr+": " + loc+" - estimated 
nodes: "+estimatedNodes+" ("+hops+" hops)");
-               System.out.println("LOCATION "+ctr+": " + loc+" - estimated 
nodes: "+estimatedNodes+" ("+hops+" hops)");
+               System.err.println("LOCATION "+ctr+": " + loc+" - estimated 
nodes: "+estimatedNodes+" ("+hops+" hops)");
        }

        private void error(String string) {
                Logger.error(this, string);
-               System.out.println("GlobalProbe error: "+string);
+               System.err.println("GlobalProbe error: "+string);
        }
-       
-
 }