From 2d463f67aa0ef6a6275b4ff3755b1763cdf239cf Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Tue, 22 Sep 2015 18:04:50 -0400 Subject: [PATCH] clean up method naming/parameters/overrides --- app/src/processing/app/contrib/ContributionTab.java | 6 +++--- app/src/processing/app/contrib/ListPanel.java | 7 ++++++- app/src/processing/app/contrib/StatusPanel.java | 2 +- .../processing/app/contrib/UpdateContributionTab.java | 8 +++----- app/src/processing/app/contrib/UpdateStatusPanel.java | 11 +++-------- todo.txt | 9 ++++++++- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index 02ba3bb5a..f39f4e8bb 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -93,7 +93,7 @@ public class ContributionTab extends JPanel { }; contribListing = ContributionListing.getInstance(); - statusPanel = new StatusPanel(650, this); + statusPanel = new StatusPanel(this, 650); contributionListPanel = new ListPanel(this, filter); contribListing.addListener(contributionListPanel); } @@ -107,7 +107,7 @@ public class ContributionTab extends JPanel { public void showFrame(final Editor editor, boolean error, boolean loading) { this.editor = editor; - setLayout(editor, error, loading); + setLayout(error, loading); contributionListPanel.setVisible(!loading); loaderLabel.setVisible(loading); errorPanel.setVisible(error); @@ -117,7 +117,7 @@ public class ContributionTab extends JPanel { } - protected void setLayout(final Editor editor, boolean activateErrorPanel, + protected void setLayout(boolean activateErrorPanel, boolean isLoading) { if (progressBar == null) { progressBar = new JProgressBar(); diff --git a/app/src/processing/app/contrib/ListPanel.java b/app/src/processing/app/contrib/ListPanel.java index b1d618cd0..419c7f2a4 100644 --- a/app/src/processing/app/contrib/ListPanel.java +++ b/app/src/processing/app/contrib/ListPanel.java @@ -580,6 +580,7 @@ implements Scrollable, ContributionListing.ChangeListener { } + @Override public Dimension getPreferredScrollableViewportSize() { return getPreferredSize(); } @@ -588,6 +589,7 @@ implements Scrollable, ContributionListing.ChangeListener { /** * Amount to scroll to reveal a new page of items */ + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { if (orientation == SwingConstants.VERTICAL) { @@ -609,6 +611,7 @@ implements Scrollable, ContributionListing.ChangeListener { /** * Amount to scroll to reveal the rest of something we are on or a new item */ + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { if (orientation == SwingConstants.VERTICAL) { int lastHeight = 0, height = 0; @@ -647,17 +650,19 @@ implements Scrollable, ContributionListing.ChangeListener { } + @Override public boolean getScrollableTracksViewportHeight() { return false; } + @Override public boolean getScrollableTracksViewportWidth() { return true; } - public int getNoOfRows() { + public int getRowCount() { return panelByContribution.size(); } } diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 1911cf284..a38d139c8 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -71,7 +71,7 @@ class StatusPanel extends JPanel { public StatusPanel() { } - public StatusPanel(int width, final ContributionTab contributionTab) { + public StatusPanel(final ContributionTab contributionTab, int width) { this.contributionTab = contributionTab; if (foundationIcon == null) { diff --git a/app/src/processing/app/contrib/UpdateContributionTab.java b/app/src/processing/app/contrib/UpdateContributionTab.java index a18ecb38c..b8275c981 100644 --- a/app/src/processing/app/contrib/UpdateContributionTab.java +++ b/app/src/processing/app/contrib/UpdateContributionTab.java @@ -6,7 +6,6 @@ import javax.swing.GroupLayout; import javax.swing.JLabel; import javax.swing.JProgressBar; -import processing.app.ui.Editor; import processing.app.ui.Toolkit; @@ -26,15 +25,14 @@ public class UpdateContributionTab extends ContributionTab { } }; contributionListPanel = new UpdateListPanel(this, filter); - statusPanel = new UpdateStatusPanel(this, 650, this); + statusPanel = new UpdateStatusPanel(this, 650); contribListing = ContributionListing.getInstance(); contribListing.addListener(contributionListPanel); } @Override - protected void setLayout(Editor editor, boolean activateErrorPanel, - boolean isLoading) { + protected void setLayout(boolean error, boolean loading) { if (progressBar == null) { progressBar = new JProgressBar(); progressBar.setVisible(false); @@ -43,7 +41,7 @@ public class UpdateContributionTab extends ContributionTab { loaderLabel = new JLabel(Toolkit.getLibIcon("icons/loader.gif")); loaderLabel.setOpaque(false); - loaderLabel.setBackground(Color.WHITE); +// loaderLabel.setBackground(Color.WHITE); } GroupLayout layout = new GroupLayout(this); diff --git a/app/src/processing/app/contrib/UpdateStatusPanel.java b/app/src/processing/app/contrib/UpdateStatusPanel.java index fa302c8fb..293d72762 100644 --- a/app/src/processing/app/contrib/UpdateStatusPanel.java +++ b/app/src/processing/app/contrib/UpdateStatusPanel.java @@ -15,14 +15,9 @@ import processing.app.ui.Toolkit; public class UpdateStatusPanel extends StatusPanel { - /** - * - */ - private final UpdateContributionTab parent; - - public UpdateStatusPanel(UpdateContributionTab updateContributionTab, int width, final ContributionTab contributionTab) { + public UpdateStatusPanel(UpdateContributionTab tab, int width) { super(); - parent = updateContributionTab; + this.contributionTab = tab; updateButton = new JButton("Update All", Toolkit.getLibIconX("manager/update")); updateButton.setFont(Toolkit.getSansFont(14, Font.PLAIN)); @@ -56,6 +51,6 @@ public class UpdateStatusPanel extends StatusPanel { } public void update() { - updateButton.setEnabled(parent.contributionListPanel.getNoOfRows() > 0); + updateButton.setEnabled(contributionTab.contributionListPanel.getRowCount() > 0); } } \ No newline at end of file diff --git a/todo.txt b/todo.txt index ea133e202..c9b0cfcf9 100644 --- a/todo.txt +++ b/todo.txt @@ -131,8 +131,15 @@ _ mouse events (i.e. toggle breakpoint) seem to be firing twice beta 7 -_ CM selected tabs are too tall +X CM selected tabs are too tall _ https://github.com/processing/processing/issues/3598 +_ why the aqua background when opening the window? +_ list with contrib types separated is really wonky +_ do we keep the list? +_ does it even work for different contrib types? +_ bring back the # of updates on each tab +_ use this instead of the 'icon' stuff + _ show number of updates available in the footer _ https://github.com/processing/processing/issues/3518 _ and have it be clickable so to open the manager