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 603f4ca21fb16db5a72064d1901dcbb729e5f702 (commit)
via ebc350141f7749652b6fb4b903803e37ea8a5e7a (commit)
via 5aceb8a781a24cf6a82d78550ebe558a426332a5 (commit)
via a33890a284caf97e505fae8c69cbc4fb50f70120 (commit)
via f58baf4b77409264fd1a12d2d24f3771625de4f5 (commit)
via 25a0558ad9868e12935c02cce3982eeea86b289a (commit)
via fda6497260319c7dedbf9973d03c993578764771 (commit)
via 1180ff62511d45774611c3f732b03ce5a1850bab (commit)
via 3ef43cfc7fd8fd2322342b4b0595455dad5350be (commit)
via c3637d535abdfc2da601890ba66a1ab06c32bfd3 (commit)
via b4ed5df77bcce6c190d6d0afd77e2cc4f6917aa6 (commit)
via 19d85de5e07187c0041c68adfd52394ffbd18b59 (commit)
via 5d329e9c77d0e310890abf9f50b3438119ad2094 (commit)
via 535c298be1e74e5dc3baec5e99c1b1c917d2e79a (commit)
via 6bba3b1712392966de98de1fac74c0b8f135ac9b (commit)
via b0385f09cd4b7762211db3974bdbd7f21bc3b240 (commit)
via a76507e4eb9e5cd981b69f5b54c75574950ce558 (commit)
via 1cb32ee2a18a88735ec0cb8559db9dfea6a696a2 (commit)
via 6bbe52ff1bfa420a1e5735d4361882c3dd2ec428 (commit)
via 2ac56f17566e489632ff3d66880394cbcb41486b (commit)
from 2ae5d86cf6cd0e30e52a6e13e21222a977cdf9cd (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 603f4ca21fb16db5a72064d1901dcbb729e5f702
Merge: 2ae5d86 ebc3501
Author: Franz Zieris <zie...@inf.fu-berlin.de>
Date: Wed Sep 23 21:24:52 2015 +0200
[BUILD] Merge release/14.10.31 into master
The release branch for 14.10.31 has been open for over 46 weeks -- the
intended duration is one single week.
Such a long time means a lot of commit on the master branch in the
meantime, therefore this merge commit was far from trivial, and it
involved a lot of manual conflict resolving.
Refer to [1] for a list of all commits of this release branch.
Not all of them where included in this merge.
In particular, these commits were *not* merged back:
- 6bbe52f [RELEASE] corrected required version dependencies
- 1cb32ee [RELEASE] disabled ConcurrentUndo feature
- b0385f0 [GUI] Removed checkbox for enabling console sharing for
Release 14.10.31
- 5aceb8a [FIX] Adds handlers to 14.10.31 for old invitations
These commits were cherry-picked from other branches:
- 535c298 [BUILD] Cherry-pick 81a2041 and 55aff3b from master branch
(these are the two *.chralx files)
- c3637d5 [FIX] #854 Allow hash character in JIDs
(cherry-picked from release/13.12.6)
- 3ef43cf [INTERNAL] fixes defects during the SVN synchronization
(from the master branch)
- 1180ff6 [FIX] UI displayed incorrect Saros support
(from the master branch)
- a33890a [FIX][E] Fix JIDCombo on Eclipse Mars
(from the master branch)
That leaves the following commits as "original" changes of the release
branch that were to be merged back into the master, which is done by
this commit:
- a76507e [GUI] Deleted preferences placeholder text
- 6bba3b1 [FIX] #846 Sorting of in-session contacts is not perfectly
working
- 19d85de [FIX] #845, by removing the "Unavailable Message" feature
- b4ed5df [FIX] #847 Preference page "Communication" is messy
- fda6497 [FIX] #848, #849: Remove Session nickname feature
- 25a0558 [REFACTOR] Move notification messages out of network layer
- f58baf4 [REFACTOR][E] Move getNickname out of User
In the course of forging this merge commit, some defects (in the master
branch) and incomplete refactorings (in the release branch) were found.
I will provide individual patches for these issues.
One issue was resolved right away: The class ModelFormatUtils (added in
f58baf4) was not added to the core project (as in the release branch)
but to the ui project. When the release branch was created, there was no
ui project yet -- I took the opportunity of this merge to "forward" that
class to its actual destination.
[1] https://github.com/saros-project/saros/compare/release/14.10.31
Change-Id: I095842ff53945e3aa25035a32d677bfedce95b53
-----------------------------------------------------------------------
Summary of changes:
de.fu_berlin.inf.dpp.core/META-INF/MANIFEST.MF | 2 +-
.../extensions/UserListExtension.java | 13 +-
.../negotiation/IncomingSessionNegotiation.java | 18 +--
.../negotiation/OutgoingSessionNegotiation.java | 15 +--
.../fu_berlin/inf/dpp/preferences/Preferences.java | 9 -
.../inf/dpp/session/ISarosSessionManager.java | 3 +
.../inf/dpp/session/NicknameNegotiationHook.java | 96 -----------
.../src/de/fu_berlin/inf/dpp/session/User.java | 21 +--
.../fu_berlin/inf/dpp/session/UserFormatUtils.java | 25 +++
.../session/internal/UserInformationHandler.java | 4 +-
.../inf/dpp/activities/ActivityOptimizerTest.java | 6 +-
.../ActivitiesExtensionProviderTest.java | 2 +-
.../jupiter/test/util/JupiterTestCase.java | 2 +-
.../dpp/editor/colorstorage/ColorIDSetTest.java | 9 +-
.../inf/dpp/misc/xstream/UserConverterTest.java | 4 +-
.../dpp/session/internal/ActivityQueuerTest.java | 8 +-
.../session/internal/ActivitySequencerTest.java | 26 ++--
.../internal/UserInformationHandlerTest.java | 22 ++--
.../inf/dpp/synchronize/StopManagerTest.java | 22 ++--
de.fu_berlin.inf.dpp.feature/feature.xml | 10 +-
.../core/concurrent/ConsistencyWatchdogClient.java | 5 +-
.../IntelliJRemoteProgressIndicatorImpl.java | 24 ++--
.../dpp/core/net/business/LeaveAndKickHandler.java | 9 +-
.../inf/dpp/core/project/SarosSessionManager.java | 38 ++---
.../dpp/core/project/internal/SarosSession.java | 17 +-
.../ui/eventhandler/UserStatusChangeHandler.java | 42 ++---
.../dpp/intellij/ui/actions/FollowModeAction.java | 3 +-
.../dpp/intellij/ui/tree/SessionTreeRootNode.java | 5 +-
.../intellij/ui/views/buttons/FollowButton.java | 5 +-
.../inf/dpp/ui/util/ModelFormatUtils.java | 51 ++++++
de.fu_berlin.inf.dpp.update/artifacts.jar | Bin 647 -> 653 bytes
de.fu_berlin.inf.dpp.update/content.jar | Bin 9678 -> 11530 bytes
de.fu_berlin.inf.dpp.update/site.xml | 8 +-
de.fu_berlin.inf.dpp.update_beta/artifacts.jar | Bin 659 -> 729 bytes
de.fu_berlin.inf.dpp.update_beta/content.jar | Bin 16078 -> 26948 bytes
de.fu_berlin.inf.dpp.update_beta/site.xml | 6 +
de.fu_berlin.inf.dpp/CHANGELOG | 50 ++++++
de.fu_berlin.inf.dpp/credits.txt | 13 +-
.../fu_berlin/inf/dpp/SarosCoreContextFactory.java | 2 -
.../watchdog/ConsistencyWatchdogClient.java | 8 +-
.../editor/annotations/ContributionAnnotation.java | 7 +-
.../editor/annotations/SelectionAnnotation.java | 7 +-
.../dpp/editor/annotations/ViewportAnnotation.java | 6 +-
.../remote/EclipseRemoteProgressIndicatorImpl.java | 13 +-
.../inf/dpp/net/business/LeaveAndKickHandler.java | 15 +-
.../inf/dpp/project/SarosSessionManager.java | 7 +-
.../inf/dpp/project/internal/SarosSession.java | 24 +--
.../src/de/fu_berlin/inf/dpp/ui/Messages.java | 18 ++-
.../dpp/ui/actions/ContactAvailabilityAction.java | 178 --------------------
.../inf/dpp/ui/actions/FollowModeAction.java | 6 +-
.../inf/dpp/ui/actions/RemoveUserAction.java | 3 +-
.../ui/eventhandler/UserStatusChangeHandler.java | 19 +-
.../de/fu_berlin/inf/dpp/ui/messages.properties | 16 ++-
.../session/FollowModeInformationTreeElement.java | 4 +-
.../dpp/ui/model/session/SessionComparator.java | 20 +--
.../inf/dpp/ui/model/session/UserElement.java | 22 +++-
.../CommunicationPreferencePage.java | 28 +++-
.../PersonalizationPreferencePage.java | 25 ---
.../de/fu_berlin/inf/dpp/ui/views/SarosView.java | 31 +++-
.../inf/dpp/ui/widgets/chat/ChatControl.java | 3 +-
.../ContributionAnnotationManagerTest.java | 12 +-
.../inf/dpp/feedback/StatisticCollectorTest.java | 4 +-
.../inf/dpp/project/SarosSessionManagerTest.java | 2 +-
.../inf/dpp/project/internal/SarosSessionTest.java | 3 +-
de.fu_berlin.inf.dpp/version.comp | 4 +
65 files changed, 473 insertions(+), 607 deletions(-)
delete mode 100644
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/session/NicknameNegotiationHook.java
create mode 100644
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/session/UserFormatUtils.java
create mode 100644
de.fu_berlin.inf.dpp.ui/src/de/fu_berlin/inf/dpp/ui/util/ModelFormatUtils.java
delete mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/actions/ContactAvailabilityAction.java
hooks/post-receive
--
The Saros Eclipse Plugin
------------------------------------------------------------------------------
Monitor Your Dynamic Infrastructure at Any Scale With Datadog!
Get real-time metrics from all of your servers, apps and tools
in one place.
SourceForge users - Click here to start your Free Trial of Datadog now!
http://pubads.g.doubleclick.net/gampad/clk?id=241902991&iu=/4140
_______________________________________________
Dpp-robot mailing list
Dpp-robot@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dpp-robot
