rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Package names refactoring: contributions is the main package, libs and cores are subpackages

Browse Source
This commit is contained in:
Federico Fissore 2015-03-17 16:17:50 +01:00
parent fe85083f0b
commit 17d3729426
51 changed files with 125 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/cc/arduino/ui/filters/NoopPredicate.java → app/src/cc/arduino/contributions/filters/NoopPredicate.java
View File

@ -1,4 +1,4 @@
package cc.arduino.ui.filters; package cc.arduino.contributions.filters;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;

4
app/src/cc/arduino/libraries/contributions/ui/filters/BuiltInPredicate.java → app/src/cc/arduino/contributions/libraries/filters/BuiltInPredicate.java
View File

@ -1,6 +1,6 @@
package cc.arduino.libraries.contributions.ui.filters; package cc.arduino.contributions.libraries.filters;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
public class BuiltInPredicate implements Predicate<ContributedLibrary> { public class BuiltInPredicate implements Predicate<ContributedLibrary> {

4
app/src/cc/arduino/libraries/contributions/ui/filters/CategoryPredicate.java → app/src/cc/arduino/contributions/libraries/filters/CategoryPredicate.java
View File

@ -1,6 +1,6 @@
package cc.arduino.libraries.contributions.ui.filters; package cc.arduino.contributions.libraries.filters;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
public class CategoryPredicate implements Predicate<ContributedLibrary> { public class CategoryPredicate implements Predicate<ContributedLibrary> {

4
app/src/cc/arduino/libraries/contributions/ui/filters/InstalledPredicate.java → app/src/cc/arduino/contributions/libraries/filters/InstalledPredicate.java
View File

@ -1,6 +1,6 @@
package cc.arduino.libraries.contributions.ui.filters; package cc.arduino.contributions.libraries.filters;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
public class InstalledPredicate implements Predicate<ContributedLibrary> { public class InstalledPredicate implements Predicate<ContributedLibrary> {

4
app/src/cc/arduino/libraries/contributions/ui/filters/OnlyUpstreamReleasePredicate.java → app/src/cc/arduino/contributions/libraries/filters/OnlyUpstreamReleasePredicate.java
View File

@ -1,6 +1,6 @@
package cc.arduino.libraries.contributions.ui.filters; package cc.arduino.contributions.libraries.filters;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import processing.app.packages.UserLibrary; import processing.app.packages.UserLibrary;

23
app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java → app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java
View File

@ -26,16 +26,15 @@
* 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.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.ContributedLibraryComparator; import cc.arduino.contributions.libraries.ContributedLibraryComparator;
import cc.arduino.libraries.contributions.ui.LibrariesIndexTableModel.ContributedLibraryReleases; import cc.arduino.contributions.libraries.filters.BuiltInPredicate;
import cc.arduino.libraries.contributions.ui.filters.BuiltInPredicate; import cc.arduino.contributions.libraries.filters.InstalledPredicate;
import cc.arduino.libraries.contributions.ui.filters.InstalledPredicate; import cc.arduino.contributions.libraries.filters.OnlyUpstreamReleasePredicate;
import cc.arduino.libraries.contributions.ui.filters.OnlyUpstreamReleasePredicate; import cc.arduino.contributions.VersionComparator;
import cc.arduino.packages.contributions.VersionComparator; import cc.arduino.contributions.ui.InstallerTableCell;
import cc.arduino.ui.InstallerTableCell;
import cc.arduino.utils.ReverseComparator; import cc.arduino.utils.ReverseComparator;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
@ -236,7 +235,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
return component; return component;
} }
private ContributedLibraryReleases editorValue; private LibrariesIndexTableModel.ContributedLibraryReleases editorValue;
private JTable parentTable; private JTable parentTable;
@Override @Override
@ -249,7 +248,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
boolean isSelected, int row, boolean isSelected, int row,
int column) { int column) {
parentTable = table; parentTable = table;
editorValue = (ContributedLibraryReleases) value; editorValue = (LibrariesIndexTableModel.ContributedLibraryReleases) value;
setEnabled(true); setEnabled(true);
final ContributedLibrary installedLibrary = editorValue.getInstalled(); final ContributedLibrary installedLibrary = editorValue.getInstalled();
@ -305,7 +304,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
} }
private Component getUpdatedCellComponent(Object value, boolean isSelected, int row, boolean hasBuiltInRelease) { private Component getUpdatedCellComponent(Object value, boolean isSelected, int row, boolean hasBuiltInRelease) {
ContributedLibraryReleases releases = (ContributedLibraryReleases) value; LibrariesIndexTableModel.ContributedLibraryReleases releases = (LibrariesIndexTableModel.ContributedLibraryReleases) value;
//FIXME: happens on macosx, don't know why //FIXME: happens on macosx, don't know why
if (releases == null) { if (releases == null) {

8
app/src/cc/arduino/libraries/contributions/ui/DropdownAllLibrariesItem.java → app/src/cc/arduino/contributions/libraries/ui/DropdownAllLibrariesItem.java
View File

@ -1,8 +1,8 @@
package cc.arduino.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.ui.filters.NoopPredicate; import cc.arduino.contributions.filters.NoopPredicate;
import cc.arduino.ui.DropdownItem; import cc.arduino.contributions.ui.DropdownItem;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import static processing.app.I18n._; import static processing.app.I18n._;

8
app/src/cc/arduino/libraries/contributions/ui/DropdownBuiltInLibrariesItem.java → app/src/cc/arduino/contributions/libraries/ui/DropdownBuiltInLibrariesItem.java
View File

@ -1,8 +1,8 @@
package cc.arduino.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.ui.filters.BuiltInPredicate; import cc.arduino.contributions.libraries.filters.BuiltInPredicate;
import cc.arduino.ui.DropdownItem; import cc.arduino.contributions.ui.DropdownItem;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import static processing.app.I18n._; import static processing.app.I18n._;

8
app/src/cc/arduino/libraries/contributions/ui/DropdownInstalledLibrariesItem.java → app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibrariesItem.java
View File

@ -1,8 +1,8 @@
package cc.arduino.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.ui.filters.InstalledPredicate; import cc.arduino.contributions.libraries.filters.InstalledPredicate;
import cc.arduino.ui.DropdownItem; import cc.arduino.contributions.ui.DropdownItem;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import static processing.app.I18n._; import static processing.app.I18n._;

8
app/src/cc/arduino/libraries/contributions/ui/DropdownLibraryOfCategoryItem.java → app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java
View File

@ -1,8 +1,8 @@
package cc.arduino.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.ui.filters.CategoryPredicate; import cc.arduino.contributions.libraries.filters.CategoryPredicate;
import cc.arduino.ui.DropdownItem; import cc.arduino.contributions.ui.DropdownItem;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
public class DropdownLibraryOfCategoryItem implements DropdownItem<ContributedLibrary> { public class DropdownLibraryOfCategoryItem implements DropdownItem<ContributedLibrary> {

12
app/src/cc/arduino/libraries/contributions/ui/LibrariesIndexTableModel.java → app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java
View File

@ -26,13 +26,13 @@
* 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.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.LibrariesIndexer; import cc.arduino.contributions.libraries.LibrariesIndexer;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributedPlatform;
import cc.arduino.packages.contributions.VersionComparator; import cc.arduino.contributions.VersionComparator;
import cc.arduino.ui.FilteredAbstractTableModel; import cc.arduino.contributions.ui.FilteredAbstractTableModel;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Collections2; import com.google.common.collect.Collections2;

8
app/src/cc/arduino/libraries/contributions/ui/LibraryInstaller.java → app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java
View File

@ -26,7 +26,7 @@
* 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.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import static processing.app.I18n._; import static processing.app.I18n._;
@ -35,9 +35,9 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import processing.app.helpers.FileUtils; import processing.app.helpers.FileUtils;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.LibrariesIndexer; import cc.arduino.contributions.libraries.LibrariesIndexer;
import cc.arduino.packages.contributions.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;
import cc.arduino.utils.Progress; import cc.arduino.utils.Progress;

14
app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java → app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java
View File

@ -26,14 +26,14 @@
* 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.libraries.contributions.ui; package cc.arduino.contributions.libraries.ui;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.LibrariesIndexer; import cc.arduino.contributions.libraries.LibrariesIndexer;
import cc.arduino.packages.contributions.ui.InstallerJDialogUncaughtExceptionHandler; import cc.arduino.contributions.packages.ui.InstallerJDialogUncaughtExceptionHandler;
import cc.arduino.ui.FilteredAbstractTableModel; import cc.arduino.contributions.ui.FilteredAbstractTableModel;
import cc.arduino.ui.InstallerJDialog; import cc.arduino.contributions.ui.InstallerJDialog;
import cc.arduino.ui.InstallerTableCell; import cc.arduino.contributions.ui.InstallerTableCell;
import cc.arduino.utils.Progress; import cc.arduino.utils.Progress;
import javax.swing.*; import javax.swing.*;

4
app/src/cc/arduino/packages/contributions/ui/filters/CategoryPredicate.java → app/src/cc/arduino/contributions/packages/filters/CategoryPredicate.java
View File

@ -1,6 +1,6 @@
package cc.arduino.packages.contributions.ui.filters; package cc.arduino.contributions.packages.filters;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributedPlatform;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
public class CategoryPredicate implements Predicate<ContributedPlatform> { public class CategoryPredicate implements Predicate<ContributedPlatform> {

15
app/src/cc/arduino/packages/contributions/ui/ContributedPlatformTableCell.java → app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java
View File

@ -26,12 +26,11 @@
* 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.packages.contributions.ui; package cc.arduino.contributions.packages.ui;
import cc.arduino.packages.contributions.ContributedBoard; import cc.arduino.contributions.packages.ContributedBoard;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributedPlatform;
import cc.arduino.packages.contributions.ui.ContributionIndexTableModel.ContributedPlatformReleases; import cc.arduino.contributions.ui.InstallerTableCell;
import cc.arduino.ui.InstallerTableCell;
import processing.app.Base; import processing.app.Base;
import javax.swing.*; import javax.swing.*;
@ -201,7 +200,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell {
return component; return component;
} }
private ContributedPlatformReleases editorValue; private ContributionIndexTableModel.ContributedPlatformReleases editorValue;
private JTable parentTable; private JTable parentTable;
@Override @Override
@ -214,7 +213,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell {
boolean isSelected, int row, boolean isSelected, int row,
int column) { int column) {
parentTable = table; parentTable = table;
editorValue = (ContributedPlatformReleases) value; editorValue = (ContributionIndexTableModel.ContributedPlatformReleases) value;
setEnabled(true); setEnabled(true);
downgradeChooser.removeAllItems(); downgradeChooser.removeAllItems();
@ -236,7 +235,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell {
private Component getUpdatedCellComponent(Object value, boolean isSelected, private Component getUpdatedCellComponent(Object value, boolean isSelected,
int row) { int row) {
ContributedPlatformReleases releases = (ContributedPlatformReleases) value; ContributionIndexTableModel.ContributedPlatformReleases releases = (ContributionIndexTableModel.ContributedPlatformReleases) value;
ContributedPlatform selectedPlatform = releases.getSelected(); ContributedPlatform selectedPlatform = releases.getSelected();
ContributedPlatform installedPlatform = releases.getInstalled(); ContributedPlatform installedPlatform = releases.getInstalled();

10
app/src/cc/arduino/packages/contributions/ui/ContributionIndexTableModel.java → app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java
View File

@ -26,12 +26,12 @@
* 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.packages.contributions.ui; package cc.arduino.contributions.packages.ui;
import cc.arduino.packages.contributions.ContributedPackage; import cc.arduino.contributions.packages.ContributedPackage;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributedPlatform;
import cc.arduino.packages.contributions.ContributionsIndex; import cc.arduino.contributions.packages.ContributionsIndex;
import cc.arduino.ui.FilteredAbstractTableModel; import cc.arduino.contributions.ui.FilteredAbstractTableModel;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import java.util.ArrayList; import java.util.ArrayList;

16
app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java → app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java
View File

@ -26,16 +26,14 @@
* 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.packages.contributions.ui; package cc.arduino.contributions.packages.ui;
import cc.arduino.libraries.contributions.ui.DropdownLibraryOfCategoryItem; import cc.arduino.contributions.packages.ContributedPlatform;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributionInstaller;
import cc.arduino.packages.contributions.ContributionInstaller; import cc.arduino.contributions.packages.ContributionsIndexer;
import cc.arduino.packages.contributions.ContributionsIndexer; import cc.arduino.contributions.ui.FilteredAbstractTableModel;
import cc.arduino.libraries.contributions.ui.DropdownAllLibrariesItem; import cc.arduino.contributions.ui.InstallerJDialog;
import cc.arduino.ui.FilteredAbstractTableModel; import cc.arduino.contributions.ui.InstallerTableCell;
import cc.arduino.ui.InstallerJDialog;
import cc.arduino.ui.InstallerTableCell;
import cc.arduino.utils.Progress; import cc.arduino.utils.Progress;
import java.awt.*; import java.awt.*;

8
app/src/cc/arduino/packages/contributions/ui/DropdownAllCoresItem.java → app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java
View File

@ -1,8 +1,8 @@
package cc.arduino.packages.contributions.ui; package cc.arduino.contributions.packages.ui;
import cc.arduino.ui.filters.NoopPredicate; import cc.arduino.contributions.filters.NoopPredicate;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributedPlatform;
import cc.arduino.ui.DropdownItem; import cc.arduino.contributions.ui.DropdownItem;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import static processing.app.I18n._; import static processing.app.I18n._;

8
app/src/cc/arduino/packages/contributions/ui/DropdownCoreOfCategoryItem.java → app/src/cc/arduino/contributions/packages/ui/DropdownCoreOfCategoryItem.java
View File

@ -1,8 +1,8 @@
package cc.arduino.packages.contributions.ui; package cc.arduino.contributions.packages.ui;
import cc.arduino.packages.contributions.ContributedPlatform; import cc.arduino.contributions.packages.ContributedPlatform;
import cc.arduino.packages.contributions.ui.filters.CategoryPredicate; import cc.arduino.contributions.packages.filters.CategoryPredicate;
import cc.arduino.ui.DropdownItem; import cc.arduino.contributions.ui.DropdownItem;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
public class DropdownCoreOfCategoryItem implements DropdownItem<ContributedPlatform> { public class DropdownCoreOfCategoryItem implements DropdownItem<ContributedPlatform> {

4
app/src/cc/arduino/packages/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java → app/src/cc/arduino/contributions/packages/ui/InstallerJDialogUncaughtExceptionHandler.java
View File

@ -1,6 +1,6 @@
package cc.arduino.packages.contributions.ui; package cc.arduino.contributions.packages.ui;
import cc.arduino.ui.InstallerJDialog; import cc.arduino.contributions.ui.InstallerJDialog;
import javax.swing.*; import javax.swing.*;

2
app/src/cc/arduino/ui/DropdownItem.java → app/src/cc/arduino/contributions/ui/DropdownItem.java
View File

@ -1,4 +1,4 @@
package cc.arduino.ui; package cc.arduino.contributions.ui;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;

2
app/src/cc/arduino/ui/FilterJTextField.java → app/src/cc/arduino/contributions/ui/FilterJTextField.java
View File

@ -26,7 +26,7 @@
* 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.ui; package cc.arduino.contributions.ui;
import java.awt.Color; import java.awt.Color;
import java.awt.Font; import java.awt.Font;

3
app/src/cc/arduino/ui/FilteredAbstractTableModel.java → app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java
View File

@ -26,9 +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.ui; package cc.arduino.contributions.ui;
import cc.arduino.libraries.contributions.ContributedLibrary;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;

5
app/src/cc/arduino/ui/InstallerJDialog.java → app/src/cc/arduino/contributions/ui/InstallerJDialog.java
View File

@ -26,9 +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.ui; package cc.arduino.contributions.ui;
import cc.arduino.libraries.contributions.ContributedLibrary;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import processing.app.Base; import processing.app.Base;
import processing.app.Theme; import processing.app.Theme;
@ -45,7 +44,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import static cc.arduino.packages.contributions.ui.ContributionIndexTableModel.DESCRIPTION_COL; import static cc.arduino.contributions.packages.ui.ContributionIndexTableModel.DESCRIPTION_COL;
import static processing.app.I18n._; import static processing.app.I18n._;
public abstract class InstallerJDialog<T> extends JDialog { public abstract class InstallerJDialog<T> extends JDialog {

2
app/src/cc/arduino/ui/InstallerTableCell.java → app/src/cc/arduino/contributions/ui/InstallerTableCell.java
View File

@ -26,7 +26,7 @@
* 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.ui; package cc.arduino.contributions.ui;
import javax.swing.*; import javax.swing.*;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;

2
app/src/cc/arduino/ui/ProgressJProgressBar.java → app/src/cc/arduino/contributions/ui/ProgressJProgressBar.java
View File

@ -26,7 +26,7 @@
* 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.ui; package cc.arduino.contributions.ui;
import javax.swing.JProgressBar; import javax.swing.JProgressBar;

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

@ -22,11 +22,10 @@
package processing.app; package processing.app;
import cc.arduino.libraries.contributions.ui.LibraryManagerUI; import cc.arduino.contributions.libraries.ui.LibraryManagerUI;
import cc.arduino.packages.DiscoveryManager; import cc.arduino.packages.DiscoveryManager;
import cc.arduino.packages.contributions.ui.ContributionManagerUI; import cc.arduino.contributions.packages.ui.ContributionManagerUI;
import cc.arduino.view.SplashScreenHelper; import cc.arduino.view.SplashScreenHelper;
import org.apache.commons.lang3.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import processing.app.debug.TargetBoard; import processing.app.debug.TargetBoard;
import processing.app.debug.TargetPackage; import processing.app.debug.TargetPackage;

2
app/src/processing/app/syntax/PdeKeywords.java
View File

@ -30,7 +30,7 @@ import processing.app.legacy.PApplet;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
public class PdeKeywords extends CTokenMarker { public class PdeKeywords extends CTokenMarker {

2
app/test/cc/arduino/packages/contributions/HostDependentDownloadableContributionStub.java
View File

@ -1,5 +1,7 @@
package cc.arduino.packages.contributions; package cc.arduino.packages.contributions;
import cc.arduino.contributions.packages.HostDependentDownloadableContribution;
public class HostDependentDownloadableContributionStub extends HostDependentDownloadableContribution { public class HostDependentDownloadableContributionStub extends HostDependentDownloadableContribution {
@Override @Override
public String getHost() { public String getHost() {

2
arduino-core/src/cc/arduino/packages/contributions/VersionComparator.java → arduino-core/src/cc/arduino/contributions/VersionComparator.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions;
import com.github.zafarkhaja.semver.Version; import com.github.zafarkhaja.semver.Version;

4
arduino-core/src/cc/arduino/libraries/contributions/ContributedLibrary.java → arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java
View File

@ -26,9 +26,9 @@
* 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.libraries.contributions; package cc.arduino.contributions.libraries;
import cc.arduino.packages.contributions.DownloadableContribution; import cc.arduino.contributions.packages.DownloadableContribution;
import processing.app.I18n; import processing.app.I18n;
import java.util.Comparator; import java.util.Comparator;

4
arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryComparator.java → arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryComparator.java
View File

@ -1,6 +1,6 @@
package cc.arduino.libraries.contributions; package cc.arduino.contributions.libraries;
import cc.arduino.packages.contributions.VersionComparator; import cc.arduino.contributions.VersionComparator;
import java.util.Comparator; import java.util.Comparator;

2
arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryReference.java → arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java
View File

@ -26,7 +26,7 @@
* 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.libraries.contributions; package cc.arduino.contributions.libraries;
public abstract class ContributedLibraryReference { public abstract class ContributedLibraryReference {

2
arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndex.java → arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java
View File

@ -26,7 +26,7 @@
* 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.libraries.contributions; package cc.arduino.contributions.libraries;
import java.util.*; import java.util.*;

3
arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndexer.java → arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java
View File

@ -26,7 +26,7 @@
* 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.libraries.contributions; package cc.arduino.contributions.libraries;
import static processing.app.I18n._; import static processing.app.I18n._;
@ -44,7 +44,6 @@ import processing.app.packages.LegacyUserLibrary;
import processing.app.packages.LibraryList; import processing.app.packages.LibraryList;
import processing.app.packages.UserLibrary; import processing.app.packages.UserLibrary;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.mrbean.MrBeanModule; import com.fasterxml.jackson.module.mrbean.MrBeanModule;

2
arduino-core/src/cc/arduino/packages/contributions/ContributedBoard.java → arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
public interface ContributedBoard { public interface ContributedBoard {

4
arduino-core/src/cc/arduino/packages/contributions/ContributedPackage.java → arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java
View File

@ -26,7 +26,9 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import cc.arduino.contributions.VersionComparator;
import java.util.List; import java.util.List;

2
arduino-core/src/cc/arduino/packages/contributions/ContributedPlatform.java → arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;

2
arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPackage.java → arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;

2
arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPlatform.java → arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPlatform.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.io.File; import java.io.File;

2
arduino-core/src/cc/arduino/packages/contributions/ContributedTool.java → arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.util.List; import java.util.List;

2
arduino-core/src/cc/arduino/packages/contributions/ContributedToolReference.java → arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.util.Collection; import java.util.Collection;

2
arduino-core/src/cc/arduino/packages/contributions/ContributionInstaller.java → arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import cc.arduino.utils.ArchiveExtractor; import cc.arduino.utils.ArchiveExtractor;
import cc.arduino.utils.MultiStepProgress; import cc.arduino.utils.MultiStepProgress;

2
arduino-core/src/cc/arduino/packages/contributions/ContributionsIndex.java → arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

3
arduino-core/src/cc/arduino/packages/contributions/ContributionsIndexer.java → arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
View File

@ -26,9 +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.packages.contributions; package cc.arduino.contributions.packages;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.mrbean.MrBeanModule; import com.fasterxml.jackson.module.mrbean.MrBeanModule;

2
arduino-core/src/cc/arduino/packages/contributions/DownloadableContribution.java → arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.io.File; import java.io.File;

2
arduino-core/src/cc/arduino/packages/contributions/DownloadableContributionsDownloader.java → arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import cc.arduino.utils.FileHash; import cc.arduino.utils.FileHash;
import cc.arduino.utils.Progress; import cc.arduino.utils.Progress;

2
arduino-core/src/cc/arduino/packages/contributions/HostDependentDownloadableContribution.java → arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java
View File

@ -26,7 +26,7 @@
* 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.packages.contributions; package cc.arduino.contributions.packages;
import java.util.Properties; import java.util.Properties;

6
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -1,10 +1,10 @@
package processing.app; package processing.app;
import cc.arduino.libraries.contributions.LibrariesIndexer; import cc.arduino.contributions.libraries.LibrariesIndexer;
import cc.arduino.packages.DiscoveryManager; import cc.arduino.packages.DiscoveryManager;
import cc.arduino.packages.Uploader; import cc.arduino.packages.Uploader;
import cc.arduino.packages.contributions.ContributedTool; import cc.arduino.contributions.packages.ContributedTool;
import cc.arduino.packages.contributions.ContributionsIndexer; import cc.arduino.contributions.packages.ContributionsIndexer;
import cc.arduino.utils.ArchiveExtractor; import cc.arduino.utils.ArchiveExtractor;
import org.apache.commons.logging.impl.LogFactoryImpl; import org.apache.commons.logging.impl.LogFactoryImpl;
import org.apache.commons.logging.impl.NoOpLog; import org.apache.commons.logging.impl.NoOpLog;

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

@ -32,7 +32,7 @@ import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import cc.arduino.libraries.contributions.ContributedLibraryReference; import cc.arduino.contributions.libraries.ContributedLibraryReference;
public class LegacyUserLibrary extends UserLibrary { public class LegacyUserLibrary extends UserLibrary {

4
arduino-core/src/processing/app/packages/UserLibrary.java
View File

@ -36,8 +36,8 @@ import java.util.List;
import processing.app.helpers.FileUtils; import processing.app.helpers.FileUtils;
import processing.app.helpers.PreferencesMap; import processing.app.helpers.PreferencesMap;
import cc.arduino.libraries.contributions.ContributedLibrary; import cc.arduino.contributions.libraries.ContributedLibrary;
import cc.arduino.libraries.contributions.ContributedLibraryReference; import cc.arduino.contributions.libraries.ContributedLibraryReference;
public class UserLibrary extends ContributedLibrary { public class UserLibrary extends ContributedLibrary {