Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Deduplicate stored launch configs of nested projects #798 #856

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Deduplicate stored launch configs of nested projects #798 #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions debug/org.eclipse.debug.core/core/org/eclipse/debug/internal/core/LaunchConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
(equalOrNull(getContainer(), config.getContainer()) || equalOrNull(getLocation(), config.getLocation()));
(Objects.equals(getContainer(), config.getContainer()) || Objects.equals(getLocation(), config.getLocation()));

}
}
return false;
Expand Down Expand Up @@ -651,11 +651,15 @@ public ILaunchConfigurationWorkingCopy getWorkingCopy() throws CoreException {
@Override
public int hashCode() {
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;
Comment on lines 653 to +662
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about just one line?

return Objects.hash(getName(), getContainer(), getLocation());

}

@Override
Expand Down
Loading