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

Merge branch 'fix-npe-platform-json' into master

Browse Source
This commit is contained in:
Cristian Maglie 2015-12-22 17:57:28 +01:00
commit a73d393554
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
View File

@ -108,6 +108,24 @@ public abstract class ContributedPlatform extends DownloadableContribution {
} }
ContributedPlatform obj1 = (ContributedPlatform) obj; ContributedPlatform obj1 = (ContributedPlatform) obj;
return getParentPackage().getName().equals(obj1.getParentPackage().getName()) && getArchitecture().equals(obj1.getArchitecture()) && getVersion().equals(obj1.getVersion()) && getName().equals(obj1.getName());
ContributedPackage parentPackage = getParentPackage();
ContributedPackage parentPackage1 = obj1.getParentPackage();
if (parentPackage == null) {
if (parentPackage1 != null)
return false;
} else {
if (parentPackage1 == null)
return false;
if (!parentPackage.getName().equals(parentPackage1.getName()))
return false;
}
if (!getArchitecture().equals(obj1.getArchitecture())) {
return false;
}
if (!getVersion().equals(obj1.getVersion())) {
return false;
}
return getName().equals(obj1.getName());
} }
} }