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.".
The branch, master has been updated
via 79368e368c5d6577e48023ae85c4ea36d9e82f98 (commit)
from 3ebbf16275861c0e504a68142d98c58ed9a274aa (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 79368e368c5d6577e48023ae85c4ea36d9e82f98
Author: Patrick Steinhardt <[email protected]>
Date: Wed Nov 14 10:52:47 2012 +0100
[INTERNAL] Merge MUC and SUC data structures
To unify single and multi user chats, several data structures and
listeners have been merged.
Copied from SWTP-2012 repository.
- Commit abf803a8e0866264bb8108cdb1c88092c885e9ae
- Reviewed on: http://saros-build.imp.fu-berlin.de/gerrit/284
- Reviewed by: Nils Bussas <[email protected]>
- Reviewed by: Arsenij Solovjev <[email protected]>
Change-Id: If74b55d35f4b5aa263b829e21ab69f8dde90658f
Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/346
Tested-by: Jenkins CI
Reviewed-by: Franz Zieris <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.../src/de/fu_berlin/inf/dpp/SarosContext.java | 15 +-
.../muc/MultiUserChat.java} | 252 ++++++-------
.../chat/muc/MultiUserChatService.java | 172 ++++++++
.../muc/negotiation/MUCSessionPreferences.java | 2 +-
.../MUCSessionPreferencesNegotiatingManager.java | 2 +-
.../{ => chat}/muc/negotiation/package-info.java | 2 +-
.../dpp/communication/chat/muc/package-info.java | 9 +
.../muc}/states/MUCStateManager.java | 29 +-
.../session => chat/muc}/states/package-info.java | 4 +-
.../{ChatSingleUser.java => SingleUserChat.java} | 23 +-
...ServiceImpl.java => SingleUserChatService.java} | 60 ++--
.../inf/dpp/communication/muc/MUCManager.java | 191 ---------
.../muc/events/IMUCManagerListener.java | 48 ---
.../muc/events/MUCManagerAdapter.java | 36 --
.../dpp/communication/muc/events/package-info.java | 7 -
.../inf/dpp/communication/muc/package-info.java | 19 -
.../muc/session/events/IMUCSessionListener.java | 38 --
.../muc/session/events/package-info.java | 6 -
.../muc/session/history/MUCSessionHistory.java | 48 ---
.../history/elements/MUCSessionHistoryElement.java | 28 --
.../elements/MUCSessionHistoryJoinElement.java | 13 -
.../elements/MUCSessionHistoryLeaveElement.java | 13 -
.../MUCSessionHistoryMessageReceptionElement.java | 20 -
.../MUCSessionHistoryStateChangeElement.java | 22 -
.../muc/session/history/elements/package-info.java | 12 -
.../muc/session/history/package-info.java | 11 -
.../communication/muc/session/package-info.java | 13 -
.../muc/session/states/IMUCStateListener.java | 22 -
.../muc/singleton/MUCManagerSingletonWrapper.java | 127 ------
.../MUCManagerSingletonWrapperChatView.java | 79 ----
.../communication/muc/singleton/package-info.java | 8 -
.../inf/dpp/communication/package-info.java | 8 +-
.../dpp/invitation/OutgoingSessionNegotiation.java | 4 +-
.../inf/dpp/net/internal/InvitationInfo.java | 2 +-
.../inf/dpp/project/ISarosSessionManager.java | 2 +-
.../inf/dpp/project/SarosSessionManager.java | 4 +-
.../de/fu_berlin/inf/dpp/ui/views/SarosView.java | 2 +-
.../dpp/ui/widgets/chatControl/ChatControl.java | 313 ++++++++++++++--
.../chatControl/events/ChatControlAdapter.java | 17 -
.../dpp/ui/widgets/session/ChatRoomsComposite.java | 408 ++++----------------
.../communication/muc/session/MucSessionTest.java | 36 +-
41 files changed, 751 insertions(+), 1376 deletions(-)
rename
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/{muc/session/MUCSession.java
=> chat/muc/MultiUserChat.java} (65%)
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/chat/muc/MultiUserChatService.java
rename de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/{ =>
chat}/muc/negotiation/MUCSessionPreferences.java (96%)
rename de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/{ =>
chat}/muc/negotiation/MUCSessionPreferencesNegotiatingManager.java (97%)
rename de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/{ =>
chat}/muc/negotiation/package-info.java (78%)
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/chat/muc/package-info.java
rename
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/{muc/session =>
chat/muc}/states/MUCStateManager.java (86%)
rename
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/{muc/session =>
chat/muc}/states/package-info.java (69%)
rename
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/chat/single/{ChatSingleUser.java
=> SingleUserChat.java} (88%)
rename
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/chat/single/{ChatServiceImpl.java
=> SingleUserChatService.java} (74%)
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/MUCManager.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/events/IMUCManagerListener.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/events/MUCManagerAdapter.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/events/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/events/IMUCSessionListener.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/events/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/MUCSessionHistory.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/elements/MUCSessionHistoryElement.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/elements/MUCSessionHistoryJoinElement.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/elements/MUCSessionHistoryLeaveElement.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/elements/MUCSessionHistoryMessageReceptionElement.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/elements/MUCSessionHistoryStateChangeElement.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/elements/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/history/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/session/states/IMUCStateListener.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/singleton/MUCManagerSingletonWrapper.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/singleton/MUCManagerSingletonWrapperChatView.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/communication/muc/singleton/package-info.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/widgets/chatControl/events/ChatControlAdapter.java
hooks/post-receive
--
The saros eclipse plugin.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Dpp-robot mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/dpp-robot
