rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Removed useless double sort

Browse Source 
Removed also the weird LibraryByTypeComparator comparator that is no
more used.
This commit is contained in:
Cristian Maglie 2018-01-18 12:15:53 +01:00
parent 9f15b0d7ab
commit 8fa45a3a07
2 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,63 +0,0 @@
/*
* This file is part of Arduino.
*
* Copyright 2015 Arduino LLC (http://www.arduino.cc/)
*
* Arduino is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* As a special exception, you may use this file as part of a free software
* library without restriction. Specifically, if other files instantiate
* templates or use macros or inline functions from this file, or you compile
* this file and link it with other files to produce an executable, this
* file does not by itself cause the resulting executable to be covered by
* the GNU General Public License. This exception does not however
* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*/
package cc.arduino.contributions.libraries;
import java.util.Comparator;
import processing.app.packages.UserLibrary;
public class LibraryByTypeComparator implements Comparator<UserLibrary> {
private final LibraryTypeComparator libraryTypeComparator;
public LibraryByTypeComparator() {
this(new LibraryTypeComparator());
}
public LibraryByTypeComparator(LibraryTypeComparator libraryTypeComparator) {
this.libraryTypeComparator = libraryTypeComparator;
}
@Override
public int compare(UserLibrary o1, UserLibrary o2) {
if (o1.getTypes().isEmpty() && o2.getTypes().isEmpty()) {
return 0;
}
if (o1.getTypes().isEmpty()) {
return 1;
}
if (o2.getTypes().isEmpty()) {
return -1;
}
return libraryTypeComparator.compare(o1.getTypes().get(0),
o2.getTypes().get(0));
}
}

1
app/src/processing/app/Base.java
View File

@ -1061,7 +1061,6 @@ public class Base {
private LibraryList getSortedLibraries() {
LibraryList installedLibraries = BaseNoGui.librariesIndexer.getInstalledLibraries();
Collections.sort(installedLibraries, new LibraryByTypeComparator());
Collections.sort(installedLibraries, new LibraryOfSameTypeComparator());
return installedLibraries;
}