Use default preferences to choose merge strategy #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| final IEclipsePreferences prefs = InstanceScope.INSTANCE | ||
| .getNode(Activator.getPluginId()); | ||
| String preferredMergeStrategyKey = prefs.get( | ||
| GitCorePreferences.core_preferredMergeStrategy, null); | ||
|
|
||
| // Get preferences defined at eclipse startup with configuration files | ||
| if (preferredMergeStrategyKey == null |
There was a problem hiding this comment.
That's very interesting... We probably need to do the same in EMFCompare to allow out users to define default properties wherever they want, don't we?
There was a problem hiding this comment.
In EMFCompare the class ScopedPreferenceStore is used to search a specific preference across multiple preferenceStores. This approach seems to be good for managing EGit preferences, but the preferences are managed in egit.core and ScopedPreferenceStore comes from eclipse.ui.
I think the better approach is to manage each store individually, as EGit does
The default preferences are only used if the user has not set a preference through the preferences pages Signed-off-by: mcartaud <[email protected]>
mcartaud
force-pushed
the
wip/startupProperties
branch
from
92c3ed7
to
278ba1c
Compare
| @@ -245,6 +245,9 @@ | |||
| public static String MergeStrategy_UnloadError; | |||
|
|
|||
| /** */ | |||
| public static String MergeStrategy_JGit_Default; | |||
There was a problem hiding this comment.
This should be a constant, but there's no reason to internationalize it!
collaborative-modeling-bot
force-pushed
the
master
branch
4 times, most recently
from
f978f10
to
c37d805
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
4 times, most recently
from
915da0d
to
75b543e
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
5 times, most recently
from
45d2a27
to
b064edf
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
2 times, most recently
from
512439b
to
d318e27
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
from
d318e27
to
055b42b
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
5 times, most recently
from
94723b0
to
2f6171c
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
2 times, most recently
from
cdca2d6
to
68d2fd9
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
from
68d2fd9
to
4d94085
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
2 times, most recently
from
a6a477f
to
39505d5
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
5 times, most recently
from
b34eba0
to
3388246
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
4 times, most recently
from
cf775d3
to
1f8d87c
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
4 times, most recently
from
bdd52f0
to
e57843c
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
4 times, most recently
from
3dd284e
to
1732180
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
3 times, most recently
from
bad56b4
to
b5fd270
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
from
b5fd270
to
09393eb
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
3 times, most recently
from
64da85c
to
f066134
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
2 times, most recently
from
590b0bb
to
6fe6696
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
3 times, most recently
from
384e7de
to
ece276c
Compare
collaborative-modeling-bot
force-pushed
the
master
branch
from
ece276c
to
500d12d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The default preferences are only used if the user has not set a
preference through the preferences pages
Signed-off-by: mcartaud [email protected]