Commit 9191442

author

Federico Fissore

committed

Libraries: fixed incorrect handling of null types

1 parent f13fe9a commit 9191442Copy full SHA for 9191442

File tree

3 files changed

+14

-62

lines changed

app/src/cc/arduino/contributions/libraries
- LibraryByTypeComparator.java
- LibraryOfSameTypeComparator.java
arduino-core/src/processing/app/packages
- LegacyUserLibrary.java

3 files changed

+14

-62

lines changed

`‎app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,12 @@ public LibraryByTypeComparator(LibraryTypeComparator libraryTypeComparator) {`
`16`	`16`
`17`	`17`	`@Override`
`18`	`18`	`public int compare(ContributedLibrary o1, ContributedLibrary o2) {`
	`19`	`+ if (o1.getTypes() == null) {`
	`20`	`+ return 1;`
	`21`	`+ }`
	`22`	`+ if (o2.getTypes() == null) {`
	`23`	`+ return -1;`
	`24`	`+ }`
`19`	`25`	`return libraryTypeComparator.compare(o1.getTypes().get(0), o2.getTypes().get(0));`
`20`	`26`	`}`
`21`	`27`

`‎app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,12 @@ public class LibraryOfSameTypeComparator implements Comparator<ContributedLibrar`
`6`	`6`
`7`	`7`	`@Override`
`8`	`8`	`public int compare(ContributedLibrary o1, ContributedLibrary o2) {`
	`9`	`+ if (o1.getTypes() == null) {`
	`10`	`+ return 1;`
	`11`	`+ }`
	`12`	`+ if (o2.getTypes() == null) {`
	`13`	`+ return -1;`
	`14`	`+ }`
`9`	`15`	`if (!o1.getTypes().get(0).equals(o2.getTypes().get(0))) {`
`10`	`16`	`return 0;`
`11`	`17`	`}`

`‎arduino-core/src/processing/app/packages/LegacyUserLibrary.java`

Lines changed: 2 additions & 62 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@`
`32`	`32`	`import java.util.Arrays;`
`33`	`33`	`import java.util.List;`
`34`	`34`
`35`		`-import cc.arduino.contributions.libraries.ContributedLibraryReference;`
`36`		`-`
`37`	`35`	`public class LegacyUserLibrary extends UserLibrary {`
`38`	`36`
`39`	`37`	`private String name;`
`@@ -45,6 +43,8 @@ public static LegacyUserLibrary create(File libFolder) {`
`45`	`43`	`res.setInstalled(true);`
`46`	`44`	`res.layout = LibraryLayout.FLAT;`
`47`	`45`	`res.name = libFolder.getName();`
	`46`	`+ res.setTypes(Arrays.asList("Contributed"));`
	`47`	`+ res.setCategory("Uncategorized");`
`48`	`48`	`return res;`
`49`	`49`	`}`
`50`	`50`
`@@ -58,66 +58,6 @@ public List<String> getArchitectures() {`
`58`	`58`	`return Arrays.asList("*");`
`59`	`59`	`}`
`60`	`60`
`61`		`- @Override`
`62`		`- public String getAuthor() {`
`63`		`- return null;`
`64`		`- }`
`65`		`-`
`66`		`- @Override`
`67`		`- public String getParagraph() {`
`68`		`- return null;`
`69`		`- }`
`70`		`-`
`71`		`- @Override`
`72`		`- public String getSentence() {`
`73`		`- return null;`
`74`		`- }`
`75`		`-`
`76`		`- @Override`
`77`		`- public String getWebsite() {`
`78`		`- return null;`
`79`		`- }`
`80`		`-`
`81`		`- @Override`
`82`		`- public String getCategory() {`
`83`		`- return "Uncategorized";`
`84`		`- }`
`85`		`-`
`86`		`- @Override`
`87`		`- public String getLicense() {`
`88`		`- return null;`
`89`		`- }`
`90`		`-`
`91`		`- @Override`
`92`		`- public String getVersion() {`
`93`		`- return null;`
`94`		`- }`
`95`		`-`
`96`		`- @Override`
`97`		`- public String getMaintainer() {`
`98`		`- return null;`
`99`		`- }`
`100`		`-`
`101`		`- @Override`
`102`		`- public String getChecksum() {`
`103`		`- return null;`
`104`		`- }`
`105`		`-`
`106`		`- @Override`
`107`		`- public long getSize() {`
`108`		`- return 0;`
`109`		`- }`
`110`		`-`
`111`		`- @Override`
`112`		`- public String getUrl() {`
`113`		`- return null;`
`114`		`- }`
`115`		`-`
`116`		`- @Override`
`117`		`- public List<ContributedLibraryReference> getRequires() {`
`118`		`- return null;`
`119`		`- }`
`120`		`-`
`121`	`61`	`@Override`
`122`	`62`	`public String toString() {`
`123`	`63`	`return "LegacyLibrary:" + name + "\n";`

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 9191442

File tree

3 files changed

3 files changed

`‎app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java`

`‎app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java`

`‎arduino-core/src/processing/app/packages/LegacyUserLibrary.java`

0 commit comments