Cleanup after prop from i2p.i2p:
- Remove I2PFile, FileStreamFactory hacks - Remove custom reseed stuff
This commit is contained in:
@ -37,7 +37,6 @@ import java.util.TreeMap;
|
||||
import java.util.zip.Deflater;
|
||||
|
||||
import net.i2p.util.ByteCache;
|
||||
import net.i2p.util.FileStreamFactory;
|
||||
import net.i2p.util.OrderedProperties;
|
||||
import net.i2p.util.ReusableGZIPInputStream;
|
||||
import net.i2p.util.ReusableGZIPOutputStream;
|
||||
@ -218,7 +217,7 @@ public class DataHelper {
|
||||
loadProps(props, file, false);
|
||||
}
|
||||
public static void loadProps(Properties props, File file, boolean forceLowerCase) throws IOException {
|
||||
loadProps(props, FileStreamFactory.getFileInputStream(file), forceLowerCase);
|
||||
loadProps(props, new FileInputStream(file), forceLowerCase);
|
||||
}
|
||||
public static void loadProps(Properties props, InputStream inStr) throws IOException {
|
||||
loadProps(props, inStr, false);
|
||||
|
@ -1,36 +0,0 @@
|
||||
/*
|
||||
* public domain
|
||||
*/
|
||||
|
||||
package net.i2p.util;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
|
||||
|
||||
/**
|
||||
* This is pulled out and replaced in the android build.
|
||||
*
|
||||
* @author zzz
|
||||
*/
|
||||
public class FileStreamFactory {
|
||||
|
||||
public static FileInputStream getFileInputStream(String f) throws FileNotFoundException {
|
||||
return new FileInputStream(f);
|
||||
}
|
||||
|
||||
public static FileInputStream getFileInputStream(File f) throws FileNotFoundException {
|
||||
return new FileInputStream(f);
|
||||
}
|
||||
|
||||
public static FileOutputStream getFileOutputStream(String f) throws FileNotFoundException {
|
||||
return new FileOutputStream(f);
|
||||
}
|
||||
|
||||
public static FileOutputStream getFileOutputStream(File f) throws FileNotFoundException {
|
||||
return new FileOutputStream(f);
|
||||
}
|
||||
|
||||
}
|
@ -1,24 +0,0 @@
|
||||
/*
|
||||
* public domain
|
||||
*/
|
||||
|
||||
package net.i2p.util;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
/**
|
||||
* This is pulled out and replaced in the android build.
|
||||
*
|
||||
* @author zzz
|
||||
*/
|
||||
public class I2PFile extends File {
|
||||
|
||||
public I2PFile (String f) {
|
||||
super(f);
|
||||
}
|
||||
|
||||
public I2PFile (File p, String f) {
|
||||
super(p, f);
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user