rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-04-06 21:57:57 +02:00
Code Issues Releases Activity

Libraries: fixed incorrect handling of null types

Browse Source
This commit is contained in:
Federico Fissore 2015-05-19 16:26:03 +02:00
parent f13fe9a4f7
commit 9191442aea
3 changed files with 14 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java
View File

@ -16,6 +16,12 @@ public class LibraryByTypeComparator implements Comparator<ContributedLibrary> {
@Override @Override
public int compare(ContributedLibrary o1, ContributedLibrary o2) { public int compare(ContributedLibrary o1, ContributedLibrary o2) {
if (o1.getTypes() == null) {
return 1;
}
if (o2.getTypes() == null) {
return -1;
}
return libraryTypeComparator.compare(o1.getTypes().get(0), o2.getTypes().get(0)); return libraryTypeComparator.compare(o1.getTypes().get(0), o2.getTypes().get(0));
} }

6
app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java
View File

@ -6,6 +6,12 @@ public class LibraryOfSameTypeComparator implements Comparator<ContributedLibrar
@Override @Override
public int compare(ContributedLibrary o1, ContributedLibrary o2) { public int compare(ContributedLibrary o1, ContributedLibrary o2) {
if (o1.getTypes() == null) {
return 1;
}
if (o2.getTypes() == null) {
return -1;
}
if (!o1.getTypes().get(0).equals(o2.getTypes().get(0))) { if (!o1.getTypes().get(0).equals(o2.getTypes().get(0))) {
return 0; return 0;
} }

64
arduino-core/src/processing/app/packages/LegacyUserLibrary.java
View File

@ -32,8 +32,6 @@ import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import cc.arduino.contributions.libraries.ContributedLibraryReference;
public class LegacyUserLibrary extends UserLibrary { public class LegacyUserLibrary extends UserLibrary {
private String name; private String name;
@ -45,6 +43,8 @@ public class LegacyUserLibrary extends UserLibrary {
res.setInstalled(true); res.setInstalled(true);
res.layout = LibraryLayout.FLAT; res.layout = LibraryLayout.FLAT;
res.name = libFolder.getName(); res.name = libFolder.getName();
res.setTypes(Arrays.asList("Contributed"));
res.setCategory("Uncategorized");
return res; return res;
} }
@ -58,66 +58,6 @@ public class LegacyUserLibrary extends UserLibrary {
return Arrays.asList("*"); return Arrays.asList("*");
} }
@Override
public String getAuthor() {
return null;
}
@Override
public String getParagraph() {
return null;
}
@Override
public String getSentence() {
return null;
}
@Override
public String getWebsite() {
return null;
}
@Override
public String getCategory() {
return "Uncategorized";
}
@Override
public String getLicense() {
return null;
}
@Override
public String getVersion() {
return null;
}
@Override
public String getMaintainer() {
return null;
}
@Override
public String getChecksum() {
return null;
}
@Override
public long getSize() {
return 0;
}
@Override
public String getUrl() {
return null;
}
@Override
public List<ContributedLibraryReference> getRequires() {
return null;
}
@Override @Override
public String toString() { public String toString() {
return "LegacyLibrary:" + name + "\n"; return "LegacyLibrary:" + name + "\n";