mirror of https://github.com/noisymime/Arduino.git
Useless DropdownBuiltInLibrariesItem removed
Moved LibraryInstaller from app to arduino-core Moved InstallerJDialogUncaughtExceptionHandler to the generic contributions.ui package
This commit is contained in:
parent
9b3ee714c7
commit
6d46bd0bde
|
@ -1,55 +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.ui;
|
|
||||||
|
|
||||||
import cc.arduino.contributions.filters.BuiltInPredicate;
|
|
||||||
import cc.arduino.contributions.packages.DownloadableContribution;
|
|
||||||
import cc.arduino.contributions.ui.DropdownItem;
|
|
||||||
import com.google.common.base.Predicate;
|
|
||||||
|
|
||||||
import static processing.app.I18n._;
|
|
||||||
|
|
||||||
public class DropdownBuiltInLibrariesItem implements DropdownItem<DownloadableContribution> {
|
|
||||||
|
|
||||||
public String toString() {
|
|
||||||
return _("Built-in");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Predicate<DownloadableContribution> getFilterPredicate() {
|
|
||||||
return new BuiltInPredicate();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
return obj instanceof DropdownBuiltInLibrariesItem;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -30,8 +30,9 @@ package cc.arduino.contributions.libraries.ui;
|
||||||
|
|
||||||
import cc.arduino.contributions.libraries.ContributedLibrary;
|
import cc.arduino.contributions.libraries.ContributedLibrary;
|
||||||
import cc.arduino.contributions.libraries.LibrariesIndexer;
|
import cc.arduino.contributions.libraries.LibrariesIndexer;
|
||||||
|
import cc.arduino.contributions.libraries.LibraryInstaller;
|
||||||
import cc.arduino.contributions.packages.DownloadableContribution;
|
import cc.arduino.contributions.packages.DownloadableContribution;
|
||||||
import cc.arduino.contributions.packages.ui.InstallerJDialogUncaughtExceptionHandler;
|
import cc.arduino.contributions.ui.InstallerJDialogUncaughtExceptionHandler;
|
||||||
import cc.arduino.contributions.ui.*;
|
import cc.arduino.contributions.ui.*;
|
||||||
import cc.arduino.utils.Progress;
|
import cc.arduino.utils.Progress;
|
||||||
import com.google.common.base.Predicate;
|
import com.google.common.base.Predicate;
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
*/
|
*/
|
||||||
package cc.arduino.contributions.packages.ui;
|
package cc.arduino.contributions.packages.ui;
|
||||||
|
|
||||||
|
import cc.arduino.contributions.ui.InstallerJDialogUncaughtExceptionHandler;
|
||||||
import cc.arduino.contributions.packages.ContributedPlatform;
|
import cc.arduino.contributions.packages.ContributedPlatform;
|
||||||
import cc.arduino.contributions.packages.ContributionInstaller;
|
import cc.arduino.contributions.packages.ContributionInstaller;
|
||||||
import cc.arduino.contributions.packages.ContributionsIndexer;
|
import cc.arduino.contributions.packages.ContributionsIndexer;
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
* the GNU General Public License.
|
* the GNU General Public License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package cc.arduino.contributions.packages.ui;
|
package cc.arduino.contributions.ui;
|
||||||
|
|
||||||
import cc.arduino.contributions.ui.InstallerJDialog;
|
import cc.arduino.contributions.ui.InstallerJDialog;
|
||||||
|
|
|
@ -25,7 +25,7 @@ package processing.app;
|
||||||
import cc.arduino.contributions.VersionHelper;
|
import cc.arduino.contributions.VersionHelper;
|
||||||
import cc.arduino.contributions.libraries.ContributedLibrary;
|
import cc.arduino.contributions.libraries.ContributedLibrary;
|
||||||
import cc.arduino.contributions.libraries.LibrariesIndexer;
|
import cc.arduino.contributions.libraries.LibrariesIndexer;
|
||||||
import cc.arduino.contributions.libraries.ui.LibraryInstaller;
|
import cc.arduino.contributions.libraries.LibraryInstaller;
|
||||||
import cc.arduino.contributions.libraries.ui.LibraryManagerUI;
|
import cc.arduino.contributions.libraries.ui.LibraryManagerUI;
|
||||||
import cc.arduino.contributions.packages.ContributedPlatform;
|
import cc.arduino.contributions.packages.ContributedPlatform;
|
||||||
import cc.arduino.contributions.packages.ContributionInstaller;
|
import cc.arduino.contributions.packages.ContributionInstaller;
|
||||||
|
|
|
@ -26,10 +26,8 @@
|
||||||
* invalidate any other reasons why the executable file might be covered by
|
* invalidate any other reasons why the executable file might be covered by
|
||||||
* the GNU General Public License.
|
* the GNU General Public License.
|
||||||
*/
|
*/
|
||||||
package cc.arduino.contributions.libraries.ui;
|
package cc.arduino.contributions.libraries;
|
||||||
|
|
||||||
import cc.arduino.contributions.libraries.ContributedLibrary;
|
|
||||||
import cc.arduino.contributions.libraries.LibrariesIndexer;
|
|
||||||
import cc.arduino.contributions.packages.DownloadableContributionsDownloader;
|
import cc.arduino.contributions.packages.DownloadableContributionsDownloader;
|
||||||
import cc.arduino.utils.ArchiveExtractor;
|
import cc.arduino.utils.ArchiveExtractor;
|
||||||
import cc.arduino.utils.MultiStepProgress;
|
import cc.arduino.utils.MultiStepProgress;
|
Loading…
Reference in New Issue