From 88ee2db5451ecb306ab2e6a5c370e7ba8b4e2ae4 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Tue, 23 Jun 2015 20:14:20 +0530 Subject: [PATCH] Removed some extra methods and corrected some merge stuff --- .../app/contrib/ContributionManagerDialog.java | 9 --------- app/src/processing/app/contrib/ContributionTab.java | 6 +++--- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java index 143f45f84..6e77e84de 100644 --- a/app/src/processing/app/contrib/ContributionManagerDialog.java +++ b/app/src/processing/app/contrib/ContributionManagerDialog.java @@ -98,15 +98,6 @@ public class ContributionManagerDialog { || examplesContributionTab.hasUpdates(base); } - protected JPanel makeTextPanel(String text) { - JPanel panel = new JPanel(false); - JLabel filler = new JLabel(text); - filler.setHorizontalAlignment(JLabel.CENTER); - panel.setLayout(new GridLayout(1, 1)); - panel.add(filler); - return panel; - } - public void showFrame(final Editor editor, ContributionType contributionType) { this.editor = editor; diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index bdbc74565..1fc74e372 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -213,7 +213,7 @@ public class ContributionTab { // The message is set to null so that every time the retry button is hit // no previous error is displayed in the status status.setMessage(null); - downloadAndUpdateContributionListing(); + downloadAndUpdateContributionListing(editor.getBase()); } }); @@ -466,10 +466,10 @@ public class ContributionTab { } - protected void downloadAndUpdateContributionListing() { + protected void downloadAndUpdateContributionListing(Base base) { retryConnectingButton.setEnabled(false); status.setMessage(Language.text("contrib.status.downloading_list")); - contribListing.downloadAvailableList(new ContribProgressBar(progressBar) { + contribListing.downloadAvailableList(base, new ContribProgressBar(progressBar) { @Override