marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove code by extending instead of implementing

Browse Source
This commit is contained in:
zzz
2011-07-17 18:57:22 +00:00
parent 8a9882c906
commit 0a8abad72e
1 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
View File

@@ -72,9 +72,8 @@ import net.i2p.util.Log;
/** /**
* Todo: Most events are not listened to elsewhere, so error propagation is poor * Todo: Most events are not listened to elsewhere, so error propagation is poor
*/ */
public class I2PTunnel implements Logging, EventDispatcher { public class I2PTunnel extends EventDispatcherImpl implements Logging {
private final Log _log; private final Log _log;
private final EventDispatcherImpl _event;
private final I2PAppContext _context; private final I2PAppContext _context;
private static long __tunnelId = 0; private static long __tunnelId = 0;
private final long _tunnelId; private final long _tunnelId;
@@ -114,10 +113,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
} }
public I2PTunnel(String[] args, ConnectionEventListener lsnr) { public I2PTunnel(String[] args, ConnectionEventListener lsnr) {
super();
_context = I2PAppContext.getGlobalContext(); // new I2PAppContext(); _context = I2PAppContext.getGlobalContext(); // new I2PAppContext();
_tunnelId = ++__tunnelId; _tunnelId = ++__tunnelId;
_log = _context.logManager().getLog(I2PTunnel.class); _log = _context.logManager().getLog(I2PTunnel.class);
_event = new EventDispatcherImpl();
// as of 0.8.4, include context properties // as of 0.8.4, include context properties
Properties p = _context.getProperties(); Properties p = _context.getProperties();
_clientOptions = p; _clientOptions = p;
@@ -1657,41 +1656,4 @@ public class I2PTunnel implements Logging, EventDispatcher {
public interface ConnectionEventListener { public interface ConnectionEventListener {
public void routerDisconnected(); public void routerDisconnected();
} }
/* Required by the EventDispatcher interface */
public EventDispatcher getEventDispatcher() {
return _event;
}
public void attachEventDispatcher(EventDispatcher e) {
_event.attachEventDispatcher(e.getEventDispatcher());
}
public void detachEventDispatcher(EventDispatcher e) {
_event.detachEventDispatcher(e.getEventDispatcher());
}
public void notifyEvent(String e, Object a) {
_event.notifyEvent(e, a);
}
public Object getEventValue(String n) {
return _event.getEventValue(n);
}
public Set getEvents() {
return _event.getEvents();
}
public void ignoreEvents() {
_event.ignoreEvents();
}
public void unIgnoreEvents() {
_event.unIgnoreEvents();
}
public Object waitEventValue(String n) {
return _event.waitEventValue(n);
}
} }