Moved DownloadableContribution and DownloadableContributionDownloader to parent package

Author: Federico Fissore

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java

@@ -33,7 +33,7 @@
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.filters.OnlyUpstreamReleasePredicate;
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.DownloadableContributionVersionComparator;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;

app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java

@@ -32,7 +32,7 @@
 import cc.arduino.contributions.libraries.LibrariesIndexer;
 import cc.arduino.contributions.libraries.LibraryInstaller;
 import cc.arduino.contributions.libraries.LibraryTypeComparator;
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.ui.InstallerJDialogUncaughtExceptionHandler;
 import cc.arduino.contributions.ui.*;
 import cc.arduino.utils.Progress;

app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java

@@ -35,7 +35,7 @@
 import cc.arduino.contributions.packages.ContributedBoard;
 import cc.arduino.contributions.packages.ContributedHelp;
 import cc.arduino.contributions.packages.ContributedPlatform;
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.ui.InstallerTableCell;
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
 import cc.arduino.utils.ReverseComparator;

app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java

@@ -31,7 +31,7 @@
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.contributions.packages.ContributionInstaller;
 import cc.arduino.contributions.packages.ContributionsIndexer;
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.ui.*;
 import cc.arduino.utils.Progress;
 import processing.app.I18n;

app/src/cc/arduino/contributions/ui/DropdownAllItem.java

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

app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java

@@ -29,7 +29,7 @@
 package cc.arduino.contributions.ui;
 
 import cc.arduino.contributions.VersionComparator;
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import com.google.common.base.Predicate;
 
 import javax.swing.table.AbstractTableModel;

arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java renamed to arduino-core/src/cc/arduino/contributions/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.contributions.packages;
+package cc.arduino.contributions;
 
 import cc.arduino.contributions.VersionHelper;
 import com.github.zafarkhaja.semver.Version;

arduino-core/src/cc/arduino/contributions/DownloadableContributionBuiltInAtTheBottomComparator.java

@@ -29,8 +29,6 @@
 
 package cc.arduino.contributions;
 
-import cc.arduino.contributions.packages.DownloadableContribution;
-
 import java.util.Comparator;
 
 public class DownloadableContributionBuiltInAtTheBottomComparator implements Comparator<DownloadableContribution> {

arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java

@@ -29,8 +29,6 @@
 
 package cc.arduino.contributions;
 
-import cc.arduino.contributions.packages.DownloadableContribution;
-
 import java.util.Comparator;
 
 public class DownloadableContributionVersionComparator implements Comparator<DownloadableContribution> {

arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java renamed to arduino-core/src/cc/arduino/contributions/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.contributions.packages;
+package cc.arduino.contributions;
 
 import cc.arduino.utils.FileHash;
 import cc.arduino.utils.Progress;

arduino-core/src/cc/arduino/contributions/filters/BuiltInPredicate.java

@@ -29,7 +29,7 @@
 
 package cc.arduino.contributions.filters;
 
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import com.google.common.base.Predicate;
 
 public class BuiltInPredicate implements Predicate<DownloadableContribution> {

arduino-core/src/cc/arduino/contributions/filters/DownloadableContributionWithVersionPredicate.java

@@ -29,7 +29,7 @@
 
 package cc.arduino.contributions.filters;
 
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import com.google.common.base.Predicate;
 
 public class DownloadableContributionWithVersionPredicate implements Predicate<DownloadableContribution> {

arduino-core/src/cc/arduino/contributions/filters/InstalledPredicate.java

@@ -29,7 +29,7 @@
 
 package cc.arduino.contributions.filters;
 
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import com.google.common.base.Predicate;
 
 public class InstalledPredicate implements Predicate<DownloadableContribution> {

arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java

@@ -28,7 +28,7 @@
  */
 package cc.arduino.contributions.libraries;
 
-import cc.arduino.contributions.packages.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContribution;
 import processing.app.I18n;
 
 import java.util.Comparator;

arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java

@@ -28,7 +28,7 @@
  */
 package cc.arduino.contributions.libraries;
 
-import cc.arduino.contributions.packages.DownloadableContributionsDownloader;
+import cc.arduino.contributions.DownloadableContributionsDownloader;
 import cc.arduino.utils.ArchiveExtractor;
 import cc.arduino.utils.MultiStepProgress;
 import cc.arduino.utils.Progress;

arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java

@@ -28,6 +28,8 @@
  */
 package cc.arduino.contributions.packages;
 
+import cc.arduino.contributions.DownloadableContribution;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;

arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java

@@ -28,6 +28,7 @@
  */
 package cc.arduino.contributions.packages;
 
+import cc.arduino.contributions.DownloadableContribution;
 import processing.app.BaseNoGui;
 
 import java.util.List;

arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java

@@ -28,6 +28,8 @@
  */
 package cc.arduino.contributions.packages;
 
+import cc.arduino.contributions.DownloadableContribution;
+import cc.arduino.contributions.DownloadableContributionsDownloader;
 import cc.arduino.contributions.GPGDetachedSignatureVerifier;
 import cc.arduino.filters.FileExecutablePredicate;
 import cc.arduino.utils.ArchiveExtractor;

arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java

@@ -28,6 +28,7 @@
  */
 package cc.arduino.contributions.packages;
 
+import cc.arduino.contributions.DownloadableContribution;
 import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
 import cc.arduino.contributions.GPGDetachedSignatureVerifier;
 import cc.arduino.contributions.SignatureVerificationFailedException;

arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java

@@ -28,6 +28,7 @@
  */
 package cc.arduino.contributions.packages;
 
+import cc.arduino.contributions.DownloadableContribution;
 import processing.app.Platform;
 
 public abstract class HostDependentDownloadableContribution extends DownloadableContribution {