arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-09 22:24:14 +03:00
Code Activity

Libraries bundled with cores will take the type of that core, instead of relying on an undocumented 'types' property. Fixes #2875

Browse Source
This commit is contained in:
Federico Fissore
2015-05-19 12:24:11 +02:00
parent 65e0d8b547
commit 42b07f0337
14 changed files with 84 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/cc/arduino/contributions/libraries/filters/TypePredicate.java
View File

@@ -1,53 +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 cc.arduino.contributions.libraries.ContributedLibrary;
import com.google.common.base.Predicate;
public class TypePredicate implements Predicate<ContributedLibrary> {
private final String type;
public TypePredicate(String type) {
this.type = type;
}
@Override
public boolean apply(ContributedLibrary input) {
return input.getTypes() != null && input.getTypes().contains(type);
}
@Override
public boolean equals(Object obj) {
return obj instanceof TypePredicate && ((TypePredicate) obj).type.equals(type);
}
}

2
app/src/processing/app/Base.java
View File

@@ -397,7 +397,7 @@ public class Base {
System.exit(0);
} else if (parser.isInstallLibrary()) {
LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder());
LibrariesIndexer indexer = new LibrariesIndexer(BaseNoGui.getSettingsFolder(), new ContributionsIndexer(BaseNoGui.getSettingsFolder()));
LibraryInstaller installer = new LibraryInstaller(indexer) {
private String lastStatus = "";