Some cleaning done and changed order for arguments to: EventDelegator.addListener(ListenerContext context, T listener)