From b64366cb97b9e6b56c3d8c6281ccf56af9bfc491 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Wed, 16 Sep 2015 22:55:42 +0530 Subject: [PATCH 1/4] Revert "Update to a incompatible version is not possible" This reverts commit 4ecacefbded0bec10489a03b78ea84a31211d2a4. --- .../app/contrib/ContributionListing.java | 3 +-- .../processing/app/contrib/StatusPanel.java | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java index 828272d06..ba2c3da1f 100644 --- a/app/src/processing/app/contrib/ContributionListing.java +++ b/app/src/processing/app/contrib/ContributionListing.java @@ -515,8 +515,7 @@ public class ContributionListing { if (advertised == null) { return false; } - return advertised.getVersion() > contribution.getVersion() - && advertised.isCompatible(Base.getRevision()); + return advertised.getVersion() > contribution.getVersion(); } return false; } diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index a53777ac6..1f011007d 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -238,16 +238,6 @@ class StatusPanel extends JPanel { contributionListing.getLatestVersion(panel.getContrib()); String currentVersion = panel.getContrib().getPrettyVersion(); - installButton.setEnabled(!panel.getContrib().isInstalled() - && contributionListing.hasDownloadedLatestList() - && panel.getContrib().isCompatible(Base.getRevision())); - - if (installButton.isEnabled()) { - updateLabel.setText(latestVersion + " available"); - } else { - updateLabel.setText(currentVersion + " installed"); - } - if (latestVersion != null) { latestVersion = "Update to " + latestVersion; } else { @@ -264,6 +254,15 @@ class StatusPanel extends JPanel { updateButton.setText("Update"); } + installButton.setEnabled(!panel.getContrib().isInstalled() + && contributionListing.hasDownloadedLatestList() + && panel.getContrib().isCompatible(Base.getRevision())); + + if (installButton.isEnabled()) { + updateLabel.setText(currentVersion + " available"); + } else { + updateLabel.setText(currentVersion + " installed"); + } removeButton.setEnabled(panel.getContrib().isInstalled()); progressBarPanel.add(panel.installProgressBar); From a1715658a992547577fcf77a4aa9654485085d61 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Fri, 18 Sep 2015 13:03:22 +0530 Subject: [PATCH 2/4] Buttons disabled when clicked --- app/src/processing/app/contrib/StatusPanel.java | 12 +++++++++--- .../app/contrib/UpdateContributionTab.java | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 1f011007d..5f0dd70b4 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -96,6 +96,7 @@ class StatusPanel extends JPanel { @Override public void actionPerformed(ActionEvent e) { + installButton.setEnabled(false); ContributionPanel currentPanel = contributionTab.contributionListPanel .getSelectedPanel(); currentPanel.install(); @@ -119,6 +120,7 @@ class StatusPanel extends JPanel { @Override public void actionPerformed(ActionEvent e) { + updateButton.setEnabled(false); ContributionPanel currentPanel = contributionTab.contributionListPanel .getSelectedPanel(); currentPanel.update(); @@ -136,6 +138,7 @@ class StatusPanel extends JPanel { @Override public void actionPerformed(ActionEvent e) { + removeButton.setEnabled(false); ContributionPanel currentPanel = contributionTab.contributionListPanel .getSelectedPanel(); currentPanel.remove(); @@ -232,7 +235,8 @@ class StatusPanel extends JPanel { updateButton.setEnabled(contributionListing.hasDownloadedLatestList() && (contributionListing.hasUpdates(panel.getContrib()) && !panel - .getContrib().isUpdateFlagged())); + .getContrib().isUpdateFlagged()) + && !panel.isUpdateInProgress); String latestVersion = contributionListing.getLatestVersion(panel.getContrib()); @@ -256,7 +260,8 @@ class StatusPanel extends JPanel { installButton.setEnabled(!panel.getContrib().isInstalled() && contributionListing.hasDownloadedLatestList() - && panel.getContrib().isCompatible(Base.getRevision())); + && panel.getContrib().isCompatible(Base.getRevision()) + && !panel.isInstallInProgress); if (installButton.isEnabled()) { updateLabel.setText(currentVersion + " available"); @@ -264,7 +269,8 @@ class StatusPanel extends JPanel { updateLabel.setText(currentVersion + " installed"); } - removeButton.setEnabled(panel.getContrib().isInstalled()); + removeButton.setEnabled(panel.getContrib().isInstalled() + && !panel.isRemoveInProgress); progressBarPanel.add(panel.installProgressBar); progressBarPanel.setVisible(false); updateLabel.setVisible(true); diff --git a/app/src/processing/app/contrib/UpdateContributionTab.java b/app/src/processing/app/contrib/UpdateContributionTab.java index 8c46da002..7611e0179 100644 --- a/app/src/processing/app/contrib/UpdateContributionTab.java +++ b/app/src/processing/app/contrib/UpdateContributionTab.java @@ -328,7 +328,6 @@ public class UpdateContributionTab extends ContributionTab { updateButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - // TODO Auto-generated method stub for(ContributionPanel contributionPanel : contributionTab.contributionListPanel.panelByContribution.values()){ contributionPanel.update(); } From fe5082c2c9ad8899ccabe8df6443a8d35af37bf3 Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Fri, 18 Sep 2015 13:14:01 +0530 Subject: [PATCH 3/4] Revert "Revert "Update to a incompatible version is not possible"" This reverts commit 728a21a5571c82ea1eb94b141c2211f9306e06df. Conflicts: app/src/processing/app/contrib/StatusPanel.java --- .../processing/app/contrib/ContributionListing.java | 3 ++- app/src/processing/app/contrib/StatusPanel.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/contrib/ContributionListing.java b/app/src/processing/app/contrib/ContributionListing.java index ba2c3da1f..828272d06 100644 --- a/app/src/processing/app/contrib/ContributionListing.java +++ b/app/src/processing/app/contrib/ContributionListing.java @@ -515,7 +515,8 @@ public class ContributionListing { if (advertised == null) { return false; } - return advertised.getVersion() > contribution.getVersion(); + return advertised.getVersion() > contribution.getVersion() + && advertised.isCompatible(Base.getRevision()); } return false; } diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 5f0dd70b4..60627ce27 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -242,6 +242,16 @@ class StatusPanel extends JPanel { contributionListing.getLatestVersion(panel.getContrib()); String currentVersion = panel.getContrib().getPrettyVersion(); + installButton.setEnabled(!panel.getContrib().isInstalled() + && contributionListing.hasDownloadedLatestList() + && panel.getContrib().isCompatible(Base.getRevision())); + + if (installButton.isEnabled()) { + updateLabel.setText(latestVersion + " available"); + } else { + updateLabel.setText(currentVersion + " installed"); + } + if (latestVersion != null) { latestVersion = "Update to " + latestVersion; } else { From 07dbfe908cb8d661fb486dd034fa6fd11d6d785e Mon Sep 17 00:00:00 2001 From: Akarshit Wal Date: Fri, 18 Sep 2015 13:31:36 +0530 Subject: [PATCH 4/4] Removing repeated code --- app/src/processing/app/contrib/StatusPanel.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/src/processing/app/contrib/StatusPanel.java b/app/src/processing/app/contrib/StatusPanel.java index 60627ce27..fb42baf90 100644 --- a/app/src/processing/app/contrib/StatusPanel.java +++ b/app/src/processing/app/contrib/StatusPanel.java @@ -244,7 +244,8 @@ class StatusPanel extends JPanel { installButton.setEnabled(!panel.getContrib().isInstalled() && contributionListing.hasDownloadedLatestList() - && panel.getContrib().isCompatible(Base.getRevision())); + && panel.getContrib().isCompatible(Base.getRevision()) + && !panel.isInstallInProgress); if (installButton.isEnabled()) { updateLabel.setText(latestVersion + " available"); @@ -268,17 +269,6 @@ class StatusPanel extends JPanel { updateButton.setText("Update"); } - installButton.setEnabled(!panel.getContrib().isInstalled() - && contributionListing.hasDownloadedLatestList() - && panel.getContrib().isCompatible(Base.getRevision()) - && !panel.isInstallInProgress); - - if (installButton.isEnabled()) { - updateLabel.setText(currentVersion + " available"); - } else { - updateLabel.setText(currentVersion + " installed"); - } - removeButton.setEnabled(panel.getContrib().isInstalled() && !panel.isRemoveInProgress); progressBarPanel.add(panel.installProgressBar);