rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Merge pull request #11096 from facchinm/loose_filter_on_boards

Browse Source 
Board Manager: searching returns also near matches
This commit is contained in:
Cristian Maglie 2021-05-11 14:50:55 +02:00 committed by GitHub
commit 9b509c06f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
View File

@ -60,8 +60,17 @@ public class ContributionIndexTableModel
private void updateContributions() {
contributions.clear();
// Generate ContributedPlatformReleases from all platform releases
for (ContributedPackage pack : BaseNoGui.indexer.getPackages()) {
for (ContributedPlatform platform : pack.getPlatforms()) {
addContribution(platform);
}
}
// Filter ContributedPlatformReleases based on search terms
contributions.removeIf(releases -> {
for (ContributedPlatform platform : releases.releases) {
String compoundTargetSearchText = platform.getName() + "\n"
+ platform.getBoards().stream()
.map(ContributedBoard::getName)
@ -71,9 +80,12 @@ public class ContributionIndexTableModel
}
if (!stringContainsAll(compoundTargetSearchText, filters))
continue;
addContribution(platform);
return false;
}
}
return true;
});
// Sort ContributedPlatformReleases and put deprecated platforms to the bottom
Collections.sort(contributions, (x,y)-> {
if (x.isDeprecated() != y.isDeprecated()) {
return x.isDeprecated() ? 1 : -1;
@ -86,6 +98,7 @@ public class ContributionIndexTableModel
}
return x1.getName().compareToIgnoreCase(y1.getName());
});
fireTableDataChanged();
}
@ -110,12 +123,12 @@ public class ContributionIndexTableModel
private void addContribution(ContributedPlatform platform) {
for (ContributedPlatformReleases contribution : contributions) {
if (!contribution.shouldContain(platform))
if (!contribution.shouldContain(platform)) {
continue;
}
contribution.add(platform);
return;
}
contributions.add(new ContributedPlatformReleases(platform));
}