Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Removed unused exceptions. Also disabled output for ant tests.

Browse Source
This commit is contained in:
akwizgran
2011-10-08 12:27:13 +01:00
parent 4b1ffbe85b
commit a3a5ebc14f
11 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/net/sf/briar/api/transport/InvalidConfigException.java
View File

@@ -1,10 +0,0 @@
package net.sf.briar.api.transport;
/**
* Thrown by a transport plugin if the specified configuration properties are
* invalid.
*/
public class InvalidConfigException extends Exception {
private static final long serialVersionUID = 9123332784670286454L;
}

10
api/net/sf/briar/api/transport/InvalidPropertiesException.java
View File

@@ -1,10 +0,0 @@
package net.sf.briar.api.transport;
/**
* Thrown by a transport plugin if the specified transport properties are
* invalid.
*/
public class InvalidPropertiesException extends Exception {
private static final long serialVersionUID = -6516979794153838108L;
}

8
api/net/sf/briar/api/transport/TransportPlugin.java
View File

@@ -18,15 +18,13 @@ public interface TransportPlugin {
void stop() throws IOException; void stop() throws IOException;
/** Updates the plugin's local transport properties. */ /** Updates the plugin's local transport properties. */
void setLocalProperties(Map<String, String> properties) void setLocalProperties(Map<String, String> properties);
throws InvalidPropertiesException;
/** Updates the plugin's transport properties for the given contact. */ /** Updates the plugin's transport properties for the given contact. */
void setRemoteProperties(ContactId c, Map<String, String> properties) void setRemoteProperties(ContactId c, Map<String, String> properties);
throws InvalidPropertiesException;
/** Updates the plugin's configuration properties. */ /** Updates the plugin's configuration properties. */
void setConfig(Map<String, String> config) throws InvalidConfigException; void setConfig(Map<String, String> config);
/** /**
* Returns true if the plugin's poll() method should be called * Returns true if the plugin's poll() method should be called

4
api/net/sf/briar/api/transport/batch/BatchTransportPlugin.java
View File

@@ -4,8 +4,6 @@ import java.io.IOException;
import java.util.Map; import java.util.Map;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.TransportPlugin; import net.sf.briar.api.transport.TransportPlugin;
/** /**
@@ -21,7 +19,7 @@ public interface BatchTransportPlugin extends TransportPlugin {
void start(Map<String, String> localProperties, void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config, BatchTransportCallback c) Map<String, String> config, BatchTransportCallback c)
throws InvalidPropertiesException, InvalidConfigException, IOException; throws IOException;
/** /**
* Attempts to create and return a BatchTransportReader for the given * Attempts to create and return a BatchTransportReader for the given

4
api/net/sf/briar/api/transport/stream/StreamTransportPlugin.java
View File

@@ -4,8 +4,6 @@ import java.io.IOException;
import java.util.Map; import java.util.Map;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.TransportPlugin; import net.sf.briar.api.transport.TransportPlugin;
/** /**
@@ -21,7 +19,7 @@ public interface StreamTransportPlugin extends TransportPlugin {
void start(Map<String, String> localProperties, void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config, StreamTransportCallback c) Map<String, String> config, StreamTransportCallback c)
throws InvalidPropertiesException, InvalidConfigException, IOException; throws IOException;
/** /**
* Attempts to create and return a StreamTransportConnection to the given * Attempts to create and return a StreamTransportConnection to the given

15
components/net/sf/briar/plugins/AbstractPlugin.java
View File

@@ -8,8 +8,6 @@ import java.util.Map.Entry;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.TransportPlugin; import net.sf.briar.api.transport.TransportPlugin;
import net.sf.briar.api.transport.batch.BatchTransportCallback; import net.sf.briar.api.transport.batch.BatchTransportCallback;
@@ -30,8 +28,7 @@ public abstract class AbstractPlugin implements TransportPlugin {
protected synchronized void start(Map<String, String> localProperties, protected synchronized void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config) throws InvalidPropertiesException, Map<String, String> config) {
InvalidConfigException {
if(started) throw new IllegalStateException(); if(started) throw new IllegalStateException();
started = true; started = true;
this.localProperties = Collections.unmodifiableMap(localProperties); this.localProperties = Collections.unmodifiableMap(localProperties);
@@ -53,21 +50,19 @@ public abstract class AbstractPlugin implements TransportPlugin {
started = false; started = false;
} }
public synchronized void setLocalProperties(Map<String, String> properties) public synchronized void setLocalProperties(
throws InvalidPropertiesException { Map<String, String> properties) {
if(!started) throw new IllegalStateException(); if(!started) throw new IllegalStateException();
localProperties = Collections.unmodifiableMap(properties); localProperties = Collections.unmodifiableMap(properties);
} }
public synchronized void setRemoteProperties(ContactId c, public synchronized void setRemoteProperties(ContactId c,
Map<String, String> properties) Map<String, String> properties) {
throws InvalidPropertiesException {
if(!started) throw new IllegalStateException(); if(!started) throw new IllegalStateException();
remoteProperties.put(c, Collections.unmodifiableMap(properties)); remoteProperties.put(c, Collections.unmodifiableMap(properties));
} }
public synchronized void setConfig(Map<String, String> config) public synchronized void setConfig(Map<String, String> config) {
throws InvalidConfigException {
if(!started) throw new IllegalStateException(); if(!started) throw new IllegalStateException();
this.config = Collections.unmodifiableMap(config); this.config = Collections.unmodifiableMap(config);
} }

6
components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
View File

@@ -21,8 +21,6 @@ import javax.microedition.io.StreamConnectionNotifier;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId; import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.transport.stream.StreamTransportCallback;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.transport.stream.StreamTransportConnection;
import net.sf.briar.api.transport.stream.StreamTransportPlugin; import net.sf.briar.api.transport.stream.StreamTransportPlugin;
@@ -56,7 +54,7 @@ class BluetoothPlugin extends AbstractPlugin implements StreamTransportPlugin {
public synchronized void start(Map<String, String> localProperties, public synchronized void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config, StreamTransportCallback callback) Map<String, String> config, StreamTransportCallback callback)
throws InvalidPropertiesException, InvalidConfigException, IOException { throws IOException {
super.start(localProperties, remoteProperties, config); super.start(localProperties, remoteProperties, config);
this.callback = callback; this.callback = callback;
// Initialise the Bluetooth stack // Initialise the Bluetooth stack
@@ -66,7 +64,7 @@ class BluetoothPlugin extends AbstractPlugin implements StreamTransportPlugin {
// On Linux the user may need to install libbluetooth-dev // On Linux the user may need to install libbluetooth-dev
if(OsUtils.isLinux()) if(OsUtils.isLinux())
callback.showMessage("BLUETOOTH_INSTALL LIBS"); callback.showMessage("BLUETOOTH_INSTALL LIBS");
throw e; throw new IOException(e.getMessage());
} }
executor.execute(createBinder()); executor.execute(createBinder());
} }

4
components/net/sf/briar/plugins/file/FilePlugin.java
View File

@@ -11,8 +11,6 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.TransportConstants; import net.sf.briar.api.transport.TransportConstants;
import net.sf.briar.api.transport.batch.BatchTransportCallback; import net.sf.briar.api.transport.batch.BatchTransportCallback;
import net.sf.briar.api.transport.batch.BatchTransportPlugin; import net.sf.briar.api.transport.batch.BatchTransportPlugin;
@@ -39,7 +37,7 @@ implements BatchTransportPlugin {
public synchronized void start(Map<String, String> localProperties, public synchronized void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config, BatchTransportCallback callback) Map<String, String> config, BatchTransportCallback callback)
throws InvalidPropertiesException, InvalidConfigException, IOException { throws IOException {
super.start(localProperties, remoteProperties, config); super.start(localProperties, remoteProperties, config);
this.callback = callback; this.callback = callback;
} }

4
components/net/sf/briar/plugins/file/RemovableDrivePlugin.java
View File

@@ -10,8 +10,6 @@ import java.util.logging.Logger;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportId; import net.sf.briar.api.TransportId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.batch.BatchTransportCallback; import net.sf.briar.api.transport.batch.BatchTransportCallback;
class RemovableDrivePlugin extends FilePlugin class RemovableDrivePlugin extends FilePlugin
@@ -41,7 +39,7 @@ implements RemovableDriveMonitor.Callback {
public void start(Map<String, String> localProperties, public void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config, BatchTransportCallback callback) Map<String, String> config, BatchTransportCallback callback)
throws InvalidPropertiesException, InvalidConfigException, IOException { throws IOException {
super.start(localProperties, remoteProperties, config, callback); super.start(localProperties, remoteProperties, config, callback);
monitor.start(this); monitor.start(this);
} }

13
components/net/sf/briar/plugins/socket/SocketPlugin.java
View File

@@ -10,8 +10,6 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.sf.briar.api.ContactId; import net.sf.briar.api.ContactId;
import net.sf.briar.api.transport.InvalidConfigException;
import net.sf.briar.api.transport.InvalidPropertiesException;
import net.sf.briar.api.transport.stream.StreamTransportCallback; import net.sf.briar.api.transport.stream.StreamTransportCallback;
import net.sf.briar.api.transport.stream.StreamTransportConnection; import net.sf.briar.api.transport.stream.StreamTransportConnection;
import net.sf.briar.api.transport.stream.StreamTransportPlugin; import net.sf.briar.api.transport.stream.StreamTransportPlugin;
@@ -40,8 +38,7 @@ implements StreamTransportPlugin {
public synchronized void start(Map<String, String> localProperties, public synchronized void start(Map<String, String> localProperties,
Map<ContactId, Map<String, String>> remoteProperties, Map<ContactId, Map<String, String>> remoteProperties,
Map<String, String> config, StreamTransportCallback callback) Map<String, String> config, StreamTransportCallback callback) {
throws InvalidPropertiesException, InvalidConfigException {
super.start(localProperties, remoteProperties, config); super.start(localProperties, remoteProperties, config);
this.callback = callback; this.callback = callback;
executor.execute(createBinder()); executor.execute(createBinder());
@@ -66,6 +63,10 @@ implements StreamTransportPlugin {
} }
if(addr == null || ss == null) return; if(addr == null || ss == null) return;
ss.bind(addr); ss.bind(addr);
if(LOG.isLoggable(Level.INFO)) {
LOG.info("Bound to " + ss.getInetAddress().getHostAddress() +
":" + ss.getLocalPort());
}
} catch(IOException e) { } catch(IOException e) {
if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage()); if(LOG.isLoggable(Level.WARNING)) LOG.warning(e.getMessage());
return; return;
@@ -135,8 +136,8 @@ implements StreamTransportPlugin {
} }
} }
public synchronized void setLocalProperties(Map<String, String> properties) public synchronized void setLocalProperties(
throws InvalidPropertiesException { Map<String, String> properties) {
super.setLocalProperties(properties); super.setLocalProperties(properties);
// Close and reopen the socket if its address has changed // Close and reopen the socket if its address has changed
if(socket != null) { if(socket != null) {

2
test/build.xml
View File

@@ -1,7 +1,7 @@
<project name='test' default='test'> <project name='test' default='test'>
<import file='../build-common.xml'/> <import file='../build-common.xml'/>
<target name='test' depends='depend'> <target name='test' depends='depend'>
<junit printsummary='on' showoutput='true' fork='yes' forkmode='once'> <junit printsummary='on' fork='yes' forkmode='once'>
<assertions> <assertions>
<enable/> <enable/>
</assertions> </assertions>