From a1d99b9a9b0f2cf779d609e35a2bfd83467580f4 Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Thu, 26 Mar 2015 13:59:56 +0100 Subject: [PATCH] LibraryManager: category is now topic, type added to list official/contributed/recommended libs --- .../libraries/ui/LibrariesIndexTableModel.java | 8 +++++--- .../contributions/libraries/ui/LibraryManagerUI.java | 11 +++++------ .../cc/arduino/contributions/ui/InstallerJDialog.java | 2 +- .../contributions/libraries/ContributedLibrary.java | 5 +---- .../processing/app/packages/LegacyUserLibrary.java | 4 ---- .../src/processing/app/packages/UserLibrary.java | 4 ---- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java index 63e6aac68..384e1cedc 100644 --- a/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java +++ b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java @@ -28,10 +28,10 @@ */ package cc.arduino.contributions.libraries.ui; +import cc.arduino.contributions.VersionComparator; import cc.arduino.contributions.libraries.ContributedLibrary; import cc.arduino.contributions.libraries.LibrariesIndexer; import cc.arduino.contributions.packages.ContributedPlatform; -import cc.arduino.contributions.VersionComparator; import cc.arduino.contributions.ui.FilteredAbstractTableModel; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -279,10 +279,12 @@ public class LibrariesIndexTableModel extends FilteredAbstractTableModel { public LibraryManagerUI(Frame parent) { super(parent, "Library Manager", Dialog.ModalityType.APPLICATION_MODAL, _("No internet connection available, the list of available libraries is not complete. You will be able to manage only the libraries you've already installed.")); - filtersContainer.add(new JLabel(_("Category:")), 1); + filtersContainer.add(new JLabel(_("Topic")), 1); filtersContainer.remove(2); typeChooser = new JComboBox(); @@ -95,8 +95,9 @@ public class LibraryManagerUI extends InstallerJDialog { typeChooser.setEnabled(false); filtersContainer.add(Box.createHorizontalStrut(5), 0); - filtersContainer.add(new JLabel(_("Type:")), 1); - filtersContainer.add(typeChooser, 2); + filtersContainer.add(new JLabel(_("Type")), 1); + filtersContainer.add(Box.createHorizontalStrut(5), 2); + filtersContainer.add(typeChooser, 3); } protected final ActionListener typeChooserActionListener = new ActionListener() { @@ -136,8 +137,6 @@ public class LibraryManagerUI extends InstallerJDialog { // Load categories categoryChooser.addItem(new DropdownAllItem()); - categoryChooser.addItem(new DropdownInstalledContributionItem()); - categoryChooser.addItem(new DropdownBuiltInLibrariesItem()); Collection categories = indexer.getIndex().getCategories(); for (String category : categories) { categoryChooser.addItem(new DropdownLibraryOfCategoryItem(category)); @@ -151,13 +150,13 @@ public class LibraryManagerUI extends InstallerJDialog { typeFilter = null; typeChooser.removeAllItems(); typeChooser.addItem(new DropdownAllItem()); + typeChooser.addItem(new DropdownInstalledContributionItem()); Collection types = indexer.getIndex().getTypes(); for (String type : types) { typeChooser.addItem(new DropdownLibraryOfTypeItem(type)); } typeChooser.setEnabled(typeChooser.getItemCount() > 1); typeChooser.addActionListener(typeChooserActionListener); - typeChooser.setSelectedIndex(1); filterField.setEnabled(contribModel.getRowCount() > 0); diff --git a/app/src/cc/arduino/contributions/ui/InstallerJDialog.java b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java index a95d1c434..e60a6c45b 100644 --- a/app/src/cc/arduino/contributions/ui/InstallerJDialog.java +++ b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java @@ -111,7 +111,7 @@ public abstract class InstallerJDialog extends JDialog { filtersContainer = new JPanel(); filtersContainer.setLayout(new BoxLayout(filtersContainer, BoxLayout.X_AXIS)); filtersContainer.add(Box.createHorizontalStrut(5)); - filtersContainer.add(new JLabel(_("Type:"))); + filtersContainer.add(new JLabel(_("Type"))); filtersContainer.add(Box.createHorizontalStrut(5)); filtersContainer.add(categoryChooser); filtersContainer.add(Box.createHorizontalStrut(5)); diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java index 0e33a309e..b67329762 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java @@ -58,8 +58,6 @@ public abstract class ContributedLibrary extends DownloadableContribution { public abstract String getSentence(); - public abstract String getSupportLevel(); - public abstract List getArchitectures(); public abstract List getTypes(); @@ -91,8 +89,7 @@ public abstract class ContributedLibrary extends DownloadableContribution { * @return */ public boolean supportsArchitecture(String reqArch) { - return getArchitectures().contains(reqArch) || - getArchitectures().contains("*"); + return getArchitectures().contains(reqArch) || getArchitectures().contains("*"); } /** diff --git a/arduino-core/src/processing/app/packages/LegacyUserLibrary.java b/arduino-core/src/processing/app/packages/LegacyUserLibrary.java index 2791fc6b4..b98aeb621 100644 --- a/arduino-core/src/processing/app/packages/LegacyUserLibrary.java +++ b/arduino-core/src/processing/app/packages/LegacyUserLibrary.java @@ -123,8 +123,4 @@ public class LegacyUserLibrary extends UserLibrary { return "LegacyLibrary:" + name + "\n"; } - @Override - public String getSupportLevel() { - return "Unsupported"; - } } diff --git a/arduino-core/src/processing/app/packages/UserLibrary.java b/arduino-core/src/processing/app/packages/UserLibrary.java index 07965fc65..b50b5cccf 100644 --- a/arduino-core/src/processing/app/packages/UserLibrary.java +++ b/arduino-core/src/processing/app/packages/UserLibrary.java @@ -278,8 +278,4 @@ public class UserLibrary extends ContributedLibrary { return res; } - @Override - public String getSupportLevel() { - return "Unsupported"; - } }