Commit 46880bd

committed

Board Manager: searching returns also near matches

The original filter would only populate the contribution list with perfect matches. Previously, if a core was installed but didn't match the search it wouldn't appear in the results (due to a board being added or the description changed); the user could then install (not upgrade) the core, triggering a confusing situation. When moving to arduino-cli backend we should take care of this issue, at least visually (the cli logic would correctly update/downgrade the core)

1 parent f4e8a91 commit 46880bdCopy full SHA for 46880bd

File tree

2 files changed

+22

-2

lines changed

app/src/cc/arduino/contributions/packages/ui
- ContributedPlatformReleases.java
- ContributionIndexTableModel.java

2 files changed

+22

-2

lines changed

`‎app/src/cc/arduino/contributions/packages/ui/ContributedPlatformReleases.java‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,12 @@ public boolean shouldContain(ContributedPlatform platform) {`
`59`	`59`	`return platform.getArchitecture().equals(arch);`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ public boolean contains(ContributedPlatform platform) {`
	`63`	`+ return (platform.getParentPackage().equals(packager)`
	`64`	`+ && platform.getArchitecture().equals(arch)`
	`65`	`+ && versions.contains(platform.getParsedVersion()));`
	`66`	`+ }`
	`67`	`+`
`62`	`68`	`public void add(ContributedPlatform platform) {`
`63`	`69`	`releases.add(platform);`
`64`	`70`	`String version = platform.getParsedVersion();`

`‎app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java‎`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,11 +65,21 @@ private void updateContributions() {`
`65`	`65`	`+ platform.getBoards().stream()`
`66`	`66`	`.map(ContributedBoard::getName)`
`67`	`67`	`.collect(Collectors.joining(" "));`
	`68`	`+`
	`69`	`+ // Add all the versions of the same core, even if there's no match`
	`70`	`+ for (ContributedPlatformReleases contribution : contributions) {`
	`71`	`+ if (contribution.shouldContain(platform)) {`
	`72`	`+ addContribution(platform);`
	`73`	`+ continue;`
	`74`	`+ }`
	`75`	`+ }`
	`76`	`+`
`68`	`77`	`if (!filter.test(platform)) {`
`69`	`78`	`continue;`
`70`	`79`	`}`
`71`	`80`	`if (!stringContainsAll(compoundTargetSearchText, filters))`
`72`	`81`	`continue;`
	`82`	`+`
`73`	`83`	`addContribution(platform);`
`74`	`84`	`}`
`75`	`85`	`}`
`@@ -97,12 +107,16 @@ private boolean stringContainsAll(String string, String set[]) {`
`97`	`107`
`98`	`108`	`private void addContribution(ContributedPlatform platform) {`
`99`	`109`	`for (ContributedPlatformReleases contribution : contributions) {`
`100`		`- if (!contribution.shouldContain(platform))`
	`110`	`+ if (!contribution.shouldContain(platform)) {`
`101`	`111`	`continue;`
	`112`	`+ }`
	`113`	`+ if (contribution.contains(platform)) {`
	`114`	`+ // no duplicates`
	`115`	`+ return;`
	`116`	`+ }`
`102`	`117`	`contribution.add(platform);`
`103`	`118`	`return;`
`104`	`119`	`}`
`105`		`-`
`106`	`120`	`contributions.add(new ContributedPlatformReleases(platform));`
`107`	`121`	`}`
`108`	`122`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 46880bd

File tree

2 files changed

2 files changed

`‎app/src/cc/arduino/contributions/packages/ui/ContributedPlatformReleases.java‎`

`‎app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java‎`

0 commit comments