From 9ddb72b519e7b7e7d75ed7dce61b2bc6b88f81cc Mon Sep 17 00:00:00 2001 From: Federico Fissore Date: Thu, 21 May 2015 15:37:58 +0200 Subject: [PATCH] Moved DownloadableContribution and DownloadableContributionDownloader to parent package --- .../libraries/ui/ContributedLibraryTableCell.java | 2 +- .../arduino/contributions/libraries/ui/LibraryManagerUI.java | 2 +- .../packages/ui/ContributedPlatformTableCell.java | 2 +- .../contributions/packages/ui/ContributionManagerUI.java | 2 +- app/src/cc/arduino/contributions/ui/DropdownAllItem.java | 3 +-- .../arduino/contributions/ui/FilteredAbstractTableModel.java | 2 +- .../contributions/{packages => }/DownloadableContribution.java | 2 +- .../DownloadableContributionBuiltInAtTheBottomComparator.java | 2 -- .../DownloadableContributionVersionComparator.java | 2 -- .../{packages => }/DownloadableContributionsDownloader.java | 2 +- .../src/cc/arduino/contributions/filters/BuiltInPredicate.java | 2 +- .../filters/DownloadableContributionWithVersionPredicate.java | 2 +- .../cc/arduino/contributions/filters/InstalledPredicate.java | 2 +- .../cc/arduino/contributions/libraries/ContributedLibrary.java | 2 +- .../cc/arduino/contributions/libraries/LibraryInstaller.java | 2 +- .../cc/arduino/contributions/packages/ContributedPlatform.java | 2 ++ .../src/cc/arduino/contributions/packages/ContributedTool.java | 1 + .../arduino/contributions/packages/ContributionInstaller.java | 2 ++ .../arduino/contributions/packages/ContributionsIndexer.java | 1 + .../packages/HostDependentDownloadableContribution.java | 1 + 20 files changed, 20 insertions(+), 18 deletions(-) rename arduino-core/src/cc/arduino/contributions/{packages => }/DownloadableContribution.java (98%) rename arduino-core/src/cc/arduino/contributions/{packages => }/DownloadableContributionsDownloader.java (98%) diff --git a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java index 2ea96303c..ddd5fe5f7 100644 --- a/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java +++ b/app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java @@ -33,7 +33,7 @@ import cc.arduino.contributions.filters.BuiltInPredicate; 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; diff --git a/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java b/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java index 8a0c4860d..f816d1944 100644 --- a/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java +++ b/app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java @@ -32,7 +32,7 @@ import cc.arduino.contributions.libraries.ContributedLibrary; 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; diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java index b492fa352..552a8dbf5 100644 --- a/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java @@ -35,7 +35,7 @@ import cc.arduino.contributions.filters.InstalledPredicate; 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; diff --git a/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java b/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java index af4525235..1ffa77af6 100644 --- a/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java +++ b/app/src/cc/arduino/contributions/packages/ui/ContributionManagerUI.java @@ -31,7 +31,7 @@ package cc.arduino.contributions.packages.ui; 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; diff --git a/app/src/cc/arduino/contributions/ui/DropdownAllItem.java b/app/src/cc/arduino/contributions/ui/DropdownAllItem.java index a9778b8f0..935138e02 100644 --- a/app/src/cc/arduino/contributions/ui/DropdownAllItem.java +++ b/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._; diff --git a/app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java b/app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java index 2d72b306a..0b799b119 100644 --- a/app/src/cc/arduino/contributions/ui/FilteredAbstractTableModel.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/DownloadableContribution.java similarity index 98% rename from arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java rename to arduino-core/src/cc/arduino/contributions/DownloadableContribution.java index 5152eac71..2b78bc765 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContribution.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/DownloadableContributionBuiltInAtTheBottomComparator.java b/arduino-core/src/cc/arduino/contributions/DownloadableContributionBuiltInAtTheBottomComparator.java index cb27b6bfa..11c18cb44 100644 --- a/arduino-core/src/cc/arduino/contributions/DownloadableContributionBuiltInAtTheBottomComparator.java +++ b/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 { diff --git a/arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java b/arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java index f23fa552d..b7f9959a4 100644 --- a/arduino-core/src/cc/arduino/contributions/DownloadableContributionVersionComparator.java +++ b/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 { diff --git a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java b/arduino-core/src/cc/arduino/contributions/DownloadableContributionsDownloader.java similarity index 98% rename from arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java rename to arduino-core/src/cc/arduino/contributions/DownloadableContributionsDownloader.java index a3ac4d9ec..d29d4e93c 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/DownloadableContributionsDownloader.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/filters/BuiltInPredicate.java b/arduino-core/src/cc/arduino/contributions/filters/BuiltInPredicate.java index 3b6f40a02..b7e1c7ab2 100644 --- a/arduino-core/src/cc/arduino/contributions/filters/BuiltInPredicate.java +++ b/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 { diff --git a/arduino-core/src/cc/arduino/contributions/filters/DownloadableContributionWithVersionPredicate.java b/arduino-core/src/cc/arduino/contributions/filters/DownloadableContributionWithVersionPredicate.java index b2954fae3..576103bfa 100644 --- a/arduino-core/src/cc/arduino/contributions/filters/DownloadableContributionWithVersionPredicate.java +++ b/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 { diff --git a/arduino-core/src/cc/arduino/contributions/filters/InstalledPredicate.java b/arduino-core/src/cc/arduino/contributions/filters/InstalledPredicate.java index 9ffc43234..87066da68 100644 --- a/arduino-core/src/cc/arduino/contributions/filters/InstalledPredicate.java +++ b/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 { diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java index c368f7319..adb4c8b9b 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java b/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java index 8da0ed9f2..27e5abeb8 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/LibraryInstaller.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java index 83565f912..5c70ba212 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java index a8f346b79..8462846c8 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java index c083193ee..90c9beaea 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java index c8f596966..b5180a27a 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java +++ b/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; diff --git a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java index c9c7ec1b6..07e1e8335 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java +++ b/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 {