diff --git a/app/src/cc/arduino/ui/filters/NoopPredicate.java b/app/src/cc/arduino/contributions/filters/NoopPredicate.java similarity index 86% rename from app/src/cc/arduino/ui/filters/NoopPredicate.java rename to app/src/cc/arduino/contributions/filters/NoopPredicate.java index 3384a59f4..20586b474 100644 --- a/app/src/cc/arduino/ui/filters/NoopPredicate.java +++ b/app/src/cc/arduino/contributions/filters/NoopPredicate.java @@ -1,4 +1,4 @@ -package cc.arduino.ui.filters; +package cc.arduino.contributions.filters; import com.google.common.base.Predicate; diff --git a/app/src/cc/arduino/libraries/contributions/ui/filters/BuiltInPredicate.java b/app/src/cc/arduino/contributions/libraries/filters/BuiltInPredicate.java similarity index 72% rename from app/src/cc/arduino/libraries/contributions/ui/filters/BuiltInPredicate.java rename to app/src/cc/arduino/contributions/libraries/filters/BuiltInPredicate.java index 3778b782a..f9c816462 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/filters/BuiltInPredicate.java +++ b/app/src/cc/arduino/contributions/libraries/filters/BuiltInPredicate.java @@ -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; public class BuiltInPredicate implements Predicate { diff --git a/app/src/cc/arduino/libraries/contributions/ui/filters/CategoryPredicate.java b/app/src/cc/arduino/contributions/libraries/filters/CategoryPredicate.java similarity index 82% rename from app/src/cc/arduino/libraries/contributions/ui/filters/CategoryPredicate.java rename to app/src/cc/arduino/contributions/libraries/filters/CategoryPredicate.java index 354076c93..38a88f9e3 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/filters/CategoryPredicate.java +++ b/app/src/cc/arduino/contributions/libraries/filters/CategoryPredicate.java @@ -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; public class CategoryPredicate implements Predicate { diff --git a/app/src/cc/arduino/libraries/contributions/ui/filters/InstalledPredicate.java b/app/src/cc/arduino/contributions/libraries/filters/InstalledPredicate.java similarity index 73% rename from app/src/cc/arduino/libraries/contributions/ui/filters/InstalledPredicate.java rename to app/src/cc/arduino/contributions/libraries/filters/InstalledPredicate.java index bc0219afc..86e03d140 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/filters/InstalledPredicate.java +++ b/app/src/cc/arduino/contributions/libraries/filters/InstalledPredicate.java @@ -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; public class InstalledPredicate implements Predicate { diff --git a/app/src/cc/arduino/libraries/contributions/ui/filters/OnlyUpstreamReleasePredicate.java b/app/src/cc/arduino/contributions/libraries/filters/OnlyUpstreamReleasePredicate.java similarity index 77% rename from app/src/cc/arduino/libraries/contributions/ui/filters/OnlyUpstreamReleasePredicate.java rename to app/src/cc/arduino/contributions/libraries/filters/OnlyUpstreamReleasePredicate.java index 6074e0d64..c77de66c2 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/filters/OnlyUpstreamReleasePredicate.java +++ b/app/src/cc/arduino/contributions/libraries/filters/OnlyUpstreamReleasePredicate.java @@ -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 processing.app.packages.UserLibrary; diff --git a/app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java similarity index 95% rename from app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java rename to app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java index 02303b99f..5fb3def28 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java +++ b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java @@ -26,16 +26,15 @@ * invalidate any other reasons why the executable file might be covered by * 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.libraries.contributions.ContributedLibraryComparator; -import cc.arduino.libraries.contributions.ui.LibrariesIndexTableModel.ContributedLibraryReleases; -import cc.arduino.libraries.contributions.ui.filters.BuiltInPredicate; -import cc.arduino.libraries.contributions.ui.filters.InstalledPredicate; -import cc.arduino.libraries.contributions.ui.filters.OnlyUpstreamReleasePredicate; -import cc.arduino.packages.contributions.VersionComparator; -import cc.arduino.ui.InstallerTableCell; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.ContributedLibraryComparator; +import cc.arduino.contributions.libraries.filters.BuiltInPredicate; +import cc.arduino.contributions.libraries.filters.InstalledPredicate; +import cc.arduino.contributions.libraries.filters.OnlyUpstreamReleasePredicate; +import cc.arduino.contributions.VersionComparator; +import cc.arduino.contributions.ui.InstallerTableCell; import cc.arduino.utils.ReverseComparator; import com.google.common.base.Function; import com.google.common.base.Predicates; @@ -236,7 +235,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell { return component; } - private ContributedLibraryReleases editorValue; + private LibrariesIndexTableModel.ContributedLibraryReleases editorValue; private JTable parentTable; @Override @@ -249,7 +248,7 @@ public class ContributedLibraryTableCell extends InstallerTableCell { boolean isSelected, int row, int column) { parentTable = table; - editorValue = (ContributedLibraryReleases) value; + editorValue = (LibrariesIndexTableModel.ContributedLibraryReleases) value; setEnabled(true); 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) { - ContributedLibraryReleases releases = (ContributedLibraryReleases) value; + LibrariesIndexTableModel.ContributedLibraryReleases releases = (LibrariesIndexTableModel.ContributedLibraryReleases) value; //FIXME: happens on macosx, don't know why if (releases == null) { diff --git a/app/src/cc/arduino/libraries/contributions/ui/DropdownAllLibrariesItem.java b/app/src/cc/arduino/contributions/libraries/ui/DropdownAllLibrariesItem.java similarity index 62% rename from app/src/cc/arduino/libraries/contributions/ui/DropdownAllLibrariesItem.java rename to app/src/cc/arduino/contributions/libraries/ui/DropdownAllLibrariesItem.java index cc1584bc0..2a5a37747 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/DropdownAllLibrariesItem.java +++ b/app/src/cc/arduino/contributions/libraries/ui/DropdownAllLibrariesItem.java @@ -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.ui.filters.NoopPredicate; -import cc.arduino.ui.DropdownItem; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.filters.NoopPredicate; +import cc.arduino.contributions.ui.DropdownItem; import com.google.common.base.Predicate; import static processing.app.I18n._; diff --git a/app/src/cc/arduino/libraries/contributions/ui/DropdownBuiltInLibrariesItem.java b/app/src/cc/arduino/contributions/libraries/ui/DropdownBuiltInLibrariesItem.java similarity index 60% rename from app/src/cc/arduino/libraries/contributions/ui/DropdownBuiltInLibrariesItem.java rename to app/src/cc/arduino/contributions/libraries/ui/DropdownBuiltInLibrariesItem.java index 5b6c8ac94..ef5181b60 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/DropdownBuiltInLibrariesItem.java +++ b/app/src/cc/arduino/contributions/libraries/ui/DropdownBuiltInLibrariesItem.java @@ -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.libraries.contributions.ui.filters.BuiltInPredicate; -import cc.arduino.ui.DropdownItem; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.filters.BuiltInPredicate; +import cc.arduino.contributions.ui.DropdownItem; import com.google.common.base.Predicate; import static processing.app.I18n._; diff --git a/app/src/cc/arduino/libraries/contributions/ui/DropdownInstalledLibrariesItem.java b/app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibrariesItem.java similarity index 60% rename from app/src/cc/arduino/libraries/contributions/ui/DropdownInstalledLibrariesItem.java rename to app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibrariesItem.java index bcbc0234b..d68d59c50 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/DropdownInstalledLibrariesItem.java +++ b/app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibrariesItem.java @@ -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.libraries.contributions.ui.filters.InstalledPredicate; -import cc.arduino.ui.DropdownItem; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.filters.InstalledPredicate; +import cc.arduino.contributions.ui.DropdownItem; import com.google.common.base.Predicate; import static processing.app.I18n._; diff --git a/app/src/cc/arduino/libraries/contributions/ui/DropdownLibraryOfCategoryItem.java b/app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java similarity index 65% rename from app/src/cc/arduino/libraries/contributions/ui/DropdownLibraryOfCategoryItem.java rename to app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java index b846d9a51..1435642a9 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/DropdownLibraryOfCategoryItem.java +++ b/app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java @@ -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.libraries.contributions.ui.filters.CategoryPredicate; -import cc.arduino.ui.DropdownItem; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.filters.CategoryPredicate; +import cc.arduino.contributions.ui.DropdownItem; import com.google.common.base.Predicate; public class DropdownLibraryOfCategoryItem implements DropdownItem { diff --git a/app/src/cc/arduino/libraries/contributions/ui/LibrariesIndexTableModel.java b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java similarity index 95% rename from app/src/cc/arduino/libraries/contributions/ui/LibrariesIndexTableModel.java rename to app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java index f9f5cb7fb..da32275f6 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/LibrariesIndexTableModel.java +++ b/app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java @@ -26,13 +26,13 @@ * invalidate any other reasons why the executable file might be covered by * 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.libraries.contributions.LibrariesIndexer; -import cc.arduino.packages.contributions.ContributedPlatform; -import cc.arduino.packages.contributions.VersionComparator; -import cc.arduino.ui.FilteredAbstractTableModel; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.LibrariesIndexer; +import cc.arduino.contributions.packages.ContributedPlatform; +import cc.arduino.contributions.VersionComparator; +import cc.arduino.contributions.ui.FilteredAbstractTableModel; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; diff --git a/app/src/cc/arduino/libraries/contributions/ui/LibraryInstaller.java b/app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java similarity index 95% rename from app/src/cc/arduino/libraries/contributions/ui/LibraryInstaller.java rename to app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java index 46d5f7a78..b20a56f7f 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/LibraryInstaller.java +++ b/app/src/cc/arduino/contributions/libraries/ui/LibraryInstaller.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.libraries.contributions.ui; +package cc.arduino.contributions.libraries.ui; import static processing.app.I18n._; @@ -35,9 +35,9 @@ import java.io.IOException; import java.net.URL; import processing.app.helpers.FileUtils; -import cc.arduino.libraries.contributions.ContributedLibrary; -import cc.arduino.libraries.contributions.LibrariesIndexer; -import cc.arduino.packages.contributions.DownloadableContributionsDownloader; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.LibrariesIndexer; +import cc.arduino.contributions.packages.DownloadableContributionsDownloader; import cc.arduino.utils.ArchiveExtractor; import cc.arduino.utils.MultiStepProgress; import cc.arduino.utils.Progress; diff --git a/app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java b/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java similarity index 94% rename from app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java rename to app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java index fe1b21ffb..1b0b4c0a9 100644 --- a/app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java +++ b/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java @@ -26,14 +26,14 @@ * invalidate any other reasons why the executable file might be covered by * 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.libraries.contributions.LibrariesIndexer; -import cc.arduino.packages.contributions.ui.InstallerJDialogUncaughtExceptionHandler; -import cc.arduino.ui.FilteredAbstractTableModel; -import cc.arduino.ui.InstallerJDialog; -import cc.arduino.ui.InstallerTableCell; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.LibrariesIndexer; +import cc.arduino.contributions.packages.ui.InstallerJDialogUncaughtExceptionHandler; +import cc.arduino.contributions.ui.FilteredAbstractTableModel; +import cc.arduino.contributions.ui.InstallerJDialog; +import cc.arduino.contributions.ui.InstallerTableCell; import cc.arduino.utils.Progress; import javax.swing.*; diff --git a/app/src/cc/arduino/packages/contributions/ui/filters/CategoryPredicate.java b/app/src/cc/arduino/contributions/packages/filters/CategoryPredicate.java similarity index 82% rename from app/src/cc/arduino/packages/contributions/ui/filters/CategoryPredicate.java rename to app/src/cc/arduino/contributions/packages/filters/CategoryPredicate.java index 7a47b3e37..787e80cd1 100644 --- a/app/src/cc/arduino/packages/contributions/ui/filters/CategoryPredicate.java +++ b/app/src/cc/arduino/contributions/packages/filters/CategoryPredicate.java @@ -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; public class CategoryPredicate implements Predicate { diff --git a/app/src/cc/arduino/packages/contributions/ui/ContributedPlatformTableCell.java b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java similarity index 95% rename from app/src/cc/arduino/packages/contributions/ui/ContributedPlatformTableCell.java rename to app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java index 386e9bd3b..cc92d5625 100644 --- a/app/src/cc/arduino/packages/contributions/ui/ContributedPlatformTableCell.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java @@ -26,12 +26,11 @@ * invalidate any other reasons why the executable file might be covered by * 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.packages.contributions.ContributedPlatform; -import cc.arduino.packages.contributions.ui.ContributionIndexTableModel.ContributedPlatformReleases; -import cc.arduino.ui.InstallerTableCell; +import cc.arduino.contributions.packages.ContributedBoard; +import cc.arduino.contributions.packages.ContributedPlatform; +import cc.arduino.contributions.ui.InstallerTableCell; import processing.app.Base; import javax.swing.*; @@ -201,7 +200,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell { return component; } - private ContributedPlatformReleases editorValue; + private ContributionIndexTableModel.ContributedPlatformReleases editorValue; private JTable parentTable; @Override @@ -214,7 +213,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell { boolean isSelected, int row, int column) { parentTable = table; - editorValue = (ContributedPlatformReleases) value; + editorValue = (ContributionIndexTableModel.ContributedPlatformReleases) value; setEnabled(true); downgradeChooser.removeAllItems(); @@ -236,7 +235,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell { private Component getUpdatedCellComponent(Object value, boolean isSelected, int row) { - ContributedPlatformReleases releases = (ContributedPlatformReleases) value; + ContributionIndexTableModel.ContributedPlatformReleases releases = (ContributionIndexTableModel.ContributedPlatformReleases) value; ContributedPlatform selectedPlatform = releases.getSelected(); ContributedPlatform installedPlatform = releases.getInstalled(); diff --git a/app/src/cc/arduino/packages/contributions/ui/ContributionIndexTableModel.java b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java similarity index 95% rename from app/src/cc/arduino/packages/contributions/ui/ContributionIndexTableModel.java rename to app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java index e9d9cf682..017943a49 100644 --- a/app/src/cc/arduino/packages/contributions/ui/ContributionIndexTableModel.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java @@ -26,12 +26,12 @@ * invalidate any other reasons why the executable file might be covered by * 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.packages.contributions.ContributedPlatform; -import cc.arduino.packages.contributions.ContributionsIndex; -import cc.arduino.ui.FilteredAbstractTableModel; +import cc.arduino.contributions.packages.ContributedPackage; +import cc.arduino.contributions.packages.ContributedPlatform; +import cc.arduino.contributions.packages.ContributionsIndex; +import cc.arduino.contributions.ui.FilteredAbstractTableModel; import com.google.common.base.Predicate; import java.util.ArrayList; diff --git a/app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java b/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java similarity index 92% rename from app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java rename to app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java index 4a654e810..67f87d70f 100644 --- a/app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java @@ -26,16 +26,14 @@ * invalidate any other reasons why the executable file might be covered by * 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.packages.contributions.ContributedPlatform; -import cc.arduino.packages.contributions.ContributionInstaller; -import cc.arduino.packages.contributions.ContributionsIndexer; -import cc.arduino.libraries.contributions.ui.DropdownAllLibrariesItem; -import cc.arduino.ui.FilteredAbstractTableModel; -import cc.arduino.ui.InstallerJDialog; -import cc.arduino.ui.InstallerTableCell; +import cc.arduino.contributions.packages.ContributedPlatform; +import cc.arduino.contributions.packages.ContributionInstaller; +import cc.arduino.contributions.packages.ContributionsIndexer; +import cc.arduino.contributions.ui.FilteredAbstractTableModel; +import cc.arduino.contributions.ui.InstallerJDialog; +import cc.arduino.contributions.ui.InstallerTableCell; import cc.arduino.utils.Progress; import java.awt.*; diff --git a/app/src/cc/arduino/packages/contributions/ui/DropdownAllCoresItem.java b/app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java similarity index 62% rename from app/src/cc/arduino/packages/contributions/ui/DropdownAllCoresItem.java rename to app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java index 82b66aa6e..3914f8b3d 100644 --- a/app/src/cc/arduino/packages/contributions/ui/DropdownAllCoresItem.java +++ b/app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java @@ -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.packages.contributions.ContributedPlatform; -import cc.arduino.ui.DropdownItem; +import cc.arduino.contributions.filters.NoopPredicate; +import cc.arduino.contributions.packages.ContributedPlatform; +import cc.arduino.contributions.ui.DropdownItem; import com.google.common.base.Predicate; import static processing.app.I18n._; diff --git a/app/src/cc/arduino/packages/contributions/ui/DropdownCoreOfCategoryItem.java b/app/src/cc/arduino/contributions/packages/ui/DropdownCoreOfCategoryItem.java similarity index 65% rename from app/src/cc/arduino/packages/contributions/ui/DropdownCoreOfCategoryItem.java rename to app/src/cc/arduino/contributions/packages/ui/DropdownCoreOfCategoryItem.java index 73a0c0fa5..320e0a7d4 100644 --- a/app/src/cc/arduino/packages/contributions/ui/DropdownCoreOfCategoryItem.java +++ b/app/src/cc/arduino/contributions/packages/ui/DropdownCoreOfCategoryItem.java @@ -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.packages.contributions.ui.filters.CategoryPredicate; -import cc.arduino.ui.DropdownItem; +import cc.arduino.contributions.packages.ContributedPlatform; +import cc.arduino.contributions.packages.filters.CategoryPredicate; +import cc.arduino.contributions.ui.DropdownItem; import com.google.common.base.Predicate; public class DropdownCoreOfCategoryItem implements DropdownItem { diff --git a/app/src/cc/arduino/packages/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java b/app/src/cc/arduino/contributions/packages/ui/InstallerJDialogUncaughtExceptionHandler.java similarity index 87% rename from app/src/cc/arduino/packages/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java rename to app/src/cc/arduino/contributions/packages/ui/InstallerJDialogUncaughtExceptionHandler.java index bc7973da1..01a80be0f 100644 --- a/app/src/cc/arduino/packages/contributions/ui/InstallerJDialogUncaughtExceptionHandler.java +++ b/app/src/cc/arduino/contributions/packages/ui/InstallerJDialogUncaughtExceptionHandler.java @@ -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.*; diff --git a/app/src/cc/arduino/ui/DropdownItem.java b/app/src/cc/arduino/contributions/ui/DropdownItem.java similarity index 76% rename from app/src/cc/arduino/ui/DropdownItem.java rename to app/src/cc/arduino/contributions/ui/DropdownItem.java index b91bdcfb7..362efd66b 100644 --- a/app/src/cc/arduino/ui/DropdownItem.java +++ b/app/src/cc/arduino/contributions/ui/DropdownItem.java @@ -1,4 +1,4 @@ -package cc.arduino.ui; +package cc.arduino.contributions.ui; import com.google.common.base.Predicate; diff --git a/app/src/cc/arduino/ui/FilterJTextField.java b/app/src/cc/arduino/contributions/ui/FilterJTextField.java similarity index 98% rename from app/src/cc/arduino/ui/FilterJTextField.java rename to app/src/cc/arduino/contributions/ui/FilterJTextField.java index ebb5e31bf..1af4882bd 100644 --- a/app/src/cc/arduino/ui/FilterJTextField.java +++ b/app/src/cc/arduino/contributions/ui/FilterJTextField.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.ui; +package cc.arduino.contributions.ui; import java.awt.Color; import java.awt.Font; diff --git a/app/src/cc/arduino/ui/FilteredAbstractTableModel.java b/app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java similarity index 95% rename from app/src/cc/arduino/ui/FilteredAbstractTableModel.java rename to app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java index fd006c93b..651c7ea87 100644 --- a/app/src/cc/arduino/ui/FilteredAbstractTableModel.java +++ b/app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java @@ -26,9 +26,8 @@ * invalidate any other reasons why the executable file might be covered by * 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 javax.swing.table.AbstractTableModel; diff --git a/app/src/cc/arduino/ui/InstallerJDialog.java b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java similarity index 98% rename from app/src/cc/arduino/ui/InstallerJDialog.java rename to app/src/cc/arduino/contributions/ui/InstallerJDialog.java index 1fc7e05a1..c8798ee38 100644 --- a/app/src/cc/arduino/ui/InstallerJDialog.java +++ b/app/src/cc/arduino/contributions/ui/InstallerJDialog.java @@ -26,9 +26,8 @@ * invalidate any other reasons why the executable file might be covered by * 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 processing.app.Base; import processing.app.Theme; @@ -45,7 +44,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; 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._; public abstract class InstallerJDialog extends JDialog { diff --git a/app/src/cc/arduino/ui/InstallerTableCell.java b/app/src/cc/arduino/contributions/ui/InstallerTableCell.java similarity index 98% rename from app/src/cc/arduino/ui/InstallerTableCell.java rename to app/src/cc/arduino/contributions/ui/InstallerTableCell.java index cf820f7f8..eb0187632 100644 --- a/app/src/cc/arduino/ui/InstallerTableCell.java +++ b/app/src/cc/arduino/contributions/ui/InstallerTableCell.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.ui; +package cc.arduino.contributions.ui; import javax.swing.*; import javax.swing.table.TableCellEditor; diff --git a/app/src/cc/arduino/ui/ProgressJProgressBar.java b/app/src/cc/arduino/contributions/ui/ProgressJProgressBar.java similarity index 97% rename from app/src/cc/arduino/ui/ProgressJProgressBar.java rename to app/src/cc/arduino/contributions/ui/ProgressJProgressBar.java index d67798b9f..ffe43a25a 100644 --- a/app/src/cc/arduino/ui/ProgressJProgressBar.java +++ b/app/src/cc/arduino/contributions/ui/ProgressJProgressBar.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.ui; +package cc.arduino.contributions.ui; import javax.swing.JProgressBar; diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 1319ebc15..4f2f7db3e 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -22,11 +22,10 @@ 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.contributions.ui.ContributionManagerUI; +import cc.arduino.contributions.packages.ui.ContributionManagerUI; import cc.arduino.view.SplashScreenHelper; -import org.apache.commons.lang3.*; import org.apache.commons.lang3.StringUtils; import processing.app.debug.TargetBoard; import processing.app.debug.TargetPackage; diff --git a/app/src/processing/app/syntax/PdeKeywords.java b/app/src/processing/app/syntax/PdeKeywords.java index 2a837fab9..865325da3 100644 --- a/app/src/processing/app/syntax/PdeKeywords.java +++ b/app/src/processing/app/syntax/PdeKeywords.java @@ -30,7 +30,7 @@ import processing.app.legacy.PApplet; import java.io.*; import java.util.*; -import cc.arduino.libraries.contributions.ContributedLibrary; +import cc.arduino.contributions.libraries.ContributedLibrary; public class PdeKeywords extends CTokenMarker { diff --git a/app/test/cc/arduino/packages/contributions/HostDependentDownloadableContributionStub.java b/app/test/cc/arduino/packages/contributions/HostDependentDownloadableContributionStub.java index 70edfb792..3178e00f1 100644 --- a/app/test/cc/arduino/packages/contributions/HostDependentDownloadableContributionStub.java +++ b/app/test/cc/arduino/packages/contributions/HostDependentDownloadableContributionStub.java @@ -1,5 +1,7 @@ package cc.arduino.packages.contributions; +import cc.arduino.contributions.packages.HostDependentDownloadableContribution; + public class HostDependentDownloadableContributionStub extends HostDependentDownloadableContribution { @Override public String getHost() { diff --git a/arduino-core/src/cc/arduino/packages/contributions/VersionComparator.java b/arduino-core/src/cc/arduino/contributions/VersionComparator.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/VersionComparator.java rename to arduino-core/src/cc/arduino/contributions/VersionComparator.java index e89971585..39d38d8eb 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/VersionComparator.java +++ b/arduino-core/src/cc/arduino/contributions/VersionComparator.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions; import com.github.zafarkhaja.semver.Version; diff --git a/arduino-core/src/cc/arduino/libraries/contributions/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java similarity index 97% rename from arduino-core/src/cc/arduino/libraries/contributions/ContributedLibrary.java rename to arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java index 91c302108..f894cb5c1 100644 --- a/arduino-core/src/cc/arduino/libraries/contributions/ContributedLibrary.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java @@ -26,9 +26,9 @@ * invalidate any other reasons why the executable file might be covered by * 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 java.util.Comparator; diff --git a/arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryComparator.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryComparator.java similarity index 74% rename from arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryComparator.java rename to arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryComparator.java index 5da63ac38..dbc80dfc4 100644 --- a/arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryComparator.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryComparator.java @@ -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; diff --git a/arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryReference.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java similarity index 97% rename from arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryReference.java rename to arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java index bed24fb64..e04a7ec7a 100644 --- a/arduino-core/src/cc/arduino/libraries/contributions/ContributedLibraryReference.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryReference.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.libraries.contributions; +package cc.arduino.contributions.libraries; public abstract class ContributedLibraryReference { diff --git a/arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndex.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java similarity index 98% rename from arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndex.java rename to arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java index 349d6088d..27661fd03 100644 --- a/arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndex.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.libraries.contributions; +package cc.arduino.contributions.libraries; import java.util.*; diff --git a/arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndexer.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java similarity index 98% rename from arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndexer.java rename to arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java index 109bd332d..4b19779af 100644 --- a/arduino-core/src/cc/arduino/libraries/contributions/LibrariesIndexer.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.libraries.contributions; +package cc.arduino.contributions.libraries; import static processing.app.I18n._; @@ -44,7 +44,6 @@ import processing.app.packages.LegacyUserLibrary; import processing.app.packages.LibraryList; import processing.app.packages.UserLibrary; -import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.module.mrbean.MrBeanModule; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedBoard.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java similarity index 97% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedBoard.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java index 5d0d87caf..9a115ad8d 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedBoard.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; public interface ContributedBoard { diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedPackage.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java similarity index 97% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedPackage.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java index 14cab49f1..724d15664 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedPackage.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java @@ -26,7 +26,9 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; + +import cc.arduino.contributions.VersionComparator; import java.util.List; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedPlatform.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java index 3462eb556..ca91e652b 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedPlatform.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.util.ArrayList; import java.util.Collection; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPackage.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPackage.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java index 9cd4959a0..d0fc05aa6 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPackage.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPackage.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.util.Collection; import java.util.HashMap; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPlatform.java similarity index 97% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPlatform.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPlatform.java index c102ea2aa..b7e1a0681 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedTargetPlatform.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedTargetPlatform.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.io.File; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedTool.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedTool.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java index bda26c535..89fab663f 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedTool.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.util.List; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributedToolReference.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java similarity index 97% rename from arduino-core/src/cc/arduino/packages/contributions/ContributedToolReference.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java index 1c6e01b02..ef4c808a8 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributedToolReference.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.util.Collection; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributionInstaller.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java similarity index 99% rename from arduino-core/src/cc/arduino/packages/contributions/ContributionInstaller.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java index 424051696..166b8e7c5 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributionInstaller.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import cc.arduino.utils.ArchiveExtractor; import cc.arduino.utils.MultiStepProgress; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributionsIndex.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/ContributionsIndex.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java index 8c6b2f51e..a7a8fce2f 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributionsIndex.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.util.ArrayList; import java.util.List; diff --git a/arduino-core/src/cc/arduino/packages/contributions/ContributionsIndexer.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/ContributionsIndexer.java rename to arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java index 30ea15f29..f0ece392a 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/ContributionsIndexer.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java @@ -26,9 +26,8 @@ * invalidate any other reasons why the executable file might be covered by * 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.ObjectMapper; import com.fasterxml.jackson.module.mrbean.MrBeanModule; diff --git a/arduino-core/src/cc/arduino/packages/contributions/DownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/DownloadableContribution.java rename to arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java index 18bc0a7c2..80173a9f2 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/DownloadableContribution.java +++ b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.io.File; diff --git a/arduino-core/src/cc/arduino/packages/contributions/DownloadableContributionsDownloader.java b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/DownloadableContributionsDownloader.java rename to arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java index 398e98387..6e034a823 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/DownloadableContributionsDownloader.java +++ b/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import cc.arduino.utils.FileHash; import cc.arduino.utils.Progress; diff --git a/arduino-core/src/cc/arduino/packages/contributions/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java similarity index 98% rename from arduino-core/src/cc/arduino/packages/contributions/HostDependentDownloadableContribution.java rename to arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java index b614a53b6..c8d57234a 100644 --- a/arduino-core/src/cc/arduino/packages/contributions/HostDependentDownloadableContribution.java +++ b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java @@ -26,7 +26,7 @@ * invalidate any other reasons why the executable file might be covered by * the GNU General Public License. */ -package cc.arduino.packages.contributions; +package cc.arduino.contributions.packages; import java.util.Properties; diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java index 5be847f5f..1056da0b1 100644 --- a/arduino-core/src/processing/app/BaseNoGui.java +++ b/arduino-core/src/processing/app/BaseNoGui.java @@ -1,10 +1,10 @@ package processing.app; -import cc.arduino.libraries.contributions.LibrariesIndexer; +import cc.arduino.contributions.libraries.LibrariesIndexer; import cc.arduino.packages.DiscoveryManager; import cc.arduino.packages.Uploader; -import cc.arduino.packages.contributions.ContributedTool; -import cc.arduino.packages.contributions.ContributionsIndexer; +import cc.arduino.contributions.packages.ContributedTool; +import cc.arduino.contributions.packages.ContributionsIndexer; import cc.arduino.utils.ArchiveExtractor; import org.apache.commons.logging.impl.LogFactoryImpl; import org.apache.commons.logging.impl.NoOpLog; diff --git a/arduino-core/src/processing/app/packages/LegacyUserLibrary.java b/arduino-core/src/processing/app/packages/LegacyUserLibrary.java index 0bed82589..2791fc6b4 100644 --- a/arduino-core/src/processing/app/packages/LegacyUserLibrary.java +++ b/arduino-core/src/processing/app/packages/LegacyUserLibrary.java @@ -32,7 +32,7 @@ import java.io.File; import java.util.Arrays; import java.util.List; -import cc.arduino.libraries.contributions.ContributedLibraryReference; +import cc.arduino.contributions.libraries.ContributedLibraryReference; public class LegacyUserLibrary extends UserLibrary { diff --git a/arduino-core/src/processing/app/packages/UserLibrary.java b/arduino-core/src/processing/app/packages/UserLibrary.java index 10bffe047..f1db366c6 100644 --- a/arduino-core/src/processing/app/packages/UserLibrary.java +++ b/arduino-core/src/processing/app/packages/UserLibrary.java @@ -36,8 +36,8 @@ import java.util.List; import processing.app.helpers.FileUtils; import processing.app.helpers.PreferencesMap; -import cc.arduino.libraries.contributions.ContributedLibrary; -import cc.arduino.libraries.contributions.ContributedLibraryReference; +import cc.arduino.contributions.libraries.ContributedLibrary; +import cc.arduino.contributions.libraries.ContributedLibraryReference; public class UserLibrary extends ContributedLibrary {