This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The Saros Eclipse Plugin". Pusher was dpp-gerrit.
The branch, master has been updated
via 57f30759239f0f679b6b32d7c92d6eb98846d2d7 (commit)
from c78a857e9dc416c95e5c15222e654f45fe717389 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 57f30759239f0f679b6b32d7c92d6eb98846d2d7
Author: Franz Zieris <[email protected]>
Date: Mon Jun 17 13:25:16 2013 +0200
[REFACTOR] Removed chat and color logic from the SessionNegotiation
Chat and color specific information is still exchanged during the
SessionNegotiation. But from now on, there are
"SessionNegotiationHooks" which may hook into the different stages
of the invitation in order to transfer their specific information. This
way the Incoming/Outgoing processes do not need to know which additional
features Saros supports.
The following dependencies were removed:
* IncomingSessionNegotiation -> PreferenceUtils
* InvitationParameterExchangeExtension -> MUC
* InvitationParameterExchangeExtension -> Colors
Through the last two, indirectly the dependencies between
Incoming/OutgoingSessionNegotiation and MUC/Colors were removed. (At
least almost: There is a color related HACK, that should be removed for
clarity.)
This patch did not touch the logic within the extensions (although the
temptation was high). For instance, consider the SarosSessionManager
which needs to know about the user's color (this dependency was removed
from the client side CTOR; otherwise the hooks wouldn't have worked).
However, this patch still breaks the compatibility with older versions
because the additional data during the SessionNegotiation is transferred
in a new format.
Change-Id: Ib14d606958413a5b364831d9f6c6b0921ebeb1a8
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/829
Reviewed-by: Franz Zieris <[email protected]>
Tested-by: Jenkins CI
-----------------------------------------------------------------------
Summary of changes:
.../src/de/fu_berlin/inf/dpp/SarosContext.java | 10 +-
.../chat/muc/MultiUserChatService.java | 4 +-
.../muc/negotiation/MUCNegotiationManager.java | 162 ++++++++++++++++++++
.../MUCSessionPreferencesNegotiatingManager.java | 114 --------------
.../dpp/invitation/IncomingSessionNegotiation.java | 38 ++++--
.../inf/dpp/invitation/InvitationProcess.java | 4 +-
.../dpp/invitation/OutgoingSessionNegotiation.java | 60 +++++---
.../invitation/hooks/ISessionNegotiationHook.java | 80 ++++++++++
.../hooks/SessionNegotiationHookManager.java | 29 ++++
.../InvitationParameterExchangeExtension.java | 101 +++++++------
.../inf/dpp/project/ISarosSessionManager.java | 7 +-
.../inf/dpp/project/SarosSessionManager.java | 12 +-
.../dpp/project/internal/ColorNegotiationHook.java | 71 +++++++++
13 files changed, 477 insertions(+), 215 deletions(-)
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/chat/muc/negotiation/MUCNegotiationManager.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/chat/muc/negotiation/MUCSessionPreferencesNegotiatingManager.java
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/invitation/hooks/ISessionNegotiationHook.java
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/invitation/hooks/SessionNegotiationHookManager.java
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/project/internal/ColorNegotiationHook.java
hooks/post-receive
--
The Saros Eclipse Plugin
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Dpp-robot mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dpp-robot
