From 9f15b0d7ab2ca480516b9eda1bc206c58ae38431 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 17 Jan 2018 17:22:34 +0100 Subject: [PATCH] Removed TypePredicate --- .../libraries/LibrariesIndexer.java | 3 +- .../libraries/filters/TypePredicate.java | 49 ------------------- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 arduino-core/src/cc/arduino/contributions/libraries/filters/TypePredicate.java diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java index c21a8e91b..8e90cc388 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java @@ -30,7 +30,6 @@ package cc.arduino.contributions.libraries; import cc.arduino.Constants; -import cc.arduino.contributions.libraries.filters.TypePredicate; import cc.arduino.contributions.packages.ContributedPlatform; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; @@ -130,7 +129,7 @@ public class LibrariesIndexer { } installedLibraries.stream() // - .filter(new TypePredicate("Contributed")) // + .filter(l -> l.getTypes().contains("Contributed")) // .filter(l -> l.getLocation() == Location.CORE || l.getLocation() == Location.REFERENCED_CORE) // .forEach(l -> { ContributedPlatform platform = BaseNoGui.indexer.getPlatformByFolder(l.getInstalledFolder()); diff --git a/arduino-core/src/cc/arduino/contributions/libraries/filters/TypePredicate.java b/arduino-core/src/cc/arduino/contributions/libraries/filters/TypePredicate.java deleted file mode 100644 index 330fc03b3..000000000 --- a/arduino-core/src/cc/arduino/contributions/libraries/filters/TypePredicate.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of Arduino. - * - * Copyright 2015 Arduino LLC (http://www.arduino.cc/) - * - * Arduino is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As a special exception, you may use this file as part of a free software - * library without restriction. Specifically, if other files instantiate - * templates or use macros or inline functions from this file, or you compile - * this file and link it with other files to produce an executable, this - * file does not by itself cause the resulting executable to be covered by - * the GNU General Public License. This exception does not however - * invalidate any other reasons why the executable file might be covered by - * the GNU General Public License. - */ - -package cc.arduino.contributions.libraries.filters; - -import processing.app.packages.UserLibrary; - -import java.util.function.Predicate; - -public class TypePredicate implements Predicate { - - private final String type; - - public TypePredicate(String type) { - this.type = type; - } - - @Override - public boolean test(UserLibrary input) { - return input.getTypes().contains(type); - } - -}