Author: j16sdiz
Date: 2008-09-05 15:49:08 +0000 (Fri, 05 Sep 2008)
New Revision: 22463
Modified:
trunk/freenet/src/freenet/support/io/ArrayBucket.java
trunk/freenet/src/freenet/support/io/BaseFileBucket.java
trunk/freenet/src/freenet/support/io/BucketChainBucket.java
trunk/freenet/src/freenet/support/io/BucketTools.java
trunk/freenet/src/freenet/support/io/MultiReaderBucket.java
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
trunk/freenet/src/freenet/support/io/TempBucketFactory.java
Log:
more warning hunt: freenet.support.io
Modified: trunk/freenet/src/freenet/support/io/ArrayBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/ArrayBucket.java 2008-09-05
15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/ArrayBucket.java 2008-09-05
15:49:08 UTC (rev 22463)
@@ -19,7 +19,7 @@
*/
public class ArrayBucket implements Bucket {
- private final ArrayList data;
+ private final ArrayList<byte[]> data;
private String name;
private boolean readOnly;
@@ -33,7 +33,7 @@
}
public ArrayBucket(String name) {
- data = new ArrayList();
+ data = new ArrayList<byte[]>();
this.name = name;
}
@@ -48,8 +48,7 @@
public String toString() {
StringBuilder s = new StringBuilder(250);
- for (Iterator i = data.iterator(); i.hasNext();) {
- byte[] b = (byte[]) i.next();
+ for (byte[] b : data) {
s.append(new String(b));
}
return s.toString();
@@ -67,8 +66,7 @@
public long size() {
long size = 0;
- for (Iterator i = data.iterator(); i.hasNext();) {
- byte[] b = (byte[]) i.next();
+ for (byte[] b : data) {
size += b.length;
}
return size;
@@ -97,7 +95,7 @@
private class ArrayBucketInputStream extends InputStream {
- private Iterator i;
+ private Iterator<byte[]> i;
private ByteArrayInputStream in;
public ArrayBucketInputStream() {
@@ -111,7 +109,7 @@
private int priv_read() {
if (in == null) {
if (i.hasNext()) {
- in = new ByteArrayInputStream((byte[])
i.next());
+ in = new ByteArrayInputStream(i.next());
} else {
return -1;
}
@@ -136,7 +134,7 @@
private int priv_read(byte[] b, int off, int len) {
if (in == null) {
if (i.hasNext()) {
- in = new ByteArrayInputStream((byte[])
i.next());
+ in = new ByteArrayInputStream(i.next());
} else {
return -1;
}
@@ -153,7 +151,7 @@
public int available() {
if (in == null) {
if (i.hasNext()) {
- in = new ByteArrayInputStream((byte[])
i.next());
+ in = new ByteArrayInputStream(i.next());
} else {
return 0;
}
@@ -181,8 +179,7 @@
int size = (int)sz;
byte[] buf = new byte[size];
int index = 0;
- for(Iterator i=data.iterator();i.hasNext();) {
- byte[] obuf = (byte[]) i.next();
+ for (byte[] obuf : data) {
System.arraycopy(obuf, 0, buf, index, obuf.length);
index += obuf.length;
}
Modified: trunk/freenet/src/freenet/support/io/BaseFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BaseFileBucket.java 2008-09-05
15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/BaseFileBucket.java 2008-09-05
15:49:08 UTC (rev 22463)
@@ -7,6 +7,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Arrays;
import java.util.Vector;
import org.tanukisoftware.wrapper.WrapperManager;
@@ -15,7 +16,6 @@
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
-import java.util.Arrays;
public abstract class BaseFileBucket implements Bucket,
SerializableToFieldSetBucket {
@@ -28,7 +28,7 @@
/** Vector of streams (FileBucketInputStream or FileBucketOutputStream)
which
* are open to this file. So we can be sure they are all closed when we
free it.
* Can be null. */
- private Vector streams;
+ private Vector<Object> streams;
protected static String tempDir = null;
@@ -80,7 +80,7 @@
// BaseFileBucket is a very common object, and often very long
lived,
// so we need to minimize memory usage even at the cost of
frequent allocations.
if(streams == null)
- streams = new Vector(1,1);
+ streams = new Vector<Object>(1, 1);
streams.add(stream);
}
Modified: trunk/freenet/src/freenet/support/io/BucketChainBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketChainBucket.java 2008-09-05
15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/BucketChainBucket.java 2008-09-05
15:49:08 UTC (rev 22463)
@@ -14,7 +14,7 @@
public class BucketChainBucket implements Bucket {
- private final Vector buckets;
+ private final Vector<Bucket> buckets;
public final long bucketSize;
private long size;
private boolean freed;
@@ -23,7 +23,7 @@
public BucketChainBucket(long bucketSize, BucketFactory bf) {
this.bucketSize = bucketSize;
- this.buckets = new Vector();
+ this.buckets = new Vector<Bucket>();
this.bf = bf;
size = 0;
freed = false;
@@ -51,7 +51,7 @@
}
public synchronized Bucket[] getBuckets() {
- return (Bucket[]) buckets.toArray(new Bucket[buckets.size()]);
+ return buckets.toArray(new Bucket[buckets.size()]);
}
public InputStream getInputStream() throws IOException {
@@ -156,7 +156,7 @@
}
protected synchronized InputStream getBucketInputStream(int i) throws
IOException {
- Bucket bucket = (Bucket) buckets.get(i);
+ Bucket bucket = buckets.get(i);
if(bucket == null) return null;
return bucket.getInputStream();
}
Modified: trunk/freenet/src/freenet/support/io/BucketTools.java
===================================================================
--- trunk/freenet/src/freenet/support/io/BucketTools.java 2008-09-05
15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/BucketTools.java 2008-09-05
15:49:08 UTC (rev 22463)
@@ -141,7 +141,7 @@
}
public final static int[] nullIndices(Bucket[] array) {
- List<Integer> list = new ArrayList();
+ List<Integer> list = new ArrayList<Integer>();
for (int i = 0; i < array.length; i++) {
if (array[i] == null) {
list.add(i);
@@ -156,7 +156,7 @@
}
public final static int[] nonNullIndices(Bucket[] array) {
- List<Integer> list = new ArrayList();
+ List<Integer> list = new ArrayList<Integer>();
for (int i = 0; i < array.length; i++) {
if (array[i] != null) {
list.add(i);
@@ -171,7 +171,7 @@
}
public final static Bucket[] nonNullBuckets(Bucket[] array) {
- List list = new ArrayList(array.length);
+ List<Bucket> list = new ArrayList<Bucket>(array.length);
for (int i = 0; i < array.length; i++) {
if (array[i] != null) {
list.add(array[i]);
@@ -179,7 +179,7 @@
}
Bucket[] ret = new Bucket[list.size()];
- return (Bucket[]) list.toArray(ret);
+ return list.toArray(ret);
}
/**
Modified: trunk/freenet/src/freenet/support/io/MultiReaderBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/MultiReaderBucket.java 2008-09-05
15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/MultiReaderBucket.java 2008-09-05
15:49:08 UTC (rev 22463)
@@ -20,7 +20,7 @@
private final Bucket bucket;
// Assume there will be relatively few readers
- private ArrayList readers;
+ private ArrayList<Bucket> readers;
private boolean closed;
@@ -33,7 +33,7 @@
synchronized(this) {
if(closed) return null;
Bucket d = new ReaderBucket();
- if(readers == null) readers = new ArrayList();
+ if(readers == null) readers = new ArrayList<Bucket>();
readers.add(d);
return d;
}
Modified:
trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
2008-09-05 15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/PaddedEphemerallyEncryptedBucket.java
2008-09-05 15:49:08 UTC (rev 22463)
@@ -7,6 +7,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.ref.SoftReference;
+import java.util.Random;
import freenet.crypt.PCFBMode;
import freenet.crypt.RandomSource;
@@ -16,7 +17,6 @@
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
-import java.util.Random;
/**
* A proxy Bucket which adds:
@@ -28,7 +28,7 @@
private final Bucket bucket;
private final int minPaddedSize;
private final Random randomSource;
- private SoftReference /* <Rijndael> */ aesRef;
+ private SoftReference<Rijndael> aesRef;
/** The decryption key. */
private final byte[] key;
private long dataLength;
@@ -176,7 +176,8 @@
}
}
- @Override
+ @Override
+ @SuppressWarnings("cast")
public void close() throws IOException {
if(closed) return;
try {
@@ -190,7 +191,7 @@
byte[] buf = new byte[4096];
long writtenPadding = 0;
while(writtenPadding < padding) {
- int left = (int)
Math.min((padding - writtenPadding), (long)buf.length);
+ int left = (int)
Math.min((long) (padding - writtenPadding), (long) buf.length);
randomSource.nextBytes(buf);
out.write(buf, 0, left);
writtenPadding += left;
@@ -300,7 +301,7 @@
private synchronized Rijndael getRijndael() {
Rijndael aes;
if(aesRef != null) {
- aes = (Rijndael) aesRef.get();
+ aes = aesRef.get();
if(aes != null) return aes;
}
try {
@@ -309,7 +310,7 @@
throw new Error(e);
}
aes.initialize(key);
- aesRef = new SoftReference(aes);
+ aesRef = new SoftReference<Rijndael>(aes);
return aes;
}
Modified: trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2008-09-05 15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/PersistentTempBucketFactory.java
2008-09-05 15:49:08 UTC (rev 22463)
@@ -31,7 +31,7 @@
private final File dir;
/** Original contents of directory */
- private HashSet originalFiles;
+ private HashSet<File> originalFiles;
/** Filename generator */
private final FilenameGenerator fg;
@@ -60,7 +60,7 @@
}
if(!dir.isDirectory())
throw new IOException("Directory is not a directory:
"+dir);
- originalFiles = new HashSet();
+ originalFiles = new HashSet<File>();
File[] files = dir.listFiles(new FileFilter() {
public boolean accept(File pathname) {
@@ -79,7 +79,7 @@
originalFiles.add(f);
}
- bucketsToFree = new LinkedList();
+ bucketsToFree = new LinkedList<Bucket>();
}
public void register(File file) {
@@ -97,9 +97,9 @@
* Deletes any old temp files still unclaimed.
*/
public synchronized void completedInit() {
- Iterator i = originalFiles.iterator();
+ Iterator<File> i = originalFiles.iterator();
while(i.hasNext()) {
- File f = (File) (i.next());
+ File f = (i.next());
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Deleting old tempfile "+f);
f.delete();
Modified:
trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
2008-09-05 15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/SerializableToFieldSetBucketUtil.java
2008-09-05 15:49:08 UTC (rev 22463)
@@ -3,11 +3,7 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.support.io;
-import java.io.File;
-import java.io.IOException;
-
import freenet.crypt.RandomSource;
-import freenet.support.HexUtil;
import freenet.support.Logger;
import freenet.support.SimpleFieldSet;
import freenet.support.api.Bucket;
Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2008-09-05
15:48:39 UTC (rev 22462)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2008-09-05
15:49:08 UTC (rev 22463)
@@ -3,16 +3,7 @@
* http://www.gnu.org/ for further details of the GPL. */
package freenet.support.io;
-import freenet.crypt.RandomSource;
-import freenet.support.Executor;
-import freenet.support.Logger;
-import freenet.support.SizeUtil;
-import freenet.support.TimeUtil;
import java.io.IOException;
-
-import freenet.support.api.Bucket;
-import freenet.support.api.BucketFactory;
-
import java.io.InputStream;
import java.io.OutputStream;
import java.util.LinkedList;
@@ -21,6 +12,14 @@
import java.util.Vector;
import java.util.concurrent.LinkedBlockingQueue;
+import freenet.crypt.RandomSource;
+import freenet.support.Executor;
+import freenet.support.Logger;
+import freenet.support.SizeUtil;
+import freenet.support.TimeUtil;
+import freenet.support.api.Bucket;
+import freenet.support.api.BucketFactory;
+
/**
* Temporary Bucket Factory
*
@@ -144,6 +143,7 @@
}
private class TempBucketOutputStream extends OutputStream {
+ @SuppressWarnings("unused")
private final short idx;
TempBucketOutputStream(short idx) throws IOException {
