Author: j16sdiz
Date: 2009-04-08 00:55:26 +0000 (Wed, 08 Apr 2009)
New Revision: 26632
Modified:
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
indent
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2009-04-08 00:55:01 UTC (rev
26631)
+++ trunk/freenet/src/freenet/node/Node.java 2009-04-08 00:55:26 UTC (rev
26632)
@@ -568,10 +568,10 @@
swapIdentifier =
Fields.bytesToLong(darknetCrypto.identityHashHash);
String loc = fs.get("location");
- double locD = Location.getLocation(loc);
- if (locD == -1.0)
- throw new IOException("Invalid location: " +
loc);
- lm.setLocation(locD);
+ double locD = Location.getLocation(loc);
+ if (locD == -1.0)
+ throw new IOException("Invalid location: " + loc);
+ lm.setLocation(locD);
myName = fs.get("myName");
if(myName == null) {
myName = newName();
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2009-04-08 00:55:01 UTC
(rev 26631)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2009-04-08 00:55:26 UTC
(rev 26632)
@@ -402,16 +402,16 @@
}
String locationString = fs.get("location");
String[] peerLocationsString = fs.getAll("peersLocation");
-
- currentLocation = Location.getLocation(locationString);
- if(peerLocationsString != null) {
- double[] peerLocations = new
double[peerLocationsString.length];
- for(int i = 0; i < peerLocationsString.length;
i++)
- peerLocations[i] =
Location.getLocation(peerLocationsString[i]);
- currentPeersLocation = peerLocations;
- }
- locSetTime = System.currentTimeMillis();
+ currentLocation = Location.getLocation(locationString);
+ if(peerLocationsString != null) {
+ double[] peerLocations = new
double[peerLocationsString.length];
+ for(int i = 0; i < peerLocationsString.length; i++)
+ peerLocations[i] =
Location.getLocation(peerLocationsString[i]);
+ currentPeersLocation = peerLocations;
+ }
+ locSetTime = System.currentTimeMillis();
+
disableRouting = disableRoutingHasBeenSetLocally = false;
disableRoutingHasBeenSetRemotely = false; // Assume so
@@ -2405,17 +2405,17 @@
String locationString = fs.get("location");
if(locationString != null) {
- double newLoc =
Location.getLocation(locationString);
- if (newLoc == -1) {
- if(logMINOR)
- Logger.minor(this, "Invalid or
null location, waiting for FNPLocChangeNotification: locationString=" +
locationString);
- } else {
+ double newLoc = Location.getLocation(locationString);
+ if (newLoc == -1) {
+ if(logMINOR)
+ Logger.minor(this, "Invalid or null
location, waiting for FNPLocChangeNotification: locationString=" +
locationString);
+ } else {
if(!Location.equals(newLoc, currentLocation)) {
changedAnything = true;
currentLocation = newLoc;
locSetTime = System.currentTimeMillis();
}
- }
+ }
}
try {
String physical[] = fs.getAll("physical.udp");
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
