From d72cb2350d446b60f23ac87db85db19e696f3263 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 25 Jan 2017 17:21:50 +0100 Subject: [PATCH] Renamed ContributedLibraryReference to ContributedLibraryDependency --- .../contributions/libraries/ContributedLibrary.java | 4 ++-- ...ryReference.java => ContributedLibraryDependency.java} | 8 +++----- arduino-core/src/processing/app/packages/UserLibrary.java | 4 ++-- 3 files changed, 7 insertions(+), 9 deletions(-) rename arduino-core/src/cc/arduino/contributions/libraries/{ContributedLibraryReference.java => ContributedLibraryDependency.java} (87%) diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java index 0c723ae3e..485d6183b 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java @@ -63,7 +63,7 @@ public abstract class ContributedLibrary extends DownloadableContribution { public abstract List getTypes(); - public abstract List getRequires(); + public abstract List getRequires(); public abstract List getProvidesIncludes(); @@ -146,7 +146,7 @@ public abstract class ContributedLibrary extends DownloadableContribution { res += "\n"; res += " requires :\n"; if (getRequires() != null) - for (ContributedLibraryReference r : getRequires()) { + for (ContributedLibraryDependency r : getRequires()) { res += " " + r; } res += "\n"; diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java similarity index 87% rename from arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java rename to arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java index f4edd5732..2683d5eb0 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java @@ -29,16 +29,14 @@ package cc.arduino.contributions.libraries; -public abstract class ContributedLibraryReference { +public abstract class ContributedLibraryDependency { public abstract String getName(); - public abstract String getMaintainer(); - - public abstract String getVersion(); + public abstract String getVersionRequired(); @Override public String toString() { - return getName() + " " + getVersion() + " (" + getMaintainer() + ")"; + return getName() + " " + getVersionRequired(); } } diff --git a/arduino-core/src/processing/app/packages/UserLibrary.java b/arduino-core/src/processing/app/packages/UserLibrary.java index e22ae36eb..c1625b88a 100644 --- a/arduino-core/src/processing/app/packages/UserLibrary.java +++ b/arduino-core/src/processing/app/packages/UserLibrary.java @@ -44,7 +44,7 @@ import com.github.zafarkhaja.semver.Version; import cc.arduino.Constants; import cc.arduino.contributions.VersionHelper; -import cc.arduino.contributions.libraries.ContributedLibraryReference; +import cc.arduino.contributions.libraries.ContributedLibraryDependency; import processing.app.helpers.PreferencesMap; import processing.app.packages.UserLibraryFolder.Location; @@ -230,7 +230,7 @@ public class UserLibrary { return maintainer; } - public List getRequires() { + public List getRequires() { return null; }