From 6b6866370a0aec46f5e573a757301e560fb503b5 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Wed, 8 Apr 2015 16:38:36 +0200 Subject: [PATCH] Preliminary support to online help/reference --- .../ui/ContributedPlatformTableCell.java | 18 ++++++++++++++++-- .../packages/ContributedHelp.java | 7 +++++++ .../packages/ContributedPackage.java | 2 ++ .../packages/ContributedPlatform.java | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java index 0aeb1f571..b492fa352 100644 --- a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java @@ -28,13 +28,14 @@ */ package cc.arduino.contributions.packages.ui; +import cc.arduino.contributions.DownloadableContributionVersionComparator; import cc.arduino.contributions.VersionComparator; -import cc.arduino.contributions.filters.InstalledPredicate; import cc.arduino.contributions.filters.BuiltInPredicate; +import cc.arduino.contributions.filters.InstalledPredicate; import cc.arduino.contributions.packages.ContributedBoard; +import cc.arduino.contributions.packages.ContributedHelp; import cc.arduino.contributions.packages.ContributedPlatform; import cc.arduino.contributions.packages.DownloadableContribution; -import cc.arduino.contributions.DownloadableContributionVersionComparator; import cc.arduino.contributions.ui.InstallerTableCell; import cc.arduino.contributions.ui.listeners.DelegatingKeyListener; import cc.arduino.utils.ReverseComparator; @@ -368,6 +369,19 @@ public class ContributedPlatformTableCell extends InstallerTableCell { } desc = desc.substring(0, desc.lastIndexOf(',')) + ".
"; + ContributedHelp help = null; + if (selected.getHelp() != null) { + help = selected.getHelp(); + } else if (selected.getParentPackage().getHelp() != null) { + help = selected.getParentPackage().getHelp(); + } + if (help != null) { + String url = help.getOnline(); + if (url != null && !url.isEmpty()) { + desc += " " + format("Online help
", url); + } + } + String url = selected.getParentPackage().getWebsiteURL(); if (url != null && !url.isEmpty()) { desc += " " + format("More info", url); diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java new file mode 100644 index 000000000..1c13a2d7f --- /dev/null +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java @@ -0,0 +1,7 @@ +package cc.arduino.contributions.packages; + +public abstract class ContributedHelp { + + public abstract String getOnline(); + +} diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java index 4b9ed4b41..d23ee16f9 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java @@ -46,6 +46,8 @@ public abstract class ContributedPackage { public abstract List getTools(); + public abstract ContributedHelp getHelp(); + public ContributedPlatform findPlatform(String architecture, String version) { if (architecture == null || version == null) { return null; diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java index e3e43549a..32de99aa4 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java @@ -47,6 +47,8 @@ public abstract class ContributedPlatform extends DownloadableContribution { public abstract List getBoards(); + public abstract ContributedHelp getHelp(); + private List resolvedTools = null; private ContributedPackage parentPackage;