diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index 9348043a3..332ebc90d 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -343,9 +343,7 @@ public class ContributionTab extends JPanel { protected void updateAll() { - Collection collection = - listPanel.detailForContrib.values(); - for (StatusDetail detail : collection) { + for (StatusDetail detail : listPanel.detailForContrib.values()) { detail.update(); } listPanel.model.fireTableDataChanged(); diff --git a/app/src/processing/app/contrib/ListPanel.java b/app/src/processing/app/contrib/ListPanel.java index 5bc9f9aca..bef919f75 100644 --- a/app/src/processing/app/contrib/ListPanel.java +++ b/app/src/processing/app/contrib/ListPanel.java @@ -701,14 +701,14 @@ public class ListPanel extends JPanel implements Scrollable { // System.out.println(contributionTab.contribType + " tab: " + // "changed " + oldContrib + " -> " + newContrib); // new Exception().printStackTrace(System.out); - StatusDetail panel = detailForContrib.get(oldContrib); + StatusDetail detail = detailForContrib.get(oldContrib); // if (panel == null) { //// System.out.println("panel null for " + newContrib); // contributionAdded(newContrib); // } else { detailForContrib.remove(oldContrib); - panel.setContrib(newContrib); - detailForContrib.put(newContrib, panel); + detail.setContrib(newContrib); + detailForContrib.put(newContrib, detail); model.fireTableDataChanged(); // } } diff --git a/app/src/processing/app/contrib/StatusDetail.java b/app/src/processing/app/contrib/StatusDetail.java index ecf607456..a7b5c2aff 100644 --- a/app/src/processing/app/contrib/StatusDetail.java +++ b/app/src/processing/app/contrib/StatusDetail.java @@ -33,8 +33,9 @@ import processing.app.laf.PdeProgressBarUI; /** - * Vestigial class that was formerly a detail panel, but since 3.x - * has only been used to track install/remove state information. + * An unfortunate mix of state information about the installation + * status of a Contribution, *as well as* the methods to handle + * installation and update of that Contribution. */ class StatusDetail { private final Base base; diff --git a/app/src/processing/app/contrib/UpdateStatusPanel.java b/app/src/processing/app/contrib/UpdateStatusPanel.java index cb060704c..58d6102b1 100644 --- a/app/src/processing/app/contrib/UpdateStatusPanel.java +++ b/app/src/processing/app/contrib/UpdateStatusPanel.java @@ -33,15 +33,12 @@ public class UpdateStatusPanel extends StatusPanel { public UpdateStatusPanel(UpdateContributionTab tab) { super(tab); - //updateButton = Toolkit.createIconButton("Update All", updateIcon); updateButton = new JButton("Update All"); -// updateButton.setFont(ManagerFrame.NORMAL_PLAIN); updateButton.setHorizontalAlignment(SwingConstants.LEFT); updateButton.setVisible(true); updateButton.setEnabled(false); updateButton.addActionListener(e -> contributionTab.updateAll()); - setBackground(new Color(0xebebeb)); layout = new GroupLayout(this); setLayout(layout);