From 9191442aeaf7af472684082d895ab2711c85cfaf Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Tue, 19 May 2015 16:26:03 +0200
Subject: [PATCH] Libraries: fixed incorrect handling of null types

---
 .../libraries/LibraryByTypeComparator.java    |  6 ++
 .../LibraryOfSameTypeComparator.java          |  6 ++
 .../app/packages/LegacyUserLibrary.java       | 64 +------------------
 3 files changed, 14 insertions(+), 62 deletions(-)

diff --git a/app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java b/app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java
index f85e8cfdf..55e33e232 100644
--- a/app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java
+++ b/app/src/cc/arduino/contributions/libraries/LibraryByTypeComparator.java
@@ -16,6 +16,12 @@ public class LibraryByTypeComparator implements Comparator<ContributedLibrary> {
 
   @Override
   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));
   }
 
diff --git a/app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java b/app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java
index 171f07db0..ac4033907 100644
--- a/app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java
+++ b/app/src/cc/arduino/contributions/libraries/LibraryOfSameTypeComparator.java
@@ -6,6 +6,12 @@ public class LibraryOfSameTypeComparator implements Comparator<ContributedLibrar
 
   @Override
   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))) {
       return 0;
     }
diff --git a/arduino-core/src/processing/app/packages/LegacyUserLibrary.java b/arduino-core/src/processing/app/packages/LegacyUserLibrary.java
index b98aeb621..56a86ccb9 100644
--- a/arduino-core/src/processing/app/packages/LegacyUserLibrary.java
+++ b/arduino-core/src/processing/app/packages/LegacyUserLibrary.java
@@ -32,8 +32,6 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
-import cc.arduino.contributions.libraries.ContributedLibraryReference;
-
 public class LegacyUserLibrary extends UserLibrary {
 
   private String name;
@@ -45,6 +43,8 @@ public class LegacyUserLibrary extends UserLibrary {
     res.setInstalled(true);
     res.layout = LibraryLayout.FLAT;
     res.name = libFolder.getName();
+    res.setTypes(Arrays.asList("Contributed"));
+    res.setCategory("Uncategorized");
     return res;
   }
 
@@ -58,66 +58,6 @@ public class LegacyUserLibrary extends UserLibrary {
     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
   public String toString() {
     return "LegacyLibrary:" + name + "\n";