mirror of
https://github.com/processing/processing4.git
synced 2026-02-04 06:09:17 +01:00
Removed some extra methods and corrected some merge stuff
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user