diff --git a/components/net/sf/briar/plugins/file/FilePlugin.java b/components/net/sf/briar/plugins/file/FilePlugin.java index 69537cb53d0fd414449ca6147310031324b86c66..ae6d2696493203c89b1fcb0701fb0336edd178f1 100644 --- a/components/net/sf/briar/plugins/file/FilePlugin.java +++ b/components/net/sf/briar/plugins/file/FilePlugin.java @@ -6,10 +6,7 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Map; -import org.apache.commons.io.FileSystemUtils; - import net.sf.briar.api.ContactId; -import net.sf.briar.api.TransportId; import net.sf.briar.api.transport.InvalidConfigException; import net.sf.briar.api.transport.InvalidTransportException; import net.sf.briar.api.transport.TransportConstants; @@ -18,25 +15,19 @@ import net.sf.briar.api.transport.batch.BatchTransportPlugin; import net.sf.briar.api.transport.batch.BatchTransportReader; import net.sf.briar.api.transport.batch.BatchTransportWriter; -abstract class FilePlugin implements BatchTransportPlugin { - - public static final int TRANSPORT_ID = 0; +import org.apache.commons.io.FileSystemUtils; - private static final TransportId id = new TransportId(TRANSPORT_ID); +abstract class FilePlugin implements BatchTransportPlugin { - private boolean started = false; protected Map<String, String> localProperties = null; protected Map<ContactId, Map<String, String>> remoteProperties = null; protected Map<String, String> config = null; protected BatchTransportCallback callback = null; + private boolean started = false; protected abstract File chooseOutputDirectory(); protected abstract void writerFinished(File f); - public TransportId getId() { - return id; - } - public synchronized void start(Map<String, String> localProperties, Map<ContactId, Map<String, String>> remoteProperties, Map<String, String> config, BatchTransportCallback callback) @@ -92,9 +83,7 @@ abstract class FilePlugin implements BatchTransportPlugin { public BatchTransportWriter createWriter(ContactId c) { if(!started) throw new IllegalStateException(); File dir = chooseOutputDirectory(); - if(dir == null) return null; - if(!dir.exists()) return null; - if(!dir.isDirectory()) return null; + if(dir == null || !dir.exists() || !dir.isDirectory()) return null; File f = new File(dir, createFilename()); try { long capacity = getCapacity(f.getAbsolutePath()); @@ -111,7 +100,6 @@ abstract class FilePlugin implements BatchTransportPlugin { StringBuilder s = new StringBuilder(12); for(int i = 0; i < 8; i++) s.append((char) ('a' + Math.random() * 26)); s.append(".dat"); - System.out.println(s); return s.toString(); }