Deduplicate stored launch configs of nested projects #798 #856
+9
−5
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
Test Results 1 758 files ±0 1 758 suites ±0 1h 39m 0s ⏱️ + 14m 36s For more details on these failures, see this check. Results for commit a742866. ± Comparison against base commit 6d514be. ♻️ This comment has been updated with latest results. |
|
@Bananeweizen master is open do you like to finish this? |
HannesWell
reviewed
Dec 7, 2023
Comment on lines
653
to
+662
| IContainer container = getContainer(); | ||
| if (container == null) { | ||
| return getName().hashCode(); | ||
| } else { | ||
| return getName().hashCode() + container.hashCode(); | ||
| int result = getName().hashCode(); | ||
| if (container != null) { | ||
| result += container.hashCode(); | ||
| } | ||
| IPath location = getLocation(); | ||
| if (location != null) { | ||
| result += location.hashCode(); | ||
| } | ||
| return result; |
There was a problem hiding this comment.
What about just one line?
return Objects.hash(getName(), getContainer(), getLocation());
|
@Bananeweizen |
jukzi
force-pushed
the
duplicate_m2e_launch_configs
branch
from
8ef4484
to
a359e6e
Compare
HannesWell
reviewed
Sep 29, 2024
| @@ -369,7 +369,7 @@ public boolean equals(Object object) { | |||
| LaunchConfiguration config = (LaunchConfiguration) object; | |||
| if (!config.isWorkingCopy()) { | |||
| return getName().equals(config.getName()) && | |||
| equalOrNull(getContainer(), config.getContainer()); | |||
| (equalOrNull(getContainer(), config.getContainer()) || equalOrNull(getLocation(), config.getLocation())); | |||
There was a problem hiding this comment.
Suggested change
| (equalOrNull(getContainer(), config.getContainer()) || equalOrNull(getLocation(), config.getLocation())); | |
| (Objects.equals(getContainer(), config.getContainer()) || Objects.equals(getLocation(), config.getLocation())); |
…#798 Fixes eclipse-platform#798. m2e projects can be nested (e.g. modules stored inside a reactor). Launch configs stored the inner nested projects appear twice, because they are not equal with the old implementation checking only name and container. Therefore also check the resolved location if the containers are different. I've tested this with an m2e IDE containing such nested projects and stored launch configs. The duplicates are gone with the change.
HannesWell
force-pushed
the
duplicate_m2e_launch_configs
branch
from
a359e6e
to
a742866
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.
Fixes #798.
m2e projects can be nested (e.g. modules stored inside a reactor). Launch configs stored the inner nested projects appear twice, because they are not equal with the old implementation checking only name and container. Therefore also check the resolved location if the containers are different.
I've tested this with an m2e IDE containing such nested projects and stored launch configs. The duplicates are gone with the change.