Author: nextgens
Date: 2007-03-15 18:14:13 +0000 (Thu, 15 Mar 2007)
New Revision: 12125
Modified:
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/fcp/ConfigData.java
trunk/freenet/src/freenet/node/fcp/NodeData.java
trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
trunk/freenet/src/freenet/support/TimeUtil.java
Log:
Spare a few useless assignations, fix some bugs, hopefully not introducing new
ones
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-03-15 17:41:35 UTC (rev 12124)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2007-03-15 18:14:13 UTC (rev 12125)
@@ -607,8 +607,8 @@
final Object[] knownLocsCopy = node.getKnownLocations(-1);
final Double[] locations = (Double[])knownLocsCopy[0];
final Long[] timestamps = (Long[])knownLocsCopy[1];
- Double location = new Double(0.0);
- Long locationTime = new Long(0);
+ Double location;
+ Long locationTime;
double strength = 1.0;
long now = System.currentTimeMillis();
long age = 1;
Modified: trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2007-03-15 17:41:35 UTC (rev 12124)
+++ trunk/freenet/src/freenet/clients/http/filter/GIFFilter.java
2007-03-15 18:14:13 UTC (rev 12125)
@@ -58,9 +58,8 @@
// Throw an exception
String message = ERROR_MESSAGE;
if(reason != null) message += ' ' + reason;
- String msg = "Not a GIF";
if(shortReason != null)
- msg += " - " + shortReason;
+ message += " - (" + shortReason + ')';
throw new DataFilterException(shortReason, shortReason,
"<p>"+message+"</p>", new
HTMLNode("p").addChild("#", message));
}
Modified: trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2007-03-15 17:41:35 UTC (rev 12124)
+++ trunk/freenet/src/freenet/clients/http/filter/HTMLFilter.java
2007-03-15 18:14:13 UTC (rev 12125)
@@ -503,11 +503,9 @@
if (safe)
err += element + ' ';
err += "-->";
- // FIXME: Hmmm, why did we just do all
this, err is not
- // used beyond this point... (avian)
if (!deleteErrors)
throwFilterException(
- "Unknown tag: " +
HTMLEncoder.encode(element));
+ "Unknown tag: " +
HTMLEncoder.encode(err));
return null;
}
}
Modified: trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2007-03-15 17:41:35 UTC (rev 12124)
+++ trunk/freenet/src/freenet/clients/http/filter/JPEGFilter.java
2007-03-15 18:14:13 UTC (rev 12125)
@@ -361,10 +361,10 @@
private void throwError(String shortReason, String reason) throws
DataFilterException {
// Throw an exception
String message = ERROR_MESSAGE;
- if(reason != null) message += ' ' + reason;
- String msg = "Not a GIF";
+ if(reason != null)
+ message += ' ' + reason;
if(shortReason != null)
- msg += " - " + shortReason;
+ message += " - " + shortReason;
DataFilterException e = new DataFilterException(shortReason,
shortReason,
"<p>"+message+"</p>", new
HTMLNode("p").addChild("#", message));
if(Logger.shouldLog(Logger.NORMAL, this))
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2007-03-15 17:41:35 UTC (rev
12124)
+++ trunk/freenet/src/freenet/node/Node.java 2007-03-15 18:14:13 UTC (rev
12125)
@@ -3209,9 +3209,9 @@
String source_nodename = null;
String target_nodename = null;
String text = null;
- long composedTime = -1;
- long sentTime = -1;
- long receivedTime = -1;
+ long composedTime;
+ long sentTime;
+ long receivedTime;
try {
source_nodename = new
String(Base64.decode(fs.get("source_nodename")));
target_nodename = new
String(Base64.decode(fs.get("target_nodename")));
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-03-15 17:41:35 UTC
(rev 12124)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-03-15 18:14:13 UTC
(rev 12125)
@@ -2574,7 +2574,7 @@
boolean gotError = false;
boolean readResult = false;
for (int i = 0; i < extraPeerDataFiles.length; i++) {
- Integer fileNumber = new Integer(-1);
+ Integer fileNumber;
try {
fileNumber = new
Integer(extraPeerDataFiles[i].getName());
} catch (NumberFormatException e) {
Modified: trunk/freenet/src/freenet/node/fcp/ConfigData.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ConfigData.java 2007-03-15 17:41:35 UTC
(rev 12124)
+++ trunk/freenet/src/freenet/node/fcp/ConfigData.java 2007-03-15 18:14:13 UTC
(rev 12125)
@@ -18,13 +18,7 @@
}
public SimpleFieldSet getFieldSet() {
- SimpleFieldSet fs = new SimpleFieldSet(true);
- if(withDefaults) {
- fs = node.config.exportFieldSet(true);
- } else {
- fs = node.config.exportFieldSet(false);
- }
- return fs;
+ return node.config.exportFieldSet(withDefaults);
}
public String getName() {
Modified: trunk/freenet/src/freenet/node/fcp/NodeData.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/NodeData.java 2007-03-15 17:41:35 UTC
(rev 12124)
+++ trunk/freenet/src/freenet/node/fcp/NodeData.java 2007-03-15 18:14:13 UTC
(rev 12125)
@@ -20,7 +20,7 @@
}
public SimpleFieldSet getFieldSet() {
- SimpleFieldSet fs = new SimpleFieldSet(true);
+ SimpleFieldSet fs;
if(withPrivate) {
fs = node.exportPrivateFieldSet();
} else {
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
2007-03-15 17:41:35 UTC (rev 12124)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdaterManager.java
2007-03-15 18:14:13 UTC (rev 12125)
@@ -306,7 +306,7 @@
/** Does the updater have an update ready to deploy? May be called
synchronized(this) */
private boolean isReadyToDeployUpdate(boolean ignoreRevocation) {
long now = System.currentTimeMillis();
- long startedMillisAgo = -1;
+ long startedMillisAgo;
synchronized(this) {
if(!(hasNewMainJar || hasNewExtJar)) return false; //
no jar
if(hasBeenBlown) return false; // Duh
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2007-03-15
17:41:35 UTC (rev 12124)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2007-03-15
18:14:13 UTC (rev 12125)
@@ -206,9 +206,9 @@
public void run() {
File currentFilename = null;
Object o = null;
- long thisTime = System.currentTimeMillis();
+ long thisTime;
long lastTime = -1;
- long startTime = -1;
+ long startTime;
long nextHour = -1;
GregorianCalendar gc = null;
String filename = null;
@@ -745,7 +745,6 @@
if (sb.length() > 0) {
strVec.addElement(sb.toString());
fmtVec.addElement(new Integer(0));
- sb = new StringBuffer();
}
this.fmt = new int[fmtVec.size()];
Modified: trunk/freenet/src/freenet/support/TimeUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/TimeUtil.java 2007-03-15 17:41:35 UTC
(rev 12124)
+++ trunk/freenet/src/freenet/support/TimeUtil.java 2007-03-15 18:14:13 UTC
(rev 12125)
@@ -72,14 +72,14 @@
DecimalFormat fix3 = new DecimalFormat("0.000");
sb.append(fix3.format(fractionalSeconds)).append('s');
termCount++;
- l = l - ((long)fractionalSeconds * (long)1000);
+ //l = l - ((long)fractionalSeconds *
(long)1000);
}
} else {
int seconds = (int)(l / (long)1000);
if (seconds > 0) {
sb.append(seconds).append('s');
termCount++;
- l = l - ((long)seconds * (long)1000);
+ //l = l - ((long)seconds * (long)1000);
}
}
//
