rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Improved lib equality check

Browse Source
This commit is contained in:
Cristian Maglie 2017-01-25 15:34:14 +01:00 committed by Martino Facchin
parent 2ec8c539b2
commit 894b1abd8a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
View File

@ -166,7 +166,7 @@ public abstract class ContributedLibrary extends DownloadableContribution {
String thisVersion = getParsedVersion();
String otherVersion = other.getParsedVersion();
boolean versionEquals = (thisVersion != null && otherVersion != null
boolean versionEquals = (thisVersion != null
&& thisVersion.equals(otherVersion));
// Important: for legacy libs, versions are null. Two legacy libs must
@ -176,9 +176,14 @@ public abstract class ContributedLibrary extends DownloadableContribution {
String thisName = getName();
String otherName = other.getName();
boolean nameEquals = thisName == null || otherName == null || thisName.equals(otherName);
boolean nameEquals = thisName != null && thisName.equals(otherName);
return versionEquals && nameEquals;
}
@Override
public int hashCode() {
String hashingData = "CONTRIBUTEDLIB" + getName() + getVersion();
return hashingData.hashCode();
}
}