diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java index 6c42ddcfb..692a3dfb2 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java @@ -64,7 +64,7 @@ public abstract class ContributedLibrary extends DownloadableContribution { public abstract List getTypes(); - public abstract List getRequires(); + public abstract List getDependencies(); public abstract List getProvidesIncludes(); @@ -146,8 +146,8 @@ public abstract class ContributedLibrary extends DownloadableContribution { } res += "\n"; res += " requires :\n"; - if (getRequires() != null) - for (ContributedLibraryDependency r : getRequires()) { + if (getDependencies() != null) + for (ContributedLibraryDependency r : getDependencies()) { res += " " + r; } res += "\n"; diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java index 2683d5eb0..e8e500dd5 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java @@ -33,10 +33,10 @@ public abstract class ContributedLibraryDependency { public abstract String getName(); - public abstract String getVersionRequired(); + public abstract String getVersion(); @Override public String toString() { - return getName() + " " + getVersionRequired(); + return getName() + " " + getVersion(); } } diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java index b42a6afb7..371d85951 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java @@ -112,7 +112,7 @@ public abstract class LibrariesIndex { public boolean resolveDependeciesOf(List solution, ContributedLibrary library) { - List requirements = library.getRequires(); + List requirements = library.getDependencies(); if (requirements == null) { // No deps for this library, great! return true; @@ -160,7 +160,7 @@ public abstract class LibrariesIndex { private List findMatchingDependencies(ContributedLibraryDependency dep) { List available = find(dep.getName()); - if (dep.getVersionRequired() == null || dep.getVersionRequired().isEmpty()) + if (dep.getVersion() == null || dep.getVersion().isEmpty()) return available; // XXX: The following part is actually never reached. The use of version diff --git a/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java index 982aec810..1e0468aa9 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/UnavailableContributedLibrary.java @@ -38,7 +38,7 @@ public class UnavailableContributedLibrary extends ContributedLibrary { private String version; public UnavailableContributedLibrary(ContributedLibraryDependency dependency) { - this(dependency.getName(), dependency.getVersionRequired()); + this(dependency.getName(), dependency.getVersion()); } public UnavailableContributedLibrary(String _name, String _version) { @@ -101,7 +101,7 @@ public class UnavailableContributedLibrary extends ContributedLibrary { } @Override - public List getRequires() { + public List getDependencies() { return new ArrayList<>(); }