Author: nextgens
Date: 2008-01-21 12:15:24 +0000 (Mon, 21 Jan 2008)
New Revision: 17177
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
trunk/freenet/src/freenet/io/AddressTrackerItem.java
trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
trunk/freenet/src/freenet/node/LoggingConfigHandler.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
trunk/freenet/src/freenet/node/updater/UpdateDeployContext.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
trunk/freenet/src/freenet/support/FileLoggerHook.java
trunk/freenet/src/freenet/support/StringCounter.java
trunk/freenet/src/freenet/support/TimeSortedHashtable.java
trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
Log:
Declare some static classes as static ones.
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-01-21 11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-01-21 12:15:24 UTC (rev 17177)
@@ -40,7 +40,7 @@
private static boolean logMINOR;
- public class PrioritySchedulerCallback implements StringCallback,
EnumerableOptionCallback {
+ public static class PrioritySchedulerCallback implements
StringCallback, EnumerableOptionCallback {
final ClientRequestScheduler cs;
private final String[] possibleValues = new String[]{
ClientRequestScheduler.PRIORITY_HARD, ClientRequestScheduler.PRIORITY_SOFT };
Modified: trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-01-21 11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/clients/http/StatisticsToadlet.java
2008-01-21 12:15:24 UTC (rev 17177)
@@ -50,7 +50,7 @@
}
- private class STMessageCount {
+ private static class STMessageCount {
public String messageName;
public int messageCount;
@@ -567,7 +567,7 @@
}
});
for (int countsArrayIndex = 0, countsArrayCount =
unclaimedFIFOMessageCountsArray.length; countsArrayIndex < countsArrayCount;
countsArrayIndex++) {
- STMessageCount messageCountItem = (STMessageCount)
unclaimedFIFOMessageCountsArray[countsArrayIndex];
+ STMessageCount messageCountItem =
unclaimedFIFOMessageCountsArray[countsArrayIndex];
int thisMessageCount = messageCountItem.messageCount;
double thisMessagePercentOfTotal = ((double)
thisMessageCount) / ((double) totalCount);
unclaimedFIFOMessageCountsList.addChild("li", "" +
messageCountItem.messageName + ":\u00a0" + thisMessageCount + "\u00a0(" +
fix3p1pct.format(thisMessagePercentOfTotal) + ')');
@@ -908,7 +908,7 @@
}
}
- class ThreadBunch {
+ private static class ThreadBunch {
public ThreadBunch(String name2, int i) {
this.name = name2;
this.count = i;
Modified: trunk/freenet/src/freenet/io/AddressTrackerItem.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTrackerItem.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/io/AddressTrackerItem.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -143,7 +143,7 @@
return longestGap;
}
- public class Gap {
+ public static class Gap {
public final long gapLength;
public final long receivedPacketAt;
Gap(long gapLength, long receivedPacketAt) {
Modified: trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/io/comm/IOStatisticCollector.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -191,7 +191,7 @@
- private class StatisticEntry {
+ private static class StatisticEntry {
private int recieved[];
private int sent[];
Modified: trunk/freenet/src/freenet/node/LoggingConfigHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/LoggingConfigHandler.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/node/LoggingConfigHandler.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -23,7 +23,7 @@
import freenet.support.api.StringCallback;
public class LoggingConfigHandler {
- private class PriorityCallback implements StringCallback,
EnumerableOptionCallback {
+ private static class PriorityCallback implements StringCallback,
EnumerableOptionCallback {
private final String[] possibleValues = new String[]{ "ERROR",
"NORMAL", "MINOR", "DEBUG" };
public String get() {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2008-01-21 11:49:41 UTC (rev
17176)
+++ trunk/freenet/src/freenet/node/Node.java 2008-01-21 12:15:24 UTC (rev
17177)
@@ -163,7 +163,7 @@
}
}
- private class L10nCallback implements StringCallback,
EnumerableOptionCallback {
+ private static class L10nCallback implements StringCallback,
EnumerableOptionCallback {
public String get() {
return L10n.getSelectedLanguage();
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2008-01-21 11:49:41 UTC
(rev 17176)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2008-01-21 12:15:24 UTC
(rev 17177)
@@ -487,7 +487,7 @@
}
}
- class LocationUIDPair implements Comparable {
+ protected static class LocationUIDPair implements Comparable {
double location;
long uid;
Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-01-21 11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-01-21 12:15:24 UTC (rev 17177)
@@ -27,7 +27,7 @@
}
}
- public class DDACheckJob {
+ public static class DDACheckJob {
final File directory, readFilename, writeFilename;
final String readContent, writeContent;
Modified: trunk/freenet/src/freenet/node/updater/UpdateDeployContext.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/UpdateDeployContext.java
2008-01-21 11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/node/updater/UpdateDeployContext.java
2008-01-21 12:15:24 UTC (rev 17177)
@@ -20,7 +20,7 @@
*/
class UpdateDeployContext {
- public class UpdateCatastropheException extends Exception {
+ public static class UpdateCatastropheException extends Exception {
private static final long serialVersionUID = 1L;
File oldConfig;
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2008-01-21 11:49:41 UTC (rev 17176)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2008-01-21 12:15:24 UTC (rev 17177)
@@ -50,7 +50,7 @@
return sb.toString();
}
- class UpdateThingy {
+ private static class UpdateThingy {
public UpdateThingy(String first, String form) {
this.firstBit = first;
this.formText = form;
Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
===================================================================
--- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -1725,7 +1725,7 @@
/**
* Used to create the secondary database sorted on accesstime
*/
- private class AccessTimeKeyCreator implements SecondaryKeyCreator {
+ private static class AccessTimeKeyCreator implements
SecondaryKeyCreator {
private TupleBinding theBinding;
public AccessTimeKeyCreator(TupleBinding theBinding1) {
@@ -1743,7 +1743,7 @@
}
}
- private class BlockNumberKeyCreator implements SecondaryKeyCreator {
+ private static class BlockNumberKeyCreator implements
SecondaryKeyCreator {
private TupleBinding theBinding;
public BlockNumberKeyCreator(TupleBinding theBinding1) {
Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -105,7 +105,7 @@
protected final LinkedList logFiles = new LinkedList();
private long oldLogFilesDiskSpaceUsage = 0;
- class OldLogFile {
+ private static class OldLogFile {
public OldLogFile(File currentFilename, long startTime, long
endTime, long length) {
this.filename = currentFilename;
this.start = startTime;
@@ -163,7 +163,7 @@
throw new IntervalParseException("invalid interval " +
intervalName);
}
- public class IntervalParseException extends Exception {
+ public static class IntervalParseException extends Exception {
private static final long serialVersionUID = 69847854744673572L;
Modified: trunk/freenet/src/freenet/support/StringCounter.java
===================================================================
--- trunk/freenet/src/freenet/support/StringCounter.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/support/StringCounter.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -15,7 +15,7 @@
private final HashMap map;
- private class Item {
+ private static class Item {
public Item(String string2) {
this.string = string2;
}
Modified: trunk/freenet/src/freenet/support/TimeSortedHashtable.java
===================================================================
--- trunk/freenet/src/freenet/support/TimeSortedHashtable.java 2008-01-21
11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/support/TimeSortedHashtable.java 2008-01-21
12:15:24 UTC (rev 17177)
@@ -11,7 +11,7 @@
*/
public class TimeSortedHashtable {
- private class Element {
+ private static class Element {
Element(long t, Comparable v) {
time = t;
@@ -29,7 +29,7 @@
}
}
- private class MyComparator implements Comparator {
+ private static class MyComparator implements Comparator {
public int compare(Object arg0, Object arg1) {
if(arg0 instanceof Long && arg1 instanceof Long) return
((Long)arg0).compareTo((Long)arg1);
Modified: trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
2008-01-21 11:49:41 UTC (rev 17176)
+++ trunk/freenet/src/freenet/support/io/ReadOnlyFileSliceBucket.java
2008-01-21 12:15:24 UTC (rev 17177)
@@ -73,7 +73,7 @@
// Do nothing
}
- class MyInputStream extends InputStream {
+ private class MyInputStream extends InputStream {
private RandomAccessFile f;
private long ptr; // relative to startAt
@@ -116,7 +116,7 @@
}
}
- public class ReadOnlyFileSliceBucketException extends IOException {
+ public static class ReadOnlyFileSliceBucketException extends
IOException {
private static final long serialVersionUID = -1;
public ReadOnlyFileSliceBucketException(FileNotFoundException
e) {
