Removed some extra methods and corrected some merge stuff

This commit is contained in:
Akarshit Wal
2015-06-23 20:14:20 +05:30
parent 0a6d45580e
commit 88ee2db545
2 changed files with 3 additions and 12 deletions

View File

@@ -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;

View File

@@ -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