-
Notifications
You must be signed in to change notification settings - Fork 52
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove reference point mentions in UI #1008
Merged
tobous
merged 4 commits into
master
from
pr/intellij/remove-reference-point-mentions-to-user
Jun 9, 2020
Merged
Remove reference point mentions in UI #1008
tobous
merged 4 commits into
master
from
pr/intellij/remove-reference-point-mentions-to-user
Jun 9, 2020
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
e3d416c
to
ed920f6
Compare
b6ee166
to
0c19e03
Compare
Rebased onto current base branch only resolving minor merge conflicts. |
m273d15
previously approved these changes
Jun 8, 2020
ed920f6
to
51d7b8a
Compare
Base automatically changed from
pr/intellij/migrate-local-resource-handler-to-reference-points
to
master
June 9, 2020 13:08
Moves messages.properties to resources/messages. Renames the file to 'IntellijMessages.properties'. Adjusts the reference in Messages.java to match the new bundle name.
Replaces mentions of 'Reference Point' shown to the user with 'Shared Root Directory' and mentions of 'Reference Point Negotiation' with 'Resource Negotiation'. This was done to not confuse the user by using the Saros-specific concept of a reference point and instead use more general concepts the user should be familiar with.
Adjusts the wording in the javadoc, method and variable names, and comments to use "Resource Negotiation" instead of "Reference Point Negotiation".
0c19e03
to
668d4e4
Compare
Rebased onto current master without any interaction. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Area: IntelliJ
Issue affecting Saros for IntelliJ (Saros/I)
Aspect: GUI
Issues specific to the Saros GUI
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.
This PR shows that there are still many string literals that are shown to the user littered throughout the UI logic. But, as that part of the logic is a huge mess anyways, I did not want to invest the time to migrate them.
[REFACTOR][I] Move messages.properties to resource root
Moves messages.properties to resources/messages. Renames the file to
'IntellijMessages.properties'.
Adjusts the reference in Messages.java to match the new bundle name.
[UI][I] Replace mentions of Reference Point in the UI
Replaces mentions of 'Reference Point' shown to the user with 'Shared
Root Directory' and mentions of 'Reference Point Negotiation' with
'Resource Negotiation'. This was done to not confuse the user by using
the Saros-specific concept of a reference point and instead use more
general concepts the user should be familiar with.
[REFACTOR][I] Use "Resource Negotiation" wording
Adjusts the wording in the javadoc, method and variable names, and
comments to use "Resource Negotiation" instead of "Reference Point
Negotiation".
[UI][I] Remove remaining reference to sharing modules in tooltip