From 8cbdf3d38970e958f106d47115a049ec20aeb377 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Thu, 25 Jun 2015 18:09:56 +0530 Subject: [PATCH] Buttons working as desired --- app/src/processing/app/contrib/ContributionPanel.java | 11 ++++++++--- app/src/processing/app/contrib/StatusPanel.java | 10 ++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionPanel.java b/app/src/processing/app/contrib/ContributionPanel.java index fa86f0820..3dba39409 100644 --- a/app/src/processing/app/contrib/ContributionPanel.java +++ b/app/src/processing/app/contrib/ContributionPanel.java @@ -87,6 +87,11 @@ class ContributionPanel extends JPanel { */ private Contribution contrib; + public Contribution getContrib() { + return contrib; + } + + private boolean alreadySelected; private boolean enableHyperlinks; private HyperlinkListener conditionalHyperlinkOpener; @@ -103,7 +108,7 @@ class ContributionPanel extends JPanel { private ActionListener installActionListener; private ActionListener undoActionListener; - private boolean isUpdateInProgress; + boolean isUpdateInProgress; private boolean isInstallInProgress; private boolean isRemoveInProgress; @@ -188,8 +193,8 @@ class ContributionPanel extends JPanel { if (contrib.isCompatible(Base.getRevision())) { listPanel.setSelectedPanel(ContributionPanel.this); } else { - final String msg = contrib.getName() + - " is not compatible with this version of Processing"; + final String msg = contrib.getName() + + " is not compatible with this version of Processing"; listPanel.contributionTab.statusPanel.setErrorMessage(msg); } } diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 9d296bff1..541e84635 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -166,6 +166,16 @@ class StatusPanel extends JPanel { public void update(ContributionPanel panel) { label.setText(panel.description.toString()); + + updateButton.setEnabled(!contributionListing.hasListDownloadFailed() + && (contributionListing.hasUpdates(panel.getContrib()) && !panel + .getContrib().isUpdateFlagged())); + + installButton.setEnabled(!panel.getContrib().isInstalled() && !contributionListing.hasListDownloadFailed()); + + removeButton.setEnabled(panel.getContrib().isInstalled()); +// reorganizePaneComponents(); + } }